From f00a8c7bc558e6d2eeb085ce50d6e01dcdaaaa04 Mon Sep 17 00:00:00 2001 From: tchavoshinia Date: Fri, 30 May 2014 15:57:45 +0200 Subject: [PATCH 1/2] init 1.8.1.0 --- RELEASE_NOTES.txt | 2 +- app/Mage.php | 6 +- .../Phoenix/Moneybookers/Block/Form.php | 2 +- .../Phoenix/Moneybookers/Block/Info.php | 2 +- .../Phoenix/Moneybookers/Block/Jsinit.php | 2 +- .../Phoenix/Moneybookers/Block/Payment.php | 2 +- .../Phoenix/Moneybookers/Block/Placeform.php | 2 +- .../Phoenix/Moneybookers/Block/Redirect.php | 2 +- .../Phoenix/Moneybookers/Helper/Data.php | 2 +- .../Phoenix/Moneybookers/Model/Abstract.php | 2 +- .../Phoenix/Moneybookers/Model/Acc.php | 2 +- .../Phoenix/Moneybookers/Model/Csi.php | 2 +- .../Phoenix/Moneybookers/Model/Did.php | 2 +- .../Phoenix/Moneybookers/Model/Dnk.php | 2 +- .../Phoenix/Moneybookers/Model/Ebt.php | 2 +- .../Phoenix/Moneybookers/Model/Ent.php | 2 +- .../Phoenix/Moneybookers/Model/Event.php | 2 +- .../Phoenix/Moneybookers/Model/Gcb.php | 2 +- .../Phoenix/Moneybookers/Model/Gir.php | 2 +- .../Phoenix/Moneybookers/Model/Idl.php | 2 +- .../Phoenix/Moneybookers/Model/Lsr.php | 2 +- .../Phoenix/Moneybookers/Model/Mae.php | 2 +- .../Phoenix/Moneybookers/Model/Npy.php | 2 +- .../Phoenix/Moneybookers/Model/Obt.php | 2 +- .../Phoenix/Moneybookers/Model/Pli.php | 2 +- .../Phoenix/Moneybookers/Model/Psp.php | 2 +- .../Phoenix/Moneybookers/Model/Pwy.php | 2 +- .../Phoenix/Moneybookers/Model/Sft.php | 2 +- .../Phoenix/Moneybookers/Model/So2.php | 2 +- .../Phoenix/Moneybookers/Model/Wlt.php | 2 +- .../controllers/MoneybookersController.php | 2 +- .../controllers/ProcessingController.php | 2 +- .../Phoenix/Moneybookers/etc/config.xml | 2 +- .../Phoenix/Moneybookers/etc/system.xml | 2 +- .../moneybookers_setup/install-1.6.0.0.php | 2 +- .../mysql4-upgrade-1.2-1.2.0.1.php | 2 +- app/code/core/Mage/Admin/Helper/Data.php | 2 +- app/code/core/Mage/Admin/Model/Acl.php | 2 +- .../core/Mage/Admin/Model/Acl/Assert/Ip.php | 2 +- .../core/Mage/Admin/Model/Acl/Assert/Time.php | 2 +- .../core/Mage/Admin/Model/Acl/Resource.php | 2 +- app/code/core/Mage/Admin/Model/Acl/Role.php | 2 +- .../Mage/Admin/Model/Acl/Role/Generic.php | 2 +- .../core/Mage/Admin/Model/Acl/Role/Group.php | 2 +- .../Mage/Admin/Model/Acl/Role/Registry.php | 2 +- .../core/Mage/Admin/Model/Acl/Role/User.php | 2 +- app/code/core/Mage/Admin/Model/Config.php | 2 +- app/code/core/Mage/Admin/Model/Mysql4/Acl.php | 2 +- .../core/Mage/Admin/Model/Mysql4/Acl/Role.php | 2 +- .../Model/Mysql4/Acl/Role/Collection.php | 2 +- .../Model/Mysql4/Permissions/Collection.php | 2 +- .../core/Mage/Admin/Model/Mysql4/Role.php | 2 +- .../Admin/Model/Mysql4/Role/Collection.php | 2 +- .../core/Mage/Admin/Model/Mysql4/Roles.php | 2 +- .../Admin/Model/Mysql4/Roles/Collection.php | 2 +- .../Model/Mysql4/Roles/User/Collection.php | 2 +- .../core/Mage/Admin/Model/Mysql4/Rules.php | 2 +- .../Admin/Model/Mysql4/Rules/Collection.php | 2 +- .../core/Mage/Admin/Model/Mysql4/User.php | 2 +- .../Admin/Model/Mysql4/User/Collection.php | 2 +- app/code/core/Mage/Admin/Model/Observer.php | 2 +- .../core/Mage/Admin/Model/Redirectpolicy.php | 71 - .../core/Mage/Admin/Model/Resource/Acl.php | 2 +- .../Mage/Admin/Model/Resource/Acl/Role.php | 2 +- .../Model/Resource/Acl/Role/Collection.php | 2 +- .../Model/Resource/Permissions/Collection.php | 2 +- .../core/Mage/Admin/Model/Resource/Role.php | 2 +- .../Admin/Model/Resource/Role/Collection.php | 2 +- .../core/Mage/Admin/Model/Resource/Roles.php | 2 +- .../Admin/Model/Resource/Roles/Collection.php | 2 +- .../Model/Resource/Roles/User/Collection.php | 2 +- .../core/Mage/Admin/Model/Resource/Rules.php | 2 +- .../Admin/Model/Resource/Rules/Collection.php | 2 +- .../core/Mage/Admin/Model/Resource/User.php | 2 +- .../Admin/Model/Resource/User/Collection.php | 2 +- app/code/core/Mage/Admin/Model/Role.php | 2 +- app/code/core/Mage/Admin/Model/Roles.php | 2 +- app/code/core/Mage/Admin/Model/Rules.php | 2 +- app/code/core/Mage/Admin/Model/Session.php | 43 +- app/code/core/Mage/Admin/Model/User.php | 4 +- .../data/admin_setup/data-install-1.6.0.0.php | 2 +- app/code/core/Mage/Admin/etc/config.xml | 2 +- .../Admin/sql/admin_setup/install-1.6.0.0.php | 2 +- .../sql/admin_setup/mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../admin_setup/upgrade-1.6.0.0-1.6.1.0.php | 2 +- .../admin_setup/upgrade-1.6.1.0-1.6.1.1.php | 2 +- .../Mage/AdminNotification/Helper/Data.php | 2 +- .../Mage/AdminNotification/Model/Feed.php | 2 +- .../Mage/AdminNotification/Model/Inbox.php | 2 +- .../AdminNotification/Model/Mysql4/Inbox.php | 2 +- .../Model/Mysql4/Inbox/Collection.php | 2 +- .../Mage/AdminNotification/Model/Observer.php | 2 +- .../Model/Resource/Inbox.php | 2 +- .../Model/Resource/Inbox/Collection.php | 2 +- .../Mage/AdminNotification/Model/Survey.php | 2 +- .../Mage/AdminNotification/etc/adminhtml.xml | 2 +- .../Mage/AdminNotification/etc/config.xml | 2 +- .../Mage/AdminNotification/etc/system.xml | 2 +- .../install-1.6.0.0.php | 2 +- .../mysql4-install-1.0.0.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../core/Mage/Adminhtml/Block/Abstract.php | 2 +- .../core/Mage/Adminhtml/Block/Api/Buttons.php | 2 +- .../Mage/Adminhtml/Block/Api/Editroles.php | 2 +- .../Mage/Adminhtml/Block/Api/Edituser.php | 2 +- .../Mage/Adminhtml/Block/Api/Grid/Role.php | 2 +- .../core/Mage/Adminhtml/Block/Api/Role.php | 2 +- .../Adminhtml/Block/Api/Role/Grid/User.php | 2 +- .../core/Mage/Adminhtml/Block/Api/Roles.php | 2 +- .../Mage/Adminhtml/Block/Api/Tab/Roleinfo.php | 2 +- .../Adminhtml/Block/Api/Tab/Rolesedit.php | 2 +- .../Adminhtml/Block/Api/Tab/Rolesusers.php | 2 +- .../Adminhtml/Block/Api/Tab/Userroles.php | 2 +- .../core/Mage/Adminhtml/Block/Api/User.php | 2 +- .../Mage/Adminhtml/Block/Api/User/Edit.php | 2 +- .../Adminhtml/Block/Api/User/Edit/Form.php | 2 +- .../Block/Api/User/Edit/Tab/Main.php | 2 +- .../Block/Api/User/Edit/Tab/Roles.php | 2 +- .../Adminhtml/Block/Api/User/Edit/Tabs.php | 2 +- .../Mage/Adminhtml/Block/Api/User/Grid.php | 2 +- .../core/Mage/Adminhtml/Block/Api/Users.php | 2 +- app/code/core/Mage/Adminhtml/Block/Backup.php | 2 +- .../Mage/Adminhtml/Block/Backup/Dialogs.php | 2 +- .../core/Mage/Adminhtml/Block/Backup/Grid.php | 2 +- app/code/core/Mage/Adminhtml/Block/Cache.php | 2 +- .../Mage/Adminhtml/Block/Cache/Additional.php | 2 +- .../core/Mage/Adminhtml/Block/Cache/Grid.php | 2 +- .../Adminhtml/Block/Cache/Notifications.php | 2 +- .../core/Mage/Adminhtml/Block/Catalog.php | 2 +- .../Block/Catalog/Category/Abstract.php | 2 +- .../Catalog/Category/Checkboxes/Tree.php | 2 +- .../Adminhtml/Block/Catalog/Category/Edit.php | 2 +- .../Block/Catalog/Category/Edit/Form.php | 2 +- .../Block/Catalog/Category/Helper/Image.php | 2 +- .../Catalog/Category/Helper/Pricestep.php | 2 +- .../Category/Helper/Sortby/Available.php | 2 +- .../Category/Helper/Sortby/Default.php | 2 +- .../Block/Catalog/Category/Tab/Attributes.php | 2 +- .../Block/Catalog/Category/Tab/Design.php | 2 +- .../Block/Catalog/Category/Tab/General.php | 2 +- .../Block/Catalog/Category/Tab/Product.php | 2 +- .../Adminhtml/Block/Catalog/Category/Tabs.php | 2 +- .../Adminhtml/Block/Catalog/Category/Tree.php | 2 +- .../Block/Catalog/Category/Widget/Chooser.php | 2 +- .../Mage/Adminhtml/Block/Catalog/Form.php | 2 +- .../Form/Renderer/Attribute/Urlkey.php | 2 +- .../Form/Renderer/Config/DateFieldsOrder.php | 2 +- .../Form/Renderer/Config/YearRange.php | 2 +- .../Form/Renderer/Fieldset/Element.php | 2 +- .../Block/Catalog/Helper/Form/Wysiwyg.php | 2 +- .../Catalog/Helper/Form/Wysiwyg/Content.php | 2 +- .../Mage/Adminhtml/Block/Catalog/Product.php | 2 +- .../Block/Catalog/Product/Attribute.php | 2 +- .../Block/Catalog/Product/Attribute/Edit.php | 2 +- .../Catalog/Product/Attribute/Edit/Form.php | 2 +- .../Product/Attribute/Edit/Tab/Front.php | 2 +- .../Product/Attribute/Edit/Tab/Main.php | 2 +- .../Product/Attribute/Edit/Tab/Options.php | 2 +- .../Product/Attribute/Edit/Tab/System.php | 2 +- .../Catalog/Product/Attribute/Edit/Tabs.php | 2 +- .../Block/Catalog/Product/Attribute/Grid.php | 2 +- .../Attribute/New/Product/Attributes.php | 2 +- .../Product/Attribute/New/Product/Created.php | 2 +- .../Catalog/Product/Attribute/Set/Grid.php | 2 +- .../Catalog/Product/Attribute/Set/Main.php | 2 +- .../Attribute/Set/Main/Formattribute.php | 2 +- .../Product/Attribute/Set/Main/Formgroup.php | 2 +- .../Product/Attribute/Set/Main/Formset.php | 2 +- .../Attribute/Set/Main/Tree/Attribute.php | 2 +- .../Product/Attribute/Set/Main/Tree/Group.php | 2 +- .../Product/Attribute/Set/Toolbar/Add.php | 2 +- .../Product/Attribute/Set/Toolbar/Main.php | 2 +- .../Attribute/Set/Toolbar/Main/Filter.php | 2 +- .../Catalog/Product/Composite/Configure.php | 2 +- .../Block/Catalog/Product/Composite/Error.php | 2 +- .../Catalog/Product/Composite/Fieldset.php | 2 +- .../Composite/Fieldset/Configurable.php | 2 +- .../Product/Composite/Fieldset/Grouped.php | 2 +- .../Product/Composite/Fieldset/Options.php | 2 +- .../Product/Composite/Fieldset/Qty.php | 2 +- .../Product/Composite/Update/Result.php | 2 +- .../Block/Catalog/Product/Created.php | 2 +- .../Adminhtml/Block/Catalog/Product/Edit.php | 2 +- .../Catalog/Product/Edit/Action/Attribute.php | 2 +- .../Edit/Action/Attribute/Tab/Attributes.php | 2 +- .../Edit/Action/Attribute/Tab/Inventory.php | 2 +- .../Edit/Action/Attribute/Tab/Websites.php | 2 +- .../Product/Edit/Action/Attribute/Tabs.php | 2 +- .../Block/Catalog/Product/Edit/Js.php | 2 +- .../Product/Edit/Tab/Ajax/Serializer.php | 2 +- .../Block/Catalog/Product/Edit/Tab/Alerts.php | 2 +- .../Catalog/Product/Edit/Tab/Alerts/Price.php | 2 +- .../Catalog/Product/Edit/Tab/Alerts/Stock.php | 2 +- .../Catalog/Product/Edit/Tab/Attributes.php | 2 +- .../Product/Edit/Tab/Attributes/Create.php | 2 +- .../Catalog/Product/Edit/Tab/Categories.php | 2 +- .../Catalog/Product/Edit/Tab/Crosssell.php | 2 +- .../Catalog/Product/Edit/Tab/Inventory.php | 2 +- .../Catalog/Product/Edit/Tab/Options.php | 2 +- .../Product/Edit/Tab/Options/Option.php | 2 +- .../Edit/Tab/Options/Type/Abstract.php | 2 +- .../Product/Edit/Tab/Options/Type/Date.php | 2 +- .../Product/Edit/Tab/Options/Type/File.php | 2 +- .../Product/Edit/Tab/Options/Type/Select.php | 2 +- .../Product/Edit/Tab/Options/Type/Text.php | 2 +- .../Block/Catalog/Product/Edit/Tab/Price.php | 2 +- .../Catalog/Product/Edit/Tab/Price/Group.php | 2 +- .../Product/Edit/Tab/Price/Group/Abstract.php | 2 +- .../Product/Edit/Tab/Price/Recurring.php | 2 +- .../Catalog/Product/Edit/Tab/Price/Tier.php | 2 +- .../Catalog/Product/Edit/Tab/Related.php | 2 +- .../Catalog/Product/Edit/Tab/Reviews.php | 2 +- .../Catalog/Product/Edit/Tab/Settings.php | 2 +- .../Catalog/Product/Edit/Tab/Super/Config.php | 2 +- .../Product/Edit/Tab/Super/Config/Grid.php | 2 +- .../Super/Config/Grid/Filter/Inventory.php | 2 +- .../Super/Config/Grid/Renderer/Checkbox.php | 2 +- .../Super/Config/Grid/Renderer/Inventory.php | 2 +- .../Product/Edit/Tab/Super/Config/Simple.php | 2 +- .../Catalog/Product/Edit/Tab/Super/Group.php | 2 +- .../Product/Edit/Tab/Super/Settings.php | 2 +- .../Block/Catalog/Product/Edit/Tab/Tag.php | 2 +- .../Catalog/Product/Edit/Tab/Tag/Customer.php | 2 +- .../Block/Catalog/Product/Edit/Tab/Upsell.php | 2 +- .../Catalog/Product/Edit/Tab/Websites.php | 2 +- .../Block/Catalog/Product/Edit/Tabs.php | 2 +- .../Product/Edit/Tabs/Configurable.php | 2 +- .../Catalog/Product/Edit/Tabs/Grouped.php | 2 +- .../Product/Frontend/Product/Watermark.php | 2 +- .../Adminhtml/Block/Catalog/Product/Grid.php | 2 +- .../Catalog/Product/Helper/Form/Apply.php | 2 +- .../Catalog/Product/Helper/Form/Boolean.php | 2 +- .../Catalog/Product/Helper/Form/Config.php | 2 +- .../Catalog/Product/Helper/Form/Gallery.php | 2 +- .../Product/Helper/Form/Gallery/Content.php | 2 +- .../Catalog/Product/Helper/Form/Image.php | 2 +- .../Product/Helper/Form/Msrp/Enabled.php | 2 +- .../Product/Helper/Form/Msrp/Price.php | 2 +- .../Catalog/Product/Helper/Form/Price.php | 2 +- .../Catalog/Product/Helper/Form/Weight.php | 2 +- .../Adminhtml/Block/Catalog/Product/Price.php | 2 +- .../Block/Catalog/Product/Widget/Chooser.php | 2 +- .../Product/Widget/Chooser/Container.php | 2 +- .../Mage/Adminhtml/Block/Catalog/Search.php | 2 +- .../Adminhtml/Block/Catalog/Search/Edit.php | 2 +- .../Block/Catalog/Search/Edit/Form.php | 2 +- .../Adminhtml/Block/Catalog/Search/Grid.php | 2 +- .../Adminhtml/Block/Checkout/Agreement.php | 2 +- .../Block/Checkout/Agreement/Edit.php | 2 +- .../Block/Checkout/Agreement/Edit/Form.php | 2 +- .../Block/Checkout/Agreement/Grid.php | 2 +- .../core/Mage/Adminhtml/Block/Cms/Block.php | 2 +- .../Mage/Adminhtml/Block/Cms/Block/Edit.php | 2 +- .../Adminhtml/Block/Cms/Block/Edit/Form.php | 2 +- .../Mage/Adminhtml/Block/Cms/Block/Grid.php | 2 +- .../Block/Cms/Block/Widget/Chooser.php | 2 +- .../core/Mage/Adminhtml/Block/Cms/Page.php | 2 +- .../Mage/Adminhtml/Block/Cms/Page/Edit.php | 2 +- .../Adminhtml/Block/Cms/Page/Edit/Form.php | 2 +- .../Block/Cms/Page/Edit/Tab/Content.php | 2 +- .../Block/Cms/Page/Edit/Tab/Design.php | 2 +- .../Block/Cms/Page/Edit/Tab/Main.php | 2 +- .../Block/Cms/Page/Edit/Tab/Meta.php | 2 +- .../Adminhtml/Block/Cms/Page/Edit/Tabs.php | 2 +- .../Mage/Adminhtml/Block/Cms/Page/Grid.php | 2 +- .../Block/Cms/Page/Grid/Renderer/Action.php | 2 +- .../Block/Cms/Page/Widget/Chooser.php | 2 +- .../Block/Cms/Wysiwyg/Images/Content.php | 2 +- .../Cms/Wysiwyg/Images/Content/Files.php | 2 +- .../Cms/Wysiwyg/Images/Content/Newfolder.php | 2 +- .../Cms/Wysiwyg/Images/Content/Uploader.php | 2 +- .../Block/Cms/Wysiwyg/Images/Tree.php | 2 +- .../core/Mage/Adminhtml/Block/Customer.php | 2 +- .../Mage/Adminhtml/Block/Customer/Edit.php | 2 +- .../Adminhtml/Block/Customer/Edit/Form.php | 2 +- .../Edit/Renderer/Attribute/Group.php | 2 +- .../Block/Customer/Edit/Renderer/Newpass.php | 2 +- .../Block/Customer/Edit/Renderer/Region.php | 2 +- .../Block/Customer/Edit/Tab/Account.php | 2 +- .../Block/Customer/Edit/Tab/Addresses.php | 2 +- .../Block/Customer/Edit/Tab/Cart.php | 2 +- .../Block/Customer/Edit/Tab/Carts.php | 2 +- .../Block/Customer/Edit/Tab/Newsletter.php | 2 +- .../Customer/Edit/Tab/Newsletter/Grid.php | 2 +- .../Tab/Newsletter/Grid/Filter/Status.php | 2 +- .../Tab/Newsletter/Grid/Renderer/Action.php | 2 +- .../Tab/Newsletter/Grid/Renderer/Status.php | 2 +- .../Block/Customer/Edit/Tab/Orders.php | 2 +- .../Block/Customer/Edit/Tab/Reviews.php | 2 +- .../Adminhtml/Block/Customer/Edit/Tab/Tag.php | 2 +- .../Block/Customer/Edit/Tab/Tags.php | 2 +- .../Block/Customer/Edit/Tab/View.php | 2 +- .../Customer/Edit/Tab/View/Accordion.php | 2 +- .../Block/Customer/Edit/Tab/View/Cart.php | 2 +- .../Edit/Tab/View/Grid/Renderer/Item.php | 2 +- .../Block/Customer/Edit/Tab/View/Orders.php | 2 +- .../Block/Customer/Edit/Tab/View/Sales.php | 2 +- .../Block/Customer/Edit/Tab/View/Wishlist.php | 2 +- .../Block/Customer/Edit/Tab/Wishlist.php | 2 +- .../Wishlist/Grid/Renderer/Description.php | 2 +- .../Adminhtml/Block/Customer/Edit/Tabs.php | 2 +- .../Block/Customer/Form/Element/Boolean.php | 2 +- .../Block/Customer/Form/Element/File.php | 2 +- .../Block/Customer/Form/Element/Image.php | 2 +- .../Mage/Adminhtml/Block/Customer/Grid.php | 2 +- .../Block/Customer/Grid/Filter/Country.php | 2 +- .../Customer/Grid/Renderer/Multiaction.php | 2 +- .../Mage/Adminhtml/Block/Customer/Group.php | 2 +- .../Adminhtml/Block/Customer/Group/Edit.php | 2 +- .../Block/Customer/Group/Edit/Form.php | 2 +- .../Adminhtml/Block/Customer/Group/Grid.php | 2 +- .../Mage/Adminhtml/Block/Customer/Online.php | 2 +- .../Block/Customer/Online/Filter.php | 2 +- .../Adminhtml/Block/Customer/Online/Grid.php | 2 +- .../Customer/Online/Grid/Renderer/Ip.php | 2 +- .../Customer/Online/Grid/Renderer/Type.php | 2 +- .../Customer/Online/Grid/Renderer/Url.php | 2 +- .../Sales/Order/Address/Form/Renderer/Vat.php | 2 +- .../Customer/System/Config/Validatevat.php | 2 +- .../core/Mage/Adminhtml/Block/Dashboard.php | 2 +- .../Adminhtml/Block/Dashboard/Abstract.php | 2 +- .../Mage/Adminhtml/Block/Dashboard/Bar.php | 2 +- .../Adminhtml/Block/Dashboard/Diagrams.php | 2 +- .../Mage/Adminhtml/Block/Dashboard/Graph.php | 2 +- .../Mage/Adminhtml/Block/Dashboard/Grid.php | 2 +- .../Mage/Adminhtml/Block/Dashboard/Grids.php | 2 +- .../Adminhtml/Block/Dashboard/Orders/Grid.php | 2 +- .../Mage/Adminhtml/Block/Dashboard/Sales.php | 2 +- .../Block/Dashboard/Searches/Last.php | 2 +- .../Searches/Renderer/Searchquery.php | 2 +- .../Block/Dashboard/Searches/Top.php | 2 +- .../Adminhtml/Block/Dashboard/Tab/Amounts.php | 2 +- .../Block/Dashboard/Tab/Customers/Most.php | 2 +- .../Block/Dashboard/Tab/Customers/Newest.php | 2 +- .../Adminhtml/Block/Dashboard/Tab/Orders.php | 2 +- .../Block/Dashboard/Tab/Products/Ordered.php | 2 +- .../Block/Dashboard/Tab/Products/Viewed.php | 2 +- .../Mage/Adminhtml/Block/Dashboard/Totals.php | 2 +- app/code/core/Mage/Adminhtml/Block/Denied.php | 2 +- .../core/Mage/Adminhtml/Block/Html/Date.php | 2 +- .../core/Mage/Adminhtml/Block/Html/Select.php | 2 +- .../Mage/Adminhtml/Block/Media/Editor.php | 2 +- .../Mage/Adminhtml/Block/Media/Uploader.php | 2 +- .../core/Mage/Adminhtml/Block/Messages.php | 2 +- .../Adminhtml/Block/Newsletter/Problem.php | 2 +- .../Block/Newsletter/Problem/Grid.php | 2 +- .../Problem/Grid/Filter/Checkbox.php | 2 +- .../Problem/Grid/Renderer/Checkbox.php | 2 +- .../Mage/Adminhtml/Block/Newsletter/Queue.php | 2 +- .../Adminhtml/Block/Newsletter/Queue/Edit.php | 2 +- .../Block/Newsletter/Queue/Edit/Form.php | 2 +- .../Adminhtml/Block/Newsletter/Queue/Grid.php | 2 +- .../Newsletter/Queue/Grid/Renderer/Action.php | 2 +- .../Block/Newsletter/Queue/Preview.php | 6 +- .../Block/Newsletter/Queue/Preview/Form.php | 2 +- .../Adminhtml/Block/Newsletter/Subscriber.php | 2 +- .../Block/Newsletter/Subscriber/Grid.php | 2 +- .../Subscriber/Grid/Filter/Checkbox.php | 2 +- .../Subscriber/Grid/Filter/Website.php | 2 +- .../Subscriber/Grid/Renderer/Checkbox.php | 2 +- .../Adminhtml/Block/Newsletter/Template.php | 2 +- .../Block/Newsletter/Template/Edit.php | 2 +- .../Block/Newsletter/Template/Edit/Form.php | 2 +- .../Block/Newsletter/Template/Grid.php | 2 +- .../Template/Grid/Renderer/Action.php | 2 +- .../Template/Grid/Renderer/Sender.php | 2 +- .../Block/Newsletter/Template/Preview.php | 4 +- .../Newsletter/Template/Preview/Form.php | 2 +- .../Adminhtml/Block/Notification/Baseurl.php | 2 +- .../Adminhtml/Block/Notification/Grid.php | 2 +- .../Notification/Grid/Renderer/Actions.php | 2 +- .../Notification/Grid/Renderer/Notice.php | 2 +- .../Notification/Grid/Renderer/Severity.php | 2 +- .../Adminhtml/Block/Notification/Inbox.php | 2 +- .../Adminhtml/Block/Notification/Security.php | 2 +- .../Adminhtml/Block/Notification/Survey.php | 2 +- .../Adminhtml/Block/Notification/Toolbar.php | 2 +- .../Adminhtml/Block/Notification/Window.php | 2 +- app/code/core/Mage/Adminhtml/Block/Page.php | 2 +- .../core/Mage/Adminhtml/Block/Page/Footer.php | 2 +- .../core/Mage/Adminhtml/Block/Page/Head.php | 2 +- .../core/Mage/Adminhtml/Block/Page/Header.php | 2 +- .../core/Mage/Adminhtml/Block/Page/Menu.php | 2 +- .../Mage/Adminhtml/Block/Page/Notices.php | 2 +- .../Adminhtml/Block/Permissions/Buttons.php | 2 +- .../Adminhtml/Block/Permissions/Editroles.php | 2 +- .../Adminhtml/Block/Permissions/Edituser.php | 2 +- .../Adminhtml/Block/Permissions/Grid/Role.php | 2 +- .../Adminhtml/Block/Permissions/Grid/User.php | 2 +- .../Mage/Adminhtml/Block/Permissions/Role.php | 2 +- .../Block/Permissions/Role/Grid/User.php | 2 +- .../Adminhtml/Block/Permissions/Roles.php | 2 +- .../Block/Permissions/Tab/Roleinfo.php | 2 +- .../Block/Permissions/Tab/Rolesedit.php | 2 +- .../Block/Permissions/Tab/Rolesusers.php | 2 +- .../Block/Permissions/Tab/Useredit.php | 2 +- .../Block/Permissions/Tab/Userroles.php | 2 +- .../Mage/Adminhtml/Block/Permissions/User.php | 2 +- .../Adminhtml/Block/Permissions/User/Edit.php | 2 +- .../Block/Permissions/User/Edit/Form.php | 2 +- .../Block/Permissions/User/Edit/Tab/Main.php | 2 +- .../Block/Permissions/User/Edit/Tab/Roles.php | 2 +- .../Block/Permissions/User/Edit/Tabs.php | 2 +- .../Adminhtml/Block/Permissions/User/Grid.php | 2 +- .../Block/Permissions/Usernroles.php | 2 +- .../Adminhtml/Block/Permissions/Users.php | 2 +- .../Mage/Adminhtml/Block/Poll/Answer/Edit.php | 2 +- .../Adminhtml/Block/Poll/Answer/Edit/Form.php | 2 +- .../core/Mage/Adminhtml/Block/Poll/Edit.php | 2 +- .../Mage/Adminhtml/Block/Poll/Edit/Form.php | 2 +- .../Adminhtml/Block/Poll/Edit/Tab/Answers.php | 2 +- .../Block/Poll/Edit/Tab/Answers/Form.php | 2 +- .../Block/Poll/Edit/Tab/Answers/Grid.php | 2 +- .../Block/Poll/Edit/Tab/Answers/List.php | 2 +- .../Adminhtml/Block/Poll/Edit/Tab/Form.php | 2 +- .../Mage/Adminhtml/Block/Poll/Edit/Tabs.php | 2 +- .../core/Mage/Adminhtml/Block/Poll/Grid.php | 2 +- .../core/Mage/Adminhtml/Block/Poll/Poll.php | 2 +- .../Mage/Adminhtml/Block/Promo/Catalog.php | 2 +- .../Adminhtml/Block/Promo/Catalog/Edit.php | 2 +- .../Block/Promo/Catalog/Edit/Form.php | 2 +- .../Adminhtml/Block/Promo/Catalog/Edit/Js.php | 2 +- .../Block/Promo/Catalog/Edit/Tab/Actions.php | 2 +- .../Promo/Catalog/Edit/Tab/Conditions.php | 2 +- .../Block/Promo/Catalog/Edit/Tab/Main.php | 2 +- .../Block/Promo/Catalog/Edit/Tabs.php | 2 +- .../Adminhtml/Block/Promo/Catalog/Grid.php | 2 +- .../core/Mage/Adminhtml/Block/Promo/Quote.php | 2 +- .../Mage/Adminhtml/Block/Promo/Quote/Edit.php | 2 +- .../Adminhtml/Block/Promo/Quote/Edit/Form.php | 2 +- .../Block/Promo/Quote/Edit/Tab/Actions.php | 2 +- .../Block/Promo/Quote/Edit/Tab/Conditions.php | 2 +- .../Block/Promo/Quote/Edit/Tab/Coupons.php | 2 +- .../Promo/Quote/Edit/Tab/Coupons/Form.php | 2 +- .../Promo/Quote/Edit/Tab/Coupons/Grid.php | 2 +- .../Tab/Coupons/Grid/Column/Renderer/Used.php | 2 +- .../Block/Promo/Quote/Edit/Tab/Labels.php | 2 +- .../Block/Promo/Quote/Edit/Tab/Main.php | 3 +- .../Quote/Edit/Tab/Main/Renderer/Checkbox.php | 2 +- .../Adminhtml/Block/Promo/Quote/Edit/Tabs.php | 2 +- .../Mage/Adminhtml/Block/Promo/Quote/Grid.php | 2 +- .../Adminhtml/Block/Promo/Widget/Chooser.php | 2 +- .../Block/Promo/Widget/Chooser/Daterange.php | 2 +- .../Block/Promo/Widget/Chooser/Sku.php | 2 +- .../core/Mage/Adminhtml/Block/Rating/Edit.php | 2 +- .../Mage/Adminhtml/Block/Rating/Edit/Form.php | 2 +- .../Adminhtml/Block/Rating/Edit/Tab/Form.php | 2 +- .../Block/Rating/Edit/Tab/Options.php | 2 +- .../Mage/Adminhtml/Block/Rating/Edit/Tabs.php | 2 +- .../core/Mage/Adminhtml/Block/Rating/Grid.php | 2 +- .../Mage/Adminhtml/Block/Rating/Rating.php | 2 +- .../Report/Config/Form/Field/MtdStart.php | 2 +- .../Report/Config/Form/Field/YtdStart.php | 2 +- .../Block/Report/Customer/Accounts.php | 2 +- .../Block/Report/Customer/Accounts/Grid.php | 2 +- .../Block/Report/Customer/Orders.php | 2 +- .../Block/Report/Customer/Orders/Grid.php | 2 +- .../Block/Report/Customer/Totals.php | 2 +- .../Block/Report/Customer/Totals/Grid.php | 2 +- .../Adminhtml/Block/Report/Filter/Form.php | 2 +- .../core/Mage/Adminhtml/Block/Report/Grid.php | 2 +- .../Adminhtml/Block/Report/Grid/Abstract.php | 2 +- .../Grid/Column/Renderer/Blanknumber.php | 2 +- .../Report/Grid/Column/Renderer/Currency.php | 2 +- .../Report/Grid/Column/Renderer/Customer.php | 2 +- .../Report/Grid/Column/Renderer/Product.php | 2 +- .../Adminhtml/Block/Report/Grid/Shopcart.php | 2 +- .../Mage/Adminhtml/Block/Report/Product.php | 2 +- .../Block/Report/Product/Downloads.php | 2 +- .../Block/Report/Product/Downloads/Grid.php | 2 +- .../Product/Downloads/Renderer/Purchases.php | 2 +- .../Adminhtml/Block/Report/Product/Grid.php | 2 +- .../Block/Report/Product/Lowstock.php | 2 +- .../Block/Report/Product/Lowstock/Grid.php | 2 +- .../Block/Report/Product/Ordered.php | 2 +- .../Block/Report/Product/Ordered/Grid.php | 2 +- .../Adminhtml/Block/Report/Product/Sold.php | 2 +- .../Block/Report/Product/Sold/Grid.php | 2 +- .../Adminhtml/Block/Report/Product/Viewed.php | 2 +- .../Block/Report/Product/Viewed/Grid.php | 2 +- .../Block/Report/Refresh/Statistics.php | 2 +- .../Block/Report/Refresh/Statistics/Grid.php | 2 +- .../Block/Report/Review/Customer.php | 2 +- .../Block/Report/Review/Customer/Grid.php | 2 +- .../Adminhtml/Block/Report/Review/Detail.php | 2 +- .../Block/Report/Review/Detail/Grid.php | 2 +- .../Adminhtml/Block/Report/Review/Product.php | 2 +- .../Block/Report/Review/Product/Grid.php | 2 +- .../Block/Report/Sales/Bestsellers.php | 2 +- .../Block/Report/Sales/Bestsellers/Grid.php | 2 +- .../Adminhtml/Block/Report/Sales/Coupons.php | 2 +- .../Block/Report/Sales/Coupons/Grid.php | 2 +- .../Sales/Grid/Column/Renderer/Date.php | 2 +- .../Adminhtml/Block/Report/Sales/Invoiced.php | 2 +- .../Block/Report/Sales/Invoiced/Grid.php | 2 +- .../Adminhtml/Block/Report/Sales/Refunded.php | 2 +- .../Block/Report/Sales/Refunded/Grid.php | 2 +- .../Adminhtml/Block/Report/Sales/Sales.php | 2 +- .../Block/Report/Sales/Sales/Grid.php | 2 +- .../Adminhtml/Block/Report/Sales/Shipping.php | 2 +- .../Block/Report/Sales/Shipping/Grid.php | 2 +- .../Mage/Adminhtml/Block/Report/Sales/Tax.php | 2 +- .../Adminhtml/Block/Report/Sales/Tax/Grid.php | 2 +- .../Mage/Adminhtml/Block/Report/Search.php | 2 +- .../Adminhtml/Block/Report/Search/Grid.php | 2 +- .../Block/Report/Shopcart/Abandoned.php | 2 +- .../Block/Report/Shopcart/Abandoned/Grid.php | 2 +- .../Block/Report/Shopcart/Customer.php | 2 +- .../Block/Report/Shopcart/Customer/Grid.php | 2 +- .../Block/Report/Shopcart/Product.php | 2 +- .../Block/Report/Shopcart/Product/Grid.php | 2 +- .../Adminhtml/Block/Report/Tag/Customer.php | 2 +- .../Block/Report/Tag/Customer/Detail.php | 2 +- .../Block/Report/Tag/Customer/Detail/Grid.php | 2 +- .../Block/Report/Tag/Customer/Grid.php | 2 +- .../Adminhtml/Block/Report/Tag/Popular.php | 2 +- .../Block/Report/Tag/Popular/Detail.php | 2 +- .../Block/Report/Tag/Popular/Detail/Grid.php | 2 +- .../Block/Report/Tag/Popular/Grid.php | 2 +- .../Adminhtml/Block/Report/Tag/Product.php | 2 +- .../Block/Report/Tag/Product/Detail.php | 2 +- .../Block/Report/Tag/Product/Detail/Grid.php | 2 +- .../Block/Report/Tag/Product/Grid.php | 2 +- .../Mage/Adminhtml/Block/Report/Wishlist.php | 2 +- .../Adminhtml/Block/Report/Wishlist/Grid.php | 2 +- .../core/Mage/Adminhtml/Block/Review/Add.php | 2 +- .../Mage/Adminhtml/Block/Review/Add/Form.php | 2 +- .../core/Mage/Adminhtml/Block/Review/Edit.php | 2 +- .../Mage/Adminhtml/Block/Review/Edit/Form.php | 2 +- .../core/Mage/Adminhtml/Block/Review/Grid.php | 2 +- .../Block/Review/Grid/Filter/Type.php | 2 +- .../Block/Review/Grid/Renderer/Type.php | 2 +- .../core/Mage/Adminhtml/Block/Review/Main.php | 2 +- .../Adminhtml/Block/Review/Product/Grid.php | 2 +- .../Block/Review/Rating/Detailed.php | 2 +- .../Adminhtml/Block/Review/Rating/Summary.php | 2 +- app/code/core/Mage/Adminhtml/Block/Sales.php | 2 +- .../Mage/Adminhtml/Block/Sales/Creditmemo.php | 2 +- .../Adminhtml/Block/Sales/Creditmemo/Grid.php | 2 +- .../Mage/Adminhtml/Block/Sales/Invoice.php | 2 +- .../Adminhtml/Block/Sales/Invoice/Grid.php | 2 +- .../Adminhtml/Block/Sales/Items/Abstract.php | 2 +- .../Block/Sales/Items/Column/Default.php | 2 +- .../Block/Sales/Items/Column/Name.php | 2 +- .../Block/Sales/Items/Column/Name/Grouped.php | 2 +- .../Block/Sales/Items/Column/Qty.php | 2 +- .../Sales/Items/Renderer/Configurable.php | 2 +- .../Block/Sales/Items/Renderer/Default.php | 2 +- .../core/Mage/Adminhtml/Block/Sales/Order.php | 2 +- .../Adminhtml/Block/Sales/Order/Abstract.php | 2 +- .../Adminhtml/Block/Sales/Order/Address.php | 2 +- .../Block/Sales/Order/Address/Form.php | 2 +- .../Block/Sales/Order/Comments/View.php | 2 +- .../Adminhtml/Block/Sales/Order/Create.php | 2 +- .../Block/Sales/Order/Create/Abstract.php | 2 +- .../Sales/Order/Create/Billing/Address.php | 2 +- .../Sales/Order/Create/Billing/Method.php | 2 +- .../Order/Create/Billing/Method/Form.php | 2 +- .../Block/Sales/Order/Create/Comment.php | 2 +- .../Block/Sales/Order/Create/Coupons.php | 2 +- .../Block/Sales/Order/Create/Coupons/Form.php | 2 +- .../Block/Sales/Order/Create/Customer.php | 2 +- .../Sales/Order/Create/Customer/Grid.php | 2 +- .../Block/Sales/Order/Create/Data.php | 2 +- .../Block/Sales/Order/Create/Form.php | 2 +- .../Sales/Order/Create/Form/Abstract.php | 2 +- .../Block/Sales/Order/Create/Form/Account.php | 2 +- .../Block/Sales/Order/Create/Form/Address.php | 2 +- .../Block/Sales/Order/Create/Giftmessage.php | 2 +- .../Sales/Order/Create/Giftmessage/Form.php | 2 +- .../Block/Sales/Order/Create/Header.php | 2 +- .../Block/Sales/Order/Create/Items.php | 2 +- .../Block/Sales/Order/Create/Items/Grid.php | 2 +- .../Block/Sales/Order/Create/Load.php | 2 +- .../Block/Sales/Order/Create/Messages.php | 2 +- .../Block/Sales/Order/Create/Newsletter.php | 2 +- .../Sales/Order/Create/Newsletter/Form.php | 2 +- .../Block/Sales/Order/Create/Search.php | 2 +- .../Block/Sales/Order/Create/Search/Grid.php | 2 +- .../Search/Grid/Renderer/Giftmessage.php | 2 +- .../Create/Search/Grid/Renderer/Price.php | 2 +- .../Create/Search/Grid/Renderer/Product.php | 2 +- .../Order/Create/Search/Grid/Renderer/Qty.php | 2 +- .../Sales/Order/Create/Shipping/Address.php | 2 +- .../Sales/Order/Create/Shipping/Method.php | 2 +- .../Order/Create/Shipping/Method/Form.php | 2 +- .../Block/Sales/Order/Create/Sidebar.php | 2 +- .../Sales/Order/Create/Sidebar/Abstract.php | 2 +- .../Block/Sales/Order/Create/Sidebar/Cart.php | 2 +- .../Sales/Order/Create/Sidebar/Compared.php | 2 +- .../Sales/Order/Create/Sidebar/Pcompared.php | 2 +- .../Sales/Order/Create/Sidebar/Pviewed.php | 2 +- .../Sales/Order/Create/Sidebar/Reorder.php | 2 +- .../Sales/Order/Create/Sidebar/Viewed.php | 2 +- .../Sales/Order/Create/Sidebar/Wishlist.php | 2 +- .../Block/Sales/Order/Create/Store.php | 2 +- .../Block/Sales/Order/Create/Store/Select.php | 2 +- .../Block/Sales/Order/Create/Totals.php | 2 +- .../Sales/Order/Create/Totals/Default.php | 2 +- .../Sales/Order/Create/Totals/Discount.php | 2 +- .../Sales/Order/Create/Totals/Grandtotal.php | 2 +- .../Sales/Order/Create/Totals/Shipping.php | 2 +- .../Sales/Order/Create/Totals/Subtotal.php | 24 +- .../Block/Sales/Order/Create/Totals/Table.php | 2 +- .../Block/Sales/Order/Create/Totals/Tax.php | 2 +- .../Block/Sales/Order/Creditmemo/Create.php | 2 +- .../Order/Creditmemo/Create/Adjustments.php | 2 +- .../Sales/Order/Creditmemo/Create/Form.php | 2 +- .../Sales/Order/Creditmemo/Create/Items.php | 2 +- .../Block/Sales/Order/Creditmemo/Totals.php | 2 +- .../Block/Sales/Order/Creditmemo/View.php | 2 +- .../Sales/Order/Creditmemo/View/Comments.php | 2 +- .../Sales/Order/Creditmemo/View/Form.php | 2 +- .../Sales/Order/Creditmemo/View/Items.php | 2 +- .../Mage/Adminhtml/Block/Sales/Order/Grid.php | 5 +- .../Block/Sales/Order/Invoice/Create.php | 2 +- .../Block/Sales/Order/Invoice/Create/Form.php | 2 +- .../Sales/Order/Invoice/Create/Items.php | 2 +- .../Sales/Order/Invoice/Create/Tracking.php | 2 +- .../Block/Sales/Order/Invoice/Totals.php | 2 +- .../Block/Sales/Order/Invoice/View.php | 2 +- .../Sales/Order/Invoice/View/Comments.php | 2 +- .../Block/Sales/Order/Invoice/View/Form.php | 2 +- .../Block/Sales/Order/Invoice/View/Items.php | 2 +- .../Adminhtml/Block/Sales/Order/Payment.php | 2 +- .../Block/Sales/Order/Shipment/Create.php | 2 +- .../Sales/Order/Shipment/Create/Form.php | 2 +- .../Sales/Order/Shipment/Create/Items.php | 2 +- .../Sales/Order/Shipment/Create/Tracking.php | 2 +- .../Block/Sales/Order/Shipment/Packaging.php | 2 +- .../Sales/Order/Shipment/Packaging/Grid.php | 2 +- .../Sales/Order/Shipment/Tracking/Info.php | 2 +- .../Block/Sales/Order/Shipment/View.php | 2 +- .../Sales/Order/Shipment/View/Comments.php | 2 +- .../Block/Sales/Order/Shipment/View/Form.php | 2 +- .../Block/Sales/Order/Shipment/View/Items.php | 2 +- .../Sales/Order/Shipment/View/Tracking.php | 2 +- .../Adminhtml/Block/Sales/Order/Status.php | 2 +- .../Block/Sales/Order/Status/Assign.php | 2 +- .../Block/Sales/Order/Status/Assign/Form.php | 2 +- .../Block/Sales/Order/Status/Edit.php | 2 +- .../Block/Sales/Order/Status/Edit/Form.php | 2 +- .../Block/Sales/Order/Status/Grid.php | 2 +- .../Block/Sales/Order/Status/New.php | 2 +- .../Block/Sales/Order/Status/New/Form.php | 2 +- .../Adminhtml/Block/Sales/Order/Totalbar.php | 2 +- .../Adminhtml/Block/Sales/Order/Totals.php | 2 +- .../Block/Sales/Order/Totals/Item.php | 2 +- .../Block/Sales/Order/Totals/Tax.php | 2 +- .../Mage/Adminhtml/Block/Sales/Order/View.php | 2 +- .../Adminhtml/Block/Sales/Order/View/Form.php | 2 +- .../Block/Sales/Order/View/Giftmessage.php | 2 +- .../Block/Sales/Order/View/History.php | 2 +- .../Adminhtml/Block/Sales/Order/View/Info.php | 2 +- .../Block/Sales/Order/View/Items.php | 2 +- .../Order/View/Items/Renderer/Default.php | 2 +- .../Block/Sales/Order/View/Messages.php | 2 +- .../Sales/Order/View/Tab/Creditmemos.php | 2 +- .../Block/Sales/Order/View/Tab/History.php | 2 +- .../Block/Sales/Order/View/Tab/Info.php | 2 +- .../Block/Sales/Order/View/Tab/Invoices.php | 2 +- .../Block/Sales/Order/View/Tab/Shipments.php | 2 +- .../Sales/Order/View/Tab/Transactions.php | 2 +- .../Adminhtml/Block/Sales/Order/View/Tabs.php | 2 +- .../Block/Sales/Reorder/Renderer/Action.php | 2 +- .../Mage/Adminhtml/Block/Sales/Shipment.php | 2 +- .../Adminhtml/Block/Sales/Shipment/Grid.php | 2 +- .../Mage/Adminhtml/Block/Sales/Totals.php | 2 +- .../Adminhtml/Block/Sales/Transactions.php | 2 +- .../Block/Sales/Transactions/Child/Grid.php | 2 +- .../Block/Sales/Transactions/Detail.php | 2 +- .../Block/Sales/Transactions/Detail/Grid.php | 2 +- .../Block/Sales/Transactions/Grid.php | 2 +- .../Block/Shipping/Carrier/Tablerate/Grid.php | 2 +- .../core/Mage/Adminhtml/Block/Sitemap.php | 2 +- .../Mage/Adminhtml/Block/Sitemap/Edit.php | 2 +- .../Adminhtml/Block/Sitemap/Edit/Form.php | 2 +- .../Mage/Adminhtml/Block/Sitemap/Grid.php | 2 +- .../Block/Sitemap/Grid/Renderer/Action.php | 2 +- .../Block/Sitemap/Grid/Renderer/Link.php | 2 +- .../Block/Sitemap/Grid/Renderer/Time.php | 2 +- .../Mage/Adminhtml/Block/Store/Switcher.php | 2 +- .../Store/Switcher/Form/Renderer/Fieldset.php | 2 +- .../Form/Renderer/Fieldset/Element.php | 2 +- .../Adminhtml/Block/System/Account/Edit.php | 2 +- .../Block/System/Account/Edit/Form.php | 2 +- .../Adminhtml/Block/System/Cache/Edit.php | 2 +- .../Adminhtml/Block/System/Cache/Form.php | 2 +- .../Adminhtml/Block/System/Config/Dwstree.php | 2 +- .../Adminhtml/Block/System/Config/Edit.php | 2 +- .../Adminhtml/Block/System/Config/Form.php | 2 +- .../Block/System/Config/Form/Field.php | 2 +- .../Config/Form/Field/Array/Abstract.php | 2 +- .../System/Config/Form/Field/Datetime.php | 2 +- .../Block/System/Config/Form/Field/Export.php | 2 +- .../Block/System/Config/Form/Field/File.php | 2 +- .../System/Config/Form/Field/Heading.php | 2 +- .../Block/System/Config/Form/Field/Image.php | 2 +- .../Block/System/Config/Form/Field/Import.php | 2 +- .../System/Config/Form/Field/Notification.php | 2 +- .../Config/Form/Field/Regexceptions.php | 2 +- .../Form/Field/Select/Allowspecific.php | 2 +- .../Config/Form/Field/Select/Flatcatalog.php | 2 +- .../Config/Form/Field/Select/Flatproduct.php | 2 +- .../Block/System/Config/Form/Fieldset.php | 2 +- .../Form/Fieldset/Modules/DisableOutput.php | 2 +- .../Config/Form/Fieldset/Order/Statuses.php | 2 +- .../Block/System/Config/Switcher.php | 2 +- .../System/Storage/Media/Synchronize.php | 2 +- .../Adminhtml/Block/System/Config/Tabs.php | 2 +- .../Adminhtml/Block/System/Convert/Gui.php | 2 +- .../Block/System/Convert/Gui/Edit.php | 2 +- .../Block/System/Convert/Gui/Edit/Form.php | 2 +- .../System/Convert/Gui/Edit/Tab/Upload.php | 2 +- .../System/Convert/Gui/Edit/Tab/View.php | 2 +- .../System/Convert/Gui/Edit/Tab/Wizard.php | 2 +- .../Block/System/Convert/Gui/Edit/Tabs.php | 2 +- .../Block/System/Convert/Gui/Grid.php | 2 +- .../Block/System/Convert/Profile.php | 2 +- .../Block/System/Convert/Profile/Edit.php | 2 +- .../Convert/Profile/Edit/Filter/Action.php | 2 +- .../System/Convert/Profile/Edit/Form.php | 2 +- .../Convert/Profile/Edit/Renderer/Action.php | 2 +- .../System/Convert/Profile/Edit/Tab/Edit.php | 2 +- .../Convert/Profile/Edit/Tab/History.php | 2 +- .../System/Convert/Profile/Edit/Tab/Run.php | 2 +- .../System/Convert/Profile/Edit/Tabs.php | 2 +- .../Block/System/Convert/Profile/Grid.php | 2 +- .../Block/System/Convert/Profile/Run.php | 2 +- .../Mage/Adminhtml/Block/System/Currency.php | 2 +- .../Block/System/Currency/Edit/Form.php | 2 +- .../Block/System/Currency/Edit/Tab/Main.php | 2 +- .../Block/System/Currency/Edit/Tab/Rates.php | 2 +- .../Block/System/Currency/Edit/Tabs.php | 2 +- .../Block/System/Currency/Rate/Matrix.php | 2 +- .../Block/System/Currency/Rate/Services.php | 2 +- .../Mage/Adminhtml/Block/System/Design.php | 2 +- .../Adminhtml/Block/System/Design/Edit.php | 2 +- .../Block/System/Design/Edit/Tab/General.php | 2 +- .../Block/System/Design/Edit/Tabs.php | 2 +- .../Adminhtml/Block/System/Design/Grid.php | 2 +- .../Adminhtml/Block/System/Email/Template.php | 2 +- .../Block/System/Email/Template/Edit.php | 2 +- .../Block/System/Email/Template/Edit/Form.php | 2 +- .../Block/System/Email/Template/Grid.php | 2 +- .../Email/Template/Grid/Filter/Type.php | 2 +- .../Email/Template/Grid/Renderer/Action.php | 2 +- .../Email/Template/Grid/Renderer/Sender.php | 2 +- .../Email/Template/Grid/Renderer/Type.php | 2 +- .../Block/System/Email/Template/Preview.php | 2 +- .../Adminhtml/Block/System/Store/Delete.php | 2 +- .../Block/System/Store/Delete/Form.php | 2 +- .../Block/System/Store/Delete/Group.php | 2 +- .../Block/System/Store/Delete/Website.php | 2 +- .../Adminhtml/Block/System/Store/Edit.php | 2 +- .../Block/System/Store/Edit/Form.php | 2 +- .../Adminhtml/Block/System/Store/Grid.php | 2 +- .../Block/System/Store/Grid/Render/Group.php | 2 +- .../Block/System/Store/Grid/Render/Store.php | 2 +- .../System/Store/Grid/Render/Website.php | 2 +- .../Adminhtml/Block/System/Store/Store.php | 2 +- .../Adminhtml/Block/System/Store/Tree.php | 2 +- .../Mage/Adminhtml/Block/System/Variable.php | 2 +- .../Adminhtml/Block/System/Variable/Edit.php | 2 +- .../Block/System/Variable/Edit/Form.php | 2 +- .../Adminhtml/Block/System/Variable/Grid.php | 2 +- app/code/core/Mage/Adminhtml/Block/Tag.php | 2 +- .../Adminhtml/Block/Tag/Assigned/Grid.php | 2 +- .../Mage/Adminhtml/Block/Tag/Customer.php | 2 +- .../Adminhtml/Block/Tag/Customer/Grid.php | 2 +- .../core/Mage/Adminhtml/Block/Tag/Edit.php | 2 +- .../Adminhtml/Block/Tag/Edit/Accordion.php | 2 +- .../Adminhtml/Block/Tag/Edit/Assigned.php | 2 +- .../Mage/Adminhtml/Block/Tag/Edit/Form.php | 2 +- .../Mage/Adminhtml/Block/Tag/Grid/All.php | 2 +- .../Adminhtml/Block/Tag/Grid/Customers.php | 2 +- .../Mage/Adminhtml/Block/Tag/Grid/Pending.php | 2 +- .../Adminhtml/Block/Tag/Grid/Products.php | 2 +- .../core/Mage/Adminhtml/Block/Tag/Pending.php | 2 +- .../core/Mage/Adminhtml/Block/Tag/Product.php | 2 +- .../Mage/Adminhtml/Block/Tag/Product/Grid.php | 2 +- .../Adminhtml/Block/Tag/Store/Switcher.php | 2 +- .../core/Mage/Adminhtml/Block/Tag/Tag.php | 2 +- .../Mage/Adminhtml/Block/Tag/Tag/Edit.php | 2 +- .../Adminhtml/Block/Tag/Tag/Edit/Form.php | 2 +- .../Mage/Adminhtml/Block/Tag/Tag/Grid.php | 2 +- .../core/Mage/Adminhtml/Block/Tax/Class.php | 2 +- .../Mage/Adminhtml/Block/Tax/Class/Edit.php | 2 +- .../Adminhtml/Block/Tax/Class/Edit/Form.php | 2 +- .../Mage/Adminhtml/Block/Tax/Class/Grid.php | 2 +- .../Mage/Adminhtml/Block/Tax/Rate/Form.php | 2 +- .../Mage/Adminhtml/Block/Tax/Rate/Grid.php | 2 +- .../Block/Tax/Rate/Grid/Renderer/Country.php | 2 +- .../Block/Tax/Rate/Grid/Renderer/Data.php | 2 +- .../Adminhtml/Block/Tax/Rate/ImportExport.php | 2 +- .../Mage/Adminhtml/Block/Tax/Rate/Title.php | 2 +- .../Block/Tax/Rate/Title/Fieldset.php | 2 +- .../Adminhtml/Block/Tax/Rate/Toolbar/Add.php | 2 +- .../Adminhtml/Block/Tax/Rate/Toolbar/Save.php | 2 +- .../core/Mage/Adminhtml/Block/Tax/Rule.php | 2 +- .../Mage/Adminhtml/Block/Tax/Rule/Edit.php | 2 +- .../Adminhtml/Block/Tax/Rule/Edit/Form.php | 2 +- .../Mage/Adminhtml/Block/Tax/Rule/Grid.php | 2 +- .../core/Mage/Adminhtml/Block/Template.php | 2 +- .../core/Mage/Adminhtml/Block/Text/List.php | 2 +- .../core/Mage/Adminhtml/Block/Urlrewrite.php | 2 +- .../Block/Urlrewrite/Category/Tree.php | 2 +- .../Mage/Adminhtml/Block/Urlrewrite/Edit.php | 2 +- .../Adminhtml/Block/Urlrewrite/Edit/Form.php | 2 +- .../Mage/Adminhtml/Block/Urlrewrite/Grid.php | 2 +- .../Mage/Adminhtml/Block/Urlrewrite/Link.php | 2 +- .../Block/Urlrewrite/Product/Grid.php | 2 +- .../Adminhtml/Block/Urlrewrite/Selector.php | 2 +- app/code/core/Mage/Adminhtml/Block/Widget.php | 2 +- .../Mage/Adminhtml/Block/Widget/Accordion.php | 2 +- .../Adminhtml/Block/Widget/Accordion/Item.php | 2 +- .../Adminhtml/Block/Widget/Breadcrumbs.php | 2 +- .../Mage/Adminhtml/Block/Widget/Button.php | 2 +- .../Mage/Adminhtml/Block/Widget/Container.php | 2 +- .../core/Mage/Adminhtml/Block/Widget/Form.php | 2 +- .../Adminhtml/Block/Widget/Form/Container.php | 2 +- .../Adminhtml/Block/Widget/Form/Element.php | 2 +- .../Block/Widget/Form/Element/Dependence.php | 2 +- .../Block/Widget/Form/Element/Gallery.php | 2 +- .../Block/Widget/Form/Renderer/Element.php | 2 +- .../Block/Widget/Form/Renderer/Fieldset.php | 2 +- .../Widget/Form/Renderer/Fieldset/Element.php | 2 +- .../core/Mage/Adminhtml/Block/Widget/Grid.php | 2 +- .../Adminhtml/Block/Widget/Grid/Block.php | 2 +- .../Adminhtml/Block/Widget/Grid/Column.php | 2 +- .../Widget/Grid/Column/Filter/Abstract.php | 2 +- .../Widget/Grid/Column/Filter/Checkbox.php | 2 +- .../Widget/Grid/Column/Filter/Country.php | 2 +- .../Block/Widget/Grid/Column/Filter/Date.php | 2 +- .../Widget/Grid/Column/Filter/Datetime.php | 2 +- .../Widget/Grid/Column/Filter/Interface.php | 2 +- .../Widget/Grid/Column/Filter/Massaction.php | 2 +- .../Block/Widget/Grid/Column/Filter/Price.php | 2 +- .../Block/Widget/Grid/Column/Filter/Radio.php | 2 +- .../Block/Widget/Grid/Column/Filter/Range.php | 2 +- .../Widget/Grid/Column/Filter/Select.php | 2 +- .../Block/Widget/Grid/Column/Filter/Store.php | 2 +- .../Block/Widget/Grid/Column/Filter/Text.php | 2 +- .../Block/Widget/Grid/Column/Filter/Theme.php | 2 +- .../Widget/Grid/Column/Renderer/Abstract.php | 2 +- .../Widget/Grid/Column/Renderer/Action.php | 2 +- .../Widget/Grid/Column/Renderer/Checkbox.php | 2 +- .../Widget/Grid/Column/Renderer/Concat.php | 2 +- .../Widget/Grid/Column/Renderer/Country.php | 2 +- .../Widget/Grid/Column/Renderer/Currency.php | 2 +- .../Widget/Grid/Column/Renderer/Date.php | 2 +- .../Widget/Grid/Column/Renderer/Datetime.php | 2 +- .../Widget/Grid/Column/Renderer/Input.php | 2 +- .../Widget/Grid/Column/Renderer/Interface.php | 2 +- .../Block/Widget/Grid/Column/Renderer/Ip.php | 2 +- .../Widget/Grid/Column/Renderer/Longtext.php | 2 +- .../Grid/Column/Renderer/Massaction.php | 2 +- .../Widget/Grid/Column/Renderer/Number.php | 2 +- .../Widget/Grid/Column/Renderer/Options.php | 2 +- .../Widget/Grid/Column/Renderer/Price.php | 2 +- .../Widget/Grid/Column/Renderer/Radio.php | 2 +- .../Widget/Grid/Column/Renderer/Select.php | 2 +- .../Widget/Grid/Column/Renderer/Store.php | 2 +- .../Widget/Grid/Column/Renderer/Text.php | 2 +- .../Widget/Grid/Column/Renderer/Theme.php | 2 +- .../Widget/Grid/Column/Renderer/Wrapline.php | 2 +- .../Adminhtml/Block/Widget/Grid/Container.php | 2 +- .../Block/Widget/Grid/Massaction.php | 2 +- .../Block/Widget/Grid/Massaction/Abstract.php | 2 +- .../Block/Widget/Grid/Massaction/Item.php | 2 +- .../Massaction/Item/Additional/Default.php | 2 +- .../Massaction/Item/Additional/Interface.php | 2 +- .../Block/Widget/Grid/Serializer.php | 2 +- .../Adminhtml/Block/Widget/Tab/Interface.php | 2 +- .../core/Mage/Adminhtml/Block/Widget/Tabs.php | 2 +- .../core/Mage/Adminhtml/Block/Widget/Tree.php | 2 +- .../Adminhtml/Block/Widget/View/Container.php | 2 +- .../core/Mage/Adminhtml/Controller/Action.php | 2 +- .../Adminhtml/Controller/Report/Abstract.php | 2 +- .../Adminhtml/Controller/Sales/Creditmemo.php | 2 +- .../Adminhtml/Controller/Sales/Invoice.php | 2 +- .../Adminhtml/Controller/Sales/Shipment.php | 2 +- app/code/core/Mage/Adminhtml/Exception.php | 2 +- .../core/Mage/Adminhtml/Helper/Addresses.php | 2 +- .../core/Mage/Adminhtml/Helper/Catalog.php | 2 +- .../Helper/Catalog/Product/Composite.php | 2 +- .../Catalog/Product/Edit/Action/Attribute.php | 2 +- .../Adminhtml/Helper/Dashboard/Abstract.php | 2 +- .../Mage/Adminhtml/Helper/Dashboard/Data.php | 2 +- .../Mage/Adminhtml/Helper/Dashboard/Order.php | 2 +- app/code/core/Mage/Adminhtml/Helper/Data.php | 2 +- app/code/core/Mage/Adminhtml/Helper/Js.php | 2 +- .../core/Mage/Adminhtml/Helper/Media/Js.php | 2 +- app/code/core/Mage/Adminhtml/Helper/Rss.php | 2 +- app/code/core/Mage/Adminhtml/Helper/Sales.php | 2 +- app/code/core/Mage/Adminhtml/Model/Config.php | 2 +- .../core/Mage/Adminhtml/Model/Config/Data.php | 2 +- .../Model/Customer/Renderer/Region.php | 2 +- .../Mage/Adminhtml/Model/Email/Template.php | 2 +- .../core/Mage/Adminhtml/Model/Extension.php | 2 +- .../Mage/Adminhtml/Model/Giftmessage/Save.php | 2 +- .../Model/LayoutUpdate/Validator.php | 2 +- .../Model/Newsletter/Renderer/Text.php | 2 +- .../core/Mage/Adminhtml/Model/Observer.php | 2 +- .../core/Mage/Adminhtml/Model/Report/Item.php | 2 +- .../core/Mage/Adminhtml/Model/Sales/Order.php | 2 +- .../Adminhtml/Model/Sales/Order/Create.php | 2 +- .../Adminhtml/Model/Sales/Order/Random.php | 2 +- .../Mage/Adminhtml/Model/Search/Catalog.php | 2 +- .../Mage/Adminhtml/Model/Search/Customer.php | 2 +- .../Mage/Adminhtml/Model/Search/Order.php | 2 +- .../core/Mage/Adminhtml/Model/Session.php | 2 +- .../Mage/Adminhtml/Model/Session/Quote.php | 2 +- .../System/Config/Backend/Admin/Custom.php | 2 +- .../Config/Backend/Admin/Custompath.php | 2 +- .../System/Config/Backend/Admin/Observer.php | 2 +- .../Admin/Password/Link/Expirationperiod.php | 2 +- .../System/Config/Backend/Admin/Usecustom.php | 2 +- .../Config/Backend/Admin/Usecustompath.php | 2 +- .../Config/Backend/Admin/Usesecretkey.php | 2 +- .../Model/System/Config/Backend/Baseurl.php | 2 +- .../Model/System/Config/Backend/Cache.php | 2 +- .../Backend/Catalog/Inventory/Managestock.php | 30 +- .../Config/Backend/Catalog/Search/Type.php | 2 +- .../Model/System/Config/Backend/Category.php | 2 +- .../Model/System/Config/Backend/Cookie.php | 2 +- .../Config/Backend/Currency/Abstract.php | 2 +- .../System/Config/Backend/Currency/Allow.php | 2 +- .../System/Config/Backend/Currency/Base.php | 2 +- .../System/Config/Backend/Currency/Cron.php | 2 +- .../Config/Backend/Currency/Default.php | 2 +- .../Backend/Customer/Address/Street.php | 2 +- .../Password/Link/Expirationperiod.php | 2 +- .../Config/Backend/Customer/Show/Address.php | 2 +- .../Config/Backend/Customer/Show/Customer.php | 2 +- .../Model/System/Config/Backend/Datashare.php | 2 +- .../Config/Backend/Design/Exception.php | 2 +- .../System/Config/Backend/Design/Package.php | 2 +- .../System/Config/Backend/Email/Address.php | 2 +- .../System/Config/Backend/Email/Logo.php | 2 +- .../System/Config/Backend/Email/Sender.php | 2 +- .../Model/System/Config/Backend/Encrypted.php | 2 +- .../Model/System/Config/Backend/File.php | 2 +- .../Model/System/Config/Backend/Filename.php | 2 +- .../Model/System/Config/Backend/Image.php | 2 +- .../System/Config/Backend/Image/Favicon.php | 2 +- .../Model/System/Config/Backend/Image/Pdf.php | 2 +- .../System/Config/Backend/Layer/Children.php | 2 +- .../Model/System/Config/Backend/Locale.php | 2 +- .../System/Config/Backend/Locale/Timezone.php | 2 +- .../Model/System/Config/Backend/Log/Cron.php | 2 +- .../System/Config/Backend/Price/Scope.php | 2 +- .../Config/Backend/Product/Alert/Cron.php | 2 +- .../Model/System/Config/Backend/Secure.php | 2 +- .../System/Config/Backend/Seo/Product.php | 2 +- .../System/Config/Backend/Serialized.php | 2 +- .../Config/Backend/Serialized/Array.php | 2 +- .../Config/Backend/Shipping/Tablerate.php | 2 +- .../Model/System/Config/Backend/Sitemap.php | 2 +- .../System/Config/Backend/Sitemap/Cron.php | 2 +- .../Config/Backend/Storage/Media/Database.php | 2 +- .../Model/System/Config/Backend/Store.php | 2 +- .../Model/System/Config/Backend/Translate.php | 2 +- .../Model/System/Config/Clone/Media/Image.php | 2 +- .../Model/System/Config/Source/Admin/Page.php | 2 +- .../Model/System/Config/Source/Allregion.php | 2 +- .../Config/Source/Catalog/GridPerPage.php | 2 +- .../System/Config/Source/Catalog/ListMode.php | 2 +- .../Config/Source/Catalog/ListPerPage.php | 2 +- .../System/Config/Source/Catalog/ListSort.php | 2 +- .../Config/Source/Catalog/Search/Type.php | 2 +- .../Config/Source/Catalog/TimeFormat.php | 2 +- .../Model/System/Config/Source/Category.php | 2 +- .../Model/System/Config/Source/Checktype.php | 2 +- .../Model/System/Config/Source/Cms/Page.php | 2 +- .../Config/Source/Cms/Wysiwyg/Enabled.php | 2 +- .../Model/System/Config/Source/Country.php | 2 +- .../System/Config/Source/Country/Full.php | 2 +- .../System/Config/Source/Cron/Frequency.php | 2 +- .../Model/System/Config/Source/Currency.php | 2 +- .../System/Config/Source/Currency/Service.php | 2 +- .../Config/Source/Customer/Address/Type.php | 2 +- .../System/Config/Source/Customer/Group.php | 2 +- .../Source/Customer/Group/Multiselect.php | 2 +- .../Model/System/Config/Source/Date/Short.php | 2 +- .../System/Config/Source/Design/Package.php | 2 +- .../System/Config/Source/Design/Robots.php | 2 +- .../System/Config/Source/Dev/Dbautoup.php | 2 +- .../System/Config/Source/Email/Identity.php | 2 +- .../System/Config/Source/Email/Method.php | 2 +- .../System/Config/Source/Email/Smtpauth.php | 2 +- .../System/Config/Source/Email/Template.php | 2 +- .../System/Config/Source/Enabledisable.php | 2 +- .../Model/System/Config/Source/Frequency.php | 2 +- .../Model/System/Config/Source/Language.php | 2 +- .../Model/System/Config/Source/Locale.php | 2 +- .../System/Config/Source/Locale/Country.php | 2 +- .../System/Config/Source/Locale/Currency.php | 2 +- .../Config/Source/Locale/Currency/All.php | 2 +- .../System/Config/Source/Locale/Timezone.php | 2 +- .../Config/Source/Locale/Weekdaycodes.php | 2 +- .../System/Config/Source/Locale/Weekdays.php | 2 +- .../Model/System/Config/Source/Nooptreq.php | 2 +- .../Config/Source/Notification/Frequency.php | 2 +- .../System/Config/Source/Order/Status.php | 2 +- .../System/Config/Source/Order/Status/New.php | 2 +- .../Source/Order/Status/Newprocessing.php | 2 +- .../Config/Source/Order/Status/Processing.php | 2 +- .../Config/Source/Payment/Allmethods.php | 2 +- .../Config/Source/Payment/Allowedmethods.php | 2 +- .../Source/Payment/Allspecificcountries.php | 2 +- .../System/Config/Source/Payment/Cctype.php | 2 +- .../System/Config/Source/Price/Scope.php | 2 +- .../Model/System/Config/Source/Price/Step.php | 2 +- .../Config/Source/Product/Options/Price.php | 2 +- .../Config/Source/Product/Options/Type.php | 2 +- .../Config/Source/Product/Thumbnail.php | 2 +- .../System/Config/Source/Reports/Scope.php | 2 +- .../Config/Source/Security/Domainpolicy.php | 58 - .../Config/Source/Shipping/Allmethods.php | 2 +- .../Config/Source/Shipping/Allowedmethods.php | 2 +- .../Source/Shipping/Allspecificcountries.php | 2 +- .../Config/Source/Shipping/Flatrate.php | 2 +- .../Config/Source/Shipping/Tablerate.php | 2 +- .../Config/Source/Shipping/Taxclass.php | 2 +- .../Config/Source/Storage/Media/Database.php | 2 +- .../Config/Source/Storage/Media/Storage.php | 2 +- .../Model/System/Config/Source/Store.php | 2 +- .../System/Config/Source/Tax/Apply/On.php | 2 +- .../System/Config/Source/Tax/Basedon.php | 2 +- .../System/Config/Source/Tax/Catalog.php | 2 +- .../Config/Source/Watermark/Position.php | 2 +- .../System/Config/Source/Web/Protocol.php | 2 +- .../System/Config/Source/Web/Redirect.php | 2 +- .../Model/System/Config/Source/Website.php | 2 +- .../Model/System/Config/Source/Yesno.php | 2 +- .../System/Config/Source/Yesnocustom.php | 2 +- .../Mage/Adminhtml/Model/System/Store.php | 2 +- app/code/core/Mage/Adminhtml/Model/Url.php | 2 +- .../Adminhtml/controllers/AjaxController.php | 2 +- .../controllers/Api/RoleController.php | 2 +- .../controllers/Api/UserController.php | 2 +- .../Adminhtml/controllers/CacheController.php | 2 +- .../Catalog/Category/WidgetController.php | 2 +- .../Catalog/CategoryController.php | 8 +- .../Product/Action/AttributeController.php | 11 +- .../Catalog/Product/AttributeController.php | 8 +- .../Catalog/Product/DatafeedsController.php | 2 +- .../Catalog/Product/GalleryController.php | 2 +- .../Catalog/Product/GroupController.php | 2 +- .../Catalog/Product/ReviewController.php | 2 +- .../Catalog/Product/SetController.php | 2 +- .../Catalog/Product/WidgetController.php | 2 +- .../controllers/Catalog/ProductController.php | 2 +- .../controllers/Catalog/SearchController.php | 2 +- .../controllers/CatalogController.php | 2 +- .../Checkout/AgreementController.php | 2 +- .../Cms/Block/WidgetController.php | 2 +- .../controllers/Cms/BlockController.php | 2 +- .../controllers/Cms/Page/WidgetController.php | 2 +- .../controllers/Cms/PageController.php | 2 +- .../Cms/Wysiwyg/ImagesController.php | 2 +- .../controllers/Cms/WysiwygController.php | 6 +- .../Cart/Product/Composite/CartController.php | 2 +- .../controllers/Customer/ConfigController.php | 2 +- .../controllers/Customer/GroupController.php | 2 +- .../controllers/Customer/OnlineController.php | 2 +- .../System/Config/ValidatevatController.php | 2 +- .../Product/Composite/WishlistController.php | 2 +- .../controllers/CustomerController.php | 2 +- .../controllers/DashboardController.php | 2 +- .../Adminhtml/controllers/IndexController.php | 2 +- .../Adminhtml/controllers/JsonController.php | 2 +- .../controllers/Media/EditorController.php | 2 +- .../controllers/Media/UploaderController.php | 2 +- .../Newsletter/ProblemController.php | 2 +- .../Newsletter/QueueController.php | 11 +- .../Newsletter/SubscriberController.php | 2 +- .../Newsletter/TemplateController.php | 4 +- .../controllers/NotificationController.php | 2 +- .../Permissions/RoleController.php | 2 +- .../Permissions/UserController.php | 2 +- .../controllers/Poll/AnswerController.php | 2 +- .../Adminhtml/controllers/PollController.php | 2 +- .../controllers/Promo/CatalogController.php | 2 +- .../controllers/Promo/QuoteController.php | 2 +- .../controllers/Promo/WidgetController.php | 2 +- .../Adminhtml/controllers/PromoController.php | 2 +- .../controllers/RatingController.php | 2 +- .../controllers/Report/CustomerController.php | 2 +- .../controllers/Report/ProductController.php | 2 +- .../controllers/Report/ReviewController.php | 2 +- .../controllers/Report/SalesController.php | 2 +- .../controllers/Report/ShopcartController.php | 2 +- .../Report/StatisticsController.php | 2 +- .../controllers/Report/TagController.php | 2 +- .../controllers/ReportController.php | 2 +- .../controllers/Rss/CatalogController.php | 2 +- .../controllers/Rss/OrderController.php | 2 +- .../Sales/Billing/AgreementController.php | 2 +- .../Sales/CreditmemoController.php | 2 +- .../controllers/Sales/InvoiceController.php | 2 +- .../Sales/Order/CreateController.php | 2 +- .../Sales/Order/CreditmemoController.php | 4 +- .../Sales/Order/EditController.php | 2 +- .../Sales/Order/InvoiceController.php | 2 +- .../Sales/Order/ShipmentController.php | 2 +- .../Sales/Order/StatusController.php | 2 +- .../Order/View/GiftmessageController.php | 2 +- .../controllers/Sales/OrderController.php | 2 +- .../Sales/Recurring/ProfileController.php | 2 +- .../controllers/Sales/ShipmentController.php | 2 +- .../Sales/TransactionsController.php | 2 +- .../Adminhtml/controllers/SalesController.php | 2 +- .../controllers/SitemapController.php | 2 +- .../controllers/SurveyController.php | 2 +- .../controllers/System/AccountController.php | 2 +- .../controllers/System/BackupController.php | 2 +- .../controllers/System/CacheController.php | 2 +- .../Config/System/StorageController.php | 2 +- .../controllers/System/ConfigController.php | 2 +- .../System/Convert/GuiController.php | 2 +- .../System/Convert/ProfileController.php | 2 +- .../controllers/System/CurrencyController.php | 2 +- .../controllers/System/DesignController.php | 2 +- .../System/Email/TemplateController.php | 2 +- .../controllers/System/StoreController.php | 2 +- .../controllers/System/VariableController.php | 2 +- .../controllers/SystemController.php | 2 +- .../Adminhtml/controllers/TagController.php | 2 +- .../Tax/Class/CustomerController.php | 2 +- .../Tax/Class/ProductController.php | 2 +- .../controllers/Tax/ClassController.php | 2 +- .../controllers/Tax/RateController.php | 2 +- .../controllers/Tax/RuleController.php | 2 +- .../Adminhtml/controllers/TaxController.php | 2 +- .../controllers/UrlrewriteController.php | 2 +- .../core/Mage/Adminhtml/etc/adminhtml.xml | 2 +- app/code/core/Mage/Adminhtml/etc/config.xml | 2 +- .../core/Mage/Adminhtml/etc/jstranslator.xml | 2 +- app/code/core/Mage/Api/Controller/Action.php | 2 +- app/code/core/Mage/Api/Exception.php | 2 +- app/code/core/Mage/Api/Helper/Data.php | 2 +- app/code/core/Mage/Api/Model/Acl.php | 2 +- .../core/Mage/Api/Model/Acl/Assert/Ip.php | 2 +- .../core/Mage/Api/Model/Acl/Assert/Time.php | 2 +- app/code/core/Mage/Api/Model/Acl/Resource.php | 2 +- app/code/core/Mage/Api/Model/Acl/Role.php | 2 +- .../core/Mage/Api/Model/Acl/Role/Generic.php | 2 +- .../core/Mage/Api/Model/Acl/Role/Group.php | 2 +- .../core/Mage/Api/Model/Acl/Role/Registry.php | 2 +- .../core/Mage/Api/Model/Acl/Role/User.php | 2 +- app/code/core/Mage/Api/Model/Config.php | 3 +- app/code/core/Mage/Api/Model/Mysql4/Acl.php | 2 +- .../core/Mage/Api/Model/Mysql4/Acl/Role.php | 2 +- .../Api/Model/Mysql4/Acl/Role/Collection.php | 2 +- .../Model/Mysql4/Permissions/Collection.php | 2 +- app/code/core/Mage/Api/Model/Mysql4/Role.php | 2 +- .../Mage/Api/Model/Mysql4/Role/Collection.php | 2 +- app/code/core/Mage/Api/Model/Mysql4/Roles.php | 2 +- .../Api/Model/Mysql4/Roles/Collection.php | 2 +- .../Model/Mysql4/Roles/User/Collection.php | 2 +- app/code/core/Mage/Api/Model/Mysql4/Rules.php | 2 +- .../Api/Model/Mysql4/Rules/Collection.php | 2 +- app/code/core/Mage/Api/Model/Mysql4/User.php | 2 +- .../Mage/Api/Model/Mysql4/User/Collection.php | 2 +- .../core/Mage/Api/Model/Resource/Abstract.php | 2 +- app/code/core/Mage/Api/Model/Resource/Acl.php | 2 +- .../core/Mage/Api/Model/Resource/Acl/Role.php | 2 +- .../Model/Resource/Acl/Role/Collection.php | 2 +- .../Model/Resource/Permissions/Collection.php | 2 +- .../core/Mage/Api/Model/Resource/Role.php | 2 +- .../Api/Model/Resource/Role/Collection.php | 2 +- .../core/Mage/Api/Model/Resource/Roles.php | 2 +- .../Api/Model/Resource/Roles/Collection.php | 2 +- .../Model/Resource/Roles/User/Collection.php | 2 +- .../core/Mage/Api/Model/Resource/Rules.php | 2 +- .../Api/Model/Resource/Rules/Collection.php | 2 +- .../core/Mage/Api/Model/Resource/User.php | 2 +- .../Api/Model/Resource/User/Collection.php | 2 +- app/code/core/Mage/Api/Model/Role.php | 2 +- app/code/core/Mage/Api/Model/Roles.php | 2 +- app/code/core/Mage/Api/Model/Rules.php | 2 +- app/code/core/Mage/Api/Model/Server.php | 2 +- .../Api/Model/Server/Adapter/Interface.php | 2 +- .../Mage/Api/Model/Server/Adapter/Soap.php | 2 +- .../Mage/Api/Model/Server/Adapter/Xmlrpc.php | 2 +- .../core/Mage/Api/Model/Server/Handler.php | 2 +- .../Api/Model/Server/Handler/Abstract.php | 2 +- .../Mage/Api/Model/Server/V2/Adapter/Soap.php | 2 +- .../core/Mage/Api/Model/Server/V2/Handler.php | 2 +- .../Api/Model/Server/Wsi/Adapter/Soap.php | 2 +- .../Mage/Api/Model/Server/Wsi/Handler.php | 2 +- app/code/core/Mage/Api/Model/Session.php | 2 +- app/code/core/Mage/Api/Model/User.php | 2 +- app/code/core/Mage/Api/Model/Wsdl/Config.php | 2 +- .../core/Mage/Api/Model/Wsdl/Config/Base.php | 2 +- .../Mage/Api/Model/Wsdl/Config/Element.php | 2 +- .../Mage/Api/controllers/IndexController.php | 2 +- .../Mage/Api/controllers/SoapController.php | 2 +- .../Api/controllers/V2/SoapController.php | 2 +- .../Mage/Api/controllers/XmlrpcController.php | 2 +- app/code/core/Mage/Api/etc/adminhtml.xml | 2 +- app/code/core/Mage/Api/etc/api.xml | 2 +- app/code/core/Mage/Api/etc/config.xml | 2 +- app/code/core/Mage/Api/etc/system.xml | 2 +- .../Api/sql/api_setup/install-1.6.0.0.php | 2 +- .../sql/api_setup/mysql4-install-0.7.0.php | 2 +- .../api_setup/mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../api_setup/mysql4-upgrade-0.8.0-0.8.1.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../mysql4-upgrade-1.6.0.0-1.6.0.1.php | 2 +- .../Mage/Api2/Block/Adminhtml/Attribute.php | 2 +- .../Block/Adminhtml/Attribute/Buttons.php | 2 +- .../Api2/Block/Adminhtml/Attribute/Edit.php | 2 +- .../Block/Adminhtml/Attribute/Edit/Form.php | 2 +- .../Api2/Block/Adminhtml/Attribute/Grid.php | 2 +- .../Adminhtml/Attribute/Tab/Resource.php | 2 +- .../Api2/Block/Adminhtml/Attribute/Tabs.php | 2 +- .../Permissions/User/Edit/Tab/Roles.php | 2 +- .../core/Mage/Api2/Block/Adminhtml/Roles.php | 2 +- .../Api2/Block/Adminhtml/Roles/Buttons.php | 2 +- .../Mage/Api2/Block/Adminhtml/Roles/Grid.php | 2 +- .../Api2/Block/Adminhtml/Roles/Tab/Info.php | 2 +- .../Block/Adminhtml/Roles/Tab/Resources.php | 2 +- .../Api2/Block/Adminhtml/Roles/Tab/Users.php | 2 +- .../Mage/Api2/Block/Adminhtml/Roles/Tabs.php | 2 +- app/code/core/Mage/Api2/Exception.php | 2 +- app/code/core/Mage/Api2/Helper/Data.php | 2 +- app/code/core/Mage/Api2/Model/Acl.php | 2 +- app/code/core/Mage/Api2/Model/Acl/Filter.php | 2 +- .../Mage/Api2/Model/Acl/Filter/Attribute.php | 2 +- .../Model/Acl/Filter/Attribute/Operation.php | 2 +- .../Filter/Attribute/ResourcePermission.php | 2 +- app/code/core/Mage/Api2/Model/Acl/Global.php | 2 +- .../core/Mage/Api2/Model/Acl/Global/Role.php | 2 +- .../core/Mage/Api2/Model/Acl/Global/Rule.php | 2 +- .../Api2/Model/Acl/Global/Rule/Permission.php | 2 +- .../Api2/Model/Acl/Global/Rule/Privilege.php | 2 +- .../Acl/Global/Rule/ResourcePermission.php | 2 +- .../Mage/Api2/Model/Acl/Global/Rule/Tree.php | 2 +- .../Api2/Model/Acl/PermissionInterface.php | 2 +- app/code/core/Mage/Api2/Model/Auth.php | 2 +- .../core/Mage/Api2/Model/Auth/Adapter.php | 2 +- .../Mage/Api2/Model/Auth/Adapter/Abstract.php | 2 +- .../Mage/Api2/Model/Auth/Adapter/Oauth.php | 2 +- app/code/core/Mage/Api2/Model/Auth/User.php | 2 +- .../Mage/Api2/Model/Auth/User/Abstract.php | 2 +- .../core/Mage/Api2/Model/Auth/User/Admin.php | 2 +- .../Mage/Api2/Model/Auth/User/Customer.php | 2 +- .../core/Mage/Api2/Model/Auth/User/Guest.php | 2 +- app/code/core/Mage/Api2/Model/Config.php | 2 +- app/code/core/Mage/Api2/Model/Dispatcher.php | 2 +- app/code/core/Mage/Api2/Model/Multicall.php | 2 +- app/code/core/Mage/Api2/Model/Observer.php | 2 +- app/code/core/Mage/Api2/Model/Renderer.php | 2 +- .../Mage/Api2/Model/Renderer/Interface.php | 2 +- .../core/Mage/Api2/Model/Renderer/Json.php | 2 +- .../core/Mage/Api2/Model/Renderer/Query.php | 2 +- .../core/Mage/Api2/Model/Renderer/Xml.php | 2 +- .../Mage/Api2/Model/Renderer/Xml/Writer.php | 2 +- app/code/core/Mage/Api2/Model/Request.php | 2 +- .../core/Mage/Api2/Model/Request/Internal.php | 2 +- .../Mage/Api2/Model/Request/Interpreter.php | 2 +- .../Model/Request/Interpreter/Interface.php | 2 +- .../Api2/Model/Request/Interpreter/Json.php | 2 +- .../Api2/Model/Request/Interpreter/Query.php | 2 +- .../Api2/Model/Request/Interpreter/Xml.php | 2 +- app/code/core/Mage/Api2/Model/Resource.php | 2 +- .../Model/Resource/Acl/Filter/Attribute.php | 2 +- .../Acl/Filter/Attribute/Collection.php | 2 +- .../Api2/Model/Resource/Acl/Global/Role.php | 2 +- .../Resource/Acl/Global/Role/Collection.php | 2 +- .../Api2/Model/Resource/Acl/Global/Rule.php | 2 +- .../Resource/Acl/Global/Rule/Collection.php | 2 +- .../core/Mage/Api2/Model/Resource/Setup.php | 2 +- .../Mage/Api2/Model/Resource/Validator.php | 2 +- .../Api2/Model/Resource/Validator/Eav.php | 2 +- .../Api2/Model/Resource/Validator/Fields.php | 2 +- app/code/core/Mage/Api2/Model/Response.php | 2 +- .../core/Mage/Api2/Model/Route/Abstract.php | 2 +- .../core/Mage/Api2/Model/Route/ApiType.php | 2 +- .../core/Mage/Api2/Model/Route/Interface.php | 2 +- app/code/core/Mage/Api2/Model/Route/Rest.php | 2 +- app/code/core/Mage/Api2/Model/Router.php | 2 +- app/code/core/Mage/Api2/Model/Server.php | 2 +- .../Adminhtml/Api2/AttributeController.php | 2 +- .../Adminhtml/Api2/RoleController.php | 2 +- app/code/core/Mage/Api2/etc/adminhtml.xml | 2 +- app/code/core/Mage/Api2/etc/config.xml | 2 +- .../Api2/sql/api2_setup/install-1.0.0.0.php | 2 +- .../Authorizenet/Block/Directpost/Form.php | 2 +- .../Authorizenet/Block/Directpost/Iframe.php | 2 +- .../core/Mage/Authorizenet/Helper/Data.php | 2 +- .../Mage/Authorizenet/Model/Directpost.php | 2 +- .../Model/Directpost/Observer.php | 2 +- .../Authorizenet/Model/Directpost/Request.php | 2 +- .../Model/Directpost/Response.php | 2 +- .../Authorizenet/Model/Directpost/Session.php | 2 +- .../Directpost/PaymentController.php | 2 +- .../Directpost/PaymentController.php | 2 +- .../core/Mage/Authorizenet/etc/config.xml | 2 +- .../core/Mage/Authorizenet/etc/system.xml | 2 +- app/code/core/Mage/Backup/Exception.php | 2 +- app/code/core/Mage/Backup/Helper/Data.php | 2 +- app/code/core/Mage/Backup/Model/Backup.php | 2 +- .../Mage/Backup/Model/Config/Backend/Cron.php | 2 +- .../Mage/Backup/Model/Config/Source/Type.php | 2 +- app/code/core/Mage/Backup/Model/Db.php | 2 +- .../core/Mage/Backup/Model/Fs/Collection.php | 2 +- app/code/core/Mage/Backup/Model/Mysql4/Db.php | 2 +- app/code/core/Mage/Backup/Model/Observer.php | 2 +- .../core/Mage/Backup/Model/Resource/Db.php | 2 +- .../Backup/Model/Resource/Helper/Mysql4.php | 2 +- app/code/core/Mage/Backup/etc/adminhtml.xml | 2 +- app/code/core/Mage/Backup/etc/config.xml | 2 +- app/code/core/Mage/Backup/etc/system.xml | 2 +- .../Product/Composite/Fieldset/Bundle.php | 2 +- .../Fieldset/Options/Type/Checkbox.php | 2 +- .../Composite/Fieldset/Options/Type/Multi.php | 2 +- .../Composite/Fieldset/Options/Type/Radio.php | 2 +- .../Fieldset/Options/Type/Select.php | 2 +- .../Catalog/Product/Edit/Tab/Attributes.php | 2 +- .../Product/Edit/Tab/Attributes/Extend.php | 2 +- .../Product/Edit/Tab/Attributes/Special.php | 2 +- .../Catalog/Product/Edit/Tab/Bundle.php | 2 +- .../Product/Edit/Tab/Bundle/Option.php | 2 +- .../Product/Edit/Tab/Bundle/Option/Search.php | 2 +- .../Edit/Tab/Bundle/Option/Search/Grid.php | 2 +- .../Edit/Tab/Bundle/Option/Selection.php | 2 +- .../Adminhtml/Catalog/Product/Edit/Tabs.php | 2 +- .../Adminhtml/Sales/Order/Items/Renderer.php | 2 +- .../Sales/Order/View/Items/Renderer.php | 2 +- .../Block/Catalog/Product/List/Partof.php | 2 +- .../Bundle/Block/Catalog/Product/Price.php | 6 +- .../Bundle/Block/Catalog/Product/View.php | 2 +- .../Catalog/Product/View/Type/Bundle.php | 2 +- .../Product/View/Type/Bundle/Option.php | 2 +- .../View/Type/Bundle/Option/Checkbox.php | 2 +- .../Product/View/Type/Bundle/Option/Multi.php | 2 +- .../Product/View/Type/Bundle/Option/Radio.php | 2 +- .../View/Type/Bundle/Option/Select.php | 2 +- .../Block/Checkout/Cart/Item/Renderer.php | 2 +- .../Block/Sales/Order/Items/Renderer.php | 2 +- .../Helper/Catalog/Product/Configuration.php | 2 +- app/code/core/Mage/Bundle/Helper/Data.php | 2 +- .../Bundle/Model/CatalogIndex/Data/Bundle.php | 2 +- .../core/Mage/Bundle/Model/Mysql4/Bundle.php | 2 +- .../Bundle/Model/Mysql4/Indexer/Price.php | 2 +- .../Bundle/Model/Mysql4/Indexer/Stock.php | 2 +- .../core/Mage/Bundle/Model/Mysql4/Option.php | 2 +- .../Bundle/Model/Mysql4/Option/Collection.php | 2 +- .../Mage/Bundle/Model/Mysql4/Price/Index.php | 2 +- .../Mage/Bundle/Model/Mysql4/Selection.php | 2 +- .../Model/Mysql4/Selection/Collection.php | 2 +- app/code/core/Mage/Bundle/Model/Observer.php | 2 +- app/code/core/Mage/Bundle/Model/Option.php | 2 +- .../core/Mage/Bundle/Model/Price/Index.php | 2 +- .../Product/Attribute/Source/Price/View.php | 2 +- .../core/Mage/Bundle/Model/Product/Price.php | 6 +- .../core/Mage/Bundle/Model/Product/Type.php | 2 +- .../Mage/Bundle/Model/Resource/Bundle.php | 2 +- .../Bundle/Model/Resource/Indexer/Price.php | 2 +- .../Bundle/Model/Resource/Indexer/Stock.php | 2 +- .../Mage/Bundle/Model/Resource/Option.php | 2 +- .../Model/Resource/Option/Collection.php | 2 +- .../Bundle/Model/Resource/Price/Index.php | 2 +- .../Mage/Bundle/Model/Resource/Selection.php | 2 +- .../Model/Resource/Selection/Collection.php | 2 +- .../Model/Sales/Order/Pdf/Items/Abstract.php | 2 +- .../Sales/Order/Pdf/Items/Creditmemo.php | 2 +- .../Model/Sales/Order/Pdf/Items/Invoice.php | 2 +- .../Model/Sales/Order/Pdf/Items/Shipment.php | 2 +- app/code/core/Mage/Bundle/Model/Selection.php | 2 +- .../Source/Option/Selection/Price/Type.php | 2 +- .../Mage/Bundle/Model/Source/Option/Type.php | 2 +- .../Bundle/Product/EditController.php | 2 +- .../Adminhtml/Bundle/SelectionController.php | 2 +- .../controllers/Product/EditController.php | 2 +- .../controllers/SelectionController.php | 2 +- .../bundle_setup/data-install-1.6.0.0.php | 2 +- app/code/core/Mage/Bundle/etc/config.xml | 2 +- .../sql/bundle_setup/install-1.6.0.0.php | 2 +- .../mysql4-data-upgrade-0.1.13-0.1.14.php | 2 +- .../sql/bundle_setup/mysql4-install-0.1.0.php | 2 +- .../mysql4-upgrade-0.1.0-0.1.1.php | 2 +- .../mysql4-upgrade-0.1.1-0.1.2.php | 2 +- .../mysql4-upgrade-0.1.10-0.1.11.php | 2 +- .../mysql4-upgrade-0.1.11-0.1.12.php | 2 +- .../mysql4-upgrade-0.1.12-0.1.13.php | 2 +- .../mysql4-upgrade-0.1.2-0.1.3.php | 2 +- .../mysql4-upgrade-0.1.3-0.1.4.php | 2 +- .../mysql4-upgrade-0.1.4-0.1.5.php | 2 +- .../mysql4-upgrade-0.1.5-0.1.6.php | 2 +- .../mysql4-upgrade-0.1.6-0.1.7.php | 2 +- .../mysql4-upgrade-0.1.7-0.1.8.php | 2 +- .../mysql4-upgrade-0.1.8-0.1.9.php | 2 +- .../mysql4-upgrade-0.1.9-0.1.10.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../mysql4-upgrade-1.6.0.0-1.6.0.0.1.php | 2 +- .../upgrade-1.6.0.0-1.6.0.0.1.php | 2 +- app/code/core/Mage/Captcha/Block/Captcha.php | 2 +- .../core/Mage/Captcha/Block/Captcha/Zend.php | 2 +- app/code/core/Mage/Captcha/Helper/Data.php | 2 +- .../core/Mage/Captcha/Model/Config/Font.php | 2 +- .../Captcha/Model/Config/Form/Abstract.php | 2 +- .../Captcha/Model/Config/Form/Backend.php | 2 +- .../Captcha/Model/Config/Form/Frontend.php | 2 +- .../core/Mage/Captcha/Model/Config/Mode.php | 2 +- .../core/Mage/Captcha/Model/Interface.php | 2 +- app/code/core/Mage/Captcha/Model/Observer.php | 2 +- .../core/Mage/Captcha/Model/Resource/Log.php | 2 +- app/code/core/Mage/Captcha/Model/Zend.php | 2 +- .../Adminhtml/RefreshController.php | 2 +- .../Captcha/controllers/RefreshController.php | 2 +- app/code/core/Mage/Captcha/etc/config.xml | 2 +- app/code/core/Mage/Captcha/etc/system.xml | 2 +- .../sql/captcha_setup/install-1.7.0.0.0.php | 2 +- .../core/Mage/Catalog/Block/Breadcrumbs.php | 2 +- .../core/Mage/Catalog/Block/Category/View.php | 2 +- .../Catalog/Block/Category/Widget/Link.php | 2 +- .../Catalog/Block/Layer/Filter/Abstract.php | 2 +- .../Catalog/Block/Layer/Filter/Attribute.php | 2 +- .../Catalog/Block/Layer/Filter/Category.php | 2 +- .../Catalog/Block/Layer/Filter/Decimal.php | 2 +- .../Mage/Catalog/Block/Layer/Filter/Price.php | 2 +- .../core/Mage/Catalog/Block/Layer/State.php | 2 +- .../core/Mage/Catalog/Block/Layer/View.php | 2 +- .../core/Mage/Catalog/Block/Navigation.php | 2 +- app/code/core/Mage/Catalog/Block/Product.php | 2 +- .../Mage/Catalog/Block/Product/Abstract.php | 2 +- .../Block/Product/Compare/Abstract.php | 2 +- .../Catalog/Block/Product/Compare/List.php | 2 +- .../Catalog/Block/Product/Compare/Sidebar.php | 2 +- .../Mage/Catalog/Block/Product/Gallery.php | 2 +- .../core/Mage/Catalog/Block/Product/List.php | 2 +- .../Catalog/Block/Product/List/Crosssell.php | 2 +- .../Catalog/Block/Product/List/Promotion.php | 2 +- .../Catalog/Block/Product/List/Random.php | 2 +- .../Catalog/Block/Product/List/Related.php | 2 +- .../Catalog/Block/Product/List/Toolbar.php | 2 +- .../Catalog/Block/Product/List/Upsell.php | 2 +- .../core/Mage/Catalog/Block/Product/New.php | 2 +- .../core/Mage/Catalog/Block/Product/Price.php | 2 +- .../Catalog/Block/Product/Price/Template.php | 2 +- .../core/Mage/Catalog/Block/Product/Send.php | 2 +- .../core/Mage/Catalog/Block/Product/View.php | 12 +- .../Catalog/Block/Product/View/Abstract.php | 2 +- .../Catalog/Block/Product/View/Additional.php | 2 +- .../Catalog/Block/Product/View/Attributes.php | 2 +- .../Block/Product/View/Description.php | 2 +- .../Mage/Catalog/Block/Product/View/Media.php | 2 +- .../Catalog/Block/Product/View/Options.php | 2 +- .../Block/Product/View/Options/Abstract.php | 2 +- .../Block/Product/View/Options/Type/Date.php | 2 +- .../Product/View/Options/Type/Default.php | 2 +- .../Block/Product/View/Options/Type/File.php | 2 +- .../Product/View/Options/Type/Select.php | 2 +- .../Block/Product/View/Options/Type/Text.php | 2 +- .../Mage/Catalog/Block/Product/View/Price.php | 2 +- .../Mage/Catalog/Block/Product/View/Tabs.php | 2 +- .../Block/Product/View/Type/Configurable.php | 4 +- .../Block/Product/View/Type/Grouped.php | 2 +- .../Block/Product/View/Type/Simple.php | 2 +- .../Block/Product/View/Type/Virtual.php | 2 +- .../Block/Product/Widget/Html/Pager.php | 2 +- .../Catalog/Block/Product/Widget/Link.php | 2 +- .../Mage/Catalog/Block/Product/Widget/New.php | 2 +- .../Catalog/Block/Seo/Sitemap/Abstract.php | 2 +- .../Catalog/Block/Seo/Sitemap/Category.php | 2 +- .../Catalog/Block/Seo/Sitemap/Product.php | 2 +- .../Block/Seo/Sitemap/Tree/Category.php | 2 +- .../Catalog/Block/Seo/Sitemap/Tree/Pager.php | 2 +- .../core/Mage/Catalog/Block/Widget/Link.php | 2 +- app/code/core/Mage/Catalog/Exception.php | 2 +- .../core/Mage/Catalog/Helper/Category.php | 2 +- .../Mage/Catalog/Helper/Category/Flat.php | 2 +- .../Catalog/Helper/Category/Url/Rewrite.php | 2 +- .../Helper/Category/Url/Rewrite/Interface.php | 2 +- app/code/core/Mage/Catalog/Helper/Data.php | 2 +- .../Mage/Catalog/Helper/Flat/Abstract.php | 2 +- app/code/core/Mage/Catalog/Helper/Image.php | 2 +- app/code/core/Mage/Catalog/Helper/Map.php | 2 +- app/code/core/Mage/Catalog/Helper/Output.php | 2 +- app/code/core/Mage/Catalog/Helper/Product.php | 2 +- .../Mage/Catalog/Helper/Product/Compare.php | 2 +- .../Catalog/Helper/Product/Configuration.php | 2 +- .../Product/Configuration/Interface.php | 2 +- .../core/Mage/Catalog/Helper/Product/Flat.php | 2 +- .../Mage/Catalog/Helper/Product/Options.php | 2 +- .../core/Mage/Catalog/Helper/Product/Url.php | 2 +- .../Catalog/Helper/Product/Url/Rewrite.php | 2 +- .../Helper/Product/Url/Rewrite/Interface.php | 2 +- .../core/Mage/Catalog/Helper/Product/View.php | 2 +- app/code/core/Mage/Catalog/Model/Abstract.php | 2 +- .../core/Mage/Catalog/Model/Api/Resource.php | 2 +- .../core/Mage/Catalog/Model/Api2/Product.php | 2 +- .../Catalog/Model/Api2/Product/Category.php | 2 +- .../Model/Api2/Product/Category/Rest.php | 2 +- .../Api2/Product/Category/Rest/Admin/V1.php | 2 +- .../Product/Category/Rest/Customer/V1.php | 2 +- .../Api2/Product/Category/Rest/Guest/V1.php | 2 +- .../Mage/Catalog/Model/Api2/Product/Image.php | 2 +- .../Catalog/Model/Api2/Product/Image/Rest.php | 2 +- .../Api2/Product/Image/Rest/Admin/V1.php | 2 +- .../Api2/Product/Image/Rest/Customer/V1.php | 2 +- .../Api2/Product/Image/Rest/Guest/V1.php | 2 +- .../Api2/Product/Image/Validator/Image.php | 2 +- .../Mage/Catalog/Model/Api2/Product/Rest.php | 13 +- .../Model/Api2/Product/Rest/Admin/V1.php | 2 +- .../Model/Api2/Product/Rest/Customer/V1.php | 2 +- .../Model/Api2/Product/Rest/Guest/V1.php | 2 +- .../Model/Api2/Product/Validator/Product.php | 2 +- .../Catalog/Model/Api2/Product/Website.php | 2 +- .../Model/Api2/Product/Website/Rest.php | 2 +- .../Api2/Product/Website/Rest/Admin/V1.php | 2 +- .../Website/Validator/Admin/Website.php | 2 +- .../Attribute/Backend/Customlayoutupdate.php | 2 +- .../Attribute/Backend/Urlkey/Abstract.php | 2 +- app/code/core/Mage/Catalog/Model/Category.php | 2 +- .../core/Mage/Catalog/Model/Category/Api.php | 2 +- .../Mage/Catalog/Model/Category/Api/V2.php | 2 +- .../Catalog/Model/Category/Attribute/Api.php | 2 +- .../Model/Category/Attribute/Api/V2.php | 2 +- .../Category/Attribute/Backend/Image.php | 2 +- .../Category/Attribute/Backend/Sortby.php | 2 +- .../Category/Attribute/Backend/Urlkey.php | 2 +- .../Category/Attribute/Source/Layout.php | 2 +- .../Model/Category/Attribute/Source/Mode.php | 2 +- .../Model/Category/Attribute/Source/Page.php | 2 +- .../Category/Attribute/Source/Sortby.php | 2 +- .../Catalog/Model/Category/Indexer/Flat.php | 2 +- .../Model/Category/Indexer/Product.php | 2 +- .../core/Mage/Catalog/Model/Category/Url.php | 2 +- app/code/core/Mage/Catalog/Model/Config.php | 2 +- app/code/core/Mage/Catalog/Model/Convert.php | 2 +- .../Catalog/Model/Convert/Adapter/Catalog.php | 2 +- .../Catalog/Model/Convert/Adapter/Product.php | 2 +- .../Catalog/Model/Convert/Parser/Product.php | 2 +- app/code/core/Mage/Catalog/Model/Design.php | 2 +- .../Mage/Catalog/Model/Entity/Attribute.php | 2 +- .../Attribute/Design/Options/Container.php | 2 +- .../Product/Attribute/Frontend/Image.php | 2 +- app/code/core/Mage/Catalog/Model/Factory.php | 2 +- app/code/core/Mage/Catalog/Model/Index.php | 2 +- .../core/Mage/Catalog/Model/Indexer/Url.php | 2 +- app/code/core/Mage/Catalog/Model/Layer.php | 2 +- .../Catalog/Model/Layer/Filter/Abstract.php | 2 +- .../Catalog/Model/Layer/Filter/Attribute.php | 2 +- .../Catalog/Model/Layer/Filter/Category.php | 2 +- .../Catalog/Model/Layer/Filter/Decimal.php | 2 +- .../Mage/Catalog/Model/Layer/Filter/Item.php | 2 +- .../Mage/Catalog/Model/Layer/Filter/Price.php | 4 +- .../Model/Layer/Filter/Price/Algorithm.php | 2 +- .../core/Mage/Catalog/Model/Layer/State.php | 2 +- app/code/core/Mage/Catalog/Model/Observer.php | 2 +- app/code/core/Mage/Catalog/Model/Product.php | 9 +- .../Mage/Catalog/Model/Product/Action.php | 7 +- .../core/Mage/Catalog/Model/Product/Api.php | 2 +- .../Mage/Catalog/Model/Product/Api/V2.php | 2 +- .../Catalog/Model/Product/Attribute/Api.php | 2 +- .../Model/Product/Attribute/Api/V2.php | 2 +- .../Product/Attribute/Backend/Boolean.php | 2 +- .../Product/Attribute/Backend/Groupprice.php | 2 +- .../Attribute/Backend/Groupprice/Abstract.php | 2 +- .../Model/Product/Attribute/Backend/Media.php | 2 +- .../Model/Product/Attribute/Backend/Msrp.php | 2 +- .../Model/Product/Attribute/Backend/Price.php | 2 +- .../Product/Attribute/Backend/Recurring.php | 2 +- .../Model/Product/Attribute/Backend/Sku.php | 2 +- .../Product/Attribute/Backend/Startdate.php | 10 +- .../Backend/Startdate/Specialprice.php | 77 - .../Product/Attribute/Backend/Tierprice.php | 2 +- .../Product/Attribute/Backend/Urlkey.php | 2 +- .../Product/Attribute/Frontend/Image.php | 2 +- .../Catalog/Model/Product/Attribute/Group.php | 2 +- .../Model/Product/Attribute/Media/Api.php | 2 +- .../Model/Product/Attribute/Media/Api/V2.php | 2 +- .../Model/Product/Attribute/Set/Api.php | 2 +- .../Model/Product/Attribute/Set/Api/V2.php | 2 +- .../Product/Attribute/Source/Boolean.php | 2 +- .../Attribute/Source/Countryofmanufacture.php | 2 +- .../Product/Attribute/Source/Inputtype.php | 2 +- .../Model/Product/Attribute/Source/Layout.php | 2 +- .../Product/Attribute/Source/Msrp/Type.php | 2 +- .../Attribute/Source/Msrp/Type/Enabled.php | 2 +- .../Attribute/Source/Msrp/Type/Price.php | 2 +- .../Model/Product/Attribute/Tierprice/Api.php | 2 +- .../Product/Attribute/Tierprice/Api/V2.php | 2 +- .../Catalog/Model/Product/Compare/Item.php | 2 +- .../Catalog/Model/Product/Compare/List.php | 2 +- .../Mage/Catalog/Model/Product/Condition.php | 2 +- .../Model/Product/Condition/Interface.php | 2 +- .../Product/Configuration/Item/Interface.php | 2 +- .../Product/Configuration/Item/Option.php | 2 +- .../Configuration/Item/Option/Interface.php | 2 +- .../Mage/Catalog/Model/Product/Flat/Flag.php | 2 +- .../Catalog/Model/Product/Flat/Indexer.php | 2 +- .../Catalog/Model/Product/Flat/Observer.php | 2 +- .../core/Mage/Catalog/Model/Product/Image.php | 2 +- .../Catalog/Model/Product/Indexer/Eav.php | 43 +- .../Catalog/Model/Product/Indexer/Flat.php | 2 +- .../Catalog/Model/Product/Indexer/Price.php | 2 +- .../core/Mage/Catalog/Model/Product/Link.php | 2 +- .../Mage/Catalog/Model/Product/Link/Api.php | 2 +- .../Catalog/Model/Product/Link/Api/V2.php | 2 +- .../Catalog/Model/Product/Media/Config.php | 2 +- .../Mage/Catalog/Model/Product/Option.php | 2 +- .../Mage/Catalog/Model/Product/Option/Api.php | 2 +- .../Catalog/Model/Product/Option/Api/V2.php | 2 +- .../Catalog/Model/Product/Option/Observer.php | 2 +- .../Model/Product/Option/Type/Date.php | 2 +- .../Model/Product/Option/Type/Default.php | 2 +- .../Model/Product/Option/Type/File.php | 2 +- .../Model/Product/Option/Type/Select.php | 2 +- .../Model/Product/Option/Type/Text.php | 2 +- .../Catalog/Model/Product/Option/Value.php | 2 +- .../Model/Product/Option/Value/Api.php | 2 +- .../Model/Product/Option/Value/Api/V2.php | 2 +- .../Mage/Catalog/Model/Product/Status.php | 2 +- .../core/Mage/Catalog/Model/Product/Type.php | 2 +- .../Catalog/Model/Product/Type/Abstract.php | 2 +- .../Mage/Catalog/Model/Product/Type/Api.php | 2 +- .../Catalog/Model/Product/Type/Api/V2.php | 2 +- .../Model/Product/Type/Configurable.php | 2 +- .../Product/Type/Configurable/Attribute.php | 2 +- .../Model/Product/Type/Configurable/Price.php | 2 +- .../Catalog/Model/Product/Type/Grouped.php | 2 +- .../Model/Product/Type/Grouped/Price.php | 2 +- .../Mage/Catalog/Model/Product/Type/Price.php | 2 +- .../Catalog/Model/Product/Type/Simple.php | 2 +- .../Catalog/Model/Product/Type/Virtual.php | 2 +- .../core/Mage/Catalog/Model/Product/Url.php | 2 +- .../Mage/Catalog/Model/Product/Visibility.php | 2 +- .../Mage/Catalog/Model/Product/Website.php | 2 +- .../Mage/Catalog/Model/Resource/Abstract.php | 2 +- .../Mage/Catalog/Model/Resource/Attribute.php | 2 +- .../Mage/Catalog/Model/Resource/Category.php | 2 +- .../Category/Attribute/Collection.php | 2 +- .../Category/Attribute/Frontend/Image.php | 2 +- .../Category/Attribute/Source/Layout.php | 2 +- .../Category/Attribute/Source/Mode.php | 2 +- .../Category/Attribute/Source/Page.php | 2 +- .../Model/Resource/Category/Collection.php | 2 +- .../Catalog/Model/Resource/Category/Flat.php | 2 +- .../Resource/Category/Flat/Collection.php | 2 +- .../Resource/Category/Indexer/Product.php | 2 +- .../Catalog/Model/Resource/Category/Tree.php | 2 +- .../Model/Resource/Collection/Abstract.php | 2 +- .../Mage/Catalog/Model/Resource/Config.php | 2 +- .../Catalog/Model/Resource/Eav/Attribute.php | 2 +- .../Model/Resource/Eav/Mysql4/Abstract.php | 2 +- .../Model/Resource/Eav/Mysql4/Attribute.php | 2 +- .../Model/Resource/Eav/Mysql4/Category.php | 2 +- .../Mysql4/Category/Attribute/Collection.php | 2 +- .../Category/Attribute/Frontend/Image.php | 2 +- .../Category/Attribute/Source/Layout.php | 2 +- .../Mysql4/Category/Attribute/Source/Mode.php | 2 +- .../Mysql4/Category/Attribute/Source/Page.php | 2 +- .../Eav/Mysql4/Category/Collection.php | 2 +- .../Resource/Eav/Mysql4/Category/Flat.php | 2 +- .../Eav/Mysql4/Category/Flat/Collection.php | 2 +- .../Eav/Mysql4/Category/Indexer/Product.php | 2 +- .../Resource/Eav/Mysql4/Category/Tree.php | 2 +- .../Eav/Mysql4/Collection/Abstract.php | 2 +- .../Model/Resource/Eav/Mysql4/Config.php | 2 +- .../Eav/Mysql4/Layer/Filter/Attribute.php | 2 +- .../Eav/Mysql4/Layer/Filter/Decimal.php | 2 +- .../Eav/Mysql4/Layer/Filter/Price.php | 2 +- .../Model/Resource/Eav/Mysql4/Product.php | 2 +- .../Resource/Eav/Mysql4/Product/Action.php | 2 +- .../Product/Attribute/Backend/Image.php | 2 +- .../Product/Attribute/Backend/Media.php | 2 +- .../Product/Attribute/Backend/Tierprice.php | 2 +- .../Product/Attribute/Backend/Urlkey.php | 2 +- .../Mysql4/Product/Attribute/Collection.php | 2 +- .../Product/Attribute/Frontend/Image.php | 2 +- .../Product/Attribute/Frontend/Tierprice.php | 2 +- .../Eav/Mysql4/Product/Collection.php | 2 +- .../Eav/Mysql4/Product/Compare/Item.php | 2 +- .../Product/Compare/Item/Collection.php | 2 +- .../Resource/Eav/Mysql4/Product/Flat.php | 2 +- .../Eav/Mysql4/Product/Flat/Indexer.php | 2 +- .../Eav/Mysql4/Product/Indexer/Abstract.php | 2 +- .../Eav/Mysql4/Product/Indexer/Eav.php | 2 +- .../Mysql4/Product/Indexer/Eav/Abstract.php | 2 +- .../Mysql4/Product/Indexer/Eav/Decimal.php | 2 +- .../Eav/Mysql4/Product/Indexer/Eav/Source.php | 2 +- .../Eav/Mysql4/Product/Indexer/Price.php | 2 +- .../Product/Indexer/Price/Configurable.php | 2 +- .../Mysql4/Product/Indexer/Price/Default.php | 2 +- .../Mysql4/Product/Indexer/Price/Grouped.php | 2 +- .../Product/Indexer/Price/Interface.php | 2 +- .../Resource/Eav/Mysql4/Product/Link.php | 2 +- .../Eav/Mysql4/Product/Link/Collection.php | 2 +- .../Product/Link/Product/Collection.php | 2 +- .../Resource/Eav/Mysql4/Product/Option.php | 2 +- .../Eav/Mysql4/Product/Option/Collection.php | 2 +- .../Eav/Mysql4/Product/Option/Value.php | 2 +- .../Product/Option/Value/Collection.php | 2 +- .../Resource/Eav/Mysql4/Product/Relation.php | 2 +- .../Resource/Eav/Mysql4/Product/Status.php | 2 +- .../Eav/Mysql4/Product/Type/Configurable.php | 2 +- .../Product/Type/Configurable/Attribute.php | 2 +- .../Configurable/Attribute/Collection.php | 2 +- .../Type/Configurable/Product/Collection.php | 2 +- .../Resource/Eav/Mysql4/Product/Website.php | 2 +- .../Model/Resource/Eav/Mysql4/Sendfriend.php | 2 +- .../Eav/Mysql4/Sendfriend/Collection.php | 2 +- .../Model/Resource/Eav/Mysql4/Setup.php | 2 +- .../Catalog/Model/Resource/Eav/Mysql4/Url.php | 2 +- .../Catalog/Model/Resource/Helper/Mysql4.php | 2 +- .../Model/Resource/Layer/Filter/Attribute.php | 2 +- .../Model/Resource/Layer/Filter/Decimal.php | 2 +- .../Model/Resource/Layer/Filter/Price.php | 2 +- .../Mage/Catalog/Model/Resource/Product.php | 2 +- .../Catalog/Model/Resource/Product/Action.php | 2 +- .../Product/Attribute/Backend/Groupprice.php | 2 +- .../Attribute/Backend/Groupprice/Abstract.php | 2 +- .../Product/Attribute/Backend/Image.php | 2 +- .../Product/Attribute/Backend/Media.php | 2 +- .../Product/Attribute/Backend/Tierprice.php | 2 +- .../Product/Attribute/Backend/Urlkey.php | 2 +- .../Resource/Product/Attribute/Collection.php | 2 +- .../Product/Attribute/Frontend/Image.php | 2 +- .../Product/Attribute/Frontend/Tierprice.php | 2 +- .../Model/Resource/Product/Collection.php | 2 +- .../Model/Resource/Product/Compare/Item.php | 2 +- .../Product/Compare/Item/Collection.php | 2 +- .../Catalog/Model/Resource/Product/Flat.php | 4 +- .../Model/Resource/Product/Flat/Indexer.php | 2 +- .../Resource/Product/Indexer/Abstract.php | 2 +- .../Model/Resource/Product/Indexer/Eav.php | 2 +- .../Resource/Product/Indexer/Eav/Abstract.php | 2 +- .../Resource/Product/Indexer/Eav/Decimal.php | 2 +- .../Resource/Product/Indexer/Eav/Source.php | 5 +- .../Model/Resource/Product/Indexer/Price.php | 2 +- .../Product/Indexer/Price/Configurable.php | 24 +- .../Product/Indexer/Price/Default.php | 2 +- .../Product/Indexer/Price/Grouped.php | 11 +- .../Product/Indexer/Price/Interface.php | 2 +- .../Catalog/Model/Resource/Product/Link.php | 2 +- .../Resource/Product/Link/Collection.php | 2 +- .../Product/Link/Product/Collection.php | 2 +- .../Catalog/Model/Resource/Product/Option.php | 2 +- .../Resource/Product/Option/Collection.php | 2 +- .../Model/Resource/Product/Option/Value.php | 2 +- .../Product/Option/Value/Collection.php | 2 +- .../Model/Resource/Product/Relation.php | 2 +- .../Catalog/Model/Resource/Product/Status.php | 2 +- .../Resource/Product/Type/Configurable.php | 2 +- .../Product/Type/Configurable/Attribute.php | 2 +- .../Configurable/Attribute/Collection.php | 2 +- .../Type/Configurable/Product/Collection.php | 2 +- .../Model/Resource/Product/Website.php | 2 +- .../Mage/Catalog/Model/Resource/Setup.php | 4 +- .../core/Mage/Catalog/Model/Resource/Url.php | 2 +- app/code/core/Mage/Catalog/Model/Session.php | 2 +- .../Config/Backend/Catalog/Category/Flat.php | 2 +- .../Config/Backend/Catalog/Product/Flat.php | 2 +- .../Backend/Catalog/Url/Rewrite/Suffix.php | 2 +- .../Mage/Catalog/Model/Template/Filter.php | 2 +- app/code/core/Mage/Catalog/Model/Url.php | 2 +- .../controllers/CategoryController.php | 2 +- .../Catalog/controllers/IndexController.php | 2 +- .../controllers/Product/CompareController.php | 2 +- .../Catalog/controllers/ProductController.php | 2 +- .../controllers/Seo/SitemapController.php | 2 +- .../catalog_setup/data-install-1.6.0.0.php | 2 +- .../data-upgrade-1.6.0.0.12-1.6.0.0.13.php | 2 +- .../data-upgrade-1.6.0.0.13-1.6.0.0.14.php | 2 +- .../data-upgrade-1.6.0.0.4-1.6.0.0.5.php | 2 +- .../data-upgrade-1.6.0.0.8-1.6.0.0.9.php | 2 +- app/code/core/Mage/Catalog/etc/adminhtml.xml | 2 +- app/code/core/Mage/Catalog/etc/api.xml | 2 +- app/code/core/Mage/Catalog/etc/api2.xml | 2 +- app/code/core/Mage/Catalog/etc/config.xml | 8 +- app/code/core/Mage/Catalog/etc/convert.xml | 2 +- app/code/core/Mage/Catalog/etc/system.xml | 2 +- app/code/core/Mage/Catalog/etc/widget.xml | 2 +- .../sql/catalog_setup/install-1.6.0.0.php | 2 +- .../mysql4-data-upgrade-0.7.57-0.7.58.php | 2 +- .../mysql4-data-upgrade-0.7.63-0.7.64.php | 2 +- ...ql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php | 2 +- ...ql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php | 2 +- .../catalog_setup/mysql4-install-0.7.0.php | 2 +- .../mysql4-install-1.4.0.0.0.php | 2 +- .../mysql4-upgrade-0.6.40-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.11-0.7.12.php | 2 +- .../mysql4-upgrade-0.7.12-0.7.13.php | 2 +- .../mysql4-upgrade-0.7.13-0.7.14.php | 2 +- .../mysql4-upgrade-0.7.14-0.7.15.php | 2 +- .../mysql4-upgrade-0.7.15-0.7.16.php | 2 +- .../mysql4-upgrade-0.7.16-0.7.17.php | 2 +- .../mysql4-upgrade-0.7.17-0.7.18.php | 2 +- .../mysql4-upgrade-0.7.18-0.7.19.php | 2 +- .../mysql4-upgrade-0.7.19-0.7.20.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.7.20-0.7.21.php | 2 +- .../mysql4-upgrade-0.7.21-0.7.22.php | 2 +- .../mysql4-upgrade-0.7.22-0.7.23.php | 2 +- .../mysql4-upgrade-0.7.23-0.7.24.php | 2 +- .../mysql4-upgrade-0.7.24-0.7.25.php | 2 +- .../mysql4-upgrade-0.7.25-0.7.26.php | 2 +- .../mysql4-upgrade-0.7.26-0.7.27.php | 2 +- .../mysql4-upgrade-0.7.27-0.7.28.php | 2 +- .../mysql4-upgrade-0.7.28-0.7.29.php | 2 +- .../mysql4-upgrade-0.7.29-0.7.30.php | 2 +- .../mysql4-upgrade-0.7.30-0.7.31.php | 2 +- .../mysql4-upgrade-0.7.31-0.7.32.php | 2 +- .../mysql4-upgrade-0.7.32-0.7.33.php | 2 +- .../mysql4-upgrade-0.7.33-0.7.34.php | 2 +- .../mysql4-upgrade-0.7.34-0.7.35.php | 2 +- .../mysql4-upgrade-0.7.35-0.7.36.php | 2 +- .../mysql4-upgrade-0.7.36-0.7.37.php | 2 +- .../mysql4-upgrade-0.7.37-0.7.38.php | 2 +- .../mysql4-upgrade-0.7.38-0.7.39.php | 2 +- .../mysql4-upgrade-0.7.39-0.7.40.php | 2 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../mysql4-upgrade-0.7.40-0.7.41.php | 2 +- .../mysql4-upgrade-0.7.41-0.7.42.php | 2 +- .../mysql4-upgrade-0.7.43-0.7.44.php | 2 +- .../mysql4-upgrade-0.7.44-0.7.45.php | 2 +- .../mysql4-upgrade-0.7.45-0.7.46.php | 2 +- .../mysql4-upgrade-0.7.46-0.7.47.php | 2 +- .../mysql4-upgrade-0.7.47-0.7.48.php | 2 +- .../mysql4-upgrade-0.7.48-0.7.49.php | 2 +- .../mysql4-upgrade-0.7.49-0.7.50.php | 2 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../mysql4-upgrade-0.7.50-0.7.51.php | 2 +- .../mysql4-upgrade-0.7.51-0.7.52.php | 2 +- .../mysql4-upgrade-0.7.52-0.7.53.php | 2 +- .../mysql4-upgrade-0.7.53-0.7.54.php | 2 +- .../mysql4-upgrade-0.7.54-0.7.55.php | 2 +- .../mysql4-upgrade-0.7.55-0.7.56.php | 2 +- .../mysql4-upgrade-0.7.56-0.7.57.php | 2 +- .../mysql4-upgrade-0.7.57-0.7.58.php | 2 +- .../mysql4-upgrade-0.7.58-0.7.59.php | 2 +- .../mysql4-upgrade-0.7.59-0.7.60.php | 2 +- .../mysql4-upgrade-0.7.6-0.7.7.php | 2 +- .../mysql4-upgrade-0.7.60-0.7.61.php | 2 +- .../mysql4-upgrade-0.7.61-0.7.62.php | 2 +- .../mysql4-upgrade-0.7.62-0.7.63.php | 2 +- .../mysql4-upgrade-0.7.63-0.7.64.php | 2 +- .../mysql4-upgrade-0.7.64-0.7.65.php | 2 +- .../mysql4-upgrade-0.7.65-0.7.66.php | 2 +- .../mysql4-upgrade-0.7.66-0.7.67.php | 2 +- .../mysql4-upgrade-0.7.67-0.7.68.php | 2 +- .../mysql4-upgrade-0.7.68-0.7.69.php | 2 +- .../mysql4-upgrade-0.7.69-0.7.70.php | 2 +- .../mysql4-upgrade-0.7.7-0.7.8.php | 2 +- .../mysql4-upgrade-0.7.70-0.7.71.php | 2 +- .../mysql4-upgrade-0.7.71-0.7.72.php | 2 +- .../mysql4-upgrade-0.7.72-0.7.73.php | 2 +- .../mysql4-upgrade-0.7.73-1.4.0.0.0.php | 2 +- .../mysql4-upgrade-0.7.8-0.7.9.php | 2 +- .../mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php | 2 +- .../mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php | 2 +- .../mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php | 2 +- .../mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php | 2 +- .../mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php | 2 +- .../mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php | 2 +- .../mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php | 2 +- .../mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php | 2 +- .../mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php | 2 +- .../mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php | 2 +- .../mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php | 2 +- .../mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php | 2 +- .../mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php | 2 +- .../mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php | 2 +- .../mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php | 2 +- .../mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php | 2 +- .../mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php | 2 +- .../mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php | 2 +- .../mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php | 2 +- .../mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php | 2 +- .../mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php | 2 +- .../mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php | 2 +- .../mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php | 2 +- .../mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php | 2 +- .../mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php | 2 +- .../mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php | 2 +- .../mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php | 2 +- .../mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php | 2 +- .../mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php | 2 +- .../mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php | 2 +- .../mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php | 2 +- .../mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php | 2 +- .../mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php | 2 +- .../mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php | 2 +- .../mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php | 2 +- .../mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php | 2 +- .../mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php | 2 +- .../mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php | 2 +- .../mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php | 2 +- .../mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php | 2 +- .../mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php | 2 +- .../mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php | 2 +- .../upgrade-1.6.0.0-1.6.0.0.1.php | 2 +- .../upgrade-1.6.0.0.1-1.6.0.0.2.php | 2 +- .../upgrade-1.6.0.0.10-1.6.0.0.11.php | 2 +- .../upgrade-1.6.0.0.11-1.6.0.0.12.php | 2 +- .../upgrade-1.6.0.0.14-1.6.0.0.15.php | 2 +- .../upgrade-1.6.0.0.15-1.6.0.0.18.php | 2 +- .../upgrade-1.6.0.0.18-1.6.0.0.19.php | 34 - .../upgrade-1.6.0.0.2-1.6.0.0.3.php | 2 +- .../upgrade-1.6.0.0.3-1.6.0.0.4.php | 2 +- .../upgrade-1.6.0.0.4-1.6.0.0.5.php | 2 +- .../upgrade-1.6.0.0.5-1.6.0.0.6.php | 2 +- .../upgrade-1.6.0.0.6-1.6.0.0.7.php | 2 +- .../upgrade-1.6.0.0.7-1.6.0.0.8.php | 2 +- .../upgrade-1.6.0.0.9-1.6.0.0.10.php | 2 +- .../Mage/CatalogIndex/Model/Aggregation.php | 2 +- .../Mage/CatalogIndex/Model/Attribute.php | 2 +- .../CatalogIndex/Model/Catalog/Index/Flag.php | 2 +- .../Model/Catalog/Index/Kill/Flag.php | 2 +- .../Mage/CatalogIndex/Model/Data/Abstract.php | 2 +- .../CatalogIndex/Model/Data/Configurable.php | 2 +- .../Mage/CatalogIndex/Model/Data/Grouped.php | 2 +- .../Mage/CatalogIndex/Model/Data/Simple.php | 2 +- .../Mage/CatalogIndex/Model/Data/Virtual.php | 2 +- .../core/Mage/CatalogIndex/Model/Indexer.php | 2 +- .../CatalogIndex/Model/Indexer/Abstract.php | 2 +- .../Mage/CatalogIndex/Model/Indexer/Eav.php | 2 +- .../CatalogIndex/Model/Indexer/Interface.php | 2 +- .../Model/Indexer/Minimalprice.php | 2 +- .../Mage/CatalogIndex/Model/Indexer/Price.php | 2 +- .../CatalogIndex/Model/Indexer/Tierprice.php | 2 +- .../CatalogIndex/Model/Mysql4/Abstract.php | 2 +- .../CatalogIndex/Model/Mysql4/Aggregation.php | 2 +- .../CatalogIndex/Model/Mysql4/Attribute.php | 2 +- .../Model/Mysql4/Data/Abstract.php | 2 +- .../Model/Mysql4/Data/Configurable.php | 2 +- .../Model/Mysql4/Data/Grouped.php | 2 +- .../CatalogIndex/Model/Mysql4/Indexer.php | 2 +- .../Model/Mysql4/Indexer/Abstract.php | 2 +- .../CatalogIndex/Model/Mysql4/Indexer/Eav.php | 2 +- .../Model/Mysql4/Indexer/Minimalprice.php | 2 +- .../Model/Mysql4/Indexer/Price.php | 2 +- .../Mage/CatalogIndex/Model/Mysql4/Price.php | 2 +- .../CatalogIndex/Model/Mysql4/Retreiver.php | 2 +- .../Mage/CatalogIndex/Model/Mysql4/Setup.php | 2 +- .../core/Mage/CatalogIndex/Model/Observer.php | 2 +- .../core/Mage/CatalogIndex/Model/Price.php | 2 +- .../CatalogIndex/Model/Resource/Abstract.php | 2 +- .../Model/Resource/Aggregation.php | 2 +- .../CatalogIndex/Model/Resource/Attribute.php | 2 +- .../Model/Resource/Data/Abstract.php | 2 +- .../Model/Resource/Data/Configurable.php | 2 +- .../Model/Resource/Data/Grouped.php | 2 +- .../CatalogIndex/Model/Resource/Indexer.php | 2 +- .../Model/Resource/Indexer/Abstract.php | 2 +- .../Model/Resource/Indexer/Eav.php | 2 +- .../Model/Resource/Indexer/Minimalprice.php | 2 +- .../Model/Resource/Indexer/Price.php | 2 +- .../CatalogIndex/Model/Resource/Price.php | 2 +- .../CatalogIndex/Model/Resource/Retreiver.php | 2 +- .../CatalogIndex/Model/Resource/Setup.php | 2 +- .../Mage/CatalogIndex/Model/Retreiver.php | 2 +- .../core/Mage/CatalogIndex/etc/config.xml | 2 +- .../catalogindex_setup/install-1.6.0.0.php | 2 +- .../mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../mysql4-upgrade-0.7.6-0.7.7.php | 2 +- .../mysql4-upgrade-0.7.7-0.7.8.php | 2 +- .../mysql4-upgrade-0.7.8-0.7.9.php | 2 +- .../mysql4-upgrade-0.7.9-0.7.10.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../Adminhtml/Form/Field/Customergroup.php | 2 +- .../Block/Adminhtml/Form/Field/Minsaleqty.php | 2 +- .../CatalogInventory/Block/Qtyincrements.php | 2 +- .../Block/Stockqty/Abstract.php | 2 +- .../Block/Stockqty/Composite.php | 2 +- .../Block/Stockqty/Default.php | 2 +- .../Block/Stockqty/Type/Configurable.php | 2 +- .../Block/Stockqty/Type/Grouped.php | 2 +- .../Mage/CatalogInventory/Helper/Data.php | 2 +- .../CatalogInventory/Helper/Minsaleqty.php | 2 +- .../Model/Api2/Stock/Item.php | 2 +- .../Model/Api2/Stock/Item/Rest.php | 2 +- .../Model/Api2/Stock/Item/Rest/Admin/V1.php | 2 +- .../Model/Api2/Stock/Item/Validator/Item.php | 2 +- .../CatalogInventory/Model/Indexer/Stock.php | 2 +- .../Model/Mysql4/Indexer/Stock.php | 2 +- .../Mysql4/Indexer/Stock/Configurable.php | 2 +- .../Model/Mysql4/Indexer/Stock/Default.php | 2 +- .../Model/Mysql4/Indexer/Stock/Grouped.php | 2 +- .../Model/Mysql4/Indexer/Stock/Interface.php | 2 +- .../CatalogInventory/Model/Mysql4/Stock.php | 2 +- .../Model/Mysql4/Stock/Item.php | 2 +- .../Model/Mysql4/Stock/Item/Collection.php | 2 +- .../Model/Mysql4/Stock/Status.php | 2 +- .../Mage/CatalogInventory/Model/Observer.php | 31 +- .../Model/Resource/Indexer/Stock.php | 2 +- .../Resource/Indexer/Stock/Configurable.php | 2 +- .../Model/Resource/Indexer/Stock/Default.php | 2 +- .../Model/Resource/Indexer/Stock/Grouped.php | 2 +- .../Resource/Indexer/Stock/Interface.php | 2 +- .../CatalogInventory/Model/Resource/Stock.php | 2 +- .../Model/Resource/Stock/Item.php | 2 +- .../Model/Resource/Stock/Item/Collection.php | 2 +- .../Model/Resource/Stock/Status.php | 2 +- .../Model/Source/Backorders.php | 2 +- .../CatalogInventory/Model/Source/Stock.php | 2 +- .../Mage/CatalogInventory/Model/Stock.php | 2 +- .../CatalogInventory/Model/Stock/Item.php | 2 +- .../CatalogInventory/Model/Stock/Item/Api.php | 2 +- .../Model/Stock/Item/Api/V2.php | 2 +- .../CatalogInventory/Model/Stock/Status.php | 2 +- .../Model/System/Config/Backend/Minqty.php | 2 +- .../System/Config/Backend/Minsaleqty.php | 2 +- .../System/Config/Backend/Qtyincrements.php | 2 +- .../Mage/CatalogInventory/etc/adminhtml.xml | 2 +- .../core/Mage/CatalogInventory/etc/api.xml | 2 +- .../core/Mage/CatalogInventory/etc/api2.xml | 2 +- .../core/Mage/CatalogInventory/etc/config.xml | 10 +- .../core/Mage/CatalogInventory/etc/system.xml | 2 +- .../install-1.6.0.0.php | 2 +- .../mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../mysql4-upgrade-0.7.6-0.7.7.php | 2 +- .../mysql4-upgrade-0.7.7-0.7.8.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../mysql4-upgrade-1.6.0.0-1.6.0.0.1.php | 2 +- .../upgrade-1.6.0.0.1-1.6.0.0.2.php | 2 +- .../core/Mage/CatalogRule/Helper/Data.php | 2 +- .../Model/Action/Index/Refresh.php | 2 +- .../Model/Action/Index/Refresh/Row.php | 2 +- app/code/core/Mage/CatalogRule/Model/Flag.php | 2 +- .../Mage/CatalogRule/Model/Mysql4/Rule.php | 2 +- .../Model/Mysql4/Rule/Collection.php | 2 +- .../Model/Mysql4/Rule/Product/Price.php | 2 +- .../Mysql4/Rule/Product/Price/Collection.php | 2 +- .../core/Mage/CatalogRule/Model/Observer.php | 2 +- .../Mage/CatalogRule/Model/Resource/Rule.php | 2 +- .../Model/Resource/Rule/Collection.php | 2 +- .../Model/Resource/Rule/Product/Price.php | 2 +- .../Rule/Product/Price/Collection.php | 2 +- app/code/core/Mage/CatalogRule/Model/Rule.php | 6 +- .../Model/Rule/Action/Collection.php | 2 +- .../CatalogRule/Model/Rule/Action/Product.php | 2 +- .../Model/Rule/Condition/Combine.php | 2 +- .../Model/Rule/Condition/Product.php | 4 +- .../CatalogRule/Model/Rule/Product/Price.php | 2 +- .../core/Mage/CatalogRule/etc/adminhtml.xml | 2 +- app/code/core/Mage/CatalogRule/etc/config.xml | 2 +- .../sql/catalogrule_setup/install-1.6.0.0.php | 2 +- .../mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../mysql4-upgrade-0.7.6-0.7.7.php | 2 +- .../mysql4-upgrade-0.7.7-0.7.8.php | 8 +- .../mysql4-upgrade-0.7.8-0.7.9.php | 2 +- .../mysql4-upgrade-0.7.9-0.7.10.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../upgrade-1.6.0.0-1.6.0.1.php | 2 +- .../upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../upgrade-1.6.0.2-1.6.0.3.php | 2 +- .../CatalogSearch/Block/Advanced/Form.php | 2 +- .../CatalogSearch/Block/Advanced/Result.php | 9 +- .../Mage/CatalogSearch/Block/Autocomplete.php | 2 +- .../core/Mage/CatalogSearch/Block/Layer.php | 2 +- .../Block/Layer/Filter/Attribute.php | 2 +- .../core/Mage/CatalogSearch/Block/Result.php | 2 +- .../core/Mage/CatalogSearch/Block/Term.php | 2 +- .../core/Mage/CatalogSearch/Helper/Data.php | 2 +- .../Mage/CatalogSearch/Model/Advanced.php | 5 +- .../Mage/CatalogSearch/Model/Fulltext.php | 2 +- .../CatalogSearch/Model/Fulltext/Observer.php | 2 +- .../CatalogSearch/Model/Indexer/Fulltext.php | 17 +- .../core/Mage/CatalogSearch/Model/Layer.php | 2 +- .../Model/Layer/Filter/Attribute.php | 2 +- .../CatalogSearch/Model/Mysql4/Advanced.php | 2 +- .../Model/Mysql4/Advanced/Collection.php | 2 +- .../CatalogSearch/Model/Mysql4/Fulltext.php | 2 +- .../Model/Mysql4/Fulltext/Collection.php | 2 +- .../Model/Mysql4/Fulltext/Engine.php | 2 +- .../Model/Mysql4/Indexer/Fulltext.php | 2 +- .../Mage/CatalogSearch/Model/Mysql4/Query.php | 2 +- .../Model/Mysql4/Query/Collection.php | 2 +- .../Model/Mysql4/Search/Collection.php | 2 +- .../core/Mage/CatalogSearch/Model/Query.php | 2 +- .../CatalogSearch/Model/Resource/Advanced.php | 2 +- .../Model/Resource/Advanced/Collection.php | 25 +- .../CatalogSearch/Model/Resource/Fulltext.php | 77 +- .../Model/Resource/Fulltext/Collection.php | 2 +- .../Model/Resource/Fulltext/Engine.php | 2 +- .../Model/Resource/Helper/Mysql4.php | 2 +- .../Model/Resource/Indexer/Fulltext.php | 2 +- .../CatalogSearch/Model/Resource/Query.php | 22 +- .../Model/Resource/Query/Collection.php | 2 +- .../Model/Resource/Search/Collection.php | 2 +- .../core/Mage/CatalogSearch/Model/Session.php | 2 +- .../Model/System/Config/Backend/Sitemap.php | 2 +- .../controllers/AdvancedController.php | 2 +- .../controllers/AjaxController.php | 2 +- .../controllers/ResultController.php | 2 +- .../controllers/TermController.php | 2 +- .../core/Mage/CatalogSearch/etc/adminhtml.xml | 2 +- .../core/Mage/CatalogSearch/etc/config.xml | 4 +- .../core/Mage/CatalogSearch/etc/system.xml | 2 +- .../catalogsearch_setup/install-1.6.0.0.php | 2 +- .../mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../mysql4-upgrade-0.7.6-0.7.7.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../upgrade-1.6.0.0-1.8.2.0.php | 33 - .../Centinel/Block/Adminhtml/Validation.php | 2 +- .../Block/Adminhtml/Validation/Form.php | 2 +- .../Mage/Centinel/Block/Authentication.php | 2 +- .../Block/Authentication/Complete.php | 2 +- .../Centinel/Block/Authentication/Start.php | 2 +- app/code/core/Mage/Centinel/Block/Logo.php | 2 +- app/code/core/Mage/Centinel/Helper/Data.php | 2 +- app/code/core/Mage/Centinel/Model/Api.php | 2 +- app/code/core/Mage/Centinel/Model/Config.php | 2 +- .../core/Mage/Centinel/Model/Observer.php | 2 +- app/code/core/Mage/Centinel/Model/Service.php | 2 +- app/code/core/Mage/Centinel/Model/Session.php | 2 +- .../core/Mage/Centinel/Model/State/Jcb.php | 2 +- .../Mage/Centinel/Model/State/Mastercard.php | 2 +- .../core/Mage/Centinel/Model/State/Visa.php | 2 +- .../Mage/Centinel/Model/StateAbstract.php | 2 +- .../Adminhtml/Centinel/IndexController.php | 2 +- .../Centinel/controllers/IndexController.php | 2 +- app/code/core/Mage/Centinel/etc/config.xml | 2 +- app/code/core/Mage/Centinel/etc/system.xml | 2 +- .../core/Mage/Checkout/Block/Agreements.php | 2 +- app/code/core/Mage/Checkout/Block/Cart.php | 2 +- .../Mage/Checkout/Block/Cart/Abstract.php | 2 +- .../core/Mage/Checkout/Block/Cart/Coupon.php | 2 +- .../Mage/Checkout/Block/Cart/Crosssell.php | 2 +- .../Checkout/Block/Cart/Item/Configure.php | 2 +- .../Checkout/Block/Cart/Item/Renderer.php | 47 +- .../Block/Cart/Item/Renderer/Configurable.php | 2 +- .../Block/Cart/Item/Renderer/Grouped.php | 2 +- .../Mage/Checkout/Block/Cart/Minicart.php | 49 - .../Mage/Checkout/Block/Cart/Shipping.php | 2 +- .../core/Mage/Checkout/Block/Cart/Sidebar.php | 30 +- .../core/Mage/Checkout/Block/Cart/Totals.php | 2 +- app/code/core/Mage/Checkout/Block/Links.php | 2 +- .../Checkout/Block/Multishipping/Abstract.php | 2 +- .../Block/Multishipping/Address/Select.php | 2 +- .../Block/Multishipping/Addresses.php | 2 +- .../Checkout/Block/Multishipping/Billing.php | 2 +- .../Block/Multishipping/Billing/Items.php | 2 +- .../Checkout/Block/Multishipping/Link.php | 2 +- .../Checkout/Block/Multishipping/Overview.php | 2 +- .../Block/Multishipping/Payment/Info.php | 2 +- .../Checkout/Block/Multishipping/Shipping.php | 2 +- .../Checkout/Block/Multishipping/State.php | 2 +- .../Checkout/Block/Multishipping/Success.php | 2 +- app/code/core/Mage/Checkout/Block/Onepage.php | 2 +- .../Mage/Checkout/Block/Onepage/Abstract.php | 2 +- .../Mage/Checkout/Block/Onepage/Billing.php | 2 +- .../Mage/Checkout/Block/Onepage/Failure.php | 2 +- .../core/Mage/Checkout/Block/Onepage/Link.php | 2 +- .../Mage/Checkout/Block/Onepage/Login.php | 2 +- .../Mage/Checkout/Block/Onepage/Payment.php | 2 +- .../Checkout/Block/Onepage/Payment/Info.php | 2 +- .../Block/Onepage/Payment/Methods.php | 2 +- .../Mage/Checkout/Block/Onepage/Progress.php | 2 +- .../Mage/Checkout/Block/Onepage/Review.php | 2 +- .../Checkout/Block/Onepage/Review/Info.php | 2 +- .../Mage/Checkout/Block/Onepage/Shipping.php | 2 +- .../Block/Onepage/Shipping/Method.php | 2 +- .../Onepage/Shipping/Method/Additional.php | 2 +- .../Onepage/Shipping/Method/Available.php | 2 +- .../Mage/Checkout/Block/Onepage/Success.php | 2 +- app/code/core/Mage/Checkout/Block/Success.php | 2 +- .../Mage/Checkout/Block/Total/Default.php | 2 +- .../Mage/Checkout/Block/Total/Nominal.php | 2 +- .../core/Mage/Checkout/Block/Total/Tax.php | 2 +- .../core/Mage/Checkout/Controller/Action.php | 2 +- app/code/core/Mage/Checkout/Exception.php | 2 +- app/code/core/Mage/Checkout/Helper/Cart.php | 2 +- app/code/core/Mage/Checkout/Helper/Data.php | 2 +- app/code/core/Mage/Checkout/Helper/Url.php | 2 +- .../core/Mage/Checkout/Model/Agreement.php | 2 +- .../core/Mage/Checkout/Model/Api/Resource.php | 2 +- .../Checkout/Model/Api/Resource/Customer.php | 2 +- .../Checkout/Model/Api/Resource/Product.php | 2 +- app/code/core/Mage/Checkout/Model/Cart.php | 2 +- .../core/Mage/Checkout/Model/Cart/Api.php | 2 +- .../core/Mage/Checkout/Model/Cart/Api/V2.php | 2 +- .../Mage/Checkout/Model/Cart/Coupon/Api.php | 2 +- .../Checkout/Model/Cart/Coupon/Api/V2.php | 2 +- .../Mage/Checkout/Model/Cart/Customer/Api.php | 2 +- .../Checkout/Model/Cart/Customer/Api/V2.php | 2 +- .../Mage/Checkout/Model/Cart/Interface.php | 2 +- .../Mage/Checkout/Model/Cart/Payment/Api.php | 2 +- .../Checkout/Model/Cart/Payment/Api/V2.php | 2 +- .../Mage/Checkout/Model/Cart/Product/Api.php | 2 +- .../Checkout/Model/Cart/Product/Api/V2.php | 2 +- .../Mage/Checkout/Model/Cart/Shipping/Api.php | 2 +- .../Checkout/Model/Cart/Shipping/Api/V2.php | 2 +- .../Model/Config/Source/Cart/Summary.php | 2 +- .../Mage/Checkout/Model/Mysql4/Agreement.php | 2 +- .../Model/Mysql4/Agreement/Collection.php | 2 +- .../core/Mage/Checkout/Model/Mysql4/Cart.php | 2 +- .../core/Mage/Checkout/Model/Mysql4/Setup.php | 2 +- .../core/Mage/Checkout/Model/Observer.php | 2 +- .../Checkout/Model/Resource/Agreement.php | 2 +- .../Model/Resource/Agreement/Collection.php | 2 +- .../Mage/Checkout/Model/Resource/Cart.php | 2 +- .../Mage/Checkout/Model/Resource/Setup.php | 2 +- app/code/core/Mage/Checkout/Model/Session.php | 2 +- .../Mage/Checkout/Model/Type/Abstract.php | 2 +- .../Checkout/Model/Type/Multishipping.php | 2 +- .../Model/Type/Multishipping/State.php | 2 +- .../core/Mage/Checkout/Model/Type/Onepage.php | 2 +- .../Checkout/controllers/CartController.php | 103 +- .../Checkout/controllers/IndexController.php | 2 +- .../Multishipping/AddressController.php | 2 +- .../controllers/MultishippingController.php | 2 +- .../controllers/OnepageController.php | 2 +- app/code/core/Mage/Checkout/etc/adminhtml.xml | 2 +- app/code/core/Mage/Checkout/etc/api.xml | 2 +- app/code/core/Mage/Checkout/etc/config.xml | 2 +- .../core/Mage/Checkout/etc/jstranslator.xml | 2 +- app/code/core/Mage/Checkout/etc/system.xml | 2 +- .../sql/checkout_setup/install-1.6.0.0.php | 2 +- .../checkout_setup/mysql4-install-0.9.1.php | 2 +- .../mysql4-upgrade-0.9.0-0.9.1.php | 2 +- .../mysql4-upgrade-0.9.1-0.9.2.php | 2 +- .../mysql4-upgrade-0.9.2-0.9.3.php | 2 +- .../mysql4-upgrade-0.9.3-0.9.4.php | 2 +- .../mysql4-upgrade-0.9.4-0.9.5.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- app/code/core/Mage/Cms/Block/Block.php | 2 +- app/code/core/Mage/Cms/Block/Page.php | 2 +- app/code/core/Mage/Cms/Block/Widget/Block.php | 2 +- .../core/Mage/Cms/Block/Widget/Page/Link.php | 2 +- app/code/core/Mage/Cms/Controller/Router.php | 2 +- app/code/core/Mage/Cms/Helper/Data.php | 2 +- app/code/core/Mage/Cms/Helper/Page.php | 2 +- .../core/Mage/Cms/Helper/Wysiwyg/Images.php | 13 +- .../Cms/Model/Adminhtml/Template/Filter.php | 57 - app/code/core/Mage/Cms/Model/Block.php | 2 +- app/code/core/Mage/Cms/Model/Mysql4/Block.php | 2 +- .../Cms/Model/Mysql4/Block/Collection.php | 2 +- app/code/core/Mage/Cms/Model/Mysql4/Page.php | 2 +- .../Mage/Cms/Model/Mysql4/Page/Collection.php | 2 +- .../Mage/Cms/Model/Mysql4/Page/Service.php | 2 +- app/code/core/Mage/Cms/Model/Observer.php | 2 +- app/code/core/Mage/Cms/Model/Page.php | 2 +- .../core/Mage/Cms/Model/Resource/Block.php | 2 +- .../Cms/Model/Resource/Block/Collection.php | 2 +- .../core/Mage/Cms/Model/Resource/Page.php | 2 +- .../Cms/Model/Resource/Page/Collection.php | 2 +- .../Mage/Cms/Model/Resource/Page/Service.php | 2 +- .../core/Mage/Cms/Model/Template/Filter.php | 2 +- .../core/Mage/Cms/Model/Wysiwyg/Config.php | 44 +- .../Mage/Cms/Model/Wysiwyg/Images/Storage.php | 2 +- .../Wysiwyg/Images/Storage/Collection.php | 2 +- .../Mage/Cms/controllers/IndexController.php | 2 +- .../Mage/Cms/controllers/PageController.php | 2 +- .../data/cms_setup/data-install-1.6.0.0.php | 290 +- .../data-upgrade-1.6.0.0.0-1.6.0.0.1.php | 2 +- .../data-upgrade-1.6.0.0.1-1.6.0.0.2.php | 2 +- app/code/core/Mage/Cms/etc/adminhtml.xml | 2 +- app/code/core/Mage/Cms/etc/config.xml | 2 +- app/code/core/Mage/Cms/etc/system.xml | 2 +- app/code/core/Mage/Cms/etc/widget.xml | 2 +- .../Cms/sql/cms_setup/install-1.6.0.0.php | 2 +- .../sql/cms_setup/mysql4-install-0.7.0.php | 2 +- .../cms_setup/mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../cms_setup/mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.10-0.7.11.php | 2 +- .../mysql4-upgrade-0.7.11-0.7.12.php | 2 +- .../mysql4-upgrade-0.7.12-0.7.13.php | 2 +- .../cms_setup/mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../cms_setup/mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../cms_setup/mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../cms_setup/mysql4-upgrade-0.7.7-0.7.8.php | 2 +- .../cms_setup/mysql4-upgrade-0.7.8-0.7.9.php | 2 +- .../cms_setup/mysql4-upgrade-0.7.9-0.7.10.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- app/code/core/Mage/Compiler/Block/Process.php | 2 +- app/code/core/Mage/Compiler/Helper/Data.php | 2 +- app/code/core/Mage/Compiler/Model/Process.php | 2 +- .../Adminhtml/Compiler/ProcessController.php | 2 +- .../controllers/ProcessController.php | 2 +- app/code/core/Mage/Compiler/etc/adminhtml.xml | 2 +- .../core/Mage/Compiler/etc/compilation.xml | 2 +- app/code/core/Mage/Compiler/etc/config.xml | 2 +- .../Block/Adminhtml/Extension/Custom/Edit.php | 2 +- .../Adminhtml/Extension/Custom/Edit/Form.php | 2 +- .../Extension/Custom/Edit/Tab/Abstract.php | 2 +- .../Extension/Custom/Edit/Tab/Authors.php | 2 +- .../Extension/Custom/Edit/Tab/Contents.php | 2 +- .../Extension/Custom/Edit/Tab/Depends.php | 2 +- .../Extension/Custom/Edit/Tab/Grid.php | 2 +- .../Extension/Custom/Edit/Tab/Load.php | 2 +- .../Extension/Custom/Edit/Tab/Local.php | 2 +- .../Extension/Custom/Edit/Tab/Package.php | 2 +- .../Extension/Custom/Edit/Tab/Release.php | 2 +- .../Adminhtml/Extension/Custom/Edit/Tabs.php | 2 +- app/code/core/Mage/Connect/Helper/Data.php | 2 +- .../core/Mage/Connect/Model/Extension.php | 2 +- .../Connect/Model/Extension/Collection.php | 2 +- app/code/core/Mage/Connect/Model/Session.php | 2 +- .../Adminhtml/Extension/CustomController.php | 2 +- .../Adminhtml/Extension/LocalController.php | 2 +- app/code/core/Mage/Connect/etc/adminhtml.xml | 2 +- app/code/core/Mage/Connect/etc/config.xml | 2 +- app/code/core/Mage/Contacts/Helper/Data.php | 2 +- .../Model/System/Config/Backend/Links.php | 2 +- .../Contacts/controllers/IndexController.php | 2 +- app/code/core/Mage/Contacts/etc/adminhtml.xml | 2 +- app/code/core/Mage/Contacts/etc/config.xml | 2 +- app/code/core/Mage/Contacts/etc/system.xml | 2 +- .../sql/contacts_setup/install-1.6.0.0.php | 2 +- .../contacts_setup/mysql4-install-0.7.1.php | 2 +- .../contacts_setup/mysql4-install-0.8.0.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- app/code/core/Mage/Core/Block/Abstract.php | 2 +- app/code/core/Mage/Core/Block/Flush.php | 2 +- .../core/Mage/Core/Block/Html/Calendar.php | 2 +- app/code/core/Mage/Core/Block/Html/Date.php | 2 +- app/code/core/Mage/Core/Block/Html/Link.php | 2 +- app/code/core/Mage/Core/Block/Html/Select.php | 2 +- app/code/core/Mage/Core/Block/Messages.php | 2 +- app/code/core/Mage/Core/Block/Profiler.php | 2 +- .../core/Mage/Core/Block/Store/Switcher.php | 2 +- app/code/core/Mage/Core/Block/Template.php | 2 +- .../core/Mage/Core/Block/Template/Facade.php | 2 +- .../core/Mage/Core/Block/Template/Smarty.php | 2 +- .../core/Mage/Core/Block/Template/Zend.php | 2 +- app/code/core/Mage/Core/Block/Text.php | 2 +- app/code/core/Mage/Core/Block/Text/List.php | 2 +- .../core/Mage/Core/Block/Text/List/Item.php | 2 +- .../core/Mage/Core/Block/Text/List/Link.php | 2 +- app/code/core/Mage/Core/Block/Text/Tag.php | 2 +- .../core/Mage/Core/Block/Text/Tag/Css.php | 2 +- .../Mage/Core/Block/Text/Tag/Css/Admin.php | 2 +- .../core/Mage/Core/Block/Text/Tag/Debug.php | 2 +- app/code/core/Mage/Core/Block/Text/Tag/Js.php | 2 +- .../core/Mage/Core/Block/Text/Tag/Meta.php | 2 +- .../Mage/Core/Controller/Front/Action.php | 2 +- .../Mage/Core/Controller/Front/Router.php | 2 +- .../Mage/Core/Controller/Request/Http.php | 10 +- .../Mage/Core/Controller/Response/Http.php | 12 +- .../Mage/Core/Controller/Varien/Action.php | 2 +- .../Mage/Core/Controller/Varien/Exception.php | 2 +- .../Mage/Core/Controller/Varien/Front.php | 2 +- .../Controller/Varien/Router/Abstract.php | 2 +- .../Core/Controller/Varien/Router/Admin.php | 2 +- .../Core/Controller/Varien/Router/Default.php | 2 +- .../Controller/Varien/Router/Standard.php | 4 +- app/code/core/Mage/Core/Exception.php | 2 +- app/code/core/Mage/Core/Helper/Abstract.php | 2 +- app/code/core/Mage/Core/Helper/Array.php | 58 - app/code/core/Mage/Core/Helper/Cookie.php | 2 +- app/code/core/Mage/Core/Helper/Data.php | 3 +- .../core/Mage/Core/Helper/File/Storage.php | 2 +- .../Core/Helper/File/Storage/Database.php | 2 +- app/code/core/Mage/Core/Helper/Hint.php | 2 +- app/code/core/Mage/Core/Helper/Http.php | 2 +- app/code/core/Mage/Core/Helper/Js.php | 2 +- app/code/core/Mage/Core/Helper/String.php | 175 +- app/code/core/Mage/Core/Helper/Translate.php | 2 +- app/code/core/Mage/Core/Helper/Url.php | 2 +- .../core/Mage/Core/Helper/Url/Rewrite.php | 2 +- app/code/core/Mage/Core/Model/Abstract.php | 2 +- app/code/core/Mage/Core/Model/App.php | 2 +- app/code/core/Mage/Core/Model/App/Area.php | 2 +- .../core/Mage/Core/Model/App/Emulation.php | 2 +- app/code/core/Mage/Core/Model/Cache.php | 4 +- app/code/core/Mage/Core/Model/Calculator.php | 2 +- app/code/core/Mage/Core/Model/Config.php | 2 +- app/code/core/Mage/Core/Model/Config/Base.php | 2 +- app/code/core/Mage/Core/Model/Config/Data.php | 2 +- .../core/Mage/Core/Model/Config/Element.php | 2 +- .../core/Mage/Core/Model/Config/Options.php | 2 +- .../core/Mage/Core/Model/Config/System.php | 2 +- app/code/core/Mage/Core/Model/Convert.php | 2 +- app/code/core/Mage/Core/Model/Cookie.php | 2 +- app/code/core/Mage/Core/Model/Date.php | 2 +- app/code/core/Mage/Core/Model/Design.php | 2 +- .../core/Mage/Core/Model/Design/Config.php | 121 - .../core/Mage/Core/Model/Design/Fallback.php | 206 - .../core/Mage/Core/Model/Design/Package.php | 72 +- .../Mage/Core/Model/Design/Source/Apply.php | 2 +- .../Mage/Core/Model/Design/Source/Design.php | 2 +- .../core/Mage/Core/Model/Domainpolicy.php | 133 - app/code/core/Mage/Core/Model/Email.php | 2 +- app/code/core/Mage/Core/Model/Email/Info.php | 2 +- .../core/Mage/Core/Model/Email/Template.php | 2 +- .../Mage/Core/Model/Email/Template/Filter.php | 2 +- .../Mage/Core/Model/Email/Template/Mailer.php | 2 +- .../core/Mage/Core/Model/Email/Transport.php | 2 +- app/code/core/Mage/Core/Model/Encryption.php | 2 +- app/code/core/Mage/Core/Model/Factory.php | 2 +- .../core/Mage/Core/Model/File/Storage.php | 3 +- .../Mage/Core/Model/File/Storage/Abstract.php | 2 +- .../Mage/Core/Model/File/Storage/Database.php | 2 +- .../Model/File/Storage/Database/Abstract.php | 2 +- .../Model/File/Storage/Directory/Database.php | 2 +- .../Mage/Core/Model/File/Storage/File.php | 2 +- .../Mage/Core/Model/File/Storage/Flag.php | 2 +- .../core/Mage/Core/Model/File/Uploader.php | 2 +- .../Model/File/Validator/AvailablePath.php | 2 +- .../File/Validator/NotProtectedExtension.php | 2 +- app/code/core/Mage/Core/Model/Flag.php | 2 +- .../core/Mage/Core/Model/Input/Filter.php | 2 +- .../Core/Model/Input/Filter/MaliciousCode.php | 2 +- app/code/core/Mage/Core/Model/Language.php | 2 +- app/code/core/Mage/Core/Model/Layout.php | 2 +- app/code/core/Mage/Core/Model/Layout/Data.php | 2 +- .../core/Mage/Core/Model/Layout/Element.php | 2 +- .../core/Mage/Core/Model/Layout/Update.php | 16 +- app/code/core/Mage/Core/Model/Locale.php | 7 +- .../core/Mage/Core/Model/Locale/Config.php | 2 +- app/code/core/Mage/Core/Model/Log/Adapter.php | 2 +- app/code/core/Mage/Core/Model/Logger.php | 2 +- app/code/core/Mage/Core/Model/Magento/Api.php | 2 +- .../core/Mage/Core/Model/Magento/Api/V2.php | 2 +- app/code/core/Mage/Core/Model/Message.php | 2 +- .../core/Mage/Core/Model/Message/Abstract.php | 2 +- .../Mage/Core/Model/Message/Collection.php | 2 +- .../core/Mage/Core/Model/Message/Error.php | 2 +- .../core/Mage/Core/Model/Message/Notice.php | 2 +- .../core/Mage/Core/Model/Message/Success.php | 2 +- .../core/Mage/Core/Model/Message/Warning.php | 2 +- .../core/Mage/Core/Model/Mysql4/Abstract.php | 2 +- .../core/Mage/Core/Model/Mysql4/Cache.php | 2 +- .../Core/Model/Mysql4/Collection/Abstract.php | 2 +- .../core/Mage/Core/Model/Mysql4/Config.php | 2 +- .../Mage/Core/Model/Mysql4/Config/Data.php | 2 +- .../Model/Mysql4/Config/Data/Collection.php | 2 +- .../core/Mage/Core/Model/Mysql4/Design.php | 2 +- .../Core/Model/Mysql4/Design/Collection.php | 2 +- .../Mysql4/Design/Package/Collection.php | 2 +- .../Model/Mysql4/Design/Theme/Collection.php | 2 +- .../Mage/Core/Model/Mysql4/Email/Template.php | 2 +- .../Mysql4/Email/Template/Collection.php | 2 +- .../Model/Mysql4/File/Storage/Abstract.php | 2 +- .../Model/Mysql4/File/Storage/Database.php | 2 +- .../File/Storage/Directory/Database.php | 2 +- .../Core/Model/Mysql4/File/Storage/File.php | 2 +- app/code/core/Mage/Core/Model/Mysql4/Flag.php | 2 +- .../core/Mage/Core/Model/Mysql4/Language.php | 2 +- .../Core/Model/Mysql4/Language/Collection.php | 2 +- .../core/Mage/Core/Model/Mysql4/Layout.php | 2 +- .../core/Mage/Core/Model/Mysql4/Resource.php | 2 +- .../core/Mage/Core/Model/Mysql4/Session.php | 2 +- .../core/Mage/Core/Model/Mysql4/Store.php | 2 +- .../Core/Model/Mysql4/Store/Collection.php | 2 +- .../Mage/Core/Model/Mysql4/Store/Group.php | 2 +- .../Model/Mysql4/Store/Group/Collection.php | 2 +- .../core/Mage/Core/Model/Mysql4/Translate.php | 2 +- .../Core/Model/Mysql4/Translate/String.php | 2 +- .../Mage/Core/Model/Mysql4/Url/Rewrite.php | 2 +- .../Model/Mysql4/Url/Rewrite/Collection.php | 2 +- .../core/Mage/Core/Model/Mysql4/Variable.php | 2 +- .../Core/Model/Mysql4/Variable/Collection.php | 2 +- .../core/Mage/Core/Model/Mysql4/Website.php | 2 +- .../Core/Model/Mysql4/Website/Collection.php | 2 +- app/code/core/Mage/Core/Model/Observer.php | 2 +- app/code/core/Mage/Core/Model/Resource.php | 2 +- .../Mage/Core/Model/Resource/Abstract.php | 2 +- .../core/Mage/Core/Model/Resource/Cache.php | 2 +- .../core/Mage/Core/Model/Resource/Config.php | 2 +- .../Mage/Core/Model/Resource/Config/Data.php | 2 +- .../Model/Resource/Config/Data/Collection.php | 2 +- .../Mage/Core/Model/Resource/Db/Abstract.php | 2 +- .../Model/Resource/Db/Collection/Abstract.php | 2 +- .../core/Mage/Core/Model/Resource/Design.php | 2 +- .../Core/Model/Resource/Design/Collection.php | 2 +- .../Resource/Design/Package/Collection.php | 2 +- .../Core/Model/Resource/Email/Template.php | 2 +- .../Resource/Email/Template/Collection.php | 2 +- .../Core/Model/Resource/Entity/Abstract.php | 2 +- .../Mage/Core/Model/Resource/Entity/Table.php | 2 +- .../Model/Resource/File/Storage/Abstract.php | 2 +- .../Model/Resource/File/Storage/Database.php | 2 +- .../File/Storage/Directory/Database.php | 2 +- .../Core/Model/Resource/File/Storage/File.php | 28 +- .../core/Mage/Core/Model/Resource/Flag.php | 2 +- .../Core/Model/Resource/Helper/Abstract.php | 2 +- .../Core/Model/Resource/Helper/Mysql4.php | 2 +- .../Mage/Core/Model/Resource/Iterator.php | 2 +- .../Mage/Core/Model/Resource/Language.php | 2 +- .../Model/Resource/Language/Collection.php | 2 +- .../core/Mage/Core/Model/Resource/Layout.php | 2 +- .../Mage/Core/Model/Resource/Resource.php | 2 +- .../core/Mage/Core/Model/Resource/Session.php | 2 +- .../core/Mage/Core/Model/Resource/Setup.php | 2 +- .../Model/Resource/Setup/Query/Modifier.php | 2 +- .../core/Mage/Core/Model/Resource/Store.php | 2 +- .../Core/Model/Resource/Store/Collection.php | 2 +- .../Mage/Core/Model/Resource/Store/Group.php | 2 +- .../Model/Resource/Store/Group/Collection.php | 2 +- .../Mage/Core/Model/Resource/Transaction.php | 2 +- .../Mage/Core/Model/Resource/Translate.php | 2 +- .../Core/Model/Resource/Translate/String.php | 2 +- .../Core/Model/Resource/Type/Abstract.php | 2 +- .../core/Mage/Core/Model/Resource/Type/Db.php | 2 +- .../Core/Model/Resource/Type/Db/Mysqli.php | 2 +- .../Model/Resource/Type/Db/Mysqli/Setup.php | 2 +- .../Core/Model/Resource/Type/Db/Pdo/Mysql.php | 2 +- .../Mage/Core/Model/Resource/Url/Rewrite.php | 2 +- .../Model/Resource/Url/Rewrite/Collection.php | 2 +- .../Mage/Core/Model/Resource/Variable.php | 2 +- .../Model/Resource/Variable/Collection.php | 2 +- .../core/Mage/Core/Model/Resource/Website.php | 2 +- .../Model/Resource/Website/Collection.php | 2 +- app/code/core/Mage/Core/Model/Session.php | 2 +- .../core/Mage/Core/Model/Session/Abstract.php | 2 +- .../Core/Model/Session/Abstract/Varien.php | 2 +- .../Mage/Core/Model/Session/Abstract/Zend.php | 2 +- .../Mage/Core/Model/Session/Exception.php | 2 +- .../Core/Model/Source/Email/Variables.php | 2 +- app/code/core/Mage/Core/Model/Store.php | 2 +- app/code/core/Mage/Core/Model/Store/Api.php | 2 +- .../core/Mage/Core/Model/Store/Api/V2.php | 2 +- .../core/Mage/Core/Model/Store/Exception.php | 2 +- app/code/core/Mage/Core/Model/Store/Group.php | 2 +- .../core/Mage/Core/Model/Store/Observer.php | 2 +- app/code/core/Mage/Core/Model/Template.php | 2 +- app/code/core/Mage/Core/Model/Translate.php | 2 +- .../core/Mage/Core/Model/Translate/Expr.php | 2 +- .../core/Mage/Core/Model/Translate/Inline.php | 2 +- .../core/Mage/Core/Model/Translate/String.php | 2 +- app/code/core/Mage/Core/Model/Url.php | 2 +- app/code/core/Mage/Core/Model/Url/Rewrite.php | 2 +- .../Mage/Core/Model/Url/Rewrite/Interface.php | 2 +- .../Mage/Core/Model/Url/Rewrite/Request.php | 6 +- .../core/Mage/Core/Model/Url/Validator.php | 2 +- app/code/core/Mage/Core/Model/Variable.php | 2 +- .../core/Mage/Core/Model/Variable/Config.php | 2 +- .../Mage/Core/Model/Variable/Observer.php | 2 +- app/code/core/Mage/Core/Model/Website.php | 2 +- .../Mage/Core/controllers/AjaxController.php | 2 +- .../Mage/Core/controllers/IndexController.php | 2 +- app/code/core/Mage/Core/etc/api.xml | 2 +- app/code/core/Mage/Core/etc/config.xml | 17 +- app/code/core/Mage/Core/etc/jstranslator.xml | 2 +- app/code/core/Mage/Core/etc/system.xml | 22 +- app/code/core/Mage/Core/functions.php | 2 +- .../Core/sql/core_setup/install-1.6.0.0.php | 2 +- .../mysql4-data-upgrade-1.6.0.2-1.6.0.3.php | 2 +- .../sql/core_setup/mysql4-install-0.7.0.php | 2 +- .../sql/core_setup/mysql4-install-0.8.0.php | 2 +- .../mysql4-upgrade-0.6.26-0.7.0.php | 2 +- .../core_setup/mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../core_setup/mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../core_setup/mysql4-upgrade-0.7.3-0.7.4.php | 14 +- .../core_setup/mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../core_setup/mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../core_setup/mysql4-upgrade-0.7.6-0.7.7.php | 2 +- .../core_setup/mysql4-upgrade-0.7.7-0.7.8.php | 2 +- .../core_setup/mysql4-upgrade-0.7.8-0.7.9.php | 2 +- .../core_setup/mysql4-upgrade-0.8.0-0.8.1.php | 2 +- .../core_setup/mysql4-upgrade-0.8.1-0.8.2.php | 2 +- .../mysql4-upgrade-0.8.10-0.8.11.php | 2 +- .../mysql4-upgrade-0.8.11-0.8.12.php | 2 +- .../mysql4-upgrade-0.8.12-0.8.13.php | 2 +- .../mysql4-upgrade-0.8.13-0.8.14.php | 2 +- .../mysql4-upgrade-0.8.14-0.8.15.php | 2 +- .../mysql4-upgrade-0.8.15-0.8.16.php | 2 +- .../mysql4-upgrade-0.8.16-0.8.17.php | 2 +- .../mysql4-upgrade-0.8.17-0.8.18.php | 2 +- .../mysql4-upgrade-0.8.18-0.8.19.php | 2 +- .../mysql4-upgrade-0.8.19-0.8.20.php | 2 +- .../core_setup/mysql4-upgrade-0.8.2-0.8.3.php | 2 +- .../mysql4-upgrade-0.8.20-0.8.21.php | 2 +- .../mysql4-upgrade-0.8.21-0.8.22.php | 2 +- .../mysql4-upgrade-0.8.22-0.8.23.php | 2 +- .../mysql4-upgrade-0.8.23-0.8.24.php | 2 +- .../mysql4-upgrade-0.8.24-0.8.25.php | 2 +- .../mysql4-upgrade-0.8.25-0.8.26.php | 2 +- .../mysql4-upgrade-0.8.26-0.8.27.php | 2 +- .../mysql4-upgrade-0.8.27-0.8.28.php | 2 +- .../core_setup/mysql4-upgrade-0.8.3-0.8.4.php | 2 +- .../core_setup/mysql4-upgrade-0.8.4-0.8.5.php | 2 +- .../core_setup/mysql4-upgrade-0.8.5-0.8.6.php | 2 +- .../core_setup/mysql4-upgrade-0.8.6-0.8.7.php | 2 +- .../core_setup/mysql4-upgrade-0.8.7-0.8.8.php | 2 +- .../core_setup/mysql4-upgrade-0.8.8-0.8.9.php | 2 +- .../mysql4-upgrade-0.8.9-0.8.10.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../core_setup/upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../core_setup/upgrade-1.6.0.2-1.6.0.3.php | 2 +- .../core_setup/upgrade-1.6.0.3-1.6.0.4.php | 2 +- app/code/core/Mage/Cron/Exception.php | 2 +- app/code/core/Mage/Cron/Helper/Data.php | 2 +- .../core/Mage/Cron/Model/Mysql4/Schedule.php | 2 +- .../Cron/Model/Mysql4/Schedule/Collection.php | 2 +- app/code/core/Mage/Cron/Model/Observer.php | 13 +- .../Mage/Cron/Model/Resource/Schedule.php | 2 +- .../Model/Resource/Schedule/Collection.php | 2 +- app/code/core/Mage/Cron/Model/Schedule.php | 2 +- app/code/core/Mage/Cron/etc/config.xml | 2 +- app/code/core/Mage/Cron/etc/system.xml | 2 +- .../Cron/sql/cron_setup/install-1.6.0.0.php | 2 +- .../sql/cron_setup/mysql4-install-0.7.0.php | 5 +- .../cron_setup/mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../Block/Adminhtml/System/Currencysymbol.php | 2 +- .../core/Mage/CurrencySymbol/Helper/Data.php | 2 +- .../Mage/CurrencySymbol/Model/Observer.php | 2 +- .../Model/System/Currencysymbol.php | 2 +- .../System/CurrencysymbolController.php | 2 +- .../Mage/CurrencySymbol/etc/adminhtml.xml | 2 +- .../core/Mage/CurrencySymbol/etc/config.xml | 2 +- app/code/core/Mage/Customer/Block/Account.php | 2 +- .../Mage/Customer/Block/Account/Dashboard.php | 2 +- .../Block/Account/Dashboard/Address.php | 2 +- .../Block/Account/Dashboard/Block.php | 2 +- .../Block/Account/Dashboard/Hello.php | 2 +- .../Customer/Block/Account/Dashboard/Info.php | 2 +- .../Block/Account/Dashboard/Newsletter.php | 2 +- .../Block/Account/Dashboard/Sidebar.php | 2 +- .../Customer/Block/Account/Forgotpassword.php | 2 +- .../Customer/Block/Account/Navigation.php | 2 +- .../Customer/Block/Account/Resetpassword.php | 2 +- .../core/Mage/Customer/Block/Address/Book.php | 2 +- .../core/Mage/Customer/Block/Address/Edit.php | 2 +- .../Block/Address/Renderer/Default.php | 2 +- .../Block/Address/Renderer/Interface.php | 2 +- .../core/Mage/Customer/Block/Form/Edit.php | 2 +- .../core/Mage/Customer/Block/Form/Login.php | 2 +- .../Mage/Customer/Block/Form/Register.php | 2 +- .../core/Mage/Customer/Block/Newsletter.php | 2 +- .../Mage/Customer/Block/Widget/Abstract.php | 2 +- .../core/Mage/Customer/Block/Widget/Dob.php | 2 +- .../Mage/Customer/Block/Widget/Gender.php | 2 +- .../core/Mage/Customer/Block/Widget/Name.php | 2 +- .../Mage/Customer/Block/Widget/Taxvat.php | 2 +- app/code/core/Mage/Customer/Exception.php | 2 +- .../core/Mage/Customer/Helper/Address.php | 2 +- app/code/core/Mage/Customer/Helper/Data.php | 2 +- app/code/core/Mage/Customer/Model/Address.php | 2 +- .../Mage/Customer/Model/Address/Abstract.php | 40 +- .../core/Mage/Customer/Model/Address/Api.php | 2 +- .../Mage/Customer/Model/Address/Api/V2.php | 2 +- .../Mage/Customer/Model/Address/Config.php | 2 +- .../core/Mage/Customer/Model/Api/Resource.php | 2 +- .../Mage/Customer/Model/Api2/Customer.php | 2 +- .../Customer/Model/Api2/Customer/Address.php | 2 +- .../Model/Api2/Customer/Address/Rest.php | 2 +- .../Api2/Customer/Address/Rest/Admin/V1.php | 2 +- .../Customer/Address/Rest/Customer/V1.php | 2 +- .../Model/Api2/Customer/Address/Validator.php | 2 +- .../Customer/Model/Api2/Customer/Rest.php | 2 +- .../Model/Api2/Customer/Rest/Admin/V1.php | 2 +- .../Model/Api2/Customer/Rest/Customer/V1.php | 2 +- .../core/Mage/Customer/Model/Attribute.php | 2 +- .../Model/Attribute/Backend/Data/Boolean.php | 2 +- .../Mage/Customer/Model/Attribute/Data.php | 2 +- .../Model/Attribute/Data/Abstract.php | 2 +- .../Customer/Model/Attribute/Data/Boolean.php | 2 +- .../Customer/Model/Attribute/Data/Date.php | 2 +- .../Customer/Model/Attribute/Data/File.php | 2 +- .../Customer/Model/Attribute/Data/Hidden.php | 2 +- .../Customer/Model/Attribute/Data/Image.php | 2 +- .../Model/Attribute/Data/Multiline.php | 2 +- .../Model/Attribute/Data/Multiselect.php | 2 +- .../Model/Attribute/Data/Postcode.php | 2 +- .../Customer/Model/Attribute/Data/Select.php | 2 +- .../Customer/Model/Attribute/Data/Text.php | 2 +- .../Model/Attribute/Data/Textarea.php | 2 +- .../core/Mage/Customer/Model/Config/Share.php | 2 +- .../Model/Convert/Adapter/Customer.php | 2 +- .../Model/Convert/Parser/Customer.php | 2 +- .../core/Mage/Customer/Model/Customer.php | 2 +- .../core/Mage/Customer/Model/Customer/Api.php | 2 +- .../Mage/Customer/Model/Customer/Api/V2.php | 2 +- .../Customer/Attribute/Backend/Billing.php | 2 +- .../Customer/Attribute/Backend/Password.php | 2 +- .../Customer/Attribute/Backend/Shipping.php | 2 +- .../Customer/Attribute/Backend/Store.php | 2 +- .../Customer/Attribute/Backend/Website.php | 2 +- .../Model/Customer/Attribute/Source/Group.php | 2 +- .../Model/Customer/Attribute/Source/Store.php | 2 +- .../Customer/Attribute/Source/Website.php | 2 +- .../Mage/Customer/Model/Entity/Address.php | 2 +- .../Address/Attribute/Backend/Region.php | 2 +- .../Address/Attribute/Backend/Street.php | 2 +- .../Entity/Address/Attribute/Collection.php | 2 +- .../Address/Attribute/Source/Country.php | 2 +- .../Address/Attribute/Source/Region.php | 2 +- .../Model/Entity/Address/Collection.php | 2 +- .../Mage/Customer/Model/Entity/Attribute.php | 2 +- .../Model/Entity/Attribute/Collection.php | 2 +- .../Mage/Customer/Model/Entity/Customer.php | 2 +- .../Model/Entity/Customer/Collection.php | 2 +- .../Customer/Model/Entity/Form/Attribute.php | 2 +- .../Entity/Form/Attribute/Collection.php | 2 +- .../core/Mage/Customer/Model/Entity/Group.php | 2 +- .../Model/Entity/Group/Collection.php | 2 +- .../core/Mage/Customer/Model/Entity/Setup.php | 2 +- .../Model/Entity/Wishlist/Collection.php | 2 +- app/code/core/Mage/Customer/Model/Form.php | 2 +- app/code/core/Mage/Customer/Model/Group.php | 2 +- .../core/Mage/Customer/Model/Group/Api.php | 2 +- .../core/Mage/Customer/Model/Group/Api/V2.php | 2 +- .../core/Mage/Customer/Model/Observer.php | 2 +- .../Mage/Customer/Model/Resource/Address.php | 2 +- .../Address/Attribute/Backend/Region.php | 2 +- .../Address/Attribute/Backend/Street.php | 2 +- .../Resource/Address/Attribute/Collection.php | 2 +- .../Address/Attribute/Source/Country.php | 2 +- .../Address/Attribute/Source/Region.php | 2 +- .../Model/Resource/Address/Collection.php | 2 +- .../Customer/Model/Resource/Attribute.php | 2 +- .../Model/Resource/Attribute/Collection.php | 2 +- .../Mage/Customer/Model/Resource/Customer.php | 2 +- .../Model/Resource/Customer/Collection.php | 2 +- .../Model/Resource/Form/Attribute.php | 2 +- .../Resource/Form/Attribute/Collection.php | 2 +- .../Mage/Customer/Model/Resource/Group.php | 2 +- .../Model/Resource/Group/Collection.php | 2 +- .../Mage/Customer/Model/Resource/Setup.php | 2 +- .../Model/Resource/Wishlist/Collection.php | 2 +- app/code/core/Mage/Customer/Model/Session.php | 4 +- .../controllers/AccountController.php | 7 +- .../controllers/AddressController.php | 2 +- .../Customer/controllers/ReviewController.php | 2 +- .../data-upgrade-1.6.2.0.2-1.6.2.0.3.php | 2 +- app/code/core/Mage/Customer/etc/adminhtml.xml | 2 +- app/code/core/Mage/Customer/etc/api.xml | 2 +- app/code/core/Mage/Customer/etc/api2.xml | 2 +- app/code/core/Mage/Customer/etc/config.xml | 2 +- app/code/core/Mage/Customer/etc/system.xml | 2 +- .../sql/customer_setup/install-1.6.0.0.php | 2 +- ...ql4-data-upgrade-1.4.0.0.11-1.4.0.0.12.php | 2 +- ...ql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php | 2 +- ...ysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php | 2 +- ...ysql4-data-upgrade-1.4.0.0.8-1.4.0.0.9.php | 2 +- .../customer_setup/mysql4-install-0.7.0.php | 2 +- .../customer_setup/mysql4-install-0.8.0.php | 2 +- .../mysql4-install-1.4.0.0.0.php | 2 +- .../mysql4-upgrade-0.6.1-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.8.0-0.8.1.php | 2 +- .../mysql4-upgrade-0.8.10-0.8.11.php | 2 +- .../mysql4-upgrade-0.8.11-0.8.12.php | 2 +- .../mysql4-upgrade-0.8.12-1.4.0.0.0.php | 2 +- .../mysql4-upgrade-0.8.4-0.8.5.php | 2 +- .../mysql4-upgrade-0.8.5-0.8.6.php | 2 +- .../mysql4-upgrade-0.8.6-0.8.7.php | 2 +- .../mysql4-upgrade-0.8.7-0.8.8.php | 2 +- .../mysql4-upgrade-0.8.8-0.8.9.php | 2 +- .../mysql4-upgrade-0.8.9-0.8.10.php | 2 +- .../mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php | 2 +- .../mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php | 2 +- .../mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php | 2 +- .../mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php | 2 +- .../mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php | 2 +- .../mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php | 2 +- .../mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php | 2 +- .../mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php | 2 +- .../mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php | 2 +- .../mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php | 2 +- .../mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../mysql4-upgrade-1.6.0.0-1.6.1.0.php | 2 +- .../upgrade-1.6.1.0-1.6.2.0.php | 2 +- .../upgrade-1.6.2.0-1.6.2.0.1.php | 2 +- .../upgrade-1.6.2.0.1-1.6.2.0.2.php | 2 +- app/code/core/Mage/Dataflow/Helper/Data.php | 2 +- app/code/core/Mage/Dataflow/Model/Batch.php | 2 +- .../Mage/Dataflow/Model/Batch/Abstract.php | 2 +- .../core/Mage/Dataflow/Model/Batch/Export.php | 2 +- .../core/Mage/Dataflow/Model/Batch/Import.php | 2 +- .../core/Mage/Dataflow/Model/Batch/Io.php | 2 +- app/code/core/Mage/Dataflow/Model/Convert.php | 2 +- .../Mage/Dataflow/Model/Convert/Action.php | 2 +- .../Model/Convert/Action/Abstract.php | 2 +- .../Model/Convert/Action/Interface.php | 2 +- .../Model/Convert/Adapter/Abstract.php | 2 +- .../Model/Convert/Adapter/Db/Table.php | 2 +- .../Dataflow/Model/Convert/Adapter/Http.php | 2 +- .../Model/Convert/Adapter/Http/Curl.php | 2 +- .../Model/Convert/Adapter/Interface.php | 2 +- .../Dataflow/Model/Convert/Adapter/Io.php | 2 +- .../Dataflow/Model/Convert/Adapter/Soap.php | 2 +- .../Dataflow/Model/Convert/Adapter/Std.php | 2 +- .../Model/Convert/Adapter/Zend/Cache.php | 2 +- .../Model/Convert/Adapter/Zend/Db.php | 2 +- .../Model/Convert/Container/Abstract.php | 2 +- .../Model/Convert/Container/Collection.php | 2 +- .../Model/Convert/Container/Generic.php | 2 +- .../Model/Convert/Container/Interface.php | 2 +- .../Mage/Dataflow/Model/Convert/Exception.php | 2 +- .../Mage/Dataflow/Model/Convert/Iterator.php | 2 +- .../Model/Convert/Iterator/File/Csv.php | 2 +- .../Dataflow/Model/Convert/Iterator/Http.php | 2 +- .../Model/Convert/Iterator/Interface.php | 2 +- .../Model/Convert/Mapper/Abstract.php | 2 +- .../Dataflow/Model/Convert/Mapper/Column.php | 2 +- .../Model/Convert/Mapper/Interface.php | 2 +- .../Model/Convert/Parser/Abstract.php | 2 +- .../Dataflow/Model/Convert/Parser/Csv.php | 2 +- .../Model/Convert/Parser/Interface.php | 2 +- .../Model/Convert/Parser/Serialize.php | 2 +- .../Model/Convert/Parser/Xml/Excel.php | 2 +- .../Mage/Dataflow/Model/Convert/Profile.php | 2 +- .../Model/Convert/Profile/Abstract.php | 2 +- .../Model/Convert/Profile/Collection.php | 2 +- .../Model/Convert/Profile/Interface.php | 2 +- .../Model/Convert/Validator/Abstract.php | 2 +- .../Model/Convert/Validator/Column.php | 2 +- .../Model/Convert/Validator/Dryrun.php | 2 +- .../Model/Convert/Validator/Interface.php | 2 +- app/code/core/Mage/Dataflow/Model/Import.php | 2 +- .../core/Mage/Dataflow/Model/Mysql4/Batch.php | 2 +- .../Dataflow/Model/Mysql4/Batch/Abstract.php | 2 +- .../Model/Mysql4/Batch/Collection.php | 2 +- .../Dataflow/Model/Mysql4/Batch/Export.php | 2 +- .../Dataflow/Model/Mysql4/Batch/Import.php | 2 +- .../Mage/Dataflow/Model/Mysql4/Catalogold.php | 2 +- .../Mage/Dataflow/Model/Mysql4/Import.php | 2 +- .../Model/Mysql4/Import/Collection.php | 2 +- .../Mage/Dataflow/Model/Mysql4/Profile.php | 2 +- .../Model/Mysql4/Profile/Collection.php | 2 +- .../Dataflow/Model/Mysql4/Profile/History.php | 2 +- .../Mysql4/Profile/History/Collection.php | 2 +- .../Mage/Dataflow/Model/Mysql4/Session.php | 2 +- app/code/core/Mage/Dataflow/Model/Profile.php | 2 +- .../Mage/Dataflow/Model/Profile/History.php | 2 +- .../Mage/Dataflow/Model/Resource/Batch.php | 2 +- .../Model/Resource/Batch/Abstract.php | 2 +- .../Model/Resource/Batch/Collection.php | 2 +- .../Dataflow/Model/Resource/Batch/Export.php | 2 +- .../Dataflow/Model/Resource/Batch/Import.php | 2 +- .../Mage/Dataflow/Model/Resource/Import.php | 2 +- .../Model/Resource/Import/Collection.php | 2 +- .../Mage/Dataflow/Model/Resource/Profile.php | 2 +- .../Model/Resource/Profile/Collection.php | 2 +- .../Model/Resource/Profile/History.php | 2 +- .../Resource/Profile/History/Collection.php | 2 +- .../Mage/Dataflow/Model/Resource/Session.php | 2 +- app/code/core/Mage/Dataflow/Model/Session.php | 2 +- .../Dataflow/Model/Session/Adapter/Http.php | 2 +- .../Dataflow/Model/Session/Parser/Csv.php | 2 +- .../dataflow_setup/data-install-1.6.0.0.php | 4 +- app/code/core/Mage/Dataflow/etc/config.xml | 2 +- .../sql/dataflow_setup/install-1.6.0.0.php | 2 +- .../dataflow_setup/mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../Adminhtml/Frontend/Currency/Base.php | 2 +- .../Adminhtml/Frontend/Region/Updater.php | 2 +- .../core/Mage/Directory/Block/Currency.php | 2 +- app/code/core/Mage/Directory/Block/Data.php | 2 +- app/code/core/Mage/Directory/Exception.php | 2 +- app/code/core/Mage/Directory/Helper/Data.php | 2 +- app/code/core/Mage/Directory/Helper/Url.php | 2 +- .../core/Mage/Directory/Model/Country.php | 2 +- .../core/Mage/Directory/Model/Country/Api.php | 2 +- .../Mage/Directory/Model/Country/Api/V2.php | 2 +- .../Mage/Directory/Model/Country/Format.php | 2 +- .../core/Mage/Directory/Model/Currency.php | 2 +- .../Mage/Directory/Model/Currency/Filter.php | 2 +- .../Model/Currency/Import/Abstract.php | 2 +- .../Model/Currency/Import/Webservicex.php | 2 +- .../Mage/Directory/Model/Mysql4/Country.php | 2 +- .../Model/Mysql4/Country/Collection.php | 2 +- .../Directory/Model/Mysql4/Country/Format.php | 2 +- .../Mysql4/Country/Format/Collection.php | 2 +- .../Mage/Directory/Model/Mysql4/Currency.php | 2 +- .../Model/Mysql4/Currency/Collection.php | 2 +- .../Mage/Directory/Model/Mysql4/Region.php | 2 +- .../Model/Mysql4/Region/Collection.php | 2 +- .../core/Mage/Directory/Model/Observer.php | 2 +- app/code/core/Mage/Directory/Model/Region.php | 2 +- .../core/Mage/Directory/Model/Region/Api.php | 2 +- .../Mage/Directory/Model/Region/Api/V2.php | 2 +- .../Mage/Directory/Model/Resource/Country.php | 2 +- .../Model/Resource/Country/Collection.php | 2 +- .../Model/Resource/Country/Format.php | 2 +- .../Resource/Country/Format/Collection.php | 2 +- .../Directory/Model/Resource/Currency.php | 2 +- .../Model/Resource/Currency/Collection.php | 2 +- .../Mage/Directory/Model/Resource/Region.php | 2 +- .../Model/Resource/Region/Collection.php | 2 +- .../controllers/CurrencyController.php | 2 +- .../directory_setup/data-install-1.6.0.0.php | 2 +- .../data-upgrade-1.6.0.0-1.6.0.1.php | 2 +- app/code/core/Mage/Directory/etc/api.xml | 2 +- app/code/core/Mage/Directory/etc/config.xml | 2 +- app/code/core/Mage/Directory/etc/system.xml | 2 +- .../sql/directory_setup/install-1.6.0.0.php | 2 +- .../directory_setup/mysql4-install-0.7.0.php | 2 +- .../directory_setup/mysql4-install-0.8.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 6 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 9 +- .../mysql4-upgrade-0.8.0-0.8.1.php | 2 +- .../mysql4-upgrade-0.8.1-0.8.2.php | 2 +- .../mysql4-upgrade-0.8.10-0.8.11.php | 2 +- .../mysql4-upgrade-0.8.2-0.8.3.php | 2 +- .../mysql4-upgrade-0.8.3-0.8.4.php | 2 +- .../mysql4-upgrade-0.8.4-0.8.5.php | 2 +- .../mysql4-upgrade-0.8.5-0.8.6.php | 2 +- .../mysql4-upgrade-0.8.6-0.8.7.php | 2 +- .../mysql4-upgrade-0.8.7-0.8.8.php | 2 +- .../mysql4-upgrade-0.8.8-0.8.9.php | 2 +- .../mysql4-upgrade-0.8.9-0.8.10.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../mysql4-upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../Composite/Fieldset/Downloadable.php | 2 +- .../Catalog/Product/Edit/Tab/Downloadable.php | 2 +- .../Product/Edit/Tab/Downloadable/Links.php | 2 +- .../Product/Edit/Tab/Downloadable/Samples.php | 2 +- .../Sales/Items/Column/Downloadable/Name.php | 2 +- .../Block/Catalog/Product/Links.php | 2 +- .../Block/Catalog/Product/Samples.php | 2 +- .../Block/Catalog/Product/View/Type.php | 2 +- .../Block/Checkout/Cart/Item/Renderer.php | 2 +- .../Downloadable/Block/Checkout/Success.php | 2 +- .../Block/Customer/Products/List.php | 2 +- .../Sales/Order/Email/Items/Downloadable.php | 2 +- .../Order/Email/Items/Order/Downloadable.php | 2 +- .../Order/Item/Renderer/Downloadable.php | 2 +- .../Helper/Catalog/Product/Configuration.php | 2 +- .../core/Mage/Downloadable/Helper/Data.php | 2 +- .../Mage/Downloadable/Helper/Download.php | 2 +- .../core/Mage/Downloadable/Helper/File.php | 2 +- .../Model/CatalogIndex/Data/Downloadable.php | 2 +- .../core/Mage/Downloadable/Model/Link.php | 2 +- .../core/Mage/Downloadable/Model/Link/Api.php | 2 +- .../Downloadable/Model/Link/Api/Uploader.php | 2 +- .../Mage/Downloadable/Model/Link/Api/V2.php | 2 +- .../Downloadable/Model/Link/Api/Validator.php | 2 +- .../Downloadable/Model/Link/Purchased.php | 2 +- .../Model/Link/Purchased/Item.php | 2 +- .../Model/Mysql4/Indexer/Price.php | 2 +- .../Mage/Downloadable/Model/Mysql4/Link.php | 2 +- .../Model/Mysql4/Link/Collection.php | 2 +- .../Model/Mysql4/Link/Purchased.php | 2 +- .../Mysql4/Link/Purchased/Collection.php | 2 +- .../Model/Mysql4/Link/Purchased/Item.php | 2 +- .../Mysql4/Link/Purchased/Item/Collection.php | 2 +- .../Mage/Downloadable/Model/Mysql4/Sample.php | 2 +- .../Model/Mysql4/Sample/Collection.php | 2 +- .../core/Mage/Downloadable/Model/Observer.php | 2 +- .../Mage/Downloadable/Model/Product/Price.php | 2 +- .../Mage/Downloadable/Model/Product/Type.php | 2 +- .../Model/Resource/Indexer/Price.php | 2 +- .../Mage/Downloadable/Model/Resource/Link.php | 2 +- .../Model/Resource/Link/Collection.php | 2 +- .../Model/Resource/Link/Purchased.php | 2 +- .../Resource/Link/Purchased/Collection.php | 2 +- .../Model/Resource/Link/Purchased/Item.php | 2 +- .../Link/Purchased/Item/Collection.php | 2 +- .../Downloadable/Model/Resource/Sample.php | 2 +- .../Model/Resource/Sample/Collection.php | 2 +- .../Model/Sales/Order/Pdf/Items/Abstract.php | 2 +- .../Sales/Order/Pdf/Items/Creditmemo.php | 2 +- .../Model/Sales/Order/Pdf/Items/Invoice.php | 2 +- .../core/Mage/Downloadable/Model/Sample.php | 2 +- .../Config/Source/Contentdisposition.php | 2 +- .../System/Config/Source/Orderitemstatus.php | 2 +- .../Adminhtml/Downloadable/FileController.php | 2 +- .../Downloadable/Product/EditController.php | 2 +- .../controllers/CustomerController.php | 2 +- .../controllers/DownloadController.php | 2 +- .../controllers/FileController.php | 2 +- .../controllers/Product/EditController.php | 2 +- .../data-install-1.6.0.0.php | 2 +- .../core/Mage/Downloadable/etc/adminhtml.xml | 2 +- app/code/core/Mage/Downloadable/etc/api.xml | 2 +- .../core/Mage/Downloadable/etc/config.xml | 2 +- .../core/Mage/Downloadable/etc/system.xml | 2 +- .../downloadable_setup/install-1.6.0.0.php | 2 +- .../mysql4-install-0.1.0.php | 2 +- .../mysql4-install-1.4.0.0.php | 2 +- .../mysql4-upgrade-0.1.0-0.1.1.php | 2 +- .../mysql4-upgrade-0.1.1-0.1.2.php | 2 +- .../mysql4-upgrade-0.1.10-0.1.11.php | 2 +- .../mysql4-upgrade-0.1.11-0.1.12.php | 2 +- .../mysql4-upgrade-0.1.12-0.1.13.php | 2 +- .../mysql4-upgrade-0.1.13-0.1.14.php | 2 +- .../mysql4-upgrade-0.1.14-0.1.15.php | 2 +- .../mysql4-upgrade-0.1.15-0.1.16.php | 2 +- .../mysql4-upgrade-0.1.2-0.1.3.php | 2 +- .../mysql4-upgrade-0.1.3-0.1.4.php | 2 +- .../mysql4-upgrade-0.1.4-0.1.5.php | 2 +- .../mysql4-upgrade-0.1.5-0.1.6.php | 2 +- .../mysql4-upgrade-0.1.6-0.1.7.php | 2 +- .../mysql4-upgrade-0.1.7-0.1.8.php | 2 +- .../mysql4-upgrade-0.1.8-0.1.9.php | 2 +- .../mysql4-upgrade-0.1.9-0.1.10.php | 2 +- .../mysql4-upgrade-1.3.9-1.4.0.0.php | 2 +- .../mysql4-upgrade-1.4.0.0-1.4.0.1.php | 2 +- .../mysql4-upgrade-1.4.0.1-1.4.0.2.php | 2 +- .../mysql4-upgrade-1.4.0.2-1.4.0.3.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../mysql4-upgrade-1.6.0.0.1-1.6.0.0.2.php | 2 +- .../upgrade-1.6.0.0-1.6.0.0.1.php | 2 +- .../upgrade-1.6.0.0.1-1.6.0.0.2.php | 2 +- .../Eav/Block/Adminhtml/Attribute/Edit/Js.php | 2 +- .../Attribute/Edit/Main/Abstract.php | 2 +- .../Attribute/Edit/Options/Abstract.php | 2 +- .../Adminhtml/Attribute/Grid/Abstract.php | 2 +- app/code/core/Mage/Eav/Exception.php | 2 +- app/code/core/Mage/Eav/Helper/Data.php | 2 +- .../System/Config/Source/Inputtype.php | 2 +- .../Config/Source/Inputtype/Validator.php | 2 +- app/code/core/Mage/Eav/Model/Attribute.php | 2 +- .../core/Mage/Eav/Model/Attribute/Data.php | 2 +- .../Eav/Model/Attribute/Data/Abstract.php | 2 +- .../Mage/Eav/Model/Attribute/Data/Boolean.php | 2 +- .../Mage/Eav/Model/Attribute/Data/Date.php | 2 +- .../Eav/Model/Attribute/Data/Datetime.php | 2 +- .../Mage/Eav/Model/Attribute/Data/File.php | 2 +- .../Mage/Eav/Model/Attribute/Data/Hidden.php | 2 +- .../Mage/Eav/Model/Attribute/Data/Image.php | 2 +- .../Eav/Model/Attribute/Data/Multiline.php | 2 +- .../Eav/Model/Attribute/Data/Multiselect.php | 2 +- .../Mage/Eav/Model/Attribute/Data/Select.php | 2 +- .../Mage/Eav/Model/Attribute/Data/Text.php | 2 +- .../Eav/Model/Attribute/Data/Textarea.php | 2 +- app/code/core/Mage/Eav/Model/Config.php | 2 +- .../Mage/Eav/Model/Convert/Adapter/Entity.php | 2 +- .../Mage/Eav/Model/Convert/Adapter/Grid.php | 2 +- .../Eav/Model/Convert/Parser/Abstract.php | 2 +- app/code/core/Mage/Eav/Model/Entity.php | 2 +- .../core/Mage/Eav/Model/Entity/Abstract.php | 2 +- .../core/Mage/Eav/Model/Entity/Attribute.php | 2 +- .../Eav/Model/Entity/Attribute/Abstract.php | 2 +- .../Entity/Attribute/Backend/Abstract.php | 2 +- .../Model/Entity/Attribute/Backend/Array.php | 2 +- .../Entity/Attribute/Backend/Datetime.php | 2 +- .../Entity/Attribute/Backend/Default.php | 2 +- .../Entity/Attribute/Backend/Increment.php | 2 +- .../Entity/Attribute/Backend/Interface.php | 2 +- .../Entity/Attribute/Backend/Serialized.php | 2 +- .../Model/Entity/Attribute/Backend/Store.php | 2 +- .../Entity/Attribute/Backend/Time/Created.php | 19 +- .../Entity/Attribute/Backend/Time/Updated.php | 2 +- .../Eav/Model/Entity/Attribute/Exception.php | 2 +- .../Entity/Attribute/Frontend/Abstract.php | 2 +- .../Entity/Attribute/Frontend/Datetime.php | 2 +- .../Entity/Attribute/Frontend/Default.php | 2 +- .../Entity/Attribute/Frontend/Interface.php | 2 +- .../Mage/Eav/Model/Entity/Attribute/Group.php | 2 +- .../Eav/Model/Entity/Attribute/Interface.php | 2 +- .../Eav/Model/Entity/Attribute/Option.php | 2 +- .../Mage/Eav/Model/Entity/Attribute/Set.php | 2 +- .../Entity/Attribute/Source/Abstract.php | 2 +- .../Model/Entity/Attribute/Source/Boolean.php | 2 +- .../Model/Entity/Attribute/Source/Config.php | 2 +- .../Entity/Attribute/Source/Interface.php | 2 +- .../Model/Entity/Attribute/Source/Store.php | 2 +- .../Model/Entity/Attribute/Source/Table.php | 2 +- .../core/Mage/Eav/Model/Entity/Collection.php | 2 +- .../Eav/Model/Entity/Collection/Abstract.php | 2 +- .../Eav/Model/Entity/Increment/Abstract.php | 2 +- .../Eav/Model/Entity/Increment/Alphanum.php | 2 +- .../Eav/Model/Entity/Increment/Interface.php | 2 +- .../Eav/Model/Entity/Increment/Numeric.php | 2 +- .../core/Mage/Eav/Model/Entity/Interface.php | 2 +- app/code/core/Mage/Eav/Model/Entity/Setup.php | 2 +- app/code/core/Mage/Eav/Model/Entity/Store.php | 2 +- app/code/core/Mage/Eav/Model/Entity/Type.php | 64 +- app/code/core/Mage/Eav/Model/Form.php | 2 +- app/code/core/Mage/Eav/Model/Form/Element.php | 2 +- .../core/Mage/Eav/Model/Form/Fieldset.php | 2 +- app/code/core/Mage/Eav/Model/Form/Type.php | 2 +- .../core/Mage/Eav/Model/Mysql4/Config.php | 2 +- .../Eav/Model/Mysql4/Entity/Attribute.php | 2 +- .../Mysql4/Entity/Attribute/Collection.php | 2 +- .../Model/Mysql4/Entity/Attribute/Group.php | 2 +- .../Entity/Attribute/Group/Collection.php | 2 +- .../Model/Mysql4/Entity/Attribute/Option.php | 2 +- .../Entity/Attribute/Option/Collection.php | 2 +- .../Eav/Model/Mysql4/Entity/Attribute/Set.php | 2 +- .../Entity/Attribute/Set/Collection.php | 2 +- .../Mage/Eav/Model/Mysql4/Entity/Store.php | 2 +- .../Mage/Eav/Model/Mysql4/Entity/Type.php | 2 +- .../Model/Mysql4/Entity/Type/Collection.php | 2 +- .../Mage/Eav/Model/Mysql4/Form/Element.php | 2 +- .../Model/Mysql4/Form/Element/Collection.php | 2 +- .../Mage/Eav/Model/Mysql4/Form/Fieldset.php | 2 +- .../Model/Mysql4/Form/Fieldset/Collection.php | 2 +- .../core/Mage/Eav/Model/Mysql4/Form/Type.php | 2 +- .../Eav/Model/Mysql4/Form/Type/Collection.php | 2 +- .../Mage/Eav/Model/Resource/Attribute.php | 2 +- .../Model/Resource/Attribute/Collection.php | 2 +- .../core/Mage/Eav/Model/Resource/Config.php | 2 +- .../Eav/Model/Resource/Entity/Attribute.php | 2 +- .../Resource/Entity/Attribute/Collection.php | 2 +- .../Model/Resource/Entity/Attribute/Group.php | 2 +- .../Entity/Attribute/Group/Collection.php | 2 +- .../Resource/Entity/Attribute/Option.php | 2 +- .../Entity/Attribute/Option/Collection.php | 2 +- .../Model/Resource/Entity/Attribute/Set.php | 2 +- .../Entity/Attribute/Set/Collection.php | 2 +- .../Mage/Eav/Model/Resource/Entity/Store.php | 2 +- .../Mage/Eav/Model/Resource/Entity/Type.php | 2 +- .../Model/Resource/Entity/Type/Collection.php | 2 +- .../Eav/Model/Resource/Form/Attribute.php | 2 +- .../Resource/Form/Attribute/Collection.php | 2 +- .../Mage/Eav/Model/Resource/Form/Element.php | 2 +- .../Resource/Form/Element/Collection.php | 2 +- .../Mage/Eav/Model/Resource/Form/Fieldset.php | 2 +- .../Resource/Form/Fieldset/Collection.php | 2 +- .../Mage/Eav/Model/Resource/Form/Type.php | 2 +- .../Model/Resource/Form/Type/Collection.php | 2 +- .../Mage/Eav/Model/Resource/Helper/Mysql4.php | 2 +- app/code/core/Mage/Eav/etc/config.xml | 2 +- .../Eav/sql/eav_setup/install-1.6.0.0.php | 2 +- .../sql/eav_setup/mysql4-install-0.7.0.php | 2 +- .../eav_setup/mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../eav_setup/mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.10-0.7.11.php | 2 +- .../mysql4-upgrade-0.7.11-0.7.12.php | 2 +- .../mysql4-upgrade-0.7.12-0.7.13.php | 2 +- .../mysql4-upgrade-0.7.13-0.7.14.php | 2 +- .../mysql4-upgrade-0.7.14-0.7.15.php | 2 +- .../mysql4-upgrade-0.7.15-0.7.16.php | 2 +- .../eav_setup/mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../eav_setup/mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../eav_setup/mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../eav_setup/mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../eav_setup/mysql4-upgrade-0.7.6-0.7.7.php | 2 +- .../eav_setup/mysql4-upgrade-0.7.7-0.7.8.php | 2 +- .../eav_setup/mysql4-upgrade-0.7.8-0.7.9.php | 2 +- .../eav_setup/mysql4-upgrade-0.7.9-0.7.10.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php | 2 +- .../Adminhtml/Product/Helper/Form/Config.php | 2 +- .../Adminhtml/Sales/Order/Create/Form.php | 2 +- .../Sales/Order/Create/Giftoptions.php | 2 +- .../Adminhtml/Sales/Order/Create/Items.php | 2 +- .../Block/Adminhtml/Sales/Order/View/Form.php | 2 +- .../Sales/Order/View/Giftoptions.php | 2 +- .../Adminhtml/Sales/Order/View/Items.php | 2 +- .../Mage/GiftMessage/Block/Message/Form.php | 2 +- .../Mage/GiftMessage/Block/Message/Helper.php | 2 +- .../Mage/GiftMessage/Block/Message/Inline.php | 2 +- .../core/Mage/GiftMessage/Helper/Data.php | 2 +- .../core/Mage/GiftMessage/Helper/Message.php | 2 +- app/code/core/Mage/GiftMessage/Helper/Url.php | 2 +- app/code/core/Mage/GiftMessage/Model/Api.php | 2 +- .../core/Mage/GiftMessage/Model/Api/V2.php | 2 +- .../Attribute/Backend/Boolean/Config.php | 2 +- .../Attribute/Source/Boolean/Config.php | 2 +- .../core/Mage/GiftMessage/Model/Message.php | 2 +- .../Mage/GiftMessage/Model/Mysql4/Message.php | 2 +- .../Model/Mysql4/Message/Collection.php | 2 +- .../Mage/GiftMessage/Model/Mysql4/Setup.php | 2 +- .../core/Mage/GiftMessage/Model/Observer.php | 2 +- .../GiftMessage/Model/Resource/Message.php | 2 +- .../Model/Resource/Message/Collection.php | 2 +- .../Mage/GiftMessage/Model/Resource/Setup.php | 2 +- .../controllers/IndexController.php | 2 +- app/code/core/Mage/GiftMessage/etc/api.xml | 2 +- app/code/core/Mage/GiftMessage/etc/config.xml | 2 +- app/code/core/Mage/GiftMessage/etc/system.xml | 2 +- .../sql/giftmessage_setup/install-1.6.0.0.php | 2 +- .../mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.1.3-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../core/Mage/GoogleAnalytics/Block/Ga.php | 2 +- .../core/Mage/GoogleAnalytics/Helper/Data.php | 2 +- .../Mage/GoogleAnalytics/Model/Observer.php | 2 +- .../Mage/GoogleAnalytics/etc/adminhtml.xml | 2 +- .../core/Mage/GoogleAnalytics/etc/config.xml | 2 +- .../core/Mage/GoogleAnalytics/etc/system.xml | 2 +- .../GoogleBase/Block/Adminhtml/Captcha.php | 2 +- .../Mage/GoogleBase/Block/Adminhtml/Items.php | 2 +- .../GoogleBase/Block/Adminhtml/Items/Item.php | 2 +- .../Block/Adminhtml/Items/Product.php | 2 +- .../Block/Adminhtml/Items/Renderer/Id.php | 2 +- .../Block/Adminhtml/Store/Switcher.php | 2 +- .../Mage/GoogleBase/Block/Adminhtml/Types.php | 2 +- .../GoogleBase/Block/Adminhtml/Types/Edit.php | 2 +- .../Block/Adminhtml/Types/Edit/Attributes.php | 2 +- .../Block/Adminhtml/Types/Edit/Form.php | 2 +- .../GoogleBase/Block/Adminhtml/Types/Grid.php | 2 +- .../Adminhtml/Types/Renderer/Country.php | 2 +- app/code/core/Mage/GoogleBase/Helper/Data.php | 2 +- .../core/Mage/GoogleBase/Model/Attribute.php | 2 +- .../core/Mage/GoogleBase/Model/Config.php | 2 +- app/code/core/Mage/GoogleBase/Model/Item.php | 2 +- .../GoogleBase/Model/Mysql4/Attribute.php | 2 +- .../Model/Mysql4/Attribute/Collection.php | 2 +- .../Mage/GoogleBase/Model/Mysql4/Item.php | 2 +- .../Model/Mysql4/Item/Collection.php | 2 +- .../Mage/GoogleBase/Model/Mysql4/Type.php | 2 +- .../Model/Mysql4/Type/Collection.php | 2 +- .../core/Mage/GoogleBase/Model/Observer.php | 2 +- .../GoogleBase/Model/Resource/Attribute.php | 2 +- .../Model/Resource/Attribute/Collection.php | 2 +- .../Mage/GoogleBase/Model/Resource/Item.php | 2 +- .../Model/Resource/Item/Collection.php | 2 +- .../Mage/GoogleBase/Model/Resource/Type.php | 2 +- .../Model/Resource/Type/Collection.php | 2 +- .../core/Mage/GoogleBase/Model/Service.php | 2 +- .../Mage/GoogleBase/Model/Service/Feed.php | 2 +- .../Mage/GoogleBase/Model/Service/Item.php | 2 +- .../GoogleBase/Model/Source/Accounttype.php | 2 +- .../Mage/GoogleBase/Model/Source/Authtype.php | 2 +- .../Mage/GoogleBase/Model/Source/Country.php | 2 +- .../Mage/GoogleBase/Model/Source/Statuses.php | 2 +- app/code/core/Mage/GoogleBase/Model/Type.php | 2 +- .../Adminhtml/Googlebase/ItemsController.php | 2 +- .../Googlebase/SelectionController.php | 2 +- .../Adminhtml/Googlebase/TypesController.php | 4 +- .../controllers/ItemsController.php | 2 +- .../controllers/SelectionController.php | 2 +- .../controllers/TypesController.php | 2 +- .../core/Mage/GoogleBase/etc/adminhtml.xml | 2 +- app/code/core/Mage/GoogleBase/etc/config.xml | 2 +- app/code/core/Mage/GoogleBase/etc/system.xml | 2 +- .../sql/googlebase_setup/install-1.6.0.0.php | 2 +- .../googlebase_setup/mysql4-install-0.1.0.php | 2 +- .../mysql4-upgrade-0.1.0-0.1.1.php | 2 +- .../mysql4-upgrade-0.1.1-0.1.2.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../Mage/GoogleCheckout/Model/Payment.php | 2 +- .../core/Mage/GoogleCheckout/etc/config.xml | 2 +- .../Block/Adminhtml/Export/Edit.php | 2 +- .../Block/Adminhtml/Export/Edit/Form.php | 2 +- .../Block/Adminhtml/Export/Filter.php | 2 +- .../Block/Adminhtml/Import/Edit.php | 2 +- .../Block/Adminhtml/Import/Edit/Form.php | 2 +- .../Block/Adminhtml/Import/Frame/Result.php | 2 +- .../core/Mage/ImportExport/Helper/Data.php | 2 +- .../core/Mage/ImportExport/Model/Abstract.php | 2 +- .../core/Mage/ImportExport/Model/Config.php | 2 +- .../core/Mage/ImportExport/Model/Export.php | 2 +- .../Model/Export/Adapter/Abstract.php | 2 +- .../ImportExport/Model/Export/Adapter/Csv.php | 2 +- .../Model/Export/Entity/Abstract.php | 2 +- .../Model/Export/Entity/Customer.php | 2 +- .../Model/Export/Entity/Product.php | 2 +- .../Export/Entity/Product/Type/Abstract.php | 2 +- .../Entity/Product/Type/Configurable.php | 2 +- .../Export/Entity/Product/Type/Grouped.php | 2 +- .../Export/Entity/Product/Type/Simple.php | 2 +- .../core/Mage/ImportExport/Model/Import.php | 2 +- .../ImportExport/Model/Import/Adapter.php | 2 +- .../Model/Import/Adapter/Abstract.php | 2 +- .../ImportExport/Model/Import/Adapter/Csv.php | 2 +- .../Model/Import/Entity/Abstract.php | 2 +- .../Model/Import/Entity/Customer.php | 2 +- .../Model/Import/Entity/Customer/Address.php | 2 +- .../Model/Import/Entity/Product.php | 2 +- .../Import/Entity/Product/Type/Abstract.php | 2 +- .../Entity/Product/Type/Configurable.php | 2 +- .../Import/Entity/Product/Type/Grouped.php | 2 +- .../Import/Entity/Product/Type/Simple.php | 2 +- .../Model/Import/Proxy/Product.php | 2 +- .../Model/Import/Proxy/Product/Resource.php | 2 +- .../ImportExport/Model/Import/Uploader.php | 2 +- .../ImportExport/Model/Mysql4/Import/Data.php | 2 +- .../Mage/ImportExport/Model/Mysql4/Setup.php | 2 +- .../Product/Attribute/Backend/Urlkey.php | 2 +- .../Model/Resource/Helper/Mysql4.php | 2 +- .../Model/Resource/Import/Data.php | 2 +- .../ImportExport/Model/Resource/Setup.php | 2 +- .../Model/Source/Export/Entity.php | 2 +- .../Model/Source/Export/Format.php | 2 +- .../Model/Source/Import/Behavior.php | 2 +- .../Model/Source/Import/Entity.php | 2 +- .../Adminhtml/ExportController.php | 2 +- .../Adminhtml/ImportController.php | 2 +- .../core/Mage/ImportExport/etc/adminhtml.xml | 2 +- .../core/Mage/ImportExport/etc/config.xml | 2 +- .../importexport_setup/install-1.6.0.0.php | 2 +- .../mysql4-install-0.1.0.php | 2 +- .../mysql4-upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../Index/Block/Adminhtml/Notifications.php | 2 +- .../Mage/Index/Block/Adminhtml/Process.php | 2 +- .../Index/Block/Adminhtml/Process/Edit.php | 2 +- .../Block/Adminhtml/Process/Edit/Form.php | 2 +- .../Block/Adminhtml/Process/Edit/Tab/Main.php | 2 +- .../Block/Adminhtml/Process/Edit/Tabs.php | 2 +- .../Index/Block/Adminhtml/Process/Grid.php | 2 +- .../Adminhtml/Process/Grid/Massaction.php | 2 +- app/code/core/Mage/Index/Helper/Data.php | 2 +- app/code/core/Mage/Index/Model/Event.php | 2 +- app/code/core/Mage/Index/Model/Indexer.php | 2 +- .../Mage/Index/Model/Indexer/Abstract.php | 2 +- .../core/Mage/Index/Model/Mysql4/Abstract.php | 2 +- .../core/Mage/Index/Model/Mysql4/Event.php | 2 +- .../Index/Model/Mysql4/Event/Collection.php | 2 +- .../core/Mage/Index/Model/Mysql4/Process.php | 2 +- .../Index/Model/Mysql4/Process/Collection.php | 2 +- .../core/Mage/Index/Model/Mysql4/Setup.php | 2 +- app/code/core/Mage/Index/Model/Observer.php | 2 +- app/code/core/Mage/Index/Model/Process.php | 2 +- .../Mage/Index/Model/Resource/Abstract.php | 2 +- .../core/Mage/Index/Model/Resource/Event.php | 2 +- .../Index/Model/Resource/Event/Collection.php | 2 +- .../Index/Model/Resource/Helper/Mysql4.php | 2 +- .../Mage/Index/Model/Resource/Process.php | 2 +- .../Model/Resource/Process/Collection.php | 2 +- .../core/Mage/Index/Model/Resource/Setup.php | 2 +- .../Adminhtml/ProcessController.php | 2 +- app/code/core/Mage/Index/etc/adminhtml.xml | 2 +- app/code/core/Mage/Index/etc/config.xml | 2 +- .../Index/sql/index_setup/install-1.6.0.0.php | 2 +- .../index_setup/mysql4-install-1.4.0.0.php | 2 +- .../mysql4-upgrade-1.4.0.0-1.4.0.1.php | 2 +- .../mysql4-upgrade-1.4.0.1-1.4.0.2.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- app/code/core/Mage/Install/Block/Abstract.php | 2 +- app/code/core/Mage/Install/Block/Admin.php | 2 +- app/code/core/Mage/Install/Block/Begin.php | 2 +- app/code/core/Mage/Install/Block/Config.php | 2 +- app/code/core/Mage/Install/Block/Db/Main.php | 2 +- app/code/core/Mage/Install/Block/Db/Type.php | 2 +- .../Mage/Install/Block/Db/Type/Mysql4.php | 2 +- app/code/core/Mage/Install/Block/Download.php | 2 +- app/code/core/Mage/Install/Block/End.php | 2 +- app/code/core/Mage/Install/Block/Locale.php | 2 +- app/code/core/Mage/Install/Block/State.php | 2 +- .../core/Mage/Install/Controller/Action.php | 2 +- app/code/core/Mage/Install/Helper/Data.php | 2 +- app/code/core/Mage/Install/Model/Config.php | 2 +- .../core/Mage/Install/Model/Installer.php | 2 +- .../Mage/Install/Model/Installer/Abstract.php | 2 +- .../Mage/Install/Model/Installer/Config.php | 2 +- .../Mage/Install/Model/Installer/Console.php | 2 +- .../Mage/Install/Model/Installer/Data.php | 2 +- .../core/Mage/Install/Model/Installer/Db.php | 2 +- .../Install/Model/Installer/Db/Abstract.php | 2 +- .../Install/Model/Installer/Db/Mysql4.php | 2 +- .../core/Mage/Install/Model/Installer/Env.php | 2 +- .../Install/Model/Installer/Filesystem.php | 2 +- .../Mage/Install/Model/Installer/Pear.php | 2 +- app/code/core/Mage/Install/Model/Observer.php | 2 +- app/code/core/Mage/Install/Model/Session.php | 2 +- app/code/core/Mage/Install/Model/Wizard.php | 2 +- .../Install/controllers/IndexController.php | 2 +- .../Install/controllers/WizardController.php | 2 +- app/code/core/Mage/Install/etc/config.xml | 2 +- app/code/core/Mage/Install/etc/install.xml | 2 +- app/code/core/Mage/Log/Helper/Data.php | 2 +- app/code/core/Mage/Log/Model/Aggregation.php | 2 +- app/code/core/Mage/Log/Model/Cron.php | 2 +- app/code/core/Mage/Log/Model/Customer.php | 2 +- app/code/core/Mage/Log/Model/Log.php | 2 +- .../Mage/Log/Model/Mysql4/Aggregation.php | 2 +- .../core/Mage/Log/Model/Mysql4/Customer.php | 2 +- app/code/core/Mage/Log/Model/Mysql4/Log.php | 2 +- .../core/Mage/Log/Model/Mysql4/Visitor.php | 2 +- .../Log/Model/Mysql4/Visitor/Collection.php | 2 +- .../Mage/Log/Model/Mysql4/Visitor/Online.php | 2 +- .../Mysql4/Visitor/Online/Collection.php | 2 +- .../Mage/Log/Model/Resource/Aggregation.php | 2 +- .../core/Mage/Log/Model/Resource/Customer.php | 2 +- app/code/core/Mage/Log/Model/Resource/Log.php | 2 +- .../core/Mage/Log/Model/Resource/Visitor.php | 4 +- .../Log/Model/Resource/Visitor/Collection.php | 2 +- .../Log/Model/Resource/Visitor/Online.php | 2 +- .../Resource/Visitor/Online/Collection.php | 2 +- app/code/core/Mage/Log/Model/Visitor.php | 22 +- .../core/Mage/Log/Model/Visitor/Online.php | 2 +- .../data/log_setup/data-install-1.6.0.0.php | 2 +- app/code/core/Mage/Log/etc/config.xml | 4 +- app/code/core/Mage/Log/etc/system.xml | 2 +- .../Log/sql/log_setup/install-1.6.0.0.php | 2 +- .../sql/log_setup/mysql4-install-0.7.0.php | 2 +- .../log_setup/mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../log_setup/mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../log_setup/mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../log_setup/mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../log_setup/mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../log_setup/mysql4-upgrade-0.7.6-0.7.7.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../mysql4-upgrade-1.6.0.0-1.6.1.0.php | 35 - app/code/core/Mage/Media/Helper/Data.php | 2 +- app/code/core/Mage/Media/Model/File/Image.php | 2 +- app/code/core/Mage/Media/Model/Image.php | 2 +- .../Media/Model/Image/Config/Interface.php | 2 +- app/code/core/Mage/Media/etc/config.xml | 2 +- .../core/Mage/Newsletter/Block/Subscribe.php | 2 +- app/code/core/Mage/Newsletter/Helper/Data.php | 2 +- .../core/Mage/Newsletter/Model/Message.php | 2 +- .../Mage/Newsletter/Model/Mysql4/Problem.php | 2 +- .../Model/Mysql4/Problem/Collection.php | 2 +- .../Mage/Newsletter/Model/Mysql4/Queue.php | 2 +- .../Model/Mysql4/Queue/Collection.php | 2 +- .../Newsletter/Model/Mysql4/Subscriber.php | 2 +- .../Model/Mysql4/Subscriber/Collection.php | 2 +- .../Mage/Newsletter/Model/Mysql4/Template.php | 2 +- .../Model/Mysql4/Template/Collection.php | 2 +- .../core/Mage/Newsletter/Model/Observer.php | 2 +- .../core/Mage/Newsletter/Model/Problem.php | 2 +- app/code/core/Mage/Newsletter/Model/Queue.php | 2 +- .../Newsletter/Model/Resource/Problem.php | 2 +- .../Model/Resource/Problem/Collection.php | 2 +- .../Mage/Newsletter/Model/Resource/Queue.php | 2 +- .../Model/Resource/Queue/Collection.php | 2 +- .../Newsletter/Model/Resource/Subscriber.php | 2 +- .../Model/Resource/Subscriber/Collection.php | 2 +- .../Newsletter/Model/Resource/Template.php | 2 +- .../Model/Resource/Template/Collection.php | 2 +- .../core/Mage/Newsletter/Model/Session.php | 2 +- .../core/Mage/Newsletter/Model/Subscriber.php | 2 +- .../core/Mage/Newsletter/Model/Template.php | 2 +- .../Mage/Newsletter/Model/Template/Filter.php | 2 +- .../controllers/ManageController.php | 2 +- .../controllers/SubscriberController.php | 2 +- .../data-upgrade-1.6.0.0-1.6.0.1.php | 2 +- .../core/Mage/Newsletter/etc/adminhtml.xml | 2 +- app/code/core/Mage/Newsletter/etc/config.xml | 2 +- app/code/core/Mage/Newsletter/etc/system.xml | 2 +- .../sql/newsletter_setup/install-1.6.0.0.php | 2 +- .../newsletter_setup/mysql4-install-0.7.0.php | 2 +- .../newsletter_setup/mysql4-install-0.8.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.8.0-0.8.1.php | 2 +- .../mysql4-upgrade-0.8.1-0.8.2.php | 2 +- .../mysql4-upgrade-0.8.2-0.8.3.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../Block/Adminhtml/Oauth/Admin/Token.php | 2 +- .../Adminhtml/Oauth/Admin/Token/Grid.php | 2 +- .../Oauth/Block/Adminhtml/Oauth/Authorize.php | 2 +- .../Adminhtml/Oauth/Authorize/Button.php | 2 +- .../Adminhtml/Oauth/AuthorizedTokens.php | 2 +- .../Adminhtml/Oauth/AuthorizedTokens/Grid.php | 2 +- .../Oauth/Block/Adminhtml/Oauth/Consumer.php | 2 +- .../Block/Adminhtml/Oauth/Consumer/Edit.php | 2 +- .../Adminhtml/Oauth/Consumer/Edit/Form.php | 2 +- .../Block/Adminhtml/Oauth/Consumer/Grid.php | 2 +- app/code/core/Mage/Oauth/Block/Authorize.php | 2 +- .../Mage/Oauth/Block/Authorize/Abstract.php | 2 +- .../Mage/Oauth/Block/Authorize/Button.php | 2 +- .../Block/Authorize/ButtonBaseAbstract.php | 2 +- .../Oauth/Block/AuthorizeBaseAbstract.php | 2 +- .../Mage/Oauth/Block/Customer/Token/List.php | 2 +- app/code/core/Mage/Oauth/Exception.php | 2 +- app/code/core/Mage/Oauth/Helper/Data.php | 2 +- app/code/core/Mage/Oauth/Model/Consumer.php | 2 +- .../Model/Consumer/Validator/KeyLength.php | 2 +- app/code/core/Mage/Oauth/Model/Nonce.php | 2 +- app/code/core/Mage/Oauth/Model/Observer.php | 2 +- .../Mage/Oauth/Model/Resource/Consumer.php | 2 +- .../Model/Resource/Consumer/Collection.php | 2 +- .../core/Mage/Oauth/Model/Resource/Nonce.php | 2 +- .../Oauth/Model/Resource/Nonce/Collection.php | 2 +- .../core/Mage/Oauth/Model/Resource/Setup.php | 2 +- .../core/Mage/Oauth/Model/Resource/Token.php | 2 +- .../Oauth/Model/Resource/Token/Collection.php | 2 +- app/code/core/Mage/Oauth/Model/Server.php | 2 +- app/code/core/Mage/Oauth/Model/Token.php | 2 +- .../Adminhtml/Oauth/Admin/TokenController.php | 2 +- .../Adminhtml/Oauth/AuthorizeController.php | 2 +- .../Oauth/AuthorizedTokensController.php | 2 +- .../Adminhtml/Oauth/ConsumerController.php | 2 +- .../Oauth/controllers/AuthorizeController.php | 2 +- .../controllers/Customer/TokenController.php | 2 +- .../Oauth/controllers/InitiateController.php | 2 +- .../Oauth/controllers/TokenController.php | 2 +- app/code/core/Mage/Oauth/etc/adminhtml.xml | 2 +- app/code/core/Mage/Oauth/etc/config.xml | 2 +- app/code/core/Mage/Oauth/etc/system.xml | 2 +- .../Oauth/sql/oauth_setup/install-1.0.0.0.php | 2 +- app/code/core/Mage/Page/Block/Html.php | 2 +- .../core/Mage/Page/Block/Html/Breadcrumbs.php | 2 +- .../Mage/Page/Block/Html/CookieNotice.php | 2 +- app/code/core/Mage/Page/Block/Html/Footer.php | 2 +- app/code/core/Mage/Page/Block/Html/Head.php | 22 +- app/code/core/Mage/Page/Block/Html/Header.php | 10 +- .../core/Mage/Page/Block/Html/Notices.php | 2 +- app/code/core/Mage/Page/Block/Html/Pager.php | 2 +- .../core/Mage/Page/Block/Html/Toplinks.php | 2 +- .../core/Mage/Page/Block/Html/Topmenu.php | 10 +- .../Mage/Page/Block/Html/Topmenu/Renderer.php | 92 - .../core/Mage/Page/Block/Html/Welcome.php | 2 +- .../core/Mage/Page/Block/Html/Wrapper.php | 2 +- app/code/core/Mage/Page/Block/Js/Cookie.php | 2 +- .../core/Mage/Page/Block/Js/Translate.php | 2 +- app/code/core/Mage/Page/Block/Redirect.php | 2 +- app/code/core/Mage/Page/Block/Switch.php | 2 +- .../Mage/Page/Block/Template/Container.php | 2 +- .../core/Mage/Page/Block/Template/Links.php | 2 +- .../Mage/Page/Block/Template/Links/Block.php | 2 +- app/code/core/Mage/Page/Helper/Data.php | 2 +- app/code/core/Mage/Page/Helper/Html.php | 2 +- app/code/core/Mage/Page/Helper/Layout.php | 2 +- app/code/core/Mage/Page/Model/Config.php | 2 +- .../core/Mage/Page/Model/Source/Layout.php | 2 +- app/code/core/Mage/Page/etc/config.xml | 5 +- app/code/core/Mage/Page/etc/system.xml | 10 +- .../Block/Adminhtml/Cache/Additional.php | 2 +- app/code/core/Mage/PageCache/Helper/Data.php | 2 +- .../PageCache/Model/Control/Interface.php | 2 +- .../Mage/PageCache/Model/Control/Zend.php | 2 +- .../core/Mage/PageCache/Model/Observer.php | 2 +- .../Model/System/Config/Source/Controls.php | 2 +- .../Adminhtml/PageCacheController.php | 2 +- .../core/Mage/PageCache/etc/adminhtml.xml | 2 +- app/code/core/Mage/PageCache/etc/config.xml | 2 +- app/code/core/Mage/PageCache/etc/system.xml | 2 +- .../Paygate/Block/Authorizenet/Form/Cc.php | 2 +- .../Paygate/Block/Authorizenet/Info/Cc.php | 2 +- app/code/core/Mage/Paygate/Helper/Data.php | 2 +- .../core/Mage/Paygate/Model/Authorizenet.php | 2 +- .../Mage/Paygate/Model/Authorizenet/Cards.php | 2 +- .../Mage/Paygate/Model/Authorizenet/Debug.php | 2 +- .../Paygate/Model/Authorizenet/Request.php | 2 +- .../Paygate/Model/Authorizenet/Result.php | 2 +- .../Model/Authorizenet/Source/Cctype.php | 2 +- .../Authorizenet/Source/PaymentAction.php | 2 +- .../Model/Mysql4/Authorizenet/Debug.php | 2 +- .../Mysql4/Authorizenet/Debug/Collection.php | 2 +- .../Model/Resource/Authorizenet/Debug.php | 2 +- .../Authorizenet/Debug/Collection.php | 2 +- .../Authorizenet/PaymentController.php | 2 +- .../Authorizenet/PaymentController.php | 2 +- app/code/core/Mage/Paygate/etc/config.xml | 2 +- app/code/core/Mage/Paygate/etc/system.xml | 2 +- .../sql/paygate_setup/install-1.6.0.0.php | 2 +- .../mysql4-data-upgrade-0.7.0-0.7.1.php | 2 +- .../paygate_setup/mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../Block/Catalog/Product/View/Profile.php | 2 +- app/code/core/Mage/Payment/Block/Form.php | 2 +- .../Mage/Payment/Block/Form/Banktransfer.php | 2 +- .../Payment/Block/Form/Cashondelivery.php | 2 +- app/code/core/Mage/Payment/Block/Form/Cc.php | 2 +- .../core/Mage/Payment/Block/Form/Ccsave.php | 2 +- .../core/Mage/Payment/Block/Form/Checkmo.php | 2 +- .../Mage/Payment/Block/Form/Container.php | 2 +- .../Mage/Payment/Block/Form/Purchaseorder.php | 2 +- app/code/core/Mage/Payment/Block/Info.php | 2 +- .../Mage/Payment/Block/Info/Banktransfer.php | 2 +- app/code/core/Mage/Payment/Block/Info/Cc.php | 2 +- .../core/Mage/Payment/Block/Info/Ccsave.php | 2 +- .../core/Mage/Payment/Block/Info/Checkmo.php | 2 +- .../Mage/Payment/Block/Info/Container.php | 2 +- .../Mage/Payment/Block/Info/Purchaseorder.php | 2 +- app/code/core/Mage/Payment/Exception.php | 2 +- app/code/core/Mage/Payment/Helper/Data.php | 2 +- .../Billing/Agreement/MethodInterface.php | 2 +- .../Model/Billing/AgreementAbstract.php | 2 +- app/code/core/Mage/Payment/Model/Config.php | 2 +- app/code/core/Mage/Payment/Model/Info.php | 2 +- .../Mage/Payment/Model/Info/Exception.php | 2 +- .../Mage/Payment/Model/Method/Abstract.php | 2 +- .../Payment/Model/Method/Banktransfer.php | 2 +- .../Payment/Model/Method/Cashondelivery.php | 2 +- .../core/Mage/Payment/Model/Method/Cc.php | 41 +- .../core/Mage/Payment/Model/Method/Ccsave.php | 2 +- .../Mage/Payment/Model/Method/Checkmo.php | 2 +- .../core/Mage/Payment/Model/Method/Free.php | 2 +- .../Payment/Model/Method/Purchaseorder.php | 2 +- app/code/core/Mage/Payment/Model/Observer.php | 2 +- .../Mage/Payment/Model/Paygate/Request.php | 2 +- .../Mage/Payment/Model/Paygate/Result.php | 2 +- .../Mage/Payment/Model/Recurring/Profile.php | 2 +- .../Recurring/Profile/MethodInterface.php | 2 +- .../core/Mage/Payment/Model/Source/Cctype.php | 2 +- .../Mage/Payment/Model/Source/Invoice.php | 2 +- app/code/core/Mage/Payment/etc/adminhtml.xml | 2 +- app/code/core/Mage/Payment/etc/config.xml | 2 +- app/code/core/Mage/Payment/etc/system.xml | 2 +- .../Block/Adminhtml/Settlement/Details.php | 2 +- .../Adminhtml/Settlement/Details/Form.php | 2 +- .../Block/Adminhtml/Settlement/Report.php | 2 +- .../Adminhtml/Settlement/Report/Grid.php | 2 +- .../Adminhtml/System/Config/ApiWizard.php | 48 +- .../Adminhtml/System/Config/BmlApiWizard.php | 48 - .../Adminhtml/System/Config/Field/Country.php | 2 +- .../Adminhtml/System/Config/Field/Hidden.php | 2 +- .../System/Config/Field/SolutionType.php | 52 - .../System/Config/Fieldset/Deprecated.php | 143 - .../System/Config/Fieldset/Expanded.php | 2 +- .../System/Config/Fieldset/Global.php | 2 +- .../System/Config/Fieldset/Group.php | 2 +- .../Adminhtml/System/Config/Fieldset/Hint.php | 2 +- .../System/Config/Fieldset/Location.php | 34 +- .../System/Config/Fieldset/Payment.php | 25 +- .../System/Config/Fieldset/Store.php | 2 +- .../System/Config/Payflowlink/Advanced.php | 2 +- .../System/Config/Payflowlink/Info.php | 2 +- .../core/Mage/Paypal/Block/Bml/Banners.php | 85 - app/code/core/Mage/Paypal/Block/Bml/Form.php | 58 - .../core/Mage/Paypal/Block/Express/Form.php | 2 +- .../core/Mage/Paypal/Block/Express/Review.php | 8 +- .../Paypal/Block/Express/Review/Billing.php | 2 +- .../Paypal/Block/Express/Review/Details.php | 2 +- .../Paypal/Block/Express/Review/Shipping.php | 2 +- .../Mage/Paypal/Block/Express/Shortcut.php | 42 +- .../Mage/Paypal/Block/Hosted/Pro/Form.php | 2 +- .../Mage/Paypal/Block/Hosted/Pro/Iframe.php | 2 +- .../Mage/Paypal/Block/Hosted/Pro/Info.php | 2 +- app/code/core/Mage/Paypal/Block/Iframe.php | 2 +- app/code/core/Mage/Paypal/Block/Logo.php | 2 +- .../Paypal/Block/Payflow/Advanced/Form.php | 2 +- .../Paypal/Block/Payflow/Advanced/Iframe.php | 2 +- .../Paypal/Block/Payflow/Advanced/Info.php | 2 +- .../Paypal/Block/Payflow/Advanced/Review.php | 2 +- .../Mage/Paypal/Block/Payflow/Link/Form.php | 2 +- .../Mage/Paypal/Block/Payflow/Link/Iframe.php | 2 +- .../Mage/Paypal/Block/Payflow/Link/Info.php | 2 +- .../Mage/Paypal/Block/Payflow/Link/Review.php | 2 +- .../core/Mage/Paypal/Block/Payment/Info.php | 2 +- .../core/Mage/Paypal/Block/Standard/Form.php | 2 +- .../Mage/Paypal/Block/Standard/Redirect.php | 2 +- .../Paypal/Controller/Express/Abstract.php | 158 +- app/code/core/Mage/Paypal/Exception.php | 2 +- app/code/core/Mage/Paypal/Helper/Checkout.php | 2 +- app/code/core/Mage/Paypal/Helper/Data.php | 21 +- app/code/core/Mage/Paypal/Helper/Hss.php | 2 +- .../core/Mage/Paypal/Model/Api/Abstract.php | 2 +- app/code/core/Mage/Paypal/Model/Api/Nvp.php | 135 +- .../Paypal/Model/Api/ProcessableException.php | 69 - .../core/Mage/Paypal/Model/Api/Standard.php | 2 +- app/code/core/Mage/Paypal/Model/Bml.php | 53 - app/code/core/Mage/Paypal/Model/Cart.php | 2 +- app/code/core/Mage/Paypal/Model/Cert.php | 2 +- app/code/core/Mage/Paypal/Model/Config.php | 197 +- app/code/core/Mage/Paypal/Model/Direct.php | 2 +- app/code/core/Mage/Paypal/Model/Express.php | 53 +- .../Mage/Paypal/Model/Express/Checkout.php | 174 +- app/code/core/Mage/Paypal/Model/Hostedpro.php | 2 +- .../Mage/Paypal/Model/Hostedpro/Request.php | 15 +- app/code/core/Mage/Paypal/Model/Info.php | 2 +- app/code/core/Mage/Paypal/Model/Ipn.php | 111 +- .../Mage/Paypal/Model/Method/Agreement.php | 2 +- .../core/Mage/Paypal/Model/Mysql4/Cert.php | 2 +- .../Paypal/Model/Mysql4/Report/Settlement.php | 2 +- .../Model/Mysql4/Report/Settlement/Row.php | 2 +- .../Report/Settlement/Row/Collection.php | 2 +- .../core/Mage/Paypal/Model/Mysql4/Setup.php | 2 +- app/code/core/Mage/Paypal/Model/Observer.php | 13 +- .../Mage/Paypal/Model/Payflow/Request.php | 2 +- .../Mage/Paypal/Model/Payflowadvanced.php | 2 +- .../core/Mage/Paypal/Model/Payflowlink.php | 4 +- .../core/Mage/Paypal/Model/Payflowpro.php | 4 +- .../Mage/Paypal/Model/Payment/Transaction.php | 2 +- app/code/core/Mage/Paypal/Model/Pro.php | 2 +- .../Mage/Paypal/Model/Report/Settlement.php | 2 +- .../Paypal/Model/Report/Settlement/Row.php | 2 +- .../core/Mage/Paypal/Model/Resource/Cert.php | 2 +- .../Model/Resource/Payment/Transaction.php | 2 +- .../Payment/Transaction/Collection.php | 2 +- .../Model/Resource/Report/Settlement.php | 2 +- .../Model/Resource/Report/Settlement/Row.php | 2 +- .../Report/Settlement/Row/Collection.php | 2 +- .../core/Mage/Paypal/Model/Resource/Setup.php | 2 +- app/code/core/Mage/Paypal/Model/Session.php | 2 +- app/code/core/Mage/Paypal/Model/Standard.php | 2 +- .../Model/System/Config/Backend/Cert.php | 2 +- .../Model/System/Config/Backend/Cron.php | 2 +- .../System/Config/Backend/MerchantCountry.php | 2 +- .../Config/Source/AuthorizationAmounts.php | 2 +- .../System/Config/Source/BmlPosition.php | 87 - .../Model/System/Config/Source/BmlSize.php | 166 - .../System/Config/Source/BuyerCountry.php | 2 +- .../System/Config/Source/FetchingSchedule.php | 2 +- .../Model/System/Config/Source/Logo.php | 2 +- .../System/Config/Source/MerchantCountry.php | 2 +- .../System/Config/Source/PaymentActions.php | 2 +- .../Config/Source/PaymentActions/Express.php | 2 +- .../Config/Source/RequireBillingAddress.php | 2 +- .../Model/System/Config/Source/UrlMethod.php | 2 +- .../Adminhtml/Paypal/ReportsController.php | 2 +- .../Mage/Paypal/controllers/BmlController.php | 42 - .../Paypal/controllers/ExpressController.php | 2 +- .../controllers/HostedproController.php | 2 +- .../Mage/Paypal/controllers/IpnController.php | 2 +- .../Paypal/controllers/PayflowController.php | 3 +- .../controllers/PayflowadvancedController.php | 2 +- .../Paypal/controllers/StandardController.php | 2 +- .../paypal_setup/data-install-1.6.0.5.php | 45 - .../data-upgrade-1.6.0.2-1.6.0.3.php | 2 +- .../data-upgrade-1.6.0.4-1.6.0.5.php | 32 - app/code/core/Mage/Paypal/etc/adminhtml.xml | 2 +- app/code/core/Mage/Paypal/etc/config.xml | 14 +- app/code/core/Mage/Paypal/etc/system.xml | 1096 +- .../sql/paypal_setup/install-1.6.0.0.php | 2 +- .../sql/paypal_setup/mysql4-install-0.7.0.php | 2 +- .../paypal_setup/mysql4-install-1.4.0.0.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-1.4.0.0-1.4.0.1.php | 2 +- .../mysql4-upgrade-1.4.0.1-1.4.0.2.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../paypal_setup/upgrade-1.6.0.0-1.6.0.1.php | 2 +- .../paypal_setup/upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../paypal_setup/upgrade-1.6.0.3-1.6.0.4.php | 2 +- .../core/Mage/PaypalUk/Block/Bml/Form.php | 37 - .../core/Mage/PaypalUk/Block/Express/Form.php | 2 +- .../Mage/PaypalUk/Block/Express/Shortcut.php | 23 +- app/code/core/Mage/PaypalUk/Helper/Data.php | 2 +- .../Mage/PaypalUk/Model/Api/Express/Nvp.php | 2 +- app/code/core/Mage/PaypalUk/Model/Api/Nvp.php | 4 +- app/code/core/Mage/PaypalUk/Model/Bml.php | 53 - app/code/core/Mage/PaypalUk/Model/Direct.php | 2 +- app/code/core/Mage/PaypalUk/Model/Express.php | 2 +- .../Mage/PaypalUk/Model/Express/Checkout.php | 2 +- .../core/Mage/PaypalUk/Model/Express/Pro.php | 2 +- app/code/core/Mage/PaypalUk/Model/Pro.php | 2 +- app/code/core/Mage/PaypalUk/Model/Session.php | 2 +- .../PaypalUk/controllers/BmlController.php | 39 - .../controllers/ExpressController.php | 2 +- app/code/core/Mage/PaypalUk/etc/config.xml | 7 +- .../sql/paypaluk_setup/install-1.6.0.0.php | 2 +- .../paypaluk_setup/mysql4-install-0.7.0.php | 2 +- .../Mage/Persistent/Block/Form/Remember.php | 2 +- .../Persistent/Block/Header/Additional.php | 2 +- app/code/core/Mage/Persistent/Helper/Data.php | 2 +- .../core/Mage/Persistent/Helper/Session.php | 2 +- .../core/Mage/Persistent/Model/Observer.php | 2 +- .../Persistent/Model/Observer/Session.php | 2 +- .../Persistent/Model/Persistent/Config.php | 2 +- .../Persistent/Model/Resource/Session.php | 2 +- .../core/Mage/Persistent/Model/Session.php | 2 +- .../controllers/IndexController.php | 2 +- .../core/Mage/Persistent/etc/adminhtml.xml | 2 +- app/code/core/Mage/Persistent/etc/config.xml | 2 +- .../core/Mage/Persistent/etc/persistent.xml | 2 +- app/code/core/Mage/Persistent/etc/system.xml | 2 +- .../sql/persistent_setup/install-1.0.0.0.php | 2 +- app/code/core/Mage/Poll/Block/ActivePoll.php | 2 +- app/code/core/Mage/Poll/Block/Poll.php | 2 +- app/code/core/Mage/Poll/Helper/Data.php | 2 +- app/code/core/Mage/Poll/Model/Mysql4/Poll.php | 2 +- .../Mage/Poll/Model/Mysql4/Poll/Answer.php | 2 +- .../Model/Mysql4/Poll/Answer/Collection.php | 2 +- .../Poll/Model/Mysql4/Poll/Collection.php | 2 +- .../core/Mage/Poll/Model/Mysql4/Poll/Vote.php | 2 +- app/code/core/Mage/Poll/Model/Poll.php | 2 +- app/code/core/Mage/Poll/Model/Poll/Answer.php | 2 +- app/code/core/Mage/Poll/Model/Poll/Vote.php | 2 +- .../core/Mage/Poll/Model/Resource/Poll.php | 2 +- .../Mage/Poll/Model/Resource/Poll/Answer.php | 2 +- .../Model/Resource/Poll/Answer/Collection.php | 2 +- .../Poll/Model/Resource/Poll/Collection.php | 2 +- .../Mage/Poll/Model/Resource/Poll/Vote.php | 2 +- .../Mage/Poll/controllers/VoteController.php | 2 +- .../data/poll_setup/data-install-1.6.0.0.php | 2 +- app/code/core/Mage/Poll/etc/adminhtml.xml | 2 +- app/code/core/Mage/Poll/etc/config.xml | 2 +- app/code/core/Mage/Poll/etc/system.xml | 2 +- .../Poll/sql/poll_setup/install-1.6.0.0.php | 2 +- .../sql/poll_setup/mysql4-install-0.7.0.php | 2 +- .../poll_setup/mysql4-upgrade-0.6.0-0.6.1.php | 2 +- .../poll_setup/mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../ProductAlert/Block/Email/Abstract.php | 2 +- .../Mage/ProductAlert/Block/Email/Price.php | 2 +- .../Mage/ProductAlert/Block/Email/Stock.php | 2 +- .../core/Mage/ProductAlert/Block/Price.php | 2 +- .../Mage/ProductAlert/Block/Product/View.php | 2 +- .../core/Mage/ProductAlert/Block/Stock.php | 2 +- .../core/Mage/ProductAlert/Helper/Data.php | 2 +- .../core/Mage/ProductAlert/Model/Email.php | 2 +- .../Mage/ProductAlert/Model/Mysql4/Price.php | 2 +- .../Model/Mysql4/Price/Collection.php | 2 +- .../Mysql4/Price/Customer/Collection.php | 2 +- .../Mage/ProductAlert/Model/Mysql4/Stock.php | 2 +- .../Model/Mysql4/Stock/Collection.php | 2 +- .../Mysql4/Stock/Customer/Collection.php | 2 +- .../core/Mage/ProductAlert/Model/Observer.php | 2 +- .../core/Mage/ProductAlert/Model/Price.php | 2 +- .../ProductAlert/Model/Resource/Abstract.php | 2 +- .../ProductAlert/Model/Resource/Price.php | 2 +- .../Model/Resource/Price/Collection.php | 2 +- .../Resource/Price/Customer/Collection.php | 2 +- .../ProductAlert/Model/Resource/Stock.php | 2 +- .../Model/Resource/Stock/Collection.php | 2 +- .../Resource/Stock/Customer/Collection.php | 2 +- .../core/Mage/ProductAlert/Model/Stock.php | 2 +- .../controllers/AddController.php | 2 +- .../controllers/UnsubscribeController.php | 2 +- .../core/Mage/ProductAlert/etc/config.xml | 2 +- .../core/Mage/ProductAlert/etc/system.xml | 2 +- .../productalert_setup/install-1.6.0.0.php | 2 +- .../mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../Mage/Rating/Block/Entity/Detailed.php | 2 +- app/code/core/Mage/Rating/Helper/Data.php | 2 +- .../core/Mage/Rating/Model/Mysql4/Rating.php | 2 +- .../Rating/Model/Mysql4/Rating/Collection.php | 2 +- .../Rating/Model/Mysql4/Rating/Entity.php | 2 +- .../Rating/Model/Mysql4/Rating/Option.php | 2 +- .../Model/Mysql4/Rating/Option/Collection.php | 2 +- .../Model/Mysql4/Rating/Option/Vote.php | 2 +- .../Mysql4/Rating/Option/Vote/Collection.php | 2 +- app/code/core/Mage/Rating/Model/Observer.php | 2 +- app/code/core/Mage/Rating/Model/Rating.php | 2 +- .../core/Mage/Rating/Model/Rating/Entity.php | 2 +- .../core/Mage/Rating/Model/Rating/Option.php | 2 +- .../Mage/Rating/Model/Rating/Option/Vote.php | 2 +- .../Mage/Rating/Model/Resource/Rating.php | 2 +- .../Model/Resource/Rating/Collection.php | 2 +- .../Rating/Model/Resource/Rating/Entity.php | 2 +- .../Rating/Model/Resource/Rating/Option.php | 2 +- .../Resource/Rating/Option/Collection.php | 2 +- .../Model/Resource/Rating/Option/Vote.php | 2 +- .../Rating/Option/Vote/Collection.php | 2 +- .../rating_setup/data-install-1.6.0.0.php | 2 +- app/code/core/Mage/Rating/etc/adminhtml.xml | 2 +- app/code/core/Mage/Rating/etc/config.xml | 2 +- .../sql/rating_setup/install-1.6.0.0.php | 2 +- .../sql/rating_setup/mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../Mage/Reports/Block/Product/Abstract.php | 2 +- .../Mage/Reports/Block/Product/Compared.php | 2 +- .../Mage/Reports/Block/Product/Viewed.php | 2 +- .../Reports/Block/Product/Widget/Compared.php | 2 +- .../Reports/Block/Product/Widget/Viewed.php | 2 +- app/code/core/Mage/Reports/Exception.php | 2 +- app/code/core/Mage/Reports/Helper/Data.php | 2 +- app/code/core/Mage/Reports/Model/Config.php | 2 +- app/code/core/Mage/Reports/Model/Event.php | 2 +- .../Mage/Reports/Model/Event/Observer.php | 2 +- .../core/Mage/Reports/Model/Event/Type.php | 2 +- app/code/core/Mage/Reports/Model/Flag.php | 2 +- .../Mage/Reports/Model/Grouped/Collection.php | 2 +- .../Model/Mysql4/Accounts/Collection.php | 2 +- .../Model/Mysql4/Coupons/Collection.php | 2 +- .../Model/Mysql4/Customer/Collection.php | 2 +- .../Mysql4/Customer/Orders/Collection.php | 2 +- .../Mysql4/Customer/Totals/Collection.php | 2 +- .../Entity/Summary/Collection/Abstract.php | 2 +- .../core/Mage/Reports/Model/Mysql4/Event.php | 2 +- .../Reports/Model/Mysql4/Event/Collection.php | 2 +- .../Mage/Reports/Model/Mysql4/Event/Type.php | 2 +- .../Model/Mysql4/Event/Type/Collection.php | 2 +- .../Model/Mysql4/Invoiced/Collection.php | 2 +- .../Reports/Model/Mysql4/Order/Collection.php | 2 +- .../Model/Mysql4/Product/Collection.php | 2 +- .../Mysql4/Product/Downloads/Collection.php | 2 +- .../Model/Mysql4/Product/Index/Abstract.php | 2 +- .../Product/Index/Collection/Abstract.php | 2 +- .../Model/Mysql4/Product/Index/Compared.php | 2 +- .../Product/Index/Compared/Collection.php | 2 +- .../Model/Mysql4/Product/Index/Viewed.php | 2 +- .../Product/Index/Viewed/Collection.php | 2 +- .../Mysql4/Product/Lowstock/Collection.php | 2 +- .../Mysql4/Product/Ordered/Collection.php | 2 +- .../Model/Mysql4/Product/Sold/Collection.php | 2 +- .../Mysql4/Product/Viewed/Collection.php | 2 +- .../Reports/Model/Mysql4/Quote/Collection.php | 2 +- .../Model/Mysql4/Refunded/Collection.php | 2 +- .../Reports/Model/Mysql4/Report/Abstract.php | 2 +- .../Model/Mysql4/Report/Collection.php | 2 +- .../Model/Mysql4/Review/Collection.php | 2 +- .../Mysql4/Review/Customer/Collection.php | 2 +- .../Mysql4/Review/Product/Collection.php | 2 +- .../Model/Mysql4/Shipping/Collection.php | 2 +- .../Mysql4/Shopcart/Product/Collection.php | 2 +- .../Reports/Model/Mysql4/Tag/Collection.php | 2 +- .../Model/Mysql4/Tag/Customer/Collection.php | 2 +- .../Model/Mysql4/Tag/Product/Collection.php | 2 +- .../Reports/Model/Mysql4/Tax/Collection.php | 2 +- .../Model/Mysql4/Wishlist/Collection.php | 2 +- .../Mysql4/Wishlist/Product/Collection.php | 2 +- .../Reports/Model/Product/Index/Abstract.php | 2 +- .../Reports/Model/Product/Index/Compared.php | 2 +- .../Reports/Model/Product/Index/Viewed.php | 2 +- app/code/core/Mage/Reports/Model/Report.php | 2 +- .../Model/Resource/Accounts/Collection.php | 2 +- .../Model/Resource/Coupons/Collection.php | 2 +- .../Model/Resource/Customer/Collection.php | 2 +- .../Resource/Customer/Orders/Collection.php | 2 +- .../Resource/Customer/Totals/Collection.php | 2 +- .../Entity/Summary/Collection/Abstract.php | 2 +- .../Mage/Reports/Model/Resource/Event.php | 2 +- .../Model/Resource/Event/Collection.php | 2 +- .../Reports/Model/Resource/Event/Type.php | 2 +- .../Model/Resource/Event/Type/Collection.php | 2 +- .../Model/Resource/Helper/Interface.php | 2 +- .../Reports/Model/Resource/Helper/Mysql4.php | 2 +- .../Model/Resource/Invoiced/Collection.php | 2 +- .../Model/Resource/Order/Collection.php | 2 +- .../Model/Resource/Product/Collection.php | 2 +- .../Resource/Product/Downloads/Collection.php | 2 +- .../Model/Resource/Product/Index/Abstract.php | 2 +- .../Product/Index/Collection/Abstract.php | 2 +- .../Model/Resource/Product/Index/Compared.php | 2 +- .../Product/Index/Compared/Collection.php | 2 +- .../Model/Resource/Product/Index/Viewed.php | 2 +- .../Product/Index/Viewed/Collection.php | 2 +- .../Resource/Product/Lowstock/Collection.php | 2 +- .../Resource/Product/Ordered/Collection.php | 2 +- .../Resource/Product/Sold/Collection.php | 2 +- .../Resource/Product/Viewed/Collection.php | 2 +- .../Model/Resource/Quote/Collection.php | 2 +- .../Model/Resource/Refunded/Collection.php | 2 +- .../Model/Resource/Report/Abstract.php | 2 +- .../Model/Resource/Report/Collection.php | 2 +- .../Resource/Report/Collection/Abstract.php | 2 +- .../Model/Resource/Report/Product/Viewed.php | 2 +- .../Report/Product/Viewed/Collection.php | 2 +- .../Model/Resource/Review/Collection.php | 2 +- .../Resource/Review/Customer/Collection.php | 2 +- .../Resource/Review/Product/Collection.php | 2 +- .../Model/Resource/Shipping/Collection.php | 2 +- .../Resource/Shopcart/Product/Collection.php | 2 +- .../Reports/Model/Resource/Tag/Collection.php | 2 +- .../Resource/Tag/Customer/Collection.php | 2 +- .../Model/Resource/Tag/Product/Collection.php | 2 +- .../Reports/Model/Resource/Tax/Collection.php | 2 +- .../Model/Resource/Wishlist/Collection.php | 2 +- .../Resource/Wishlist/Product/Collection.php | 2 +- app/code/core/Mage/Reports/Model/Session.php | 2 +- app/code/core/Mage/Reports/Model/Test.php | 2 +- app/code/core/Mage/Reports/Model/Totals.php | 2 +- .../reports_setup/data-install-1.6.0.0.php | 2 +- app/code/core/Mage/Reports/etc/adminhtml.xml | 2 +- app/code/core/Mage/Reports/etc/config.xml | 2 +- app/code/core/Mage/Reports/etc/system.xml | 2 +- app/code/core/Mage/Reports/etc/widget.xml | 2 +- .../sql/reports_setup/install-1.6.0.0.php | 2 +- .../reports_setup/mysql4-install-0.7.1.php | 2 +- .../reports_setup/mysql4-install-1.5.0.0.php | 2 +- .../reports_setup/mysql4-install-1.6.0.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../mysql4-upgrade-0.7.5-0.7.7.php | 2 +- .../mysql4-upgrade-0.7.7-0.7.8.php | 2 +- .../mysql4-upgrade-0.7.8-0.7.9.php | 2 +- .../mysql4-upgrade-0.7.9-0.7.10.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../upgrade-1.6.0.0-1.6.0.0.1.php | 2 +- .../core/Mage/Review/Block/Customer/List.php | 2 +- .../Mage/Review/Block/Customer/Recent.php | 2 +- .../core/Mage/Review/Block/Customer/View.php | 2 +- app/code/core/Mage/Review/Block/Form.php | 2 +- app/code/core/Mage/Review/Block/Helper.php | 2 +- .../core/Mage/Review/Block/Product/View.php | 2 +- .../Mage/Review/Block/Product/View/List.php | 4 +- app/code/core/Mage/Review/Block/View.php | 2 +- app/code/core/Mage/Review/Helper/Data.php | 2 +- .../core/Mage/Review/Model/Mysql4/Review.php | 2 +- .../Review/Model/Mysql4/Review/Collection.php | 2 +- .../Mysql4/Review/Product/Collection.php | 2 +- .../Model/Mysql4/Review/Status/Collection.php | 2 +- .../Review/Model/Mysql4/Review/Summary.php | 2 +- .../Mysql4/Review/Summary/Collection.php | 2 +- app/code/core/Mage/Review/Model/Observer.php | 2 +- .../Mage/Review/Model/Resource/Review.php | 2 +- .../Model/Resource/Review/Collection.php | 2 +- .../Resource/Review/Product/Collection.php | 2 +- .../Review/Model/Resource/Review/Status.php | 2 +- .../Resource/Review/Status/Collection.php | 2 +- .../Review/Model/Resource/Review/Summary.php | 2 +- .../Resource/Review/Summary/Collection.php | 2 +- app/code/core/Mage/Review/Model/Review.php | 2 +- .../core/Mage/Review/Model/Review/Status.php | 2 +- .../core/Mage/Review/Model/Review/Summary.php | 2 +- app/code/core/Mage/Review/Model/Session.php | 2 +- .../Review/controllers/CustomerController.php | 2 +- .../Review/controllers/ProductController.php | 2 +- .../review_setup/data-install-1.6.0.0.php | 2 +- app/code/core/Mage/Review/etc/adminhtml.xml | 2 +- app/code/core/Mage/Review/etc/config.xml | 2 +- app/code/core/Mage/Review/etc/system.xml | 2 +- .../sql/review_setup/install-1.6.0.0.php | 2 +- .../sql/review_setup/mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- app/code/core/Mage/Rss/Block/Abstract.php | 2 +- .../core/Mage/Rss/Block/Catalog/Abstract.php | 2 +- .../core/Mage/Rss/Block/Catalog/Category.php | 2 +- app/code/core/Mage/Rss/Block/Catalog/New.php | 2 +- .../Mage/Rss/Block/Catalog/NotifyStock.php | 2 +- .../core/Mage/Rss/Block/Catalog/Review.php | 2 +- .../core/Mage/Rss/Block/Catalog/Salesrule.php | 2 +- .../core/Mage/Rss/Block/Catalog/Special.php | 2 +- app/code/core/Mage/Rss/Block/Catalog/Tag.php | 2 +- app/code/core/Mage/Rss/Block/List.php | 2 +- .../core/Mage/Rss/Block/Order/Details.php | 2 +- app/code/core/Mage/Rss/Block/Order/New.php | 2 +- app/code/core/Mage/Rss/Block/Order/Status.php | 2 +- app/code/core/Mage/Rss/Block/Wishlist.php | 2 +- app/code/core/Mage/Rss/Helper/Catalog.php | 2 +- app/code/core/Mage/Rss/Helper/Data.php | 2 +- app/code/core/Mage/Rss/Helper/Order.php | 2 +- app/code/core/Mage/Rss/Model/Mysql4/Order.php | 2 +- app/code/core/Mage/Rss/Model/Observer.php | 2 +- .../core/Mage/Rss/Model/Resource/Order.php | 2 +- app/code/core/Mage/Rss/Model/Rss.php | 2 +- app/code/core/Mage/Rss/Model/Session.php | 2 +- .../Rss/Model/System/Config/Backend/Links.php | 2 +- .../Rss/controllers/CatalogController.php | 2 +- .../Mage/Rss/controllers/IndexController.php | 2 +- .../Mage/Rss/controllers/OrderController.php | 2 +- app/code/core/Mage/Rss/etc/adminhtml.xml | 2 +- app/code/core/Mage/Rss/etc/config.xml | 2 +- app/code/core/Mage/Rss/etc/system.xml | 2 +- app/code/core/Mage/Rule/Block/Actions.php | 2 +- app/code/core/Mage/Rule/Block/Conditions.php | 2 +- app/code/core/Mage/Rule/Block/Editable.php | 2 +- app/code/core/Mage/Rule/Block/Newchild.php | 2 +- app/code/core/Mage/Rule/Block/Rule.php | 2 +- app/code/core/Mage/Rule/Helper/Data.php | 2 +- app/code/core/Mage/Rule/Model/Abstract.php | 2 +- .../core/Mage/Rule/Model/Action/Abstract.php | 2 +- .../Mage/Rule/Model/Action/Collection.php | 2 +- .../core/Mage/Rule/Model/Action/Interface.php | 2 +- .../Mage/Rule/Model/Condition/Abstract.php | 2 +- .../Mage/Rule/Model/Condition/Combine.php | 2 +- .../Mage/Rule/Model/Condition/Interface.php | 2 +- .../Rule/Model/Condition/Product/Abstract.php | 4 +- app/code/core/Mage/Rule/Model/Environment.php | 2 +- app/code/core/Mage/Rule/Model/Mysql4/Rule.php | 2 +- .../Rule/Model/Mysql4/Rule/Collection.php | 2 +- .../core/Mage/Rule/Model/Renderer/Actions.php | 2 +- .../Mage/Rule/Model/Renderer/Conditions.php | 2 +- .../Mage/Rule/Model/Resource/Abstract.php | 2 +- .../core/Mage/Rule/Model/Resource/Rule.php | 2 +- .../Rule/Model/Resource/Rule/Collection.php | 2 +- .../Resource/Rule/Collection/Abstract.php | 2 +- .../Resource/Rule/Condition/SqlBuilder.php | 2 +- app/code/core/Mage/Rule/Model/Rule.php | 2 +- app/code/core/Mage/Rule/etc/config.xml | 2 +- .../Block/Adminhtml/Billing/Agreement.php | 2 +- .../Adminhtml/Billing/Agreement/Grid.php | 2 +- .../Adminhtml/Billing/Agreement/View.php | 2 +- .../Adminhtml/Billing/Agreement/View/Form.php | 2 +- .../Billing/Agreement/View/Tab/Info.php | 2 +- .../Billing/Agreement/View/Tab/Orders.php | 2 +- .../Adminhtml/Billing/Agreement/View/Tabs.php | 2 +- .../Adminhtml/Customer/Edit/Tab/Agreement.php | 2 +- .../Customer/Edit/Tab/Recurring/Profile.php | 2 +- .../Block/Adminhtml/Recurring/Profile.php | 2 +- .../Adminhtml/Recurring/Profile/Edit/Form.php | 2 +- .../Adminhtml/Recurring/Profile/Grid.php | 2 +- .../Adminhtml/Recurring/Profile/View.php | 2 +- .../Recurring/Profile/View/Getawayinfo.php | 2 +- .../Adminhtml/Recurring/Profile/View/Info.php | 2 +- .../Recurring/Profile/View/Items.php | 2 +- .../Recurring/Profile/View/Tab/Info.php | 2 +- .../Recurring/Profile/View/Tab/Orders.php | 3 +- .../Block/Adminhtml/Report/Filter/Form.php | 2 +- .../Adminhtml/Report/Filter/Form/Coupon.php | 2 +- .../Adminhtml/Report/Filter/Form/Order.php | 2 +- .../Sales/Block/Billing/Agreement/View.php | 2 +- .../Mage/Sales/Block/Billing/Agreements.php | 2 +- .../core/Mage/Sales/Block/Guest/Links.php | 2 +- .../core/Mage/Sales/Block/Items/Abstract.php | 2 +- .../core/Mage/Sales/Block/Order/Comments.php | 2 +- .../Mage/Sales/Block/Order/Creditmemo.php | 2 +- .../Sales/Block/Order/Creditmemo/Items.php | 2 +- .../Sales/Block/Order/Creditmemo/Totals.php | 2 +- .../core/Mage/Sales/Block/Order/Details.php | 2 +- .../Block/Order/Email/Creditmemo/Items.php | 2 +- .../Sales/Block/Order/Email/Invoice/Items.php | 2 +- .../Mage/Sales/Block/Order/Email/Items.php | 2 +- .../Sales/Block/Order/Email/Items/Default.php | 2 +- .../Block/Order/Email/Items/Order/Default.php | 2 +- .../Block/Order/Email/Items/Order/Grouped.php | 2 +- .../Block/Order/Email/Shipment/Items.php | 2 +- .../core/Mage/Sales/Block/Order/History.php | 2 +- app/code/core/Mage/Sales/Block/Order/Info.php | 2 +- .../Mage/Sales/Block/Order/Info/Buttons.php | 2 +- .../core/Mage/Sales/Block/Order/Invoice.php | 2 +- .../Mage/Sales/Block/Order/Invoice/Items.php | 2 +- .../Mage/Sales/Block/Order/Invoice/Totals.php | 2 +- .../Block/Order/Item/Renderer/Default.php | 2 +- .../Block/Order/Item/Renderer/Grouped.php | 2 +- .../core/Mage/Sales/Block/Order/Items.php | 2 +- .../core/Mage/Sales/Block/Order/Print.php | 2 +- .../Sales/Block/Order/Print/Creditmemo.php | 2 +- .../Mage/Sales/Block/Order/Print/Invoice.php | 2 +- .../Mage/Sales/Block/Order/Print/Shipment.php | 2 +- .../core/Mage/Sales/Block/Order/Recent.php | 2 +- .../core/Mage/Sales/Block/Order/Shipment.php | 2 +- .../Mage/Sales/Block/Order/Shipment/Items.php | 2 +- app/code/core/Mage/Sales/Block/Order/Tax.php | 2 +- .../core/Mage/Sales/Block/Order/Totals.php | 2 +- app/code/core/Mage/Sales/Block/Order/View.php | 2 +- .../Block/Payment/Form/Billing/Agreement.php | 2 +- .../Block/Payment/Info/Billing/Agreement.php | 2 +- .../Sales/Block/Recurring/Profile/View.php | 2 +- .../Mage/Sales/Block/Recurring/Profiles.php | 2 +- .../core/Mage/Sales/Block/Reorder/Sidebar.php | 2 +- .../Mage/Sales/Block/Widget/Guest/Form.php | 2 +- .../core/Mage/Sales/Controller/Abstract.php | 2 +- app/code/core/Mage/Sales/Exception.php | 2 +- app/code/core/Mage/Sales/Helper/Data.php | 2 +- app/code/core/Mage/Sales/Helper/Guest.php | 21 +- app/code/core/Mage/Sales/Helper/Reorder.php | 2 +- app/code/core/Mage/Sales/Model/Abstract.php | 2 +- .../core/Mage/Sales/Model/Api/Resource.php | 2 +- app/code/core/Mage/Sales/Model/Api2/Order.php | 2 +- .../Mage/Sales/Model/Api2/Order/Address.php | 2 +- .../Sales/Model/Api2/Order/Address/Rest.php | 2 +- .../Api2/Order/Address/Rest/Admin/V1.php | 2 +- .../Api2/Order/Address/Rest/Customer/V1.php | 2 +- .../Mage/Sales/Model/Api2/Order/Comment.php | 2 +- .../Sales/Model/Api2/Order/Comment/Rest.php | 2 +- .../Api2/Order/Comment/Rest/Admin/V1.php | 2 +- .../Api2/Order/Comment/Rest/Customer/V1.php | 2 +- .../core/Mage/Sales/Model/Api2/Order/Item.php | 2 +- .../Mage/Sales/Model/Api2/Order/Item/Rest.php | 2 +- .../Model/Api2/Order/Item/Rest/Admin/V1.php | 2 +- .../Api2/Order/Item/Rest/Customer/V1.php | 2 +- .../core/Mage/Sales/Model/Api2/Order/Rest.php | 2 +- .../Sales/Model/Api2/Order/Rest/Admin/V1.php | 2 +- .../Model/Api2/Order/Rest/Customer/V1.php | 2 +- .../Mage/Sales/Model/Billing/Agreement.php | 2 +- app/code/core/Mage/Sales/Model/Config.php | 2 +- .../core/Mage/Sales/Model/Config/Ordered.php | 2 +- .../core/Mage/Sales/Model/Convert/Order.php | 2 +- .../core/Mage/Sales/Model/Convert/Quote.php | 2 +- .../core/Mage/Sales/Model/Email/Template.php | 2 +- .../core/Mage/Sales/Model/Entity/Order.php | 2 +- .../Mage/Sales/Model/Entity/Order/Address.php | 2 +- .../Model/Entity/Order/Address/Collection.php | 2 +- .../Order/Attribute/Backend/Billing.php | 2 +- .../Entity/Order/Attribute/Backend/Child.php | 2 +- .../Entity/Order/Attribute/Backend/Parent.php | 2 +- .../Order/Attribute/Backend/Shipping.php | 2 +- .../Sales/Model/Entity/Order/Collection.php | 2 +- .../Sales/Model/Entity/Order/Creditmemo.php | 2 +- .../Creditmemo/Attribute/Backend/Child.php | 2 +- .../Creditmemo/Attribute/Backend/Parent.php | 2 +- .../Entity/Order/Creditmemo/Collection.php | 2 +- .../Model/Entity/Order/Creditmemo/Comment.php | 2 +- .../Order/Creditmemo/Comment/Collection.php | 2 +- .../Model/Entity/Order/Creditmemo/Item.php | 2 +- .../Order/Creditmemo/Item/Collection.php | 2 +- .../Mage/Sales/Model/Entity/Order/Invoice.php | 2 +- .../Order/Invoice/Attribute/Backend/Child.php | 2 +- .../Order/Invoice/Attribute/Backend/Item.php | 2 +- .../Order/Invoice/Attribute/Backend/Order.php | 2 +- .../Invoice/Attribute/Backend/Parent.php | 2 +- .../Model/Entity/Order/Invoice/Collection.php | 2 +- .../Model/Entity/Order/Invoice/Comment.php | 2 +- .../Order/Invoice/Comment/Collection.php | 2 +- .../Sales/Model/Entity/Order/Invoice/Item.php | 2 +- .../Entity/Order/Invoice/Item/Collection.php | 2 +- .../Mage/Sales/Model/Entity/Order/Item.php | 2 +- .../Model/Entity/Order/Item/Collection.php | 2 +- .../Mage/Sales/Model/Entity/Order/Payment.php | 2 +- .../Model/Entity/Order/Payment/Collection.php | 2 +- .../Sales/Model/Entity/Order/Shipment.php | 2 +- .../Shipment/Attribute/Backend/Child.php | 2 +- .../Shipment/Attribute/Backend/Parent.php | 2 +- .../Entity/Order/Shipment/Collection.php | 2 +- .../Model/Entity/Order/Shipment/Comment.php | 2 +- .../Order/Shipment/Comment/Collection.php | 2 +- .../Model/Entity/Order/Shipment/Item.php | 2 +- .../Entity/Order/Shipment/Item/Collection.php | 2 +- .../Model/Entity/Order/Shipment/Track.php | 2 +- .../Order/Shipment/Track/Collection.php | 2 +- .../Model/Entity/Order/Status/History.php | 2 +- .../Order/Status/History/Collection.php | 2 +- .../core/Mage/Sales/Model/Entity/Quote.php | 2 +- .../Mage/Sales/Model/Entity/Quote/Address.php | 2 +- .../Quote/Address/Attribute/Backend.php | 2 +- .../Quote/Address/Attribute/Backend/Child.php | 2 +- .../Address/Attribute/Backend/Parent.php | 2 +- .../Address/Attribute/Backend/Region.php | 2 +- .../Quote/Address/Attribute/Frontend.php | 2 +- .../Attribute/Frontend/Custbalance.php | 2 +- .../Address/Attribute/Frontend/Discount.php | 2 +- .../Address/Attribute/Frontend/Grand.php | 2 +- .../Address/Attribute/Frontend/Shipping.php | 2 +- .../Address/Attribute/Frontend/Subtotal.php | 2 +- .../Quote/Address/Attribute/Frontend/Tax.php | 2 +- .../Model/Entity/Quote/Address/Collection.php | 2 +- .../Sales/Model/Entity/Quote/Address/Item.php | 2 +- .../Entity/Quote/Address/Item/Collection.php | 2 +- .../Sales/Model/Entity/Quote/Address/Rate.php | 2 +- .../Entity/Quote/Address/Rate/Collection.php | 2 +- .../Sales/Model/Entity/Quote/Collection.php | 2 +- .../Mage/Sales/Model/Entity/Quote/Item.php | 2 +- .../Model/Entity/Quote/Item/Collection.php | 2 +- .../Mage/Sales/Model/Entity/Quote/Payment.php | 2 +- .../Model/Entity/Quote/Payment/Collection.php | 2 +- .../Sales/Model/Entity/Sale/Collection.php | 2 +- .../core/Mage/Sales/Model/Entity/Setup.php | 2 +- .../core/Mage/Sales/Model/Mysql4/Abstract.php | 2 +- .../Sales/Model/Mysql4/Billing/Agreement.php | 2 +- .../Mysql4/Billing/Agreement/Collection.php | 2 +- .../Model/Mysql4/Collection/Abstract.php | 2 +- .../core/Mage/Sales/Model/Mysql4/Order.php | 2 +- .../Sales/Model/Mysql4/Order/Abstract.php | 2 +- .../Mage/Sales/Model/Mysql4/Order/Address.php | 2 +- .../Model/Mysql4/Order/Address/Collection.php | 2 +- .../Order/Attribute/Backend/Billing.php | 2 +- .../Mysql4/Order/Attribute/Backend/Child.php | 2 +- .../Mysql4/Order/Attribute/Backend/Parent.php | 2 +- .../Order/Attribute/Backend/Shipping.php | 2 +- .../Sales/Model/Mysql4/Order/Collection.php | 2 +- .../Mysql4/Order/Collection/Abstract.php | 2 +- .../Order/Comment/Collection/Abstract.php | 2 +- .../Sales/Model/Mysql4/Order/Creditmemo.php | 2 +- .../Creditmemo/Attribute/Backend/Child.php | 2 +- .../Creditmemo/Attribute/Backend/Parent.php | 2 +- .../Mysql4/Order/Creditmemo/Collection.php | 2 +- .../Model/Mysql4/Order/Creditmemo/Comment.php | 2 +- .../Order/Creditmemo/Comment/Collection.php | 2 +- .../Order/Creditmemo/Grid/Collection.php | 2 +- .../Model/Mysql4/Order/Creditmemo/Item.php | 2 +- .../Order/Creditmemo/Item/Collection.php | 2 +- .../Model/Mysql4/Order/Grid/Collection.php | 2 +- .../Mage/Sales/Model/Mysql4/Order/Invoice.php | 2 +- .../Order/Invoice/Attribute/Backend/Child.php | 2 +- .../Order/Invoice/Attribute/Backend/Item.php | 2 +- .../Order/Invoice/Attribute/Backend/Order.php | 2 +- .../Invoice/Attribute/Backend/Parent.php | 2 +- .../Model/Mysql4/Order/Invoice/Collection.php | 2 +- .../Model/Mysql4/Order/Invoice/Comment.php | 2 +- .../Order/Invoice/Comment/Collection.php | 2 +- .../Mysql4/Order/Invoice/Grid/Collection.php | 2 +- .../Sales/Model/Mysql4/Order/Invoice/Item.php | 2 +- .../Mysql4/Order/Invoice/Item/Collection.php | 2 +- .../Mage/Sales/Model/Mysql4/Order/Item.php | 2 +- .../Model/Mysql4/Order/Item/Collection.php | 2 +- .../Mage/Sales/Model/Mysql4/Order/Payment.php | 2 +- .../Model/Mysql4/Order/Payment/Collection.php | 2 +- .../Mysql4/Order/Payment/Transaction.php | 2 +- .../Order/Payment/Transaction/Collection.php | 2 +- .../Sales/Model/Mysql4/Order/Shipment.php | 2 +- .../Shipment/Attribute/Backend/Child.php | 2 +- .../Shipment/Attribute/Backend/Parent.php | 2 +- .../Mysql4/Order/Shipment/Collection.php | 2 +- .../Model/Mysql4/Order/Shipment/Comment.php | 2 +- .../Order/Shipment/Comment/Collection.php | 2 +- .../Mysql4/Order/Shipment/Grid/Collection.php | 2 +- .../Model/Mysql4/Order/Shipment/Item.php | 2 +- .../Mysql4/Order/Shipment/Item/Collection.php | 2 +- .../Model/Mysql4/Order/Shipment/Track.php | 2 +- .../Order/Shipment/Track/Collection.php | 2 +- .../Mage/Sales/Model/Mysql4/Order/Status.php | 2 +- .../Model/Mysql4/Order/Status/Collection.php | 2 +- .../Model/Mysql4/Order/Status/History.php | 2 +- .../Order/Status/History/Collection.php | 2 +- .../Mage/Sales/Model/Mysql4/Order/Tax.php | 2 +- .../Model/Mysql4/Order/Tax/Collection.php | 2 +- .../core/Mage/Sales/Model/Mysql4/Quote.php | 2 +- .../Mage/Sales/Model/Mysql4/Quote/Address.php | 2 +- .../Quote/Address/Attribute/Backend.php | 2 +- .../Quote/Address/Attribute/Backend/Child.php | 2 +- .../Address/Attribute/Backend/Parent.php | 2 +- .../Address/Attribute/Backend/Region.php | 2 +- .../Quote/Address/Attribute/Frontend.php | 2 +- .../Attribute/Frontend/Custbalance.php | 2 +- .../Address/Attribute/Frontend/Discount.php | 2 +- .../Address/Attribute/Frontend/Grand.php | 2 +- .../Address/Attribute/Frontend/Shipping.php | 2 +- .../Address/Attribute/Frontend/Subtotal.php | 2 +- .../Quote/Address/Attribute/Frontend/Tax.php | 2 +- .../Model/Mysql4/Quote/Address/Collection.php | 2 +- .../Sales/Model/Mysql4/Quote/Address/Item.php | 2 +- .../Mysql4/Quote/Address/Item/Collection.php | 2 +- .../Sales/Model/Mysql4/Quote/Address/Rate.php | 2 +- .../Mysql4/Quote/Address/Rate/Collection.php | 2 +- .../Sales/Model/Mysql4/Quote/Collection.php | 2 +- .../Mage/Sales/Model/Mysql4/Quote/Item.php | 2 +- .../Model/Mysql4/Quote/Item/Collection.php | 2 +- .../Sales/Model/Mysql4/Quote/Item/Option.php | 2 +- .../Mysql4/Quote/Item/Option/Collection.php | 2 +- .../Mage/Sales/Model/Mysql4/Quote/Payment.php | 2 +- .../Model/Mysql4/Quote/Payment/Collection.php | 2 +- .../Sales/Model/Mysql4/Recurring/Profile.php | 2 +- .../Mysql4/Recurring/Profile/Collection.php | 2 +- .../core/Mage/Sales/Model/Mysql4/Report.php | 2 +- .../Sales/Model/Mysql4/Report/Abstract.php | 2 +- .../Sales/Model/Mysql4/Report/Bestsellers.php | 2 +- .../Mysql4/Report/Bestsellers/Collection.php | 2 +- .../Mysql4/Report/Collection/Abstract.php | 2 +- .../Sales/Model/Mysql4/Report/Invoiced.php | 2 +- .../Report/Invoiced/Collection/Invoiced.php | 2 +- .../Report/Invoiced/Collection/Order.php | 2 +- .../Mage/Sales/Model/Mysql4/Report/Order.php | 2 +- .../Model/Mysql4/Report/Order/Collection.php | 2 +- .../Report/Order/Updatedat/Collection.php | 2 +- .../Sales/Model/Mysql4/Report/Refunded.php | 2 +- .../Report/Refunded/Collection/Order.php | 2 +- .../Report/Refunded/Collection/Refunded.php | 2 +- .../Sales/Model/Mysql4/Report/Shipping.php | 2 +- .../Report/Shipping/Collection/Order.php | 2 +- .../Report/Shipping/Collection/Shipment.php | 2 +- .../Sales/Model/Mysql4/Sale/Collection.php | 2 +- .../core/Mage/Sales/Model/Mysql4/Setup.php | 2 +- app/code/core/Mage/Sales/Model/Observer.php | 2 +- app/code/core/Mage/Sales/Model/Order.php | 6 +- .../core/Mage/Sales/Model/Order/Address.php | 2 +- app/code/core/Mage/Sales/Model/Order/Api.php | 2 +- .../core/Mage/Sales/Model/Order/Api/V2.php | 2 +- .../core/Mage/Sales/Model/Order/Config.php | 2 +- .../Mage/Sales/Model/Order/Creditmemo.php | 3 +- .../Mage/Sales/Model/Order/Creditmemo/Api.php | 2 +- .../Sales/Model/Order/Creditmemo/Api/V2.php | 2 +- .../Sales/Model/Order/Creditmemo/Comment.php | 2 +- .../Sales/Model/Order/Creditmemo/Config.php | 2 +- .../Sales/Model/Order/Creditmemo/Item.php | 2 +- .../Model/Order/Creditmemo/Total/Abstract.php | 2 +- .../Model/Order/Creditmemo/Total/Cost.php | 2 +- .../Model/Order/Creditmemo/Total/Discount.php | 2 +- .../Model/Order/Creditmemo/Total/Grand.php | 2 +- .../Model/Order/Creditmemo/Total/Shipping.php | 2 +- .../Model/Order/Creditmemo/Total/Subtotal.php | 2 +- .../Model/Order/Creditmemo/Total/Tax.php | 19 +- .../core/Mage/Sales/Model/Order/Invoice.php | 2 +- .../Mage/Sales/Model/Order/Invoice/Api.php | 2 +- .../Mage/Sales/Model/Order/Invoice/Api/V2.php | 2 +- .../Sales/Model/Order/Invoice/Comment.php | 2 +- .../Mage/Sales/Model/Order/Invoice/Config.php | 2 +- .../Mage/Sales/Model/Order/Invoice/Item.php | 2 +- .../Model/Order/Invoice/Total/Abstract.php | 2 +- .../Sales/Model/Order/Invoice/Total/Cost.php | 2 +- .../Model/Order/Invoice/Total/Discount.php | 8 +- .../Sales/Model/Order/Invoice/Total/Grand.php | 2 +- .../Model/Order/Invoice/Total/Shipping.php | 2 +- .../Model/Order/Invoice/Total/Subtotal.php | 2 +- .../Sales/Model/Order/Invoice/Total/Tax.php | 4 +- app/code/core/Mage/Sales/Model/Order/Item.php | 2 +- .../core/Mage/Sales/Model/Order/Payment.php | 34 +- .../Sales/Model/Order/Payment/Transaction.php | 2 +- .../Mage/Sales/Model/Order/Pdf/Abstract.php | 2 +- .../Mage/Sales/Model/Order/Pdf/Creditmemo.php | 2 +- .../Mage/Sales/Model/Order/Pdf/Invoice.php | 2 +- .../Sales/Model/Order/Pdf/Items/Abstract.php | 2 +- .../Order/Pdf/Items/Creditmemo/Default.php | 2 +- .../Order/Pdf/Items/Creditmemo/Grouped.php | 2 +- .../Model/Order/Pdf/Items/Invoice/Default.php | 2 +- .../Model/Order/Pdf/Items/Invoice/Grouped.php | 2 +- .../Order/Pdf/Items/Shipment/Default.php | 2 +- .../Mage/Sales/Model/Order/Pdf/Shipment.php | 2 +- .../Model/Order/Pdf/Shipment/Packaging.php | 2 +- .../Sales/Model/Order/Pdf/Total/Default.php | 2 +- .../core/Mage/Sales/Model/Order/Shipment.php | 2 +- .../Mage/Sales/Model/Order/Shipment/Api.php | 2 +- .../Sales/Model/Order/Shipment/Api/V2.php | 2 +- .../Sales/Model/Order/Shipment/Comment.php | 2 +- .../Mage/Sales/Model/Order/Shipment/Item.php | 2 +- .../Mage/Sales/Model/Order/Shipment/Track.php | 2 +- .../core/Mage/Sales/Model/Order/Status.php | 2 +- .../Mage/Sales/Model/Order/Status/History.php | 2 +- app/code/core/Mage/Sales/Model/Order/Tax.php | 2 +- .../core/Mage/Sales/Model/Order/Total.php | 2 +- .../Mage/Sales/Model/Order/Total/Abstract.php | 2 +- .../Sales/Model/Order/Total/Config/Base.php | 2 +- .../Method/Billing/AgreementAbstract.php | 5 +- app/code/core/Mage/Sales/Model/Quote.php | 2 +- .../core/Mage/Sales/Model/Quote/Address.php | 2 +- .../Mage/Sales/Model/Quote/Address/Item.php | 2 +- .../Mage/Sales/Model/Quote/Address/Rate.php | 2 +- .../Mage/Sales/Model/Quote/Address/Total.php | 2 +- .../Model/Quote/Address/Total/Abstract.php | 2 +- .../Model/Quote/Address/Total/Collector.php | 2 +- .../Model/Quote/Address/Total/Custbalance.php | 2 +- .../Model/Quote/Address/Total/Discount.php | 2 +- .../Sales/Model/Quote/Address/Total/Grand.php | 2 +- .../Sales/Model/Quote/Address/Total/Msrp.php | 2 +- .../Model/Quote/Address/Total/Nominal.php | 2 +- .../Quote/Address/Total/Nominal/Collector.php | 2 +- .../Total/Nominal/Recurring/Initial.php | 2 +- .../Address/Total/Nominal/Recurring/Trial.php | 2 +- .../Total/Nominal/RecurringAbstract.php | 2 +- .../Quote/Address/Total/Nominal/Shipping.php | 2 +- .../Quote/Address/Total/Nominal/Subtotal.php | 2 +- .../Model/Quote/Address/Total/Shipping.php | 2 +- .../Model/Quote/Address/Total/Subtotal.php | 2 +- .../Sales/Model/Quote/Address/Total/Tax.php | 2 +- .../core/Mage/Sales/Model/Quote/Config.php | 2 +- app/code/core/Mage/Sales/Model/Quote/Item.php | 2 +- .../Mage/Sales/Model/Quote/Item/Abstract.php | 2 +- .../Mage/Sales/Model/Quote/Item/Option.php | 2 +- .../core/Mage/Sales/Model/Quote/Payment.php | 2 +- .../Mage/Sales/Model/Recurring/Profile.php | 32 +- .../Mage/Sales/Model/Resource/Abstract.php | 2 +- .../Model/Resource/Billing/Agreement.php | 2 +- .../Resource/Billing/Agreement/Collection.php | 2 +- .../Model/Resource/Collection/Abstract.php | 2 +- .../Sales/Model/Resource/Helper/Interface.php | 2 +- .../Sales/Model/Resource/Helper/Mysql4.php | 2 +- .../core/Mage/Sales/Model/Resource/Order.php | 2 +- .../Sales/Model/Resource/Order/Abstract.php | 2 +- .../Sales/Model/Resource/Order/Address.php | 2 +- .../Resource/Order/Address/Collection.php | 2 +- .../Order/Attribute/Backend/Billing.php | 2 +- .../Order/Attribute/Backend/Child.php | 2 +- .../Order/Attribute/Backend/Parent.php | 2 +- .../Order/Attribute/Backend/Shipping.php | 2 +- .../Sales/Model/Resource/Order/Collection.php | 2 +- .../Resource/Order/Collection/Abstract.php | 2 +- .../Order/Comment/Collection/Abstract.php | 2 +- .../Sales/Model/Resource/Order/Creditmemo.php | 2 +- .../Creditmemo/Attribute/Backend/Child.php | 2 +- .../Creditmemo/Attribute/Backend/Parent.php | 2 +- .../Resource/Order/Creditmemo/Collection.php | 2 +- .../Resource/Order/Creditmemo/Comment.php | 2 +- .../Order/Creditmemo/Comment/Collection.php | 2 +- .../Order/Creditmemo/Grid/Collection.php | 2 +- .../Model/Resource/Order/Creditmemo/Item.php | 2 +- .../Order/Creditmemo/Item/Collection.php | 2 +- .../Model/Resource/Order/Grid/Collection.php | 2 +- .../Sales/Model/Resource/Order/Invoice.php | 2 +- .../Order/Invoice/Attribute/Backend/Child.php | 2 +- .../Order/Invoice/Attribute/Backend/Item.php | 2 +- .../Order/Invoice/Attribute/Backend/Order.php | 2 +- .../Invoice/Attribute/Backend/Parent.php | 2 +- .../Resource/Order/Invoice/Collection.php | 2 +- .../Model/Resource/Order/Invoice/Comment.php | 2 +- .../Order/Invoice/Comment/Collection.php | 2 +- .../Order/Invoice/Grid/Collection.php | 2 +- .../Model/Resource/Order/Invoice/Item.php | 2 +- .../Order/Invoice/Item/Collection.php | 2 +- .../Mage/Sales/Model/Resource/Order/Item.php | 2 +- .../Model/Resource/Order/Item/Collection.php | 2 +- .../Sales/Model/Resource/Order/Payment.php | 2 +- .../Resource/Order/Payment/Collection.php | 2 +- .../Resource/Order/Payment/Transaction.php | 2 +- .../Order/Payment/Transaction/Collection.php | 2 +- .../Sales/Model/Resource/Order/Shipment.php | 2 +- .../Shipment/Attribute/Backend/Child.php | 2 +- .../Shipment/Attribute/Backend/Parent.php | 2 +- .../Resource/Order/Shipment/Collection.php | 2 +- .../Model/Resource/Order/Shipment/Comment.php | 2 +- .../Order/Shipment/Comment/Collection.php | 2 +- .../Order/Shipment/Grid/Collection.php | 2 +- .../Model/Resource/Order/Shipment/Item.php | 2 +- .../Order/Shipment/Item/Collection.php | 2 +- .../Model/Resource/Order/Shipment/Track.php | 2 +- .../Order/Shipment/Track/Collection.php | 2 +- .../Sales/Model/Resource/Order/Status.php | 2 +- .../Resource/Order/Status/Collection.php | 2 +- .../Model/Resource/Order/Status/History.php | 2 +- .../Order/Status/History/Collection.php | 2 +- .../Mage/Sales/Model/Resource/Order/Tax.php | 2 +- .../Model/Resource/Order/Tax/Collection.php | 2 +- .../core/Mage/Sales/Model/Resource/Quote.php | 2 +- .../Sales/Model/Resource/Quote/Address.php | 2 +- .../Quote/Address/Attribute/Backend.php | 2 +- .../Quote/Address/Attribute/Backend/Child.php | 2 +- .../Address/Attribute/Backend/Parent.php | 2 +- .../Address/Attribute/Backend/Region.php | 2 +- .../Quote/Address/Attribute/Frontend.php | 2 +- .../Attribute/Frontend/Custbalance.php | 2 +- .../Address/Attribute/Frontend/Discount.php | 2 +- .../Address/Attribute/Frontend/Grand.php | 2 +- .../Address/Attribute/Frontend/Shipping.php | 2 +- .../Address/Attribute/Frontend/Subtotal.php | 2 +- .../Quote/Address/Attribute/Frontend/Tax.php | 2 +- .../Resource/Quote/Address/Collection.php | 2 +- .../Model/Resource/Quote/Address/Item.php | 2 +- .../Quote/Address/Item/Collection.php | 2 +- .../Model/Resource/Quote/Address/Rate.php | 2 +- .../Quote/Address/Rate/Collection.php | 2 +- .../Sales/Model/Resource/Quote/Collection.php | 2 +- .../Mage/Sales/Model/Resource/Quote/Item.php | 2 +- .../Model/Resource/Quote/Item/Collection.php | 2 +- .../Model/Resource/Quote/Item/Option.php | 2 +- .../Resource/Quote/Item/Option/Collection.php | 2 +- .../Sales/Model/Resource/Quote/Payment.php | 2 +- .../Resource/Quote/Payment/Collection.php | 2 +- .../Model/Resource/Recurring/Profile.php | 2 +- .../Resource/Recurring/Profile/Collection.php | 2 +- .../core/Mage/Sales/Model/Resource/Report.php | 2 +- .../Sales/Model/Resource/Report/Abstract.php | 2 +- .../Model/Resource/Report/Bestsellers.php | 2 +- .../Report/Bestsellers/Collection.php | 2 +- .../Resource/Report/Collection/Abstract.php | 2 +- .../Sales/Model/Resource/Report/Invoiced.php | 2 +- .../Report/Invoiced/Collection/Invoiced.php | 2 +- .../Report/Invoiced/Collection/Order.php | 2 +- .../Sales/Model/Resource/Report/Order.php | 2 +- .../Resource/Report/Order/Collection.php | 2 +- .../Model/Resource/Report/Order/Createdat.php | 2 +- .../Model/Resource/Report/Order/Updatedat.php | 2 +- .../Report/Order/Updatedat/Collection.php | 2 +- .../Sales/Model/Resource/Report/Refunded.php | 2 +- .../Report/Refunded/Collection/Order.php | 2 +- .../Report/Refunded/Collection/Refunded.php | 2 +- .../Sales/Model/Resource/Report/Shipping.php | 2 +- .../Report/Shipping/Collection/Order.php | 2 +- .../Report/Shipping/Collection/Shipment.php | 2 +- .../Sales/Model/Resource/Sale/Collection.php | 2 +- .../core/Mage/Sales/Model/Resource/Setup.php | 2 +- .../core/Mage/Sales/Model/Service/Order.php | 2 +- .../core/Mage/Sales/Model/Service/Quote.php | 2 +- .../core/Mage/Sales/Model/Status/List.php | 2 +- .../Billing/AgreementController.php | 2 +- .../Sales/controllers/DownloadController.php | 2 +- .../Sales/controllers/GuestController.php | 2 +- .../Sales/controllers/OrderController.php | 2 +- .../Recurring/ProfileController.php | 2 +- .../data/sales_setup/data-install-1.6.0.0.php | 2 +- .../data-upgrade-1.6.0.4-1.6.0.5.php | 2 +- app/code/core/Mage/Sales/doc/test.php | 2 +- app/code/core/Mage/Sales/etc/adminhtml.xml | 2 +- app/code/core/Mage/Sales/etc/api.xml | 2 +- app/code/core/Mage/Sales/etc/api2.xml | 2 +- app/code/core/Mage/Sales/etc/config.xml | 2 +- app/code/core/Mage/Sales/etc/system.xml | 2 +- app/code/core/Mage/Sales/etc/widget.xml | 2 +- .../Sales/sql/sales_setup/install-1.6.0.0.php | 2 +- .../sql/sales_setup/mysql4-install-0.7.0.php | 274 +- .../sql/sales_setup/mysql4-install-0.8.11.php | 2 +- .../sql/sales_setup/mysql4-install-0.9.0.php | 2 +- .../sales_setup/mysql4-install-1.4.0.0.php | 2 +- .../mysql4-upgrade-0.6.2-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.7.9-0.7.10.php | 2 +- .../mysql4-upgrade-0.8.0-0.8.1.php | 2 +- .../mysql4-upgrade-0.8.1-0.8.2.php | 2 +- .../mysql4-upgrade-0.8.11-0.8.12.php | 2 +- .../mysql4-upgrade-0.8.12-0.8.13.php | 2 +- .../mysql4-upgrade-0.8.13-0.8.14.php | 2 +- .../mysql4-upgrade-0.8.14-0.8.15.php | 2 +- .../mysql4-upgrade-0.8.15-0.8.16.php | 2 +- .../mysql4-upgrade-0.8.16-0.8.17.php | 2 +- .../mysql4-upgrade-0.8.17-0.8.18.php | 2 +- .../mysql4-upgrade-0.8.18-0.8.19.php | 2 +- .../mysql4-upgrade-0.8.19-0.8.20.php | 2 +- .../mysql4-upgrade-0.8.2-0.8.3.php | 2 +- .../mysql4-upgrade-0.8.20-0.8.21.php | 2 +- .../mysql4-upgrade-0.8.21-0.8.22.php | 2 +- .../mysql4-upgrade-0.8.22-0.8.23.php | 2 +- .../mysql4-upgrade-0.8.23-0.8.24.php | 2 +- .../mysql4-upgrade-0.8.24-0.8.25.php | 2 +- .../mysql4-upgrade-0.8.25-0.8.26.php | 2 +- .../mysql4-upgrade-0.8.26-0.8.27.php | 2 +- .../mysql4-upgrade-0.8.27-0.8.28.php | 2 +- .../mysql4-upgrade-0.8.28-0.8.29.php | 2 +- .../mysql4-upgrade-0.8.29-0.9.0.php | 2 +- .../mysql4-upgrade-0.8.3-0.8.4.php | 2 +- .../mysql4-upgrade-0.8.6-0.8.7.php | 2 +- .../mysql4-upgrade-0.8.7-0.8.8.php | 2 +- .../mysql4-upgrade-0.8.8-0.8.9.php | 2 +- .../mysql4-upgrade-0.9.0-0.9.1.php | 2 +- .../mysql4-upgrade-0.9.1-0.9.2.php | 2 +- .../mysql4-upgrade-0.9.10-0.9.11.php | 2 +- .../mysql4-upgrade-0.9.11-0.9.12.php | 2 +- .../mysql4-upgrade-0.9.12-0.9.13.php | 2 +- .../mysql4-upgrade-0.9.13-0.9.14.php | 2 +- .../mysql4-upgrade-0.9.14-0.9.15.php | 2 +- .../mysql4-upgrade-0.9.15-0.9.16.php | 2 +- .../mysql4-upgrade-0.9.16-0.9.17.php | 2 +- .../mysql4-upgrade-0.9.17-0.9.18.php | 2 +- .../mysql4-upgrade-0.9.18-0.9.19.php | 2 +- .../mysql4-upgrade-0.9.19-0.9.20.php | 2 +- .../mysql4-upgrade-0.9.2-0.9.3.php | 2 +- .../mysql4-upgrade-0.9.20-0.9.21.php | 2 +- .../mysql4-upgrade-0.9.21-0.9.22.php | 2 +- .../mysql4-upgrade-0.9.22-0.9.23.php | 2 +- .../mysql4-upgrade-0.9.23-0.9.24.php | 2 +- .../mysql4-upgrade-0.9.24-0.9.25.php | 2 +- .../mysql4-upgrade-0.9.25-0.9.26.php | 2 +- .../mysql4-upgrade-0.9.26-0.9.27.php | 2 +- .../mysql4-upgrade-0.9.27-0.9.28.php | 2 +- .../mysql4-upgrade-0.9.28-0.9.29.php | 2 +- .../mysql4-upgrade-0.9.29-0.9.30.php | 2 +- .../mysql4-upgrade-0.9.3-0.9.4.php | 2 +- .../mysql4-upgrade-0.9.30-0.9.31.php | 2 +- .../mysql4-upgrade-0.9.31-0.9.32.php | 2 +- .../mysql4-upgrade-0.9.32-0.9.33.php | 2 +- .../mysql4-upgrade-0.9.33-0.9.34.php | 2 +- .../mysql4-upgrade-0.9.34-0.9.35.php | 2 +- .../mysql4-upgrade-0.9.35-0.9.36.php | 2 +- .../mysql4-upgrade-0.9.36-0.9.37.php | 2 +- .../mysql4-upgrade-0.9.37-0.9.38.php | 2 +- .../mysql4-upgrade-0.9.38-0.9.39.php | 2 +- .../mysql4-upgrade-0.9.39-0.9.40.php | 2 +- .../mysql4-upgrade-0.9.4-0.9.5.php | 2 +- .../mysql4-upgrade-0.9.40-0.9.41.php | 2 +- .../mysql4-upgrade-0.9.41-0.9.42.php | 2 +- .../mysql4-upgrade-0.9.42-0.9.43.php | 2 +- .../mysql4-upgrade-0.9.43-0.9.44.php | 2 +- .../mysql4-upgrade-0.9.44-0.9.45.php | 2 +- .../mysql4-upgrade-0.9.45-0.9.46.php | 2 +- .../mysql4-upgrade-0.9.46-0.9.47.php | 2 +- .../mysql4-upgrade-0.9.47-0.9.48.php | 2 +- .../mysql4-upgrade-0.9.48-0.9.49.php | 2 +- .../mysql4-upgrade-0.9.49-0.9.50.php | 2 +- .../mysql4-upgrade-0.9.5-0.9.6.php | 2 +- .../mysql4-upgrade-0.9.50-0.9.51.php | 2 +- .../mysql4-upgrade-0.9.51-0.9.52.php | 2 +- .../mysql4-upgrade-0.9.52-0.9.53.php | 2 +- .../mysql4-upgrade-0.9.53-0.9.54.php | 2 +- .../mysql4-upgrade-0.9.54-0.9.55.php | 2 +- .../mysql4-upgrade-0.9.55-0.9.56.php | 2 +- .../mysql4-upgrade-0.9.6-0.9.7.php | 2 +- .../mysql4-upgrade-0.9.7-0.9.8.php | 2 +- .../mysql4-upgrade-0.9.8-0.9.9.php | 2 +- .../mysql4-upgrade-0.9.9-0.9.10.php | 2 +- .../mysql4-upgrade-1.3.99-1.4.0.0.php | 2 +- .../mysql4-upgrade-1.4.0.0-1.4.0.1.php | 2 +- .../mysql4-upgrade-1.4.0.1-1.4.0.2.php | 2 +- .../mysql4-upgrade-1.4.0.15-1.4.0.16.php | 2 +- .../mysql4-upgrade-1.4.0.16-1.4.0.17.php | 2 +- .../mysql4-upgrade-1.4.0.17-1.4.0.18.php | 2 +- .../mysql4-upgrade-1.4.0.18-1.4.0.19.php | 2 +- .../mysql4-upgrade-1.4.0.19-1.4.0.20.php | 2 +- .../mysql4-upgrade-1.4.0.2-1.4.0.3.php | 2 +- .../mysql4-upgrade-1.4.0.20-1.4.0.21.php | 2 +- .../mysql4-upgrade-1.4.0.21-1.4.0.22.php | 2 +- .../mysql4-upgrade-1.4.0.22-1.4.0.23.php | 2 +- .../mysql4-upgrade-1.4.0.23-1.4.0.24.php | 2 +- .../mysql4-upgrade-1.4.0.24-1.4.0.25.php | 2 +- .../mysql4-upgrade-1.4.0.3-1.4.0.4.php | 2 +- .../mysql4-upgrade-1.4.0.4-1.4.0.5.php | 2 +- .../mysql4-upgrade-1.4.0.5-1.4.0.6.php | 2 +- .../mysql4-upgrade-1.4.0.6-1.4.0.7.php | 2 +- .../mysql4-upgrade-1.4.0.7-1.4.0.8.php | 2 +- .../mysql4-upgrade-1.4.0.8-1.4.0.15.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../sales_setup/upgrade-1.6.0.0-1.6.0.1.php | 2 +- .../sales_setup/upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../sales_setup/upgrade-1.6.0.2-1.6.0.3.php | 2 +- .../sales_setup/upgrade-1.6.0.3-1.6.0.4.php | 2 +- .../sales_setup/upgrade-1.6.0.4-1.6.0.5.php | 2 +- .../sales_setup/upgrade-1.6.0.5-1.6.0.6.php | 2 +- .../sales_setup/upgrade-1.6.0.6-1.6.0.7.php | 2 +- .../sales_setup/upgrade-1.6.0.7-1.6.0.8.php | 2 +- app/code/core/Mage/SalesRule/Exception.php | 2 +- .../core/Mage/SalesRule/Helper/Coupon.php | 2 +- app/code/core/Mage/SalesRule/Helper/Data.php | 2 +- app/code/core/Mage/SalesRule/Model/Coupon.php | 2 +- .../SalesRule/Model/Coupon/Codegenerator.php | 2 +- .../Model/Coupon/CodegeneratorInterface.php | 2 +- .../SalesRule/Model/Coupon/Massgenerator.php | 2 +- .../Mage/SalesRule/Model/Mysql4/Coupon.php | 2 +- .../Model/Mysql4/Coupon/Collection.php | 2 +- .../SalesRule/Model/Mysql4/Coupon/Usage.php | 2 +- .../Model/Mysql4/Report/Collection.php | 2 +- .../SalesRule/Model/Mysql4/Report/Rule.php | 2 +- .../Mysql4/Report/Updatedat/Collection.php | 2 +- .../core/Mage/SalesRule/Model/Mysql4/Rule.php | 2 +- .../Model/Mysql4/Rule/Collection.php | 2 +- .../SalesRule/Model/Mysql4/Rule/Customer.php | 2 +- .../Model/Mysql4/Rule/Customer/Collection.php | 2 +- .../SalesRule/Model/Mysql4/Rule/Product.php | 2 +- .../Model/Mysql4/Rule/Product/Collection.php | 2 +- .../core/Mage/SalesRule/Model/Observer.php | 2 +- .../Mage/SalesRule/Model/Quote/Discount.php | 4 +- .../SalesRule/Model/Quote/Freeshipping.php | 2 +- .../Model/Quote/Nominal/Discount.php | 2 +- .../Mage/SalesRule/Model/Resource/Coupon.php | 2 +- .../Model/Resource/Coupon/Collection.php | 2 +- .../SalesRule/Model/Resource/Coupon/Usage.php | 2 +- .../Model/Resource/Report/Collection.php | 2 +- .../SalesRule/Model/Resource/Report/Rule.php | 2 +- .../Model/Resource/Report/Rule/Createdat.php | 2 +- .../Model/Resource/Report/Rule/Updatedat.php | 2 +- .../Resource/Report/Updatedat/Collection.php | 2 +- .../Mage/SalesRule/Model/Resource/Rule.php | 2 +- .../Model/Resource/Rule/Collection.php | 42 +- .../Model/Resource/Rule/Customer.php | 2 +- .../Resource/Rule/Customer/Collection.php | 2 +- .../SalesRule/Model/Resource/Rule/Product.php | 2 +- .../Resource/Rule/Product/Collection.php | 2 +- app/code/core/Mage/SalesRule/Model/Rule.php | 2 +- .../Model/Rule/Action/Collection.php | 2 +- .../SalesRule/Model/Rule/Action/Product.php | 2 +- .../Model/Rule/Condition/Address.php | 2 +- .../Model/Rule/Condition/Combine.php | 2 +- .../Model/Rule/Condition/Product.php | 2 +- .../Model/Rule/Condition/Product/Combine.php | 2 +- .../Model/Rule/Condition/Product/Found.php | 2 +- .../Rule/Condition/Product/Subselect.php | 2 +- .../Mage/SalesRule/Model/Rule/Customer.php | 2 +- .../Mage/SalesRule/Model/Rule/Product.php | 2 +- .../System/Config/Source/Coupon/Format.php | 2 +- .../core/Mage/SalesRule/Model/Validator.php | 48 +- .../core/Mage/SalesRule/etc/adminhtml.xml | 2 +- app/code/core/Mage/SalesRule/etc/config.xml | 2 +- app/code/core/Mage/SalesRule/etc/system.xml | 2 +- .../sql/salesrule_setup/install-1.6.0.0.php | 2 +- .../salesrule_setup/mysql4-install-0.7.0.php | 2 +- .../mysql4-install-1.4.0.0.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.10-0.7.11.php | 2 +- .../mysql4-upgrade-0.7.11-0.7.12.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../mysql4-upgrade-0.7.6-0.7.7.php | 2 +- .../mysql4-upgrade-0.7.7-0.7.8.php | 2 +- .../mysql4-upgrade-0.7.8-0.7.9.php | 2 +- .../mysql4-upgrade-0.7.9-0.7.10.php | 2 +- .../mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php | 2 +- .../mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php | 2 +- .../mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php | 2 +- .../mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php | 2 +- .../mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php | 2 +- .../mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../upgrade-1.6.0.0-1.6.0.1.php | 2 +- .../upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../upgrade-1.6.0.2-1.6.0.3.php | 2 +- app/code/core/Mage/Sendfriend/Block/Send.php | 2 +- app/code/core/Mage/Sendfriend/Helper/Data.php | 2 +- .../Sendfriend/Model/Mysql4/Sendfriend.php | 2 +- .../Model/Mysql4/Sendfriend/Collection.php | 2 +- .../Mage/Sendfriend/Model/Mysql4/Setup.php | 2 +- .../core/Mage/Sendfriend/Model/Observer.php | 2 +- .../Sendfriend/Model/Resource/Sendfriend.php | 2 +- .../Model/Resource/Sendfriend/Collection.php | 2 +- .../Mage/Sendfriend/Model/Resource/Setup.php | 2 +- .../core/Mage/Sendfriend/Model/Sendfriend.php | 2 +- .../controllers/ProductController.php | 2 +- app/code/core/Mage/Sendfriend/etc/config.xml | 2 +- app/code/core/Mage/Sendfriend/etc/system.xml | 2 +- .../sql/sendfriend_setup/install-1.6.0.0.php | 2 +- .../sendfriend_setup/mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../Mage/Shipping/Block/Tracking/Ajax.php | 2 +- .../Mage/Shipping/Block/Tracking/Popup.php | 2 +- app/code/core/Mage/Shipping/Exception.php | 2 +- app/code/core/Mage/Shipping/Helper/Data.php | 2 +- .../Mage/Shipping/Model/Carrier/Abstract.php | 2 +- .../Mage/Shipping/Model/Carrier/Flatrate.php | 2 +- .../Shipping/Model/Carrier/Freeshipping.php | 2 +- .../Mage/Shipping/Model/Carrier/Interface.php | 2 +- .../Mage/Shipping/Model/Carrier/Pickup.php | 2 +- .../Mage/Shipping/Model/Carrier/Tablerate.php | 2 +- app/code/core/Mage/Shipping/Model/Config.php | 2 +- app/code/core/Mage/Shipping/Model/Info.php | 2 +- .../Model/Mysql4/Carrier/Tablerate.php | 2 +- .../Mysql4/Carrier/Tablerate/Collection.php | 2 +- .../Mage/Shipping/Model/Rate/Abstract.php | 2 +- .../core/Mage/Shipping/Model/Rate/Request.php | 2 +- .../core/Mage/Shipping/Model/Rate/Result.php | 2 +- .../Shipping/Model/Rate/Result/Abstract.php | 2 +- .../Mage/Shipping/Model/Rate/Result/Error.php | 2 +- .../Shipping/Model/Rate/Result/Method.php | 2 +- .../Model/Resource/Carrier/Tablerate.php | 2 +- .../Resource/Carrier/Tablerate/Collection.php | 2 +- .../Mage/Shipping/Model/Shipment/Request.php | 2 +- .../Mage/Shipping/Model/Shipment/Return.php | 2 +- .../core/Mage/Shipping/Model/Shipping.php | 2 +- .../Shipping/Model/Source/HandlingAction.php | 2 +- .../Shipping/Model/Source/HandlingType.php | 2 +- .../Mage/Shipping/Model/Tracking/Result.php | 2 +- .../Model/Tracking/Result/Abstract.php | 2 +- .../Shipping/Model/Tracking/Result/Error.php | 2 +- .../Shipping/Model/Tracking/Result/Status.php | 2 +- .../controllers/ShippingController.php | 2 +- .../controllers/TrackingController.php | 2 +- app/code/core/Mage/Shipping/etc/adminhtml.xml | 2 +- app/code/core/Mage/Shipping/etc/config.xml | 2 +- app/code/core/Mage/Shipping/etc/system.xml | 2 +- .../sql/shipping_setup/install-1.6.0.0.php | 2 +- .../shipping_setup/mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- app/code/core/Mage/Sitemap/Helper/Data.php | 2 +- .../Sitemap/Model/Mysql4/Catalog/Category.php | 2 +- .../Sitemap/Model/Mysql4/Catalog/Product.php | 2 +- .../Mage/Sitemap/Model/Mysql4/Cms/Page.php | 2 +- .../Mage/Sitemap/Model/Mysql4/Sitemap.php | 2 +- .../Model/Mysql4/Sitemap/Collection.php | 2 +- app/code/core/Mage/Sitemap/Model/Observer.php | 2 +- .../Model/Resource/Catalog/Abstract.php | 2 +- .../Model/Resource/Catalog/Category.php | 2 +- .../Model/Resource/Catalog/Product.php | 2 +- .../Mage/Sitemap/Model/Resource/Cms/Page.php | 2 +- .../Mage/Sitemap/Model/Resource/Sitemap.php | 2 +- .../Model/Resource/Sitemap/Collection.php | 2 +- app/code/core/Mage/Sitemap/Model/Sitemap.php | 16 +- app/code/core/Mage/Sitemap/etc/adminhtml.xml | 2 +- app/code/core/Mage/Sitemap/etc/config.xml | 2 +- app/code/core/Mage/Sitemap/etc/system.xml | 2 +- .../sql/sitemap_setup/install-1.6.0.0.php | 2 +- .../sitemap_setup/mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- app/code/core/Mage/Tag/Block/All.php | 2 +- .../core/Mage/Tag/Block/Customer/Edit.php | 2 +- .../core/Mage/Tag/Block/Customer/Recent.php | 2 +- .../core/Mage/Tag/Block/Customer/Tags.php | 2 +- .../core/Mage/Tag/Block/Customer/View.php | 2 +- app/code/core/Mage/Tag/Block/Popular.php | 2 +- app/code/core/Mage/Tag/Block/Product/List.php | 2 +- .../core/Mage/Tag/Block/Product/Result.php | 2 +- app/code/core/Mage/Tag/Helper/Data.php | 2 +- app/code/core/Mage/Tag/Model/Api.php | 2 +- app/code/core/Mage/Tag/Model/Api/V2.php | 2 +- .../Tag/Model/Entity/Customer/Collection.php | 2 +- .../core/Mage/Tag/Model/Indexer/Summary.php | 2 +- .../Tag/Model/Mysql4/Customer/Collection.php | 2 +- .../Mage/Tag/Model/Mysql4/Indexer/Summary.php | 2 +- .../Tag/Model/Mysql4/Popular/Collection.php | 2 +- .../Tag/Model/Mysql4/Product/Collection.php | 2 +- app/code/core/Mage/Tag/Model/Mysql4/Tag.php | 2 +- .../Mage/Tag/Model/Mysql4/Tag/Collection.php | 2 +- .../Mage/Tag/Model/Mysql4/Tag/Relation.php | 2 +- .../Model/Resource/Customer/Collection.php | 2 +- .../Tag/Model/Resource/Indexer/Summary.php | 2 +- .../Tag/Model/Resource/Popular/Collection.php | 2 +- .../Tag/Model/Resource/Product/Collection.php | 2 +- app/code/core/Mage/Tag/Model/Resource/Tag.php | 2 +- .../Tag/Model/Resource/Tag/Collection.php | 2 +- .../Mage/Tag/Model/Resource/Tag/Relation.php | 2 +- app/code/core/Mage/Tag/Model/Session.php | 2 +- app/code/core/Mage/Tag/Model/Tag.php | 2 +- app/code/core/Mage/Tag/Model/Tag/Relation.php | 2 +- .../Tag/controllers/CustomerController.php | 2 +- .../Mage/Tag/controllers/IndexController.php | 2 +- .../Mage/Tag/controllers/ListController.php | 2 +- .../Tag/controllers/ProductController.php | 2 +- app/code/core/Mage/Tag/etc/adminhtml.xml | 2 +- app/code/core/Mage/Tag/etc/api.xml | 2 +- app/code/core/Mage/Tag/etc/config.xml | 2 +- .../Tag/sql/tag_setup/install-1.6.0.0.php | 2 +- .../sql/tag_setup/mysql4-install-0.7.0.php | 2 +- .../tag_setup/mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../tag_setup/mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../tag_setup/mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../tag_setup/mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../tag_setup/mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../tag_setup/mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../tag_setup/mysql4-upgrade-0.7.6-0.7.7.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../Adminhtml/Frontend/Region/Updater.php | 2 +- .../Tax/Block/Adminhtml/Notifications.php | 2 +- .../core/Mage/Tax/Block/Checkout/Discount.php | 2 +- .../Mage/Tax/Block/Checkout/Grandtotal.php | 2 +- .../core/Mage/Tax/Block/Checkout/Shipping.php | 2 +- .../core/Mage/Tax/Block/Checkout/Subtotal.php | 2 +- app/code/core/Mage/Tax/Block/Checkout/Tax.php | 2 +- .../core/Mage/Tax/Block/Sales/Order/Tax.php | 2 +- app/code/core/Mage/Tax/Exception.php | 2 +- app/code/core/Mage/Tax/Helper/Data.php | 32 +- app/code/core/Mage/Tax/Model/Calculation.php | 47 +- .../core/Mage/Tax/Model/Calculation/Rate.php | 2 +- .../Mage/Tax/Model/Calculation/Rate/Title.php | 2 +- .../core/Mage/Tax/Model/Calculation/Rule.php | 2 +- app/code/core/Mage/Tax/Model/Class.php | 2 +- .../Mage/Tax/Model/Class/Source/Customer.php | 2 +- .../Mage/Tax/Model/Class/Source/Product.php | 2 +- app/code/core/Mage/Tax/Model/Config.php | 14 +- .../Mage/Tax/Model/Config/Notification.php | 2 +- .../Mage/Tax/Model/Config/Price/Include.php | 2 +- .../Mage/Tax/Model/Mysql4/Calculation.php | 2 +- .../Model/Mysql4/Calculation/Collection.php | 2 +- .../Tax/Model/Mysql4/Calculation/Rate.php | 2 +- .../Mysql4/Calculation/Rate/Collection.php | 2 +- .../Model/Mysql4/Calculation/Rate/Title.php | 2 +- .../Calculation/Rate/Title/Collection.php | 2 +- .../Tax/Model/Mysql4/Calculation/Rule.php | 2 +- .../Mysql4/Calculation/Rule/Collection.php | 2 +- app/code/core/Mage/Tax/Model/Mysql4/Class.php | 2 +- .../Tax/Model/Mysql4/Class/Collection.php | 2 +- .../Tax/Model/Mysql4/Report/Collection.php | 2 +- .../core/Mage/Tax/Model/Mysql4/Report/Tax.php | 2 +- .../Mysql4/Report/Updatedat/Collection.php | 2 +- .../Mage/Tax/Model/Mysql4/Sales/Order/Tax.php | 2 +- .../Mysql4/Sales/Order/Tax/Collection.php | 2 +- app/code/core/Mage/Tax/Model/Mysql4/Setup.php | 2 +- app/code/core/Mage/Tax/Model/Observer.php | 2 +- .../Mage/Tax/Model/Resource/Calculation.php | 33 +- .../Model/Resource/Calculation/Collection.php | 2 +- .../Tax/Model/Resource/Calculation/Rate.php | 2 +- .../Resource/Calculation/Rate/Collection.php | 2 +- .../Model/Resource/Calculation/Rate/Title.php | 2 +- .../Calculation/Rate/Title/Collection.php | 2 +- .../Tax/Model/Resource/Calculation/Rule.php | 2 +- .../Resource/Calculation/Rule/Collection.php | 2 +- .../core/Mage/Tax/Model/Resource/Class.php | 2 +- .../Tax/Model/Resource/Class/Collection.php | 2 +- .../Tax/Model/Resource/Report/Collection.php | 2 +- .../Mage/Tax/Model/Resource/Report/Tax.php | 2 +- .../Model/Resource/Report/Tax/Createdat.php | 2 +- .../Model/Resource/Report/Tax/Updatedat.php | 2 +- .../Resource/Report/Updatedat/Collection.php | 2 +- .../Tax/Model/Resource/Sales/Order/Tax.php | 2 +- .../Resource/Sales/Order/Tax/Collection.php | 2 +- .../Model/Resource/Sales/Order/Tax/Item.php | 2 +- .../Sales/Order/Tax/Item/Collection.php | 2 +- .../core/Mage/Tax/Model/Resource/Setup.php | 2 +- .../core/Mage/Tax/Model/Sales/Order/Tax.php | 2 +- .../Mage/Tax/Model/Sales/Order/Tax/Item.php | 2 +- .../Mage/Tax/Model/Sales/Pdf/Grandtotal.php | 2 +- .../Mage/Tax/Model/Sales/Pdf/Shipping.php | 2 +- .../Mage/Tax/Model/Sales/Pdf/Subtotal.php | 2 +- .../core/Mage/Tax/Model/Sales/Pdf/Tax.php | 2 +- .../Tax/Model/Sales/Total/Quote/Discount.php | 2 +- .../Sales/Total/Quote/Nominal/Subtotal.php | 2 +- .../Model/Sales/Total/Quote/Nominal/Tax.php | 2 +- .../Tax/Model/Sales/Total/Quote/Shipping.php | 17 +- .../Tax/Model/Sales/Total/Quote/Subtotal.php | 8 +- .../Mage/Tax/Model/Sales/Total/Quote/Tax.php | 24 +- .../Model/System/Config/Source/Algorithm.php | 2 +- .../Tax/Model/System/Config/Source/Apply.php | 2 +- .../Model/System/Config/Source/PriceType.php | 2 +- .../System/Config/Source/Tax/Country.php | 2 +- .../System/Config/Source/Tax/Display/Type.php | 2 +- .../Model/System/Config/Source/Tax/Region.php | 2 +- .../data/tax_setup/data-install-1.6.0.0.php | 2 +- app/code/core/Mage/Tax/etc/adminhtml.xml | 2 +- app/code/core/Mage/Tax/etc/config.xml | 2 +- app/code/core/Mage/Tax/etc/system.xml | 12 +- .../Tax/sql/tax_setup/install-1.6.0.0.php | 43 +- .../sql/tax_setup/mysql4-install-0.7.0.php | 2 +- .../sql/tax_setup/mysql4-install-1.4.0.0.php | 2 +- .../tax_setup/mysql4-upgrade-0.6.1-0.7.0.php | 2 +- .../tax_setup/mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../tax_setup/mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.10-0.7.11.php | 2 +- .../mysql4-upgrade-0.7.11-0.7.12.php | 2 +- .../mysql4-upgrade-0.7.12-0.7.13.php | 2 +- .../tax_setup/mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../tax_setup/mysql4-upgrade-0.7.3-0.7.4.php | 2 +- .../tax_setup/mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../tax_setup/mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../tax_setup/mysql4-upgrade-0.7.6-0.7.7.php | 2 +- .../tax_setup/mysql4-upgrade-0.7.7-0.7.8.php | 2 +- .../tax_setup/mysql4-upgrade-0.7.8-0.7.9.php | 2 +- .../tax_setup/mysql4-upgrade-0.7.9-0.7.10.php | 2 +- .../tax_setup/mysql4-upgrade-1.3.9-1.4.0.php | 2 +- .../mysql4-upgrade-1.4.0.0-1.4.0.1.php | 2 +- .../mysql4-upgrade-1.4.0.1-1.4.0.2.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php | 2 +- .../sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php | 2 +- .../sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php | 2 +- .../Usa/Block/Adminhtml/Dhl/Unitofmeasure.php | 2 +- app/code/core/Mage/Usa/Helper/Data.php | 2 +- .../Usa/Model/Shipping/Carrier/Abstract.php | 2 +- .../Shipping/Carrier/Abstract/Source/Mode.php | 2 +- .../Carrier/Abstract/Source/Requesttype.php | 2 +- .../Mage/Usa/Model/Shipping/Carrier/Dhl.php | 2 +- .../Model/Shipping/Carrier/Dhl/Abstract.php | 2 +- .../Shipping/Carrier/Dhl/International.php | 2 +- .../Dhl/International/Source/Contenttype.php | 2 +- .../International/Source/Method/Abstract.php | 2 +- .../Dhl/International/Source/Method/Doc.php | 2 +- .../International/Source/Method/Freedoc.php | 2 +- .../Source/Method/Freenondoc.php | 2 +- .../International/Source/Method/Nondoc.php | 2 +- .../Dhl/International/Source/Method/Size.php | 2 +- .../Source/Method/Unitofmeasure.php | 2 +- .../Model/Shipping/Carrier/Dhl/Label/Pdf.php | 2 +- .../Shipping/Carrier/Dhl/Label/Pdf/Page.php | 2 +- .../Carrier/Dhl/Label/Pdf/PageBuilder.php | 2 +- .../Carrier/Dhl/Source/Dutypaymenttype.php | 2 +- .../Carrier/Dhl/Source/Freemethod.php | 2 +- .../Shipping/Carrier/Dhl/Source/Method.php | 2 +- .../Dhl/Source/Protection/Rounding.php | 2 +- .../Carrier/Dhl/Source/Protection/Value.php | 2 +- .../Carrier/Dhl/Source/Shipmenttype.php | 2 +- .../Mage/Usa/Model/Shipping/Carrier/Fedex.php | 6 +- .../Shipping/Carrier/Fedex/Source/Dropoff.php | 2 +- .../Carrier/Fedex/Source/Freemethod.php | 2 +- .../Shipping/Carrier/Fedex/Source/Method.php | 2 +- .../Carrier/Fedex/Source/Packaging.php | 2 +- .../Carrier/Fedex/Source/Unitofmeasure.php | 2 +- .../Mage/Usa/Model/Shipping/Carrier/Ups.php | 2 +- .../Shipping/Carrier/Ups/Source/Container.php | 2 +- .../Shipping/Carrier/Ups/Source/DestType.php | 2 +- .../Carrier/Ups/Source/Freemethod.php | 2 +- .../Shipping/Carrier/Ups/Source/Method.php | 2 +- .../Shipping/Carrier/Ups/Source/Mode.php | 2 +- .../Carrier/Ups/Source/OriginShipment.php | 2 +- .../Shipping/Carrier/Ups/Source/Pickup.php | 2 +- .../Shipping/Carrier/Ups/Source/Type.php | 2 +- .../Carrier/Ups/Source/Unitofmeasure.php | 2 +- .../Mage/Usa/Model/Shipping/Carrier/Usps.php | 2 +- .../Carrier/Usps/Source/Container.php | 2 +- .../Carrier/Usps/Source/Freemethod.php | 2 +- .../Carrier/Usps/Source/Machinable.php | 2 +- .../Shipping/Carrier/Usps/Source/Method.php | 2 +- .../Shipping/Carrier/Usps/Source/Size.php | 2 +- app/code/core/Mage/Usa/etc/config.xml | 2 +- .../Usa/etc/dhl/international/countries.xml | 2 +- app/code/core/Mage/Usa/etc/system.xml | 2 +- .../Usa/sql/usa_setup/install-1.6.0.0.php | 2 +- .../usa_setup/mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php | 2 +- .../sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php | 2 +- .../core/Mage/Weee/Block/Element/Weee/Tax.php | 2 +- .../Mage/Weee/Block/Renderer/Weee/Tax.php | 2 +- app/code/core/Mage/Weee/Helper/Data.php | 44 +- .../Weee/Model/Attribute/Backend/Weee/Tax.php | 2 +- .../Mage/Weee/Model/Config/Source/Display.php | 2 +- .../Mage/Weee/Model/Config/Source/Fpt/Tax.php | 2 +- .../Mysql4/Attribute/Backend/Weee/Tax.php | 2 +- .../core/Mage/Weee/Model/Mysql4/Setup.php | 2 +- app/code/core/Mage/Weee/Model/Mysql4/Tax.php | 2 +- app/code/core/Mage/Weee/Model/Observer.php | 2 +- .../Resource/Attribute/Backend/Weee/Tax.php | 2 +- .../core/Mage/Weee/Model/Resource/Setup.php | 2 +- .../core/Mage/Weee/Model/Resource/Tax.php | 2 +- app/code/core/Mage/Weee/Model/Tax.php | 36 +- .../Mage/Weee/Model/Total/Creditmemo/Weee.php | 31 +- .../Mage/Weee/Model/Total/Invoice/Weee.php | 19 +- .../Weee/Model/Total/Quote/Nominal/Weee.php | 2 +- .../core/Mage/Weee/Model/Total/Quote/Weee.php | 4 +- app/code/core/Mage/Weee/etc/config.xml | 2 +- app/code/core/Mage/Weee/etc/system.xml | 2 +- .../Weee/sql/weee_setup/install-1.6.0.0.php | 6 +- .../sql/weee_setup/mysql4-install-0.1.php | 2 +- .../sql/weee_setup/mysql4-upgrade-0.1-0.2.php | 2 +- .../weee_setup/mysql4-upgrade-0.10-0.11.php | 2 +- .../weee_setup/mysql4-upgrade-0.11-0.12.php | 2 +- .../weee_setup/mysql4-upgrade-0.12-0.13.php | 2 +- .../sql/weee_setup/mysql4-upgrade-0.2-0.3.php | 2 +- .../sql/weee_setup/mysql4-upgrade-0.3-0.4.php | 2 +- .../sql/weee_setup/mysql4-upgrade-0.4-0.5.php | 2 +- .../sql/weee_setup/mysql4-upgrade-0.5-0.6.php | 2 +- .../sql/weee_setup/mysql4-upgrade-0.6-0.7.php | 2 +- .../sql/weee_setup/mysql4-upgrade-0.7-0.8.php | 2 +- .../sql/weee_setup/mysql4-upgrade-0.8-0.9.php | 2 +- .../weee_setup/mysql4-upgrade-0.9-0.10.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../Mage/Widget/Block/Adminhtml/Widget.php | 2 +- .../Widget/Block/Adminhtml/Widget/Chooser.php | 2 +- .../Widget/Block/Adminhtml/Widget/Form.php | 2 +- .../Block/Adminhtml/Widget/Instance.php | 2 +- .../Block/Adminhtml/Widget/Instance/Edit.php | 2 +- .../Widget/Instance/Edit/Chooser/Block.php | 2 +- .../Widget/Instance/Edit/Chooser/Layout.php | 2 +- .../Widget/Instance/Edit/Chooser/Template.php | 2 +- .../Adminhtml/Widget/Instance/Edit/Form.php | 2 +- .../Widget/Instance/Edit/Tab/Main.php | 2 +- .../Widget/Instance/Edit/Tab/Main/Layout.php | 2 +- .../Widget/Instance/Edit/Tab/Properties.php | 2 +- .../Widget/Instance/Edit/Tab/Settings.php | 2 +- .../Adminhtml/Widget/Instance/Edit/Tabs.php | 2 +- .../Block/Adminhtml/Widget/Instance/Grid.php | 2 +- .../Widget/Block/Adminhtml/Widget/Options.php | 2 +- app/code/core/Mage/Widget/Block/Interface.php | 2 +- app/code/core/Mage/Widget/Helper/Data.php | 2 +- .../core/Mage/Widget/Model/Mysql4/Widget.php | 2 +- .../Widget/Model/Mysql4/Widget/Instance.php | 2 +- .../Mysql4/Widget/Instance/Collection.php | 2 +- app/code/core/Mage/Widget/Model/Observer.php | 2 +- .../Mage/Widget/Model/Resource/Widget.php | 2 +- .../Widget/Model/Resource/Widget/Instance.php | 2 +- .../Resource/Widget/Instance/Collection.php | 2 +- .../Mage/Widget/Model/Template/Filter.php | 2 +- app/code/core/Mage/Widget/Model/Widget.php | 2 +- .../core/Mage/Widget/Model/Widget/Config.php | 2 +- .../Mage/Widget/Model/Widget/Instance.php | 2 +- .../Adminhtml/Widget/InstanceController.php | 2 +- .../Adminhtml/WidgetController.php | 2 +- app/code/core/Mage/Widget/etc/adminhtml.xml | 2 +- app/code/core/Mage/Widget/etc/config.xml | 2 +- .../core/Mage/Widget/etc/jstranslator.xml | 2 +- .../sql/widget_setup/install-1.6.0.0.php | 2 +- .../widget_setup/mysql4-install-1.4.0.0.0.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../core/Mage/Wishlist/Block/Abstract.php | 2 +- .../Mage/Wishlist/Block/Customer/Sharing.php | 2 +- .../Mage/Wishlist/Block/Customer/Sidebar.php | 2 +- .../Mage/Wishlist/Block/Customer/Wishlist.php | 2 +- .../Block/Customer/Wishlist/Button.php | 2 +- .../Block/Customer/Wishlist/Item/Column.php | 2 +- .../Customer/Wishlist/Item/Column/Cart.php | 2 +- .../Customer/Wishlist/Item/Column/Comment.php | 2 +- .../Customer/Wishlist/Item/Column/Image.php | 2 +- .../Customer/Wishlist/Item/Column/Remove.php | 2 +- .../Block/Customer/Wishlist/Item/Options.php | 2 +- .../Block/Customer/Wishlist/Items.php | 2 +- .../Mage/Wishlist/Block/Item/Configure.php | 2 +- app/code/core/Mage/Wishlist/Block/Links.php | 2 +- .../Mage/Wishlist/Block/Render/Item/Price.php | 2 +- .../Mage/Wishlist/Block/Share/Email/Items.php | 2 +- .../Mage/Wishlist/Block/Share/Email/Rss.php | 2 +- .../Mage/Wishlist/Block/Share/Wishlist.php | 2 +- .../Mage/Wishlist/Controller/Abstract.php | 2 +- app/code/core/Mage/Wishlist/Helper/Data.php | 2 +- app/code/core/Mage/Wishlist/Model/Config.php | 2 +- .../Wishlist/Model/Config/Source/Summary.php | 2 +- app/code/core/Mage/Wishlist/Model/Item.php | 2 +- .../core/Mage/Wishlist/Model/Item/Option.php | 2 +- .../core/Mage/Wishlist/Model/Mysql4/Item.php | 2 +- .../Wishlist/Model/Mysql4/Item/Collection.php | 2 +- .../Wishlist/Model/Mysql4/Item/Option.php | 2 +- .../Model/Mysql4/Item/Option/Collection.php | 2 +- .../Model/Mysql4/Product/Collection.php | 2 +- .../Mage/Wishlist/Model/Mysql4/Wishlist.php | 2 +- .../Model/Mysql4/Wishlist/Collection.php | 2 +- .../core/Mage/Wishlist/Model/Observer.php | 2 +- .../Mage/Wishlist/Model/Resource/Item.php | 2 +- .../Model/Resource/Item/Collection.php | 2 +- .../Wishlist/Model/Resource/Item/Option.php | 2 +- .../Model/Resource/Item/Option/Collection.php | 2 +- .../Model/Resource/Product/Collection.php | 2 +- .../Mage/Wishlist/Model/Resource/Wishlist.php | 2 +- .../Model/Resource/Wishlist/Collection.php | 2 +- app/code/core/Mage/Wishlist/Model/Session.php | 2 +- .../core/Mage/Wishlist/Model/Wishlist.php | 2 +- .../Wishlist/controllers/IndexController.php | 2 +- .../Wishlist/controllers/SharedController.php | 2 +- app/code/core/Mage/Wishlist/etc/adminhtml.xml | 2 +- app/code/core/Mage/Wishlist/etc/config.xml | 2 +- app/code/core/Mage/Wishlist/etc/system.xml | 2 +- .../sql/wishlist_setup/install-1.6.0.0.php | 2 +- .../wishlist_setup/mysql4-install-0.7.0.php | 2 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../mysql4-upgrade-0.7.2-0.7.4.php | 2 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 2 +- .../mysql4-upgrade-0.7.6-0.7.7.php | 2 +- .../mysql4-upgrade-0.7.7-0.7.8.php | 2 +- .../mysql4-upgrade-0.7.8-0.7.9.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../Adminhtml/Admin/Application/Edit.php | 2 +- .../Adminhtml/Admin/Application/Edit/Form.php | 2 +- .../Admin/Application/Edit/Tab/Settings.php | 2 +- .../Adminhtml/Admin/Application/Edit/Tabs.php | 2 +- .../Block/Adminhtml/Connect/Config.php | 2 +- .../Block/Adminhtml/Connect/Dashboard.php | 2 +- .../Connect/Dashboard/BestSellers.php | 2 +- .../Adminhtml/Connect/Dashboard/Customers.php | 2 +- .../Connect/Dashboard/GraphAmountsData.php | 2 +- .../Connect/Dashboard/GraphDataAbstract.php | 2 +- .../Adminhtml/Connect/Dashboard/GraphInfo.php | 2 +- .../Connect/Dashboard/GraphOrderData.php | 2 +- .../Connect/Dashboard/GraphTotalsData.php | 2 +- .../Connect/Dashboard/LastOrders.php | 2 +- .../Connect/Dashboard/LastSearchTerms.php | 2 +- .../Connect/Dashboard/MostViewedProducts.php | 2 +- .../Connect/Dashboard/NewCustomers.php | 2 +- .../Adminhtml/Connect/Dashboard/SalesInfo.php | 2 +- .../Connect/Dashboard/StoreSwitcher.php | 2 +- .../Connect/Dashboard/TopSearchTerms.php | 2 +- .../Block/Adminhtml/Connect/Loginform.php | 2 +- .../XmlConnect/Block/Adminhtml/History.php | 2 +- .../Block/Adminhtml/History/Grid.php | 2 +- .../XmlConnect/Block/Adminhtml/Mobile.php | 2 +- .../Block/Adminhtml/Mobile/Edit.php | 2 +- .../Block/Adminhtml/Mobile/Edit/Form.php | 2 +- .../Adminhtml/Mobile/Edit/Submission.php | 2 +- .../Block/Adminhtml/Mobile/Edit/Tab/Cache.php | 2 +- .../Adminhtml/Mobile/Edit/Tab/Content.php | 2 +- .../Adminhtml/Mobile/Edit/Tab/Design.php | 2 +- .../Mobile/Edit/Tab/Design/Accordion.php | 2 +- .../Edit/Tab/Design/Accordion/Images.php | 2 +- .../Mobile/Edit/Tab/Design/Accordion/Tabs.php | 2 +- .../Edit/Tab/Design/Accordion/Themes.php | 2 +- .../Mobile/Edit/Tab/Design/Images.php | 2 +- .../Mobile/Edit/Tab/Design/Preview.php | 2 +- .../Mobile/Edit/Tab/Design/Themes.php | 2 +- .../Mobile/Edit/Tab/Flurryanalytics.php | 2 +- .../Adminhtml/Mobile/Edit/Tab/General.php | 2 +- .../Mobile/Edit/Tab/Notification.php | 2 +- .../Mobile/Edit/Tab/OfflineCatalog.php | 2 +- .../Adminhtml/Mobile/Edit/Tab/Payment.php | 2 +- .../Adminhtml/Mobile/Edit/Tab/Settings.php | 2 +- .../Adminhtml/Mobile/Edit/Tab/Social.php | 2 +- .../Mobile/Edit/Tab/Submission/History.php | 2 +- .../Block/Adminhtml/Mobile/Edit/Tabs.php | 2 +- .../Adminhtml/Mobile/Form/Element/Addrow.php | 2 +- .../Adminhtml/Mobile/Form/Element/Color.php | 2 +- .../Adminhtml/Mobile/Form/Element/Country.php | 2 +- .../Mobile/Form/Element/Datetime.php | 2 +- .../Adminhtml/Mobile/Form/Element/Font.php | 2 +- .../Adminhtml/Mobile/Form/Element/Image.php | 2 +- .../Adminhtml/Mobile/Form/Element/Page.php | 2 +- .../Adminhtml/Mobile/Form/Element/Tabs.php | 2 +- .../Adminhtml/Mobile/Form/Element/Theme.php | 2 +- .../Block/Adminhtml/Mobile/Grid.php | 2 +- .../Adminhtml/Mobile/Grid/Renderer/Bool.php | 2 +- .../Adminhtml/Mobile/Grid/Renderer/Type.php | 2 +- .../Adminhtml/Mobile/Preview/Content.php | 2 +- .../Adminhtml/Mobile/Preview/Tabitems.php | 2 +- .../Block/Adminhtml/Mobile/Submission.php | 2 +- .../Adminhtml/Mobile/Submission/Form.php | 2 +- .../Renderer/Country/Androidmarket.php | 2 +- .../Submission/Renderer/Country/Istore.php | 2 +- .../Mobile/Submission/Tab/Container.php | 2 +- .../Submission/Tab/Container/Submission.php | 2 +- .../Adminhtml/Mobile/Submission/Tabs.php | 2 +- .../Block/Adminhtml/Mobile/Widget/Form.php | 2 +- .../Mage/XmlConnect/Block/Adminhtml/Queue.php | 2 +- .../XmlConnect/Block/Adminhtml/Queue/Edit.php | 2 +- .../Block/Adminhtml/Queue/Edit/Form.php | 2 +- .../XmlConnect/Block/Adminhtml/Queue/Grid.php | 2 +- .../Adminhtml/Queue/Grid/Renderer/Action.php | 2 +- .../Queue/Grid/Renderer/Application.php | 2 +- .../Adminhtml/Queue/Grid/Renderer/Id.php | 2 +- .../Queue/Grid/Renderer/Msgtitle.php | 2 +- .../Queue/Grid/Renderer/Pushtitle.php | 2 +- .../Adminhtml/Queue/Grid/Renderer/Status.php | 2 +- .../Queue/Grid/Renderer/Template.php | 2 +- .../XmlConnect/Block/Adminhtml/Template.php | 2 +- .../Block/Adminhtml/Template/Edit.php | 2 +- .../Block/Adminhtml/Template/Edit/Form.php | 2 +- .../Block/Adminhtml/Template/Grid.php | 2 +- .../Template/Grid/Renderer/Application.php | 2 +- .../Adminhtml/Template/Grid/Renderer/Name.php | 2 +- .../Block/Adminhtml/Template/Preview.php | 4 +- .../Block/Adminhtml/Template/Preview/Form.php | 2 +- app/code/core/Mage/XmlConnect/Block/Cart.php | 2 +- .../Mage/XmlConnect/Block/Cart/CartTotals.php | 2 +- .../Block/Cart/CartTotals/Default.php | 2 +- .../Block/Cart/CartTotals/Grandtotal.php | 2 +- .../Block/Cart/CartTotals/Nodes/Default.php | 2 +- .../Cart/CartTotals/Nodes/Giftcardaccount.php | 2 +- .../Block/Cart/CartTotals/Shipping.php | 2 +- .../Block/Cart/CartTotals/Subtotal.php | 2 +- .../Mage/XmlConnect/Block/Cart/Crosssell.php | 2 +- .../core/Mage/XmlConnect/Block/Cart/Info.php | 2 +- .../XmlConnect/Block/Cart/Item/Renderer.php | 2 +- .../Block/Cart/Item/Renderer/Configurable.php | 2 +- .../Block/Cart/Item/Renderer/Grouped.php | 2 +- .../core/Mage/XmlConnect/Block/Cart/Items.php | 2 +- .../Block/Cart/Paypal/Mecl/Details.php | 2 +- .../Block/Cart/Paypal/Mecl/OrderDetails.php | 2 +- .../Block/Cart/Paypal/Mecl/Review.php | 2 +- .../Cart/Paypal/Mecl/Shippingmethods.php | 2 +- .../Block/Cart/Paypal/Mep/Totals.php | 2 +- .../Mage/XmlConnect/Block/Cart/Totals.php | 2 +- .../core/Mage/XmlConnect/Block/Catalog.php | 2 +- .../XmlConnect/Block/Catalog/Category.php | 2 +- .../Block/Catalog/Category/Info.php | 2 +- .../Mage/XmlConnect/Block/Catalog/Filters.php | 2 +- .../Mage/XmlConnect/Block/Catalog/Product.php | 2 +- .../Block/Catalog/Product/Attributes.php | 2 +- .../Block/Catalog/Product/Gallery.php | 2 +- .../Block/Catalog/Product/ItemPrice.php | 2 +- .../Catalog/Product/ItemPrice/Bundle.php | 2 +- .../Catalog/Product/ItemPrice/Default.php | 2 +- .../Catalog/Product/ItemPrice/Giftcard.php | 2 +- .../XmlConnect/Block/Catalog/Product/List.php | 2 +- .../Block/Catalog/Product/Options.php | 2 +- .../Block/Catalog/Product/Options/Bundle.php | 2 +- .../Catalog/Product/Options/Configurable.php | 2 +- .../Catalog/Product/Options/Downloadable.php | 2 +- .../Catalog/Product/Options/Giftcard.php | 2 +- .../Block/Catalog/Product/Options/Grouped.php | 2 +- .../Block/Catalog/Product/Options/Simple.php | 2 +- .../Block/Catalog/Product/Options/Virtual.php | 2 +- .../Block/Catalog/Product/Price.php | 2 +- .../Block/Catalog/Product/Price/Bundle.php | 2 +- .../Block/Catalog/Product/Price/Default.php | 2 +- .../Block/Catalog/Product/Price/Giftcard.php | 2 +- .../Block/Catalog/Product/Related.php | 2 +- .../Block/Catalog/Product/Review.php | 2 +- .../Block/Catalog/Product/Review/List.php | 2 +- .../Mage/XmlConnect/Block/Catalog/Search.php | 2 +- .../Block/Catalog/Search/Suggest.php | 2 +- .../Block/Checkout/Address/Billing.php | 2 +- .../Block/Checkout/Address/Form.php | 2 +- .../Block/Checkout/Address/Shipping.php | 2 +- .../XmlConnect/Block/Checkout/Agreements.php | 2 +- .../Block/Checkout/Cart/Item/Renderer.php | 2 +- .../Checkout/Cart/Item/Renderer/Bundle.php | 2 +- .../Cart/Item/Renderer/Configurable.php | 2 +- .../Cart/Item/Renderer/Downloadable.php | 2 +- .../Checkout/Cart/Item/Renderer/Giftcard.php | 2 +- .../Checkout/Cart/Item/Renderer/Grouped.php | 2 +- .../Block/Checkout/Onepage/Address.php | 2 +- .../Block/Checkout/Onepage/Address/Form.php | 2 +- .../Block/Checkout/Onepage/Address/List.php | 2 +- .../Block/Checkout/Onepage/Review.php | 2 +- .../Block/Checkout/Order/Review.php | 2 +- .../Block/Checkout/Order/Review/Info.php | 2 +- .../Checkout/Payment/Method/Authorizenet.php | 2 +- .../Block/Checkout/Payment/Method/Ccsave.php | 2 +- .../Block/Checkout/Payment/Method/Checkmo.php | 2 +- .../Payment/Method/Info/Authorizenet.php | 2 +- .../Checkout/Payment/Method/Info/Ccsave.php | 2 +- .../Checkout/Payment/Method/Info/Checkmo.php | 2 +- .../Checkout/Payment/Method/Info/Free.php | 2 +- .../Payment/Method/Info/Paypal/Abstract.php | 2 +- .../Payment/Method/Info/Paypal/Express.php | 2 +- .../Payment/Method/Info/Paypal/Mecl.php | 2 +- .../Method/Info/Pbridge/Authorizenet.php | 2 +- .../Method/Info/Pbridge/Paypal/Direct.php | 2 +- .../Method/Info/Pbridge/Paypaluk/Direct.php | 2 +- .../Payment/Method/Info/Pbridge/Verisign.php | 2 +- .../Payment/Method/Info/Purchaseorder.php | 2 +- .../Block/Checkout/Payment/Method/List.php | 2 +- .../Checkout/Payment/Method/ListApi23.php | 2 +- .../Checkout/Payment/Method/Paypal/Direct.php | 2 +- .../Payment/Method/Paypal/Payflow.php | 2 +- .../Payment/Method/Pbridge/Abstract.php | 2 +- .../Payment/Method/Pbridge/Authorizenet.php | 2 +- .../Payment/Method/Pbridge/Paypal.php | 2 +- .../Payment/Method/Pbridge/Paypaluk.php | 2 +- .../Payment/Method/Pbridge/Verisign.php | 2 +- .../Checkout/Payment/Method/Purchaseorder.php | 2 +- .../Block/Checkout/Pbridge/Result.php | 2 +- .../Checkout/Shipping/Method/Available.php | 2 +- .../Shipping/Method/AvailableList.php | 2 +- .../core/Mage/XmlConnect/Block/Cms/Page.php | 2 +- .../Mage/XmlConnect/Block/Configuration.php | 2 +- .../Block/Customer/Address/Form.php | 2 +- .../Block/Customer/Address/List.php | 2 +- .../XmlConnect/Block/Customer/Downloads.php | 2 +- .../Mage/XmlConnect/Block/Customer/Form.php | 2 +- .../Block/Customer/Form/Renderer/Boolean.php | 2 +- .../Block/Customer/Form/Renderer/Date.php | 2 +- .../Block/Customer/Form/Renderer/File.php | 2 +- .../Block/Customer/Form/Renderer/Image.php | 2 +- .../Customer/Form/Renderer/Multiline.php | 2 +- .../Customer/Form/Renderer/Multiselect.php | 2 +- .../Block/Customer/Form/Renderer/Select.php | 2 +- .../Block/Customer/Form/Renderer/Text.php | 2 +- .../Block/Customer/Form/Renderer/Textarea.php | 2 +- .../Block/Customer/GiftcardCheck.php | 2 +- .../Block/Customer/Order/Details.php | 2 +- .../Customer/Order/Item/Renderer/Bundle.php | 2 +- .../Customer/Order/Item/Renderer/Default.php | 2 +- .../Order/Item/Renderer/Downloadable.php | 2 +- .../Customer/Order/Item/Renderer/Giftcard.php | 2 +- .../Customer/Order/Item/Renderer/Grouped.php | 2 +- .../XmlConnect/Block/Customer/Order/Items.php | 2 +- .../XmlConnect/Block/Customer/Order/List.php | 2 +- .../Block/Customer/Order/Totals.php | 2 +- .../Customer/Order/Totals/Customerbalance.php | 2 +- .../Order/Totals/Customerbalance/Refunded.php | 2 +- .../Block/Customer/Order/Totals/Giftcards.php | 2 +- .../Block/Customer/Order/Totals/Tax.php | 2 +- .../XmlConnect/Block/Customer/Storecredit.php | 2 +- app/code/core/Mage/XmlConnect/Block/Home.php | 2 +- .../Mage/XmlConnect/Block/Homebanners.php | 2 +- .../Mage/XmlConnect/Block/Localization.php | 2 +- .../Mage/XmlConnect/Block/Review/Form.php | 2 +- .../Mage/XmlConnect/Block/ShoppingCart.php | 2 +- .../core/Mage/XmlConnect/Block/Wishlist.php | 2 +- .../Mage/XmlConnect/Controller/Action.php | 2 +- .../XmlConnect/Controller/AdminAction.php | 2 +- .../XmlConnect/Helper/AdminApplication.php | 2 +- .../Helper/Adminhtml/Dashboard/Order.php | 2 +- .../core/Mage/XmlConnect/Helper/Android.php | 2 +- .../Helper/Catalog/Category/Image.php | 2 +- .../Helper/Catalog/Product/Image.php | 2 +- .../Helper/Customer/Form/Renderer.php | 2 +- .../Mage/XmlConnect/Helper/Customer/Order.php | 2 +- app/code/core/Mage/XmlConnect/Helper/Data.php | 2 +- .../XmlConnect/Helper/Device/Abstract.php | 2 +- .../core/Mage/XmlConnect/Helper/Image.php | 2 +- app/code/core/Mage/XmlConnect/Helper/Ipad.php | 2 +- .../core/Mage/XmlConnect/Helper/Iphone.php | 2 +- .../Mage/XmlConnect/Helper/OfflineCatalog.php | 2 +- .../core/Mage/XmlConnect/Helper/Payment.php | 2 +- .../core/Mage/XmlConnect/Helper/Theme.php | 2 +- .../core/Mage/XmlConnect/Helper/Translate.php | 2 +- .../Model/Adminhtml/Search/Catalog.php | 2 +- .../Model/Adminhtml/Search/Category.php | 2 +- .../System/Config/Backend/Baseurl.php | 2 +- .../Config/Backend/Currency/Default.php | 2 +- .../Mage/XmlConnect/Model/Application.php | 2 +- .../Model/Catalog/Category/Image.php | 2 +- .../Model/Catalog/Category/Media/Config.php | 2 +- .../core/Mage/XmlConnect/Model/ConfigData.php | 2 +- .../Mage/XmlConnect/Model/Configuration.php | 2 +- .../Mage/XmlConnect/Model/Device/Abstract.php | 2 +- .../Mage/XmlConnect/Model/Device/Android.php | 2 +- .../Mage/XmlConnect/Model/Device/Ipad.php | 2 +- .../Mage/XmlConnect/Model/Device/Iphone.php | 2 +- .../core/Mage/XmlConnect/Model/History.php | 2 +- .../Mage/XmlConnect/Model/ImageAction.php | 2 +- .../Mage/XmlConnect/Model/ImageLimits.php | 2 +- .../XmlConnect/Model/ImageLimits/Abstract.php | 2 +- .../core/Mage/XmlConnect/Model/Images.php | 2 +- .../XmlConnect/Model/Mysql4/Application.php | 2 +- .../Model/Mysql4/Application/Collection.php | 2 +- .../Model/Mysql4/Cms/Page/Collection.php | 2 +- .../XmlConnect/Model/Mysql4/ConfigData.php | 2 +- .../Model/Mysql4/ConfigData/Collection.php | 2 +- .../Model/Mysql4/Filter/Collection.php | 2 +- .../Mage/XmlConnect/Model/Mysql4/History.php | 2 +- .../Model/Mysql4/History/Collection.php | 2 +- .../Mage/XmlConnect/Model/Mysql4/Queue.php | 2 +- .../Model/Mysql4/Queue/Collection.php | 2 +- .../Mage/XmlConnect/Model/Mysql4/Setup.php | 2 +- .../Mage/XmlConnect/Model/Mysql4/Template.php | 2 +- .../Model/Mysql4/Template/Collection.php | 2 +- .../core/Mage/XmlConnect/Model/Observer.php | 2 +- .../Mage/XmlConnect/Model/OfflineCatalog.php | 2 +- .../Model/OfflineCatalog/Abstract.php | 2 +- .../Model/OfflineCatalog/Category.php | 2 +- .../OfflineCatalog/Category/Category.php | 2 +- .../OfflineCatalog/Category/IndexCategory.php | 2 +- .../Model/OfflineCatalog/Config.php | 2 +- .../XmlConnect/Model/OfflineCatalog/Home.php | 2 +- .../Model/OfflineCatalog/Homebanners.php | 2 +- .../Model/OfflineCatalog/Product.php | 2 +- .../Model/OfflineCatalog/Product/Gallery.php | 2 +- .../Model/OfflineCatalog/Product/Product.php | 2 +- .../Model/OfflineCatalog/Product/Review.php | 2 +- .../Model/Payment/Method/Paypal/Config.php | 2 +- .../Model/Payment/Method/Paypal/Mecl.php | 2 +- .../Model/Payment/Method/Paypal/Mep.php | 2 +- .../Model/Payment/Method/Paypal/Pro.php | 2 +- .../XmlConnect/Model/Paypal/Mecl/Checkout.php | 2 +- .../XmlConnect/Model/Paypal/Mep/Checkout.php | 2 +- .../XmlConnect/Model/Preview/Abstract.php | 2 +- .../Mage/XmlConnect/Model/Preview/Android.php | 2 +- .../Mage/XmlConnect/Model/Preview/Ipad.php | 2 +- .../Mage/XmlConnect/Model/Preview/Iphone.php | 2 +- app/code/core/Mage/XmlConnect/Model/Queue.php | 2 +- .../XmlConnect/Model/Resource/Application.php | 2 +- .../Model/Resource/Application/Collection.php | 2 +- .../Resource/CategorySearch/Collection.php | 2 +- .../Model/Resource/Cms/Page/Collection.php | 2 +- .../XmlConnect/Model/Resource/ConfigData.php | 2 +- .../Model/Resource/ConfigData/Collection.php | 2 +- .../Model/Resource/Filter/Collection.php | 2 +- .../XmlConnect/Model/Resource/History.php | 2 +- .../Model/Resource/History/Collection.php | 2 +- .../Mage/XmlConnect/Model/Resource/Images.php | 2 +- .../Model/Resource/Images/Collection.php | 2 +- .../Mage/XmlConnect/Model/Resource/Queue.php | 2 +- .../Model/Resource/Queue/Collection.php | 2 +- .../Mage/XmlConnect/Model/Resource/Setup.php | 2 +- .../XmlConnect/Model/Resource/Template.php | 2 +- .../Model/Resource/Template/Collection.php | 2 +- .../XmlConnect/Model/Simplexml/Element.php | 2 +- .../Mage/XmlConnect/Model/Simplexml/Form.php | 2 +- .../Model/Simplexml/Form/Abstract.php | 2 +- .../Model/Simplexml/Form/Element/Abstract.php | 2 +- .../Model/Simplexml/Form/Element/Checkbox.php | 2 +- .../Simplexml/Form/Element/Collection.php | 2 +- .../Form/Element/CountryListSelect.php | 2 +- .../Model/Simplexml/Form/Element/Custom.php | 2 +- .../Model/Simplexml/Form/Element/Date.php | 2 +- .../Model/Simplexml/Form/Element/Email.php | 2 +- .../Model/Simplexml/Form/Element/Fieldset.php | 2 +- .../Model/Simplexml/Form/Element/File.php | 2 +- .../Model/Simplexml/Form/Element/Image.php | 2 +- .../Simplexml/Form/Element/Multiline.php | 2 +- .../Simplexml/Form/Element/Multiselect.php | 2 +- .../Model/Simplexml/Form/Element/Password.php | 2 +- .../Form/Element/Renderer/Interface.php | 2 +- .../Model/Simplexml/Form/Element/Select.php | 2 +- .../Model/Simplexml/Form/Element/Text.php | 2 +- .../Model/Simplexml/Form/Element/Textarea.php | 2 +- .../Simplexml/Form/Element/Validator.php | 2 +- .../Form/Element/Validator/Abstract.php | 2 +- .../Simplexml/Form/Element/Validator/Rule.php | 2 +- .../XmlConnect/Model/Simplexml/Message.php | 2 +- .../Model/Simplexml/Message/Abstract.php | 2 +- .../Model/Simplexml/Message/Error.php | 2 +- .../Model/Simplexml/Message/Success.php | 2 +- app/code/core/Mage/XmlConnect/Model/Tabs.php | 2 +- .../core/Mage/XmlConnect/Model/Template.php | 2 +- app/code/core/Mage/XmlConnect/Model/Theme.php | 2 +- .../Adminhtml/Admin/ApplicationController.php | 2 +- .../Adminhtml/Connect/ConfigController.php | 2 +- .../Adminhtml/Connect/DashboardController.php | 2 +- .../Adminhtml/Connect/UserController.php | 2 +- .../Adminhtml/MobileController.php | 2 +- .../XmlConnect/controllers/CartController.php | 2 +- .../controllers/CatalogController.php | 2 +- .../controllers/CheckoutController.php | 2 +- .../XmlConnect/controllers/CmsController.php | 2 +- .../controllers/ConfigurationController.php | 2 +- .../controllers/CustomerController.php | 2 +- .../controllers/HomebannersController.php | 2 +- .../controllers/IndexController.php | 2 +- .../controllers/LocalizationController.php | 2 +- .../controllers/OfflineCatalogController.php | 2 +- .../controllers/Paypal/MeclController.php | 2 +- .../controllers/Paypal/MepController.php | 2 +- .../controllers/PbridgeController.php | 2 +- .../controllers/ReviewController.php | 2 +- .../controllers/WishlistController.php | 2 +- .../core/Mage/XmlConnect/etc/adminhtml.xml | 2 +- app/code/core/Mage/XmlConnect/etc/config.xml | 2 +- app/code/core/Mage/XmlConnect/etc/system.xml | 2 +- .../Mage/XmlConnect/etc/themes/custom.xml | 2 +- .../Mage/XmlConnect/etc/themes/default.xml | 2 +- .../Mage/XmlConnect/etc/themes/funk_leaf.xml | 2 +- .../Mage/XmlConnect/etc/themes/hot_red.xml | 2 +- .../Mage/XmlConnect/etc/themes/sky_blue.xml | 2 +- .../sql/xmlconnect_setup/install-1.6.0.0.php | 2 +- .../mysql4-data-upgrade-1.4.0.13-1.4.0.14.php | 2 +- .../mysql4-data-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../mysql4-data-upgrade-1.6.0.0-1.6.0.0.1.php | 2 +- .../mysql4-install-1.4.0.8.php | 2 +- .../mysql4-upgrade-1.4.0.10-1.4.0.11.php | 2 +- .../mysql4-upgrade-1.4.0.11-1.4.0.12.php | 2 +- .../mysql4-upgrade-1.4.0.12-1.4.0.13.php | 2 +- .../mysql4-upgrade-1.4.0.13-1.4.0.14.php | 2 +- .../mysql4-upgrade-1.4.0.8-1.4.0.9.php | 2 +- .../mysql4-upgrade-1.4.0.9-1.4.0.10.php | 2 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 2 +- .../upgrade-1.6.0.0-1.6.0.0.1.php | 2 +- app/code/local/local_data_goes_here | 0 .../adminhtml/default/default/etc/theme.xml | 30 - .../default/default/layout/admin.xml | 2 +- .../default/layout/adminnotification.xml | 2 +- .../adminhtml/default/default/layout/api2.xml | 2 +- .../default/default/layout/authorizenet.xml | 2 +- .../default/default/layout/bundle.xml | 2 +- .../default/default/layout/captcha.xml | 2 +- .../default/default/layout/catalog.xml | 2 +- .../default/default/layout/centinel.xml | 2 +- .../adminhtml/default/default/layout/cms.xml | 2 +- .../default/default/layout/compiler.xml | 2 +- .../default/default/layout/connect.xml | 2 +- .../default/default/layout/currencysymbol.xml | 2 +- .../default/default/layout/customer.xml | 2 +- .../default/default/layout/dataflow.xml | 2 +- .../default/default/layout/downloadable.xml | 2 +- .../default/default/layout/giftmessage.xml | 2 +- .../default/default/layout/index.xml | 2 +- .../adminhtml/default/default/layout/main.xml | 3 +- .../default/default/layout/moneybookers.xml | 2 +- .../default/default/layout/newsletter.xml | 2 +- .../default/default/layout/oauth.xml | 2 +- .../default/default/layout/pagecache.xml | 2 +- .../default/default/layout/promo.xml | 2 +- .../default/default/layout/report.xml | 2 +- .../adminhtml/default/default/layout/rss.xml | 2 +- .../default/default/layout/sales.xml | 2 +- .../default/default/layout/search.xml | 2 +- .../adminhtml/default/default/layout/tag.xml | 2 +- .../adminhtml/default/default/layout/tax.xml | 2 +- .../default/default/layout/widget.xml | 2 +- .../default/default/layout/xmlconnect.xml | 2 +- .../default/template/access_denied.phtml | 2 +- .../template/api/role_users_grid_js.phtml | 2 +- .../default/template/api/roleinfo.phtml | 2 +- .../default/default/template/api/roles.phtml | 2 +- .../default/template/api/rolesedit.phtml | 2 +- .../default/template/api/rolesusers.phtml | 2 +- .../template/api/user_roles_grid_js.phtml | 2 +- .../default/template/api/userinfo.phtml | 2 +- .../default/template/api/usernroles.phtml | 2 +- .../default/template/api/userroles.phtml | 2 +- .../default/default/template/api/users.phtml | 2 +- .../template/api2/attribute/buttons.phtml | 2 +- .../template/api2/attribute/resource.phtml | 2 +- .../permissions/user/edit/tab/roles/js.phtml | 2 +- .../default/template/api2/role/buttons.phtml | 2 +- .../template/api2/role/users_grid_js.phtml | 2 +- .../authorizenet/directpost/iframe.phtml | 2 +- .../authorizenet/directpost/info.phtml | 2 +- .../default/template/backup/left.phtml | 2 +- .../default/template/backup/list.phtml | 2 +- .../composite/fieldset/options/bundle.phtml | 2 +- .../fieldset/options/type/checkbox.phtml | 2 +- .../fieldset/options/type/multi.phtml | 2 +- .../fieldset/options/type/radio.phtml | 2 +- .../fieldset/options/type/select.phtml | 2 +- .../template/bundle/product/edit/bundle.phtml | 2 +- .../bundle/product/edit/bundle/option.phtml | 2 +- .../product/edit/bundle/option/search.phtml | 2 +- .../edit/bundle/option/selection.phtml | 2 +- .../creditmemo/create/items/renderer.phtml | 2 +- .../creditmemo/view/items/renderer.phtml | 2 +- .../sales/invoice/create/items/renderer.phtml | 2 +- .../sales/invoice/view/items/renderer.phtml | 2 +- .../sales/order/view/items/renderer.phtml | 2 +- .../shipment/create/items/renderer.phtml | 2 +- .../sales/shipment/view/items/renderer.phtml | 2 +- .../default/template/captcha/zend.phtml | 2 +- .../catalog/category/checkboxes/tree.phtml | 2 +- .../template/catalog/category/edit.phtml | 2 +- .../template/catalog/category/edit/form.phtml | 2 +- .../template/catalog/category/tree.phtml | 2 +- .../catalog/category/widget/tree.phtml | 2 +- .../form/renderer/fieldset/element.phtml | 2 +- .../default/template/catalog/product.phtml | 2 +- .../catalog/product/attribute/js.phtml | 2 +- .../product/attribute/new/created.phtml | 2 +- .../catalog/product/attribute/options.phtml | 2 +- .../catalog/product/attribute/set/main.phtml | 2 +- .../attribute/set/main/tree/attribute.phtml | 2 +- .../attribute/set/main/tree/group.phtml | 2 +- .../product/attribute/set/toolbar/add.phtml | 2 +- .../product/attribute/set/toolbar/main.phtml | 2 +- .../catalog/product/composite/configure.phtml | 2 +- .../composite/fieldset/configurable.phtml | 2 +- .../product/composite/fieldset/grouped.phtml | 2 +- .../product/composite/fieldset/options.phtml | 2 +- .../composite/fieldset/options/js.phtml | 2 +- .../fieldset/options/type/date.phtml | 2 +- .../fieldset/options/type/default.phtml | 2 +- .../fieldset/options/type/file.phtml | 2 +- .../fieldset/options/type/select.phtml | 2 +- .../fieldset/options/type/text.phtml | 2 +- .../product/composite/fieldset/qty.phtml | 2 +- .../template/catalog/product/created.phtml | 2 +- .../template/catalog/product/edit.phtml | 2 +- .../product/edit/action/attribute.phtml | 2 +- .../product/edit/action/inventory.phtml | 2 +- .../product/edit/action/websites.phtml | 2 +- .../catalog/product/edit/categories.phtml | 2 +- .../catalog/product/edit/options.phtml | 2 +- .../catalog/product/edit/options/option.phtml | 2 +- .../product/edit/options/type/date.phtml | 2 +- .../product/edit/options/type/file.phtml | 2 +- .../product/edit/options/type/select.phtml | 2 +- .../product/edit/options/type/text.phtml | 2 +- .../catalog/product/edit/price/group.phtml | 2 +- .../catalog/product/edit/price/tier.phtml | 2 +- .../catalog/product/edit/serializer.phtml | 2 +- .../catalog/product/edit/super/config.phtml | 2 +- .../catalog/product/edit/websites.phtml | 2 +- .../catalog/product/helper/gallery.phtml | 2 +- .../default/template/catalog/product/js.phtml | 2 +- .../template/catalog/product/price.phtml | 2 +- .../template/catalog/product/tab/alert.phtml | 2 +- .../catalog/product/tab/inventory.phtml | 2 +- .../product/widget/chooser/container.phtml | 2 +- .../default/template/catalog/wysiwyg/js.phtml | 2 +- .../centinel/authentication/complete.phtml | 2 +- .../centinel/authentication/start.phtml | 2 +- .../template/centinel/validation/form.phtml | 2 +- .../template/cms/browser/content.phtml | 2 +- .../template/cms/browser/content/files.phtml | 2 +- .../cms/browser/content/newfolder.phtml | 2 +- .../cms/browser/content/uploader.phtml | 2 +- .../default/template/cms/browser/js.phtml | 2 +- .../default/template/cms/browser/tree.phtml | 2 +- .../cms/page/edit/form/renderer/content.phtml | 2 +- .../default/default/template/coming.phtml | 2 +- .../default/template/compiler/process.phtml | 2 +- .../connect/extension/custom/authors.phtml | 2 +- .../connect/extension/custom/contents.phtml | 2 +- .../connect/extension/custom/depends.phtml | 2 +- .../connect/extension/custom/load.phtml | 2 +- .../connect/extension/custom/package.phtml | 2 +- .../connect/extension/custom/release.phtml | 2 +- .../template/currencysymbol/grid.phtml | 2 +- .../default/template/customer/edit/js.phtml | 2 +- .../tab/account/form/renderer/group.phtml | 2 +- .../customer/edit/tab/view/grid/item.phtml | 2 +- .../default/template/customer/online.phtml | 2 +- .../create/address/form/renderer/vat.phtml | 2 +- .../customer/system/config/validatevat.phtml | 2 +- .../template/customer/tab/addresses.phtml | 2 +- .../default/template/customer/tab/cart.phtml | 2 +- .../template/customer/tab/newsletter.phtml | 2 +- .../default/template/customer/tab/view.phtml | 2 +- .../template/customer/tab/view/sales.phtml | 2 +- .../template/customer/tab/wishlist.phtml | 2 +- .../default/template/dashboard/graph.phtml | 2 +- .../template/dashboard/graph/disabled.phtml | 2 +- .../default/template/dashboard/grid.phtml | 2 +- .../default/template/dashboard/index.phtml | 2 +- .../default/template/dashboard/salebar.phtml | 2 +- .../default/template/dashboard/searches.phtml | 2 +- .../template/dashboard/store/switcher.phtml | 2 +- .../default/template/dashboard/totalbar.phtml | 2 +- .../directory/js/optional_zip_countries.phtml | 2 +- .../composite/fieldset/downloadable.phtml | 2 +- .../product/edit/downloadable.phtml | 2 +- .../product/edit/downloadable/links.phtml | 2 +- .../product/edit/downloadable/samples.phtml | 2 +- .../column/downloadable/creditmemo/name.phtml | 2 +- .../column/downloadable/invoice/name.phtml | 2 +- .../items/column/downloadable/name.phtml | 2 +- .../create/items/renderer/downloadable.phtml | 2 +- .../view/items/renderer/downloadable.phtml | 2 +- .../create/items/renderer/downloadable.phtml | 2 +- .../view/items/renderer/downloadable.phtml | 2 +- .../view/items/renderer/downloadable.phtml | 2 +- .../template/eav/attribute/edit/js.phtml | 2 +- .../template/eav/attribute/options.phtml | 2 +- .../default/template/email/order/items.phtml | 2 +- .../default/default/template/empty.phtml | 2 +- .../default/default/template/example.phtml | 2 +- .../default/template/forgotpassword.phtml | 2 +- .../default/default/template/formkey.phtml | 2 +- .../default/template/giftmessage/form.phtml | 2 +- .../giftmessage/giftoptionsform.phtml | 2 +- .../default/template/giftmessage/helper.phtml | 2 +- .../default/template/giftmessage/popup.phtml | 2 +- .../sales/order/create/giftoptions.phtml | 2 +- .../sales/order/create/items.phtml | 2 +- .../sales/order/view/giftoptions.phtml | 2 +- .../giftmessage/sales/order/view/items.phtml | 2 +- .../default/template/googlebase/captcha.phtml | 2 +- .../default/template/googlebase/items.phtml | 2 +- .../googlebase/types/edit/attributes.phtml | 2 +- .../default/template/importexport/busy.phtml | 2 +- .../importexport/export/form/after.phtml | 2 +- .../importexport/export/form/before.phtml | 2 +- .../importexport/import/form/after.phtml | 2 +- .../importexport/import/form/before.phtml | 2 +- .../importexport/import/frame/result.phtml | 2 +- .../template/index/notifications.phtml | 2 +- .../default/default/template/login.phtml | 2 +- .../default/template/media/editor.phtml | 2 +- .../default/template/media/uploader.phtml | 2 +- .../default/template/moneybookers/info.phtml | 2 +- .../template/moneybookers/jsinit.phtml | 2 +- .../template/moneybookers/pdf/info.phtml | 2 +- .../newsletter/preview/iframeswitcher.phtml | 2 +- .../template/newsletter/preview/store.phtml | 2 +- .../template/newsletter/problem/list.phtml | 2 +- .../template/newsletter/queue/edit.phtml | 2 +- .../template/newsletter/queue/list.phtml | 2 +- .../template/newsletter/queue/preview.phtml | 2 +- .../template/newsletter/subscriber/list.phtml | 2 +- .../template/newsletter/template/edit.phtml | 2 +- .../template/newsletter/template/list.phtml | 2 +- .../newsletter/template/preview.phtml | 2 +- .../template/notification/baseurl.phtml | 2 +- .../template/notification/security.phtml | 2 +- .../template/notification/survey.phtml | 2 +- .../template/notification/toolbar.phtml | 2 +- .../template/notification/window.phtml | 2 +- .../oauth/authorize/button-simple.phtml | 2 +- .../template/oauth/authorize/button.phtml | 2 +- .../oauth/authorize/confirm-simple.phtml | 2 +- .../template/oauth/authorize/confirm.phtml | 2 +- .../oauth/authorize/form/login-simple.phtml | 2 +- .../template/oauth/authorize/form/login.phtml | 2 +- .../oauth/authorize/head-simple.phtml | 2 +- .../oauth/authorize/reject-simple.phtml | 2 +- .../template/oauth/authorize/reject.phtml | 2 +- .../default/template/overlay_popup.phtml | 2 +- .../default/default/template/page.phtml | 2 +- .../default/template/page/footer.phtml | 4 +- .../default/template/page/header.phtml | 2 +- .../default/template/page/js/calendar.phtml | 2 +- .../default/template/page/js/translate.phtml | 2 +- .../default/default/template/page/menu.phtml | 2 +- .../default/template/page/notices.phtml | 2 +- .../template/pagecache/cache/additional.phtml | 2 +- .../default/template/paygate/form/cc.phtml | 2 +- .../default/template/paygate/info/cc.phtml | 2 +- .../default/template/paygate/info/pdf.phtml | 2 +- .../template/payment/form/banktransfer.phtml | 2 +- .../payment/form/cashondelivery.phtml | 2 +- .../default/template/payment/form/cc.phtml | 2 +- .../template/payment/form/ccsave.phtml | 2 +- .../template/payment/form/checkmo.phtml | 2 +- .../template/payment/form/purchaseorder.phtml | 2 +- .../template/payment/info/banktransfer.phtml | 2 +- .../template/payment/info/checkmo.phtml | 2 +- .../template/payment/info/default.phtml | 2 +- .../template/payment/info/pdf/checkmo.phtml | 2 +- .../template/payment/info/pdf/default.phtml | 2 +- .../payment/info/pdf/purchaseorder.phtml | 2 +- .../template/payment/info/purchaseorder.phtml | 2 +- .../paypal/system/config/api_wizard.phtml | 2 +- .../paypal/system/config/bml_api_wizard.phtml | 36 - .../system/config/fieldset/global.phtml | 2 +- .../paypal/system/config/fieldset/hint.phtml | 2 +- .../paypal/system/config/fieldset/store.phtml | 2 +- .../system/config/payflowlink/advanced.phtml | 2 +- .../system/config/payflowlink/info.phtml | 2 +- .../template/permissions/roleinfo.phtml | 2 +- .../default/template/permissions/roles.phtml | 2 +- .../template/permissions/rolesedit.phtml | 2 +- .../template/permissions/rolesusers.phtml | 2 +- .../template/permissions/userinfo.phtml | 2 +- .../template/permissions/usernroles.phtml | 2 +- .../template/permissions/userroles.phtml | 2 +- .../default/template/permissions/users.phtml | 2 +- .../default/template/poll/answers/list.phtml | 2 +- .../default/default/template/popup.phtml | 2 +- .../default/template/promo/fieldset.phtml | 2 +- .../default/default/template/promo/form.phtml | 2 +- .../default/default/template/promo/js.phtml | 2 +- .../default/template/promo/salesrulejs.phtml | 2 +- .../default/template/rating/detailed.phtml | 2 +- .../default/template/rating/options.phtml | 2 +- .../template/rating/stars/detailed.phtml | 2 +- .../template/rating/stars/summary.phtml | 2 +- .../default/template/report/grid.phtml | 2 +- .../template/report/grid/container.phtml | 2 +- .../template/report/refresh/statistics.phtml | 2 +- .../template/report/store/switcher.phtml | 2 +- .../report/store/switcher/enhanced.phtml | 2 +- .../default/template/report/wishlist.phtml | 2 +- .../template/resetforgottenpassword.phtml | 2 +- .../default/default/template/review/add.phtml | 2 +- .../sales/billing/agreement/form.phtml | 2 +- .../sales/billing/agreement/view/form.phtml | 2 +- .../billing/agreement/view/tab/info.phtml | 2 +- .../template/sales/items/column/name.phtml | 2 +- .../template/sales/items/column/qty.phtml | 2 +- .../sales/items/renderer/default.phtml | 2 +- .../template/sales/order/address/form.phtml | 2 +- .../template/sales/order/comments/view.phtml | 2 +- .../sales/order/create/abstract.phtml | 2 +- .../order/create/billing/method/form.phtml | 2 +- .../template/sales/order/create/comment.phtml | 2 +- .../sales/order/create/coupons/form.phtml | 2 +- .../template/sales/order/create/data.phtml | 2 +- .../template/sales/order/create/form.phtml | 2 +- .../sales/order/create/form/account.phtml | 2 +- .../sales/order/create/form/address.phtml | 2 +- .../sales/order/create/giftmessage.phtml | 2 +- .../template/sales/order/create/items.phtml | 2 +- .../sales/order/create/items/grid.phtml | 2 +- .../template/sales/order/create/js.phtml | 2 +- .../sales/order/create/newsletter/form.phtml | 2 +- .../order/create/shipping/method/form.phtml | 2 +- .../template/sales/order/create/sidebar.phtml | 2 +- .../sales/order/create/sidebar/items.phtml | 2 +- .../sales/order/create/store/select.phtml | 2 +- .../template/sales/order/create/totals.phtml | 2 +- .../sales/order/create/totals/default.phtml | 2 +- .../order/create/totals/grandtotal.phtml | 2 +- .../sales/order/create/totals/shipping.phtml | 2 +- .../sales/order/create/totals/subtotal.phtml | 2 +- .../sales/order/create/totals/tax.phtml | 2 +- .../sales/order/creditmemo/create/form.phtml | 2 +- .../sales/order/creditmemo/create/items.phtml | 2 +- .../create/items/renderer/configurable.phtml | 2 +- .../create/items/renderer/default.phtml | 6 +- .../create/totals/adjustments.phtml | 2 +- .../sales/order/creditmemo/view/form.phtml | 2 +- .../sales/order/creditmemo/view/items.phtml | 2 +- .../view/items/renderer/configurable.phtml | 2 +- .../view/items/renderer/default.phtml | 6 +- .../template/sales/order/giftoptions.phtml | 2 +- .../sales/order/invoice/create/form.phtml | 2 +- .../sales/order/invoice/create/items.phtml | 2 +- .../create/items/renderer/configurable.phtml | 2 +- .../create/items/renderer/default.phtml | 6 +- .../sales/order/invoice/create/tracking.phtml | 2 +- .../sales/order/invoice/view/form.phtml | 2 +- .../sales/order/invoice/view/items.phtml | 2 +- .../view/items/renderer/configurable.phtml | 2 +- .../invoice/view/items/renderer/default.phtml | 6 +- .../sales/order/shipment/create/form.phtml | 2 +- .../sales/order/shipment/create/items.phtml | 2 +- .../create/items/renderer/configurable.phtml | 2 +- .../create/items/renderer/default.phtml | 2 +- .../order/shipment/create/tracking.phtml | 2 +- .../sales/order/shipment/packaging/grid.phtml | 2 +- .../order/shipment/packaging/packed.phtml | 2 +- .../order/shipment/packaging/popup.phtml | 2 +- .../sales/order/shipment/tracking/info.phtml | 2 +- .../sales/order/shipment/view/form.phtml | 2 +- .../sales/order/shipment/view/items.phtml | 2 +- .../view/items/renderer/configurable.phtml | 2 +- .../view/items/renderer/default.phtml | 2 +- .../sales/order/shipment/view/tracking.phtml | 2 +- .../template/sales/order/totalbar.phtml | 2 +- .../default/template/sales/order/totals.phtml | 2 +- .../sales/order/totals/discount.phtml | 2 +- .../template/sales/order/totals/due.phtml | 2 +- .../template/sales/order/totals/footer.phtml | 2 +- .../template/sales/order/totals/grand.phtml | 2 +- .../template/sales/order/totals/item.phtml | 2 +- .../template/sales/order/totals/main.phtml | 2 +- .../template/sales/order/totals/paid.phtml | 2 +- .../sales/order/totals/refunded.phtml | 2 +- .../sales/order/totals/shipping.phtml | 2 +- .../sales/order/totals/subtotal.phtml | 2 +- .../template/sales/order/totals/tax.phtml | 2 +- .../template/sales/order/view/form.phtml | 2 +- .../sales/order/view/giftmessage.phtml | 2 +- .../template/sales/order/view/history.phtml | 2 +- .../template/sales/order/view/info.phtml | 2 +- .../template/sales/order/view/items.phtml | 2 +- .../order/view/items/renderer/default.phtml | 6 +- .../sales/order/view/tab/history.phtml | 2 +- .../template/sales/order/view/tab/info.phtml | 2 +- .../template/sales/order/view/tracking.phtml | 2 +- .../payment/form/billing/agreement.phtml | 2 +- .../sales/recurring/profile/view.phtml | 2 +- .../sales/recurring/profile/view/info.phtml | 2 +- .../template/sales/transactions/detail.phtml | 2 +- .../default/template/store/switcher.phtml | 2 +- .../template/store/switcher/enhanced.phtml | 2 +- .../switcher/form/renderer/fieldset.phtml | 2 +- .../form/renderer/fieldset/element.phtml | 2 +- .../template/system/autocomplete.phtml | 2 +- .../template/system/cache/additional.phtml | 2 +- .../default/template/system/cache/edit.phtml | 2 +- .../template/system/cache/notifications.phtml | 2 +- .../default/template/system/config/edit.phtml | 2 +- .../system/config/form/field/array.phtml | 2 +- .../default/template/system/config/js.phtml | 2 +- .../template/system/config/switcher.phtml | 2 +- .../system/storage/media/synchronize.phtml | 2 +- .../default/template/system/config/tabs.phtml | 2 +- .../system/convert/profile/process.phtml | 2 +- .../system/convert/profile/wizard.phtml | 2 +- .../system/currency/rate/matrix.phtml | 2 +- .../system/currency/rate/services.phtml | 2 +- .../template/system/currency/rates.phtml | 2 +- .../default/template/system/design/edit.phtml | 2 +- .../template/system/design/index.phtml | 2 +- .../template/system/email/template/edit.phtml | 2 +- .../template/system/email/template/list.phtml | 2 +- .../system/email/template/preview.phtml | 2 +- .../default/template/system/info.phtml | 2 +- .../system/shipping/applicable_country.phtml | 2 +- .../template/system/shipping/ups.phtml | 2 +- .../default/template/system/store/cell.phtml | 2 +- .../template/system/store/container.phtml | 2 +- .../default/template/system/store/tree.phtml | 2 +- .../default/template/system/variable/js.phtml | 2 +- .../default/template/tag/edit/container.phtml | 2 +- .../default/default/template/tag/index.phtml | 2 +- .../template/tax/class/page/edit.phtml | 2 +- .../default/template/tax/importExport.phtml | 2 +- .../default/template/tax/notifications.phtml | 2 +- .../default/template/tax/rate/form.phtml | 2 +- .../default/template/tax/rate/title.phtml | 2 +- .../template/tax/toolbar/class/add.phtml | 2 +- .../template/tax/toolbar/class/save.phtml | 2 +- .../template/tax/toolbar/rate/add.phtml | 2 +- .../template/tax/toolbar/rate/save.phtml | 2 +- .../template/tax/toolbar/rule/add.phtml | 2 +- .../template/tax/toolbar/rule/save.phtml | 2 +- .../template/urlrewrite/categories.phtml | 2 +- .../default/template/urlrewrite/edit.phtml | 2 +- .../template/urlrewrite/selector.phtml | 2 +- .../template/usa/dhl/unitofmeasure.phtml | 2 +- .../default/template/weee/renderer/tax.phtml | 2 +- .../default/template/widget/accordion.phtml | 2 +- .../default/template/widget/breadcrumbs.phtml | 2 +- .../default/template/widget/form.phtml | 2 +- .../template/widget/form/container.phtml | 2 +- .../template/widget/form/element.phtml | 2 +- .../widget/form/element/gallery.phtml | 2 +- .../widget/form/renderer/element.phtml | 2 +- .../widget/form/renderer/fieldset.phtml | 2 +- .../form/renderer/fieldset/element.phtml | 2 +- .../default/template/widget/grid.phtml | 2 +- .../template/widget/grid/container.phtml | 2 +- .../template/widget/grid/massaction.phtml | 2 +- .../template/widget/grid/serializer.phtml | 2 +- .../widget/instance/edit/layout.phtml | 2 +- .../default/template/widget/instance/js.phtml | 2 +- .../default/template/widget/tabs.phtml | 2 +- .../default/template/widget/tabshoriz.phtml | 2 +- .../default/template/widget/tabsleft.phtml | 2 +- .../template/widget/view/container.phtml | 2 +- .../xmlconnect/edit/tab/content.phtml | 2 +- .../template/xmlconnect/edit/tab/design.phtml | 2 +- .../edit/tab/design/autocomplete.phtml | 2 +- .../edit/tab/design/image_edit.phtml | 2 +- .../edit/tab/design/images_android.phtml | 2 +- .../edit/tab/design/images_ipad.phtml | 2 +- .../edit/tab/design/images_iphone.phtml | 2 +- .../tab/design/preview/banner_rotator.phtml | 2 +- .../tab/design/preview/catalog_android.phtml | 2 +- .../tab/design/preview/catalog_hor_ipad.phtml | 2 +- .../tab/design/preview/catalog_ipad.phtml | 2 +- .../tab/design/preview/catalog_iphone.phtml | 2 +- .../tab/design/preview/home_android.phtml | 2 +- .../tab/design/preview/home_hor_ipad.phtml | 2 +- .../edit/tab/design/preview/home_ipad.phtml | 2 +- .../edit/tab/design/preview/home_iphone.phtml | 2 +- .../design/preview/productinfo_iphone.phtml | 2 +- .../design/preview/tab_items_android.phtml | 2 +- .../tab/design/preview/tab_items_ipad.phtml | 2 +- .../tab/design/preview/tab_items_iphone.phtml | 2 +- .../edit/tab/design/preview_android.phtml | 2 +- .../edit/tab/design/preview_ipad.phtml | 2 +- .../edit/tab/design/preview_iphone.phtml | 2 +- .../xmlconnect/edit/tab/offlinecatalog.phtml | 2 +- .../xmlconnect/form/element/addrow.phtml | 2 +- .../form/element/app_tabs_android.phtml | 2 +- .../form/element/app_tabs_ipad.phtml | 2 +- .../form/element/app_tabs_iphone.phtml | 2 +- .../form/element/country/androidmarket.phtml | 2 +- .../form/element/country/istore.phtml | 2 +- .../xmlconnect/form/element/themes.phtml | 2 +- .../mobile/notification_helper.phtml | 2 +- .../submission/app_icons_preview.phtml | 2 +- .../xmlconnect/submission/container.phtml | 2 +- .../xmlconnect/template/preview.phtml | 2 +- .../frontend/base/default/etc/theme.xml | 30 - .../frontend/base/default/etc/widget.xml | 2 +- .../base/default/layout/authorizenet.xml | 2 +- .../frontend/base/default/layout/bml.xml | 129 - .../frontend/base/default/layout/bundle.xml | 2 +- .../frontend/base/default/layout/captcha.xml | 2 +- .../frontend/base/default/layout/catalog.xml | 2 +- .../base/default/layout/catalog_msrp.xml | 2 +- .../base/default/layout/cataloginventory.xml | 2 +- .../base/default/layout/catalogsearch.xml | 2 +- .../frontend/base/default/layout/centinel.xml | 2 +- .../frontend/base/default/layout/checkout.xml | 2 +- .../frontend/base/default/layout/cms.xml | 2 +- .../frontend/base/default/layout/contacts.xml | 2 +- .../frontend/base/default/layout/core.xml | 2 +- .../frontend/base/default/layout/customer.xml | 2 +- .../base/default/layout/directory.xml | 2 +- .../base/default/layout/downloadable.xml | 2 +- .../base/default/layout/googleanalytics.xml | 2 +- .../base/default/layout/moneybookers.xml | 2 +- .../base/default/layout/newsletter.xml | 2 +- .../frontend/base/default/layout/oauth.xml | 2 +- .../frontend/base/default/layout/page.xml | 2 +- .../base/default/layout/pagecache.xml | 2 +- .../frontend/base/default/layout/payment.xml | 2 +- .../frontend/base/default/layout/paypal.xml | 4 +- .../frontend/base/default/layout/paypaluk.xml | 5 +- .../base/default/layout/persistent.xml | 2 +- .../frontend/base/default/layout/poll.xml | 2 +- .../base/default/layout/productalert.xml | 2 +- .../frontend/base/default/layout/reports.xml | 2 +- .../frontend/base/default/layout/review.xml | 2 +- .../frontend/base/default/layout/rss.xml | 2 +- .../frontend/base/default/layout/sales.xml | 2 +- .../layout/sales/billing_agreement.xml | 2 +- .../layout/sales/recurring_profile.xml | 2 +- .../base/default/layout/sendfriend.xml | 2 +- .../frontend/base/default/layout/shipping.xml | 2 +- .../frontend/base/default/layout/tag.xml | 2 +- .../frontend/base/default/layout/weee.xml | 2 +- .../frontend/base/default/layout/wishlist.xml | 2 +- .../base/default/layout/xmlconnect.xml | 2 +- .../authorizenet/directpost/form.phtml | 2 +- .../authorizenet/directpost/iframe.phtml | 2 +- .../authorizenet/directpost/info.phtml | 2 +- .../bundle/catalog/product/list/partof.phtml | 2 +- .../bundle/catalog/product/price.phtml | 2 +- .../product/view/option_tierprices.phtml | 8 +- .../catalog/product/view/options/notice.phtml | 2 +- .../bundle/catalog/product/view/price.phtml | 2 +- .../catalog/product/view/tierprices.phtml | 2 +- .../catalog/product/view/type/bundle.phtml | 3 +- .../view/type/bundle/option/checkbox.phtml | 2 +- .../view/type/bundle/option/multi.phtml | 2 +- .../view/type/bundle/option/radio.phtml | 2 +- .../view/type/bundle/option/select.phtml | 2 +- .../product/view/type/bundle/options.phtml | 2 +- .../order/items/creditmemo/default.phtml | 2 +- .../email/order/items/invoice/default.phtml | 2 +- .../email/order/items/order/default.phtml | 2 +- .../email/order/items/shipment/default.phtml | 2 +- .../bundle/rss/catalog/product/price.phtml | 2 +- .../order/creditmemo/items/renderer.phtml | 2 +- .../sales/order/invoice/items/renderer.phtml | 2 +- .../bundle/sales/order/items/renderer.phtml | 2 +- .../sales/order/shipment/items/renderer.phtml | 2 +- .../default/template/callouts/left_col.phtml | 2 +- .../default/template/callouts/right_col.phtml | 2 +- .../base/default/template/captcha/zend.phtml | 2 +- .../template/catalog/category/page.phtml | 2 +- .../template/catalog/category/view.phtml | 2 +- .../category/widget/link/link_block.phtml | 2 +- .../category/widget/link/link_inline.phtml | 2 +- .../template/catalog/layer/filter.phtml | 2 +- .../template/catalog/layer/state.phtml | 2 +- .../default/template/catalog/layer/view.phtml | 2 +- .../default/template/catalog/msrp/popup.phtml | 2 +- .../template/catalog/navigation/left.phtml | 2 +- .../template/catalog/navigation/top.phtml | 2 +- .../catalog/product/compare/list.phtml | 2 +- .../catalog/product/compare/sidebar.phtml | 2 +- .../template/catalog/product/gallery.phtml | 2 +- .../template/catalog/product/list.phtml | 2 +- .../catalog/product/list/related.phtml | 2 +- .../catalog/product/list/toolbar.phtml | 2 +- .../catalog/product/list/upsell.phtml | 2 +- .../template/catalog/product/new.phtml | 2 +- .../template/catalog/product/price.phtml | 2 +- .../template/catalog/product/price_msrp.phtml | 6 +- .../catalog/product/price_msrp_item.phtml | 2 +- .../catalog/product/price_msrp_noform.phtml | 2 +- .../catalog/product/price_msrp_rss.phtml | 2 +- .../template/catalog/product/view.phtml | 2 +- .../catalog/product/view/additional.phtml | 2 +- .../template/catalog/product/view/addto.phtml | 2 +- .../catalog/product/view/addtocart.phtml | 4 +- .../catalog/product/view/attributes.phtml | 2 +- .../catalog/product/view/description.phtml | 2 +- .../template/catalog/product/view/media.phtml | 2 +- .../catalog/product/view/options.phtml | 2 +- .../catalog/product/view/options/js.phtml | 2 +- .../product/view/options/type/date.phtml | 2 +- .../product/view/options/type/default.phtml | 2 +- .../product/view/options/type/file.phtml | 2 +- .../product/view/options/type/select.phtml | 2 +- .../product/view/options/type/text.phtml | 2 +- .../product/view/options/wrapper.phtml | 2 +- .../product/view/options/wrapper/bottom.phtml | 2 +- .../template/catalog/product/view/price.phtml | 2 +- .../catalog/product/view/price_clone.phtml | 2 +- .../catalog/product/view/tierprices.phtml | 2 +- .../product/view/type/configurable.phtml | 2 +- .../catalog/product/view/type/default.phtml | 2 +- .../catalog/product/view/type/grouped.phtml | 2 +- .../view/type/options/configurable.phtml | 2 +- .../catalog/product/view/type/simple.phtml | 2 +- .../catalog/product/view/type/virtual.phtml | 2 +- .../product/widget/link/link_block.phtml | 2 +- .../product/widget/link/link_inline.phtml | 2 +- .../widget/new/column/new_default_list.phtml | 2 +- .../widget/new/column/new_images_list.phtml | 2 +- .../widget/new/column/new_names_list.phtml | 2 +- .../product/widget/new/content/new_grid.phtml | 2 +- .../product/widget/new/content/new_list.phtml | 2 +- .../template/catalog/rss/product/price.phtml | 2 +- .../template/catalog/seo/sitemap.phtml | 2 +- .../catalog/seo/sitemap/container.phtml | 2 +- .../default/template/catalog/seo/tree.phtml | 2 +- .../cataloginventory/qtyincrements.phtml | 2 +- .../cataloginventory/stockqty/composite.phtml | 2 +- .../cataloginventory/stockqty/default.phtml | 2 +- .../catalogsearch/advanced/form.phtml | 2 +- .../catalogsearch/advanced/result.phtml | 2 +- .../template/catalogsearch/form.mini.phtml | 2 +- .../template/catalogsearch/result.phtml | 2 +- .../default/template/catalogsearch/term.phtml | 2 +- .../template/centinel/authentication.phtml | 2 +- .../centinel/authentication/complete.phtml | 2 +- .../centinel/authentication/start.phtml | 2 +- .../base/default/template/centinel/logo.phtml | 2 +- .../base/default/template/checkout/cart.phtml | 2 +- .../template/checkout/cart/coupon.phtml | 2 +- .../template/checkout/cart/crosssell.phtml | 2 +- .../cart/item/configure/updatecart.phtml | 2 +- .../template/checkout/cart/item/default.phtml | 2 +- .../template/checkout/cart/noItems.phtml | 2 +- .../checkout/cart/render/default.phtml | 2 +- .../checkout/cart/render/simple.phtml | 2 +- .../template/checkout/cart/shipping.phtml | 2 +- .../template/checkout/cart/sidebar.phtml | 2 +- .../checkout/cart/sidebar/default.phtml | 2 +- .../template/checkout/cart/totals.phtml | 2 +- .../multishipping/address/select.phtml | 2 +- .../checkout/multishipping/addresses.phtml | 6 +- .../checkout/multishipping/agreements.phtml | 2 +- .../checkout/multishipping/billing.phtml | 4 +- .../multishipping/billing/items.phtml | 2 +- .../checkout/multishipping/item/default.phtml | 2 +- .../checkout/multishipping/link.phtml | 2 +- .../checkout/multishipping/overview.phtml | 4 +- .../multishipping/overview/item.phtml | 2 +- .../checkout/multishipping/shipping.phtml | 4 +- .../checkout/multishipping/state.phtml | 2 +- .../checkout/multishipping/success.phtml | 6 +- .../default/template/checkout/onepage.phtml | 2 +- .../checkout/onepage/agreements.phtml | 2 +- .../template/checkout/onepage/billing.phtml | 2 +- .../template/checkout/onepage/failure.phtml | 2 +- .../template/checkout/onepage/link.phtml | 2 +- .../template/checkout/onepage/login.phtml | 2 +- .../template/checkout/onepage/payment.phtml | 2 +- .../checkout/onepage/payment/info.phtml | 2 +- .../checkout/onepage/payment/methods.phtml | 2 +- .../template/checkout/onepage/progress.phtml | 2 +- .../checkout/onepage/progress/billing.phtml | 2 +- .../checkout/onepage/progress/payment.phtml | 2 +- .../checkout/onepage/progress/shipping.phtml | 2 +- .../onepage/progress/shipping_method.phtml | 2 +- .../template/checkout/onepage/review.phtml | 2 +- .../checkout/onepage/review/button.phtml | 2 +- .../checkout/onepage/review/info.phtml | 2 +- .../checkout/onepage/review/item.phtml | 2 +- .../checkout/onepage/review/totals.phtml | 2 +- .../template/checkout/onepage/shipping.phtml | 2 +- .../checkout/onepage/shipping_method.phtml | 2 +- .../onepage/shipping_method/additional.phtml | 2 +- .../onepage/shipping_method/available.phtml | 2 +- .../default/template/checkout/success.phtml | 2 +- .../template/checkout/total/default.phtml | 2 +- .../template/checkout/total/nominal.phtml | 2 +- .../default/template/checkout/total/tax.phtml | 2 +- .../base/default/template/cms/content.phtml | 2 +- .../template/cms/content_heading.phtml | 2 +- .../default/template/cms/default/home.phtml | 2 +- .../template/cms/default/no-route.phtml | 2 +- .../base/default/template/cms/meta.phtml | 2 +- .../template/cms/widget/link/link_block.phtml | 2 +- .../cms/widget/link/link_inline.phtml | 2 +- .../cms/widget/static_block/default.phtml | 2 +- .../base/default/template/contacts/form.phtml | 2 +- .../base/default/template/core/formkey.phtml | 2 +- .../base/default/template/core/link.phtml | 2 +- .../base/default/template/core/messages.phtml | 2 +- .../template/customer/account/dashboard.phtml | 2 +- .../customer/account/dashboard/address.phtml | 2 +- .../customer/account/dashboard/hello.phtml | 2 +- .../customer/account/dashboard/info.phtml | 2 +- .../account/dashboard/newsletter.phtml | 2 +- .../template/customer/account/link/back.phtml | 2 +- .../customer/account/navigation.phtml | 2 +- .../default/template/customer/address.phtml | 2 +- .../template/customer/address/book.phtml | 2 +- .../template/customer/address/edit.phtml | 4 +- .../default/template/customer/balance.phtml | 2 +- .../template/customer/form/address.phtml | 4 +- .../customer/form/changepassword.phtml | 2 +- .../template/customer/form/confirmation.phtml | 2 +- .../default/template/customer/form/edit.phtml | 2 +- .../customer/form/forgotpassword.phtml | 2 +- .../template/customer/form/login.phtml | 2 +- .../template/customer/form/mini.login.phtml | 2 +- .../template/customer/form/newsletter.phtml | 2 +- .../template/customer/form/register.phtml | 2 +- .../form/resetforgottenpassword.phtml | 2 +- .../default/template/customer/logout.phtml | 2 +- .../default/template/customer/orders.phtml | 2 +- .../template/customer/widget/dob.phtml | 2 +- .../template/customer/widget/gender.phtml | 2 +- .../template/customer/widget/name.phtml | 2 +- .../template/customer/widget/taxvat.phtml | 2 +- .../default/template/customer/wishlist.phtml | 2 +- .../default/template/directory/currency.phtml | 2 +- .../template/directory/currency/switch.phtml | 2 +- .../directory/js/optional_zip_countries.phtml | 2 +- .../downloadable/catalog/product/links.phtml | 2 +- .../catalog/product/samples.phtml | 2 +- .../downloadable/catalog/product/type.phtml | 2 +- .../checkout/cart/item/default.phtml | 2 +- .../multishipping/item/downloadable.phtml | 2 +- .../checkout/onepage/review/item.phtml | 2 +- .../downloadable/checkout/success.phtml | 2 +- .../downloadable/customer/products/list.phtml | 2 +- .../order/items/creditmemo/downloadable.phtml | 2 +- .../order/items/invoice/downloadable.phtml | 2 +- .../order/items/order/downloadable.phtml | 2 +- .../items/renderer/downloadable.phtml | 2 +- .../invoice/items/renderer/downloadable.phtml | 2 +- .../order/items/renderer/downloadable.phtml | 2 +- .../email/order/creditmemo/items.phtml | 2 +- .../template/email/order/invoice/items.phtml | 2 +- .../default/template/email/order/items.phtml | 2 +- .../order/items/creditmemo/default.phtml | 2 +- .../email/order/items/invoice/default.phtml | 2 +- .../email/order/items/order/default.phtml | 2 +- .../email/order/items/shipment/default.phtml | 2 +- .../template/email/order/shipment/items.phtml | 2 +- .../template/email/order/shipment/track.phtml | 2 +- .../template/email/productalert/price.phtml | 2 +- .../template/email/productalert/stock.phtml | 2 +- .../default/template/giftmessage/inline.phtml | 2 +- .../default/template/googleanalytics/ga.phtml | 2 +- .../template/newsletter/subscribe.phtml | 2 +- .../oauth/authorize/button-simple.phtml | 2 +- .../template/oauth/authorize/button.phtml | 2 +- .../oauth/authorize/confirm-simple.phtml | 2 +- .../template/oauth/authorize/confirm.phtml | 2 +- .../oauth/authorize/form/login-simple.phtml | 2 +- .../template/oauth/authorize/form/login.phtml | 2 +- .../oauth/authorize/head-simple.phtml | 2 +- .../oauth/authorize/reject-simple.phtml | 2 +- .../template/oauth/authorize/reject.phtml | 2 +- .../template/oauth/customer/token/list.phtml | 2 +- .../base/default/template/page/1column.phtml | 2 +- .../default/template/page/2columns-left.phtml | 2 +- .../template/page/2columns-right.phtml | 2 +- .../base/default/template/page/3columns.phtml | 2 +- .../base/default/template/page/empty.phtml | 2 +- .../template/page/html/breadcrumbs.phtml | 2 +- .../template/page/html/cookienotice.phtml | 2 +- .../default/template/page/html/footer.phtml | 2 +- .../default/template/page/html/head.phtml | 2 +- .../default/template/page/html/header.phtml | 2 +- .../default/template/page/html/notices.phtml | 2 +- .../default/template/page/html/pager.phtml | 2 +- .../template/page/html/top.links.phtml | 2 +- .../default/template/page/html/topmenu.phtml | 2 +- .../default/template/page/html/wrapper.phtml | 2 +- .../default/template/page/js/calendar.phtml | 2 +- .../default/template/page/js/cookie.phtml | 2 +- .../base/default/template/page/popup.phtml | 2 +- .../base/default/template/page/print.phtml | 2 +- .../base/default/template/page/redirect.phtml | 2 +- .../default/template/page/switch/flags.phtml | 2 +- .../template/page/switch/languages.phtml | 2 +- .../default/template/page/switch/stores.phtml | 2 +- .../template/page/template/container.phtml | 2 +- .../template/page/template/links.phtml | 2 +- .../template/page/template/linksblock.phtml | 2 +- .../default/template/pagecache/cookie.phtml | 2 +- .../default/template/paygate/form/cc.phtml | 2 +- .../default/template/paygate/info/cc.phtml | 2 +- .../product/view/profile/options.phtml | 2 +- .../product/view/profile/schedule.phtml | 2 +- .../template/payment/form/banktransfer.phtml | 2 +- .../payment/form/cashondelivery.phtml | 2 +- .../default/template/payment/form/cc.phtml | 2 +- .../template/payment/form/ccsave.phtml | 2 +- .../template/payment/form/checkmo.phtml | 2 +- .../template/payment/form/purchaseorder.phtml | 2 +- .../template/payment/info/banktransfer.phtml | 2 +- .../template/payment/info/checkmo.phtml | 2 +- .../template/payment/info/default.phtml | 2 +- .../template/payment/info/purchaseorder.phtml | 2 +- .../base/default/template/paypal/bml.phtml | 40 - .../template/paypal/express/review.phtml | 168 +- .../paypal/express/review/address.phtml | 86 +- .../paypal/express/review/details.phtml | 2 +- .../express/review/shipping/method.phtml | 2 +- .../template/paypal/express/shortcut.phtml | 28 +- .../default/template/paypal/hss/form.phtml | 2 +- .../default/template/paypal/hss/iframe.phtml | 2 +- .../default/template/paypal/hss/info.phtml | 2 +- .../base/default/template/paypal/hss/js.phtml | 2 +- .../template/paypal/hss/redirect.phtml | 2 +- .../template/paypal/hss/review/button.phtml | 2 +- .../template/paypal/partner/logo.phtml | 2 +- .../paypal/payflowadvanced/form.phtml | 2 +- .../paypal/payflowadvanced/iframe.phtml | 2 +- .../paypal/payflowadvanced/info.phtml | 2 +- .../paypal/payflowadvanced/redirect.phtml | 2 +- .../template/paypal/payflowlink/form.phtml | 2 +- .../template/paypal/payflowlink/iframe.phtml | 2 +- .../template/paypal/payflowlink/info.phtml | 2 +- .../paypal/payflowlink/redirect.phtml | 2 +- .../template/paypal/payment/mark.phtml | 6 +- .../template/paypal/payment/redirect.phtml | 2 +- .../template/paypaluk}/express/review.phtml | 140 +- .../persistent/checkout/onepage/billing.phtml | 2 +- .../persistent/checkout/onepage/login.phtml | 2 +- .../persistent/customer/form/login.phtml | 2 +- .../persistent/customer/form/register.phtml | 2 +- .../template/persistent/remember_me.phtml | 2 +- .../persistent/remember_me_tooltip.phtml | 2 +- .../base/default/template/poll/active.phtml | 2 +- .../base/default/template/poll/result.phtml | 2 +- .../default/template/productalert/price.phtml | 2 +- .../template/productalert/product/view.phtml | 2 +- .../default/template/productalert/stock.phtml | 2 +- .../default/template/rating/detailed.phtml | 2 +- .../base/default/template/rating/empty.phtml | 2 +- .../reports/home_product_compared.phtml | 2 +- .../reports/home_product_viewed.phtml | 2 +- .../template/reports/product_compared.phtml | 2 +- .../template/reports/product_viewed.phtml | 2 +- .../column/compared_default_list.phtml | 2 +- .../column/compared_images_list.phtml | 2 +- .../compared/column/compared_names_list.phtml | 2 +- .../compared/content/compared_grid.phtml | 2 +- .../compared/content/compared_list.phtml | 2 +- .../viewed/column/viewed_default_list.phtml | 2 +- .../viewed/column/viewed_images_list.phtml | 2 +- .../viewed/column/viewed_names_list.phtml | 2 +- .../widget/viewed/content/viewed_grid.phtml | 2 +- .../widget/viewed/content/viewed_list.phtml | 2 +- .../template/review/customer/list.phtml | 2 +- .../template/review/customer/recent.phtml | 2 +- .../template/review/customer/view.phtml | 2 +- .../base/default/template/review/form.phtml | 2 +- .../template/review/helper/summary.phtml | 2 +- .../review/helper/summary_short.phtml | 2 +- .../template/review/product/view/count.phtml | 2 +- .../template/review/product/view/list.phtml | 2 +- .../template/review/product/view/other.phtml | 2 +- .../base/default/template/review/view.phtml | 2 +- .../base/default/template/rss/list.phtml | 2 +- .../base/default/template/rss/nofeed.phtml | 2 +- .../default/template/rss/order/details.phtml | 2 +- .../sales/billing/agreement/view.phtml | 2 +- .../template/sales/billing/agreements.phtml | 2 +- .../template/sales/order/comments.phtml | 2 +- .../template/sales/order/creditmemo.phtml | 2 +- .../sales/order/creditmemo/items.phtml | 2 +- .../creditmemo/items/renderer/default.phtml | 2 +- .../template/sales/order/details.phtml | 2 +- .../template/sales/order/history.phtml | 2 +- .../default/template/sales/order/info.phtml | 2 +- .../template/sales/order/info/buttons.phtml | 2 +- .../template/sales/order/invoice.phtml | 2 +- .../template/sales/order/invoice/items.phtml | 2 +- .../invoice/items/renderer/default.phtml | 2 +- .../default/template/sales/order/items.phtml | 2 +- .../sales/order/items/renderer/default.phtml | 2 +- .../default/template/sales/order/print.phtml | 2 +- .../sales/order/print/creditmemo.phtml | 2 +- .../template/sales/order/print/invoice.phtml | 2 +- .../template/sales/order/print/shipment.phtml | 2 +- .../default/template/sales/order/recent.phtml | 2 +- .../template/sales/order/shipment.phtml | 2 +- .../template/sales/order/shipment/items.phtml | 2 +- .../shipment/items/renderer/default.phtml | 2 +- .../default/template/sales/order/totals.phtml | 2 +- .../template/sales/order/trackinginfo.phtml | 2 +- .../default/template/sales/order/view.phtml | 2 +- .../payment/form/billing/agreement.phtml | 2 +- .../template/sales/recurring/grid.phtml | 2 +- .../sales/recurring/profile/view.phtml | 2 +- .../sales/recurring/profile/view/info.phtml | 2 +- .../template/sales/recurring/profiles.phtml | 2 +- .../template/sales/reorder/sidebar.phtml | 2 +- .../template/sales/widget/guest/form.phtml | 2 +- .../default/template/sendfriend/send.phtml | 2 +- .../template/shipping/tracking/ajax.phtml | 2 +- .../template/shipping/tracking/popup.phtml | 2 +- .../base/default/template/tag/cloud.phtml | 2 +- .../template/tag/customer/recent.phtml | 2 +- .../default/template/tag/customer/tags.phtml | 2 +- .../default/template/tag/customer/view.phtml | 2 +- .../base/default/template/tag/list.phtml | 2 +- .../base/default/template/tag/popular.phtml | 2 +- .../template/tax/checkout/discount.phtml | 2 +- .../template/tax/checkout/grandtotal.phtml | 2 +- .../template/tax/checkout/shipping.phtml | 2 +- .../template/tax/checkout/subtotal.phtml | 2 +- .../default/template/tax/checkout/tax.phtml | 2 +- .../base/default/template/tax/order/tax.phtml | 2 +- .../template/wishlist/button/share.phtml | 2 +- .../template/wishlist/button/tocart.phtml | 2 +- .../template/wishlist/button/update.phtml | 2 +- .../template/wishlist/email/items.phtml | 2 +- .../default/template/wishlist/email/rss.phtml | 2 +- .../template/wishlist/item/column/cart.phtml | 2 +- .../template/wishlist/item/column/image.phtml | 2 +- .../template/wishlist/item/column/info.phtml | 2 +- .../wishlist/item/column/remove.phtml | 2 +- .../wishlist/item/configure/addto.phtml | 2 +- .../default/template/wishlist/item/list.phtml | 2 +- .../template/wishlist/options_list.phtml | 2 +- .../template/wishlist/render/item/price.phtml | 2 +- .../render/item/price_msrp_item.phtml | 2 +- .../wishlist/render/item/price_msrp_rss.phtml | 2 +- .../default/template/wishlist/shared.phtml | 2 +- .../default/template/wishlist/sharing.phtml | 2 +- .../default/template/wishlist/sidebar.phtml | 2 +- .../base/default/template/wishlist/view.phtml | 2 +- .../xmlconnect/centinel/authentication.phtml | 2 +- .../template/xmlconnect/pbridge/result.phtml | 2 +- .../frontend/default/blank/etc/theme.xml | 30 - .../frontend/default/blank/etc/widget.xml | 2 +- .../frontend/default/default/etc/theme.xml | 30 - .../frontend/default/default/etc/widget.xml | 2 +- .../frontend/default/iphone/etc/theme.xml | 30 - .../frontend/default/iphone/etc/widget.xml | 2 +- .../frontend/default/iphone/layout/bundle.xml | 2 +- .../default/iphone/layout/catalog.xml | 2 +- .../default/iphone/layout/catalogsearch.xml | 2 +- .../default/iphone/layout/checkout.xml | 2 +- .../frontend/default/iphone/layout/cms.xml | 2 +- .../default/iphone/layout/contacts.xml | 2 +- .../default/iphone/layout/customer.xml | 2 +- .../default/iphone/layout/newsletter.xml | 2 +- .../frontend/default/iphone/layout/page.xml | 2 +- .../frontend/default/iphone/layout/review.xml | 2 +- .../frontend/default/iphone/layout/rss.xml | 2 +- .../frontend/default/iphone/layout/sales.xml | 2 +- .../iphone/layout/sales/billing_agreement.xml | 2 +- .../iphone/layout/sales/recurring_profile.xml | 2 +- .../default/iphone/layout/sendfriend.xml | 2 +- .../frontend/default/iphone/layout/tag.xml | 2 +- .../default/iphone/layout/wishlist.xml | 2 +- .../catalog/product/view/type/bundle.phtml | 2 +- .../bundle/sales/order/items/renderer.phtml | 2 +- .../template/catalog/category/view.phtml | 2 +- .../iphone/template/catalog/layer/view.phtml | 2 +- .../template/catalog/navigation/top.phtml | 2 +- .../template/catalog/product/gallery.phtml | 2 +- .../template/catalog/product/list.phtml | 2 +- .../catalog/product/list/toolbar.phtml | 2 +- .../catalog/product/list/upsell.phtml | 2 +- .../template/catalog/product/price.phtml | 2 +- .../template/catalog/product/price_msrp.phtml | 2 +- .../catalog/product/price_msrp_noform.phtml | 2 +- .../template/catalog/product/view.phtml | 2 +- .../template/catalog/product/view/addto.phtml | 2 +- .../template/catalog/product/view/media.phtml | 2 +- .../product/view/options/wrapper.phtml | 2 +- .../template/catalogsearch/form.mini.phtml | 2 +- .../template/catalogsearch/result.phtml | 2 +- .../iphone/template/checkout/cart.phtml | 2 +- .../template/checkout/cart/item/default.phtml | 2 +- .../checkout/onepage/review/info.phtml | 2 +- .../checkout/onepage/review/item.phtml | 2 +- .../checkout/onepage/review/totals.phtml | 2 +- .../iphone/template/checkout/success.phtml | 2 +- .../customer/account/dashboard/address.phtml | 2 +- .../customer/account/navigation.phtml | 2 +- .../template/customer/address/book.phtml | 2 +- .../iphone/template/customer/form/login.phtml | 2 +- .../checkout/cart/item/default.phtml | 2 +- .../checkout/onepage/review/item.phtml | 2 +- .../downloadable/customer/products/list.phtml | 2 +- .../items/renderer/downloadable.phtml | 2 +- .../invoice/items/renderer/downloadable.phtml | 2 +- .../order/items/renderer/downloadable.phtml | 2 +- .../template/newsletter/subscribe.phtml | 2 +- .../iphone/template/page/1column.phtml | 2 +- .../iphone/template/page/html/footer.phtml | 2 +- .../iphone/template/page/html/head.phtml | 2 +- .../iphone/template/page/html/header.phtml | 2 +- .../iphone/template/page/html/pager.phtml | 2 +- .../template/page/switch/languages.phtml | 2 +- .../iphone/template/page/switch/stores.phtml | 2 +- .../iphone/template/page/template/links.phtml | 2 +- .../template/paypal/express/review.phtml | 2 +- .../paypal/express/review/details.phtml | 2 +- .../persistent/checkout/onepage/login.phtml | 2 +- .../persistent/customer/form/login.phtml | 2 +- .../persistent/remember_me_tooltip.phtml | 2 +- .../template/review/customer/list.phtml | 2 +- .../sales/billing/agreement/view.phtml | 2 +- .../template/sales/billing/agreements.phtml | 2 +- .../sales/order/creditmemo/items.phtml | 2 +- .../creditmemo/items/renderer/default.phtml | 2 +- .../iphone/template/sales/order/history.phtml | 2 +- .../template/sales/order/invoice/items.phtml | 2 +- .../invoice/items/renderer/default.phtml | 2 +- .../iphone/template/sales/order/items.phtml | 2 +- .../sales/order/items/renderer/default.phtml | 2 +- .../iphone/template/sales/order/recent.phtml | 2 +- .../iphone/template/sales/order/totals.phtml | 2 +- .../template/shipping/tracking/popup.phtml | 2 +- .../default/iphone/template/tag/list.phtml | 2 +- .../iphone/template/tax/order/tax.phtml | 2 +- .../template/wishlist/item/column/cart.phtml | 2 +- .../template/wishlist/item/column/image.phtml | 2 +- .../template/wishlist/item/column/info.phtml | 2 +- .../wishlist/item/configure/addto.phtml | 2 +- .../iphone/template/wishlist/item/list.phtml | 2 +- .../iphone/template/wishlist/shared.phtml | 2 +- .../iphone/template/wishlist/view.phtml | 2 +- .../frontend/default/modern/etc/theme.xml | 30 - .../frontend/default/modern/etc/widget.xml | 2 +- .../default/modern/layout/catalog.xml | 2 +- .../default/modern/layout/catalogsearch.xml | 2 +- .../default/modern/layout/checkout.xml | 2 +- .../default/modern/layout/contacts.xml | 2 +- .../default/modern/layout/customer.xml | 2 +- .../default/modern/layout/newsletter.xml | 2 +- .../frontend/default/modern/layout/page.xml | 2 +- .../default/modern/layout/payment.xml | 2 +- .../default/modern/layout/persistent.xml | 2 +- .../frontend/default/modern/layout/review.xml | 2 +- .../frontend/default/modern/layout/rss.xml | 2 +- .../frontend/default/modern/layout/sales.xml | 2 +- .../default/modern/layout/sendfriend.xml | 2 +- .../frontend/default/modern/layout/tag.xml | 2 +- .../default/modern/layout/wishlist.xml | 2 +- .../template/catalog/product/list.phtml | 2 +- .../catalog/product/list/upsell.phtml | 2 +- .../template/catalog/product/view.phtml | 2 +- .../template/catalog/product/view/media.phtml | 2 +- .../template/catalog/product/view/tabs.phtml | 2 +- .../template/catalogsearch/form.mini.phtml | 2 +- .../modern/template/checkout/cart.phtml | 2 +- .../template/newsletter/subscribe.phtml | 2 +- .../modern/template/page/3columns.phtml | 2 +- .../modern/template/page/html/footer.phtml | 2 +- .../modern/template/page/html/header.phtml | 2 +- .../default/modern/template/sample/home.phtml | 2 +- app/design/frontend/rwd/default/etc/theme.xml | 30 - .../frontend/rwd/default/etc/widget.xml | 166 - .../frontend/rwd/default/layout/bundle.xml | 383 - .../frontend/rwd/default/layout/captcha.xml | 4 - .../frontend/rwd/default/layout/catalog.xml | 447 - .../rwd/default/layout/catalog_msrp.xml | 109 - .../rwd/default/layout/catalogsearch.xml | 148 - .../frontend/rwd/default/layout/checkout.xml | 542 - .../frontend/rwd/default/layout/cms.xml | 108 - .../frontend/rwd/default/layout/contacts.xml | 43 - .../frontend/rwd/default/layout/customer.xml | 301 - .../frontend/rwd/default/layout/directory.xml | 43 - .../rwd/default/layout/downloadable.xml | 232 - .../rwd/default/layout/newsletter.xml | 67 - .../frontend/rwd/default/layout/oauth.xml | 137 - .../frontend/rwd/default/layout/page.xml | 241 - .../frontend/rwd/default/layout/paypal.xml | 205 - .../rwd/default/layout/persistent.xml | 63 - .../frontend/rwd/default/layout/poll.xml | 4 - .../frontend/rwd/default/layout/review.xml | 146 - .../frontend/rwd/default/layout/rss.xml | 100 - .../frontend/rwd/default/layout/sales.xml | 526 - .../frontend/rwd/default/layout/tag.xml | 4 - .../frontend/rwd/default/layout/wishlist.xml | 146 - .../rwd/default/locale/en_US/translate.csv | 20 - .../authorizenet/directpost/form.phtml | 135 - .../catalog/product/view/type/bundle.phtml | 41 - .../view/type/bundle/availability.phtml | 39 - .../view/type/bundle/option/select.phtml | 64 - .../bundle/sales/order/items/renderer.phtml | 380 - .../template/catalog/layer/filter.phtml | 55 - .../template/catalog/layer/state.phtml | 73 - .../default/template/catalog/layer/view.phtml | 59 - .../default/template/catalog/msrp/popup.phtml | 64 - .../template/catalog/navigation/left.phtml | 63 - .../catalog/product/compare/list.phtml | 172 - .../catalog/product/compare/sidebar.phtml | 60 - .../template/catalog/product/list.phtml | 186 - .../catalog/product/list/related.phtml | 94 - .../catalog/product/list/toolbar.phtml | 99 - .../catalog/product/list/upsell.phtml | 59 - .../template/catalog/product/new.phtml | 64 - .../template/catalog/product/view.phtml | 191 - .../template/catalog/product/view/addto.phtml | 43 - .../catalog/product/view/addtocart.phtml | 42 - .../template/catalog/product/view/media.phtml | 88 - .../catalog/product/view/sharing.phtml | 50 - .../view/type/availability/default.phtml | 39 - .../view/type/availability/grouped.phtml | 41 - .../catalog/product/view/type/default.phtml | 30 - .../catalog/product/view/type/grouped.phtml | 90 - .../view/type/options/configurable.phtml | 67 - .../widget/new/column/new_default_list.phtml | 58 - .../widget/new/column/new_images_list.phtml | 48 - .../widget/new/column/new_names_list.phtml | 47 - .../product/widget/new/content/new_grid.phtml | 68 - .../product/widget/new/content/new_list.phtml | 65 - .../cataloginventory/stockqty/composite.phtml | 66 - .../catalogsearch/advanced/form.phtml | 96 - .../template/catalogsearch/form.mini.phtml | 45 - .../template/catalogsearch/result.phtml | 56 - .../centinel/authentication/start.phtml | 40 - .../rwd/default/template/checkout/cart.phtml | 177 - .../template/checkout/cart/coupon.phtml | 60 - .../template/checkout/cart/crosssell.phtml | 61 - .../cart/item/configure/updatecart.phtml | 43 - .../template/checkout/cart/item/default.phtml | 330 - .../template/checkout/cart/minicart.phtml | 50 - .../checkout/cart/minicart/default.phtml | 189 - .../checkout/cart/minicart/items.phtml | 108 - .../checkout/cart/render/default.phtml | 70 - .../checkout/cart/render/simple.phtml | 70 - .../template/checkout/cart/shipping.phtml | 150 - .../template/checkout/cart/sidebar.phtml | 80 - .../checkout/cart/sidebar/default.phtml | 145 - .../checkout/multishipping/billing.phtml | 118 - .../checkout/multishipping/item/default.phtml | 48 - .../default/template/checkout/onepage.phtml | 61 - .../template/checkout/onepage/payment.phtml | 76 - .../template/checkout/onepage/progress.phtml | 59 - .../checkout/onepage/review/info.phtml | 84 - .../checkout/onepage/review/item.phtml | 240 - .../template/checkout/onepage/shipping.phtml | 157 - .../rwd/default/template/contacts/form.phtml | 73 - .../template/customer/account/dashboard.phtml | 45 - .../customer/account/dashboard/address.phtml | 56 - .../customer/account/navigation.phtml | 46 - .../template/customer/address/edit.phtml | 166 - .../template/customer/form/address.phtml | 144 - .../customer/form/changepassword.phtml | 67 - .../template/customer/form/confirmation.phtml | 54 - .../default/template/customer/form/edit.phtml | 117 - .../customer/form/forgotpassword.phtml | 55 - .../template/customer/form/mini.login.phtml | 40 - .../form/resetforgottenpassword.phtml | 59 - .../default/template/directory/currency.phtml | 45 - .../downloadable/catalog/product/type.phtml | 48 - .../checkout/cart/item/default.phtml | 344 - .../checkout/onepage/review/item.phtml | 246 - .../downloadable/customer/products/list.phtml | 74 - .../order/items/renderer/downloadable.phtml | 360 - .../template/newsletter/subscribe.phtml | 49 - .../oauth/authorize/form/login-simple.phtml | 75 - .../rwd/default/template/page/1column.phtml | 68 - .../default/template/page/2columns-left.phtml | 72 - .../template/page/2columns-right.phtml | 68 - .../rwd/default/template/page/3columns.phtml | 75 - .../rwd/default/template/page/empty.phtml | 53 - .../default/template/page/html/footer.phtml | 32 - .../default/template/page/html/header.phtml | 114 - .../default/template/page/html/pager.phtml | 130 - .../default/template/page/html/topmenu.phtml | 42 - .../template/page/html/topmenu/renderer.phtml | 82 - .../rwd/default/template/page/popup.phtml | 52 - .../rwd/default/template/page/print.phtml | 59 - .../template/page/template/links.phtml | 48 - .../default/template/payment/form/cc.phtml | 139 - .../template/payment/form/ccsave.phtml | 136 - .../template/payment/info/default.phtml | 43 - .../rwd/default/template/paypal/bml.phtml | 49 - .../paypal/express/minicart/shortcut.phtml | 73 - .../paypal/express/product/shortcut.phtml | 69 - .../paypal/express/review/details.phtml | 64 - .../express/review/shipping/method.phtml | 53 - .../persistent/checkout/onepage/billing.phtml | 228 - .../persistent/checkout/onepage/login.phtml | 157 - .../persistent/customer/form/login.phtml | 104 - .../persistent/customer/form/register.phtml | 188 - .../template/persistent/remember_me.phtml | 41 - .../persistent/remember_me_tooltip.phtml | 62 - .../template/reports/product_viewed.phtml | 53 - .../column/compared_default_list.phtml | 57 - .../column/compared_images_list.phtml | 47 - .../compared/column/compared_names_list.phtml | 46 - .../compared/content/compared_grid.phtml | 67 - .../compared/content/compared_list.phtml | 64 - .../viewed/column/viewed_default_list.phtml | 62 - .../viewed/column/viewed_images_list.phtml | 52 - .../viewed/column/viewed_names_list.phtml | 51 - .../widget/viewed/content/viewed_grid.phtml | 70 - .../widget/viewed/content/viewed_list.phtml | 69 - .../template/review/customer/view.phtml | 75 - .../rwd/default/template/review/form.phtml | 165 - .../template/review/product/view/list.phtml | 85 - .../rwd/default/template/review/view.phtml | 76 - .../sales/order/creditmemo/items.phtml | 65 - .../creditmemo/items/renderer/default.phtml | 331 - .../template/sales/order/history.phtml | 77 - .../default/template/sales/order/items.phtml | 69 - .../sales/order/items/renderer/default.phtml | 323 - .../default/template/sales/order/recent.phtml | 75 - .../template/sales/order/shipment/items.phtml | 89 - .../template/sales/widget/guest/form.phtml | 105 - .../default/template/sendfriend/send.phtml | 143 - .../template/wishlist/button/update.phtml | 30 - .../template/wishlist/item/column/cart.phtml | 58 - .../template/wishlist/item/column/info.phtml | 53 - .../template/wishlist/item/column/price.phtml | 37 - .../wishlist/item/column/quantity.phtml | 41 - .../default/template/wishlist/item/list.phtml | 69 - .../default/template/wishlist/shared.phtml | 85 - .../default/template/wishlist/sidebar.phtml | 61 - .../rwd/default/template/wishlist/view.phtml | 92 - .../install/default/default/etc/theme.xml | 30 - .../install/default/default/layout/main.xml | 2 +- .../default/template/install/begin.phtml | 2 +- .../default/template/install/config.phtml | 2 +- .../template/install/create_admin.phtml | 2 +- .../default/template/install/db/main.phtml | 2 +- .../default/template/install/db/mysql4.phtml | 2 +- .../default/template/install/download.phtml | 2 +- .../default/template/install/end.phtml | 2 +- .../default/template/install/locale.phtml | 2 +- .../default/template/install/state.phtml | 4 +- .../default/default/template/page.phtml | 2 +- app/etc/config.xml | 2 +- app/etc/local.xml.additional | 4 +- app/etc/modules/Mage_All.xml | 2 +- app/etc/modules/Mage_Api.xml | 2 +- app/etc/modules/Mage_Api2.xml | 2 +- app/etc/modules/Mage_Authorizenet.xml | 2 +- app/etc/modules/Mage_Bundle.xml | 2 +- app/etc/modules/Mage_Captcha.xml | 2 +- app/etc/modules/Mage_Centinel.xml | 2 +- app/etc/modules/Mage_Compiler.xml | 2 +- app/etc/modules/Mage_Connect.xml | 2 +- app/etc/modules/Mage_CurrencySymbol.xml | 2 +- app/etc/modules/Mage_Downloadable.xml | 2 +- app/etc/modules/Mage_ImportExport.xml | 2 +- app/etc/modules/Mage_Oauth.xml | 2 +- app/etc/modules/Mage_PageCache.xml | 2 +- app/etc/modules/Mage_Persistent.xml | 2 +- app/etc/modules/Mage_Weee.xml | 2 +- app/etc/modules/Mage_Widget.xml | 2 +- app/etc/modules/Mage_XmlConnect.xml | 2 +- app/etc/modules/Phoenix_Moneybookers.xml | 2 +- app/locale/de_DE/Mage_AdminNotification.csv | 31 - app/locale/de_DE/Mage_Adminhtml.csv | 1215 -- app/locale/de_DE/Mage_AmazonPayments.csv | 101 - app/locale/de_DE/Mage_Api.csv | 18 - app/locale/de_DE/Mage_Api2.csv | 238 - app/locale/de_DE/Mage_Authorizenet.csv | 41 - app/locale/de_DE/Mage_Backup.csv | 55 - app/locale/de_DE/Mage_Bundle.csv | 71 - app/locale/de_DE/Mage_Captcha.csv | 23 - app/locale/de_DE/Mage_Catalog.csv | 848 -- app/locale/de_DE/Mage_CatalogInventory.csv | 62 - app/locale/de_DE/Mage_CatalogRule.csv | 64 - app/locale/de_DE/Mage_CatalogSearch.csv | 49 - app/locale/de_DE/Mage_Centinel.csv | 33 - app/locale/de_DE/Mage_Checkout.csv | 360 - app/locale/de_DE/Mage_Cms.csv | 127 - app/locale/de_DE/Mage_Compiler.csv | 21 - app/locale/de_DE/Mage_Connect.csv | 58 - app/locale/de_DE/Mage_Contacts.csv | 19 - app/locale/de_DE/Mage_Core.csv | 394 - app/locale/de_DE/Mage_Cron.csv | 24 - app/locale/de_DE/Mage_CurrencySymbol.csv | 10 - app/locale/de_DE/Mage_Customer.csv | 470 - app/locale/de_DE/Mage_Dataflow.csv | 32 - app/locale/de_DE/Mage_Directory.csv | 49 - app/locale/de_DE/Mage_Downloadable.csv | 95 - app/locale/de_DE/Mage_Eav.csv | 124 - app/locale/de_DE/Mage_GiftMessage.csv | 38 - app/locale/de_DE/Mage_GoogleAnalytics.csv | 5 - app/locale/de_DE/Mage_GoogleBase.csv | 82 - app/locale/de_DE/Mage_GoogleCheckout.csv | 131 - app/locale/de_DE/Mage_ImportExport.csv | 93 - app/locale/de_DE/Mage_Index.csv | 47 - app/locale/de_DE/Mage_Install.csv | 125 - app/locale/de_DE/Mage_Log.csv | 9 - app/locale/de_DE/Mage_Media.csv | 4 - app/locale/de_DE/Mage_Newsletter.csv | 137 - app/locale/de_DE/Mage_Oauth.csv | 118 - app/locale/de_DE/Mage_Page.csv | 81 - app/locale/de_DE/Mage_PageCache.csv | 12 - app/locale/de_DE/Mage_Paygate.csv | 69 - app/locale/de_DE/Mage_Payment.csv | 142 - app/locale/de_DE/Mage_Paypal.csv | 623 -- app/locale/de_DE/Mage_PaypalUk.csv | 2 - app/locale/de_DE/Mage_Persistent.csv | 74 - app/locale/de_DE/Mage_Poll.csv | 42 - app/locale/de_DE/Mage_ProductAlert.csv | 35 - app/locale/de_DE/Mage_Rating.csv | 29 - app/locale/de_DE/Mage_Reports.csv | 174 - app/locale/de_DE/Mage_Review.csv | 104 - app/locale/de_DE/Mage_Rss.csv | 56 - app/locale/de_DE/Mage_Rule.csv | 42 - app/locale/de_DE/Mage_Sales.csv | 882 -- app/locale/de_DE/Mage_SalesRule.csv | 132 - app/locale/de_DE/Mage_Sendfriend.csv | 38 - app/locale/de_DE/Mage_Shipping.csv | 93 - app/locale/de_DE/Mage_Sitemap.csv | 46 - app/locale/de_DE/Mage_Tag.csv | 101 - app/locale/de_DE/Mage_Tax.csv | 163 - app/locale/de_DE/Mage_Usa.csv | 381 - app/locale/de_DE/Mage_Weee.csv | 25 - app/locale/de_DE/Mage_Widget.csv | 75 - app/locale/de_DE/Mage_Wishlist.csv | 100 - app/locale/de_DE/Mage_XmlConnect.csv | 1200 -- app/locale/de_DE/Phoenix_Moneybookers.csv | 42 - .../de_DE/template/email/account_new.html | 55 - .../email/account_new_confirmation.html | 50 - .../template/email/account_new_confirmed.html | 51 - .../account_password_reset_confirmation.html | 43 - .../template/email/admin_password_new.html | 43 - .../admin_password_reset_confirmation.html | 44 - ...amazonpayments_asp_notification_error.html | 12 - .../de_DE/template/email/contact_form.html | 12 - .../email/currency_update_warning.html | 8 - .../template/email/log_clean_warning.html | 7 - .../email/moneybookers_activateemail.html | 6 - .../email/newsletter_subscr_confirm.html | 41 - .../email/newsletter_subscr_success.html | 2 - .../email/newsletter_unsub_success.html | 2 - .../de_DE/template/email/password_new.html | 42 - .../de_DE/template/email/payment_failed.html | 68 - .../email/product_alert_cron_error.html | 7 - .../template/email/product_price_alert.html | 8 - .../de_DE/template/email/product_share.html | 13 - .../template/email/product_stock_alert.html | 8 - .../template/email/sales/creditmemo_new.html | 108 - .../email/sales/creditmemo_new_guest.html | 106 - .../email/sales/creditmemo_update.html | 52 - .../email/sales/creditmemo_update_guest.html | 51 - .../template/email/sales/invoice_new.html | 107 - .../email/sales/invoice_new_guest.html | 106 - .../template/email/sales/invoice_update.html | 52 - .../email/sales/invoice_update_guest.html | 49 - .../de_DE/template/email/sales/order_new.html | 109 - .../template/email/sales/order_new_guest.html | 108 - .../template/email/sales/order_update.html | 52 - .../email/sales/order_update_guest.html | 50 - .../template/email/sales/shipment_new.html | 111 - .../email/sales/shipment_new_guest.html | 109 - .../template/email/sales/shipment_update.html | 52 - .../email/sales/shipment_update_guest.html | 50 - .../email/sitemap_generate_warning.html | 8 - app/locale/de_DE/template/email/token.html | 9 - .../de_DE/template/email/wishlist_share.html | 43 - app/locale/en_US/Mage_Adminhtml.csv | 19 - app/locale/en_US/Mage_Bundle.csv | 1 - app/locale/en_US/Mage_Catalog.csv | 12 - app/locale/en_US/Mage_CatalogRule.csv | 4 - app/locale/en_US/Mage_Checkout.csv | 1 - app/locale/en_US/Mage_Core.csv | 1 - app/locale/en_US/Mage_Cron.csv | 8 - app/locale/en_US/Mage_Customer.csv | 3 - app/locale/en_US/Mage_Directory.csv | 1 - app/locale/en_US/Mage_Page.csv | 2 - app/locale/en_US/Mage_PageCache.csv | 1 - app/locale/en_US/Mage_Paygate.csv | 1 - app/locale/en_US/Mage_Payment.csv | 5 - app/locale/en_US/Mage_Paypal.csv | 26 - app/locale/en_US/Mage_Rule.csv | 10 - app/locale/en_US/Mage_Sales.csv | 9 +- app/locale/en_US/Mage_Shipping.csv | 1 - app/locale/en_US/Mage_Usa.csv | 6 - app/locale/en_US/Mage_Weee.csv | 2 - app/locale/en_US/Mage_Wishlist.csv | 3 - app/locale/es_ES/Mage_AdminNotification.csv | 31 - app/locale/es_ES/Mage_Adminhtml.csv | 1215 -- app/locale/es_ES/Mage_AmazonPayments.csv | 101 - app/locale/es_ES/Mage_Api.csv | 18 - app/locale/es_ES/Mage_Api2.csv | 238 - app/locale/es_ES/Mage_Authorizenet.csv | 41 - app/locale/es_ES/Mage_Backup.csv | 55 - app/locale/es_ES/Mage_Bundle.csv | 71 - app/locale/es_ES/Mage_Captcha.csv | 22 - app/locale/es_ES/Mage_Catalog.csv | 848 -- app/locale/es_ES/Mage_CatalogInventory.csv | 62 - app/locale/es_ES/Mage_CatalogRule.csv | 64 - app/locale/es_ES/Mage_CatalogSearch.csv | 49 - app/locale/es_ES/Mage_Centinel.csv | 33 - app/locale/es_ES/Mage_Checkout.csv | 360 - app/locale/es_ES/Mage_Cms.csv | 123 - app/locale/es_ES/Mage_Compiler.csv | 21 - app/locale/es_ES/Mage_Connect.csv | 58 - app/locale/es_ES/Mage_Contacts.csv | 19 - app/locale/es_ES/Mage_Core.csv | 394 - app/locale/es_ES/Mage_Cron.csv | 24 - app/locale/es_ES/Mage_CurrencySymbol.csv | 10 - app/locale/es_ES/Mage_Customer.csv | 469 - app/locale/es_ES/Mage_Dataflow.csv | 32 - app/locale/es_ES/Mage_Directory.csv | 49 - app/locale/es_ES/Mage_Downloadable.csv | 95 - app/locale/es_ES/Mage_Eav.csv | 124 - app/locale/es_ES/Mage_GiftMessage.csv | 38 - app/locale/es_ES/Mage_GoogleAnalytics.csv | 5 - app/locale/es_ES/Mage_GoogleBase.csv | 78 - app/locale/es_ES/Mage_GoogleCheckout.csv | 131 - app/locale/es_ES/Mage_ImportExport.csv | 93 - app/locale/es_ES/Mage_Index.csv | 47 - app/locale/es_ES/Mage_Install.csv | 125 - app/locale/es_ES/Mage_Log.csv | 9 - app/locale/es_ES/Mage_Media.csv | 3 - app/locale/es_ES/Mage_Newsletter.csv | 137 - app/locale/es_ES/Mage_Oauth.csv | 118 - app/locale/es_ES/Mage_Page.csv | 82 - app/locale/es_ES/Mage_PageCache.csv | 12 - app/locale/es_ES/Mage_Paygate.csv | 67 - app/locale/es_ES/Mage_Payment.csv | 142 - app/locale/es_ES/Mage_Paypal.csv | 623 -- app/locale/es_ES/Mage_PaypalUk.csv | 2 - app/locale/es_ES/Mage_Persistent.csv | 74 - app/locale/es_ES/Mage_Poll.csv | 42 - app/locale/es_ES/Mage_ProductAlert.csv | 35 - app/locale/es_ES/Mage_Rating.csv | 29 - app/locale/es_ES/Mage_Reports.csv | 174 - app/locale/es_ES/Mage_Review.csv | 104 - app/locale/es_ES/Mage_Rss.csv | 56 - app/locale/es_ES/Mage_Rule.csv | 40 - app/locale/es_ES/Mage_Sales.csv | 882 -- app/locale/es_ES/Mage_SalesRule.csv | 132 - app/locale/es_ES/Mage_Sendfriend.csv | 38 - app/locale/es_ES/Mage_Shipping.csv | 93 - app/locale/es_ES/Mage_Sitemap.csv | 46 - app/locale/es_ES/Mage_Tag.csv | 101 - app/locale/es_ES/Mage_Tax.csv | 163 - app/locale/es_ES/Mage_Usa.csv | 381 - app/locale/es_ES/Mage_Weee.csv | 25 - app/locale/es_ES/Mage_Widget.csv | 75 - app/locale/es_ES/Mage_Wishlist.csv | 100 - app/locale/es_ES/Mage_XmlConnect.csv | 1200 -- app/locale/es_ES/Phoenix_Moneybookers.csv | 42 - .../es_ES/template/email/account_new.html | 55 - .../email/account_new_confirmation.html | 50 - .../template/email/account_new_confirmed.html | 51 - .../account_password_reset_confirmation.html | 43 - .../template/email/admin_password_new.html | 43 - .../admin_password_reset_confirmation.html | 44 - ...amazonpayments_asp_notification_error.html | 12 - .../es_ES/template/email/contact_form.html | 12 - .../email/currency_update_warning.html | 8 - .../template/email/log_clean_warning.html | 7 - .../email/moneybookers_activateemail.html | 6 - .../email/newsletter_subscr_confirm.html | 41 - .../email/newsletter_subscr_success.html | 2 - .../email/newsletter_unsub_success.html | 2 - .../es_ES/template/email/password_new.html | 42 - .../es_ES/template/email/payment_failed.html | 68 - .../email/product_alert_cron_error.html | 7 - .../template/email/product_price_alert.html | 8 - .../es_ES/template/email/product_share.html | 13 - .../template/email/product_stock_alert.html | 8 - .../template/email/sales/creditmemo_new.html | 108 - .../email/sales/creditmemo_new_guest.html | 106 - .../email/sales/creditmemo_update.html | 52 - .../email/sales/creditmemo_update_guest.html | 51 - .../template/email/sales/invoice_new.html | 107 - .../email/sales/invoice_new_guest.html | 106 - .../template/email/sales/invoice_update.html | 52 - .../email/sales/invoice_update_guest.html | 49 - .../es_ES/template/email/sales/order_new.html | 109 - .../template/email/sales/order_new_guest.html | 108 - .../template/email/sales/order_update.html | 52 - .../email/sales/order_update_guest.html | 50 - .../template/email/sales/shipment_new.html | 111 - .../email/sales/shipment_new_guest.html | 109 - .../template/email/sales/shipment_update.html | 52 - .../email/sales/shipment_update_guest.html | 50 - .../email/sitemap_generate_warning.html | 8 - app/locale/es_ES/template/email/token.html | 9 - .../es_ES/template/email/wishlist_share.html | 43 - app/locale/fr_FR/Mage_AdminNotification.csv | 31 - app/locale/fr_FR/Mage_Adminhtml.csv | 1215 -- app/locale/fr_FR/Mage_AmazonPayments.csv | 101 - app/locale/fr_FR/Mage_Api.csv | 18 - app/locale/fr_FR/Mage_Api2.csv | 238 - app/locale/fr_FR/Mage_Authorizenet.csv | 41 - app/locale/fr_FR/Mage_Backup.csv | 55 - app/locale/fr_FR/Mage_Bundle.csv | 71 - app/locale/fr_FR/Mage_Captcha.csv | 22 - app/locale/fr_FR/Mage_Catalog.csv | 848 -- app/locale/fr_FR/Mage_CatalogInventory.csv | 62 - app/locale/fr_FR/Mage_CatalogRule.csv | 65 - app/locale/fr_FR/Mage_CatalogSearch.csv | 49 - app/locale/fr_FR/Mage_Centinel.csv | 33 - app/locale/fr_FR/Mage_Checkout.csv | 360 - app/locale/fr_FR/Mage_Cms.csv | 123 - app/locale/fr_FR/Mage_Compiler.csv | 21 - app/locale/fr_FR/Mage_Connect.csv | 58 - app/locale/fr_FR/Mage_Contacts.csv | 19 - app/locale/fr_FR/Mage_Core.csv | 394 - app/locale/fr_FR/Mage_Cron.csv | 24 - app/locale/fr_FR/Mage_CurrencySymbol.csv | 10 - app/locale/fr_FR/Mage_Customer.csv | 469 - app/locale/fr_FR/Mage_Dataflow.csv | 32 - app/locale/fr_FR/Mage_Directory.csv | 49 - app/locale/fr_FR/Mage_Downloadable.csv | 95 - app/locale/fr_FR/Mage_Eav.csv | 124 - app/locale/fr_FR/Mage_GiftMessage.csv | 38 - app/locale/fr_FR/Mage_GoogleAnalytics.csv | 5 - app/locale/fr_FR/Mage_GoogleBase.csv | 78 - app/locale/fr_FR/Mage_GoogleCheckout.csv | 131 - app/locale/fr_FR/Mage_ImportExport.csv | 93 - app/locale/fr_FR/Mage_Index.csv | 47 - app/locale/fr_FR/Mage_Install.csv | 125 - app/locale/fr_FR/Mage_Log.csv | 9 - app/locale/fr_FR/Mage_Media.csv | 3 - app/locale/fr_FR/Mage_Newsletter.csv | 137 - app/locale/fr_FR/Mage_Oauth.csv | 118 - app/locale/fr_FR/Mage_Page.csv | 81 - app/locale/fr_FR/Mage_PageCache.csv | 12 - app/locale/fr_FR/Mage_Paygate.csv | 67 - app/locale/fr_FR/Mage_Payment.csv | 142 - app/locale/fr_FR/Mage_Paypal.csv | 623 -- app/locale/fr_FR/Mage_PaypalUk.csv | 2 - app/locale/fr_FR/Mage_Persistent.csv | 74 - app/locale/fr_FR/Mage_Poll.csv | 42 - app/locale/fr_FR/Mage_ProductAlert.csv | 35 - app/locale/fr_FR/Mage_Rating.csv | 29 - app/locale/fr_FR/Mage_Reports.csv | 174 - app/locale/fr_FR/Mage_Review.csv | 104 - app/locale/fr_FR/Mage_Rss.csv | 56 - app/locale/fr_FR/Mage_Rule.csv | 41 - app/locale/fr_FR/Mage_Sales.csv | 882 -- app/locale/fr_FR/Mage_SalesRule.csv | 132 - app/locale/fr_FR/Mage_Sendfriend.csv | 38 - app/locale/fr_FR/Mage_Shipping.csv | 93 - app/locale/fr_FR/Mage_Sitemap.csv | 46 - app/locale/fr_FR/Mage_Tag.csv | 101 - app/locale/fr_FR/Mage_Tax.csv | 163 - app/locale/fr_FR/Mage_Usa.csv | 381 - app/locale/fr_FR/Mage_Weee.csv | 25 - app/locale/fr_FR/Mage_Widget.csv | 75 - app/locale/fr_FR/Mage_Wishlist.csv | 100 - app/locale/fr_FR/Mage_XmlConnect.csv | 1200 -- app/locale/fr_FR/Phoenix_Moneybookers.csv | 42 - .../fr_FR/template/email/account_new.html | 55 - .../email/account_new_confirmation.html | 50 - .../template/email/account_new_confirmed.html | 51 - .../account_password_reset_confirmation.html | 43 - .../template/email/admin_password_new.html | 43 - .../admin_password_reset_confirmation.html | 44 - ...amazonpayments_asp_notification_error.html | 12 - .../fr_FR/template/email/contact_form.html | 12 - .../email/currency_update_warning.html | 8 - .../template/email/log_clean_warning.html | 7 - .../email/moneybookers_activateemail.html | 6 - .../email/newsletter_subscr_confirm.html | 41 - .../email/newsletter_subscr_success.html | 2 - .../email/newsletter_unsub_success.html | 2 - .../fr_FR/template/email/password_new.html | 42 - .../fr_FR/template/email/payment_failed.html | 68 - .../email/product_alert_cron_error.html | 7 - .../template/email/product_price_alert.html | 8 - .../fr_FR/template/email/product_share.html | 13 - .../template/email/product_stock_alert.html | 8 - .../template/email/sales/creditmemo_new.html | 108 - .../email/sales/creditmemo_new_guest.html | 106 - .../email/sales/creditmemo_update.html | 52 - .../email/sales/creditmemo_update_guest.html | 51 - .../template/email/sales/invoice_new.html | 107 - .../email/sales/invoice_new_guest.html | 106 - .../template/email/sales/invoice_update.html | 52 - .../email/sales/invoice_update_guest.html | 49 - .../fr_FR/template/email/sales/order_new.html | 109 - .../template/email/sales/order_new_guest.html | 108 - .../template/email/sales/order_update.html | 52 - .../email/sales/order_update_guest.html | 50 - .../template/email/sales/shipment_new.html | 111 - .../email/sales/shipment_new_guest.html | 109 - .../template/email/sales/shipment_update.html | 52 - .../email/sales/shipment_update_guest.html | 50 - .../email/sitemap_generate_warning.html | 8 - app/locale/fr_FR/template/email/token.html | 9 - .../fr_FR/template/email/wishlist_share.html | 43 - app/locale/nl_NL/Mage_AdminNotification.csv | 31 - app/locale/nl_NL/Mage_Adminhtml.csv | 1215 -- app/locale/nl_NL/Mage_AmazonPayments.csv | 101 - app/locale/nl_NL/Mage_Api.csv | 18 - app/locale/nl_NL/Mage_Api2.csv | 238 - app/locale/nl_NL/Mage_Authorizenet.csv | 41 - app/locale/nl_NL/Mage_Backup.csv | 55 - app/locale/nl_NL/Mage_Bundle.csv | 71 - app/locale/nl_NL/Mage_Captcha.csv | 22 - app/locale/nl_NL/Mage_Catalog.csv | 848 -- app/locale/nl_NL/Mage_CatalogInventory.csv | 62 - app/locale/nl_NL/Mage_CatalogRule.csv | 64 - app/locale/nl_NL/Mage_CatalogSearch.csv | 49 - app/locale/nl_NL/Mage_Centinel.csv | 33 - app/locale/nl_NL/Mage_Checkout.csv | 360 - app/locale/nl_NL/Mage_Cms.csv | 123 - app/locale/nl_NL/Mage_Compiler.csv | 21 - app/locale/nl_NL/Mage_Connect.csv | 58 - app/locale/nl_NL/Mage_Contacts.csv | 19 - app/locale/nl_NL/Mage_Core.csv | 394 - app/locale/nl_NL/Mage_Cron.csv | 24 - app/locale/nl_NL/Mage_CurrencySymbol.csv | 10 - app/locale/nl_NL/Mage_Customer.csv | 469 - app/locale/nl_NL/Mage_Dataflow.csv | 32 - app/locale/nl_NL/Mage_Directory.csv | 49 - app/locale/nl_NL/Mage_Downloadable.csv | 95 - app/locale/nl_NL/Mage_Eav.csv | 124 - app/locale/nl_NL/Mage_GiftMessage.csv | 38 - app/locale/nl_NL/Mage_GoogleAnalytics.csv | 5 - app/locale/nl_NL/Mage_GoogleBase.csv | 78 - app/locale/nl_NL/Mage_GoogleCheckout.csv | 131 - app/locale/nl_NL/Mage_ImportExport.csv | 93 - app/locale/nl_NL/Mage_Index.csv | 47 - app/locale/nl_NL/Mage_Install.csv | 125 - app/locale/nl_NL/Mage_Log.csv | 9 - app/locale/nl_NL/Mage_Media.csv | 3 - app/locale/nl_NL/Mage_Newsletter.csv | 137 - app/locale/nl_NL/Mage_Oauth.csv | 118 - app/locale/nl_NL/Mage_Page.csv | 81 - app/locale/nl_NL/Mage_PageCache.csv | 12 - app/locale/nl_NL/Mage_Paygate.csv | 67 - app/locale/nl_NL/Mage_Payment.csv | 142 - app/locale/nl_NL/Mage_Paypal.csv | 623 -- app/locale/nl_NL/Mage_PaypalUk.csv | 2 - app/locale/nl_NL/Mage_Persistent.csv | 74 - app/locale/nl_NL/Mage_Poll.csv | 42 - app/locale/nl_NL/Mage_ProductAlert.csv | 35 - app/locale/nl_NL/Mage_Rating.csv | 29 - app/locale/nl_NL/Mage_Reports.csv | 174 - app/locale/nl_NL/Mage_Review.csv | 104 - app/locale/nl_NL/Mage_Rss.csv | 56 - app/locale/nl_NL/Mage_Rule.csv | 40 - app/locale/nl_NL/Mage_Sales.csv | 882 -- app/locale/nl_NL/Mage_SalesRule.csv | 132 - app/locale/nl_NL/Mage_Sendfriend.csv | 38 - app/locale/nl_NL/Mage_Shipping.csv | 93 - app/locale/nl_NL/Mage_Sitemap.csv | 46 - app/locale/nl_NL/Mage_Tag.csv | 101 - app/locale/nl_NL/Mage_Tax.csv | 163 - app/locale/nl_NL/Mage_Usa.csv | 381 - app/locale/nl_NL/Mage_Weee.csv | 25 - app/locale/nl_NL/Mage_Widget.csv | 75 - app/locale/nl_NL/Mage_Wishlist.csv | 100 - app/locale/nl_NL/Mage_XmlConnect.csv | 1200 -- app/locale/nl_NL/Phoenix_Moneybookers.csv | 42 - .../nl_NL/template/email/account_new.html | 55 - .../email/account_new_confirmation.html | 50 - .../template/email/account_new_confirmed.html | 51 - .../account_password_reset_confirmation.html | 43 - .../template/email/admin_password_new.html | 43 - .../admin_password_reset_confirmation.html | 44 - ...amazonpayments_asp_notification_error.html | 12 - .../nl_NL/template/email/contact_form.html | 12 - .../email/currency_update_warning.html | 8 - .../template/email/log_clean_warning.html | 7 - .../email/moneybookers_activateemail.html | 6 - .../email/newsletter_subscr_confirm.html | 41 - .../email/newsletter_subscr_success.html | 2 - .../email/newsletter_unsub_success.html | 2 - .../nl_NL/template/email/password_new.html | 42 - .../nl_NL/template/email/payment_failed.html | 68 - .../email/product_alert_cron_error.html | 7 - .../template/email/product_price_alert.html | 8 - .../nl_NL/template/email/product_share.html | 13 - .../template/email/product_stock_alert.html | 8 - .../template/email/sales/creditmemo_new.html | 108 - .../email/sales/creditmemo_new_guest.html | 106 - .../email/sales/creditmemo_update.html | 52 - .../email/sales/creditmemo_update_guest.html | 51 - .../template/email/sales/invoice_new.html | 107 - .../email/sales/invoice_new_guest.html | 106 - .../template/email/sales/invoice_update.html | 52 - .../email/sales/invoice_update_guest.html | 49 - .../nl_NL/template/email/sales/order_new.html | 109 - .../template/email/sales/order_new_guest.html | 108 - .../template/email/sales/order_update.html | 52 - .../email/sales/order_update_guest.html | 50 - .../template/email/sales/shipment_new.html | 111 - .../email/sales/shipment_new_guest.html | 109 - .../template/email/sales/shipment_update.html | 52 - .../email/sales/shipment_update_guest.html | 50 - .../email/sitemap_generate_warning.html | 8 - app/locale/nl_NL/template/email/token.html | 9 - .../nl_NL/template/email/wishlist_share.html | 43 - app/locale/pt_BR/Mage_AdminNotification.csv | 31 - app/locale/pt_BR/Mage_Adminhtml.csv | 1215 -- app/locale/pt_BR/Mage_AmazonPayments.csv | 101 - app/locale/pt_BR/Mage_Api.csv | 18 - app/locale/pt_BR/Mage_Api2.csv | 238 - app/locale/pt_BR/Mage_Authorizenet.csv | 41 - app/locale/pt_BR/Mage_Backup.csv | 55 - app/locale/pt_BR/Mage_Bundle.csv | 71 - app/locale/pt_BR/Mage_Captcha.csv | 22 - app/locale/pt_BR/Mage_Catalog.csv | 848 -- app/locale/pt_BR/Mage_CatalogInventory.csv | 62 - app/locale/pt_BR/Mage_CatalogRule.csv | 64 - app/locale/pt_BR/Mage_CatalogSearch.csv | 49 - app/locale/pt_BR/Mage_Centinel.csv | 33 - app/locale/pt_BR/Mage_Checkout.csv | 360 - app/locale/pt_BR/Mage_Cms.csv | 123 - app/locale/pt_BR/Mage_Compiler.csv | 21 - app/locale/pt_BR/Mage_Connect.csv | 58 - app/locale/pt_BR/Mage_Contacts.csv | 19 - app/locale/pt_BR/Mage_Core.csv | 396 - app/locale/pt_BR/Mage_Cron.csv | 24 - app/locale/pt_BR/Mage_CurrencySymbol.csv | 10 - app/locale/pt_BR/Mage_Customer.csv | 469 - app/locale/pt_BR/Mage_Dataflow.csv | 32 - app/locale/pt_BR/Mage_Directory.csv | 49 - app/locale/pt_BR/Mage_Downloadable.csv | 95 - app/locale/pt_BR/Mage_Eav.csv | 124 - app/locale/pt_BR/Mage_GiftMessage.csv | 38 - app/locale/pt_BR/Mage_GoogleAnalytics.csv | 5 - app/locale/pt_BR/Mage_GoogleBase.csv | 78 - app/locale/pt_BR/Mage_GoogleCheckout.csv | 131 - app/locale/pt_BR/Mage_ImportExport.csv | 93 - app/locale/pt_BR/Mage_Index.csv | 47 - app/locale/pt_BR/Mage_Install.csv | 125 - app/locale/pt_BR/Mage_Log.csv | 9 - app/locale/pt_BR/Mage_Media.csv | 3 - app/locale/pt_BR/Mage_Newsletter.csv | 137 - app/locale/pt_BR/Mage_Oauth.csv | 118 - app/locale/pt_BR/Mage_Page.csv | 81 - app/locale/pt_BR/Mage_PageCache.csv | 12 - app/locale/pt_BR/Mage_Paygate.csv | 67 - app/locale/pt_BR/Mage_Payment.csv | 142 - app/locale/pt_BR/Mage_Paypal.csv | 623 -- app/locale/pt_BR/Mage_PaypalUk.csv | 2 - app/locale/pt_BR/Mage_Persistent.csv | 74 - app/locale/pt_BR/Mage_Poll.csv | 42 - app/locale/pt_BR/Mage_ProductAlert.csv | 35 - app/locale/pt_BR/Mage_Rating.csv | 29 - app/locale/pt_BR/Mage_Reports.csv | 174 - app/locale/pt_BR/Mage_Review.csv | 104 - app/locale/pt_BR/Mage_Rss.csv | 57 - app/locale/pt_BR/Mage_Rule.csv | 40 - app/locale/pt_BR/Mage_Sales.csv | 882 -- app/locale/pt_BR/Mage_SalesRule.csv | 132 - app/locale/pt_BR/Mage_Sendfriend.csv | 38 - app/locale/pt_BR/Mage_Shipping.csv | 93 - app/locale/pt_BR/Mage_Sitemap.csv | 46 - app/locale/pt_BR/Mage_Tag.csv | 101 - app/locale/pt_BR/Mage_Tax.csv | 163 - app/locale/pt_BR/Mage_Usa.csv | 381 - app/locale/pt_BR/Mage_Weee.csv | 25 - app/locale/pt_BR/Mage_Widget.csv | 75 - app/locale/pt_BR/Mage_Wishlist.csv | 100 - app/locale/pt_BR/Mage_XmlConnect.csv | 1200 -- app/locale/pt_BR/Phoenix_Moneybookers.csv | 42 - .../pt_BR/template/email/account_new.html | 55 - .../email/account_new_confirmation.html | 50 - .../template/email/account_new_confirmed.html | 51 - .../account_password_reset_confirmation.html | 43 - .../template/email/admin_password_new.html | 43 - .../admin_password_reset_confirmation.html | 44 - ...amazonpayments_asp_notification_error.html | 12 - .../pt_BR/template/email/contact_form.html | 12 - .../email/currency_update_warning.html | 8 - .../template/email/log_clean_warning.html | 7 - .../email/moneybookers_activateemail.html | 6 - .../email/newsletter_subscr_confirm.html | 41 - .../email/newsletter_subscr_success.html | 2 - .../email/newsletter_unsub_success.html | 2 - .../pt_BR/template/email/password_new.html | 42 - .../pt_BR/template/email/payment_failed.html | 68 - .../email/product_alert_cron_error.html | 7 - .../template/email/product_price_alert.html | 8 - .../pt_BR/template/email/product_share.html | 13 - .../template/email/product_stock_alert.html | 8 - .../template/email/sales/creditmemo_new.html | 108 - .../email/sales/creditmemo_new_guest.html | 106 - .../email/sales/creditmemo_update.html | 52 - .../email/sales/creditmemo_update_guest.html | 51 - .../template/email/sales/invoice_new.html | 107 - .../email/sales/invoice_new_guest.html | 106 - .../template/email/sales/invoice_update.html | 52 - .../email/sales/invoice_update_guest.html | 49 - .../pt_BR/template/email/sales/order_new.html | 109 - .../template/email/sales/order_new_guest.html | 108 - .../template/email/sales/order_update.html | 52 - .../email/sales/order_update_guest.html | 50 - .../template/email/sales/shipment_new.html | 111 - .../email/sales/shipment_new_guest.html | 109 - .../template/email/sales/shipment_update.html | 52 - .../email/sales/shipment_update_guest.html | 50 - .../email/sitemap_generate_warning.html | 8 - app/locale/pt_BR/template/email/token.html | 9 - .../pt_BR/template/email/wishlist_share.html | 43 - app/locale/zh_CN/Mage_AdminNotification.csv | 31 - app/locale/zh_CN/Mage_Adminhtml.csv | 1215 -- app/locale/zh_CN/Mage_AmazonPayments.csv | 101 - app/locale/zh_CN/Mage_Api.csv | 18 - app/locale/zh_CN/Mage_Api2.csv | 238 - app/locale/zh_CN/Mage_Authorizenet.csv | 41 - app/locale/zh_CN/Mage_Backup.csv | 55 - app/locale/zh_CN/Mage_Bundle.csv | 71 - app/locale/zh_CN/Mage_Captcha.csv | 22 - app/locale/zh_CN/Mage_Catalog.csv | 848 -- app/locale/zh_CN/Mage_CatalogInventory.csv | 62 - app/locale/zh_CN/Mage_CatalogRule.csv | 64 - app/locale/zh_CN/Mage_CatalogSearch.csv | 49 - app/locale/zh_CN/Mage_Centinel.csv | 33 - app/locale/zh_CN/Mage_Checkout.csv | 360 - app/locale/zh_CN/Mage_Cms.csv | 123 - app/locale/zh_CN/Mage_Compiler.csv | 21 - app/locale/zh_CN/Mage_Connect.csv | 58 - app/locale/zh_CN/Mage_Contacts.csv | 19 - app/locale/zh_CN/Mage_Core.csv | 394 - app/locale/zh_CN/Mage_Cron.csv | 24 - app/locale/zh_CN/Mage_CurrencySymbol.csv | 10 - app/locale/zh_CN/Mage_Customer.csv | 469 - app/locale/zh_CN/Mage_Dataflow.csv | 32 - app/locale/zh_CN/Mage_Directory.csv | 49 - app/locale/zh_CN/Mage_Downloadable.csv | 95 - app/locale/zh_CN/Mage_Eav.csv | 124 - app/locale/zh_CN/Mage_GiftMessage.csv | 38 - app/locale/zh_CN/Mage_GoogleAnalytics.csv | 5 - app/locale/zh_CN/Mage_GoogleBase.csv | 78 - app/locale/zh_CN/Mage_GoogleCheckout.csv | 131 - app/locale/zh_CN/Mage_ImportExport.csv | 93 - app/locale/zh_CN/Mage_Index.csv | 47 - app/locale/zh_CN/Mage_Install.csv | 125 - app/locale/zh_CN/Mage_Log.csv | 9 - app/locale/zh_CN/Mage_Media.csv | 3 - app/locale/zh_CN/Mage_Newsletter.csv | 137 - app/locale/zh_CN/Mage_Oauth.csv | 118 - app/locale/zh_CN/Mage_Page.csv | 81 - app/locale/zh_CN/Mage_PageCache.csv | 12 - app/locale/zh_CN/Mage_Paygate.csv | 67 - app/locale/zh_CN/Mage_Payment.csv | 142 - app/locale/zh_CN/Mage_Paypal.csv | 623 -- app/locale/zh_CN/Mage_PaypalUk.csv | 2 - app/locale/zh_CN/Mage_Persistent.csv | 74 - app/locale/zh_CN/Mage_Poll.csv | 42 - app/locale/zh_CN/Mage_ProductAlert.csv | 35 - app/locale/zh_CN/Mage_Rating.csv | 29 - app/locale/zh_CN/Mage_Reports.csv | 174 - app/locale/zh_CN/Mage_Review.csv | 104 - app/locale/zh_CN/Mage_Rss.csv | 56 - app/locale/zh_CN/Mage_Rule.csv | 40 - app/locale/zh_CN/Mage_Sales.csv | 882 -- app/locale/zh_CN/Mage_SalesRule.csv | 132 - app/locale/zh_CN/Mage_Sendfriend.csv | 38 - app/locale/zh_CN/Mage_Shipping.csv | 93 - app/locale/zh_CN/Mage_Sitemap.csv | 46 - app/locale/zh_CN/Mage_Tag.csv | 101 - app/locale/zh_CN/Mage_Tax.csv | 163 - app/locale/zh_CN/Mage_Usa.csv | 381 - app/locale/zh_CN/Mage_Weee.csv | 25 - app/locale/zh_CN/Mage_Widget.csv | 75 - app/locale/zh_CN/Mage_Wishlist.csv | 100 - app/locale/zh_CN/Mage_XmlConnect.csv | 1200 -- app/locale/zh_CN/Phoenix_Moneybookers.csv | 42 - .../zh_CN/template/email/account_new.html | 55 - .../email/account_new_confirmation.html | 50 - .../template/email/account_new_confirmed.html | 51 - .../account_password_reset_confirmation.html | 43 - .../template/email/admin_password_new.html | 43 - .../admin_password_reset_confirmation.html | 44 - ...amazonpayments_asp_notification_error.html | 12 - .../zh_CN/template/email/contact_form.html | 12 - .../email/currency_update_warning.html | 8 - .../template/email/log_clean_warning.html | 7 - .../email/moneybookers_activateemail.html | 6 - .../email/newsletter_subscr_confirm.html | 41 - .../email/newsletter_subscr_success.html | 2 - .../email/newsletter_unsub_success.html | 2 - .../zh_CN/template/email/password_new.html | 42 - .../zh_CN/template/email/payment_failed.html | 68 - .../email/product_alert_cron_error.html | 7 - .../template/email/product_price_alert.html | 8 - .../zh_CN/template/email/product_share.html | 13 - .../template/email/product_stock_alert.html | 8 - .../template/email/sales/creditmemo_new.html | 108 - .../email/sales/creditmemo_new_guest.html | 106 - .../email/sales/creditmemo_update.html | 52 - .../email/sales/creditmemo_update_guest.html | 51 - .../template/email/sales/invoice_new.html | 107 - .../email/sales/invoice_new_guest.html | 106 - .../template/email/sales/invoice_update.html | 52 - .../email/sales/invoice_update_guest.html | 49 - .../zh_CN/template/email/sales/order_new.html | 109 - .../template/email/sales/order_new_guest.html | 108 - .../template/email/sales/order_update.html | 52 - .../email/sales/order_update_guest.html | 50 - .../template/email/sales/shipment_new.html | 111 - .../email/sales/shipment_new_guest.html | 109 - .../template/email/sales/shipment_update.html | 52 - .../email/sales/shipment_update_guest.html | 50 - .../email/sitemap_generate_warning.html | 8 - app/locale/zh_CN/template/email/token.html | 9 - .../zh_CN/template/email/wishlist_share.html | 43 - composer.json | 15 - downloader/Maged/Connect.php | 2 +- downloader/Maged/Connect/Frontend.php | 13 +- downloader/Maged/Controller.php | 27 +- downloader/Maged/Exception.php | 2 +- downloader/Maged/Model.php | 2 +- downloader/Maged/Model/Config.php | 2 +- downloader/Maged/Model/Config/Abstract.php | 2 +- downloader/Maged/Model/Config/Community.php | 2 +- downloader/Maged/Model/Config/Interface.php | 2 +- downloader/Maged/Model/Connect.php | 2 +- downloader/Maged/Model/Connect/Request.php | 2 +- downloader/Maged/Model/Dowloader.php | 2 +- downloader/Maged/Model/Session.php | 2 +- downloader/Maged/View.php | 2 +- downloader/index.php | 2 +- downloader/lib/Mage/Archive.php | 2 +- downloader/lib/Mage/Archive/Abstract.php | 2 +- downloader/lib/Mage/Archive/Bz.php | 2 +- downloader/lib/Mage/Archive/Gz.php | 2 +- downloader/lib/Mage/Archive/Helper/File.php | 2 +- .../lib/Mage/Archive/Helper/File/Bz.php | 2 +- .../lib/Mage/Archive/Helper/File/Gz.php | 2 +- downloader/lib/Mage/Archive/Interface.php | 2 +- downloader/lib/Mage/Archive/Tar.php | 2 +- downloader/lib/Mage/Autoload/Simple.php | 4 +- downloader/lib/Mage/Backup.php | 2 +- downloader/lib/Mage/Backup/Abstract.php | 2 +- downloader/lib/Mage/Backup/Archive/Tar.php | 2 +- downloader/lib/Mage/Backup/Db.php | 2 +- downloader/lib/Mage/Backup/Exception.php | 2 +- .../Backup/Exception/CantLoadSnapshot.php | 2 +- .../Backup/Exception/FtpConnectionFailed.php | 2 +- .../Backup/Exception/FtpValidationFailed.php | 2 +- .../Backup/Exception/NotEnoughFreeSpace.php | 2 +- .../Backup/Exception/NotEnoughPermissions.php | 2 +- downloader/lib/Mage/Backup/Filesystem.php | 2 +- .../lib/Mage/Backup/Filesystem/Helper.php | 2 +- .../Mage/Backup/Filesystem/Iterator/File.php | 2 +- .../Backup/Filesystem/Iterator/Filter.php | 2 +- .../Backup/Filesystem/Rollback/Abstract.php | 2 +- .../Mage/Backup/Filesystem/Rollback/Fs.php | 2 +- .../Mage/Backup/Filesystem/Rollback/Ftp.php | 2 +- downloader/lib/Mage/Backup/Interface.php | 2 +- downloader/lib/Mage/Backup/Media.php | 2 +- downloader/lib/Mage/Backup/Nomedia.php | 2 +- downloader/lib/Mage/Backup/Snapshot.php | 2 +- .../lib/Mage/Connect/Channel/Generator.php | 2 +- .../lib/Mage/Connect/Channel/Parser.php | 2 +- downloader/lib/Mage/Connect/Channel/VO.php | 2 +- downloader/lib/Mage/Connect/Command.php | 2 +- .../lib/Mage/Connect/Command/Channels.php | 2 +- .../Mage/Connect/Command/Channels_Header.php | 2 +- .../lib/Mage/Connect/Command/Config.php | 2 +- .../Mage/Connect/Command/Config_Header.php | 2 +- .../lib/Mage/Connect/Command/Install.php | 2 +- .../Mage/Connect/Command/Install_Header.php | 2 +- .../lib/Mage/Connect/Command/Package.php | 2 +- .../Mage/Connect/Command/Package_Header.php | 2 +- .../lib/Mage/Connect/Command/Registry.php | 2 +- .../Mage/Connect/Command/Registry_Header.php | 2 +- .../lib/Mage/Connect/Command/Remote.php | 2 +- .../Mage/Connect/Command/Remote_Header.php | 2 +- downloader/lib/Mage/Connect/Config.php | 2 +- downloader/lib/Mage/Connect/Converter.php | 2 +- downloader/lib/Mage/Connect/Frontend.php | 2 +- downloader/lib/Mage/Connect/Frontend/CLI.php | 2 +- downloader/lib/Mage/Connect/Ftp.php | 2 +- downloader/lib/Mage/Connect/Loader.php | 2 +- downloader/lib/Mage/Connect/Loader/Ftp.php | 2 +- downloader/lib/Mage/Connect/Package.php | 2 +- .../lib/Mage/Connect/Package/Hotfix.php | 2 +- .../lib/Mage/Connect/Package/Reader.php | 2 +- .../lib/Mage/Connect/Package/Target.php | 2 +- downloader/lib/Mage/Connect/Package/VO.php | 2 +- .../lib/Mage/Connect/Package/Writer.php | 2 +- downloader/lib/Mage/Connect/Packager.php | 2 +- downloader/lib/Mage/Connect/Rest.php | 2 +- downloader/lib/Mage/Connect/Singleconfig.php | 2 +- .../lib/Mage/Connect/Structures/Graph.php | 2 +- .../lib/Mage/Connect/Structures/Node.php | 2 +- downloader/lib/Mage/Connect/Validator.php | 2 +- downloader/lib/Mage/DB/Exception.php | 2 +- downloader/lib/Mage/DB/Mysqli.php | 2 +- downloader/lib/Mage/Exception.php | 2 +- downloader/lib/Mage/HTTP/Client.php | 2 +- downloader/lib/Mage/HTTP/Client/Curl.php | 2 +- downloader/lib/Mage/HTTP/Client/Socket.php | 2 +- downloader/lib/Mage/HTTP/IClient.php | 2 +- downloader/lib/Mage/System/Args.php | 2 +- downloader/lib/Mage/System/Dirs.php | 2 +- downloader/lib/Mage/System/Ftp.php | 2 +- downloader/lib/Mage/Xml/Generator.php | 2 +- downloader/lib/Mage/Xml/Parser.php | 2 +- downloader/mage.php | 2 +- downloader/skin/boxes.css | 2 +- downloader/skin/ie7boxes.css | 2 +- downloader/skin/ieboxes.css | 2 +- downloader/skin/install/boxes.css | 2 +- downloader/skin/install/clears.css | 2 +- downloader/skin/install/ie7minus.css | 2 +- downloader/skin/install/iestyles.css | 2 +- downloader/skin/install/reset.css | 2 +- downloader/template/connect/iframe.phtml | 2 +- downloader/template/connect/packages.phtml | 2 +- .../template/connect/packages_prepare.phtml | 2 +- downloader/template/exception.phtml | 2 +- downloader/template/footer.phtml | 4 +- downloader/template/header.phtml | 2 +- downloader/template/index.phtml | 2 +- downloader/template/install/download.phtml | 2 +- downloader/template/install/footer.phtml | 4 +- downloader/template/install/header.phtml | 4 +- downloader/template/install/writable.phtml | 2 +- downloader/template/login.phtml | 2 +- downloader/template/messages.phtml | 2 +- downloader/template/noroute.phtml | 2 +- downloader/template/settings.phtml | 2 +- downloader/template/writable.phtml | 2 +- errors/404.php | 2 +- errors/503.php | 2 +- errors/default/404.phtml | 2 +- errors/default/503.phtml | 2 +- errors/default/css/styles.css | 2 +- errors/default/page.phtml | 4 +- errors/default/report.phtml | 2 +- errors/local.xml.sample | 2 +- errors/processor.php | 2 +- errors/report.php | 2 +- js/lib/dropdown.js | 2 +- js/lib/flex.js | 2 +- js/mage/adminhtml/accordion.js | 2 +- js/mage/adminhtml/backup.js | 2 +- js/mage/adminhtml/browser.js | 2 +- js/mage/adminhtml/events.js | 2 +- js/mage/adminhtml/flexuploader.js | 2 +- js/mage/adminhtml/form.js | 6 +- js/mage/adminhtml/giftmessage.js | 2 +- js/mage/adminhtml/giftoptions/tooltip.js | 2 +- js/mage/adminhtml/grid.js | 2 +- js/mage/adminhtml/hash.js | 2 +- js/mage/adminhtml/image.js | 2 +- js/mage/adminhtml/loader.js | 2 +- js/mage/adminhtml/magento-all.js | 2 +- js/mage/adminhtml/moneybookers.js | 2 +- js/mage/adminhtml/product.js | 2 +- .../adminhtml/product/composite/configure.js | 2 +- js/mage/adminhtml/rules.js | 2 +- js/mage/adminhtml/sales.js | 2 +- js/mage/adminhtml/sales/centinel.js | 2 +- js/mage/adminhtml/sales/packaging.js | 2 +- js/mage/adminhtml/scrollbar.js | 2 +- js/mage/adminhtml/tabs.js | 2 +- js/mage/adminhtml/tools.js | 2 +- js/mage/adminhtml/uploader.js | 2 +- js/mage/adminhtml/variables.js | 2 +- .../plugins/magentovariable/editor_plugin.js | 2 +- .../plugins/magentowidget/editor_plugin.js | 2 +- js/mage/adminhtml/wysiwyg/tiny_mce/setup.js | 2 +- .../themes/advanced/skins/default/content.css | 2 +- .../themes/advanced/skins/default/dialog.css | 2 +- js/mage/adminhtml/wysiwyg/widget.js | 2 +- js/mage/captcha.js | 2 +- js/mage/centinel.js | 2 +- js/mage/cookies.js | 2 +- js/mage/directpost.js | 2 +- js/mage/translate.js | 2 +- js/mage/translate_inline.css | 2 +- js/mage/translate_inline.js | 2 +- js/prototype/validation.js | 19 +- js/tiny_mce/plugins/media/img/flv_player.swf | Bin 0 -> 11668 bytes js/varien/accordion.js | 2 +- js/varien/configurable.js | 2 +- js/varien/form.js | 2 +- js/varien/iehover-fix.js | 2 +- js/varien/js.js | 2 +- js/varien/menu.js | 2 +- js/varien/payment.js | 2 +- js/varien/product.js | 76 +- js/varien/telephone.js | 2 +- js/varien/weee.js | 2 +- lib/Magento/Autoload/ClassMap.php | 100 - lib/Magento/Autoload/IncludePath.php | 93 - lib/Magento/Autoload/Simple.php | 54 - lib/Magento/Crypt.php | 26 +- lib/Magento/Db/Adapter/Pdo/Mysql.php | 6 +- lib/Magento/Db/Object.php | 8 +- lib/Magento/Db/Object/Interface.php | 8 +- lib/Magento/Db/Object/Table.php | 8 +- lib/Magento/Db/Object/Trigger.php | 8 +- lib/Magento/Db/Object/View.php | 8 +- lib/Magento/Db/Sql/Select.php | 10 +- lib/Magento/Db/Sql/Trigger.php | 8 +- lib/Magento/Exception.php | 26 +- lib/Magento/Profiler.php | 26 +- lib/Magento/Profiler/Output/Csvfile.php | 26 +- lib/Magento/Profiler/Output/Firebug.php | 26 +- lib/Magento/Profiler/Output/Html.php | 26 +- lib/Magento/Profiler/OutputAbstract.php | 26 +- lib/Varien/Data/Form/Element/Datetime.php | 16 +- lib/Varien/Data/Form/Filter/Datetime.php | 16 +- lib/Varien/Http/Adapter/Curl.php | 67 +- lib/Zend/Acl.php | 25 +- lib/Zend/Acl/Assert/Interface.php | 6 +- lib/Zend/Acl/Exception.php | 6 +- lib/Zend/Acl/Resource.php | 6 +- lib/Zend/Acl/Resource/Interface.php | 6 +- lib/Zend/Acl/Role.php | 8 +- lib/Zend/Acl/Role/Interface.php | 6 +- lib/Zend/Acl/Role/Registry.php | 6 +- lib/Zend/Acl/Role/Registry/Exception.php | 6 +- lib/Zend/Amf/Adobe/Auth.php | 6 +- lib/Zend/Amf/Adobe/DbInspector.php | 6 +- lib/Zend/Amf/Adobe/Introspector.php | 6 +- lib/Zend/Amf/Auth/Abstract.php | 6 +- lib/Zend/Amf/Constants.php | 6 +- lib/Zend/Amf/Exception.php | 6 +- lib/Zend/Amf/Parse/Amf0/Deserializer.php | 6 +- lib/Zend/Amf/Parse/Amf0/Serializer.php | 30 +- lib/Zend/Amf/Parse/Amf3/Deserializer.php | 9 +- lib/Zend/Amf/Parse/Amf3/Serializer.php | 31 +- lib/Zend/Amf/Parse/Deserializer.php | 6 +- lib/Zend/Amf/Parse/InputStream.php | 6 +- lib/Zend/Amf/Parse/OutputStream.php | 6 +- lib/Zend/Amf/Parse/Resource/MysqlResult.php | 6 +- lib/Zend/Amf/Parse/Resource/MysqliResult.php | 6 +- lib/Zend/Amf/Parse/Resource/Stream.php | 6 +- lib/Zend/Amf/Parse/Serializer.php | 14 +- lib/Zend/Amf/Parse/TypeLoader.php | 6 +- lib/Zend/Amf/Request.php | 6 +- lib/Zend/Amf/Request/Http.php | 6 +- lib/Zend/Amf/Response.php | 10 +- lib/Zend/Amf/Response/Http.php | 32 +- lib/Zend/Amf/Server.php | 226 +- lib/Zend/Amf/Server/Exception.php | 6 +- lib/Zend/Amf/Util/BinaryStream.php | 30 +- lib/Zend/Amf/Value/ByteArray.php | 6 +- lib/Zend/Amf/Value/MessageBody.php | 6 +- lib/Zend/Amf/Value/MessageHeader.php | 6 +- .../Amf/Value/Messaging/AbstractMessage.php | 6 +- .../Value/Messaging/AcknowledgeMessage.php | 6 +- .../Amf/Value/Messaging/ArrayCollection.php | 8 +- lib/Zend/Amf/Value/Messaging/AsyncMessage.php | 6 +- .../Amf/Value/Messaging/CommandMessage.php | 6 +- lib/Zend/Amf/Value/Messaging/ErrorMessage.php | 6 +- .../Amf/Value/Messaging/RemotingMessage.php | 6 +- lib/Zend/Amf/Value/TraitsInfo.php | 6 +- lib/Zend/Application.php | 14 +- lib/Zend/Application/Bootstrap/Bootstrap.php | 8 +- .../Bootstrap/BootstrapAbstract.php | 13 +- .../Application/Bootstrap/Bootstrapper.php | 6 +- lib/Zend/Application/Bootstrap/Exception.php | 6 +- .../Bootstrap/ResourceBootstrapper.php | 6 +- lib/Zend/Application/Exception.php | 6 +- lib/Zend/Application/Module/Autoloader.php | 6 +- lib/Zend/Application/Module/Bootstrap.php | 10 +- .../Application/Resource/Cachemanager.php | 10 +- lib/Zend/Application/Resource/Db.php | 25 +- lib/Zend/Application/Resource/Dojo.php | 6 +- lib/Zend/Application/Resource/Exception.php | 6 +- .../Application/Resource/Frontcontroller.php | 28 +- lib/Zend/Application/Resource/Layout.php | 6 +- lib/Zend/Application/Resource/Locale.php | 38 +- lib/Zend/Application/Resource/Log.php | 17 +- lib/Zend/Application/Resource/Mail.php | 31 +- lib/Zend/Application/Resource/Modules.php | 27 +- lib/Zend/Application/Resource/Multidb.php | 10 +- lib/Zend/Application/Resource/Navigation.php | 13 +- lib/Zend/Application/Resource/Resource.php | 6 +- .../Application/Resource/ResourceAbstract.php | 6 +- lib/Zend/Application/Resource/Router.php | 6 +- lib/Zend/Application/Resource/Session.php | 8 +- lib/Zend/Application/Resource/Translate.php | 6 +- lib/Zend/Application/Resource/Useragent.php | 38 +- lib/Zend/Application/Resource/View.php | 12 +- lib/Zend/Auth.php | 6 +- lib/Zend/Auth/Adapter/DbTable.php | 30 +- lib/Zend/Auth/Adapter/Digest.php | 8 +- lib/Zend/Auth/Adapter/Exception.php | 6 +- lib/Zend/Auth/Adapter/Http.php | 8 +- .../Auth/Adapter/Http/Resolver/Exception.php | 6 +- lib/Zend/Auth/Adapter/Http/Resolver/File.php | 6 +- .../Auth/Adapter/Http/Resolver/Interface.php | 6 +- lib/Zend/Auth/Adapter/InfoCard.php | 6 +- lib/Zend/Auth/Adapter/Interface.php | 6 +- lib/Zend/Auth/Adapter/Ldap.php | 20 +- lib/Zend/Auth/Adapter/OpenId.php | 6 +- lib/Zend/Auth/Exception.php | 6 +- lib/Zend/Auth/Result.php | 6 +- lib/Zend/Auth/Storage/Exception.php | 6 +- lib/Zend/Auth/Storage/Interface.php | 6 +- lib/Zend/Auth/Storage/NonPersistent.php | 6 +- lib/Zend/Auth/Storage/Session.php | 6 +- lib/Zend/Barcode.php | 26 +- lib/Zend/Barcode/Exception.php | 6 +- lib/Zend/Barcode/Object/Code128.php | 78 +- lib/Zend/Barcode/Object/Code25.php | 10 +- lib/Zend/Barcode/Object/Code25interleaved.php | 6 +- lib/Zend/Barcode/Object/Code39.php | 8 +- lib/Zend/Barcode/Object/Ean13.php | 6 +- lib/Zend/Barcode/Object/Ean2.php | 6 +- lib/Zend/Barcode/Object/Ean5.php | 6 +- lib/Zend/Barcode/Object/Ean8.php | 6 +- lib/Zend/Barcode/Object/Error.php | 6 +- lib/Zend/Barcode/Object/Exception.php | 6 +- lib/Zend/Barcode/Object/Identcode.php | 6 +- lib/Zend/Barcode/Object/Itf14.php | 6 +- lib/Zend/Barcode/Object/Leitcode.php | 6 +- lib/Zend/Barcode/Object/ObjectAbstract.php | 6 +- lib/Zend/Barcode/Object/Planet.php | 6 +- lib/Zend/Barcode/Object/Postnet.php | 6 +- lib/Zend/Barcode/Object/Royalmail.php | 6 +- lib/Zend/Barcode/Object/Upca.php | 6 +- lib/Zend/Barcode/Object/Upce.php | 6 +- lib/Zend/Barcode/Renderer/Exception.php | 6 +- lib/Zend/Barcode/Renderer/Image.php | 6 +- lib/Zend/Barcode/Renderer/Pdf.php | 6 +- .../Barcode/Renderer/RendererAbstract.php | 6 +- lib/Zend/Barcode/Renderer/Svg.php | 4 +- lib/Zend/Cache.php | 16 +- lib/Zend/Cache/Backend.php | 34 +- lib/Zend/Cache/Backend/Apc.php | 6 +- lib/Zend/Cache/Backend/BlackHole.php | 10 +- lib/Zend/Cache/Backend/ExtendedInterface.php | 6 +- lib/Zend/Cache/Backend/File.php | 77 +- lib/Zend/Cache/Backend/Interface.php | 6 +- lib/Zend/Cache/Backend/Libmemcached.php | 6 +- lib/Zend/Cache/Backend/Memcached.php | 6 +- lib/Zend/Cache/Backend/Sqlite.php | 7 +- lib/Zend/Cache/Backend/Static.php | 51 +- lib/Zend/Cache/Backend/Test.php | 10 +- lib/Zend/Cache/Backend/TwoLevels.php | 22 +- lib/Zend/Cache/Backend/WinCache.php | 349 - lib/Zend/Cache/Backend/Xcache.php | 6 +- lib/Zend/Cache/Backend/ZendPlatform.php | 6 +- lib/Zend/Cache/Backend/ZendServer.php | 6 +- lib/Zend/Cache/Backend/ZendServer/Disk.php | 6 +- lib/Zend/Cache/Backend/ZendServer/ShMem.php | 6 +- lib/Zend/Cache/Core.php | 74 +- lib/Zend/Cache/Exception.php | 6 +- lib/Zend/Cache/Frontend/Capture.php | 8 +- lib/Zend/Cache/Frontend/Class.php | 16 +- lib/Zend/Cache/Frontend/File.php | 14 +- lib/Zend/Cache/Frontend/Function.php | 9 +- lib/Zend/Cache/Frontend/Output.php | 11 +- lib/Zend/Cache/Frontend/Page.php | 14 +- lib/Zend/Cache/Manager.php | 6 +- lib/Zend/Captcha/Adapter.php | 6 +- lib/Zend/Captcha/Base.php | 6 +- lib/Zend/Captcha/Dumb.php | 31 +- lib/Zend/Captcha/Exception.php | 6 +- lib/Zend/Captcha/Figlet.php | 6 +- lib/Zend/Captcha/Image.php | 14 +- lib/Zend/Captcha/ReCaptcha.php | 22 +- lib/Zend/Captcha/Word.php | 42 +- lib/Zend/Cloud/AbstractFactory.php | 16 +- lib/Zend/Cloud/DocumentService/Adapter.php | 30 +- .../Adapter/AbstractAdapter.php | 26 +- .../DocumentService/Adapter/SimpleDb.php | 90 +- .../Adapter/SimpleDb/Query.php | 20 +- .../DocumentService/Adapter/WindowsAzure.php | 112 +- .../Adapter/WindowsAzure/Query.php | 46 +- lib/Zend/Cloud/DocumentService/Document.php | 68 +- .../Cloud/DocumentService/DocumentSet.php | 8 +- lib/Zend/Cloud/DocumentService/Exception.php | 4 +- lib/Zend/Cloud/DocumentService/Factory.php | 16 +- lib/Zend/Cloud/DocumentService/Query.php | 62 +- .../Cloud/DocumentService/QueryAdapter.php | 22 +- lib/Zend/Cloud/Exception.php | 12 +- lib/Zend/Cloud/Infrastructure/Adapter.php | 167 - .../Adapter/AbstractAdapter.php | 175 - lib/Zend/Cloud/Infrastructure/Adapter/Ec2.php | 496 - .../Infrastructure/Adapter/Rackspace.php | 483 - lib/Zend/Cloud/Infrastructure/Exception.php | 25 - lib/Zend/Cloud/Infrastructure/Factory.php | 65 - lib/Zend/Cloud/Infrastructure/Image.php | 176 - lib/Zend/Cloud/Infrastructure/ImageList.php | 218 - lib/Zend/Cloud/Infrastructure/Instance.php | 320 - .../Cloud/Infrastructure/InstanceList.php | 219 - .../Cloud/OperationNotAvailableException.php | 4 +- lib/Zend/Cloud/QueueService/Adapter.php | 36 +- .../QueueService/Adapter/AbstractAdapter.php | 16 +- lib/Zend/Cloud/QueueService/Adapter/Sqs.php | 38 +- .../QueueService/Adapter/WindowsAzure.php | 52 +- .../Cloud/QueueService/Adapter/ZendQueue.php | 58 +- lib/Zend/Cloud/QueueService/Exception.php | 4 +- lib/Zend/Cloud/QueueService/Factory.php | 14 +- lib/Zend/Cloud/QueueService/Message.php | 14 +- lib/Zend/Cloud/QueueService/MessageSet.php | 12 +- lib/Zend/Cloud/StorageService/Adapter.php | 32 +- .../StorageService/Adapter/FileSystem.php | 40 +- .../Cloud/StorageService/Adapter/Nirvanix.php | 46 +- .../StorageService/Adapter/Rackspace.php | 332 - lib/Zend/Cloud/StorageService/Adapter/S3.php | 81 +- .../StorageService/Adapter/WindowsAzure.php | 108 +- lib/Zend/Cloud/StorageService/Exception.php | 4 +- lib/Zend/Cloud/StorageService/Factory.php | 18 +- lib/Zend/CodeGenerator/Abstract.php | 6 +- lib/Zend/CodeGenerator/Exception.php | 6 +- lib/Zend/CodeGenerator/Php/Abstract.php | 6 +- lib/Zend/CodeGenerator/Php/Body.php | 6 +- lib/Zend/CodeGenerator/Php/Class.php | 113 +- lib/Zend/CodeGenerator/Php/Docblock.php | 12 +- lib/Zend/CodeGenerator/Php/Docblock/Tag.php | 26 +- .../Php/Docblock/Tag/License.php | 6 +- .../CodeGenerator/Php/Docblock/Tag/Param.php | 8 +- .../CodeGenerator/Php/Docblock/Tag/Return.php | 6 +- lib/Zend/CodeGenerator/Php/Exception.php | 6 +- lib/Zend/CodeGenerator/Php/File.php | 15 +- .../CodeGenerator/Php/Member/Abstract.php | 6 +- .../CodeGenerator/Php/Member/Container.php | 6 +- lib/Zend/CodeGenerator/Php/Method.php | 10 +- lib/Zend/CodeGenerator/Php/Parameter.php | 6 +- .../Php/Parameter/DefaultValue.php | 6 +- lib/Zend/CodeGenerator/Php/Property.php | 6 +- .../Php/Property/DefaultValue.php | 6 +- lib/Zend/Config.php | 6 +- lib/Zend/Config/Exception.php | 6 +- lib/Zend/Config/Ini.php | 21 +- lib/Zend/Config/Json.php | 6 +- lib/Zend/Config/Writer.php | 6 +- lib/Zend/Config/Writer/Array.php | 6 +- lib/Zend/Config/Writer/FileAbstract.php | 6 +- lib/Zend/Config/Writer/Ini.php | 16 +- lib/Zend/Config/Writer/Json.php | 2 +- lib/Zend/Config/Writer/Xml.php | 6 +- lib/Zend/Config/Writer/Yaml.php | 4 +- lib/Zend/Config/Xml.php | 22 +- lib/Zend/Config/Yaml.php | 87 +- lib/Zend/Console/Getopt.php | 6 +- lib/Zend/Console/Getopt/Exception.php | 6 +- lib/Zend/Controller/Action.php | 132 +- lib/Zend/Controller/Action/Exception.php | 6 +- .../Controller/Action/Helper/Abstract.php | 20 +- .../Controller/Action/Helper/ActionStack.php | 6 +- .../Controller/Action/Helper/AjaxContext.php | 11 +- .../Action/Helper/AutoComplete/Abstract.php | 6 +- .../Action/Helper/AutoCompleteDojo.php | 6 +- .../Helper/AutoCompleteScriptaculous.php | 6 +- lib/Zend/Controller/Action/Helper/Cache.php | 24 +- .../Action/Helper/ContextSwitch.php | 8 +- .../Action/Helper/FlashMessenger.php | 105 +- lib/Zend/Controller/Action/Helper/Json.php | 27 +- .../Controller/Action/Helper/Redirector.php | 18 +- lib/Zend/Controller/Action/Helper/Url.php | 6 +- .../Controller/Action/Helper/ViewRenderer.php | 9 +- lib/Zend/Controller/Action/HelperBroker.php | 6 +- .../Action/HelperBroker/PriorityStack.php | 6 +- lib/Zend/Controller/Action/Interface.php | 6 +- lib/Zend/Controller/Dispatcher/Abstract.php | 6 +- lib/Zend/Controller/Dispatcher/Exception.php | 6 +- lib/Zend/Controller/Dispatcher/Interface.php | 6 +- lib/Zend/Controller/Dispatcher/Standard.php | 23 +- lib/Zend/Controller/Exception.php | 6 +- lib/Zend/Controller/Front.php | 6 +- lib/Zend/Controller/Plugin/Abstract.php | 6 +- lib/Zend/Controller/Plugin/ActionStack.php | 6 +- lib/Zend/Controller/Plugin/Broker.php | 20 +- lib/Zend/Controller/Plugin/ErrorHandler.php | 21 +- lib/Zend/Controller/Plugin/PutHandler.php | 6 +- lib/Zend/Controller/Request/Abstract.php | 8 +- lib/Zend/Controller/Request/Apache404.php | 8 +- lib/Zend/Controller/Request/Exception.php | 6 +- lib/Zend/Controller/Request/Http.php | 48 +- lib/Zend/Controller/Request/HttpTestCase.php | 4 +- lib/Zend/Controller/Request/Simple.php | 6 +- lib/Zend/Controller/Response/Abstract.php | 10 +- lib/Zend/Controller/Response/Cli.php | 6 +- lib/Zend/Controller/Response/Exception.php | 6 +- lib/Zend/Controller/Response/Http.php | 4 +- lib/Zend/Controller/Response/HttpTestCase.php | 4 +- lib/Zend/Controller/Router/Abstract.php | 11 +- lib/Zend/Controller/Router/Exception.php | 6 +- lib/Zend/Controller/Router/Interface.php | 6 +- lib/Zend/Controller/Router/Rewrite.php | 17 +- lib/Zend/Controller/Router/Route.php | 13 +- lib/Zend/Controller/Router/Route/Abstract.php | 11 +- lib/Zend/Controller/Router/Route/Chain.php | 71 +- lib/Zend/Controller/Router/Route/Hostname.php | 7 +- .../Controller/Router/Route/Interface.php | 6 +- lib/Zend/Controller/Router/Route/Module.php | 25 +- lib/Zend/Controller/Router/Route/Regex.php | 8 +- lib/Zend/Controller/Router/Route/Static.php | 10 +- lib/Zend/Crypt.php | 6 +- lib/Zend/Crypt/DiffieHellman.php | 6 +- lib/Zend/Crypt/DiffieHellman/Exception.php | 6 +- lib/Zend/Crypt/Exception.php | 6 +- lib/Zend/Crypt/Hmac.php | 6 +- lib/Zend/Crypt/Hmac/Exception.php | 6 +- lib/Zend/Crypt/Math.php | 6 +- lib/Zend/Crypt/Math/BigInteger.php | 6 +- lib/Zend/Crypt/Math/BigInteger/Bcmath.php | 6 +- lib/Zend/Crypt/Math/BigInteger/Exception.php | 6 +- lib/Zend/Crypt/Math/BigInteger/Gmp.php | 6 +- lib/Zend/Crypt/Math/BigInteger/Interface.php | 6 +- lib/Zend/Crypt/Math/Exception.php | 6 +- lib/Zend/Crypt/Rsa.php | 22 +- lib/Zend/Crypt/Rsa/Exception.php | 4 +- lib/Zend/Crypt/Rsa/Key.php | 6 +- lib/Zend/Crypt/Rsa/Key/Private.php | 6 +- lib/Zend/Crypt/Rsa/Key/Public.php | 6 +- lib/Zend/Currency.php | 24 +- lib/Zend/Currency/CurrencyInterface.php | 6 +- lib/Zend/Currency/Exception.php | 6 +- lib/Zend/Date.php | 49 +- lib/Zend/Date/Cities.php | 6 +- lib/Zend/Date/DateObject.php | 13 +- lib/Zend/Date/Exception.php | 6 +- lib/Zend/Db.php | 19 +- lib/Zend/Db/Adapter/Abstract.php | 11 +- lib/Zend/Db/Adapter/Db2.php | 8 +- lib/Zend/Db/Adapter/Db2/Exception.php | 8 +- lib/Zend/Db/Adapter/Exception.php | 6 +- lib/Zend/Db/Adapter/Mysqli.php | 15 +- lib/Zend/Db/Adapter/Mysqli/Exception.php | 6 +- lib/Zend/Db/Adapter/Oracle.php | 11 +- lib/Zend/Db/Adapter/Oracle/Exception.php | 6 +- lib/Zend/Db/Adapter/Pdo/Abstract.php | 6 +- lib/Zend/Db/Adapter/Pdo/Ibm.php | 6 +- lib/Zend/Db/Adapter/Pdo/Ibm/Db2.php | 6 +- lib/Zend/Db/Adapter/Pdo/Ibm/Ids.php | 6 +- lib/Zend/Db/Adapter/Pdo/Mssql.php | 6 +- lib/Zend/Db/Adapter/Pdo/Mysql.php | 19 +- lib/Zend/Db/Adapter/Pdo/Oci.php | 6 +- lib/Zend/Db/Adapter/Pdo/Pgsql.php | 6 +- lib/Zend/Db/Adapter/Pdo/Sqlite.php | 6 +- lib/Zend/Db/Adapter/Sqlsrv.php | 27 +- lib/Zend/Db/Adapter/Sqlsrv/Exception.php | 6 +- lib/Zend/Db/Exception.php | 6 +- lib/Zend/Db/Expr.php | 6 +- lib/Zend/Db/Profiler.php | 14 +- lib/Zend/Db/Profiler/Exception.php | 6 +- lib/Zend/Db/Profiler/Firebug.php | 6 +- lib/Zend/Db/Profiler/Query.php | 6 +- lib/Zend/Db/Select.php | 27 +- lib/Zend/Db/Select/Exception.php | 6 +- lib/Zend/Db/Statement.php | 47 +- lib/Zend/Db/Statement/Db2.php | 8 +- lib/Zend/Db/Statement/Db2/Exception.php | 6 +- lib/Zend/Db/Statement/Exception.php | 6 +- lib/Zend/Db/Statement/Interface.php | 6 +- lib/Zend/Db/Statement/Mysqli.php | 6 +- lib/Zend/Db/Statement/Mysqli/Exception.php | 6 +- lib/Zend/Db/Statement/Oracle.php | 10 +- lib/Zend/Db/Statement/Oracle/Exception.php | 6 +- lib/Zend/Db/Statement/Pdo.php | 6 +- lib/Zend/Db/Statement/Pdo/Ibm.php | 6 +- lib/Zend/Db/Statement/Pdo/Oci.php | 6 +- lib/Zend/Db/Statement/Sqlsrv.php | 18 +- lib/Zend/Db/Statement/Sqlsrv/Exception.php | 6 +- lib/Zend/Db/Table.php | 6 +- lib/Zend/Db/Table/Abstract.php | 162 +- lib/Zend/Db/Table/Definition.php | 6 +- lib/Zend/Db/Table/Exception.php | 6 +- lib/Zend/Db/Table/Row.php | 6 +- lib/Zend/Db/Table/Row/Abstract.php | 51 +- lib/Zend/Db/Table/Row/Exception.php | 6 +- lib/Zend/Db/Table/Rowset.php | 6 +- lib/Zend/Db/Table/Rowset/Abstract.php | 14 +- lib/Zend/Db/Table/Rowset/Exception.php | 6 +- lib/Zend/Db/Table/Select.php | 6 +- lib/Zend/Db/Table/Select/Exception.php | 6 +- lib/Zend/Debug.php | 13 +- lib/Zend/Dojo.php | 6 +- lib/Zend/Dojo/BuildLayer.php | 6 +- lib/Zend/Dojo/Data.php | 6 +- lib/Zend/Dojo/Exception.php | 6 +- lib/Zend/Dojo/Form.php | 6 +- .../Form/Decorator/AccordionContainer.php | 6 +- .../Dojo/Form/Decorator/AccordionPane.php | 6 +- .../Dojo/Form/Decorator/BorderContainer.php | 6 +- lib/Zend/Dojo/Form/Decorator/ContentPane.php | 6 +- .../Dojo/Form/Decorator/DijitContainer.php | 6 +- lib/Zend/Dojo/Form/Decorator/DijitElement.php | 6 +- lib/Zend/Dojo/Form/Decorator/DijitForm.php | 11 +- .../Dojo/Form/Decorator/SplitContainer.php | 6 +- .../Dojo/Form/Decorator/StackContainer.php | 6 +- lib/Zend/Dojo/Form/Decorator/TabContainer.php | 6 +- lib/Zend/Dojo/Form/DisplayGroup.php | 6 +- lib/Zend/Dojo/Form/Element/Button.php | 6 +- lib/Zend/Dojo/Form/Element/CheckBox.php | 6 +- lib/Zend/Dojo/Form/Element/ComboBox.php | 6 +- .../Dojo/Form/Element/CurrencyTextBox.php | 6 +- lib/Zend/Dojo/Form/Element/DateTextBox.php | 6 +- lib/Zend/Dojo/Form/Element/Dijit.php | 6 +- lib/Zend/Dojo/Form/Element/DijitMulti.php | 6 +- lib/Zend/Dojo/Form/Element/Editor.php | 110 +- .../Dojo/Form/Element/FilteringSelect.php | 6 +- .../Dojo/Form/Element/HorizontalSlider.php | 6 +- lib/Zend/Dojo/Form/Element/NumberSpinner.php | 14 +- lib/Zend/Dojo/Form/Element/NumberTextBox.php | 6 +- .../Dojo/Form/Element/PasswordTextBox.php | 6 +- lib/Zend/Dojo/Form/Element/RadioButton.php | 6 +- lib/Zend/Dojo/Form/Element/SimpleTextarea.php | 6 +- lib/Zend/Dojo/Form/Element/Slider.php | 6 +- lib/Zend/Dojo/Form/Element/SubmitButton.php | 6 +- lib/Zend/Dojo/Form/Element/TextBox.php | 6 +- lib/Zend/Dojo/Form/Element/Textarea.php | 6 +- lib/Zend/Dojo/Form/Element/TimeTextBox.php | 6 +- .../Dojo/Form/Element/ValidationTextBox.php | 8 +- lib/Zend/Dojo/Form/Element/VerticalSlider.php | 6 +- lib/Zend/Dojo/Form/SubForm.php | 6 +- lib/Zend/Dojo/View/Exception.php | 6 +- .../Dojo/View/Helper/AccordionContainer.php | 6 +- lib/Zend/Dojo/View/Helper/AccordionPane.php | 6 +- lib/Zend/Dojo/View/Helper/BorderContainer.php | 6 +- lib/Zend/Dojo/View/Helper/Button.php | 6 +- lib/Zend/Dojo/View/Helper/CheckBox.php | 6 +- lib/Zend/Dojo/View/Helper/ComboBox.php | 10 +- lib/Zend/Dojo/View/Helper/ContentPane.php | 6 +- lib/Zend/Dojo/View/Helper/CurrencyTextBox.php | 6 +- lib/Zend/Dojo/View/Helper/CustomDijit.php | 6 +- lib/Zend/Dojo/View/Helper/DateTextBox.php | 6 +- lib/Zend/Dojo/View/Helper/Dijit.php | 6 +- lib/Zend/Dojo/View/Helper/DijitContainer.php | 6 +- lib/Zend/Dojo/View/Helper/Dojo.php | 6 +- lib/Zend/Dojo/View/Helper/Dojo/Container.php | 20 +- lib/Zend/Dojo/View/Helper/Editor.php | 34 +- lib/Zend/Dojo/View/Helper/FilteringSelect.php | 6 +- lib/Zend/Dojo/View/Helper/Form.php | 10 +- .../Dojo/View/Helper/HorizontalSlider.php | 6 +- lib/Zend/Dojo/View/Helper/NumberSpinner.php | 6 +- lib/Zend/Dojo/View/Helper/NumberTextBox.php | 6 +- lib/Zend/Dojo/View/Helper/PasswordTextBox.php | 6 +- lib/Zend/Dojo/View/Helper/RadioButton.php | 6 +- lib/Zend/Dojo/View/Helper/SimpleTextarea.php | 9 +- lib/Zend/Dojo/View/Helper/Slider.php | 8 +- lib/Zend/Dojo/View/Helper/SplitContainer.php | 6 +- lib/Zend/Dojo/View/Helper/StackContainer.php | 6 +- lib/Zend/Dojo/View/Helper/SubmitButton.php | 6 +- lib/Zend/Dojo/View/Helper/TabContainer.php | 6 +- lib/Zend/Dojo/View/Helper/TextBox.php | 6 +- lib/Zend/Dojo/View/Helper/Textarea.php | 7 +- lib/Zend/Dojo/View/Helper/TimeTextBox.php | 6 +- .../Dojo/View/Helper/ValidationTextBox.php | 6 +- lib/Zend/Dojo/View/Helper/VerticalSlider.php | 6 +- lib/Zend/Dom/Exception.php | 6 +- lib/Zend/Dom/Query.php | 28 +- lib/Zend/Dom/Query/Css2Xpath.php | 26 +- lib/Zend/Dom/Query/Result.php | 6 +- lib/Zend/EventManager/Event.php | 225 - lib/Zend/EventManager/EventCollection.php | 109 - lib/Zend/EventManager/EventDescription.php | 108 - lib/Zend/EventManager/EventManager.php | 551 - lib/Zend/EventManager/EventManagerAware.php | 40 - lib/Zend/EventManager/Exception.php | 31 - .../Exception/InvalidArgumentException.php | 42 - lib/Zend/EventManager/Filter.php | 78 - .../EventManager/Filter/FilterIterator.php | 113 - lib/Zend/EventManager/FilterChain.php | 138 - lib/Zend/EventManager/GlobalEventManager.php | 149 - lib/Zend/EventManager/ListenerAggregate.php | 53 - lib/Zend/EventManager/ResponseCollection.php | 424 - .../EventManager/SharedEventCollection.php | 32 - .../SharedEventCollectionAware.php | 42 - lib/Zend/EventManager/SharedEventManager.php | 148 - lib/Zend/EventManager/StaticEventManager.php | 80 - lib/Zend/Exception.php | 16 +- lib/Zend/Feed.php | 11 +- lib/Zend/Feed/Abstract.php | 55 +- lib/Zend/Feed/Atom.php | 6 +- lib/Zend/Feed/Builder.php | 6 +- lib/Zend/Feed/Builder/Entry.php | 6 +- lib/Zend/Feed/Builder/Exception.php | 6 +- lib/Zend/Feed/Builder/Header.php | 6 +- lib/Zend/Feed/Builder/Header/Itunes.php | 6 +- lib/Zend/Feed/Builder/Interface.php | 6 +- lib/Zend/Feed/Element.php | 6 +- lib/Zend/Feed/Entry/Abstract.php | 6 +- lib/Zend/Feed/Entry/Atom.php | 6 +- lib/Zend/Feed/Entry/Rss.php | 6 +- lib/Zend/Feed/Exception.php | 6 +- lib/Zend/Feed/Pubsubhubbub.php | 8 +- .../Feed/Pubsubhubbub/CallbackAbstract.php | 12 +- .../Feed/Pubsubhubbub/CallbackInterface.php | 6 +- lib/Zend/Feed/Pubsubhubbub/Exception.php | 6 +- lib/Zend/Feed/Pubsubhubbub/HttpResponse.php | 6 +- .../Feed/Pubsubhubbub/Model/ModelAbstract.php | 16 +- .../Feed/Pubsubhubbub/Model/Subscription.php | 6 +- .../Model/SubscriptionInterface.php | 22 +- lib/Zend/Feed/Pubsubhubbub/Publisher.php | 6 +- lib/Zend/Feed/Pubsubhubbub/Subscriber.php | 36 +- .../Feed/Pubsubhubbub/Subscriber/Callback.php | 16 +- lib/Zend/Feed/Reader.php | 53 +- lib/Zend/Feed/Reader/Collection.php | 8 +- lib/Zend/Feed/Reader/Collection/Author.php | 8 +- lib/Zend/Feed/Reader/Collection/Category.php | 8 +- .../Reader/Collection/CollectionAbstract.php | 6 +- lib/Zend/Feed/Reader/Entry/Atom.php | 16 +- lib/Zend/Feed/Reader/Entry/Rss.php | 16 +- lib/Zend/Feed/Reader/EntryAbstract.php | 22 +- lib/Zend/Feed/Reader/EntryInterface.php | 8 +- lib/Zend/Feed/Reader/Extension/Atom/Entry.php | 26 +- lib/Zend/Feed/Reader/Extension/Atom/Feed.php | 14 +- .../Feed/Reader/Extension/Content/Entry.php | 6 +- .../Extension/CreativeCommons/Entry.php | 6 +- .../Reader/Extension/CreativeCommons/Feed.php | 6 +- .../Reader/Extension/DublinCore/Entry.php | 18 +- .../Feed/Reader/Extension/DublinCore/Feed.php | 18 +- .../Feed/Reader/Extension/EntryAbstract.php | 6 +- .../Feed/Reader/Extension/FeedAbstract.php | 6 +- .../Feed/Reader/Extension/Podcast/Entry.php | 6 +- .../Feed/Reader/Extension/Podcast/Feed.php | 6 +- .../Feed/Reader/Extension/Slash/Entry.php | 6 +- .../Reader/Extension/Syndication/Feed.php | 6 +- .../Feed/Reader/Extension/Thread/Entry.php | 6 +- .../Reader/Extension/WellFormedWeb/Entry.php | 6 +- lib/Zend/Feed/Reader/Feed/Atom.php | 10 +- lib/Zend/Feed/Reader/Feed/Atom/Source.php | 18 +- lib/Zend/Feed/Reader/Feed/Rss.php | 14 +- lib/Zend/Feed/Reader/FeedAbstract.php | 6 +- lib/Zend/Feed/Reader/FeedInterface.php | 8 +- lib/Zend/Feed/Reader/FeedSet.php | 10 +- lib/Zend/Feed/Rss.php | 6 +- lib/Zend/Feed/Writer.php | 28 +- lib/Zend/Feed/Writer/Deleted.php | 46 +- lib/Zend/Feed/Writer/Entry.php | 64 +- .../Exception/InvalidMethodException.php | 6 +- .../Writer/Extension/Atom/Renderer/Feed.php | 34 +- .../Extension/Content/Renderer/Entry.php | 26 +- .../Extension/DublinCore/Renderer/Entry.php | 28 +- .../Extension/DublinCore/Renderer/Feed.php | 28 +- .../Feed/Writer/Extension/ITunes/Entry.php | 76 +- .../Feed/Writer/Extension/ITunes/Feed.php | 108 +- .../Extension/ITunes/Renderer/Entry.php | 74 +- .../Writer/Extension/ITunes/Renderer/Feed.php | 110 +- .../Writer/Extension/RendererAbstract.php | 78 +- .../Writer/Extension/RendererInterface.php | 24 +- .../Writer/Extension/Slash/Renderer/Entry.php | 26 +- .../Extension/Threading/Renderer/Entry.php | 42 +- .../WellFormedWeb/Renderer/Entry.php | 28 +- lib/Zend/Feed/Writer/Feed.php | 15 +- lib/Zend/Feed/Writer/Feed/FeedAbstract.php | 62 +- lib/Zend/Feed/Writer/Renderer/Entry/Atom.php | 112 +- .../Writer/Renderer/Entry/Atom/Deleted.php | 38 +- lib/Zend/Feed/Writer/Renderer/Entry/Rss.php | 96 +- lib/Zend/Feed/Writer/Renderer/Feed/Atom.php | 16 +- .../Renderer/Feed/Atom/AtomAbstract.php | 128 +- .../Feed/Writer/Renderer/Feed/Atom/Source.php | 28 +- lib/Zend/Feed/Writer/Renderer/Feed/Rss.php | 106 +- .../Feed/Writer/Renderer/RendererAbstract.php | 58 +- .../Writer/Renderer/RendererInterface.php | 30 +- lib/Zend/Feed/Writer/Source.php | 8 +- lib/Zend/File/ClassFileLocator.php | 173 - lib/Zend/File/Transfer.php | 6 +- lib/Zend/File/Transfer/Adapter/Abstract.php | 6 +- lib/Zend/File/Transfer/Adapter/Http.php | 10 +- lib/Zend/File/Transfer/Exception.php | 6 +- lib/Zend/Filter.php | 6 +- lib/Zend/Filter/Alnum.php | 6 +- lib/Zend/Filter/Alpha.php | 6 +- lib/Zend/Filter/BaseName.php | 6 +- lib/Zend/Filter/Boolean.php | 6 +- lib/Zend/Filter/Callback.php | 10 +- lib/Zend/Filter/Compress.php | 6 +- lib/Zend/Filter/Compress/Bz2.php | 6 +- lib/Zend/Filter/Compress/CompressAbstract.php | 6 +- .../Filter/Compress/CompressInterface.php | 6 +- lib/Zend/Filter/Compress/Gz.php | 6 +- lib/Zend/Filter/Compress/Lzf.php | 6 +- lib/Zend/Filter/Compress/Rar.php | 6 +- lib/Zend/Filter/Compress/Tar.php | 6 +- lib/Zend/Filter/Compress/Zip.php | 12 +- lib/Zend/Filter/Decompress.php | 6 +- lib/Zend/Filter/Decrypt.php | 6 +- lib/Zend/Filter/Digits.php | 6 +- lib/Zend/Filter/Dir.php | 6 +- lib/Zend/Filter/Encrypt.php | 6 +- lib/Zend/Filter/Encrypt/Interface.php | 6 +- lib/Zend/Filter/Encrypt/Mcrypt.php | 6 +- lib/Zend/Filter/Encrypt/Openssl.php | 6 +- lib/Zend/Filter/Exception.php | 6 +- lib/Zend/Filter/File/Decrypt.php | 6 +- lib/Zend/Filter/File/Encrypt.php | 6 +- lib/Zend/Filter/File/LowerCase.php | 6 +- lib/Zend/Filter/File/Rename.php | 6 +- lib/Zend/Filter/File/UpperCase.php | 6 +- lib/Zend/Filter/HtmlEntities.php | 22 +- lib/Zend/Filter/Inflector.php | 6 +- lib/Zend/Filter/Input.php | 105 +- lib/Zend/Filter/Int.php | 6 +- lib/Zend/Filter/Interface.php | 6 +- lib/Zend/Filter/LocalizedToNormalized.php | 6 +- lib/Zend/Filter/NormalizedToLocalized.php | 6 +- lib/Zend/Filter/Null.php | 6 +- lib/Zend/Filter/PregReplace.php | 6 +- lib/Zend/Filter/RealPath.php | 6 +- lib/Zend/Filter/StringToLower.php | 6 +- lib/Zend/Filter/StringToUpper.php | 6 +- lib/Zend/Filter/StringTrim.php | 6 +- lib/Zend/Filter/StripNewlines.php | 6 +- lib/Zend/Filter/StripTags.php | 8 +- lib/Zend/Filter/Word/CamelCaseToDash.php | 6 +- lib/Zend/Filter/Word/CamelCaseToSeparator.php | 6 +- .../Filter/Word/CamelCaseToUnderscore.php | 6 +- lib/Zend/Filter/Word/DashToCamelCase.php | 6 +- lib/Zend/Filter/Word/DashToSeparator.php | 6 +- lib/Zend/Filter/Word/DashToUnderscore.php | 6 +- lib/Zend/Filter/Word/Separator/Abstract.php | 6 +- lib/Zend/Filter/Word/SeparatorToCamelCase.php | 6 +- lib/Zend/Filter/Word/SeparatorToDash.php | 6 +- lib/Zend/Filter/Word/SeparatorToSeparator.php | 6 +- .../Filter/Word/UnderscoreToCamelCase.php | 6 +- lib/Zend/Filter/Word/UnderscoreToDash.php | 6 +- .../Filter/Word/UnderscoreToSeparator.php | 6 +- lib/Zend/Form.php | 125 +- lib/Zend/Form/Decorator/Abstract.php | 6 +- lib/Zend/Form/Decorator/Callback.php | 6 +- lib/Zend/Form/Decorator/Captcha.php | 6 +- lib/Zend/Form/Decorator/Captcha/ReCaptcha.php | 128 - lib/Zend/Form/Decorator/Captcha/Word.php | 6 +- lib/Zend/Form/Decorator/Description.php | 6 +- lib/Zend/Form/Decorator/DtDdWrapper.php | 10 +- lib/Zend/Form/Decorator/Errors.php | 16 +- lib/Zend/Form/Decorator/Exception.php | 6 +- lib/Zend/Form/Decorator/Fieldset.php | 9 +- lib/Zend/Form/Decorator/File.php | 11 +- lib/Zend/Form/Decorator/Form.php | 6 +- lib/Zend/Form/Decorator/FormElements.php | 25 +- lib/Zend/Form/Decorator/FormErrors.php | 74 +- lib/Zend/Form/Decorator/HtmlTag.php | 13 +- lib/Zend/Form/Decorator/Image.php | 6 +- lib/Zend/Form/Decorator/Interface.php | 6 +- lib/Zend/Form/Decorator/Label.php | 158 +- .../Form/Decorator/Marker/File/Interface.php | 6 +- lib/Zend/Form/Decorator/PrepareElements.php | 6 +- lib/Zend/Form/Decorator/Tooltip.php | 4 +- lib/Zend/Form/Decorator/ViewHelper.php | 22 +- lib/Zend/Form/Decorator/ViewScript.php | 10 +- lib/Zend/Form/DisplayGroup.php | 28 +- lib/Zend/Form/Element.php | 55 +- lib/Zend/Form/Element/Button.php | 20 +- lib/Zend/Form/Element/Captcha.php | 64 +- lib/Zend/Form/Element/Checkbox.php | 6 +- lib/Zend/Form/Element/Exception.php | 6 +- lib/Zend/Form/Element/File.php | 13 +- lib/Zend/Form/Element/Hash.php | 6 +- lib/Zend/Form/Element/Hidden.php | 6 +- lib/Zend/Form/Element/Image.php | 8 +- lib/Zend/Form/Element/Multi.php | 6 +- lib/Zend/Form/Element/MultiCheckbox.php | 27 +- lib/Zend/Form/Element/Multiselect.php | 6 +- lib/Zend/Form/Element/Note.php | 64 - lib/Zend/Form/Element/Password.php | 6 +- lib/Zend/Form/Element/Radio.php | 18 +- lib/Zend/Form/Element/Reset.php | 6 +- lib/Zend/Form/Element/Select.php | 12 +- lib/Zend/Form/Element/Submit.php | 16 +- lib/Zend/Form/Element/Text.php | 6 +- lib/Zend/Form/Element/Textarea.php | 6 +- lib/Zend/Form/Element/Xhtml.php | 6 +- lib/Zend/Form/Exception.php | 6 +- lib/Zend/Form/SubForm.php | 6 +- lib/Zend/Gdata.php | 6 +- lib/Zend/Gdata/Analytics.php | 137 - lib/Zend/Gdata/Analytics/AccountEntry.php | 102 - lib/Zend/Gdata/Analytics/AccountFeed.php | 57 - lib/Zend/Gdata/Analytics/AccountQuery.php | 190 - lib/Zend/Gdata/Analytics/DataEntry.php | 116 - lib/Zend/Gdata/Analytics/DataFeed.php | 64 - lib/Zend/Gdata/Analytics/DataQuery.php | 403 - .../Gdata/Analytics/Extension/Dimension.php | 40 - lib/Zend/Gdata/Analytics/Extension/Goal.php | 52 - lib/Zend/Gdata/Analytics/Extension/Metric.php | 54 - .../Gdata/Analytics/Extension/Property.php | 122 - .../Gdata/Analytics/Extension/TableId.php | 112 - lib/Zend/Gdata/App.php | 30 +- lib/Zend/Gdata/App/AuthException.php | 6 +- lib/Zend/Gdata/App/BadMethodCallException.php | 6 +- lib/Zend/Gdata/App/Base.php | 6 +- lib/Zend/Gdata/App/BaseMediaSource.php | 6 +- .../Gdata/App/CaptchaRequiredException.php | 6 +- lib/Zend/Gdata/App/Entry.php | 6 +- lib/Zend/Gdata/App/Exception.php | 6 +- lib/Zend/Gdata/App/Extension.php | 6 +- lib/Zend/Gdata/App/Extension/Author.php | 6 +- lib/Zend/Gdata/App/Extension/Category.php | 6 +- lib/Zend/Gdata/App/Extension/Content.php | 6 +- lib/Zend/Gdata/App/Extension/Contributor.php | 6 +- lib/Zend/Gdata/App/Extension/Control.php | 6 +- lib/Zend/Gdata/App/Extension/Draft.php | 6 +- lib/Zend/Gdata/App/Extension/Edited.php | 6 +- lib/Zend/Gdata/App/Extension/Element.php | 6 +- lib/Zend/Gdata/App/Extension/Email.php | 6 +- lib/Zend/Gdata/App/Extension/Generator.php | 6 +- lib/Zend/Gdata/App/Extension/Icon.php | 6 +- lib/Zend/Gdata/App/Extension/Id.php | 6 +- lib/Zend/Gdata/App/Extension/Link.php | 6 +- lib/Zend/Gdata/App/Extension/Logo.php | 6 +- lib/Zend/Gdata/App/Extension/Name.php | 6 +- lib/Zend/Gdata/App/Extension/Person.php | 6 +- lib/Zend/Gdata/App/Extension/Published.php | 6 +- lib/Zend/Gdata/App/Extension/Rights.php | 6 +- lib/Zend/Gdata/App/Extension/Source.php | 6 +- lib/Zend/Gdata/App/Extension/Subtitle.php | 6 +- lib/Zend/Gdata/App/Extension/Summary.php | 6 +- lib/Zend/Gdata/App/Extension/Text.php | 6 +- lib/Zend/Gdata/App/Extension/Title.php | 6 +- lib/Zend/Gdata/App/Extension/Updated.php | 6 +- lib/Zend/Gdata/App/Extension/Uri.php | 6 +- lib/Zend/Gdata/App/Feed.php | 6 +- lib/Zend/Gdata/App/FeedEntryParent.php | 6 +- lib/Zend/Gdata/App/FeedSourceParent.php | 6 +- lib/Zend/Gdata/App/HttpException.php | 6 +- lib/Zend/Gdata/App/IOException.php | 6 +- .../Gdata/App/InvalidArgumentException.php | 6 +- .../App/LoggingHttpClientAdapterSocket.php | 6 +- lib/Zend/Gdata/App/MediaEntry.php | 6 +- lib/Zend/Gdata/App/MediaFileSource.php | 6 +- lib/Zend/Gdata/App/MediaSource.php | 6 +- lib/Zend/Gdata/App/Util.php | 8 +- lib/Zend/Gdata/App/VersionException.php | 6 +- lib/Zend/Gdata/AuthSub.php | 12 +- lib/Zend/Gdata/Books.php | 12 +- lib/Zend/Gdata/Books/CollectionEntry.php | 6 +- lib/Zend/Gdata/Books/CollectionFeed.php | 6 +- .../Gdata/Books/Extension/AnnotationLink.php | 6 +- .../Gdata/Books/Extension/BooksCategory.php | 6 +- lib/Zend/Gdata/Books/Extension/BooksLink.php | 6 +- .../Gdata/Books/Extension/Embeddability.php | 6 +- lib/Zend/Gdata/Books/Extension/InfoLink.php | 4 +- .../Gdata/Books/Extension/PreviewLink.php | 6 +- lib/Zend/Gdata/Books/Extension/Review.php | 6 +- .../Gdata/Books/Extension/ThumbnailLink.php | 6 +- .../Gdata/Books/Extension/Viewability.php | 6 +- lib/Zend/Gdata/Books/VolumeEntry.php | 6 +- lib/Zend/Gdata/Books/VolumeFeed.php | 6 +- lib/Zend/Gdata/Books/VolumeQuery.php | 6 +- lib/Zend/Gdata/Calendar.php | 10 +- lib/Zend/Gdata/Calendar/EventEntry.php | 6 +- lib/Zend/Gdata/Calendar/EventFeed.php | 6 +- lib/Zend/Gdata/Calendar/EventQuery.php | 12 +- .../Gdata/Calendar/Extension/AccessLevel.php | 6 +- lib/Zend/Gdata/Calendar/Extension/Color.php | 6 +- lib/Zend/Gdata/Calendar/Extension/Hidden.php | 6 +- lib/Zend/Gdata/Calendar/Extension/Link.php | 6 +- .../Gdata/Calendar/Extension/QuickAdd.php | 6 +- .../Gdata/Calendar/Extension/Selected.php | 6 +- .../Extension/SendEventNotifications.php | 6 +- .../Gdata/Calendar/Extension/Timezone.php | 6 +- .../Gdata/Calendar/Extension/WebContent.php | 6 +- lib/Zend/Gdata/Calendar/ListEntry.php | 6 +- lib/Zend/Gdata/Calendar/ListFeed.php | 6 +- lib/Zend/Gdata/ClientLogin.php | 6 +- lib/Zend/Gdata/Docs.php | 16 +- lib/Zend/Gdata/Docs/DocumentListEntry.php | 6 +- lib/Zend/Gdata/Docs/DocumentListFeed.php | 6 +- lib/Zend/Gdata/Docs/Query.php | 8 +- lib/Zend/Gdata/DublinCore.php | 6 +- .../Gdata/DublinCore/Extension/Creator.php | 6 +- lib/Zend/Gdata/DublinCore/Extension/Date.php | 6 +- .../DublinCore/Extension/Description.php | 6 +- .../Gdata/DublinCore/Extension/Format.php | 6 +- .../Gdata/DublinCore/Extension/Identifier.php | 6 +- .../Gdata/DublinCore/Extension/Language.php | 6 +- .../Gdata/DublinCore/Extension/Publisher.php | 6 +- .../Gdata/DublinCore/Extension/Rights.php | 6 +- .../Gdata/DublinCore/Extension/Subject.php | 6 +- lib/Zend/Gdata/DublinCore/Extension/Title.php | 6 +- lib/Zend/Gdata/Entry.php | 6 +- lib/Zend/Gdata/Exif.php | 6 +- lib/Zend/Gdata/Exif/Entry.php | 6 +- lib/Zend/Gdata/Exif/Extension/Distance.php | 6 +- lib/Zend/Gdata/Exif/Extension/Exposure.php | 6 +- lib/Zend/Gdata/Exif/Extension/FStop.php | 6 +- lib/Zend/Gdata/Exif/Extension/Flash.php | 6 +- lib/Zend/Gdata/Exif/Extension/FocalLength.php | 6 +- .../Gdata/Exif/Extension/ImageUniqueId.php | 6 +- lib/Zend/Gdata/Exif/Extension/Iso.php | 6 +- lib/Zend/Gdata/Exif/Extension/Make.php | 6 +- lib/Zend/Gdata/Exif/Extension/Model.php | 6 +- lib/Zend/Gdata/Exif/Extension/Tags.php | 6 +- lib/Zend/Gdata/Exif/Extension/Time.php | 6 +- lib/Zend/Gdata/Exif/Feed.php | 6 +- lib/Zend/Gdata/Extension.php | 6 +- lib/Zend/Gdata/Extension/AttendeeStatus.php | 6 +- lib/Zend/Gdata/Extension/AttendeeType.php | 6 +- lib/Zend/Gdata/Extension/Comments.php | 6 +- lib/Zend/Gdata/Extension/EntryLink.php | 6 +- lib/Zend/Gdata/Extension/EventStatus.php | 6 +- lib/Zend/Gdata/Extension/ExtendedProperty.php | 6 +- lib/Zend/Gdata/Extension/FeedLink.php | 6 +- .../Extension/OpenSearchItemsPerPage.php | 6 +- .../Gdata/Extension/OpenSearchStartIndex.php | 6 +- .../Extension/OpenSearchTotalResults.php | 6 +- lib/Zend/Gdata/Extension/OriginalEvent.php | 6 +- lib/Zend/Gdata/Extension/Rating.php | 6 +- lib/Zend/Gdata/Extension/Recurrence.php | 6 +- .../Gdata/Extension/RecurrenceException.php | 6 +- lib/Zend/Gdata/Extension/Reminder.php | 6 +- lib/Zend/Gdata/Extension/Transparency.php | 6 +- lib/Zend/Gdata/Extension/Visibility.php | 6 +- lib/Zend/Gdata/Extension/When.php | 6 +- lib/Zend/Gdata/Extension/Where.php | 6 +- lib/Zend/Gdata/Extension/Who.php | 6 +- lib/Zend/Gdata/Feed.php | 6 +- lib/Zend/Gdata/Gapps.php | 32 +- lib/Zend/Gdata/Gapps/EmailListEntry.php | 6 +- lib/Zend/Gdata/Gapps/EmailListFeed.php | 6 +- lib/Zend/Gdata/Gapps/EmailListQuery.php | 6 +- .../Gdata/Gapps/EmailListRecipientEntry.php | 6 +- .../Gdata/Gapps/EmailListRecipientFeed.php | 6 +- .../Gdata/Gapps/EmailListRecipientQuery.php | 6 +- lib/Zend/Gdata/Gapps/Error.php | 6 +- lib/Zend/Gdata/Gapps/Extension/EmailList.php | 6 +- lib/Zend/Gdata/Gapps/Extension/Login.php | 6 +- lib/Zend/Gdata/Gapps/Extension/Name.php | 6 +- lib/Zend/Gdata/Gapps/Extension/Nickname.php | 6 +- lib/Zend/Gdata/Gapps/Extension/Property.php | 5 +- lib/Zend/Gdata/Gapps/Extension/Quota.php | 6 +- lib/Zend/Gdata/Gapps/GroupEntry.php | 4 +- lib/Zend/Gdata/Gapps/GroupFeed.php | 4 +- lib/Zend/Gdata/Gapps/GroupQuery.php | 12 +- lib/Zend/Gdata/Gapps/MemberEntry.php | 4 +- lib/Zend/Gdata/Gapps/MemberFeed.php | 4 +- lib/Zend/Gdata/Gapps/MemberQuery.php | 4 +- lib/Zend/Gdata/Gapps/NicknameEntry.php | 6 +- lib/Zend/Gdata/Gapps/NicknameFeed.php | 6 +- lib/Zend/Gdata/Gapps/NicknameQuery.php | 6 +- lib/Zend/Gdata/Gapps/OwnerEntry.php | 4 +- lib/Zend/Gdata/Gapps/OwnerFeed.php | 4 +- lib/Zend/Gdata/Gapps/OwnerQuery.php | 10 +- lib/Zend/Gdata/Gapps/Query.php | 6 +- lib/Zend/Gdata/Gapps/ServiceException.php | 6 +- lib/Zend/Gdata/Gapps/UserEntry.php | 6 +- lib/Zend/Gdata/Gapps/UserFeed.php | 6 +- lib/Zend/Gdata/Gapps/UserQuery.php | 6 +- lib/Zend/Gdata/Gbase.php | 159 +- lib/Zend/Gdata/Gbase/Entry.php | 116 +- .../Gdata/Gbase/Extension/BaseAttribute.php | 77 +- lib/Zend/Gdata/Gbase/Feed.php | 25 +- lib/Zend/Gdata/Gbase/ItemEntry.php | 125 +- lib/Zend/Gdata/Gbase/ItemFeed.php | 12 +- lib/Zend/Gdata/Gbase/ItemQuery.php | 63 +- lib/Zend/Gdata/Gbase/Query.php | 235 +- lib/Zend/Gdata/Gbase/SnippetEntry.php | 12 +- lib/Zend/Gdata/Gbase/SnippetFeed.php | 21 +- lib/Zend/Gdata/Gbase/SnippetQuery.php | 40 +- lib/Zend/Gdata/Geo.php | 6 +- lib/Zend/Gdata/Geo/Entry.php | 6 +- lib/Zend/Gdata/Geo/Extension/GeoRssWhere.php | 6 +- lib/Zend/Gdata/Geo/Extension/GmlPoint.php | 6 +- lib/Zend/Gdata/Geo/Extension/GmlPos.php | 6 +- lib/Zend/Gdata/Geo/Feed.php | 6 +- lib/Zend/Gdata/Health.php | 209 +- lib/Zend/Gdata/Health/Extension/Ccr.php | 92 +- lib/Zend/Gdata/Health/ProfileEntry.php | 100 +- lib/Zend/Gdata/Health/ProfileFeed.php | 32 +- lib/Zend/Gdata/Health/ProfileListEntry.php | 67 +- lib/Zend/Gdata/Health/ProfileListFeed.php | 26 +- lib/Zend/Gdata/Health/Query.php | 242 +- lib/Zend/Gdata/HttpAdapterStreamingProxy.php | 6 +- lib/Zend/Gdata/HttpAdapterStreamingSocket.php | 6 +- lib/Zend/Gdata/HttpClient.php | 6 +- lib/Zend/Gdata/Kind/EventEntry.php | 6 +- lib/Zend/Gdata/Media.php | 6 +- lib/Zend/Gdata/Media/Entry.php | 6 +- .../Gdata/Media/Extension/MediaCategory.php | 6 +- .../Gdata/Media/Extension/MediaContent.php | 6 +- .../Gdata/Media/Extension/MediaCopyright.php | 6 +- .../Gdata/Media/Extension/MediaCredit.php | 6 +- .../Media/Extension/MediaDescription.php | 6 +- lib/Zend/Gdata/Media/Extension/MediaGroup.php | 6 +- lib/Zend/Gdata/Media/Extension/MediaHash.php | 6 +- .../Gdata/Media/Extension/MediaKeywords.php | 6 +- .../Gdata/Media/Extension/MediaPlayer.php | 6 +- .../Gdata/Media/Extension/MediaRating.php | 6 +- .../Media/Extension/MediaRestriction.php | 6 +- lib/Zend/Gdata/Media/Extension/MediaText.php | 16 +- .../Gdata/Media/Extension/MediaThumbnail.php | 6 +- lib/Zend/Gdata/Media/Extension/MediaTitle.php | 6 +- lib/Zend/Gdata/Media/Feed.php | 6 +- lib/Zend/Gdata/MediaMimeStream.php | 6 +- lib/Zend/Gdata/MimeBodyString.php | 6 +- lib/Zend/Gdata/MimeFile.php | 6 +- lib/Zend/Gdata/Photos.php | 10 +- lib/Zend/Gdata/Photos/AlbumEntry.php | 6 +- lib/Zend/Gdata/Photos/AlbumFeed.php | 6 +- lib/Zend/Gdata/Photos/AlbumQuery.php | 6 +- lib/Zend/Gdata/Photos/CommentEntry.php | 6 +- lib/Zend/Gdata/Photos/Extension/Access.php | 6 +- lib/Zend/Gdata/Photos/Extension/AlbumId.php | 6 +- lib/Zend/Gdata/Photos/Extension/BytesUsed.php | 6 +- lib/Zend/Gdata/Photos/Extension/Checksum.php | 6 +- lib/Zend/Gdata/Photos/Extension/Client.php | 6 +- .../Gdata/Photos/Extension/CommentCount.php | 6 +- .../Photos/Extension/CommentingEnabled.php | 6 +- lib/Zend/Gdata/Photos/Extension/Height.php | 6 +- lib/Zend/Gdata/Photos/Extension/Id.php | 6 +- lib/Zend/Gdata/Photos/Extension/Location.php | 6 +- .../Photos/Extension/MaxPhotosPerAlbum.php | 6 +- lib/Zend/Gdata/Photos/Extension/Name.php | 6 +- lib/Zend/Gdata/Photos/Extension/Nickname.php | 6 +- lib/Zend/Gdata/Photos/Extension/NumPhotos.php | 6 +- .../Photos/Extension/NumPhotosRemaining.php | 6 +- lib/Zend/Gdata/Photos/Extension/PhotoId.php | 6 +- lib/Zend/Gdata/Photos/Extension/Position.php | 6 +- .../Gdata/Photos/Extension/QuotaCurrent.php | 6 +- .../Gdata/Photos/Extension/QuotaLimit.php | 6 +- lib/Zend/Gdata/Photos/Extension/Rotation.php | 6 +- lib/Zend/Gdata/Photos/Extension/Size.php | 6 +- lib/Zend/Gdata/Photos/Extension/Thumbnail.php | 6 +- lib/Zend/Gdata/Photos/Extension/Timestamp.php | 6 +- lib/Zend/Gdata/Photos/Extension/User.php | 6 +- lib/Zend/Gdata/Photos/Extension/Version.php | 6 +- lib/Zend/Gdata/Photos/Extension/Weight.php | 6 +- lib/Zend/Gdata/Photos/Extension/Width.php | 6 +- lib/Zend/Gdata/Photos/PhotoEntry.php | 6 +- lib/Zend/Gdata/Photos/PhotoFeed.php | 6 +- lib/Zend/Gdata/Photos/PhotoQuery.php | 6 +- lib/Zend/Gdata/Photos/TagEntry.php | 6 +- lib/Zend/Gdata/Photos/UserEntry.php | 6 +- lib/Zend/Gdata/Photos/UserFeed.php | 6 +- lib/Zend/Gdata/Photos/UserQuery.php | 6 +- lib/Zend/Gdata/Query.php | 6 +- lib/Zend/Gdata/Spreadsheets.php | 10 +- lib/Zend/Gdata/Spreadsheets/CellEntry.php | 9 +- lib/Zend/Gdata/Spreadsheets/CellFeed.php | 6 +- lib/Zend/Gdata/Spreadsheets/CellQuery.php | 8 +- lib/Zend/Gdata/Spreadsheets/DocumentQuery.php | 8 +- .../Gdata/Spreadsheets/Extension/Cell.php | 6 +- .../Gdata/Spreadsheets/Extension/ColCount.php | 6 +- .../Gdata/Spreadsheets/Extension/Custom.php | 6 +- .../Gdata/Spreadsheets/Extension/RowCount.php | 6 +- lib/Zend/Gdata/Spreadsheets/ListEntry.php | 6 +- lib/Zend/Gdata/Spreadsheets/ListFeed.php | 6 +- lib/Zend/Gdata/Spreadsheets/ListQuery.php | 8 +- .../Gdata/Spreadsheets/SpreadsheetEntry.php | 6 +- .../Gdata/Spreadsheets/SpreadsheetFeed.php | 6 +- .../Gdata/Spreadsheets/WorksheetEntry.php | 6 +- lib/Zend/Gdata/Spreadsheets/WorksheetFeed.php | 6 +- lib/Zend/Gdata/YouTube.php | 80 +- lib/Zend/Gdata/YouTube/ActivityEntry.php | 6 +- lib/Zend/Gdata/YouTube/ActivityFeed.php | 6 +- lib/Zend/Gdata/YouTube/CommentEntry.php | 6 +- lib/Zend/Gdata/YouTube/CommentFeed.php | 6 +- lib/Zend/Gdata/YouTube/ContactEntry.php | 6 +- lib/Zend/Gdata/YouTube/ContactFeed.php | 6 +- lib/Zend/Gdata/YouTube/Extension/AboutMe.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Age.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Books.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Company.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Control.php | 6 +- .../Gdata/YouTube/Extension/CountHint.php | 6 +- .../Gdata/YouTube/Extension/Description.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Duration.php | 6 +- .../Gdata/YouTube/Extension/FirstName.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Gender.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Hobbies.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Hometown.php | 6 +- lib/Zend/Gdata/YouTube/Extension/LastName.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Link.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Location.php | 6 +- .../Gdata/YouTube/Extension/MediaContent.php | 6 +- .../Gdata/YouTube/Extension/MediaCredit.php | 6 +- .../Gdata/YouTube/Extension/MediaGroup.php | 6 +- .../Gdata/YouTube/Extension/MediaRating.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Movies.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Music.php | 6 +- lib/Zend/Gdata/YouTube/Extension/NoEmbed.php | 6 +- .../Gdata/YouTube/Extension/Occupation.php | 6 +- .../Gdata/YouTube/Extension/PlaylistId.php | 6 +- .../Gdata/YouTube/Extension/PlaylistTitle.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Position.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Private.php | 6 +- .../Gdata/YouTube/Extension/QueryString.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Racy.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Recorded.php | 6 +- .../Gdata/YouTube/Extension/Relationship.php | 6 +- .../Gdata/YouTube/Extension/ReleaseDate.php | 6 +- lib/Zend/Gdata/YouTube/Extension/School.php | 6 +- lib/Zend/Gdata/YouTube/Extension/State.php | 6 +- .../Gdata/YouTube/Extension/Statistics.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Status.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Token.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Uploaded.php | 6 +- lib/Zend/Gdata/YouTube/Extension/Username.php | 6 +- lib/Zend/Gdata/YouTube/Extension/VideoId.php | 6 +- lib/Zend/Gdata/YouTube/InboxEntry.php | 6 +- lib/Zend/Gdata/YouTube/InboxFeed.php | 6 +- lib/Zend/Gdata/YouTube/MediaEntry.php | 6 +- lib/Zend/Gdata/YouTube/PlaylistListEntry.php | 6 +- lib/Zend/Gdata/YouTube/PlaylistListFeed.php | 6 +- lib/Zend/Gdata/YouTube/PlaylistVideoEntry.php | 6 +- lib/Zend/Gdata/YouTube/PlaylistVideoFeed.php | 6 +- lib/Zend/Gdata/YouTube/SubscriptionEntry.php | 6 +- lib/Zend/Gdata/YouTube/SubscriptionFeed.php | 6 +- lib/Zend/Gdata/YouTube/UserProfileEntry.php | 6 +- lib/Zend/Gdata/YouTube/VideoEntry.php | 6 +- lib/Zend/Gdata/YouTube/VideoFeed.php | 6 +- lib/Zend/Gdata/YouTube/VideoQuery.php | 10 +- lib/Zend/Http/Client.php | 145 +- lib/Zend/Http/Client/Adapter/Curl.php | 11 +- lib/Zend/Http/Client/Adapter/Exception.php | 6 +- lib/Zend/Http/Client/Adapter/Interface.php | 6 +- lib/Zend/Http/Client/Adapter/Proxy.php | 151 +- lib/Zend/Http/Client/Adapter/Socket.php | 63 +- lib/Zend/Http/Client/Adapter/Stream.php | 14 +- lib/Zend/Http/Client/Adapter/Test.php | 16 +- lib/Zend/Http/Client/Exception.php | 6 +- lib/Zend/Http/Cookie.php | 6 +- lib/Zend/Http/CookieJar.php | 33 +- lib/Zend/Http/Exception.php | 6 +- .../Exception/InvalidArgumentException.php | 36 - .../Header/Exception/RuntimeException.php | 36 - lib/Zend/Http/Header/SetCookie.php | 546 - lib/Zend/Http/Response.php | 10 +- lib/Zend/Http/Response/Stream.php | 8 +- lib/Zend/Http/UserAgent.php | 100 +- lib/Zend/Http/UserAgent/AbstractDevice.php | 235 +- lib/Zend/Http/UserAgent/Bot.php | 119 +- lib/Zend/Http/UserAgent/Checker.php | 22 +- lib/Zend/Http/UserAgent/Console.php | 8 +- lib/Zend/Http/UserAgent/Desktop.php | 4 +- lib/Zend/Http/UserAgent/Device.php | 64 +- lib/Zend/Http/UserAgent/Email.php | 4 +- lib/Zend/Http/UserAgent/Exception.php | 4 +- lib/Zend/Http/UserAgent/Features/Adapter.php | 6 +- .../UserAgent/Features/Adapter/Browscap.php | 90 - .../Features/Adapter/DeviceAtlas.php | 18 +- .../UserAgent/Features/Adapter/TeraWurfl.php | 22 +- .../UserAgent/Features/Adapter/WurflApi.php | 103 + .../Http/UserAgent/Features/Exception.php | 4 +- lib/Zend/Http/UserAgent/Feed.php | 10 +- lib/Zend/Http/UserAgent/Mobile.php | 438 +- lib/Zend/Http/UserAgent/Offline.php | 14 +- lib/Zend/Http/UserAgent/Probe.php | 10 +- lib/Zend/Http/UserAgent/Spam.php | 4 +- lib/Zend/Http/UserAgent/Storage.php | 4 +- lib/Zend/Http/UserAgent/Storage/Exception.php | 4 +- .../Http/UserAgent/Storage/NonPersistent.php | 6 +- lib/Zend/Http/UserAgent/Storage/Session.php | 48 +- lib/Zend/Http/UserAgent/Text.php | 8 +- lib/Zend/Http/UserAgent/Validator.php | 20 +- lib/Zend/InfoCard.php | 6 +- lib/Zend/InfoCard/Adapter/Default.php | 6 +- lib/Zend/InfoCard/Adapter/Exception.php | 6 +- lib/Zend/InfoCard/Adapter/Interface.php | 6 +- lib/Zend/InfoCard/Cipher.php | 6 +- lib/Zend/InfoCard/Cipher/Exception.php | 6 +- .../InfoCard/Cipher/Pki/Adapter/Abstract.php | 6 +- lib/Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php | 6 +- lib/Zend/InfoCard/Cipher/Pki/Interface.php | 6 +- .../InfoCard/Cipher/Pki/Rsa/Interface.php | 6 +- .../Cipher/Symmetric/Adapter/Abstract.php | 6 +- .../Cipher/Symmetric/Adapter/Aes128cbc.php | 6 +- .../Cipher/Symmetric/Adapter/Aes256cbc.php | 6 +- .../Cipher/Symmetric/Aes128cbc/Interface.php | 6 +- .../Cipher/Symmetric/Aes256cbc/Interface.php | 6 +- .../InfoCard/Cipher/Symmetric/Interface.php | 6 +- lib/Zend/InfoCard/Claims.php | 6 +- lib/Zend/InfoCard/Exception.php | 6 +- lib/Zend/InfoCard/Xml/Assertion.php | 6 +- lib/Zend/InfoCard/Xml/Assertion/Interface.php | 6 +- lib/Zend/InfoCard/Xml/Assertion/Saml.php | 6 +- lib/Zend/InfoCard/Xml/Element.php | 6 +- lib/Zend/InfoCard/Xml/Element/Interface.php | 6 +- lib/Zend/InfoCard/Xml/EncryptedData.php | 6 +- .../InfoCard/Xml/EncryptedData/Abstract.php | 6 +- .../InfoCard/Xml/EncryptedData/XmlEnc.php | 8 +- lib/Zend/InfoCard/Xml/EncryptedKey.php | 6 +- lib/Zend/InfoCard/Xml/Exception.php | 6 +- lib/Zend/InfoCard/Xml/KeyInfo.php | 6 +- lib/Zend/InfoCard/Xml/KeyInfo/Abstract.php | 6 +- lib/Zend/InfoCard/Xml/KeyInfo/Default.php | 6 +- lib/Zend/InfoCard/Xml/KeyInfo/Interface.php | 6 +- lib/Zend/InfoCard/Xml/KeyInfo/XmlDSig.php | 6 +- lib/Zend/InfoCard/Xml/Security.php | 6 +- lib/Zend/InfoCard/Xml/Security/Exception.php | 6 +- lib/Zend/InfoCard/Xml/Security/Transform.php | 6 +- .../Security/Transform/EnvelopedSignature.php | 6 +- .../Xml/Security/Transform/Exception.php | 6 +- .../Xml/Security/Transform/Interface.php | 6 +- .../Xml/Security/Transform/XmlExcC14N.php | 6 +- .../InfoCard/Xml/SecurityTokenReference.php | 6 +- lib/Zend/Json.php | 300 +- lib/Zend/Json/Decoder.php | 9 +- lib/Zend/Json/Encoder.php | 62 +- lib/Zend/Json/Exception.php | 6 +- lib/Zend/Json/Expr.php | 6 +- lib/Zend/Json/Server.php | 18 +- lib/Zend/Json/Server/Cache.php | 6 +- lib/Zend/Json/Server/Error.php | 6 +- lib/Zend/Json/Server/Exception.php | 6 +- lib/Zend/Json/Server/Request.php | 6 +- lib/Zend/Json/Server/Request/Http.php | 6 +- lib/Zend/Json/Server/Response.php | 15 +- lib/Zend/Json/Server/Response/Http.php | 6 +- lib/Zend/Json/Server/Smd.php | 6 +- lib/Zend/Json/Server/Smd/Service.php | 6 +- lib/Zend/Layout.php | 18 +- .../Controller/Action/Helper/Layout.php | 6 +- lib/Zend/Layout/Controller/Plugin/Layout.php | 6 +- lib/Zend/Layout/Exception.php | 6 +- lib/Zend/Ldap.php | 18 +- lib/Zend/Ldap/Attribute.php | 24 +- lib/Zend/Ldap/Collection.php | 6 +- lib/Zend/Ldap/Collection/Iterator/Default.php | 10 +- lib/Zend/Ldap/Converter.php | 69 +- lib/Zend/Ldap/Converter/Exception.php | 4 +- lib/Zend/Ldap/Dn.php | 6 +- lib/Zend/Ldap/Exception.php | 6 +- lib/Zend/Ldap/Filter.php | 6 +- lib/Zend/Ldap/Filter/Abstract.php | 6 +- lib/Zend/Ldap/Filter/And.php | 6 +- lib/Zend/Ldap/Filter/Exception.php | 6 +- lib/Zend/Ldap/Filter/Logical.php | 6 +- lib/Zend/Ldap/Filter/Mask.php | 6 +- lib/Zend/Ldap/Filter/Not.php | 6 +- lib/Zend/Ldap/Filter/Or.php | 6 +- lib/Zend/Ldap/Filter/String.php | 6 +- lib/Zend/Ldap/Ldif/Encoder.php | 6 +- lib/Zend/Ldap/Node.php | 96 +- lib/Zend/Ldap/Node/Abstract.php | 6 +- lib/Zend/Ldap/Node/ChildrenIterator.php | 6 +- lib/Zend/Ldap/Node/Collection.php | 6 +- lib/Zend/Ldap/Node/RootDse.php | 6 +- .../Ldap/Node/RootDse/ActiveDirectory.php | 6 +- lib/Zend/Ldap/Node/RootDse/OpenLdap.php | 6 +- lib/Zend/Ldap/Node/RootDse/eDirectory.php | 6 +- lib/Zend/Ldap/Node/Schema.php | 6 +- lib/Zend/Ldap/Node/Schema/ActiveDirectory.php | 6 +- .../Schema/AttributeType/ActiveDirectory.php | 6 +- .../Node/Schema/AttributeType/Interface.php | 6 +- .../Node/Schema/AttributeType/OpenLdap.php | 6 +- lib/Zend/Ldap/Node/Schema/Item.php | 6 +- .../Schema/ObjectClass/ActiveDirectory.php | 6 +- .../Node/Schema/ObjectClass/Interface.php | 6 +- .../Ldap/Node/Schema/ObjectClass/OpenLdap.php | 6 +- lib/Zend/Ldap/Node/Schema/OpenLdap.php | 6 +- lib/Zend/Loader.php | 56 +- lib/Zend/Loader/Autoloader.php | 21 +- lib/Zend/Loader/Autoloader/Interface.php | 6 +- lib/Zend/Loader/Autoloader/Resource.php | 20 +- lib/Zend/Loader/AutoloaderFactory.php | 211 - lib/Zend/Loader/ClassMapAutoloader.php | 248 - lib/Zend/Loader/Exception.php | 6 +- .../Exception/InvalidArgumentException.php | 34 - lib/Zend/Loader/PluginLoader.php | 20 +- lib/Zend/Loader/PluginLoader/Exception.php | 6 +- lib/Zend/Loader/PluginLoader/Interface.php | 6 +- lib/Zend/Loader/SplAutoloader.php | 75 - lib/Zend/Loader/StandardAutoloader.php | 368 - lib/Zend/Locale.php | 8 +- lib/Zend/Locale/Data.php | 12 +- lib/Zend/Locale/Data/Translation.php | 6 +- lib/Zend/Locale/Data/cy.xml | 2 +- lib/Zend/Locale/Exception.php | 6 +- lib/Zend/Locale/Format.php | 16 +- lib/Zend/Locale/Math.php | 6 +- lib/Zend/Locale/Math/Exception.php | 6 +- lib/Zend/Locale/Math/PhpMath.php | 6 +- lib/Zend/Log.php | 104 +- lib/Zend/Log/Exception.php | 8 +- lib/Zend/Log/FactoryInterface.php | 14 +- lib/Zend/Log/Filter/Abstract.php | 12 +- lib/Zend/Log/Filter/Interface.php | 8 +- lib/Zend/Log/Filter/Message.php | 14 +- lib/Zend/Log/Filter/Priority.php | 22 +- lib/Zend/Log/Filter/Suppress.php | 8 +- lib/Zend/Log/Formatter/Abstract.php | 40 - lib/Zend/Log/Formatter/Firebug.php | 25 +- lib/Zend/Log/Formatter/Interface.php | 8 +- lib/Zend/Log/Formatter/Simple.php | 49 +- lib/Zend/Log/Formatter/Xml.php | 84 +- lib/Zend/Log/Writer/Abstract.php | 21 +- lib/Zend/Log/Writer/Db.php | 26 +- lib/Zend/Log/Writer/Firebug.php | 17 +- lib/Zend/Log/Writer/Mail.php | 19 +- lib/Zend/Log/Writer/Mock.php | 17 +- lib/Zend/Log/Writer/Null.php | 13 +- lib/Zend/Log/Writer/Stream.php | 39 +- lib/Zend/Log/Writer/Syslog.php | 32 +- lib/Zend/Log/Writer/ZendMonitor.php | 29 +- lib/Zend/Mail.php | 9 +- lib/Zend/Mail/Exception.php | 6 +- lib/Zend/Mail/Message.php | 8 +- lib/Zend/Mail/Message/File.php | 6 +- lib/Zend/Mail/Message/Interface.php | 6 +- lib/Zend/Mail/Part.php | 57 +- lib/Zend/Mail/Part/File.php | 6 +- lib/Zend/Mail/Part/Interface.php | 6 +- lib/Zend/Mail/Protocol/Abstract.php | 39 +- lib/Zend/Mail/Protocol/Exception.php | 6 +- lib/Zend/Mail/Protocol/Imap.php | 6 +- lib/Zend/Mail/Protocol/Pop3.php | 6 +- lib/Zend/Mail/Protocol/Smtp.php | 12 +- lib/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php | 6 +- lib/Zend/Mail/Protocol/Smtp/Auth/Login.php | 6 +- lib/Zend/Mail/Protocol/Smtp/Auth/Plain.php | 6 +- lib/Zend/Mail/Storage.php | 6 +- lib/Zend/Mail/Storage/Abstract.php | 8 +- lib/Zend/Mail/Storage/Exception.php | 6 +- lib/Zend/Mail/Storage/Folder.php | 6 +- lib/Zend/Mail/Storage/Folder/Interface.php | 6 +- lib/Zend/Mail/Storage/Folder/Maildir.php | 8 +- lib/Zend/Mail/Storage/Folder/Mbox.php | 8 +- lib/Zend/Mail/Storage/Imap.php | 6 +- lib/Zend/Mail/Storage/Maildir.php | 8 +- lib/Zend/Mail/Storage/Mbox.php | 8 +- lib/Zend/Mail/Storage/Pop3.php | 8 +- lib/Zend/Mail/Storage/Writable/Interface.php | 6 +- lib/Zend/Mail/Storage/Writable/Maildir.php | 8 +- lib/Zend/Mail/Transport/Abstract.php | 6 +- lib/Zend/Mail/Transport/Exception.php | 6 +- lib/Zend/Mail/Transport/File.php | 8 +- lib/Zend/Mail/Transport/Sendmail.php | 16 +- lib/Zend/Mail/Transport/Smtp.php | 8 +- lib/Zend/Markup.php | 6 +- lib/Zend/Markup/Exception.php | 8 +- lib/Zend/Markup/Parser/Bbcode.php | 6 +- lib/Zend/Markup/Parser/Exception.php | 8 +- lib/Zend/Markup/Parser/ParserInterface.php | 6 +- lib/Zend/Markup/Parser/Textile.php | 570 + lib/Zend/Markup/Renderer/Exception.php | 6 +- lib/Zend/Markup/Renderer/Html.php | 6 +- lib/Zend/Markup/Renderer/Html/Code.php | 6 +- .../Markup/Renderer/Html/HtmlAbstract.php | 6 +- lib/Zend/Markup/Renderer/Html/Img.php | 6 +- lib/Zend/Markup/Renderer/Html/List.php | 6 +- lib/Zend/Markup/Renderer/Html/Url.php | 6 +- lib/Zend/Markup/Renderer/RendererAbstract.php | 6 +- .../Renderer/TokenConverterInterface.php | 6 +- lib/Zend/Markup/Token.php | 8 +- lib/Zend/Markup/TokenList.php | 6 +- lib/Zend/Measure/Abstract.php | 12 +- lib/Zend/Measure/Acceleration.php | 6 +- lib/Zend/Measure/Angle.php | 6 +- lib/Zend/Measure/Area.php | 6 +- lib/Zend/Measure/Binary.php | 6 +- lib/Zend/Measure/Capacitance.php | 6 +- lib/Zend/Measure/Cooking/Volume.php | 6 +- lib/Zend/Measure/Cooking/Weight.php | 6 +- lib/Zend/Measure/Current.php | 6 +- lib/Zend/Measure/Density.php | 6 +- lib/Zend/Measure/Energy.php | 6 +- lib/Zend/Measure/Exception.php | 6 +- lib/Zend/Measure/Flow/Mass.php | 6 +- lib/Zend/Measure/Flow/Mole.php | 6 +- lib/Zend/Measure/Flow/Volume.php | 6 +- lib/Zend/Measure/Force.php | 6 +- lib/Zend/Measure/Frequency.php | 6 +- lib/Zend/Measure/Illumination.php | 6 +- lib/Zend/Measure/Length.php | 28 +- lib/Zend/Measure/Lightness.php | 6 +- lib/Zend/Measure/Number.php | 6 +- lib/Zend/Measure/Power.php | 6 +- lib/Zend/Measure/Pressure.php | 6 +- lib/Zend/Measure/Speed.php | 6 +- lib/Zend/Measure/Temperature.php | 6 +- lib/Zend/Measure/Time.php | 6 +- lib/Zend/Measure/Torque.php | 6 +- lib/Zend/Measure/Viscosity/Dynamic.php | 6 +- lib/Zend/Measure/Viscosity/Kinematic.php | 6 +- lib/Zend/Measure/Volume.php | 6 +- lib/Zend/Measure/Weight.php | 6 +- lib/Zend/Memory.php | 8 +- lib/Zend/Memory/AccessController.php | 6 +- lib/Zend/Memory/Container.php | 6 +- lib/Zend/Memory/Container/Interface.php | 6 +- lib/Zend/Memory/Container/Locked.php | 6 +- lib/Zend/Memory/Container/Movable.php | 6 +- lib/Zend/Memory/Exception.php | 6 +- lib/Zend/Memory/Manager.php | 6 +- lib/Zend/Memory/Value.php | 6 +- lib/Zend/Mime.php | 10 +- lib/Zend/Mime/Decode.php | 8 +- lib/Zend/Mime/Exception.php | 6 +- lib/Zend/Mime/Message.php | 6 +- lib/Zend/Mime/Part.php | 19 +- lib/Zend/Mobile/Exception.php | 33 - lib/Zend/Mobile/Push/Abstract.php | 112 - lib/Zend/Mobile/Push/Apns.php | 391 - lib/Zend/Mobile/Push/Exception.php | 35 - .../Push/Exception/DeviceQuotaExceeded.php | 35 - .../Push/Exception/InvalidAuthToken.php | 35 - .../Mobile/Push/Exception/InvalidPayload.php | 35 - .../Push/Exception/InvalidRegistration.php | 35 - .../Mobile/Push/Exception/InvalidToken.php | 35 - .../Mobile/Push/Exception/InvalidTopic.php | 35 - .../Mobile/Push/Exception/QuotaExceeded.php | 35 - .../Push/Exception/ServerUnavailable.php | 35 - lib/Zend/Mobile/Push/Gcm.php | 172 - lib/Zend/Mobile/Push/Interface.php | 64 - lib/Zend/Mobile/Push/Message/Abstract.php | 135 - lib/Zend/Mobile/Push/Message/Apns.php | 284 - lib/Zend/Mobile/Push/Message/Exception.php | 35 - lib/Zend/Mobile/Push/Message/Gcm.php | 274 - lib/Zend/Mobile/Push/Message/Interface.php | 79 - lib/Zend/Mobile/Push/Message/Mpns.php | 117 - lib/Zend/Mobile/Push/Message/Mpns/Raw.php | 149 - lib/Zend/Mobile/Push/Message/Mpns/Tile.php | 365 - lib/Zend/Mobile/Push/Message/Mpns/Toast.php | 225 - lib/Zend/Mobile/Push/Mpns.php | 152 - lib/Zend/Mobile/Push/Response/Gcm.php | 242 - lib/Zend/Mobile/Push/Test/ApnsProxy.php | 103 - lib/Zend/Navigation.php | 6 +- lib/Zend/Navigation/Container.php | 194 +- lib/Zend/Navigation/Exception.php | 6 +- lib/Zend/Navigation/Page.php | 276 +- lib/Zend/Navigation/Page/Mvc.php | 292 +- lib/Zend/Navigation/Page/Uri.php | 19 +- lib/Zend/Oauth.php | 7 +- lib/Zend/Oauth/Client.php | 39 +- lib/Zend/Oauth/Config.php | 55 +- lib/Zend/Oauth/Config/ConfigInterface.php | 10 +- lib/Zend/Oauth/Consumer.php | 10 +- lib/Zend/Oauth/Exception.php | 6 +- lib/Zend/Oauth/Http.php | 10 +- lib/Zend/Oauth/Http/AccessToken.php | 6 +- lib/Zend/Oauth/Http/RequestToken.php | 6 +- lib/Zend/Oauth/Http/UserAuthorization.php | 6 +- lib/Zend/Oauth/Http/Utility.php | 50 +- lib/Zend/Oauth/Signature/Hmac.php | 14 +- lib/Zend/Oauth/Signature/Plaintext.php | 14 +- lib/Zend/Oauth/Signature/Rsa.php | 18 +- .../Oauth/Signature/SignatureAbstract.php | 42 +- lib/Zend/Oauth/Token.php | 16 +- lib/Zend/Oauth/Token/Access.php | 34 +- lib/Zend/Oauth/Token/AuthorizedRequest.php | 12 +- lib/Zend/Oauth/Token/Request.php | 6 +- lib/Zend/OpenId.php | 17 +- lib/Zend/OpenId/Consumer.php | 6 +- lib/Zend/OpenId/Consumer/Storage.php | 6 +- lib/Zend/OpenId/Consumer/Storage/File.php | 6 +- lib/Zend/OpenId/Exception.php | 6 +- lib/Zend/OpenId/Extension.php | 6 +- lib/Zend/OpenId/Extension/Sreg.php | 6 +- lib/Zend/OpenId/Provider.php | 8 +- lib/Zend/OpenId/Provider/Storage.php | 6 +- lib/Zend/OpenId/Provider/Storage/File.php | 8 +- lib/Zend/OpenId/Provider/User.php | 6 +- lib/Zend/OpenId/Provider/User/Session.php | 6 +- lib/Zend/Paginator.php | 41 +- lib/Zend/Paginator/Adapter/Array.php | 6 +- lib/Zend/Paginator/Adapter/DbSelect.php | 46 +- lib/Zend/Paginator/Adapter/DbTableSelect.php | 6 +- lib/Zend/Paginator/Adapter/Interface.php | 6 +- lib/Zend/Paginator/Adapter/Iterator.php | 6 +- lib/Zend/Paginator/Adapter/Null.php | 6 +- lib/Zend/Paginator/AdapterAggregate.php | 6 +- lib/Zend/Paginator/Exception.php | 6 +- lib/Zend/Paginator/ScrollingStyle/All.php | 6 +- lib/Zend/Paginator/ScrollingStyle/Elastic.php | 6 +- .../Paginator/ScrollingStyle/Interface.php | 6 +- lib/Zend/Paginator/ScrollingStyle/Jumping.php | 6 +- lib/Zend/Paginator/ScrollingStyle/Sliding.php | 6 +- .../Paginator/SerializableLimitIterator.php | 6 +- lib/Zend/Pdf.php | 28 +- lib/Zend/Pdf/Action.php | 6 +- lib/Zend/Pdf/Action/GoTo.php | 6 +- lib/Zend/Pdf/Action/GoTo3DView.php | 6 +- lib/Zend/Pdf/Action/GoToE.php | 6 +- lib/Zend/Pdf/Action/GoToR.php | 6 +- lib/Zend/Pdf/Action/Hide.php | 6 +- lib/Zend/Pdf/Action/ImportData.php | 6 +- lib/Zend/Pdf/Action/JavaScript.php | 6 +- lib/Zend/Pdf/Action/Launch.php | 6 +- lib/Zend/Pdf/Action/Movie.php | 6 +- lib/Zend/Pdf/Action/Named.php | 6 +- lib/Zend/Pdf/Action/Rendition.php | 6 +- lib/Zend/Pdf/Action/ResetForm.php | 6 +- lib/Zend/Pdf/Action/SetOCGState.php | 6 +- lib/Zend/Pdf/Action/Sound.php | 6 +- lib/Zend/Pdf/Action/SubmitForm.php | 6 +- lib/Zend/Pdf/Action/Thread.php | 6 +- lib/Zend/Pdf/Action/Trans.php | 6 +- lib/Zend/Pdf/Action/URI.php | 6 +- lib/Zend/Pdf/Action/Unknown.php | 6 +- lib/Zend/Pdf/Annotation.php | 8 +- lib/Zend/Pdf/Annotation/FileAttachment.php | 6 +- lib/Zend/Pdf/Annotation/Link.php | 6 +- lib/Zend/Pdf/Annotation/Markup.php | 6 +- lib/Zend/Pdf/Annotation/Text.php | 6 +- lib/Zend/Pdf/Canvas.php | 4 +- lib/Zend/Pdf/Canvas/Abstract.php | 7 +- lib/Zend/Pdf/Canvas/Interface.php | 4 +- lib/Zend/Pdf/Cmap.php | 6 +- lib/Zend/Pdf/Cmap/ByteEncoding.php | 6 +- lib/Zend/Pdf/Cmap/ByteEncoding/Static.php | 6 +- lib/Zend/Pdf/Cmap/SegmentToDelta.php | 6 +- lib/Zend/Pdf/Cmap/TrimmedTable.php | 6 +- lib/Zend/Pdf/Color.php | 6 +- lib/Zend/Pdf/Color/Cmyk.php | 6 +- lib/Zend/Pdf/Color/GrayScale.php | 6 +- lib/Zend/Pdf/Color/Html.php | 6 +- lib/Zend/Pdf/Color/Rgb.php | 6 +- lib/Zend/Pdf/Destination.php | 8 +- lib/Zend/Pdf/Destination/Explicit.php | 6 +- lib/Zend/Pdf/Destination/Fit.php | 6 +- lib/Zend/Pdf/Destination/FitBoundingBox.php | 6 +- .../FitBoundingBoxHorizontally.php | 6 +- .../Destination/FitBoundingBoxVertically.php | 6 +- lib/Zend/Pdf/Destination/FitHorizontally.php | 6 +- lib/Zend/Pdf/Destination/FitRectangle.php | 6 +- lib/Zend/Pdf/Destination/FitVertically.php | 6 +- lib/Zend/Pdf/Destination/Named.php | 8 +- lib/Zend/Pdf/Destination/Unknown.php | 6 +- lib/Zend/Pdf/Destination/Zoom.php | 6 +- lib/Zend/Pdf/Element.php | 6 +- lib/Zend/Pdf/Element/Array.php | 6 +- lib/Zend/Pdf/Element/Boolean.php | 6 +- lib/Zend/Pdf/Element/Dictionary.php | 6 +- lib/Zend/Pdf/Element/Name.php | 6 +- lib/Zend/Pdf/Element/Null.php | 6 +- lib/Zend/Pdf/Element/Numeric.php | 6 +- lib/Zend/Pdf/Element/Object.php | 6 +- lib/Zend/Pdf/Element/Object/Stream.php | 6 +- lib/Zend/Pdf/Element/Reference.php | 6 +- lib/Zend/Pdf/Element/Reference/Context.php | 6 +- lib/Zend/Pdf/Element/Reference/Table.php | 6 +- lib/Zend/Pdf/Element/Stream.php | 6 +- lib/Zend/Pdf/Element/String.php | 6 +- lib/Zend/Pdf/Element/String/Binary.php | 6 +- lib/Zend/Pdf/ElementFactory.php | 6 +- lib/Zend/Pdf/ElementFactory/Interface.php | 6 +- lib/Zend/Pdf/ElementFactory/Proxy.php | 6 +- lib/Zend/Pdf/Exception.php | 6 +- lib/Zend/Pdf/FileParser.php | 6 +- lib/Zend/Pdf/FileParser/Font.php | 6 +- lib/Zend/Pdf/FileParser/Font/OpenType.php | 30 +- .../Pdf/FileParser/Font/OpenType/TrueType.php | 6 +- lib/Zend/Pdf/FileParser/Image.php | 6 +- lib/Zend/Pdf/FileParser/Image/Png.php | 6 +- lib/Zend/Pdf/FileParserDataSource.php | 21 +- lib/Zend/Pdf/FileParserDataSource/File.php | 6 +- lib/Zend/Pdf/FileParserDataSource/String.php | 6 +- lib/Zend/Pdf/Filter/Ascii85.php | 6 +- lib/Zend/Pdf/Filter/AsciiHex.php | 6 +- lib/Zend/Pdf/Filter/Compression.php | 6 +- lib/Zend/Pdf/Filter/Compression/Flate.php | 6 +- lib/Zend/Pdf/Filter/Compression/Lzw.php | 6 +- lib/Zend/Pdf/Filter/Interface.php | 6 +- lib/Zend/Pdf/Filter/RunLength.php | 6 +- lib/Zend/Pdf/Font.php | 6 +- lib/Zend/Pdf/Image.php | 6 +- lib/Zend/Pdf/NameTree.php | 8 +- lib/Zend/Pdf/Outline.php | 6 +- lib/Zend/Pdf/Outline/Created.php | 6 +- lib/Zend/Pdf/Outline/Loaded.php | 6 +- lib/Zend/Pdf/Page.php | 6 +- lib/Zend/Pdf/Parser.php | 6 +- .../RecursivelyIteratableObjectsContainer.php | 6 +- lib/Zend/Pdf/Resource.php | 6 +- lib/Zend/Pdf/Resource/ContentStream.php | 4 +- lib/Zend/Pdf/Resource/Extractor.php | 4 +- lib/Zend/Pdf/Resource/Font.php | 6 +- lib/Zend/Pdf/Resource/Font/CidFont.php | 10 +- .../Pdf/Resource/Font/CidFont/TrueType.php | 6 +- lib/Zend/Pdf/Resource/Font/Extracted.php | 6 +- lib/Zend/Pdf/Resource/Font/FontDescriptor.php | 6 +- lib/Zend/Pdf/Resource/Font/Simple.php | 6 +- lib/Zend/Pdf/Resource/Font/Simple/Parsed.php | 6 +- .../Resource/Font/Simple/Parsed/TrueType.php | 6 +- .../Pdf/Resource/Font/Simple/Standard.php | 6 +- .../Resource/Font/Simple/Standard/Courier.php | 6 +- .../Font/Simple/Standard/CourierBold.php | 6 +- .../Simple/Standard/CourierBoldOblique.php | 6 +- .../Font/Simple/Standard/CourierOblique.php | 6 +- .../Font/Simple/Standard/Helvetica.php | 6 +- .../Font/Simple/Standard/HelveticaBold.php | 6 +- .../Simple/Standard/HelveticaBoldOblique.php | 6 +- .../Font/Simple/Standard/HelveticaOblique.php | 6 +- .../Resource/Font/Simple/Standard/Symbol.php | 6 +- .../Font/Simple/Standard/TimesBold.php | 6 +- .../Font/Simple/Standard/TimesBoldItalic.php | 6 +- .../Font/Simple/Standard/TimesItalic.php | 6 +- .../Font/Simple/Standard/TimesRoman.php | 6 +- .../Font/Simple/Standard/ZapfDingbats.php | 6 +- lib/Zend/Pdf/Resource/Font/Type0.php | 6 +- lib/Zend/Pdf/Resource/GraphicsState.php | 4 +- lib/Zend/Pdf/Resource/Image.php | 6 +- lib/Zend/Pdf/Resource/Image/Jpeg.php | 6 +- lib/Zend/Pdf/Resource/Image/Png.php | 6 +- lib/Zend/Pdf/Resource/Image/Tiff.php | 6 +- lib/Zend/Pdf/Resource/ImageFactory.php | 6 +- lib/Zend/Pdf/Resource/Unified.php | 4 +- lib/Zend/Pdf/StringParser.php | 8 +- lib/Zend/Pdf/Style.php | 6 +- lib/Zend/Pdf/Target.php | 6 +- lib/Zend/Pdf/Trailer.php | 6 +- lib/Zend/Pdf/Trailer/Generator.php | 6 +- lib/Zend/Pdf/Trailer/Keeper.php | 6 +- lib/Zend/Pdf/UpdateInfoContainer.php | 6 +- lib/Zend/ProgressBar.php | 6 +- lib/Zend/ProgressBar/Adapter.php | 6 +- lib/Zend/ProgressBar/Adapter/Console.php | 6 +- lib/Zend/ProgressBar/Adapter/Exception.php | 6 +- lib/Zend/ProgressBar/Adapter/JsPull.php | 6 +- lib/Zend/ProgressBar/Adapter/JsPush.php | 6 +- lib/Zend/ProgressBar/Exception.php | 6 +- lib/Zend/Queue.php | 6 +- lib/Zend/Queue/Adapter/Activemq.php | 46 +- lib/Zend/Queue/Adapter/AdapterAbstract.php | 6 +- lib/Zend/Queue/Adapter/AdapterInterface.php | 6 +- lib/Zend/Queue/Adapter/Array.php | 8 +- lib/Zend/Queue/Adapter/Db.php | 6 +- lib/Zend/Queue/Adapter/Db/Message.php | 6 +- lib/Zend/Queue/Adapter/Db/Queue.php | 6 +- lib/Zend/Queue/Adapter/Db/postgresql.sql | 4 +- lib/Zend/Queue/Adapter/Memcacheq.php | 6 +- lib/Zend/Queue/Adapter/Null.php | 6 +- lib/Zend/Queue/Adapter/PlatformJobQueue.php | 6 +- lib/Zend/Queue/Exception.php | 6 +- lib/Zend/Queue/Message.php | 6 +- lib/Zend/Queue/Message/Iterator.php | 6 +- lib/Zend/Queue/Message/PlatformJob.php | 6 +- lib/Zend/Queue/Stomp/Client.php | 6 +- lib/Zend/Queue/Stomp/Client/Connection.php | 6 +- .../Stomp/Client/ConnectionInterface.php | 6 +- lib/Zend/Queue/Stomp/Frame.php | 6 +- lib/Zend/Queue/Stomp/FrameInterface.php | 6 +- lib/Zend/Reflection/Class.php | 6 +- lib/Zend/Reflection/Docblock.php | 6 +- lib/Zend/Reflection/Docblock/Tag.php | 6 +- lib/Zend/Reflection/Docblock/Tag/Param.php | 8 +- lib/Zend/Reflection/Docblock/Tag/Return.php | 10 +- lib/Zend/Reflection/Exception.php | 6 +- lib/Zend/Reflection/Extension.php | 6 +- lib/Zend/Reflection/File.php | 40 +- lib/Zend/Reflection/Function.php | 6 +- lib/Zend/Reflection/Method.php | 41 +- lib/Zend/Reflection/Parameter.php | 6 +- lib/Zend/Reflection/Property.php | 6 +- lib/Zend/Registry.php | 6 +- lib/Zend/Rest/Client.php | 49 +- lib/Zend/Rest/Client/Exception.php | 6 +- lib/Zend/Rest/Client/Result.php | 9 +- lib/Zend/Rest/Client/Result/Exception.php | 6 +- lib/Zend/Rest/Controller.php | 15 +- lib/Zend/Rest/Exception.php | 6 +- lib/Zend/Rest/Route.php | 32 +- lib/Zend/Rest/Server.php | 6 +- lib/Zend/Rest/Server/Exception.php | 6 +- lib/Zend/Search/Exception.php | 6 +- lib/Zend/Search/Lucene.php | 6 +- lib/Zend/Search/Lucene/Analysis/Analyzer.php | 6 +- .../Lucene/Analysis/Analyzer/Common.php | 10 +- .../Lucene/Analysis/Analyzer/Common/Text.php | 6 +- .../Analyzer/Common/Text/CaseInsensitive.php | 6 +- .../Analysis/Analyzer/Common/TextNum.php | 6 +- .../Common/TextNum/CaseInsensitive.php | 6 +- .../Lucene/Analysis/Analyzer/Common/Utf8.php | 6 +- .../Analyzer/Common/Utf8/CaseInsensitive.php | 6 +- .../Analysis/Analyzer/Common/Utf8Num.php | 6 +- .../Common/Utf8Num/CaseInsensitive.php | 6 +- lib/Zend/Search/Lucene/Analysis/Token.php | 18 +- .../Search/Lucene/Analysis/TokenFilter.php | 6 +- .../Lucene/Analysis/TokenFilter/LowerCase.php | 16 +- .../Analysis/TokenFilter/LowerCaseUtf8.php | 16 +- .../Analysis/TokenFilter/ShortWords.php | 6 +- .../Lucene/Analysis/TokenFilter/StopWords.php | 6 +- lib/Zend/Search/Lucene/Document.php | 8 +- lib/Zend/Search/Lucene/Document/Docx.php | 6 +- lib/Zend/Search/Lucene/Document/Exception.php | 6 +- lib/Zend/Search/Lucene/Document/Html.php | 8 +- lib/Zend/Search/Lucene/Document/OpenXml.php | 6 +- lib/Zend/Search/Lucene/Document/Pptx.php | 6 +- lib/Zend/Search/Lucene/Document/Xlsx.php | 6 +- lib/Zend/Search/Lucene/Exception.php | 6 +- lib/Zend/Search/Lucene/FSM.php | 6 +- lib/Zend/Search/Lucene/FSMAction.php | 6 +- lib/Zend/Search/Lucene/Field.php | 6 +- .../Search/Lucene/Index/DictionaryLoader.php | 6 +- lib/Zend/Search/Lucene/Index/DocsFilter.php | 6 +- lib/Zend/Search/Lucene/Index/FieldInfo.php | 6 +- lib/Zend/Search/Lucene/Index/SegmentInfo.php | 6 +- .../Search/Lucene/Index/SegmentMerger.php | 6 +- .../Search/Lucene/Index/SegmentWriter.php | 6 +- .../Index/SegmentWriter/DocumentWriter.php | 6 +- .../Index/SegmentWriter/StreamWriter.php | 6 +- lib/Zend/Search/Lucene/Index/Term.php | 6 +- lib/Zend/Search/Lucene/Index/TermInfo.php | 6 +- .../Lucene/Index/TermsPriorityQueue.php | 6 +- .../Lucene/Index/TermsStream/Interface.php | 6 +- lib/Zend/Search/Lucene/Index/Writer.php | 6 +- lib/Zend/Search/Lucene/Interface.php | 6 +- .../Search/Lucene/Interface/MultiSearcher.php | 25 - lib/Zend/Search/Lucene/LockManager.php | 6 +- lib/Zend/Search/Lucene/MultiSearcher.php | 27 +- lib/Zend/Search/Lucene/PriorityQueue.php | 6 +- lib/Zend/Search/Lucene/Proxy.php | 6 +- .../Search/BooleanExpressionRecognizer.php | 6 +- .../Lucene/Search/Highlighter/Default.php | 6 +- .../Lucene/Search/Highlighter/Interface.php | 6 +- lib/Zend/Search/Lucene/Search/Query.php | 6 +- .../Search/Lucene/Search/Query/Boolean.php | 6 +- lib/Zend/Search/Lucene/Search/Query/Empty.php | 6 +- lib/Zend/Search/Lucene/Search/Query/Fuzzy.php | 6 +- .../Lucene/Search/Query/Insignificant.php | 6 +- .../Search/Lucene/Search/Query/MultiTerm.php | 6 +- .../Search/Lucene/Search/Query/Phrase.php | 6 +- .../Lucene/Search/Query/Preprocessing.php | 6 +- .../Search/Query/Preprocessing/Fuzzy.php | 6 +- .../Search/Query/Preprocessing/Phrase.php | 6 +- .../Search/Query/Preprocessing/Term.php | 6 +- lib/Zend/Search/Lucene/Search/Query/Range.php | 6 +- lib/Zend/Search/Lucene/Search/Query/Term.php | 6 +- .../Search/Lucene/Search/Query/Wildcard.php | 6 +- lib/Zend/Search/Lucene/Search/QueryEntry.php | 6 +- .../Lucene/Search/QueryEntry/Phrase.php | 6 +- .../Lucene/Search/QueryEntry/Subquery.php | 6 +- .../Search/Lucene/Search/QueryEntry/Term.php | 6 +- lib/Zend/Search/Lucene/Search/QueryHit.php | 6 +- lib/Zend/Search/Lucene/Search/QueryLexer.php | 6 +- lib/Zend/Search/Lucene/Search/QueryParser.php | 6 +- .../Lucene/Search/QueryParserContext.php | 6 +- .../Lucene/Search/QueryParserException.php | 6 +- lib/Zend/Search/Lucene/Search/QueryToken.php | 6 +- lib/Zend/Search/Lucene/Search/Similarity.php | 6 +- .../Lucene/Search/Similarity/Default.php | 6 +- lib/Zend/Search/Lucene/Search/Weight.php | 8 +- .../Search/Lucene/Search/Weight/Boolean.php | 6 +- .../Search/Lucene/Search/Weight/Empty.php | 6 +- .../Search/Lucene/Search/Weight/MultiTerm.php | 6 +- .../Search/Lucene/Search/Weight/Phrase.php | 6 +- lib/Zend/Search/Lucene/Search/Weight/Term.php | 6 +- lib/Zend/Search/Lucene/Storage/Directory.php | 6 +- .../Lucene/Storage/Directory/Filesystem.php | 9 +- lib/Zend/Search/Lucene/Storage/File.php | 6 +- .../Search/Lucene/Storage/File/Filesystem.php | 6 +- .../Search/Lucene/Storage/File/Memory.php | 6 +- .../Lucene/TermStreamsPriorityQueue.php | 6 +- lib/Zend/Serializer.php | 24 +- .../Serializer/Adapter/AdapterAbstract.php | 16 +- .../Serializer/Adapter/AdapterInterface.php | 8 +- lib/Zend/Serializer/Adapter/Amf0.php | 18 +- lib/Zend/Serializer/Adapter/Amf3.php | 18 +- lib/Zend/Serializer/Adapter/Igbinary.php | 24 +- lib/Zend/Serializer/Adapter/Json.php | 18 +- lib/Zend/Serializer/Adapter/PhpCode.php | 18 +- lib/Zend/Serializer/Adapter/PhpSerialize.php | 24 +- lib/Zend/Serializer/Adapter/PythonPickle.php | 18 +- lib/Zend/Serializer/Adapter/Wddx.php | 36 +- lib/Zend/Serializer/Exception.php | 6 +- lib/Zend/Server/Abstract.php | 6 +- lib/Zend/Server/Cache.php | 6 +- lib/Zend/Server/Definition.php | 6 +- lib/Zend/Server/Exception.php | 4 +- lib/Zend/Server/Interface.php | 6 +- lib/Zend/Server/Method/Callback.php | 6 +- lib/Zend/Server/Method/Definition.php | 6 +- lib/Zend/Server/Method/Parameter.php | 6 +- lib/Zend/Server/Method/Prototype.php | 6 +- lib/Zend/Server/Reflection.php | 6 +- lib/Zend/Server/Reflection/Class.php | 6 +- lib/Zend/Server/Reflection/Exception.php | 6 +- lib/Zend/Server/Reflection/Function.php | 6 +- .../Server/Reflection/Function/Abstract.php | 6 +- lib/Zend/Server/Reflection/Method.php | 6 +- lib/Zend/Server/Reflection/Node.php | 6 +- lib/Zend/Server/Reflection/Parameter.php | 6 +- lib/Zend/Server/Reflection/Prototype.php | 6 +- lib/Zend/Server/Reflection/ReturnValue.php | 6 +- lib/Zend/Service/Abstract.php | 6 +- lib/Zend/Service/Akismet.php | 6 +- lib/Zend/Service/Amazon.php | 16 +- lib/Zend/Service/Amazon/Abstract.php | 6 +- lib/Zend/Service/Amazon/Accessories.php | 8 +- lib/Zend/Service/Amazon/Authentication.php | 38 +- .../Amazon/Authentication/Exception.php | 4 +- lib/Zend/Service/Amazon/Authentication/S3.php | 20 +- lib/Zend/Service/Amazon/Authentication/V1.php | 10 +- lib/Zend/Service/Amazon/Authentication/V2.php | 14 +- lib/Zend/Service/Amazon/CustomerReview.php | 8 +- lib/Zend/Service/Amazon/Ec2.php | 6 +- lib/Zend/Service/Amazon/Ec2/Abstract.php | 10 +- .../Service/Amazon/Ec2/Availabilityzones.php | 6 +- lib/Zend/Service/Amazon/Ec2/CloudWatch.php | 8 +- lib/Zend/Service/Amazon/Ec2/Ebs.php | 6 +- lib/Zend/Service/Amazon/Ec2/Elasticip.php | 6 +- lib/Zend/Service/Amazon/Ec2/Exception.php | 6 +- lib/Zend/Service/Amazon/Ec2/Image.php | 6 +- lib/Zend/Service/Amazon/Ec2/Instance.php | 11 +- .../Service/Amazon/Ec2/Instance/Reserved.php | 6 +- .../Service/Amazon/Ec2/Instance/Windows.php | 6 +- lib/Zend/Service/Amazon/Ec2/Keypair.php | 6 +- lib/Zend/Service/Amazon/Ec2/Region.php | 6 +- lib/Zend/Service/Amazon/Ec2/Response.php | 8 +- .../Service/Amazon/Ec2/Securitygroups.php | 6 +- lib/Zend/Service/Amazon/EditorialReview.php | 8 +- lib/Zend/Service/Amazon/Exception.php | 6 +- lib/Zend/Service/Amazon/Image.php | 8 +- lib/Zend/Service/Amazon/Item.php | 28 +- lib/Zend/Service/Amazon/ListmaniaList.php | 8 +- lib/Zend/Service/Amazon/Offer.php | 8 +- lib/Zend/Service/Amazon/OfferSet.php | 8 +- lib/Zend/Service/Amazon/Query.php | 6 +- lib/Zend/Service/Amazon/ResultSet.php | 8 +- lib/Zend/Service/Amazon/S3.php | 100 +- lib/Zend/Service/Amazon/S3/Exception.php | 6 +- lib/Zend/Service/Amazon/S3/Stream.php | 25 +- lib/Zend/Service/Amazon/SimilarProduct.php | 8 +- lib/Zend/Service/Amazon/SimpleDb.php | 224 +- .../Service/Amazon/SimpleDb/Attribute.php | 28 +- .../Service/Amazon/SimpleDb/Exception.php | 14 +- lib/Zend/Service/Amazon/SimpleDb/Page.php | 30 +- lib/Zend/Service/Amazon/SimpleDb/Response.php | 18 +- lib/Zend/Service/Amazon/Sqs.php | 87 +- lib/Zend/Service/Amazon/Sqs/Exception.php | 6 +- lib/Zend/Service/Audioscrobbler.php | 6 +- lib/Zend/Service/Delicious.php | 6 +- lib/Zend/Service/Delicious/Exception.php | 6 +- lib/Zend/Service/Delicious/Post.php | 6 +- lib/Zend/Service/Delicious/PostList.php | 6 +- lib/Zend/Service/Delicious/SimplePost.php | 6 +- .../DeveloperGarden/BaseUserService.php | 6 +- .../BaseUserService/AccountBalance.php | 6 +- .../DeveloperGarden/Client/ClientAbstract.php | 6 +- .../DeveloperGarden/Client/Exception.php | 6 +- .../Service/DeveloperGarden/Client/Soap.php | 6 +- .../DeveloperGarden/ConferenceCall.php | 6 +- .../ConferenceCall/ConferenceAccount.php | 6 +- .../ConferenceCall/ConferenceDetail.php | 8 +- .../ConferenceCall/ConferenceSchedule.php | 6 +- .../ConferenceCall/Exception.php | 6 +- .../ConferenceCall/Participant.php | 6 +- .../ConferenceCall/ParticipantDetail.php | 6 +- .../ConferenceCall/ParticipantStatus.php | 6 +- .../Service/DeveloperGarden/Credential.php | 8 +- .../Service/DeveloperGarden/Exception.php | 6 +- .../Service/DeveloperGarden/IpLocation.php | 8 +- .../DeveloperGarden/IpLocation/IpAddress.php | 6 +- .../Service/DeveloperGarden/LocalSearch.php | 6 +- .../DeveloperGarden/LocalSearch/Exception.php | 6 +- .../LocalSearch/SearchParameters.php | 18 +- .../BaseUserService/ChangeQuotaPool.php | 6 +- .../BaseUserService/GetAccountBalance.php | 6 +- .../BaseUserService/GetQuotaInformation.php | 6 +- ...ddConferenceTemplateParticipantRequest.php | 6 +- .../CommitConferenceRequest.php | 6 +- .../CreateConferenceRequest.php | 8 +- .../CreateConferenceTemplateRequest.php | 6 +- .../GetConferenceListRequest.php | 8 +- .../GetConferenceStatusRequest.php | 6 +- .../GetConferenceTemplateListRequest.php | 8 +- ...etConferenceTemplateParticipantRequest.php | 6 +- .../GetConferenceTemplateRequest.php | 6 +- .../GetParticipantStatusRequest.php | 6 +- .../GetRunningConferenceRequest.php | 6 +- .../ConferenceCall/NewParticipantRequest.php | 6 +- .../RemoveConferenceRequest.php | 6 +- ...veConferenceTemplateParticipantRequest.php | 6 +- .../RemoveConferenceTemplateRequest.php | 6 +- .../RemoveParticipantRequest.php | 6 +- .../UpdateConferenceRequest.php | 8 +- ...teConferenceTemplateParticipantRequest.php | 6 +- .../UpdateConferenceTemplateRequest.php | 6 +- .../UpdateParticipantRequest.php | 6 +- .../DeveloperGarden/Request/Exception.php | 6 +- .../Request/IpLocation/LocateIPRequest.php | 6 +- .../LocalSearch/LocalSearchRequest.php | 10 +- .../Request/RequestAbstract.php | 6 +- .../Request/SendSms/SendFlashSMS.php | 6 +- .../Request/SendSms/SendSMS.php | 6 +- .../Request/SendSms/SendSmsAbstract.php | 24 +- .../SmsValidation/GetValidatedNumbers.php | 6 +- .../Request/SmsValidation/Invalidate.php | 6 +- .../SmsValidation/SendValidationKeyword.php | 6 +- .../Request/SmsValidation/Validate.php | 6 +- .../Request/VoiceButler/CallStatus.php | 6 +- .../Request/VoiceButler/NewCall.php | 6 +- .../Request/VoiceButler/NewCallSequenced.php | 6 +- .../Request/VoiceButler/TearDownCall.php | 6 +- .../VoiceButler/VoiceButlerAbstract.php | 6 +- .../DeveloperGarden/Response/BaseType.php | 6 +- .../ChangeQuotaPoolResponse.php | 6 +- .../GetAccountBalanceResponse.php | 6 +- .../GetQuotaInformationResponse.php | 6 +- ...dConferenceTemplateParticipantResponse.php | 6 +- ...ferenceTemplateParticipantResponseType.php | 6 +- .../ConferenceCall/CCSResponseType.php | 6 +- .../CommitConferenceResponse.php | 6 +- .../ConferenceCall/ConferenceCallAbstract.php | 6 +- .../CreateConferenceResponse.php | 6 +- .../CreateConferenceResponseType.php | 6 +- .../CreateConferenceTemplateResponse.php | 6 +- .../CreateConferenceTemplateResponseType.php | 6 +- .../GetConferenceListResponse.php | 6 +- .../GetConferenceListResponseType.php | 6 +- .../GetConferenceStatusResponse.php | 6 +- .../GetConferenceStatusResponseType.php | 6 +- .../GetConferenceTemplateListResponse.php | 6 +- .../GetConferenceTemplateListResponseType.php | 6 +- ...tConferenceTemplateParticipantResponse.php | 6 +- ...ferenceTemplateParticipantResponseType.php | 6 +- .../GetConferenceTemplateResponse.php | 6 +- .../GetConferenceTemplateResponseType.php | 6 +- .../GetParticipantStatusResponse.php | 6 +- .../GetParticipantStatusResponseType.php | 6 +- .../GetRunningConferenceResponse.php | 6 +- .../GetRunningConferenceResponseType.php | 6 +- .../ConferenceCall/NewParticipantResponse.php | 6 +- .../NewParticipantResponseType.php | 6 +- .../RemoveConferenceResponse.php | 6 +- ...eConferenceTemplateParticipantResponse.php | 6 +- .../RemoveConferenceTemplateResponse.php | 6 +- .../RemoveParticipantResponse.php | 6 +- .../UpdateConferenceResponse.php | 6 +- ...eConferenceTemplateParticipantResponse.php | 6 +- .../UpdateConferenceTemplateResponse.php | 6 +- .../UpdateParticipantResponse.php | 6 +- .../DeveloperGarden/Response/Exception.php | 6 +- .../Response/IpLocation/CityType.php | 6 +- .../IpLocation/GeoCoordinatesType.php | 6 +- .../IpLocation/IPAddressLocationType.php | 6 +- .../Response/IpLocation/LocateIPResponse.php | 6 +- .../IpLocation/LocateIPResponseType.php | 6 +- .../Response/IpLocation/RegionType.php | 6 +- .../LocalSearch/LocalSearchResponse.php | 6 +- .../LocalSearch/LocalSearchResponseType.php | 6 +- .../Response/ResponseAbstract.php | 6 +- .../SecurityTokenServer/Exception.php | 6 +- .../SecurityTokenServer/GetTokensResponse.php | 6 +- .../SecurityTokenServer/Interface.php | 6 +- .../SecurityTokenResponse.php | 6 +- .../Response/SendSms/SendFlashSMSResponse.php | 6 +- .../Response/SendSms/SendSMSResponse.php | 6 +- .../Response/SendSms/SendSmsAbstract.php | 6 +- .../GetValidatedNumbersResponse.php | 6 +- .../SmsValidation/InvalidateResponse.php | 6 +- .../SendValidationKeywordResponse.php | 6 +- .../SmsValidation/ValidateResponse.php | 6 +- .../SmsValidation/ValidatedNumber.php | 6 +- .../VoiceButler/CallStatus2Response.php | 6 +- .../VoiceButler/CallStatusResponse.php | 6 +- .../Response/VoiceButler/NewCallResponse.php | 6 +- .../VoiceButler/NewCallSequencedResponse.php | 6 +- .../VoiceButler/TearDownCallResponse.php | 6 +- .../VoiceButler/VoiceButlerAbstract.php | 6 +- .../DeveloperGarden/SecurityTokenServer.php | 6 +- .../SecurityTokenServer/Cache.php | 6 +- lib/Zend/Service/DeveloperGarden/SendSms.php | 6 +- .../Service/DeveloperGarden/SmsValidation.php | 6 +- .../Service/DeveloperGarden/VoiceCall.php | 6 +- lib/Zend/Service/Ebay/Abstract.php | 4 +- lib/Zend/Service/Ebay/Exception.php | 4 +- lib/Zend/Service/Ebay/Finding.php | 4 +- lib/Zend/Service/Ebay/Finding/Abstract.php | 4 +- lib/Zend/Service/Ebay/Finding/Aspect.php | 4 +- .../Finding/Aspect/Histogram/Container.php | 4 +- .../Ebay/Finding/Aspect/Histogram/Value.php | 4 +- .../Finding/Aspect/Histogram/Value/Set.php | 4 +- lib/Zend/Service/Ebay/Finding/Aspect/Set.php | 4 +- lib/Zend/Service/Ebay/Finding/Category.php | 4 +- .../Ebay/Finding/Category/Histogram.php | 4 +- .../Finding/Category/Histogram/Container.php | 4 +- .../Ebay/Finding/Category/Histogram/Set.php | 4 +- lib/Zend/Service/Ebay/Finding/Error/Data.php | 4 +- .../Service/Ebay/Finding/Error/Data/Set.php | 4 +- .../Service/Ebay/Finding/Error/Message.php | 4 +- lib/Zend/Service/Ebay/Finding/Exception.php | 4 +- lib/Zend/Service/Ebay/Finding/ListingInfo.php | 4 +- .../Service/Ebay/Finding/PaginationOutput.php | 4 +- .../Ebay/Finding/Response/Abstract.php | 4 +- .../Ebay/Finding/Response/Histograms.php | 4 +- .../Service/Ebay/Finding/Response/Items.php | 4 +- .../Ebay/Finding/Response/Keywords.php | 4 +- lib/Zend/Service/Ebay/Finding/Search/Item.php | 4 +- .../Service/Ebay/Finding/Search/Item/Set.php | 4 +- .../Service/Ebay/Finding/Search/Result.php | 4 +- lib/Zend/Service/Ebay/Finding/SellerInfo.php | 4 +- .../Service/Ebay/Finding/SellingStatus.php | 4 +- .../Service/Ebay/Finding/Set/Abstract.php | 4 +- .../Service/Ebay/Finding/ShippingInfo.php | 4 +- lib/Zend/Service/Ebay/Finding/Storefront.php | 4 +- lib/Zend/Service/Exception.php | 6 +- lib/Zend/Service/Flickr.php | 6 +- lib/Zend/Service/Flickr/Image.php | 6 +- lib/Zend/Service/Flickr/Result.php | 6 +- lib/Zend/Service/Flickr/ResultSet.php | 6 +- lib/Zend/Service/LiveDocx.php | 132 +- lib/Zend/Service/LiveDocx/Exception.php | 6 +- lib/Zend/Service/LiveDocx/MailMerge.php | 142 +- lib/Zend/Service/Nirvanix.php | 6 +- lib/Zend/Service/Nirvanix/Exception.php | 6 +- lib/Zend/Service/Nirvanix/Namespace/Base.php | 8 +- lib/Zend/Service/Nirvanix/Namespace/Imfs.php | 6 +- lib/Zend/Service/Nirvanix/Response.php | 6 +- lib/Zend/Service/Rackspace/Abstract.php | 387 - lib/Zend/Service/Rackspace/Exception.php | 36 - lib/Zend/Service/Rackspace/Files.php | 691 -- .../Service/Rackspace/Files/Container.php | 329 - .../Service/Rackspace/Files/ContainerList.php | 221 - .../Service/Rackspace/Files/Exception.php | 36 - lib/Zend/Service/Rackspace/Files/Object.php | 271 - .../Service/Rackspace/Files/ObjectList.php | 237 - lib/Zend/Service/Rackspace/Servers.php | 1281 --- .../Service/Rackspace/Servers/Exception.php | 36 - lib/Zend/Service/Rackspace/Servers/Image.php | 209 - .../Service/Rackspace/Servers/ImageList.php | 234 - lib/Zend/Service/Rackspace/Servers/Server.php | 325 - .../Service/Rackspace/Servers/ServerList.php | 235 - .../Rackspace/Servers/SharedIpGroup.php | 165 - .../Rackspace/Servers/SharedIpGroupList.php | 234 - lib/Zend/Service/ReCaptcha.php | 39 +- lib/Zend/Service/ReCaptcha/Exception.php | 6 +- lib/Zend/Service/ReCaptcha/MailHide.php | 28 +- .../Service/ReCaptcha/MailHide/Exception.php | 6 +- lib/Zend/Service/ReCaptcha/Response.php | 25 +- .../Service/ShortUrl/AbstractShortener.php | 10 +- lib/Zend/Service/ShortUrl/BitLy.php | 167 - lib/Zend/Service/ShortUrl/Exception.php | 4 +- lib/Zend/Service/ShortUrl/IsGd.php | 22 +- lib/Zend/Service/ShortUrl/JdemCz.php | 20 +- lib/Zend/Service/ShortUrl/MetamarkNet.php | 20 +- lib/Zend/Service/ShortUrl/Shortener.php | 10 +- lib/Zend/Service/ShortUrl/TinyUrlCom.php | 26 +- lib/Zend/Service/Simpy.php | 433 + lib/Zend/Service/Simpy/Link.php | 215 + lib/Zend/Service/Simpy/LinkQuery.php | 200 + lib/Zend/Service/Simpy/LinkSet.php | 83 + lib/Zend/Service/Simpy/Note.php | 215 + lib/Zend/Service/Simpy/NoteSet.php | 83 + lib/Zend/Service/Simpy/Tag.php | 81 + lib/Zend/Service/Simpy/TagSet.php | 83 + lib/Zend/Service/Simpy/Watchlist.php | 191 + lib/Zend/Service/Simpy/WatchlistFilter.php | 81 + lib/Zend/Service/Simpy/WatchlistFilterSet.php | 77 + lib/Zend/Service/Simpy/WatchlistSet.php | 82 + lib/Zend/Service/SlideShare.php | 226 +- lib/Zend/Service/SlideShare/Exception.php | 6 +- lib/Zend/Service/SlideShare/SlideShow.php | 9 +- lib/Zend/Service/SqlAzure/Exception.php | 35 - .../Service/SqlAzure/Management/Client.php | 609 - .../Service/SqlAzure/Management/Exception.php | 35 - .../Management/FirewallRuleInstance.php | 57 - .../SqlAzure/Management/ServerInstance.php | 59 - .../Management/ServiceEntityAbstract.php | 67 - lib/Zend/Service/StrikeIron.php | 6 +- lib/Zend/Service/StrikeIron/Base.php | 14 +- lib/Zend/Service/StrikeIron/Decorator.php | 6 +- lib/Zend/Service/StrikeIron/Exception.php | 6 +- .../Service/StrikeIron/SalesUseTaxBasic.php | 6 +- .../StrikeIron/USAddressVerification.php | 6 +- lib/Zend/Service/StrikeIron/ZipCodeInfo.php | 6 +- lib/Zend/Service/Technorati.php | 6 +- lib/Zend/Service/Technorati/Author.php | 6 +- .../Service/Technorati/BlogInfoResult.php | 6 +- lib/Zend/Service/Technorati/CosmosResult.php | 6 +- .../Service/Technorati/CosmosResultSet.php | 6 +- .../Service/Technorati/DailyCountsResult.php | 6 +- .../Technorati/DailyCountsResultSet.php | 6 +- lib/Zend/Service/Technorati/Exception.php | 6 +- lib/Zend/Service/Technorati/GetInfoResult.php | 6 +- lib/Zend/Service/Technorati/KeyInfoResult.php | 6 +- lib/Zend/Service/Technorati/Result.php | 6 +- lib/Zend/Service/Technorati/ResultSet.php | 6 +- lib/Zend/Service/Technorati/SearchResult.php | 6 +- .../Service/Technorati/SearchResultSet.php | 6 +- lib/Zend/Service/Technorati/TagResult.php | 6 +- lib/Zend/Service/Technorati/TagResultSet.php | 6 +- lib/Zend/Service/Technorati/TagsResult.php | 6 +- lib/Zend/Service/Technorati/TagsResultSet.php | 6 +- lib/Zend/Service/Technorati/Utils.php | 6 +- lib/Zend/Service/Technorati/Weblog.php | 6 +- lib/Zend/Service/Twitter.php | 1452 +-- lib/Zend/Service/Twitter/Exception.php | 6 +- lib/Zend/Service/Twitter/Response.php | 179 - lib/Zend/Service/Twitter/Search.php | 167 + .../WindowsAzure/CommandLine/Certificate.php | 170 - .../WindowsAzure/CommandLine/Deployment.php | 580 - .../CommandLine/GetAsynchronousOperation.php | 88 - .../WindowsAzure/CommandLine/Package.php | 198 - .../PackageScaffolderAbstract.php | 249 - .../Scaffolders/DefaultScaffolder.phar | Bin 4404199 -> 0 bytes .../Scaffolders/DefaultScaffolder/build.bat | 1 - .../Scaffolders/DefaultScaffolder/index.php | 63 - .../resources/PhpOnAzure.Web/Web.config | 20 - .../bin/add-environment-variables.cmd | 7 - .../bin/add-environment-variables.ps1 | 15 - .../PhpOnAzure.Web/bin/install-php.cmd | 12 - .../PhpOnAzure.Web/diagnostics.wadcfg | 35 - .../WebPICmdLine/Microsoft.Web.Deployment.dll | Bin 1201991 -> 0 bytes .../Microsoft.Web.PlatformInstaller.UI.dll | Bin 546620 -> 0 bytes .../Microsoft.Web.PlatformInstaller.dll | Bin 333658 -> 0 bytes .../resources/WebPICmdLine/WebpiCmdLine.exe | Bin 94461 -> 0 bytes .../resources/WebPICmdLine/license.rtf | 41 - .../resources/ServiceConfiguration.cscfg | 9 - .../resources/ServiceDefinition.csdef | 24 - .../WindowsAzure/CommandLine/Service.php | 192 - .../WindowsAzure/CommandLine/Storage.php | 189 - .../Credentials/CredentialsAbstract.php | 15 +- .../WindowsAzure/Credentials/Exception.php | 4 +- .../Credentials/SharedAccessSignature.php | 17 +- .../WindowsAzure/Credentials/SharedKey.php | 28 +- .../Credentials/SharedKeyLite.php | 22 +- .../Diagnostics/ConfigurationDataSources.php | 14 +- ...figurationDiagnosticInfrastructureLogs.php | 18 +- .../Diagnostics/ConfigurationDirectories.php | 9 +- .../Diagnostics/ConfigurationInstance.php | 13 +- .../Diagnostics/ConfigurationLogs.php | 9 +- .../ConfigurationObjectBaseAbstract.php | 13 +- .../ConfigurationPerformanceCounters.php | 10 +- .../ConfigurationWindowsEventLog.php | 19 +- .../DirectoryConfigurationSubscription.php | 13 +- .../WindowsAzure/Diagnostics/Exception.php | 7 +- .../WindowsAzure/Diagnostics/LogLevel.php | 4 +- .../WindowsAzure/Diagnostics/Manager.php | 66 +- .../PerformanceCounterSubscription.php | 9 +- lib/Zend/Service/WindowsAzure/Exception.php | 6 +- .../Service/WindowsAzure/Log/Exception.php | 38 - .../Log/Formatter/WindowsAzure.php | 73 - .../WindowsAzure/Log/Writer/WindowsAzure.php | 196 - .../Management/AffinityGroupInstance.php | 66 - .../Management/CertificateInstance.php | 60 - .../WindowsAzure/Management/Client.php | 2423 ---- .../Management/DeploymentInstance.php | 90 - .../WindowsAzure/Management/Exception.php | 38 - .../Management/HostedServiceInstance.php | 69 - .../Management/LocationInstance.php | 51 - .../OperatingSystemFamilyInstance.php | 57 - .../Management/OperatingSystemInstance.php | 66 - .../Management/OperationStatusInstance.php | 60 - .../Management/ServiceEntityAbstract.php | 67 - .../Management/StorageServiceInstance.php | 66 - .../SubscriptionOperationInstance.php | 77 - .../WindowsAzure/RetryPolicy/Exception.php | 6 +- .../WindowsAzure/RetryPolicy/NoRetry.php | 6 +- .../WindowsAzure/RetryPolicy/RetryN.php | 12 +- .../RetryPolicy/RetryPolicyAbstract.php | 13 +- .../Service/WindowsAzure/SessionHandler.php | 279 +- lib/Zend/Service/WindowsAzure/Storage.php | 51 +- .../Service/WindowsAzure/Storage/Batch.php | 23 +- .../Storage/BatchStorageAbstract.php | 37 +- .../Service/WindowsAzure/Storage/Blob.php | 355 +- .../WindowsAzure/Storage/Blob/Stream.php | 95 +- .../WindowsAzure/Storage/BlobContainer.php | 15 +- .../WindowsAzure/Storage/BlobInstance.php | 75 +- .../Storage/DynamicTableEntity.php | 43 +- .../WindowsAzure/Storage/LeaseInstance.php | 9 +- .../Storage/PageRegionInstance.php | 9 +- .../Service/WindowsAzure/Storage/Queue.php | 133 +- .../WindowsAzure/Storage/QueueInstance.php | 11 +- .../WindowsAzure/Storage/QueueMessage.php | 11 +- .../WindowsAzure/Storage/SignedIdentifier.php | 11 +- .../Storage/StorageEntityAbstract.php | 18 +- .../Service/WindowsAzure/Storage/Table.php | 227 +- .../WindowsAzure/Storage/TableEntity.php | 60 +- .../WindowsAzure/Storage/TableEntityQuery.php | 25 +- .../WindowsAzure/Storage/TableInstance.php | 11 +- lib/Zend/Service/Yahoo.php | 6 +- lib/Zend/Service/Yahoo/Image.php | 6 +- lib/Zend/Service/Yahoo/ImageResult.php | 6 +- lib/Zend/Service/Yahoo/ImageResultSet.php | 6 +- lib/Zend/Service/Yahoo/InlinkDataResult.php | 6 +- .../Service/Yahoo/InlinkDataResultSet.php | 6 +- lib/Zend/Service/Yahoo/LocalResult.php | 6 +- lib/Zend/Service/Yahoo/LocalResultSet.php | 6 +- lib/Zend/Service/Yahoo/NewsResult.php | 6 +- lib/Zend/Service/Yahoo/NewsResultSet.php | 6 +- lib/Zend/Service/Yahoo/PageDataResult.php | 6 +- lib/Zend/Service/Yahoo/PageDataResultSet.php | 6 +- lib/Zend/Service/Yahoo/Result.php | 6 +- lib/Zend/Service/Yahoo/ResultSet.php | 6 +- lib/Zend/Service/Yahoo/VideoResult.php | 6 +- lib/Zend/Service/Yahoo/VideoResultSet.php | 6 +- lib/Zend/Service/Yahoo/WebResult.php | 6 +- lib/Zend/Service/Yahoo/WebResultSet.php | 6 +- lib/Zend/Session.php | 75 +- lib/Zend/Session/Abstract.php | 8 +- lib/Zend/Session/Exception.php | 10 +- lib/Zend/Session/Namespace.php | 6 +- lib/Zend/Session/SaveHandler/DbTable.php | 12 +- lib/Zend/Session/SaveHandler/Exception.php | 6 +- lib/Zend/Session/SaveHandler/Interface.php | 6 +- lib/Zend/Session/Validator/Abstract.php | 12 +- lib/Zend/Session/Validator/HttpUserAgent.php | 6 +- lib/Zend/Session/Validator/Interface.php | 6 +- lib/Zend/Soap/AutoDiscover.php | 16 +- lib/Zend/Soap/AutoDiscover/Exception.php | 4 +- lib/Zend/Soap/Client.php | 6 +- lib/Zend/Soap/Client/Common.php | 4 +- lib/Zend/Soap/Client/DotNet.php | 4 +- lib/Zend/Soap/Client/Exception.php | 6 +- lib/Zend/Soap/Client/Local.php | 14 +- lib/Zend/Soap/Server.php | 86 +- lib/Zend/Soap/Server/Exception.php | 6 +- lib/Zend/Soap/Server/Proxy.php | 75 - lib/Zend/Soap/Wsdl.php | 28 +- lib/Zend/Soap/Wsdl/Exception.php | 6 +- lib/Zend/Soap/Wsdl/Strategy/Abstract.php | 6 +- lib/Zend/Soap/Wsdl/Strategy/AnyType.php | 6 +- .../Soap/Wsdl/Strategy/ArrayOfTypeComplex.php | 6 +- .../Wsdl/Strategy/ArrayOfTypeSequence.php | 6 +- lib/Zend/Soap/Wsdl/Strategy/Composite.php | 6 +- .../Soap/Wsdl/Strategy/DefaultComplexType.php | 6 +- lib/Zend/Soap/Wsdl/Strategy/Interface.php | 6 +- lib/Zend/Stdlib/CallbackHandler.php | 301 - lib/Zend/Stdlib/Exception.php | 31 - .../Exception/InvalidCallbackException.php | 35 - lib/Zend/Stdlib/PriorityQueue.php | 319 - lib/Zend/Stdlib/SplPriorityQueue.php | 499 - lib/Zend/Tag/Cloud.php | 6 +- lib/Zend/Tag/Cloud/Decorator/Cloud.php | 6 +- lib/Zend/Tag/Cloud/Decorator/Exception.php | 6 +- lib/Zend/Tag/Cloud/Decorator/HtmlCloud.php | 6 +- lib/Zend/Tag/Cloud/Decorator/HtmlTag.php | 6 +- lib/Zend/Tag/Cloud/Decorator/Tag.php | 6 +- lib/Zend/Tag/Cloud/Exception.php | 6 +- lib/Zend/Tag/Exception.php | 6 +- lib/Zend/Tag/Item.php | 6 +- lib/Zend/Tag/ItemList.php | 6 +- lib/Zend/Tag/Taggable.php | 6 +- lib/Zend/Test/DbAdapter.php | 10 +- lib/Zend/Test/DbStatement.php | 6 +- lib/Zend/Test/PHPUnit/Constraint/DomQuery.php | 6 +- .../Test/PHPUnit/Constraint/Exception.php | 6 +- lib/Zend/Test/PHPUnit/Constraint/Redirect.php | 30 +- .../PHPUnit/Constraint/ResponseHeader.php | 19 +- lib/Zend/Test/PHPUnit/ControllerTestCase.php | 51 +- lib/Zend/Test/PHPUnit/DatabaseTestCase.php | 6 +- lib/Zend/Test/PHPUnit/Db/Connection.php | 6 +- lib/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php | 6 +- lib/Zend/Test/PHPUnit/Db/DataSet/DbTable.php | 6 +- .../PHPUnit/Db/DataSet/DbTableDataSet.php | 6 +- .../Test/PHPUnit/Db/DataSet/QueryDataSet.php | 6 +- .../Test/PHPUnit/Db/DataSet/QueryTable.php | 6 +- lib/Zend/Test/PHPUnit/Db/Exception.php | 6 +- lib/Zend/Test/PHPUnit/Db/Metadata/Generic.php | 6 +- .../Test/PHPUnit/Db/Operation/DeleteAll.php | 6 +- lib/Zend/Test/PHPUnit/Db/Operation/Insert.php | 6 +- .../Test/PHPUnit/Db/Operation/Truncate.php | 8 +- lib/Zend/Test/PHPUnit/Db/SimpleTester.php | 6 +- lib/Zend/Text/Exception.php | 6 +- lib/Zend/Text/Figlet.php | 6 +- lib/Zend/Text/Figlet/Exception.php | 6 +- lib/Zend/Text/Figlet/zend-framework.flf | 2 +- lib/Zend/Text/MultiByte.php | 122 +- lib/Zend/Text/Table.php | 7 +- lib/Zend/Text/Table/Column.php | 6 +- lib/Zend/Text/Table/Decorator/Ascii.php | 6 +- lib/Zend/Text/Table/Decorator/Interface.php | 6 +- lib/Zend/Text/Table/Decorator/Unicode.php | 6 +- lib/Zend/Text/Table/Exception.php | 6 +- lib/Zend/Text/Table/Row.php | 10 +- lib/Zend/TimeSync.php | 8 +- lib/Zend/TimeSync/Exception.php | 6 +- lib/Zend/TimeSync/Ntp.php | 6 +- lib/Zend/TimeSync/Protocol.php | 6 +- lib/Zend/TimeSync/Sntp.php | 6 +- lib/Zend/Tool/Framework/Action/Base.php | 6 +- lib/Zend/Tool/Framework/Action/Exception.php | 6 +- lib/Zend/Tool/Framework/Action/Interface.php | 6 +- lib/Zend/Tool/Framework/Action/Repository.php | 6 +- lib/Zend/Tool/Framework/Client/Abstract.php | 18 +- lib/Zend/Tool/Framework/Client/Config.php | 14 +- lib/Zend/Tool/Framework/Client/Console.php | 33 +- .../Client/Console/ArgumentParser.php | 6 +- .../Framework/Client/Console/HelpSystem.php | 10 +- .../Framework/Client/Console/Manifest.php | 6 +- .../Console/ResponseDecorator/AlignCenter.php | 6 +- .../Console/ResponseDecorator/Blockize.php | 6 +- .../Console/ResponseDecorator/Colorizer.php | 6 +- .../Console/ResponseDecorator/Indention.php | 6 +- lib/Zend/Tool/Framework/Client/Exception.php | 6 +- .../Client/Interactive/InputHandler.php | 6 +- .../Client/Interactive/InputInterface.php | 6 +- .../Client/Interactive/InputRequest.php | 6 +- .../Client/Interactive/InputResponse.php | 6 +- .../Client/Interactive/OutputInterface.php | 6 +- lib/Zend/Tool/Framework/Client/Manifest.php | 8 +- lib/Zend/Tool/Framework/Client/Request.php | 6 +- lib/Zend/Tool/Framework/Client/Response.php | 6 +- .../Response/ContentDecorator/Interface.php | 6 +- .../Response/ContentDecorator/Separator.php | 6 +- lib/Zend/Tool/Framework/Client/Storage.php | 6 +- .../Client/Storage/AdapterInterface.php | 6 +- .../Framework/Client/Storage/Directory.php | 6 +- lib/Zend/Tool/Framework/Exception.php | 6 +- lib/Zend/Tool/Framework/Loader/Abstract.php | 8 +- .../Tool/Framework/Loader/BasicLoader.php | 24 +- .../Framework/Loader/IncludePathLoader.php | 6 +- .../RecursiveFilterIterator.php | 6 +- lib/Zend/Tool/Framework/Loader/Interface.php | 6 +- .../Framework/Manifest/ActionManifestable.php | 6 +- .../Framework/Manifest/ActionMetadata.php | 31 - .../Tool/Framework/Manifest/Exception.php | 6 +- .../Tool/Framework/Manifest/Indexable.php | 6 +- .../Tool/Framework/Manifest/Interface.php | 6 +- lib/Zend/Tool/Framework/Manifest/Metadata.php | 31 - .../Manifest/MetadataManifestable.php | 6 +- .../Manifest/ProviderManifestable.php | 6 +- .../Framework/Manifest/ProviderMetadata.php | 31 - .../Tool/Framework/Manifest/Repository.php | 10 +- .../Tool/Framework/Metadata/Attributable.php | 6 +- lib/Zend/Tool/Framework/Metadata/Basic.php | 8 +- lib/Zend/Tool/Framework/Metadata/Dynamic.php | 30 +- .../Tool/Framework/Metadata/Interface.php | 8 +- lib/Zend/Tool/Framework/Metadata/Tool.php | 6 +- lib/Zend/Tool/Framework/Provider/Abstract.php | 6 +- .../Provider/DocblockManifestable.php | 6 +- .../Tool/Framework/Provider/Exception.php | 6 +- .../Tool/Framework/Provider/Initializable.php | 4 +- .../Tool/Framework/Provider/Interactable.php | 6 +- .../Tool/Framework/Provider/Interface.php | 6 +- .../Tool/Framework/Provider/Pretendable.php | 6 +- .../Tool/Framework/Provider/Repository.php | 8 +- .../Tool/Framework/Provider/Signature.php | 6 +- lib/Zend/Tool/Framework/Registry.php | 6 +- .../Framework/Registry/EnabledInterface.php | 6 +- .../Tool/Framework/Registry/Exception.php | 6 +- .../Tool/Framework/Registry/Interface.php | 6 +- .../Tool/Framework/System/Action/Create.php | 6 +- .../Tool/Framework/System/Action/Delete.php | 6 +- lib/Zend/Tool/Framework/System/Manifest.php | 6 +- .../Tool/Framework/System/Provider/Config.php | 10 +- .../Framework/System/Provider/Manifest.php | 6 +- .../Framework/System/Provider/Phpinfo.php | 6 +- .../Framework/System/Provider/Version.php | 6 +- .../Tool/Project/Context/Content/Engine.php | 6 +- .../Context/Content/Engine/CodeGenerator.php | 6 +- .../Project/Context/Content/Engine/Phtml.php | 6 +- lib/Zend/Tool/Project/Context/Exception.php | 6 +- .../Project/Context/Filesystem/Abstract.php | 6 +- .../Project/Context/Filesystem/Directory.php | 10 +- .../Tool/Project/Context/Filesystem/File.php | 30 +- lib/Zend/Tool/Project/Context/Interface.php | 6 +- lib/Zend/Tool/Project/Context/Repository.php | 6 +- .../Tool/Project/Context/System/Interface.php | 6 +- .../Context/System/NotOverwritable.php | 6 +- .../Context/System/ProjectDirectory.php | 6 +- .../Context/System/ProjectProfileFile.php | 10 +- .../System/ProjectProvidersDirectory.php | 10 +- .../Context/System/TopLevelRestrictable.php | 6 +- .../Project/Context/Zf/AbstractClassFile.php | 18 +- .../Tool/Project/Context/Zf/ActionMethod.php | 6 +- .../Tool/Project/Context/Zf/ApisDirectory.php | 10 +- .../Context/Zf/ApplicationConfigFile.php | 86 +- .../Context/Zf/ApplicationDirectory.php | 16 +- .../Tool/Project/Context/Zf/BootstrapFile.php | 16 +- .../Project/Context/Zf/CacheDirectory.php | 6 +- .../Tool/Project/Context/Zf/ConfigFile.php | 6 +- .../Project/Context/Zf/ConfigsDirectory.php | 6 +- .../Project/Context/Zf/ControllerFile.php | 22 +- .../Context/Zf/ControllersDirectory.php | 6 +- .../Tool/Project/Context/Zf/DataDirectory.php | 6 +- .../Project/Context/Zf/DbTableDirectory.php | 6 +- .../Tool/Project/Context/Zf/DbTableFile.php | 18 +- .../Tool/Project/Context/Zf/DocsDirectory.php | 6 +- lib/Zend/Tool/Project/Context/Zf/FormFile.php | 6 +- .../Project/Context/Zf/FormsDirectory.php | 6 +- .../Tool/Project/Context/Zf/HtaccessFile.php | 18 +- .../Project/Context/Zf/LayoutScriptFile.php | 6 +- .../Context/Zf/LayoutScriptsDirectory.php | 6 +- .../Project/Context/Zf/LayoutsDirectory.php | 6 +- .../Project/Context/Zf/LibraryDirectory.php | 6 +- .../Project/Context/Zf/LocalesDirectory.php | 6 +- .../Tool/Project/Context/Zf/LogsDirectory.php | 6 +- .../Tool/Project/Context/Zf/ModelFile.php | 27 +- .../Project/Context/Zf/ModelsDirectory.php | 6 +- .../Project/Context/Zf/ModuleDirectory.php | 6 +- .../Project/Context/Zf/ModulesDirectory.php | 6 +- .../Context/Zf/ProjectProviderFile.php | 6 +- .../Project/Context/Zf/PublicDirectory.php | 6 +- .../Context/Zf/PublicImagesDirectory.php | 6 +- .../Project/Context/Zf/PublicIndexFile.php | 6 +- .../Context/Zf/PublicScriptsDirectory.php | 6 +- .../Context/Zf/PublicStylesheetsDirectory.php | 6 +- .../Context/Zf/SearchIndexesDirectory.php | 6 +- .../Project/Context/Zf/ServicesDirectory.php | 55 - .../Project/Context/Zf/SessionsDirectory.php | 6 +- .../Project/Context/Zf/TemporaryDirectory.php | 6 +- .../Zf/TestApplicationActionMethod.php | 229 - .../Zf/TestApplicationBootstrapFile.php | 6 +- .../Zf/TestApplicationControllerDirectory.php | 6 +- .../Zf/TestApplicationControllerFile.php | 50 +- .../Context/Zf/TestApplicationDirectory.php | 6 +- .../Zf/TestApplicationModuleDirectory.php | 98 - .../Zf/TestApplicationModulesDirectory.php | 57 - .../Context/Zf/TestLibraryBootstrapFile.php | 6 +- .../Context/Zf/TestLibraryDirectory.php | 6 +- .../Project/Context/Zf/TestLibraryFile.php | 6 +- .../Zf/TestLibraryNamespaceDirectory.php | 6 +- .../Context/Zf/TestPHPUnitBootstrapFile.php | 88 - .../Context/Zf/TestPHPUnitConfigFile.php | 30 +- .../Project/Context/Zf/TestsDirectory.php | 6 +- .../Project/Context/Zf/UploadsDirectory.php | 6 +- .../Zf/ViewControllerScriptsDirectory.php | 6 +- .../Context/Zf/ViewFiltersDirectory.php | 6 +- .../Context/Zf/ViewHelpersDirectory.php | 6 +- .../Project/Context/Zf/ViewScriptFile.php | 35 +- .../Context/Zf/ViewScriptsDirectory.php | 6 +- .../Project/Context/Zf/ViewsDirectory.php | 6 +- .../Context/Zf/ZfStandardLibraryDirectory.php | 6 +- lib/Zend/Tool/Project/Exception.php | 6 +- lib/Zend/Tool/Project/Profile.php | 8 +- lib/Zend/Tool/Project/Profile/Exception.php | 6 +- .../Project/Profile/FileParser/Interface.php | 6 +- .../Tool/Project/Profile/FileParser/Xml.php | 16 +- .../Profile/Iterator/ContextFilter.php | 10 +- .../Iterator/EnabledResourceFilter.php | 6 +- lib/Zend/Tool/Project/Profile/Resource.php | 6 +- .../Project/Profile/Resource/Container.php | 12 +- .../Profile/Resource/SearchConstraints.php | 6 +- lib/Zend/Tool/Project/Provider/Abstract.php | 36 +- lib/Zend/Tool/Project/Provider/Action.php | 70 +- .../Tool/Project/Provider/Application.php | 38 +- lib/Zend/Tool/Project/Provider/Controller.php | 55 +- lib/Zend/Tool/Project/Provider/DbAdapter.php | 58 +- lib/Zend/Tool/Project/Provider/DbTable.php | 87 +- lib/Zend/Tool/Project/Provider/Exception.php | 6 +- lib/Zend/Tool/Project/Provider/Form.php | 22 +- lib/Zend/Tool/Project/Provider/Layout.php | 103 +- lib/Zend/Tool/Project/Provider/Manifest.php | 20 +- lib/Zend/Tool/Project/Provider/Model.php | 31 +- lib/Zend/Tool/Project/Provider/Module.php | 10 +- lib/Zend/Tool/Project/Provider/Profile.php | 6 +- lib/Zend/Tool/Project/Provider/Project.php | 47 +- .../Tool/Project/Provider/ProjectProvider.php | 6 +- lib/Zend/Tool/Project/Provider/Test.php | 52 +- lib/Zend/Tool/Project/Provider/View.php | 10 +- lib/Zend/Translate.php | 6 +- lib/Zend/Translate/Adapter.php | 27 +- lib/Zend/Translate/Adapter/Array.php | 6 +- lib/Zend/Translate/Adapter/Csv.php | 6 +- lib/Zend/Translate/Adapter/Gettext.php | 10 +- lib/Zend/Translate/Adapter/Ini.php | 6 +- lib/Zend/Translate/Adapter/Qt.php | 11 +- lib/Zend/Translate/Adapter/Tbx.php | 11 +- lib/Zend/Translate/Adapter/Tmx.php | 11 +- lib/Zend/Translate/Adapter/Xliff.php | 11 +- lib/Zend/Translate/Adapter/XmlTm.php | 11 +- lib/Zend/Translate/Exception.php | 6 +- lib/Zend/Translate/Plural.php | 6 +- lib/Zend/Uri.php | 6 +- lib/Zend/Uri/Exception.php | 6 +- lib/Zend/Uri/Http.php | 20 +- lib/Zend/Validate.php | 6 +- lib/Zend/Validate/Abstract.php | 16 +- lib/Zend/Validate/Alnum.php | 6 +- lib/Zend/Validate/Alpha.php | 6 +- lib/Zend/Validate/Barcode.php | 6 +- lib/Zend/Validate/Barcode/AdapterAbstract.php | 6 +- .../Validate/Barcode/AdapterInterface.php | 6 +- lib/Zend/Validate/Barcode/Code25.php | 6 +- .../Validate/Barcode/Code25interleaved.php | 6 +- lib/Zend/Validate/Barcode/Code39.php | 6 +- lib/Zend/Validate/Barcode/Code39ext.php | 6 +- lib/Zend/Validate/Barcode/Code93.php | 6 +- lib/Zend/Validate/Barcode/Code93ext.php | 6 +- lib/Zend/Validate/Barcode/Ean12.php | 6 +- lib/Zend/Validate/Barcode/Ean13.php | 6 +- lib/Zend/Validate/Barcode/Ean14.php | 6 +- lib/Zend/Validate/Barcode/Ean18.php | 6 +- lib/Zend/Validate/Barcode/Ean2.php | 6 +- lib/Zend/Validate/Barcode/Ean5.php | 6 +- lib/Zend/Validate/Barcode/Ean8.php | 6 +- lib/Zend/Validate/Barcode/Gtin12.php | 6 +- lib/Zend/Validate/Barcode/Gtin13.php | 6 +- lib/Zend/Validate/Barcode/Gtin14.php | 6 +- lib/Zend/Validate/Barcode/Identcode.php | 6 +- lib/Zend/Validate/Barcode/Intelligentmail.php | 6 +- lib/Zend/Validate/Barcode/Issn.php | 6 +- lib/Zend/Validate/Barcode/Itf14.php | 6 +- lib/Zend/Validate/Barcode/Leitcode.php | 6 +- lib/Zend/Validate/Barcode/Planet.php | 6 +- lib/Zend/Validate/Barcode/Postnet.php | 6 +- lib/Zend/Validate/Barcode/Royalmail.php | 6 +- lib/Zend/Validate/Barcode/Sscc.php | 6 +- lib/Zend/Validate/Barcode/Upca.php | 6 +- lib/Zend/Validate/Barcode/Upce.php | 6 +- lib/Zend/Validate/Between.php | 6 +- lib/Zend/Validate/Callback.php | 6 +- lib/Zend/Validate/Ccnum.php | 6 +- lib/Zend/Validate/CreditCard.php | 6 +- lib/Zend/Validate/Date.php | 6 +- lib/Zend/Validate/Db/Abstract.php | 8 +- lib/Zend/Validate/Db/NoRecordExists.php | 6 +- lib/Zend/Validate/Db/RecordExists.php | 6 +- lib/Zend/Validate/Digits.php | 6 +- lib/Zend/Validate/EmailAddress.php | 38 +- lib/Zend/Validate/Exception.php | 6 +- lib/Zend/Validate/File/Count.php | 6 +- lib/Zend/Validate/File/Crc32.php | 6 +- lib/Zend/Validate/File/ExcludeExtension.php | 6 +- lib/Zend/Validate/File/ExcludeMimeType.php | 6 +- lib/Zend/Validate/File/Exists.php | 6 +- lib/Zend/Validate/File/Extension.php | 6 +- lib/Zend/Validate/File/FilesSize.php | 6 +- lib/Zend/Validate/File/Hash.php | 6 +- lib/Zend/Validate/File/ImageSize.php | 6 +- lib/Zend/Validate/File/IsCompressed.php | 7 +- lib/Zend/Validate/File/IsImage.php | 6 +- lib/Zend/Validate/File/Md5.php | 6 +- lib/Zend/Validate/File/MimeType.php | 50 +- lib/Zend/Validate/File/NotExists.php | 6 +- lib/Zend/Validate/File/Sha1.php | 6 +- lib/Zend/Validate/File/Size.php | 6 +- lib/Zend/Validate/File/Upload.php | 29 +- lib/Zend/Validate/File/WordCount.php | 6 +- lib/Zend/Validate/Float.php | 6 +- lib/Zend/Validate/GreaterThan.php | 6 +- lib/Zend/Validate/Hex.php | 6 +- lib/Zend/Validate/Hostname.php | 52 +- lib/Zend/Validate/Hostname/Biz.php | 6 +- lib/Zend/Validate/Hostname/Cn.php | 6 +- lib/Zend/Validate/Hostname/Com.php | 6 +- lib/Zend/Validate/Hostname/Jp.php | 6 +- lib/Zend/Validate/Iban.php | 6 +- lib/Zend/Validate/Identical.php | 6 +- lib/Zend/Validate/InArray.php | 6 +- lib/Zend/Validate/Int.php | 6 +- lib/Zend/Validate/Interface.php | 6 +- lib/Zend/Validate/Ip.php | 6 +- lib/Zend/Validate/Isbn.php | 8 +- lib/Zend/Validate/Ldap/Dn.php | 65 - lib/Zend/Validate/LessThan.php | 6 +- lib/Zend/Validate/NotEmpty.php | 6 +- lib/Zend/Validate/PostCode.php | 6 +- lib/Zend/Validate/Regex.php | 6 +- lib/Zend/Validate/Sitemap/Changefreq.php | 8 +- lib/Zend/Validate/Sitemap/Lastmod.php | 8 +- lib/Zend/Validate/Sitemap/Loc.php | 8 +- lib/Zend/Validate/Sitemap/Priority.php | 8 +- lib/Zend/Validate/StringLength.php | 6 +- lib/Zend/Version.php | 24 +- lib/Zend/View.php | 6 +- lib/Zend/View/Abstract.php | 16 +- lib/Zend/View/Exception.php | 10 +- lib/Zend/View/Helper/Abstract.php | 6 +- lib/Zend/View/Helper/Action.php | 6 +- lib/Zend/View/Helper/BaseUrl.php | 6 +- lib/Zend/View/Helper/Currency.php | 11 +- lib/Zend/View/Helper/Cycle.php | 9 +- lib/Zend/View/Helper/DeclareVars.php | 6 +- lib/Zend/View/Helper/Doctype.php | 57 +- lib/Zend/View/Helper/Fieldset.php | 6 +- lib/Zend/View/Helper/Form.php | 17 +- lib/Zend/View/Helper/FormButton.php | 6 +- lib/Zend/View/Helper/FormCheckbox.php | 23 +- lib/Zend/View/Helper/FormElement.php | 32 +- lib/Zend/View/Helper/FormErrors.php | 16 +- lib/Zend/View/Helper/FormFile.php | 14 +- lib/Zend/View/Helper/FormHidden.php | 6 +- lib/Zend/View/Helper/FormImage.php | 14 +- lib/Zend/View/Helper/FormLabel.php | 6 +- lib/Zend/View/Helper/FormMultiCheckbox.php | 6 +- lib/Zend/View/Helper/FormNote.php | 6 +- lib/Zend/View/Helper/FormPassword.php | 14 +- lib/Zend/View/Helper/FormRadio.php | 30 +- lib/Zend/View/Helper/FormReset.php | 14 +- lib/Zend/View/Helper/FormSelect.php | 38 +- lib/Zend/View/Helper/FormSubmit.php | 14 +- lib/Zend/View/Helper/FormText.php | 14 +- lib/Zend/View/Helper/FormTextarea.php | 6 +- lib/Zend/View/Helper/Gravatar.php | 28 +- lib/Zend/View/Helper/HeadLink.php | 42 +- lib/Zend/View/Helper/HeadMeta.php | 59 +- lib/Zend/View/Helper/HeadScript.php | 29 +- lib/Zend/View/Helper/HeadStyle.php | 23 +- lib/Zend/View/Helper/HeadTitle.php | 14 +- lib/Zend/View/Helper/HtmlElement.php | 23 +- lib/Zend/View/Helper/HtmlFlash.php | 6 +- lib/Zend/View/Helper/HtmlList.php | 6 +- lib/Zend/View/Helper/HtmlObject.php | 6 +- lib/Zend/View/Helper/HtmlPage.php | 6 +- lib/Zend/View/Helper/HtmlQuicktime.php | 6 +- lib/Zend/View/Helper/InlineScript.php | 6 +- lib/Zend/View/Helper/Interface.php | 6 +- lib/Zend/View/Helper/Json.php | 36 +- lib/Zend/View/Helper/Layout.php | 6 +- lib/Zend/View/Helper/Navigation.php | 14 +- .../View/Helper/Navigation/Breadcrumbs.php | 10 +- lib/Zend/View/Helper/Navigation/Helper.php | 6 +- .../View/Helper/Navigation/HelperAbstract.php | 159 +- lib/Zend/View/Helper/Navigation/Links.php | 8 +- lib/Zend/View/Helper/Navigation/Menu.php | 584 +- lib/Zend/View/Helper/Navigation/Sitemap.php | 51 +- lib/Zend/View/Helper/PaginationControl.php | 6 +- lib/Zend/View/Helper/Partial.php | 10 +- lib/Zend/View/Helper/Partial/Exception.php | 6 +- lib/Zend/View/Helper/PartialLoop.php | 10 +- lib/Zend/View/Helper/Placeholder.php | 6 +- .../View/Helper/Placeholder/Container.php | 6 +- .../Helper/Placeholder/Container/Abstract.php | 19 +- .../Placeholder/Container/Exception.php | 6 +- .../Placeholder/Container/Standalone.php | 6 +- lib/Zend/View/Helper/Placeholder/Registry.php | 8 +- .../Helper/Placeholder/Registry/Exception.php | 6 +- lib/Zend/View/Helper/RenderToPlaceholder.php | 10 +- lib/Zend/View/Helper/ServerUrl.php | 8 +- lib/Zend/View/Helper/TinySrc.php | 68 +- lib/Zend/View/Helper/Translate.php | 6 +- lib/Zend/View/Helper/Url.php | 6 +- lib/Zend/View/Helper/UserAgent.php | 21 +- lib/Zend/View/Interface.php | 6 +- lib/Zend/View/Stream.php | 6 +- lib/Zend/Wildfire/Channel/HttpHeaders.php | 8 +- lib/Zend/Wildfire/Channel/Interface.php | 6 +- lib/Zend/Wildfire/Exception.php | 6 +- lib/Zend/Wildfire/Plugin/FirePhp.php | 21 +- lib/Zend/Wildfire/Plugin/FirePhp/Message.php | 6 +- .../Wildfire/Plugin/FirePhp/TableMessage.php | 6 +- lib/Zend/Wildfire/Plugin/Interface.php | 6 +- lib/Zend/Wildfire/Protocol/JsonStream.php | 6 +- lib/Zend/XmlRpc/Client.php | 39 +- lib/Zend/XmlRpc/Client/Exception.php | 6 +- lib/Zend/XmlRpc/Client/FaultException.php | 6 +- lib/Zend/XmlRpc/Client/HttpException.php | 6 +- .../XmlRpc/Client/IntrospectException.php | 6 +- .../XmlRpc/Client/ServerIntrospection.php | 6 +- lib/Zend/XmlRpc/Client/ServerProxy.php | 6 +- lib/Zend/XmlRpc/Exception.php | 6 +- lib/Zend/XmlRpc/Fault.php | 6 +- lib/Zend/XmlRpc/Generator/DomDocument.php | 4 +- .../XmlRpc/Generator/GeneratorAbstract.php | 10 +- lib/Zend/XmlRpc/Generator/XmlWriter.php | 9 +- lib/Zend/XmlRpc/Request.php | 22 +- lib/Zend/XmlRpc/Request/Http.php | 6 +- lib/Zend/XmlRpc/Request/Stdin.php | 6 +- lib/Zend/XmlRpc/Response.php | 25 +- lib/Zend/XmlRpc/Response/Http.php | 6 +- lib/Zend/XmlRpc/Server.php | 6 +- lib/Zend/XmlRpc/Server/Cache.php | 6 +- lib/Zend/XmlRpc/Server/Exception.php | 6 +- lib/Zend/XmlRpc/Server/Fault.php | 6 +- lib/Zend/XmlRpc/Server/System.php | 6 +- lib/Zend/XmlRpc/Value.php | 109 +- lib/Zend/XmlRpc/Value/Array.php | 6 +- lib/Zend/XmlRpc/Value/Base64.php | 6 +- lib/Zend/XmlRpc/Value/BigInteger.php | 27 +- lib/Zend/XmlRpc/Value/Boolean.php | 6 +- lib/Zend/XmlRpc/Value/Collection.php | 6 +- lib/Zend/XmlRpc/Value/DateTime.php | 14 +- lib/Zend/XmlRpc/Value/Double.php | 6 +- lib/Zend/XmlRpc/Value/Exception.php | 6 +- lib/Zend/XmlRpc/Value/Integer.php | 6 +- lib/Zend/XmlRpc/Value/Nil.php | 6 +- lib/Zend/XmlRpc/Value/Scalar.php | 6 +- lib/Zend/XmlRpc/Value/String.php | 6 +- lib/Zend/XmlRpc/Value/Struct.php | 6 +- modman | 2 - .../default/default/images/logo_email.gif | Bin 2320 -> 0 bytes .../default/default/images/logo_print.gif | Bin 2320 -> 0 bytes skin/frontend/base/default/css/widgets.css | 2 +- skin/frontend/base/default/js/bundle.js | 8 +- .../base/default/js/checkout/review.js | 2 +- skin/frontend/base/default/js/giftmessage.js | 2 +- skin/frontend/base/default/js/ie6.js | 2 +- skin/frontend/base/default/js/msrp.js | 2 +- skin/frontend/base/default/js/opcheckout.js | 2 +- .../lib/prototype/windows/themes/magento.css | 2 +- skin/frontend/default/blank/css/print.css | 2 +- skin/frontend/default/blank/css/styles-ie.css | 2 +- skin/frontend/default/blank/css/styles.css | 3 +- skin/frontend/default/blue/css/styles-ie.css | 2 +- skin/frontend/default/blue/css/styles.css | 2 +- .../default/default/css/oauth-simple.css | 2 +- skin/frontend/default/default/css/print.css | 2 +- .../default/default/css/styles-ie.css | 2 +- skin/frontend/default/default/css/styles.css | 17 +- skin/frontend/default/iphone/css/custom.css | 2 +- skin/frontend/default/iphone/css/iphone.css | 2 +- skin/frontend/default/iphone/js/dnd.js | 2 +- skin/frontend/default/iphone/js/iphone.js | 2 +- skin/frontend/default/iphone/js/modernizr.js | 2 +- skin/frontend/default/modern/css/print.css | 2 +- .../frontend/default/modern/css/styles-ie.css | 2 +- skin/frontend/default/modern/css/styles.css | 2 +- skin/frontend/default/modern/css/widgets.css | 2 +- .../rwd/default/css/madisonisland-ie8.css | 176 - .../rwd/default/css/madisonisland.css | 350 - .../rwd/default/css/scaffold-forms.css | 103 - skin/frontend/rwd/default/css/styles-ie8.css | 7761 ------------- skin/frontend/rwd/default/css/styles.css | 9713 ---------------- .../rwd/default/images/ajax-loader.gif | Bin 7507 -> 0 bytes skin/frontend/rwd/default/images/bg_x.png | Bin 1446 -> 0 bytes .../frontend/rwd/default/images/demo-logo.png | Bin 3209 -> 0 bytes .../frontend/rwd/default/images/demo_logo.png | Bin 5098 -> 0 bytes .../rwd/default/images/icon_sprite.png | Bin 11899 -> 0 bytes .../rwd/default/images/icon_sprite@2x.png | Bin 11167 -> 0 bytes skin/frontend/rwd/default/images/logo.gif | Bin 2320 -> 0 bytes .../rwd/default/images/logo_email.gif | Bin 2320 -> 0 bytes .../rwd/default/images/logo_print.gif | Bin 2320 -> 0 bytes .../default/images/media/col_left_callout.jpg | Bin 19102 -> 0 bytes .../images/media/col_right_callout.jpg | Bin 14703 -> 0 bytes .../images/media/homepage_banner_1.jpg | Bin 71151 -> 0 bytes .../images/media/homepage_banner_1@2x.jpg | Bin 174064 -> 0 bytes .../images/media/homepage_banner_2.jpg | Bin 46137 -> 0 bytes .../images/media/homepage_callout_1.jpg | Bin 7406 -> 0 bytes .../images/media/homepage_callout_1@2x.jpg | Bin 16663 -> 0 bytes .../images/media/homepage_callout_2.jpg | Bin 2916 -> 0 bytes .../images/media/homepage_callout_2@2x.jpg | Bin 6221 -> 0 bytes .../images/media/homepage_callout_3.jpg | Bin 4437 -> 0 bytes .../images/media/homepage_callout_3@2x.jpg | Bin 9175 -> 0 bytes .../rwd/default/images/opc-ajax-loader.gif | Bin 7507 -> 0 bytes .../rwd/default/images/social_icons.png | Bin 4308 -> 0 bytes .../rwd/default/images/social_icons@2x.png | Bin 5245 -> 0 bytes skin/frontend/rwd/default/js/app.js | 742 -- .../jquery.elevateZoom-3.0.8.min.js | 66 - .../js/lib/elevatezoom/jquery.elevatezoom.js | 1777 --- skin/frontend/rwd/default/js/lib/enquire.js | 293 - skin/frontend/rwd/default/js/lib/fastclick.js | 777 -- .../rwd/default/js/lib/imagesloaded.js | 7 - .../rwd/default/js/lib/jquery-1.10.2.js | 9789 ----------------- .../rwd/default/js/lib/jquery-1.10.2.min.js | 6 - .../rwd/default/js/lib/jquery-1.10.2.min.map | 1 - .../rwd/default/js/lib/jquery.cycle2.min.js | 16 - .../default/js/lib/jquery.cycle2.swipe.min.js | 2 - .../default/js/lib/matchMedia.addListener.js | 75 - .../frontend/rwd/default/js/lib/matchMedia.js | 46 - .../default/js/lib/modernizr.custom.min.js | 4 - .../rwd/default/js/lib/selectivizr.js | 561 - skin/frontend/rwd/default/js/minicart.js | 214 - skin/frontend/rwd/default/js/msrp_rwd.js | 44 - .../frontend/rwd/default/js/opcheckout_rwd.js | 48 - skin/frontend/rwd/default/js/slideshow.js | 44 - skin/frontend/rwd/default/scss/.htaccess | 2 - skin/frontend/rwd/default/scss/_core.scss | 90 - .../frontend/rwd/default/scss/_framework.scss | 59 - skin/frontend/rwd/default/scss/_var.scss | 221 - skin/frontend/rwd/default/scss/config.rb | 10 - .../rwd/default/scss/content/_category.scss | 177 - .../rwd/default/scss/content/_home.scss | 208 - .../rwd/default/scss/core/_common.scss | 1914 ---- .../frontend/rwd/default/scss/core/_form.scss | 376 - .../rwd/default/scss/core/_reset.scss | 113 - .../rwd/default/scss/core/_table.scss | 226 - .../rwd/default/scss/function/_black.scss | 36 - .../rwd/default/scss/function/_white.scss | 36 - .../rwd/default/scss/layout/_footer.scss | 248 - .../rwd/default/scss/layout/_global.scss | 44 - .../default/scss/layout/_header-account.scss | 108 - .../rwd/default/scss/layout/_header-cart.scss | 224 - .../rwd/default/scss/layout/_header-nav.scss | 278 - .../default/scss/layout/_header-search.scss | 129 - .../rwd/default/scss/layout/_header.scss | 331 - .../rwd/default/scss/madisonisland-ie8.scss | 38 - .../rwd/default/scss/madisonisland.scss | 39 - .../rwd/default/scss/mixin/_breakpoint.scss | 93 - .../rwd/default/scss/mixin/_clearfix.scss | 38 - .../default/scss/mixin/_if-resolution.scss | 83 - .../scss/mixin/_image-replacement.scss | 49 - .../default/scss/mixin/_loading-overlay.scss | 58 - .../rwd/default/scss/mixin/_menu.scss | 33 - .../default/scss/mixin/_not-selectable.scss | 36 - .../default/scss/mixin/_toggle-content.scss | 183 - .../rwd/default/scss/mixin/_triangle.scss | 64 - .../rwd/default/scss/mixin/_typography.scss | 117 - .../default/scss/module/_account-reviews.scss | 126 - .../default/scss/module/_catalog-compare.scss | 49 - .../default/scss/module/_catalog-msrp.scss | 222 - .../default/scss/module/_catalog-product.scss | 878 -- .../scss/module/_checkout-cart-minicart.scss | 307 - .../default/scss/module/_checkout-cart.scss | 904 -- .../scss/module/_checkout-onepage.scss | 586 - .../scss/module/_checkout-success.scss | 44 - .../rwd/default/scss/module/_cms.scss | 178 - .../scss/module/_configurableswatches.scss | 79 - .../rwd/default/scss/module/_contacts.scss | 53 - .../rwd/default/scss/module/_cookies.scss | 107 - .../rwd/default/scss/module/_customer.scss | 968 -- .../rwd/default/scss/module/_paypal.scss | 124 - .../scss/module/_pricing_conditions.scss | 45 - .../default/scss/module/_product-list.scss | 657 -- .../rwd/default/scss/module/_review.scss | 440 - .../rwd/default/scss/module/_search.scss | 104 - .../rwd/default/scss/module/_slideshow.scss | 195 - .../rwd/default/scss/module/_wishlist.scss | 418 - .../rwd/default/scss/override/_plugin.scss | 39 - .../rwd/default/scss/scaffold-forms.scss | 112 - .../frontend/rwd/default/scss/styles-ie8.scss | 34 - skin/frontend/rwd/default/scss/styles.scss | 34 - .../rwd/default/scss/vendor/_normalize.scss | 399 - .../Interface_Adminhtml_Default-1.8.1.0.xml | 18 + .../Interface_Adminhtml_Default-1.9.0.0.xml | 18 - ...nterface_Frontend_Base_Default-1.8.1.0.xml | 18 + ...nterface_Frontend_Base_Default-1.9.0.0.xml | 18 - ...=> Interface_Frontend_Default-1.8.1.0.xml} | 12 +- ...Interface_Frontend_Rwd_Default-1.9.0.1.xml | 18 - .../Interface_Install_Default-1.8.0.0.xml | 18 + .../Interface_Install_Default-1.9.0.0.xml | 18 - var/package/Lib_Js_Mage-1.8.1.0.xml | 18 + var/package/Lib_Js_Mage-1.9.0.0.xml | 18 - ...0.5.xml => Lib_Js_Prototype-1.7.0.0.4.xml} | 10 +- ...3.4.7.1.xml => Lib_Js_TinyMCE-3.4.7.0.xml} | 10 +- var/package/Lib_Magento-1.8.0.0.xml | 18 + var/package/Lib_Magento-1.9.0.0.xml | 18 - ...ien-1.9.0.0.xml => Lib_Varien-1.8.1.0.xml} | 12 +- var/package/Lib_ZF-1.11.1.0.xml | 18 + var/package/Lib_ZF-1.12.3.0.xml | 18 - ....12.3.0.xml => Lib_ZF_Locale-1.11.1.0.xml} | 12 +- var/package/Mage_All_Latest-1.8.1.0.xml | 18 + var/package/Mage_All_Latest-1.9.0.1.xml | 18 - var/package/Mage_Centinel-1.8.0.0.xml | 18 + var/package/Mage_Centinel-1.9.0.1.xml | 18 - ...-1.9.0.1.xml => Mage_Compiler-1.8.1.0.xml} | 12 +- var/package/Mage_Core_Adminhtml-1.8.1.0.xml | 18 + var/package/Mage_Core_Adminhtml-1.9.0.0.xml | 18 - var/package/Mage_Core_Modules-1.8.1.0.xml | 18 + var/package/Mage_Core_Modules-1.9.0.1.xml | 18 - var/package/Mage_Downloader-1.8.1.0.xml | 18 + var/package/Mage_Downloader-1.9.0.1.xml | 18 - var/package/Mage_Locale_de_DE-1.9.0.0.xml | 18 - ....0.0.xml => Mage_Locale_en_US-1.8.1.0.xml} | 12 +- var/package/Mage_Locale_es_ES-1.9.0.0.xml | 18 - var/package/Mage_Locale_fr_FR-1.9.0.0.xml | 18 - var/package/Mage_Locale_nl_NL-1.9.0.0.xml | 18 - var/package/Mage_Locale_pt_BR-1.9.0.0.xml | 18 - var/package/Mage_Locale_zh_CN-1.9.0.0.xml | 18 - var/package/Magento_Mobile-1.8.0.0.23.1.xml | 18 + var/package/Magento_Mobile-1.8.0.0.23.2.xml | 18 - ...2.1.xml => Phoenix_Moneybookers-1.3.2.xml} | 12 +- 10316 files changed, 25738 insertions(+), 193047 deletions(-) delete mode 100644 app/code/core/Mage/Admin/Model/Redirectpolicy.php delete mode 100644 app/code/core/Mage/Adminhtml/Model/System/Config/Source/Security/Domainpolicy.php delete mode 100644 app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate/Specialprice.php delete mode 100644 app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php delete mode 100644 app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.0.php delete mode 100644 app/code/core/Mage/Checkout/Block/Cart/Minicart.php delete mode 100644 app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php delete mode 100644 app/code/core/Mage/Core/Helper/Array.php delete mode 100644 app/code/core/Mage/Core/Model/Design/Config.php delete mode 100644 app/code/core/Mage/Core/Model/Design/Fallback.php delete mode 100644 app/code/core/Mage/Core/Model/Domainpolicy.php delete mode 100644 app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php delete mode 100644 app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php delete mode 100644 app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php delete mode 100644 app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php delete mode 100644 app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php delete mode 100644 app/code/core/Mage/Paypal/Block/Bml/Banners.php delete mode 100644 app/code/core/Mage/Paypal/Block/Bml/Form.php delete mode 100644 app/code/core/Mage/Paypal/Model/Api/ProcessableException.php delete mode 100644 app/code/core/Mage/Paypal/Model/Bml.php delete mode 100644 app/code/core/Mage/Paypal/Model/System/Config/Source/BmlPosition.php delete mode 100644 app/code/core/Mage/Paypal/Model/System/Config/Source/BmlSize.php delete mode 100644 app/code/core/Mage/Paypal/controllers/BmlController.php delete mode 100644 app/code/core/Mage/Paypal/data/paypal_setup/data-install-1.6.0.5.php delete mode 100644 app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.4-1.6.0.5.php delete mode 100644 app/code/core/Mage/PaypalUk/Block/Bml/Form.php delete mode 100644 app/code/core/Mage/PaypalUk/Model/Bml.php delete mode 100644 app/code/core/Mage/PaypalUk/controllers/BmlController.php delete mode 100644 app/code/local/local_data_goes_here delete mode 100644 app/design/adminhtml/default/default/etc/theme.xml delete mode 100644 app/design/adminhtml/default/default/template/paypal/system/config/bml_api_wizard.phtml delete mode 100644 app/design/frontend/base/default/etc/theme.xml delete mode 100644 app/design/frontend/base/default/layout/bml.xml delete mode 100644 app/design/frontend/base/default/template/paypal/bml.phtml rename app/design/frontend/{rwd => base}/default/template/paypal/express/review/address.phtml (64%) rename app/design/frontend/{rwd/default/template/paypal => base/default/template/paypaluk}/express/review.phtml (53%) delete mode 100644 app/design/frontend/default/blank/etc/theme.xml delete mode 100644 app/design/frontend/default/default/etc/theme.xml delete mode 100644 app/design/frontend/default/iphone/etc/theme.xml delete mode 100644 app/design/frontend/default/modern/etc/theme.xml delete mode 100644 app/design/frontend/rwd/default/etc/theme.xml delete mode 100644 app/design/frontend/rwd/default/etc/widget.xml delete mode 100644 app/design/frontend/rwd/default/layout/bundle.xml delete mode 100644 app/design/frontend/rwd/default/layout/captcha.xml delete mode 100644 app/design/frontend/rwd/default/layout/catalog.xml delete mode 100644 app/design/frontend/rwd/default/layout/catalog_msrp.xml delete mode 100644 app/design/frontend/rwd/default/layout/catalogsearch.xml delete mode 100644 app/design/frontend/rwd/default/layout/checkout.xml delete mode 100644 app/design/frontend/rwd/default/layout/cms.xml delete mode 100644 app/design/frontend/rwd/default/layout/contacts.xml delete mode 100644 app/design/frontend/rwd/default/layout/customer.xml delete mode 100644 app/design/frontend/rwd/default/layout/directory.xml delete mode 100644 app/design/frontend/rwd/default/layout/downloadable.xml delete mode 100644 app/design/frontend/rwd/default/layout/newsletter.xml delete mode 100644 app/design/frontend/rwd/default/layout/oauth.xml delete mode 100644 app/design/frontend/rwd/default/layout/page.xml delete mode 100644 app/design/frontend/rwd/default/layout/paypal.xml delete mode 100644 app/design/frontend/rwd/default/layout/persistent.xml delete mode 100644 app/design/frontend/rwd/default/layout/poll.xml delete mode 100644 app/design/frontend/rwd/default/layout/review.xml delete mode 100644 app/design/frontend/rwd/default/layout/rss.xml delete mode 100644 app/design/frontend/rwd/default/layout/sales.xml delete mode 100644 app/design/frontend/rwd/default/layout/tag.xml delete mode 100644 app/design/frontend/rwd/default/layout/wishlist.xml delete mode 100644 app/design/frontend/rwd/default/locale/en_US/translate.csv delete mode 100644 app/design/frontend/rwd/default/template/authorizenet/directpost/form.phtml delete mode 100644 app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle.phtml delete mode 100644 app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/availability.phtml delete mode 100644 app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml delete mode 100644 app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/layer/filter.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/layer/state.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/layer/view.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/navigation/left.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/compare/sidebar.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/list.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/list/related.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/list/toolbar.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/list/upsell.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/new.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/view.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/view/media.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/view/type/availability/default.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/view/type/availability/grouped.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/view/type/default.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/view/type/grouped.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/view/type/options/configurable.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_default_list.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_images_list.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_names_list.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml delete mode 100644 app/design/frontend/rwd/default/template/cataloginventory/stockqty/composite.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalogsearch/advanced/form.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml delete mode 100644 app/design/frontend/rwd/default/template/catalogsearch/result.phtml delete mode 100644 app/design/frontend/rwd/default/template/centinel/authentication/start.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart/coupon.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart/item/configure/updatecart.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart/minicart.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart/minicart/items.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart/sidebar.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/cart/sidebar/default.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/multishipping/item/default.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/onepage.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/onepage/progress.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/onepage/review/info.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml delete mode 100644 app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml delete mode 100644 app/design/frontend/rwd/default/template/contacts/form.phtml delete mode 100644 app/design/frontend/rwd/default/template/customer/account/dashboard.phtml delete mode 100644 app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml delete mode 100644 app/design/frontend/rwd/default/template/customer/account/navigation.phtml delete mode 100644 app/design/frontend/rwd/default/template/customer/address/edit.phtml delete mode 100644 app/design/frontend/rwd/default/template/customer/form/address.phtml delete mode 100644 app/design/frontend/rwd/default/template/customer/form/changepassword.phtml delete mode 100644 app/design/frontend/rwd/default/template/customer/form/confirmation.phtml delete mode 100644 app/design/frontend/rwd/default/template/customer/form/edit.phtml delete mode 100644 app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml delete mode 100644 app/design/frontend/rwd/default/template/customer/form/mini.login.phtml delete mode 100644 app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml delete mode 100644 app/design/frontend/rwd/default/template/directory/currency.phtml delete mode 100644 app/design/frontend/rwd/default/template/downloadable/catalog/product/type.phtml delete mode 100644 app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml delete mode 100644 app/design/frontend/rwd/default/template/downloadable/checkout/onepage/review/item.phtml delete mode 100644 app/design/frontend/rwd/default/template/downloadable/customer/products/list.phtml delete mode 100644 app/design/frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml delete mode 100644 app/design/frontend/rwd/default/template/newsletter/subscribe.phtml delete mode 100644 app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/1column.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/2columns-left.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/2columns-right.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/3columns.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/empty.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/html/footer.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/html/header.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/html/pager.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/html/topmenu.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/html/topmenu/renderer.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/popup.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/print.phtml delete mode 100644 app/design/frontend/rwd/default/template/page/template/links.phtml delete mode 100644 app/design/frontend/rwd/default/template/payment/form/cc.phtml delete mode 100644 app/design/frontend/rwd/default/template/payment/form/ccsave.phtml delete mode 100644 app/design/frontend/rwd/default/template/payment/info/default.phtml delete mode 100644 app/design/frontend/rwd/default/template/paypal/bml.phtml delete mode 100644 app/design/frontend/rwd/default/template/paypal/express/minicart/shortcut.phtml delete mode 100644 app/design/frontend/rwd/default/template/paypal/express/product/shortcut.phtml delete mode 100644 app/design/frontend/rwd/default/template/paypal/express/review/details.phtml delete mode 100644 app/design/frontend/rwd/default/template/paypal/express/review/shipping/method.phtml delete mode 100644 app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml delete mode 100644 app/design/frontend/rwd/default/template/persistent/checkout/onepage/login.phtml delete mode 100644 app/design/frontend/rwd/default/template/persistent/customer/form/login.phtml delete mode 100644 app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml delete mode 100644 app/design/frontend/rwd/default/template/persistent/remember_me.phtml delete mode 100644 app/design/frontend/rwd/default/template/persistent/remember_me_tooltip.phtml delete mode 100644 app/design/frontend/rwd/default/template/reports/product_viewed.phtml delete mode 100644 app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_default_list.phtml delete mode 100644 app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_images_list.phtml delete mode 100644 app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_names_list.phtml delete mode 100644 app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml delete mode 100644 app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml delete mode 100644 app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_default_list.phtml delete mode 100644 app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_images_list.phtml delete mode 100644 app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_names_list.phtml delete mode 100644 app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml delete mode 100644 app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml delete mode 100644 app/design/frontend/rwd/default/template/review/customer/view.phtml delete mode 100644 app/design/frontend/rwd/default/template/review/form.phtml delete mode 100644 app/design/frontend/rwd/default/template/review/product/view/list.phtml delete mode 100644 app/design/frontend/rwd/default/template/review/view.phtml delete mode 100644 app/design/frontend/rwd/default/template/sales/order/creditmemo/items.phtml delete mode 100644 app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml delete mode 100644 app/design/frontend/rwd/default/template/sales/order/history.phtml delete mode 100644 app/design/frontend/rwd/default/template/sales/order/items.phtml delete mode 100644 app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml delete mode 100644 app/design/frontend/rwd/default/template/sales/order/recent.phtml delete mode 100644 app/design/frontend/rwd/default/template/sales/order/shipment/items.phtml delete mode 100644 app/design/frontend/rwd/default/template/sales/widget/guest/form.phtml delete mode 100644 app/design/frontend/rwd/default/template/sendfriend/send.phtml delete mode 100644 app/design/frontend/rwd/default/template/wishlist/button/update.phtml delete mode 100644 app/design/frontend/rwd/default/template/wishlist/item/column/cart.phtml delete mode 100644 app/design/frontend/rwd/default/template/wishlist/item/column/info.phtml delete mode 100644 app/design/frontend/rwd/default/template/wishlist/item/column/price.phtml delete mode 100644 app/design/frontend/rwd/default/template/wishlist/item/column/quantity.phtml delete mode 100644 app/design/frontend/rwd/default/template/wishlist/item/list.phtml delete mode 100644 app/design/frontend/rwd/default/template/wishlist/shared.phtml delete mode 100644 app/design/frontend/rwd/default/template/wishlist/sidebar.phtml delete mode 100644 app/design/frontend/rwd/default/template/wishlist/view.phtml delete mode 100644 app/design/install/default/default/etc/theme.xml delete mode 100644 app/locale/de_DE/Mage_AdminNotification.csv delete mode 100644 app/locale/de_DE/Mage_Adminhtml.csv delete mode 100644 app/locale/de_DE/Mage_AmazonPayments.csv delete mode 100644 app/locale/de_DE/Mage_Api.csv delete mode 100644 app/locale/de_DE/Mage_Api2.csv delete mode 100644 app/locale/de_DE/Mage_Authorizenet.csv delete mode 100644 app/locale/de_DE/Mage_Backup.csv delete mode 100644 app/locale/de_DE/Mage_Bundle.csv delete mode 100644 app/locale/de_DE/Mage_Captcha.csv delete mode 100644 app/locale/de_DE/Mage_Catalog.csv delete mode 100644 app/locale/de_DE/Mage_CatalogInventory.csv delete mode 100644 app/locale/de_DE/Mage_CatalogRule.csv delete mode 100644 app/locale/de_DE/Mage_CatalogSearch.csv delete mode 100644 app/locale/de_DE/Mage_Centinel.csv delete mode 100644 app/locale/de_DE/Mage_Checkout.csv delete mode 100644 app/locale/de_DE/Mage_Cms.csv delete mode 100644 app/locale/de_DE/Mage_Compiler.csv delete mode 100644 app/locale/de_DE/Mage_Connect.csv delete mode 100644 app/locale/de_DE/Mage_Contacts.csv delete mode 100644 app/locale/de_DE/Mage_Core.csv delete mode 100644 app/locale/de_DE/Mage_Cron.csv delete mode 100644 app/locale/de_DE/Mage_CurrencySymbol.csv delete mode 100644 app/locale/de_DE/Mage_Customer.csv delete mode 100644 app/locale/de_DE/Mage_Dataflow.csv delete mode 100644 app/locale/de_DE/Mage_Directory.csv delete mode 100644 app/locale/de_DE/Mage_Downloadable.csv delete mode 100644 app/locale/de_DE/Mage_Eav.csv delete mode 100644 app/locale/de_DE/Mage_GiftMessage.csv delete mode 100644 app/locale/de_DE/Mage_GoogleAnalytics.csv delete mode 100644 app/locale/de_DE/Mage_GoogleBase.csv delete mode 100644 app/locale/de_DE/Mage_GoogleCheckout.csv delete mode 100644 app/locale/de_DE/Mage_ImportExport.csv delete mode 100644 app/locale/de_DE/Mage_Index.csv delete mode 100644 app/locale/de_DE/Mage_Install.csv delete mode 100644 app/locale/de_DE/Mage_Log.csv delete mode 100644 app/locale/de_DE/Mage_Media.csv delete mode 100644 app/locale/de_DE/Mage_Newsletter.csv delete mode 100644 app/locale/de_DE/Mage_Oauth.csv delete mode 100644 app/locale/de_DE/Mage_Page.csv delete mode 100644 app/locale/de_DE/Mage_PageCache.csv delete mode 100644 app/locale/de_DE/Mage_Paygate.csv delete mode 100644 app/locale/de_DE/Mage_Payment.csv delete mode 100644 app/locale/de_DE/Mage_Paypal.csv delete mode 100644 app/locale/de_DE/Mage_PaypalUk.csv delete mode 100644 app/locale/de_DE/Mage_Persistent.csv delete mode 100644 app/locale/de_DE/Mage_Poll.csv delete mode 100644 app/locale/de_DE/Mage_ProductAlert.csv delete mode 100644 app/locale/de_DE/Mage_Rating.csv delete mode 100644 app/locale/de_DE/Mage_Reports.csv delete mode 100644 app/locale/de_DE/Mage_Review.csv delete mode 100644 app/locale/de_DE/Mage_Rss.csv delete mode 100644 app/locale/de_DE/Mage_Rule.csv delete mode 100644 app/locale/de_DE/Mage_Sales.csv delete mode 100644 app/locale/de_DE/Mage_SalesRule.csv delete mode 100644 app/locale/de_DE/Mage_Sendfriend.csv delete mode 100644 app/locale/de_DE/Mage_Shipping.csv delete mode 100644 app/locale/de_DE/Mage_Sitemap.csv delete mode 100644 app/locale/de_DE/Mage_Tag.csv delete mode 100644 app/locale/de_DE/Mage_Tax.csv delete mode 100644 app/locale/de_DE/Mage_Usa.csv delete mode 100644 app/locale/de_DE/Mage_Weee.csv delete mode 100644 app/locale/de_DE/Mage_Widget.csv delete mode 100644 app/locale/de_DE/Mage_Wishlist.csv delete mode 100644 app/locale/de_DE/Mage_XmlConnect.csv delete mode 100644 app/locale/de_DE/Phoenix_Moneybookers.csv delete mode 100644 app/locale/de_DE/template/email/account_new.html delete mode 100644 app/locale/de_DE/template/email/account_new_confirmation.html delete mode 100644 app/locale/de_DE/template/email/account_new_confirmed.html delete mode 100644 app/locale/de_DE/template/email/account_password_reset_confirmation.html delete mode 100644 app/locale/de_DE/template/email/admin_password_new.html delete mode 100644 app/locale/de_DE/template/email/admin_password_reset_confirmation.html delete mode 100644 app/locale/de_DE/template/email/amazonpayments_asp_notification_error.html delete mode 100644 app/locale/de_DE/template/email/contact_form.html delete mode 100644 app/locale/de_DE/template/email/currency_update_warning.html delete mode 100644 app/locale/de_DE/template/email/log_clean_warning.html delete mode 100644 app/locale/de_DE/template/email/moneybookers_activateemail.html delete mode 100644 app/locale/de_DE/template/email/newsletter_subscr_confirm.html delete mode 100644 app/locale/de_DE/template/email/newsletter_subscr_success.html delete mode 100644 app/locale/de_DE/template/email/newsletter_unsub_success.html delete mode 100644 app/locale/de_DE/template/email/password_new.html delete mode 100644 app/locale/de_DE/template/email/payment_failed.html delete mode 100644 app/locale/de_DE/template/email/product_alert_cron_error.html delete mode 100644 app/locale/de_DE/template/email/product_price_alert.html delete mode 100644 app/locale/de_DE/template/email/product_share.html delete mode 100644 app/locale/de_DE/template/email/product_stock_alert.html delete mode 100644 app/locale/de_DE/template/email/sales/creditmemo_new.html delete mode 100644 app/locale/de_DE/template/email/sales/creditmemo_new_guest.html delete mode 100644 app/locale/de_DE/template/email/sales/creditmemo_update.html delete mode 100644 app/locale/de_DE/template/email/sales/creditmemo_update_guest.html delete mode 100644 app/locale/de_DE/template/email/sales/invoice_new.html delete mode 100644 app/locale/de_DE/template/email/sales/invoice_new_guest.html delete mode 100644 app/locale/de_DE/template/email/sales/invoice_update.html delete mode 100644 app/locale/de_DE/template/email/sales/invoice_update_guest.html delete mode 100644 app/locale/de_DE/template/email/sales/order_new.html delete mode 100644 app/locale/de_DE/template/email/sales/order_new_guest.html delete mode 100644 app/locale/de_DE/template/email/sales/order_update.html delete mode 100644 app/locale/de_DE/template/email/sales/order_update_guest.html delete mode 100644 app/locale/de_DE/template/email/sales/shipment_new.html delete mode 100644 app/locale/de_DE/template/email/sales/shipment_new_guest.html delete mode 100644 app/locale/de_DE/template/email/sales/shipment_update.html delete mode 100644 app/locale/de_DE/template/email/sales/shipment_update_guest.html delete mode 100644 app/locale/de_DE/template/email/sitemap_generate_warning.html delete mode 100644 app/locale/de_DE/template/email/token.html delete mode 100644 app/locale/de_DE/template/email/wishlist_share.html delete mode 100644 app/locale/es_ES/Mage_AdminNotification.csv delete mode 100644 app/locale/es_ES/Mage_Adminhtml.csv delete mode 100644 app/locale/es_ES/Mage_AmazonPayments.csv delete mode 100644 app/locale/es_ES/Mage_Api.csv delete mode 100644 app/locale/es_ES/Mage_Api2.csv delete mode 100644 app/locale/es_ES/Mage_Authorizenet.csv delete mode 100644 app/locale/es_ES/Mage_Backup.csv delete mode 100644 app/locale/es_ES/Mage_Bundle.csv delete mode 100644 app/locale/es_ES/Mage_Captcha.csv delete mode 100644 app/locale/es_ES/Mage_Catalog.csv delete mode 100644 app/locale/es_ES/Mage_CatalogInventory.csv delete mode 100644 app/locale/es_ES/Mage_CatalogRule.csv delete mode 100644 app/locale/es_ES/Mage_CatalogSearch.csv delete mode 100644 app/locale/es_ES/Mage_Centinel.csv delete mode 100644 app/locale/es_ES/Mage_Checkout.csv delete mode 100644 app/locale/es_ES/Mage_Cms.csv delete mode 100644 app/locale/es_ES/Mage_Compiler.csv delete mode 100644 app/locale/es_ES/Mage_Connect.csv delete mode 100644 app/locale/es_ES/Mage_Contacts.csv delete mode 100644 app/locale/es_ES/Mage_Core.csv delete mode 100644 app/locale/es_ES/Mage_Cron.csv delete mode 100644 app/locale/es_ES/Mage_CurrencySymbol.csv delete mode 100644 app/locale/es_ES/Mage_Customer.csv delete mode 100644 app/locale/es_ES/Mage_Dataflow.csv delete mode 100644 app/locale/es_ES/Mage_Directory.csv delete mode 100644 app/locale/es_ES/Mage_Downloadable.csv delete mode 100644 app/locale/es_ES/Mage_Eav.csv delete mode 100644 app/locale/es_ES/Mage_GiftMessage.csv delete mode 100644 app/locale/es_ES/Mage_GoogleAnalytics.csv delete mode 100644 app/locale/es_ES/Mage_GoogleBase.csv delete mode 100644 app/locale/es_ES/Mage_GoogleCheckout.csv delete mode 100644 app/locale/es_ES/Mage_ImportExport.csv delete mode 100644 app/locale/es_ES/Mage_Index.csv delete mode 100644 app/locale/es_ES/Mage_Install.csv delete mode 100644 app/locale/es_ES/Mage_Log.csv delete mode 100644 app/locale/es_ES/Mage_Media.csv delete mode 100644 app/locale/es_ES/Mage_Newsletter.csv delete mode 100644 app/locale/es_ES/Mage_Oauth.csv delete mode 100644 app/locale/es_ES/Mage_Page.csv delete mode 100644 app/locale/es_ES/Mage_PageCache.csv delete mode 100644 app/locale/es_ES/Mage_Paygate.csv delete mode 100644 app/locale/es_ES/Mage_Payment.csv delete mode 100644 app/locale/es_ES/Mage_Paypal.csv delete mode 100644 app/locale/es_ES/Mage_PaypalUk.csv delete mode 100644 app/locale/es_ES/Mage_Persistent.csv delete mode 100644 app/locale/es_ES/Mage_Poll.csv delete mode 100644 app/locale/es_ES/Mage_ProductAlert.csv delete mode 100644 app/locale/es_ES/Mage_Rating.csv delete mode 100644 app/locale/es_ES/Mage_Reports.csv delete mode 100644 app/locale/es_ES/Mage_Review.csv delete mode 100644 app/locale/es_ES/Mage_Rss.csv delete mode 100644 app/locale/es_ES/Mage_Rule.csv delete mode 100644 app/locale/es_ES/Mage_Sales.csv delete mode 100644 app/locale/es_ES/Mage_SalesRule.csv delete mode 100644 app/locale/es_ES/Mage_Sendfriend.csv delete mode 100644 app/locale/es_ES/Mage_Shipping.csv delete mode 100644 app/locale/es_ES/Mage_Sitemap.csv delete mode 100644 app/locale/es_ES/Mage_Tag.csv delete mode 100644 app/locale/es_ES/Mage_Tax.csv delete mode 100644 app/locale/es_ES/Mage_Usa.csv delete mode 100644 app/locale/es_ES/Mage_Weee.csv delete mode 100644 app/locale/es_ES/Mage_Widget.csv delete mode 100644 app/locale/es_ES/Mage_Wishlist.csv delete mode 100644 app/locale/es_ES/Mage_XmlConnect.csv delete mode 100644 app/locale/es_ES/Phoenix_Moneybookers.csv delete mode 100644 app/locale/es_ES/template/email/account_new.html delete mode 100644 app/locale/es_ES/template/email/account_new_confirmation.html delete mode 100644 app/locale/es_ES/template/email/account_new_confirmed.html delete mode 100644 app/locale/es_ES/template/email/account_password_reset_confirmation.html delete mode 100644 app/locale/es_ES/template/email/admin_password_new.html delete mode 100644 app/locale/es_ES/template/email/admin_password_reset_confirmation.html delete mode 100644 app/locale/es_ES/template/email/amazonpayments_asp_notification_error.html delete mode 100644 app/locale/es_ES/template/email/contact_form.html delete mode 100644 app/locale/es_ES/template/email/currency_update_warning.html delete mode 100644 app/locale/es_ES/template/email/log_clean_warning.html delete mode 100644 app/locale/es_ES/template/email/moneybookers_activateemail.html delete mode 100644 app/locale/es_ES/template/email/newsletter_subscr_confirm.html delete mode 100644 app/locale/es_ES/template/email/newsletter_subscr_success.html delete mode 100644 app/locale/es_ES/template/email/newsletter_unsub_success.html delete mode 100644 app/locale/es_ES/template/email/password_new.html delete mode 100644 app/locale/es_ES/template/email/payment_failed.html delete mode 100644 app/locale/es_ES/template/email/product_alert_cron_error.html delete mode 100644 app/locale/es_ES/template/email/product_price_alert.html delete mode 100644 app/locale/es_ES/template/email/product_share.html delete mode 100644 app/locale/es_ES/template/email/product_stock_alert.html delete mode 100644 app/locale/es_ES/template/email/sales/creditmemo_new.html delete mode 100644 app/locale/es_ES/template/email/sales/creditmemo_new_guest.html delete mode 100644 app/locale/es_ES/template/email/sales/creditmemo_update.html delete mode 100644 app/locale/es_ES/template/email/sales/creditmemo_update_guest.html delete mode 100644 app/locale/es_ES/template/email/sales/invoice_new.html delete mode 100644 app/locale/es_ES/template/email/sales/invoice_new_guest.html delete mode 100644 app/locale/es_ES/template/email/sales/invoice_update.html delete mode 100644 app/locale/es_ES/template/email/sales/invoice_update_guest.html delete mode 100644 app/locale/es_ES/template/email/sales/order_new.html delete mode 100644 app/locale/es_ES/template/email/sales/order_new_guest.html delete mode 100644 app/locale/es_ES/template/email/sales/order_update.html delete mode 100644 app/locale/es_ES/template/email/sales/order_update_guest.html delete mode 100644 app/locale/es_ES/template/email/sales/shipment_new.html delete mode 100644 app/locale/es_ES/template/email/sales/shipment_new_guest.html delete mode 100644 app/locale/es_ES/template/email/sales/shipment_update.html delete mode 100644 app/locale/es_ES/template/email/sales/shipment_update_guest.html delete mode 100644 app/locale/es_ES/template/email/sitemap_generate_warning.html delete mode 100644 app/locale/es_ES/template/email/token.html delete mode 100644 app/locale/es_ES/template/email/wishlist_share.html delete mode 100644 app/locale/fr_FR/Mage_AdminNotification.csv delete mode 100644 app/locale/fr_FR/Mage_Adminhtml.csv delete mode 100644 app/locale/fr_FR/Mage_AmazonPayments.csv delete mode 100644 app/locale/fr_FR/Mage_Api.csv delete mode 100644 app/locale/fr_FR/Mage_Api2.csv delete mode 100644 app/locale/fr_FR/Mage_Authorizenet.csv delete mode 100644 app/locale/fr_FR/Mage_Backup.csv delete mode 100644 app/locale/fr_FR/Mage_Bundle.csv delete mode 100644 app/locale/fr_FR/Mage_Captcha.csv delete mode 100644 app/locale/fr_FR/Mage_Catalog.csv delete mode 100644 app/locale/fr_FR/Mage_CatalogInventory.csv delete mode 100644 app/locale/fr_FR/Mage_CatalogRule.csv delete mode 100644 app/locale/fr_FR/Mage_CatalogSearch.csv delete mode 100644 app/locale/fr_FR/Mage_Centinel.csv delete mode 100644 app/locale/fr_FR/Mage_Checkout.csv delete mode 100644 app/locale/fr_FR/Mage_Cms.csv delete mode 100644 app/locale/fr_FR/Mage_Compiler.csv delete mode 100644 app/locale/fr_FR/Mage_Connect.csv delete mode 100644 app/locale/fr_FR/Mage_Contacts.csv delete mode 100644 app/locale/fr_FR/Mage_Core.csv delete mode 100644 app/locale/fr_FR/Mage_Cron.csv delete mode 100644 app/locale/fr_FR/Mage_CurrencySymbol.csv delete mode 100644 app/locale/fr_FR/Mage_Customer.csv delete mode 100644 app/locale/fr_FR/Mage_Dataflow.csv delete mode 100644 app/locale/fr_FR/Mage_Directory.csv delete mode 100644 app/locale/fr_FR/Mage_Downloadable.csv delete mode 100644 app/locale/fr_FR/Mage_Eav.csv delete mode 100644 app/locale/fr_FR/Mage_GiftMessage.csv delete mode 100644 app/locale/fr_FR/Mage_GoogleAnalytics.csv delete mode 100644 app/locale/fr_FR/Mage_GoogleBase.csv delete mode 100644 app/locale/fr_FR/Mage_GoogleCheckout.csv delete mode 100644 app/locale/fr_FR/Mage_ImportExport.csv delete mode 100644 app/locale/fr_FR/Mage_Index.csv delete mode 100644 app/locale/fr_FR/Mage_Install.csv delete mode 100644 app/locale/fr_FR/Mage_Log.csv delete mode 100644 app/locale/fr_FR/Mage_Media.csv delete mode 100644 app/locale/fr_FR/Mage_Newsletter.csv delete mode 100644 app/locale/fr_FR/Mage_Oauth.csv delete mode 100644 app/locale/fr_FR/Mage_Page.csv delete mode 100644 app/locale/fr_FR/Mage_PageCache.csv delete mode 100644 app/locale/fr_FR/Mage_Paygate.csv delete mode 100644 app/locale/fr_FR/Mage_Payment.csv delete mode 100644 app/locale/fr_FR/Mage_Paypal.csv delete mode 100644 app/locale/fr_FR/Mage_PaypalUk.csv delete mode 100644 app/locale/fr_FR/Mage_Persistent.csv delete mode 100644 app/locale/fr_FR/Mage_Poll.csv delete mode 100644 app/locale/fr_FR/Mage_ProductAlert.csv delete mode 100644 app/locale/fr_FR/Mage_Rating.csv delete mode 100644 app/locale/fr_FR/Mage_Reports.csv delete mode 100644 app/locale/fr_FR/Mage_Review.csv delete mode 100644 app/locale/fr_FR/Mage_Rss.csv delete mode 100644 app/locale/fr_FR/Mage_Rule.csv delete mode 100644 app/locale/fr_FR/Mage_Sales.csv delete mode 100644 app/locale/fr_FR/Mage_SalesRule.csv delete mode 100644 app/locale/fr_FR/Mage_Sendfriend.csv delete mode 100644 app/locale/fr_FR/Mage_Shipping.csv delete mode 100644 app/locale/fr_FR/Mage_Sitemap.csv delete mode 100644 app/locale/fr_FR/Mage_Tag.csv delete mode 100644 app/locale/fr_FR/Mage_Tax.csv delete mode 100644 app/locale/fr_FR/Mage_Usa.csv delete mode 100644 app/locale/fr_FR/Mage_Weee.csv delete mode 100644 app/locale/fr_FR/Mage_Widget.csv delete mode 100644 app/locale/fr_FR/Mage_Wishlist.csv delete mode 100644 app/locale/fr_FR/Mage_XmlConnect.csv delete mode 100644 app/locale/fr_FR/Phoenix_Moneybookers.csv delete mode 100644 app/locale/fr_FR/template/email/account_new.html delete mode 100644 app/locale/fr_FR/template/email/account_new_confirmation.html delete mode 100644 app/locale/fr_FR/template/email/account_new_confirmed.html delete mode 100644 app/locale/fr_FR/template/email/account_password_reset_confirmation.html delete mode 100644 app/locale/fr_FR/template/email/admin_password_new.html delete mode 100644 app/locale/fr_FR/template/email/admin_password_reset_confirmation.html delete mode 100644 app/locale/fr_FR/template/email/amazonpayments_asp_notification_error.html delete mode 100644 app/locale/fr_FR/template/email/contact_form.html delete mode 100644 app/locale/fr_FR/template/email/currency_update_warning.html delete mode 100644 app/locale/fr_FR/template/email/log_clean_warning.html delete mode 100644 app/locale/fr_FR/template/email/moneybookers_activateemail.html delete mode 100644 app/locale/fr_FR/template/email/newsletter_subscr_confirm.html delete mode 100644 app/locale/fr_FR/template/email/newsletter_subscr_success.html delete mode 100644 app/locale/fr_FR/template/email/newsletter_unsub_success.html delete mode 100644 app/locale/fr_FR/template/email/password_new.html delete mode 100644 app/locale/fr_FR/template/email/payment_failed.html delete mode 100644 app/locale/fr_FR/template/email/product_alert_cron_error.html delete mode 100644 app/locale/fr_FR/template/email/product_price_alert.html delete mode 100644 app/locale/fr_FR/template/email/product_share.html delete mode 100644 app/locale/fr_FR/template/email/product_stock_alert.html delete mode 100644 app/locale/fr_FR/template/email/sales/creditmemo_new.html delete mode 100644 app/locale/fr_FR/template/email/sales/creditmemo_new_guest.html delete mode 100644 app/locale/fr_FR/template/email/sales/creditmemo_update.html delete mode 100644 app/locale/fr_FR/template/email/sales/creditmemo_update_guest.html delete mode 100644 app/locale/fr_FR/template/email/sales/invoice_new.html delete mode 100644 app/locale/fr_FR/template/email/sales/invoice_new_guest.html delete mode 100644 app/locale/fr_FR/template/email/sales/invoice_update.html delete mode 100644 app/locale/fr_FR/template/email/sales/invoice_update_guest.html delete mode 100644 app/locale/fr_FR/template/email/sales/order_new.html delete mode 100644 app/locale/fr_FR/template/email/sales/order_new_guest.html delete mode 100644 app/locale/fr_FR/template/email/sales/order_update.html delete mode 100644 app/locale/fr_FR/template/email/sales/order_update_guest.html delete mode 100644 app/locale/fr_FR/template/email/sales/shipment_new.html delete mode 100644 app/locale/fr_FR/template/email/sales/shipment_new_guest.html delete mode 100644 app/locale/fr_FR/template/email/sales/shipment_update.html delete mode 100644 app/locale/fr_FR/template/email/sales/shipment_update_guest.html delete mode 100644 app/locale/fr_FR/template/email/sitemap_generate_warning.html delete mode 100644 app/locale/fr_FR/template/email/token.html delete mode 100644 app/locale/fr_FR/template/email/wishlist_share.html delete mode 100644 app/locale/nl_NL/Mage_AdminNotification.csv delete mode 100644 app/locale/nl_NL/Mage_Adminhtml.csv delete mode 100644 app/locale/nl_NL/Mage_AmazonPayments.csv delete mode 100644 app/locale/nl_NL/Mage_Api.csv delete mode 100644 app/locale/nl_NL/Mage_Api2.csv delete mode 100644 app/locale/nl_NL/Mage_Authorizenet.csv delete mode 100644 app/locale/nl_NL/Mage_Backup.csv delete mode 100644 app/locale/nl_NL/Mage_Bundle.csv delete mode 100644 app/locale/nl_NL/Mage_Captcha.csv delete mode 100644 app/locale/nl_NL/Mage_Catalog.csv delete mode 100644 app/locale/nl_NL/Mage_CatalogInventory.csv delete mode 100644 app/locale/nl_NL/Mage_CatalogRule.csv delete mode 100644 app/locale/nl_NL/Mage_CatalogSearch.csv delete mode 100644 app/locale/nl_NL/Mage_Centinel.csv delete mode 100644 app/locale/nl_NL/Mage_Checkout.csv delete mode 100644 app/locale/nl_NL/Mage_Cms.csv delete mode 100644 app/locale/nl_NL/Mage_Compiler.csv delete mode 100644 app/locale/nl_NL/Mage_Connect.csv delete mode 100644 app/locale/nl_NL/Mage_Contacts.csv delete mode 100644 app/locale/nl_NL/Mage_Core.csv delete mode 100644 app/locale/nl_NL/Mage_Cron.csv delete mode 100644 app/locale/nl_NL/Mage_CurrencySymbol.csv delete mode 100644 app/locale/nl_NL/Mage_Customer.csv delete mode 100644 app/locale/nl_NL/Mage_Dataflow.csv delete mode 100644 app/locale/nl_NL/Mage_Directory.csv delete mode 100644 app/locale/nl_NL/Mage_Downloadable.csv delete mode 100644 app/locale/nl_NL/Mage_Eav.csv delete mode 100644 app/locale/nl_NL/Mage_GiftMessage.csv delete mode 100644 app/locale/nl_NL/Mage_GoogleAnalytics.csv delete mode 100644 app/locale/nl_NL/Mage_GoogleBase.csv delete mode 100644 app/locale/nl_NL/Mage_GoogleCheckout.csv delete mode 100644 app/locale/nl_NL/Mage_ImportExport.csv delete mode 100644 app/locale/nl_NL/Mage_Index.csv delete mode 100644 app/locale/nl_NL/Mage_Install.csv delete mode 100644 app/locale/nl_NL/Mage_Log.csv delete mode 100644 app/locale/nl_NL/Mage_Media.csv delete mode 100644 app/locale/nl_NL/Mage_Newsletter.csv delete mode 100644 app/locale/nl_NL/Mage_Oauth.csv delete mode 100644 app/locale/nl_NL/Mage_Page.csv delete mode 100644 app/locale/nl_NL/Mage_PageCache.csv delete mode 100644 app/locale/nl_NL/Mage_Paygate.csv delete mode 100644 app/locale/nl_NL/Mage_Payment.csv delete mode 100644 app/locale/nl_NL/Mage_Paypal.csv delete mode 100644 app/locale/nl_NL/Mage_PaypalUk.csv delete mode 100644 app/locale/nl_NL/Mage_Persistent.csv delete mode 100644 app/locale/nl_NL/Mage_Poll.csv delete mode 100644 app/locale/nl_NL/Mage_ProductAlert.csv delete mode 100644 app/locale/nl_NL/Mage_Rating.csv delete mode 100644 app/locale/nl_NL/Mage_Reports.csv delete mode 100644 app/locale/nl_NL/Mage_Review.csv delete mode 100644 app/locale/nl_NL/Mage_Rss.csv delete mode 100644 app/locale/nl_NL/Mage_Rule.csv delete mode 100644 app/locale/nl_NL/Mage_Sales.csv delete mode 100644 app/locale/nl_NL/Mage_SalesRule.csv delete mode 100644 app/locale/nl_NL/Mage_Sendfriend.csv delete mode 100644 app/locale/nl_NL/Mage_Shipping.csv delete mode 100644 app/locale/nl_NL/Mage_Sitemap.csv delete mode 100644 app/locale/nl_NL/Mage_Tag.csv delete mode 100644 app/locale/nl_NL/Mage_Tax.csv delete mode 100644 app/locale/nl_NL/Mage_Usa.csv delete mode 100644 app/locale/nl_NL/Mage_Weee.csv delete mode 100644 app/locale/nl_NL/Mage_Widget.csv delete mode 100644 app/locale/nl_NL/Mage_Wishlist.csv delete mode 100644 app/locale/nl_NL/Mage_XmlConnect.csv delete mode 100644 app/locale/nl_NL/Phoenix_Moneybookers.csv delete mode 100644 app/locale/nl_NL/template/email/account_new.html delete mode 100644 app/locale/nl_NL/template/email/account_new_confirmation.html delete mode 100644 app/locale/nl_NL/template/email/account_new_confirmed.html delete mode 100644 app/locale/nl_NL/template/email/account_password_reset_confirmation.html delete mode 100644 app/locale/nl_NL/template/email/admin_password_new.html delete mode 100644 app/locale/nl_NL/template/email/admin_password_reset_confirmation.html delete mode 100644 app/locale/nl_NL/template/email/amazonpayments_asp_notification_error.html delete mode 100644 app/locale/nl_NL/template/email/contact_form.html delete mode 100644 app/locale/nl_NL/template/email/currency_update_warning.html delete mode 100644 app/locale/nl_NL/template/email/log_clean_warning.html delete mode 100644 app/locale/nl_NL/template/email/moneybookers_activateemail.html delete mode 100644 app/locale/nl_NL/template/email/newsletter_subscr_confirm.html delete mode 100644 app/locale/nl_NL/template/email/newsletter_subscr_success.html delete mode 100644 app/locale/nl_NL/template/email/newsletter_unsub_success.html delete mode 100644 app/locale/nl_NL/template/email/password_new.html delete mode 100644 app/locale/nl_NL/template/email/payment_failed.html delete mode 100644 app/locale/nl_NL/template/email/product_alert_cron_error.html delete mode 100644 app/locale/nl_NL/template/email/product_price_alert.html delete mode 100644 app/locale/nl_NL/template/email/product_share.html delete mode 100644 app/locale/nl_NL/template/email/product_stock_alert.html delete mode 100644 app/locale/nl_NL/template/email/sales/creditmemo_new.html delete mode 100644 app/locale/nl_NL/template/email/sales/creditmemo_new_guest.html delete mode 100644 app/locale/nl_NL/template/email/sales/creditmemo_update.html delete mode 100644 app/locale/nl_NL/template/email/sales/creditmemo_update_guest.html delete mode 100644 app/locale/nl_NL/template/email/sales/invoice_new.html delete mode 100644 app/locale/nl_NL/template/email/sales/invoice_new_guest.html delete mode 100644 app/locale/nl_NL/template/email/sales/invoice_update.html delete mode 100644 app/locale/nl_NL/template/email/sales/invoice_update_guest.html delete mode 100644 app/locale/nl_NL/template/email/sales/order_new.html delete mode 100644 app/locale/nl_NL/template/email/sales/order_new_guest.html delete mode 100644 app/locale/nl_NL/template/email/sales/order_update.html delete mode 100644 app/locale/nl_NL/template/email/sales/order_update_guest.html delete mode 100644 app/locale/nl_NL/template/email/sales/shipment_new.html delete mode 100644 app/locale/nl_NL/template/email/sales/shipment_new_guest.html delete mode 100644 app/locale/nl_NL/template/email/sales/shipment_update.html delete mode 100644 app/locale/nl_NL/template/email/sales/shipment_update_guest.html delete mode 100644 app/locale/nl_NL/template/email/sitemap_generate_warning.html delete mode 100644 app/locale/nl_NL/template/email/token.html delete mode 100644 app/locale/nl_NL/template/email/wishlist_share.html delete mode 100644 app/locale/pt_BR/Mage_AdminNotification.csv delete mode 100644 app/locale/pt_BR/Mage_Adminhtml.csv delete mode 100644 app/locale/pt_BR/Mage_AmazonPayments.csv delete mode 100644 app/locale/pt_BR/Mage_Api.csv delete mode 100644 app/locale/pt_BR/Mage_Api2.csv delete mode 100644 app/locale/pt_BR/Mage_Authorizenet.csv delete mode 100644 app/locale/pt_BR/Mage_Backup.csv delete mode 100644 app/locale/pt_BR/Mage_Bundle.csv delete mode 100644 app/locale/pt_BR/Mage_Captcha.csv delete mode 100644 app/locale/pt_BR/Mage_Catalog.csv delete mode 100644 app/locale/pt_BR/Mage_CatalogInventory.csv delete mode 100644 app/locale/pt_BR/Mage_CatalogRule.csv delete mode 100644 app/locale/pt_BR/Mage_CatalogSearch.csv delete mode 100644 app/locale/pt_BR/Mage_Centinel.csv delete mode 100644 app/locale/pt_BR/Mage_Checkout.csv delete mode 100644 app/locale/pt_BR/Mage_Cms.csv delete mode 100644 app/locale/pt_BR/Mage_Compiler.csv delete mode 100644 app/locale/pt_BR/Mage_Connect.csv delete mode 100644 app/locale/pt_BR/Mage_Contacts.csv delete mode 100644 app/locale/pt_BR/Mage_Core.csv delete mode 100644 app/locale/pt_BR/Mage_Cron.csv delete mode 100644 app/locale/pt_BR/Mage_CurrencySymbol.csv delete mode 100644 app/locale/pt_BR/Mage_Customer.csv delete mode 100644 app/locale/pt_BR/Mage_Dataflow.csv delete mode 100644 app/locale/pt_BR/Mage_Directory.csv delete mode 100644 app/locale/pt_BR/Mage_Downloadable.csv delete mode 100644 app/locale/pt_BR/Mage_Eav.csv delete mode 100644 app/locale/pt_BR/Mage_GiftMessage.csv delete mode 100644 app/locale/pt_BR/Mage_GoogleAnalytics.csv delete mode 100644 app/locale/pt_BR/Mage_GoogleBase.csv delete mode 100644 app/locale/pt_BR/Mage_GoogleCheckout.csv delete mode 100644 app/locale/pt_BR/Mage_ImportExport.csv delete mode 100644 app/locale/pt_BR/Mage_Index.csv delete mode 100644 app/locale/pt_BR/Mage_Install.csv delete mode 100644 app/locale/pt_BR/Mage_Log.csv delete mode 100644 app/locale/pt_BR/Mage_Media.csv delete mode 100644 app/locale/pt_BR/Mage_Newsletter.csv delete mode 100644 app/locale/pt_BR/Mage_Oauth.csv delete mode 100644 app/locale/pt_BR/Mage_Page.csv delete mode 100644 app/locale/pt_BR/Mage_PageCache.csv delete mode 100644 app/locale/pt_BR/Mage_Paygate.csv delete mode 100644 app/locale/pt_BR/Mage_Payment.csv delete mode 100644 app/locale/pt_BR/Mage_Paypal.csv delete mode 100644 app/locale/pt_BR/Mage_PaypalUk.csv delete mode 100644 app/locale/pt_BR/Mage_Persistent.csv delete mode 100644 app/locale/pt_BR/Mage_Poll.csv delete mode 100644 app/locale/pt_BR/Mage_ProductAlert.csv delete mode 100644 app/locale/pt_BR/Mage_Rating.csv delete mode 100644 app/locale/pt_BR/Mage_Reports.csv delete mode 100644 app/locale/pt_BR/Mage_Review.csv delete mode 100644 app/locale/pt_BR/Mage_Rss.csv delete mode 100644 app/locale/pt_BR/Mage_Rule.csv delete mode 100644 app/locale/pt_BR/Mage_Sales.csv delete mode 100644 app/locale/pt_BR/Mage_SalesRule.csv delete mode 100644 app/locale/pt_BR/Mage_Sendfriend.csv delete mode 100644 app/locale/pt_BR/Mage_Shipping.csv delete mode 100644 app/locale/pt_BR/Mage_Sitemap.csv delete mode 100644 app/locale/pt_BR/Mage_Tag.csv delete mode 100644 app/locale/pt_BR/Mage_Tax.csv delete mode 100644 app/locale/pt_BR/Mage_Usa.csv delete mode 100644 app/locale/pt_BR/Mage_Weee.csv delete mode 100644 app/locale/pt_BR/Mage_Widget.csv delete mode 100644 app/locale/pt_BR/Mage_Wishlist.csv delete mode 100644 app/locale/pt_BR/Mage_XmlConnect.csv delete mode 100644 app/locale/pt_BR/Phoenix_Moneybookers.csv delete mode 100644 app/locale/pt_BR/template/email/account_new.html delete mode 100644 app/locale/pt_BR/template/email/account_new_confirmation.html delete mode 100644 app/locale/pt_BR/template/email/account_new_confirmed.html delete mode 100644 app/locale/pt_BR/template/email/account_password_reset_confirmation.html delete mode 100644 app/locale/pt_BR/template/email/admin_password_new.html delete mode 100644 app/locale/pt_BR/template/email/admin_password_reset_confirmation.html delete mode 100644 app/locale/pt_BR/template/email/amazonpayments_asp_notification_error.html delete mode 100644 app/locale/pt_BR/template/email/contact_form.html delete mode 100644 app/locale/pt_BR/template/email/currency_update_warning.html delete mode 100644 app/locale/pt_BR/template/email/log_clean_warning.html delete mode 100644 app/locale/pt_BR/template/email/moneybookers_activateemail.html delete mode 100644 app/locale/pt_BR/template/email/newsletter_subscr_confirm.html delete mode 100644 app/locale/pt_BR/template/email/newsletter_subscr_success.html delete mode 100644 app/locale/pt_BR/template/email/newsletter_unsub_success.html delete mode 100644 app/locale/pt_BR/template/email/password_new.html delete mode 100644 app/locale/pt_BR/template/email/payment_failed.html delete mode 100644 app/locale/pt_BR/template/email/product_alert_cron_error.html delete mode 100644 app/locale/pt_BR/template/email/product_price_alert.html delete mode 100644 app/locale/pt_BR/template/email/product_share.html delete mode 100644 app/locale/pt_BR/template/email/product_stock_alert.html delete mode 100644 app/locale/pt_BR/template/email/sales/creditmemo_new.html delete mode 100644 app/locale/pt_BR/template/email/sales/creditmemo_new_guest.html delete mode 100644 app/locale/pt_BR/template/email/sales/creditmemo_update.html delete mode 100644 app/locale/pt_BR/template/email/sales/creditmemo_update_guest.html delete mode 100644 app/locale/pt_BR/template/email/sales/invoice_new.html delete mode 100644 app/locale/pt_BR/template/email/sales/invoice_new_guest.html delete mode 100644 app/locale/pt_BR/template/email/sales/invoice_update.html delete mode 100644 app/locale/pt_BR/template/email/sales/invoice_update_guest.html delete mode 100644 app/locale/pt_BR/template/email/sales/order_new.html delete mode 100644 app/locale/pt_BR/template/email/sales/order_new_guest.html delete mode 100644 app/locale/pt_BR/template/email/sales/order_update.html delete mode 100644 app/locale/pt_BR/template/email/sales/order_update_guest.html delete mode 100644 app/locale/pt_BR/template/email/sales/shipment_new.html delete mode 100644 app/locale/pt_BR/template/email/sales/shipment_new_guest.html delete mode 100644 app/locale/pt_BR/template/email/sales/shipment_update.html delete mode 100644 app/locale/pt_BR/template/email/sales/shipment_update_guest.html delete mode 100644 app/locale/pt_BR/template/email/sitemap_generate_warning.html delete mode 100644 app/locale/pt_BR/template/email/token.html delete mode 100644 app/locale/pt_BR/template/email/wishlist_share.html delete mode 100644 app/locale/zh_CN/Mage_AdminNotification.csv delete mode 100644 app/locale/zh_CN/Mage_Adminhtml.csv delete mode 100644 app/locale/zh_CN/Mage_AmazonPayments.csv delete mode 100644 app/locale/zh_CN/Mage_Api.csv delete mode 100644 app/locale/zh_CN/Mage_Api2.csv delete mode 100644 app/locale/zh_CN/Mage_Authorizenet.csv delete mode 100644 app/locale/zh_CN/Mage_Backup.csv delete mode 100644 app/locale/zh_CN/Mage_Bundle.csv delete mode 100644 app/locale/zh_CN/Mage_Captcha.csv delete mode 100644 app/locale/zh_CN/Mage_Catalog.csv delete mode 100644 app/locale/zh_CN/Mage_CatalogInventory.csv delete mode 100644 app/locale/zh_CN/Mage_CatalogRule.csv delete mode 100644 app/locale/zh_CN/Mage_CatalogSearch.csv delete mode 100644 app/locale/zh_CN/Mage_Centinel.csv delete mode 100644 app/locale/zh_CN/Mage_Checkout.csv delete mode 100644 app/locale/zh_CN/Mage_Cms.csv delete mode 100644 app/locale/zh_CN/Mage_Compiler.csv delete mode 100644 app/locale/zh_CN/Mage_Connect.csv delete mode 100644 app/locale/zh_CN/Mage_Contacts.csv delete mode 100644 app/locale/zh_CN/Mage_Core.csv delete mode 100644 app/locale/zh_CN/Mage_Cron.csv delete mode 100644 app/locale/zh_CN/Mage_CurrencySymbol.csv delete mode 100644 app/locale/zh_CN/Mage_Customer.csv delete mode 100644 app/locale/zh_CN/Mage_Dataflow.csv delete mode 100644 app/locale/zh_CN/Mage_Directory.csv delete mode 100644 app/locale/zh_CN/Mage_Downloadable.csv delete mode 100644 app/locale/zh_CN/Mage_Eav.csv delete mode 100644 app/locale/zh_CN/Mage_GiftMessage.csv delete mode 100644 app/locale/zh_CN/Mage_GoogleAnalytics.csv delete mode 100644 app/locale/zh_CN/Mage_GoogleBase.csv delete mode 100644 app/locale/zh_CN/Mage_GoogleCheckout.csv delete mode 100644 app/locale/zh_CN/Mage_ImportExport.csv delete mode 100644 app/locale/zh_CN/Mage_Index.csv delete mode 100644 app/locale/zh_CN/Mage_Install.csv delete mode 100644 app/locale/zh_CN/Mage_Log.csv delete mode 100644 app/locale/zh_CN/Mage_Media.csv delete mode 100644 app/locale/zh_CN/Mage_Newsletter.csv delete mode 100644 app/locale/zh_CN/Mage_Oauth.csv delete mode 100644 app/locale/zh_CN/Mage_Page.csv delete mode 100644 app/locale/zh_CN/Mage_PageCache.csv delete mode 100644 app/locale/zh_CN/Mage_Paygate.csv delete mode 100644 app/locale/zh_CN/Mage_Payment.csv delete mode 100644 app/locale/zh_CN/Mage_Paypal.csv delete mode 100644 app/locale/zh_CN/Mage_PaypalUk.csv delete mode 100644 app/locale/zh_CN/Mage_Persistent.csv delete mode 100644 app/locale/zh_CN/Mage_Poll.csv delete mode 100644 app/locale/zh_CN/Mage_ProductAlert.csv delete mode 100644 app/locale/zh_CN/Mage_Rating.csv delete mode 100644 app/locale/zh_CN/Mage_Reports.csv delete mode 100644 app/locale/zh_CN/Mage_Review.csv delete mode 100644 app/locale/zh_CN/Mage_Rss.csv delete mode 100644 app/locale/zh_CN/Mage_Rule.csv delete mode 100644 app/locale/zh_CN/Mage_Sales.csv delete mode 100644 app/locale/zh_CN/Mage_SalesRule.csv delete mode 100644 app/locale/zh_CN/Mage_Sendfriend.csv delete mode 100644 app/locale/zh_CN/Mage_Shipping.csv delete mode 100644 app/locale/zh_CN/Mage_Sitemap.csv delete mode 100644 app/locale/zh_CN/Mage_Tag.csv delete mode 100644 app/locale/zh_CN/Mage_Tax.csv delete mode 100644 app/locale/zh_CN/Mage_Usa.csv delete mode 100644 app/locale/zh_CN/Mage_Weee.csv delete mode 100644 app/locale/zh_CN/Mage_Widget.csv delete mode 100644 app/locale/zh_CN/Mage_Wishlist.csv delete mode 100644 app/locale/zh_CN/Mage_XmlConnect.csv delete mode 100644 app/locale/zh_CN/Phoenix_Moneybookers.csv delete mode 100644 app/locale/zh_CN/template/email/account_new.html delete mode 100644 app/locale/zh_CN/template/email/account_new_confirmation.html delete mode 100644 app/locale/zh_CN/template/email/account_new_confirmed.html delete mode 100644 app/locale/zh_CN/template/email/account_password_reset_confirmation.html delete mode 100644 app/locale/zh_CN/template/email/admin_password_new.html delete mode 100644 app/locale/zh_CN/template/email/admin_password_reset_confirmation.html delete mode 100644 app/locale/zh_CN/template/email/amazonpayments_asp_notification_error.html delete mode 100644 app/locale/zh_CN/template/email/contact_form.html delete mode 100644 app/locale/zh_CN/template/email/currency_update_warning.html delete mode 100644 app/locale/zh_CN/template/email/log_clean_warning.html delete mode 100644 app/locale/zh_CN/template/email/moneybookers_activateemail.html delete mode 100644 app/locale/zh_CN/template/email/newsletter_subscr_confirm.html delete mode 100644 app/locale/zh_CN/template/email/newsletter_subscr_success.html delete mode 100644 app/locale/zh_CN/template/email/newsletter_unsub_success.html delete mode 100644 app/locale/zh_CN/template/email/password_new.html delete mode 100644 app/locale/zh_CN/template/email/payment_failed.html delete mode 100644 app/locale/zh_CN/template/email/product_alert_cron_error.html delete mode 100644 app/locale/zh_CN/template/email/product_price_alert.html delete mode 100644 app/locale/zh_CN/template/email/product_share.html delete mode 100644 app/locale/zh_CN/template/email/product_stock_alert.html delete mode 100644 app/locale/zh_CN/template/email/sales/creditmemo_new.html delete mode 100644 app/locale/zh_CN/template/email/sales/creditmemo_new_guest.html delete mode 100644 app/locale/zh_CN/template/email/sales/creditmemo_update.html delete mode 100644 app/locale/zh_CN/template/email/sales/creditmemo_update_guest.html delete mode 100644 app/locale/zh_CN/template/email/sales/invoice_new.html delete mode 100644 app/locale/zh_CN/template/email/sales/invoice_new_guest.html delete mode 100644 app/locale/zh_CN/template/email/sales/invoice_update.html delete mode 100644 app/locale/zh_CN/template/email/sales/invoice_update_guest.html delete mode 100644 app/locale/zh_CN/template/email/sales/order_new.html delete mode 100644 app/locale/zh_CN/template/email/sales/order_new_guest.html delete mode 100644 app/locale/zh_CN/template/email/sales/order_update.html delete mode 100644 app/locale/zh_CN/template/email/sales/order_update_guest.html delete mode 100644 app/locale/zh_CN/template/email/sales/shipment_new.html delete mode 100644 app/locale/zh_CN/template/email/sales/shipment_new_guest.html delete mode 100644 app/locale/zh_CN/template/email/sales/shipment_update.html delete mode 100644 app/locale/zh_CN/template/email/sales/shipment_update_guest.html delete mode 100644 app/locale/zh_CN/template/email/sitemap_generate_warning.html delete mode 100644 app/locale/zh_CN/template/email/token.html delete mode 100644 app/locale/zh_CN/template/email/wishlist_share.html delete mode 100644 composer.json create mode 100644 js/tiny_mce/plugins/media/img/flv_player.swf delete mode 100644 lib/Magento/Autoload/ClassMap.php delete mode 100644 lib/Magento/Autoload/IncludePath.php delete mode 100644 lib/Magento/Autoload/Simple.php delete mode 100644 lib/Zend/Cache/Backend/WinCache.php delete mode 100644 lib/Zend/Cloud/Infrastructure/Adapter.php delete mode 100644 lib/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php delete mode 100644 lib/Zend/Cloud/Infrastructure/Adapter/Ec2.php delete mode 100644 lib/Zend/Cloud/Infrastructure/Adapter/Rackspace.php delete mode 100644 lib/Zend/Cloud/Infrastructure/Exception.php delete mode 100644 lib/Zend/Cloud/Infrastructure/Factory.php delete mode 100644 lib/Zend/Cloud/Infrastructure/Image.php delete mode 100644 lib/Zend/Cloud/Infrastructure/ImageList.php delete mode 100644 lib/Zend/Cloud/Infrastructure/Instance.php delete mode 100644 lib/Zend/Cloud/Infrastructure/InstanceList.php delete mode 100644 lib/Zend/Cloud/StorageService/Adapter/Rackspace.php delete mode 100644 lib/Zend/EventManager/Event.php delete mode 100644 lib/Zend/EventManager/EventCollection.php delete mode 100644 lib/Zend/EventManager/EventDescription.php delete mode 100644 lib/Zend/EventManager/EventManager.php delete mode 100644 lib/Zend/EventManager/EventManagerAware.php delete mode 100644 lib/Zend/EventManager/Exception.php delete mode 100644 lib/Zend/EventManager/Exception/InvalidArgumentException.php delete mode 100644 lib/Zend/EventManager/Filter.php delete mode 100644 lib/Zend/EventManager/Filter/FilterIterator.php delete mode 100644 lib/Zend/EventManager/FilterChain.php delete mode 100644 lib/Zend/EventManager/GlobalEventManager.php delete mode 100644 lib/Zend/EventManager/ListenerAggregate.php delete mode 100644 lib/Zend/EventManager/ResponseCollection.php delete mode 100644 lib/Zend/EventManager/SharedEventCollection.php delete mode 100644 lib/Zend/EventManager/SharedEventCollectionAware.php delete mode 100644 lib/Zend/EventManager/SharedEventManager.php delete mode 100644 lib/Zend/EventManager/StaticEventManager.php delete mode 100644 lib/Zend/File/ClassFileLocator.php delete mode 100644 lib/Zend/Form/Decorator/Captcha/ReCaptcha.php delete mode 100644 lib/Zend/Form/Element/Note.php delete mode 100644 lib/Zend/Gdata/Analytics.php delete mode 100644 lib/Zend/Gdata/Analytics/AccountEntry.php delete mode 100644 lib/Zend/Gdata/Analytics/AccountFeed.php delete mode 100644 lib/Zend/Gdata/Analytics/AccountQuery.php delete mode 100644 lib/Zend/Gdata/Analytics/DataEntry.php delete mode 100644 lib/Zend/Gdata/Analytics/DataFeed.php delete mode 100644 lib/Zend/Gdata/Analytics/DataQuery.php delete mode 100644 lib/Zend/Gdata/Analytics/Extension/Dimension.php delete mode 100644 lib/Zend/Gdata/Analytics/Extension/Goal.php delete mode 100644 lib/Zend/Gdata/Analytics/Extension/Metric.php delete mode 100644 lib/Zend/Gdata/Analytics/Extension/Property.php delete mode 100644 lib/Zend/Gdata/Analytics/Extension/TableId.php delete mode 100644 lib/Zend/Http/Header/Exception/InvalidArgumentException.php delete mode 100644 lib/Zend/Http/Header/Exception/RuntimeException.php delete mode 100644 lib/Zend/Http/Header/SetCookie.php delete mode 100644 lib/Zend/Http/UserAgent/Features/Adapter/Browscap.php create mode 100644 lib/Zend/Http/UserAgent/Features/Adapter/WurflApi.php delete mode 100644 lib/Zend/Loader/AutoloaderFactory.php delete mode 100644 lib/Zend/Loader/ClassMapAutoloader.php delete mode 100644 lib/Zend/Loader/Exception/InvalidArgumentException.php delete mode 100644 lib/Zend/Loader/SplAutoloader.php delete mode 100644 lib/Zend/Loader/StandardAutoloader.php delete mode 100644 lib/Zend/Log/Formatter/Abstract.php create mode 100644 lib/Zend/Markup/Parser/Textile.php delete mode 100644 lib/Zend/Mobile/Exception.php delete mode 100644 lib/Zend/Mobile/Push/Abstract.php delete mode 100644 lib/Zend/Mobile/Push/Apns.php delete mode 100644 lib/Zend/Mobile/Push/Exception.php delete mode 100644 lib/Zend/Mobile/Push/Exception/DeviceQuotaExceeded.php delete mode 100644 lib/Zend/Mobile/Push/Exception/InvalidAuthToken.php delete mode 100644 lib/Zend/Mobile/Push/Exception/InvalidPayload.php delete mode 100644 lib/Zend/Mobile/Push/Exception/InvalidRegistration.php delete mode 100644 lib/Zend/Mobile/Push/Exception/InvalidToken.php delete mode 100644 lib/Zend/Mobile/Push/Exception/InvalidTopic.php delete mode 100644 lib/Zend/Mobile/Push/Exception/QuotaExceeded.php delete mode 100644 lib/Zend/Mobile/Push/Exception/ServerUnavailable.php delete mode 100644 lib/Zend/Mobile/Push/Gcm.php delete mode 100644 lib/Zend/Mobile/Push/Interface.php delete mode 100644 lib/Zend/Mobile/Push/Message/Abstract.php delete mode 100644 lib/Zend/Mobile/Push/Message/Apns.php delete mode 100644 lib/Zend/Mobile/Push/Message/Exception.php delete mode 100644 lib/Zend/Mobile/Push/Message/Gcm.php delete mode 100644 lib/Zend/Mobile/Push/Message/Interface.php delete mode 100644 lib/Zend/Mobile/Push/Message/Mpns.php delete mode 100644 lib/Zend/Mobile/Push/Message/Mpns/Raw.php delete mode 100644 lib/Zend/Mobile/Push/Message/Mpns/Tile.php delete mode 100644 lib/Zend/Mobile/Push/Message/Mpns/Toast.php delete mode 100644 lib/Zend/Mobile/Push/Mpns.php delete mode 100644 lib/Zend/Mobile/Push/Response/Gcm.php delete mode 100644 lib/Zend/Mobile/Push/Test/ApnsProxy.php delete mode 100644 lib/Zend/Search/Lucene/Interface/MultiSearcher.php delete mode 100644 lib/Zend/Service/Rackspace/Abstract.php delete mode 100644 lib/Zend/Service/Rackspace/Exception.php delete mode 100644 lib/Zend/Service/Rackspace/Files.php delete mode 100644 lib/Zend/Service/Rackspace/Files/Container.php delete mode 100644 lib/Zend/Service/Rackspace/Files/ContainerList.php delete mode 100644 lib/Zend/Service/Rackspace/Files/Exception.php delete mode 100644 lib/Zend/Service/Rackspace/Files/Object.php delete mode 100644 lib/Zend/Service/Rackspace/Files/ObjectList.php delete mode 100644 lib/Zend/Service/Rackspace/Servers.php delete mode 100644 lib/Zend/Service/Rackspace/Servers/Exception.php delete mode 100644 lib/Zend/Service/Rackspace/Servers/Image.php delete mode 100644 lib/Zend/Service/Rackspace/Servers/ImageList.php delete mode 100644 lib/Zend/Service/Rackspace/Servers/Server.php delete mode 100644 lib/Zend/Service/Rackspace/Servers/ServerList.php delete mode 100644 lib/Zend/Service/Rackspace/Servers/SharedIpGroup.php delete mode 100644 lib/Zend/Service/Rackspace/Servers/SharedIpGroupList.php delete mode 100644 lib/Zend/Service/ShortUrl/BitLy.php create mode 100644 lib/Zend/Service/Simpy.php create mode 100644 lib/Zend/Service/Simpy/Link.php create mode 100644 lib/Zend/Service/Simpy/LinkQuery.php create mode 100644 lib/Zend/Service/Simpy/LinkSet.php create mode 100644 lib/Zend/Service/Simpy/Note.php create mode 100644 lib/Zend/Service/Simpy/NoteSet.php create mode 100644 lib/Zend/Service/Simpy/Tag.php create mode 100644 lib/Zend/Service/Simpy/TagSet.php create mode 100644 lib/Zend/Service/Simpy/Watchlist.php create mode 100644 lib/Zend/Service/Simpy/WatchlistFilter.php create mode 100644 lib/Zend/Service/Simpy/WatchlistFilterSet.php create mode 100644 lib/Zend/Service/Simpy/WatchlistSet.php delete mode 100644 lib/Zend/Service/SqlAzure/Exception.php delete mode 100644 lib/Zend/Service/SqlAzure/Management/Client.php delete mode 100644 lib/Zend/Service/SqlAzure/Management/Exception.php delete mode 100644 lib/Zend/Service/SqlAzure/Management/FirewallRuleInstance.php delete mode 100644 lib/Zend/Service/SqlAzure/Management/ServerInstance.php delete mode 100644 lib/Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php delete mode 100644 lib/Zend/Service/Twitter/Response.php create mode 100644 lib/Zend/Service/Twitter/Search.php delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Certificate.php delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Deployment.php delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/GetAsynchronousOperation.php delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Package.php delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/PackageScaffolder/PackageScaffolderAbstract.php delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder.phar delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/build.bat delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/index.php delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/Web.config delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/bin/add-environment-variables.cmd delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/bin/add-environment-variables.ps1 delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/bin/install-php.cmd delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/diagnostics.wadcfg delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/Microsoft.Web.Deployment.dll delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/Microsoft.Web.PlatformInstaller.UI.dll delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/Microsoft.Web.PlatformInstaller.dll delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/WebpiCmdLine.exe delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/license.rtf delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/ServiceConfiguration.cscfg delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/ServiceDefinition.csdef delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Service.php delete mode 100644 lib/Zend/Service/WindowsAzure/CommandLine/Storage.php delete mode 100644 lib/Zend/Service/WindowsAzure/Log/Exception.php delete mode 100644 lib/Zend/Service/WindowsAzure/Log/Formatter/WindowsAzure.php delete mode 100644 lib/Zend/Service/WindowsAzure/Log/Writer/WindowsAzure.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/AffinityGroupInstance.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/CertificateInstance.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/Client.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/DeploymentInstance.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/Exception.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/HostedServiceInstance.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/LocationInstance.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/OperatingSystemFamilyInstance.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/OperatingSystemInstance.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/OperationStatusInstance.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/StorageServiceInstance.php delete mode 100644 lib/Zend/Service/WindowsAzure/Management/SubscriptionOperationInstance.php delete mode 100644 lib/Zend/Soap/Server/Proxy.php delete mode 100644 lib/Zend/Stdlib/CallbackHandler.php delete mode 100644 lib/Zend/Stdlib/Exception.php delete mode 100644 lib/Zend/Stdlib/Exception/InvalidCallbackException.php delete mode 100644 lib/Zend/Stdlib/PriorityQueue.php delete mode 100644 lib/Zend/Stdlib/SplPriorityQueue.php delete mode 100644 lib/Zend/Tool/Framework/Manifest/ActionMetadata.php delete mode 100644 lib/Zend/Tool/Framework/Manifest/Metadata.php delete mode 100644 lib/Zend/Tool/Framework/Manifest/ProviderMetadata.php delete mode 100644 lib/Zend/Tool/Project/Context/Zf/ServicesDirectory.php delete mode 100644 lib/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php delete mode 100644 lib/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php delete mode 100644 lib/Zend/Tool/Project/Context/Zf/TestApplicationModulesDirectory.php delete mode 100644 lib/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php delete mode 100644 lib/Zend/Validate/Ldap/Dn.php delete mode 100644 modman delete mode 100644 skin/adminhtml/default/default/images/logo_email.gif delete mode 100644 skin/adminhtml/default/default/images/logo_print.gif delete mode 100644 skin/frontend/rwd/default/css/madisonisland-ie8.css delete mode 100644 skin/frontend/rwd/default/css/madisonisland.css delete mode 100644 skin/frontend/rwd/default/css/scaffold-forms.css delete mode 100644 skin/frontend/rwd/default/css/styles-ie8.css delete mode 100644 skin/frontend/rwd/default/css/styles.css delete mode 100644 skin/frontend/rwd/default/images/ajax-loader.gif delete mode 100644 skin/frontend/rwd/default/images/bg_x.png delete mode 100644 skin/frontend/rwd/default/images/demo-logo.png delete mode 100644 skin/frontend/rwd/default/images/demo_logo.png delete mode 100644 skin/frontend/rwd/default/images/icon_sprite.png delete mode 100644 skin/frontend/rwd/default/images/icon_sprite@2x.png delete mode 100644 skin/frontend/rwd/default/images/logo.gif delete mode 100644 skin/frontend/rwd/default/images/logo_email.gif delete mode 100644 skin/frontend/rwd/default/images/logo_print.gif delete mode 100644 skin/frontend/rwd/default/images/media/col_left_callout.jpg delete mode 100644 skin/frontend/rwd/default/images/media/col_right_callout.jpg delete mode 100644 skin/frontend/rwd/default/images/media/homepage_banner_1.jpg delete mode 100644 skin/frontend/rwd/default/images/media/homepage_banner_1@2x.jpg delete mode 100644 skin/frontend/rwd/default/images/media/homepage_banner_2.jpg delete mode 100644 skin/frontend/rwd/default/images/media/homepage_callout_1.jpg delete mode 100644 skin/frontend/rwd/default/images/media/homepage_callout_1@2x.jpg delete mode 100644 skin/frontend/rwd/default/images/media/homepage_callout_2.jpg delete mode 100644 skin/frontend/rwd/default/images/media/homepage_callout_2@2x.jpg delete mode 100644 skin/frontend/rwd/default/images/media/homepage_callout_3.jpg delete mode 100644 skin/frontend/rwd/default/images/media/homepage_callout_3@2x.jpg delete mode 100644 skin/frontend/rwd/default/images/opc-ajax-loader.gif delete mode 100644 skin/frontend/rwd/default/images/social_icons.png delete mode 100644 skin/frontend/rwd/default/images/social_icons@2x.png delete mode 100644 skin/frontend/rwd/default/js/app.js delete mode 100644 skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevateZoom-3.0.8.min.js delete mode 100644 skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevatezoom.js delete mode 100644 skin/frontend/rwd/default/js/lib/enquire.js delete mode 100644 skin/frontend/rwd/default/js/lib/fastclick.js delete mode 100644 skin/frontend/rwd/default/js/lib/imagesloaded.js delete mode 100644 skin/frontend/rwd/default/js/lib/jquery-1.10.2.js delete mode 100644 skin/frontend/rwd/default/js/lib/jquery-1.10.2.min.js delete mode 100644 skin/frontend/rwd/default/js/lib/jquery-1.10.2.min.map delete mode 100644 skin/frontend/rwd/default/js/lib/jquery.cycle2.min.js delete mode 100644 skin/frontend/rwd/default/js/lib/jquery.cycle2.swipe.min.js delete mode 100644 skin/frontend/rwd/default/js/lib/matchMedia.addListener.js delete mode 100644 skin/frontend/rwd/default/js/lib/matchMedia.js delete mode 100644 skin/frontend/rwd/default/js/lib/modernizr.custom.min.js delete mode 100644 skin/frontend/rwd/default/js/lib/selectivizr.js delete mode 100644 skin/frontend/rwd/default/js/minicart.js delete mode 100644 skin/frontend/rwd/default/js/msrp_rwd.js delete mode 100644 skin/frontend/rwd/default/js/opcheckout_rwd.js delete mode 100644 skin/frontend/rwd/default/js/slideshow.js delete mode 100644 skin/frontend/rwd/default/scss/.htaccess delete mode 100644 skin/frontend/rwd/default/scss/_core.scss delete mode 100644 skin/frontend/rwd/default/scss/_framework.scss delete mode 100644 skin/frontend/rwd/default/scss/_var.scss delete mode 100644 skin/frontend/rwd/default/scss/config.rb delete mode 100644 skin/frontend/rwd/default/scss/content/_category.scss delete mode 100644 skin/frontend/rwd/default/scss/content/_home.scss delete mode 100644 skin/frontend/rwd/default/scss/core/_common.scss delete mode 100644 skin/frontend/rwd/default/scss/core/_form.scss delete mode 100644 skin/frontend/rwd/default/scss/core/_reset.scss delete mode 100644 skin/frontend/rwd/default/scss/core/_table.scss delete mode 100644 skin/frontend/rwd/default/scss/function/_black.scss delete mode 100644 skin/frontend/rwd/default/scss/function/_white.scss delete mode 100644 skin/frontend/rwd/default/scss/layout/_footer.scss delete mode 100644 skin/frontend/rwd/default/scss/layout/_global.scss delete mode 100644 skin/frontend/rwd/default/scss/layout/_header-account.scss delete mode 100644 skin/frontend/rwd/default/scss/layout/_header-cart.scss delete mode 100644 skin/frontend/rwd/default/scss/layout/_header-nav.scss delete mode 100644 skin/frontend/rwd/default/scss/layout/_header-search.scss delete mode 100644 skin/frontend/rwd/default/scss/layout/_header.scss delete mode 100644 skin/frontend/rwd/default/scss/madisonisland-ie8.scss delete mode 100644 skin/frontend/rwd/default/scss/madisonisland.scss delete mode 100644 skin/frontend/rwd/default/scss/mixin/_breakpoint.scss delete mode 100644 skin/frontend/rwd/default/scss/mixin/_clearfix.scss delete mode 100644 skin/frontend/rwd/default/scss/mixin/_if-resolution.scss delete mode 100644 skin/frontend/rwd/default/scss/mixin/_image-replacement.scss delete mode 100644 skin/frontend/rwd/default/scss/mixin/_loading-overlay.scss delete mode 100644 skin/frontend/rwd/default/scss/mixin/_menu.scss delete mode 100644 skin/frontend/rwd/default/scss/mixin/_not-selectable.scss delete mode 100644 skin/frontend/rwd/default/scss/mixin/_toggle-content.scss delete mode 100644 skin/frontend/rwd/default/scss/mixin/_triangle.scss delete mode 100644 skin/frontend/rwd/default/scss/mixin/_typography.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_account-reviews.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_catalog-compare.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_catalog-msrp.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_catalog-product.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_checkout-cart-minicart.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_checkout-cart.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_checkout-onepage.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_checkout-success.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_cms.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_configurableswatches.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_contacts.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_cookies.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_customer.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_paypal.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_pricing_conditions.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_product-list.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_review.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_search.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_slideshow.scss delete mode 100644 skin/frontend/rwd/default/scss/module/_wishlist.scss delete mode 100644 skin/frontend/rwd/default/scss/override/_plugin.scss delete mode 100644 skin/frontend/rwd/default/scss/scaffold-forms.scss delete mode 100644 skin/frontend/rwd/default/scss/styles-ie8.scss delete mode 100644 skin/frontend/rwd/default/scss/styles.scss delete mode 100644 skin/frontend/rwd/default/scss/vendor/_normalize.scss create mode 100644 var/package/Interface_Adminhtml_Default-1.8.1.0.xml delete mode 100644 var/package/Interface_Adminhtml_Default-1.9.0.0.xml create mode 100644 var/package/Interface_Frontend_Base_Default-1.8.1.0.xml delete mode 100644 var/package/Interface_Frontend_Base_Default-1.9.0.0.xml rename var/package/{Interface_Frontend_Default-1.9.0.0.xml => Interface_Frontend_Default-1.8.1.0.xml} (95%) delete mode 100644 var/package/Interface_Frontend_Rwd_Default-1.9.0.1.xml create mode 100644 var/package/Interface_Install_Default-1.8.0.0.xml delete mode 100644 var/package/Interface_Install_Default-1.9.0.0.xml create mode 100644 var/package/Lib_Js_Mage-1.8.1.0.xml delete mode 100644 var/package/Lib_Js_Mage-1.9.0.0.xml rename var/package/{Lib_Js_Prototype-1.7.0.0.5.xml => Lib_Js_Prototype-1.7.0.0.4.xml} (97%) rename var/package/{Lib_Js_TinyMCE-3.4.7.1.xml => Lib_Js_TinyMCE-3.4.7.0.xml} (50%) create mode 100644 var/package/Lib_Magento-1.8.0.0.xml delete mode 100644 var/package/Lib_Magento-1.9.0.0.xml rename var/package/{Lib_Varien-1.9.0.0.xml => Lib_Varien-1.8.1.0.xml} (97%) create mode 100644 var/package/Lib_ZF-1.11.1.0.xml delete mode 100644 var/package/Lib_ZF-1.12.3.0.xml rename var/package/{Lib_ZF_Locale-1.12.3.0.xml => Lib_ZF_Locale-1.11.1.0.xml} (96%) create mode 100644 var/package/Mage_All_Latest-1.8.1.0.xml delete mode 100644 var/package/Mage_All_Latest-1.9.0.1.xml create mode 100644 var/package/Mage_Centinel-1.8.0.0.xml delete mode 100644 var/package/Mage_Centinel-1.9.0.1.xml rename var/package/{Mage_Compiler-1.9.0.1.xml => Mage_Compiler-1.8.1.0.xml} (54%) create mode 100644 var/package/Mage_Core_Adminhtml-1.8.1.0.xml delete mode 100644 var/package/Mage_Core_Adminhtml-1.9.0.0.xml create mode 100644 var/package/Mage_Core_Modules-1.8.1.0.xml delete mode 100644 var/package/Mage_Core_Modules-1.9.0.1.xml create mode 100644 var/package/Mage_Downloader-1.8.1.0.xml delete mode 100644 var/package/Mage_Downloader-1.9.0.1.xml delete mode 100644 var/package/Mage_Locale_de_DE-1.9.0.0.xml rename var/package/{Mage_Locale_en_US-1.9.0.0.xml => Mage_Locale_en_US-1.8.1.0.xml} (77%) delete mode 100644 var/package/Mage_Locale_es_ES-1.9.0.0.xml delete mode 100644 var/package/Mage_Locale_fr_FR-1.9.0.0.xml delete mode 100644 var/package/Mage_Locale_nl_NL-1.9.0.0.xml delete mode 100644 var/package/Mage_Locale_pt_BR-1.9.0.0.xml delete mode 100644 var/package/Mage_Locale_zh_CN-1.9.0.0.xml create mode 100644 var/package/Magento_Mobile-1.8.0.0.23.1.xml delete mode 100644 var/package/Magento_Mobile-1.8.0.0.23.2.xml rename var/package/{Phoenix_Moneybookers-1.3.2.1.xml => Phoenix_Moneybookers-1.3.2.xml} (62%) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index cfc9d824c..7025e1961 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -2,7 +2,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ] NOTE: Current Release Notes are maintained at: [ ] [ -] http://www.magentocommerce.com/knowledge-base/entry/ce-19-later-release-notes [ +] http://www.magentocommerce.com/knowledge-base/entry/ce-18-later-release-notes [ ] [ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/app/Mage.php b/app/Mage.php index 077d905b2..e2efba43d 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -169,9 +169,9 @@ public static function getVersionInfo() { return array( 'major' => '1', - 'minor' => '9', - 'revision' => '0', - 'patch' => '1', + 'minor' => '8', + 'revision' => '1', + 'patch' => '0', 'stability' => '', 'number' => '', ); diff --git a/app/code/community/Phoenix/Moneybookers/Block/Form.php b/app/code/community/Phoenix/Moneybookers/Block/Form.php index 819bdbdf1..30a1a75a2 100644 --- a/app/code/community/Phoenix/Moneybookers/Block/Form.php +++ b/app/code/community/Phoenix/Moneybookers/Block/Form.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Block_Form extends Mage_Payment_Block_Form diff --git a/app/code/community/Phoenix/Moneybookers/Block/Info.php b/app/code/community/Phoenix/Moneybookers/Block/Info.php index 9cbea1c5f..0e99a96b8 100644 --- a/app/code/community/Phoenix/Moneybookers/Block/Info.php +++ b/app/code/community/Phoenix/Moneybookers/Block/Info.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Block_Info extends Mage_Payment_Block_Info diff --git a/app/code/community/Phoenix/Moneybookers/Block/Jsinit.php b/app/code/community/Phoenix/Moneybookers/Block/Jsinit.php index 0d2f64462..26d000af7 100644 --- a/app/code/community/Phoenix/Moneybookers/Block/Jsinit.php +++ b/app/code/community/Phoenix/Moneybookers/Block/Jsinit.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Block_Jsinit extends Mage_Adminhtml_Block_Template diff --git a/app/code/community/Phoenix/Moneybookers/Block/Payment.php b/app/code/community/Phoenix/Moneybookers/Block/Payment.php index f0dc718a7..471c1a913 100644 --- a/app/code/community/Phoenix/Moneybookers/Block/Payment.php +++ b/app/code/community/Phoenix/Moneybookers/Block/Payment.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Block_Payment extends Mage_Core_Block_Template diff --git a/app/code/community/Phoenix/Moneybookers/Block/Placeform.php b/app/code/community/Phoenix/Moneybookers/Block/Placeform.php index 1194dff38..96f26a198 100644 --- a/app/code/community/Phoenix/Moneybookers/Block/Placeform.php +++ b/app/code/community/Phoenix/Moneybookers/Block/Placeform.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Block_Placeform extends Mage_Core_Block_Template diff --git a/app/code/community/Phoenix/Moneybookers/Block/Redirect.php b/app/code/community/Phoenix/Moneybookers/Block/Redirect.php index bf28050fc..3c891fc96 100644 --- a/app/code/community/Phoenix/Moneybookers/Block/Redirect.php +++ b/app/code/community/Phoenix/Moneybookers/Block/Redirect.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Block_Redirect extends Mage_Core_Block_Template diff --git a/app/code/community/Phoenix/Moneybookers/Helper/Data.php b/app/code/community/Phoenix/Moneybookers/Helper/Data.php index 653ea7890..9737d7909 100644 --- a/app/code/community/Phoenix/Moneybookers/Helper/Data.php +++ b/app/code/community/Phoenix/Moneybookers/Helper/Data.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Helper_Data extends Mage_Payment_Helper_Data diff --git a/app/code/community/Phoenix/Moneybookers/Model/Abstract.php b/app/code/community/Phoenix/Moneybookers/Model/Abstract.php index 3aa7bad30..87e1010e1 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Abstract.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Abstract.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ abstract class Phoenix_Moneybookers_Model_Abstract extends Mage_Payment_Model_Method_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Acc.php b/app/code/community/Phoenix/Moneybookers/Model/Acc.php index fef67540f..35f812e48 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Acc.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Acc.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Acc extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Csi.php b/app/code/community/Phoenix/Moneybookers/Model/Csi.php index 0d9e32d62..49965cc8c 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Csi.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Csi.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Csi extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Did.php b/app/code/community/Phoenix/Moneybookers/Model/Did.php index c3fab915f..30c3ba62c 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Did.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Did.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Did extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Dnk.php b/app/code/community/Phoenix/Moneybookers/Model/Dnk.php index 2cd3055fb..6a25f09f3 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Dnk.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Dnk.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Dnk extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Ebt.php b/app/code/community/Phoenix/Moneybookers/Model/Ebt.php index 126cc6497..7968f473a 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Ebt.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Ebt.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Ebt extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Ent.php b/app/code/community/Phoenix/Moneybookers/Model/Ent.php index b508fc335..a0a492038 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Ent.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Ent.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Ent extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Event.php b/app/code/community/Phoenix/Moneybookers/Model/Event.php index 7b1f6d09f..2beace693 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Event.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Event.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/community/Phoenix/Moneybookers/Model/Gcb.php b/app/code/community/Phoenix/Moneybookers/Model/Gcb.php index a390737dd..2f7e8f570 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Gcb.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Gcb.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Gcb extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Gir.php b/app/code/community/Phoenix/Moneybookers/Model/Gir.php index 73211c114..ad9c990b3 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Gir.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Gir.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Gir extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Idl.php b/app/code/community/Phoenix/Moneybookers/Model/Idl.php index b6f245b79..d04d5bb02 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Idl.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Idl.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Idl extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Lsr.php b/app/code/community/Phoenix/Moneybookers/Model/Lsr.php index 99866dbb9..90fbde075 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Lsr.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Lsr.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Lsr extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Mae.php b/app/code/community/Phoenix/Moneybookers/Model/Mae.php index 9841832ef..8e344a91f 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Mae.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Mae.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Mae extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Npy.php b/app/code/community/Phoenix/Moneybookers/Model/Npy.php index 23aec64d0..8ba2d7646 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Npy.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Npy.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Npy extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Obt.php b/app/code/community/Phoenix/Moneybookers/Model/Obt.php index 74123a1ff..8761099d1 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Obt.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Obt.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Obt extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Pli.php b/app/code/community/Phoenix/Moneybookers/Model/Pli.php index aa72c775d..d042c0148 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Pli.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Pli.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Pli extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Psp.php b/app/code/community/Phoenix/Moneybookers/Model/Psp.php index 7a1424c25..7a5307f4b 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Psp.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Psp.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Psp extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Pwy.php b/app/code/community/Phoenix/Moneybookers/Model/Pwy.php index d83fec79a..b782292ab 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Pwy.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Pwy.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Pwy extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Sft.php b/app/code/community/Phoenix/Moneybookers/Model/Sft.php index 20935b56f..d386fdbc3 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Sft.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Sft.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Sft extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/So2.php b/app/code/community/Phoenix/Moneybookers/Model/So2.php index f61934a91..cad177cb5 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/So2.php +++ b/app/code/community/Phoenix/Moneybookers/Model/So2.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_So2 extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/Model/Wlt.php b/app/code/community/Phoenix/Moneybookers/Model/Wlt.php index 8a15fbfa0..75a66ea41 100644 --- a/app/code/community/Phoenix/Moneybookers/Model/Wlt.php +++ b/app/code/community/Phoenix/Moneybookers/Model/Wlt.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_Model_Wlt extends Phoenix_Moneybookers_Model_Abstract diff --git a/app/code/community/Phoenix/Moneybookers/controllers/MoneybookersController.php b/app/code/community/Phoenix/Moneybookers/controllers/MoneybookersController.php index 9be794194..73f17209a 100644 --- a/app/code/community/Phoenix/Moneybookers/controllers/MoneybookersController.php +++ b/app/code/community/Phoenix/Moneybookers/controllers/MoneybookersController.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_MoneybookersController extends Mage_Adminhtml_Controller_Action diff --git a/app/code/community/Phoenix/Moneybookers/controllers/ProcessingController.php b/app/code/community/Phoenix/Moneybookers/controllers/ProcessingController.php index 24821f5e6..d49e16a6b 100644 --- a/app/code/community/Phoenix/Moneybookers/controllers/ProcessingController.php +++ b/app/code/community/Phoenix/Moneybookers/controllers/ProcessingController.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Phoenix_Moneybookers_ProcessingController extends Mage_Core_Controller_Front_Action diff --git a/app/code/community/Phoenix/Moneybookers/etc/config.xml b/app/code/community/Phoenix/Moneybookers/etc/config.xml index 486ad2681..712386ab1 100644 --- a/app/code/community/Phoenix/Moneybookers/etc/config.xml +++ b/app/code/community/Phoenix/Moneybookers/etc/config.xml @@ -15,7 +15,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ --> diff --git a/app/code/community/Phoenix/Moneybookers/etc/system.xml b/app/code/community/Phoenix/Moneybookers/etc/system.xml index d4ba81192..b9e046855 100644 --- a/app/code/community/Phoenix/Moneybookers/etc/system.xml +++ b/app/code/community/Phoenix/Moneybookers/etc/system.xml @@ -15,7 +15,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ --> diff --git a/app/code/community/Phoenix/Moneybookers/sql/moneybookers_setup/install-1.6.0.0.php b/app/code/community/Phoenix/Moneybookers/sql/moneybookers_setup/install-1.6.0.0.php index c3e6ca367..1e4d1f65c 100644 --- a/app/code/community/Phoenix/Moneybookers/sql/moneybookers_setup/install-1.6.0.0.php +++ b/app/code/community/Phoenix/Moneybookers/sql/moneybookers_setup/install-1.6.0.0.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/community/Phoenix/Moneybookers/sql/moneybookers_setup/mysql4-upgrade-1.2-1.2.0.1.php b/app/code/community/Phoenix/Moneybookers/sql/moneybookers_setup/mysql4-upgrade-1.2-1.2.0.1.php index a7c32e043..7293003e1 100644 --- a/app/code/community/Phoenix/Moneybookers/sql/moneybookers_setup/mysql4-upgrade-1.2-1.2.0.1.php +++ b/app/code/community/Phoenix/Moneybookers/sql/moneybookers_setup/mysql4-upgrade-1.2-1.2.0.1.php @@ -14,7 +14,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Helper/Data.php b/app/code/core/Mage/Admin/Helper/Data.php index 9ab698ab9..2d11f9bf0 100644 --- a/app/code/core/Mage/Admin/Helper/Data.php +++ b/app/code/core/Mage/Admin/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Acl.php b/app/code/core/Mage/Admin/Model/Acl.php index 4b60c0cda..c49604dfd 100644 --- a/app/code/core/Mage/Admin/Model/Acl.php +++ b/app/code/core/Mage/Admin/Model/Acl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php b/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php index fcc9ad36e..55af7e155 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php +++ b/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php index 7956a757a..ebba9c23d 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Acl/Resource.php b/app/code/core/Mage/Admin/Model/Acl/Resource.php index 329c8b0f4..a012c9dab 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Resource.php +++ b/app/code/core/Mage/Admin/Model/Acl/Resource.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Acl/Role.php b/app/code/core/Mage/Admin/Model/Acl/Role.php index 03b701f51..03ac77088 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php b/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php index 0b3783ffd..d5c78d915 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Group.php b/app/code/core/Mage/Admin/Model/Acl/Role/Group.php index cb22d97a5..297d9c460 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Group.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php b/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php index f89a7ef72..c745998ce 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/User.php b/app/code/core/Mage/Admin/Model/Acl/Role/User.php index dbee9ad00..7a84306fc 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/User.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Config.php b/app/code/core/Mage/Admin/Model/Config.php index ef62c1e8c..e6fa1ab13 100644 --- a/app/code/core/Mage/Admin/Model/Config.php +++ b/app/code/core/Mage/Admin/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl.php index f5d8c5f89..1d382a9ee 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Acl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php index 56dc6ce97..ed95830b2 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php index 89b0f8940..ae2726397 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php index 6432f8131..68a683c06 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Role.php b/app/code/core/Mage/Admin/Model/Mysql4/Role.php index 831ff25f1..6bf4f9065 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Role.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php index d2d501df2..8a3c83ee6 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles.php index ced5842f3..cf774e39d 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Roles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php index fffe93537..762ab5c48 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php index 43d1a5b29..76694b1cd 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Rules.php b/app/code/core/Mage/Admin/Model/Mysql4/Rules.php index f706dba7a..ff3c051d6 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Rules.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Rules.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php index 5a266c276..d75b9fcaf 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/User.php b/app/code/core/Mage/Admin/Model/Mysql4/User.php index 2b920ad8e..5b1bfc72d 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/User.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php index a8dda4301..7c4baf671 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Observer.php b/app/code/core/Mage/Admin/Model/Observer.php index 899b5f419..4379d5443 100644 --- a/app/code/core/Mage/Admin/Model/Observer.php +++ b/app/code/core/Mage/Admin/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Redirectpolicy.php b/app/code/core/Mage/Admin/Model/Redirectpolicy.php deleted file mode 100644 index 2be3a7c90..000000000 --- a/app/code/core/Mage/Admin/Model/Redirectpolicy.php +++ /dev/null @@ -1,71 +0,0 @@ - - */ -class Mage_Admin_Model_Redirectpolicy -{ - /** - * @var Mage_Adminhtml_Model_Url - */ - protected $_urlModel; - - /** - * @param array $parameters array('urlModel' => object) - */ - public function __construct($parameters = array()) - { - /** @var Mage_Adminhtml_Model_Url _urlModel */ - $this->_urlModel = (!empty($parameters['urlModel'])) ? - $parameters['urlModel'] : Mage::getModel('adminhtml/url'); - } - - /** - * Redirect to startup page after logging in if request contains any params (except security key) - * - * @param Mage_Admin_Model_User $user - * @param Zend_Controller_Request_Http $request - * @param string|null $alternativeUrl - * @return null|string - */ - public function getRedirectUrl(Mage_Admin_Model_User $user, Zend_Controller_Request_Http $request = null, - $alternativeUrl = null) - { - if (empty($request)) { - return; - } - $countRequiredParams = $this->_urlModel->useSecretKey() ? 1 : 0; - $countGetParams = count($request->getUserParams()) + count($request->getQuery()); - - return ($countGetParams > $countRequiredParams) ? - $this->_urlModel->getUrl($user->getStartupPageUrl()) : $alternativeUrl; - } -} diff --git a/app/code/core/Mage/Admin/Model/Resource/Acl.php b/app/code/core/Mage/Admin/Model/Resource/Acl.php index fbfa8e758..8f5ebcdb6 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Acl.php +++ b/app/code/core/Mage/Admin/Model/Resource/Acl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Acl/Role.php b/app/code/core/Mage/Admin/Model/Resource/Acl/Role.php index 0955284b0..cb4b980fa 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Acl/Role.php +++ b/app/code/core/Mage/Admin/Model/Resource/Acl/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php index 53d8c7a50..c7e520aaa 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php index 765583705..6f2f9694d 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Role.php b/app/code/core/Mage/Admin/Model/Resource/Role.php index 507067d1b..9cdea00a9 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Role.php +++ b/app/code/core/Mage/Admin/Model/Resource/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Role/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Role/Collection.php index 2be1287f9..d53eea584 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Role/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Role/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles.php b/app/code/core/Mage/Admin/Model/Resource/Roles.php index e9c249f79..ab6ada1e9 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Roles.php +++ b/app/code/core/Mage/Admin/Model/Resource/Roles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php index ae0362a48..878e6c9b0 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php index 141fd4d45..8c92ab0c7 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Rules.php b/app/code/core/Mage/Admin/Model/Resource/Rules.php index a1377e545..963b0a94e 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Rules.php +++ b/app/code/core/Mage/Admin/Model/Resource/Rules.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php index 96b34851f..84fba51b8 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/User.php b/app/code/core/Mage/Admin/Model/Resource/User.php index 0f07db2c1..c8439045c 100644 --- a/app/code/core/Mage/Admin/Model/Resource/User.php +++ b/app/code/core/Mage/Admin/Model/Resource/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/User/Collection.php b/app/code/core/Mage/Admin/Model/Resource/User/Collection.php index 34342dbfa..b7d461a60 100644 --- a/app/code/core/Mage/Admin/Model/Resource/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/User/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Role.php b/app/code/core/Mage/Admin/Model/Role.php index e1be9a1f6..4e5d5e7df 100644 --- a/app/code/core/Mage/Admin/Model/Role.php +++ b/app/code/core/Mage/Admin/Model/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Roles.php b/app/code/core/Mage/Admin/Model/Roles.php index 05d456710..4fc21034e 100644 --- a/app/code/core/Mage/Admin/Model/Roles.php +++ b/app/code/core/Mage/Admin/Model/Roles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Rules.php b/app/code/core/Mage/Admin/Model/Rules.php index a9d1afd1d..be089829d 100644 --- a/app/code/core/Mage/Admin/Model/Rules.php +++ b/app/code/core/Mage/Admin/Model/Rules.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Session.php b/app/code/core/Mage/Admin/Model/Session.php index 81dcf3b97..ea8d1d8cf 100644 --- a/app/code/core/Mage/Admin/Model/Session.php +++ b/app/code/core/Mage/Admin/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,39 +42,12 @@ class Mage_Admin_Model_Session extends Mage_Core_Model_Session_Abstract */ protected $_isFirstPageAfterLogin; - /** - * @var Mage_Admin_Model_Redirectpolicy - */ - protected $_urlPolicy; - - /** - * @var Mage_Core_Controller_Response_Http - */ - protected $_response; - - /** - * @var Mage_Core_Model_Factory - */ - protected $_factory; - /** * Class constructor * */ - public function __construct($parameters = array()) + public function __construct() { - /** @var Mage_Admin_Model_Redirectpolicy _urlPolicy */ - $this->_urlPolicy = (!empty($parameters['redirectPolicy'])) ? - $parameters['redirectPolicy'] : Mage::getModel('admin/redirectpolicy'); - - /** @var Mage_Core_Controller_Response_Http _response */ - $this->_response = (!empty($parameters['response'])) ? - $parameters['response'] : new Mage_Core_Controller_Response_Http(); - - /** @var $user Mage_Core_Model_Factory */ - $this->_factory = (!empty($parameters['factory'])) ? - $parameters['factory'] : Mage::getModel('core/factory'); - $this->init('admin'); } @@ -114,7 +87,7 @@ public function login($username, $password, $request = null) try { /** @var $user Mage_Admin_Model_User */ - $user = $this->_factory->getModel('admin/user'); + $user = Mage::getModel('admin/user'); $user->login($username, $password); if ($user->getId()) { $this->renewSession(); @@ -126,13 +99,11 @@ public function login($username, $password, $request = null) $this->setUser($user); $this->setAcl(Mage::getResourceModel('admin/acl')->loadAcl()); - $alternativeUrl = $this->_getRequestUri($request); - $redirectUrl = $this->_urlPolicy->getRedirectUrl($user, $request, $alternativeUrl); - if ($redirectUrl) { + $requestUri = $this->_getRequestUri($request); + if ($requestUri) { Mage::dispatchEvent('admin_session_user_login_success', array('user' => $user)); - $this->_response->clearHeaders() - ->setRedirect($redirectUrl) - ->sendHeadersAndExit(); + header('Location: ' . $requestUri); + exit; } } else { Mage::throwException(Mage::helper('adminhtml')->__('Invalid User Name or Password.')); diff --git a/app/code/core/Mage/Admin/Model/User.php b/app/code/core/Mage/Admin/Model/User.php index f176c2119..6f2de7986 100644 --- a/app/code/core/Mage/Admin/Model/User.php +++ b/app/code/core/Mage/Admin/Model/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -503,7 +503,7 @@ public function getStartupPageUrl() $aclResource = 'admin/' . $startupPage; if (Mage::getSingleton('admin/session')->isAllowed($aclResource)) { $nodePath = 'menu/' . join('/children/', explode('/', $startupPage)) . '/action'; - $url = (string)Mage::getSingleton('admin/config')->getAdminhtmlConfig()->getNode($nodePath); + $url = Mage::getSingleton('admin/config')->getAdminhtmlConfig()->getNode($nodePath); if ($url) { return $url; } diff --git a/app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php index 60e5ed491..c8dc6e720 100644 --- a/app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/etc/config.xml b/app/code/core/Mage/Admin/etc/config.xml index 6e1abd046..c28de66eb 100644 --- a/app/code/core/Mage/Admin/etc/config.xml +++ b/app/code/core/Mage/Admin/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php b/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php index def55dfc5..d29291416 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php index 9707a9de4..087d6c147 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php index db7619260..2aca4bf3a 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php index c1d80869c..44db95329 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 8c013a669..37be82052 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php index 46cc4705d..b3c91129d 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php index 9de0a7624..3b3afe02f 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Helper/Data.php b/app/code/core/Mage/AdminNotification/Helper/Data.php index f467f9bc6..c15399cd4 100644 --- a/app/code/core/Mage/AdminNotification/Helper/Data.php +++ b/app/code/core/Mage/AdminNotification/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Feed.php b/app/code/core/Mage/AdminNotification/Model/Feed.php index 13d4d4c00..7ad41a2d1 100644 --- a/app/code/core/Mage/AdminNotification/Model/Feed.php +++ b/app/code/core/Mage/AdminNotification/Model/Feed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Inbox.php index b1450d8ad..75ab3ad0d 100644 --- a/app/code/core/Mage/AdminNotification/Model/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Inbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php index 4bb56a750..a05946439 100644 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php index 51fa27bd8..ba1acf447 100644 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php +++ b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Observer.php b/app/code/core/Mage/AdminNotification/Model/Observer.php index 0312ceb7a..10780ee1f 100644 --- a/app/code/core/Mage/AdminNotification/Model/Observer.php +++ b/app/code/core/Mage/AdminNotification/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php index 1a7979d9a..ed5c14492 100644 --- a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php index 3f46442e3..b782035b5 100644 --- a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php +++ b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Survey.php b/app/code/core/Mage/AdminNotification/Model/Survey.php index 46a1270bc..45834a12b 100644 --- a/app/code/core/Mage/AdminNotification/Model/Survey.php +++ b/app/code/core/Mage/AdminNotification/Model/Survey.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/etc/adminhtml.xml b/app/code/core/Mage/AdminNotification/etc/adminhtml.xml index 0c2041722..19f8246b7 100644 --- a/app/code/core/Mage/AdminNotification/etc/adminhtml.xml +++ b/app/code/core/Mage/AdminNotification/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/AdminNotification/etc/config.xml b/app/code/core/Mage/AdminNotification/etc/config.xml index 731d699eb..38da2750b 100644 --- a/app/code/core/Mage/AdminNotification/etc/config.xml +++ b/app/code/core/Mage/AdminNotification/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/AdminNotification/etc/system.xml b/app/code/core/Mage/AdminNotification/etc/system.xml index 8ee03aad4..89c6af705 100644 --- a/app/code/core/Mage/AdminNotification/etc/system.xml +++ b/app/code/core/Mage/AdminNotification/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php index fc9d17d5c..6dce505db 100644 --- a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php index a610fe4f9..23dded4be 100644 --- a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php +++ b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 8d7941312..14b94ded9 100644 --- a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AdminNotification - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Abstract.php index 50581220f..92c96f144 100644 --- a/app/code/core/Mage/Adminhtml/Block/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php index 2624b625d..8e3e91c00 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php index 8109156f9..a5219bbfe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php b/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php index 1237d42fa..9149f2b57 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php b/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php index 7218ece5c..d423e6cb9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Role.php b/app/code/core/Mage/Adminhtml/Block/Api/Role.php index 35bad3fa5..ec3aa37a9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php index e36dedba0..e48832b66 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Roles.php b/app/code/core/Mage/Adminhtml/Block/Api/Roles.php index b3049e319..c3adc53f5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Roles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php index 9706541e6..7c915f693 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php index dfa931e86..3bee4afae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php index ada311827..1ba319c82 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php index 292c0d1da..3b5443c9f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Api_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User.php b/app/code/core/Mage/Adminhtml/Block/Api/User.php index 6e40d4c29..7ff033788 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php index bc3ec5aa1..ac22ea807 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php index 1f607d41a..b6823cb19 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php index c83171f61..43c1fd46e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php index 1490a674d..dc37e41fb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php index dac8bb803..b94d4f964 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php index 37f6330fc..8f1404cc7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Users.php b/app/code/core/Mage/Adminhtml/Block/Api/Users.php index c827d09f9..5e951311d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Users.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Users.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Backup.php b/app/code/core/Mage/Adminhtml/Block/Backup.php index a1bb0e77f..f8428f6ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php b/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php index 97ad73aa1..4a88bb183 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php index b12b1e179..0d1661b4a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cache.php b/app/code/core/Mage/Adminhtml/Block/Cache.php index efcda8a8a..8fe3ec01b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Additional.php b/app/code/core/Mage/Adminhtml/Block/Cache/Additional.php index a03825514..49d4e02fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Additional.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Additional.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php index 50cf7d5b7..c42f99030 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php b/app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php index 609de0fcc..7d18a7948 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog.php b/app/code/core/Mage/Adminhtml/Block/Catalog.php index 5edeb7fe4..42673d13d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php index 1946737b7..0e6976a54 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php index bfde19805..1e076a612 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php index 59d705fe8..9cfc16645 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php index f53282e84..ec74a56d2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php index 1108f42c1..82035c1ad 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php index 01d4e9707..53a10d458 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php index c8967af55..a5b68ba65 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php index 8b058ed92..b63e39eb3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php index 425df8167..9b1b1dd1b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php index 1c51cc632..2073008fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Catalog_Category_Tab_Design extends Mage_Adminhtml_Block_Catalog_Form diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php index a188ba1b9..a5977ad0c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php index 1d8e56dbf..2f63f718b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php index 4633ddc86..ffdbc82c7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php index 8815eedcd..66b99d2c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php index 46dce8d7a..60333a2c0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php index 8b02d2db7..63978e490 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php index 9fd117a6b..bf4a4e3bd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php index 972bb010a..e06a0554d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php index e3aa5d85b..aad01f467 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php index 0ea8a7b7b..6d947946b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php index cd82e17a3..1e08d0be8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php index 194945c24..6f95c11de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php index 62c1c166d..a0dfda07f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php index 030455587..8f4ec2218 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php index b777b94e0..76d612b04 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php index 5ea338f43..850d3cb28 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php index 8c01b32d1..c729eebc3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php index 626420483..b85fc590a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php index 0c59df79c..f7fff514c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php index 64b5b55fe..8eceaaade 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php index 75fa04d8d..e263dd5d2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php index 82e976548..6c32fc25d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php index 37c3b53ca..47ebd33b9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php index 1423515c0..cbfde4ab7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php index b77c7bb3d..eac0faf86 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php index 4a0fd406a..7fd715d67 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php index 630901962..457c31d92 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php index f60c51fea..403333f52 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php index e93d4763a..d014349a8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php index 083b4840f..cd163fd55 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php index d00daa10b..8b0793412 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php index 0e6bc2168..e065f6b01 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php index db195a021..46cf33a2e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php index 3d8a23a2a..6c1bdbe47 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php index 2b5be93cd..dc737559e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php index 937cdc451..d2aeb6d54 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php index d044483d7..a15e69972 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php index 6114db926..159f86d77 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php index 5ffc333a8..c7967efb7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php index 99d2623a3..d1c9aac0c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php index b5d5f0f2c..e10975a4e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php index e11e2b655..8f51727c5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php index 90e4f4fc7..d4e00427c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php index 14c6a6ba1..54976042c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php index 3a9670657..709bd1b5c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php index c8333e9c8..5e98caeee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php index fdebcba26..6312107b7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php index 5f32c9219..158a53590 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php index cf20fc387..010466a6c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php index c2edded7a..226e02c46 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php index d0f6830ec..6aee9eb8e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php index 12118bf38..6391f6098 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php index 2bf72af29..b11027aa5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php index 5c664c1d9..1c01d19b0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php index a9a04289e..130df9d1b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php index 9e8458e8c..5147980d4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php index 675fe4cad..793efb481 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php index 446604475..c5ceec952 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php index 5639e7997..e640687ba 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php index bc4f4bc35..568d63e4d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php index 0867507f4..d364a694d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php index df7db8f11..13b483b71 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php index 570e91e9e..12b8fb267 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php index 9ed651a44..a619a6c25 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php index 87d79503f..7235c8bad 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php index 0f4e4750f..e7f0eabea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php index d52faf912..8a55082e1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php index fb390b6e3..186627a4f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php index 2a3fe98eb..7020d9b93 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php index b0aa397c6..82473d24a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php index 3f9bb460f..06f0dc7a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php index a915a561c..775964fb4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php index 2c173e9d7..a743629b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php index 2d096c31d..009727501 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php index d1a0baa92..ef173a2d6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php index 9fc91e98f..8d9d83d81 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php index 3c86b7d8c..412b46200 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php index 473afbed9..2e76d6f06 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php index f0c79a217..c43e5c030 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php index df8aef8e2..6910eef28 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php index c5f84b7fb..818604d39 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php index 4b7b54d5a..6fa3ef036 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php index e63d04a21..5a2eab3f7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php index b6a3d4ce6..35e2df06d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php index 4090d65de..2b42300d7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php index fae243d05..bf22b99ba 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php index c9454e504..40f1159eb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php index 344094923..9d39d6c74 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php index a7ce410ea..5f3ba4c8e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php index 00ce4ff05..a29874e70 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php index 112933795..8c3f0bbfa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php index a52e60b0b..38e1d9491 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php index ce0260b8c..1eee398e1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php index 3ec8e56d7..12f1a5334 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php index 372d2c45c..99d4b6194 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php index e43140512..132b00c39 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php index e499aa6ef..06a1c40b7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php index fab927532..037a524b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php index e88441048..ce864e652 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php index ba8d68c9a..eff8667dc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php index e70507fa7..e76c9e040 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Price.php index 404e7a14c..c60c4e242 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php index f1c9bfce2..00b9baea5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php index 1e820a7ce..445f78ffe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php index da4e3736c..308987858 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php index d377ecc40..168bdb88d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php index 3a3d1ca28..580980164 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php index f41748159..f1af805a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php index 7fb6ffb2c..4d9a794f2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php index 58ff87fc4..6dcd7ecdf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php index db0f65e60..e8393792a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php index bd4c156ec..e16fd4135 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Checkout_Agreement_Grid extends Mage_Adminhtml_Block_Widget_Grid diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block.php index cbfacdbbc..906f3d550 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php index 8bd16fa7a..4ea659cd1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php index 67ec30b76..83afa697b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php index 9262ccd0a..8b5d8aa3d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php index 47acb5378..3e4785d7f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page.php index ab172f9da..c20957a76 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php index 3bd74842f..081e6d53c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php index d4890399a..d1549d694 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php index dc65a61b2..82faa7dab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php index 85df1fc5d..b208c9c74 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Cms_Page_Edit_Tab_Design diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php index 7adca28d6..3ebc4fdd9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php index 6359de00c..bb8eab462 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php index 7d683ee91..639a9fb08 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php index b426612bd..0b6cc3d1f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php index f118e8ae9..f86478e9a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php index 71ddd4083..76e54e328 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php index d04426970..2fcceea19 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php index 1e7344742..fe6f8e1e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php index 4b6e85d18..8edddd95c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php index fb82db233..94f5467a5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php index 19f2d4c18..c393c0399 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer.php b/app/code/core/Mage/Adminhtml/Block/Customer.php index 7c299a0ac..c315edc17 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php index c2a06eff4..80e8ab071 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php index cf5c62ff9..8bcacfc7d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php index 9c5a7e9d7..f81c83d7b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php index e37730dae..33a634dff 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php index b6aa408e4..0e7535559 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php index 092258a3f..0a8796399 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php index ceeac58d9..e38f30af4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php index 32a1e61d3..4df873bc0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php index 593b8a7be..2c142490e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php index dbf44cad9..fc3cf63cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php index 2dc490970..69d001075 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php index dbcc22485..743584c4f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php index ed5deab88..129b9b360 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php index 832e64324..5176ae20b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php index 55013b58b..fc8045690 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php index 013782e68..28faa477b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php index 7245ad28e..9b8999c32 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php index 0921d9812..f3dbcdedd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php index af851b497..1b1267be1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php index 0bb0e15ff..5763d70bc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php index da0fb9e03..5e09c2ddf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php index 83ac5720c..43f98128a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php index 75cbc4061..6191e2273 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php index f5632d377..a7108a433 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php index 8ff6d1bdf..571a8da38 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php index 4a57058a5..e5cc91c7b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php index e646155da..a32b60a68 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php index 00dadaad9..60434938a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php index 21398ca20..5d8518fa2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php index 71fc40b25..e1df3029e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php index 6f83af187..bd39683b3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php index 3b56b968c..d68bbd3c2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php index 9352bdee3..64c2046b1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php index 6763f5a7a..c1fa6271d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group.php index 9396f3cf1..3dea8bbfc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php index 72d564c91..1b0653a84 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php index a5e477d90..0582ef82e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php index d04b77676..3a40b0537 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online.php index 3db6fde39..181f8b4fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php index f1f1a0355..184366152 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php index c210744d8..4e736fe79 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php index 3b5d80e01..9e7ce7e2c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php index 23bd1d86d..8563dbad0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php index a4f8cfafd..5f17e4bb0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php index 5f96b2e9f..d64d8b6e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php b/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php index 57ee89d64..009d4fbe5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard.php b/app/code/core/Mage/Adminhtml/Block/Dashboard.php index 2bd7eac75..a01daec19 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php index c46ebabc2..2ad7cf3f0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php index 48a276dcd..b3b399760 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php index 32b61a78f..ef0f3b15d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php index b6d72c0f1..52effcdba 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php index 3de9afbac..11176fe36 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php index 0da30afc8..20abcee25 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php index 12671fbde..7fc5f542b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php index fedbbc013..8c371a322 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php index 1ecbc0390..338f7cb8d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php index 88b491ea5..4ced9beb4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php index 56c6a7387..3b0d3b84b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php index f018154b8..4c91d5a5e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php index 5f01e0eba..810488d6f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php index 94c56a1a6..53cd75c91 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php index 7bd9f7337..428018eda 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php index f6329b6e2..e9412bdf4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php index 51d2f2223..999785277 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php index db79686fd..4721771de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Denied.php b/app/code/core/Mage/Adminhtml/Block/Denied.php index f3988dac0..7ce47ada4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Denied.php +++ b/app/code/core/Mage/Adminhtml/Block/Denied.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Html/Date.php b/app/code/core/Mage/Adminhtml/Block/Html/Date.php index 4fad71ad9..04cefe915 100644 --- a/app/code/core/Mage/Adminhtml/Block/Html/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Html/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Html/Select.php b/app/code/core/Mage/Adminhtml/Block/Html/Select.php index 9efeb5671..45b1102f9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Html/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Html/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Media/Editor.php b/app/code/core/Mage/Adminhtml/Block/Media/Editor.php index b1a365b3b..fe8885efb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Media/Editor.php +++ b/app/code/core/Mage/Adminhtml/Block/Media/Editor.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php b/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php index 26d714312..e6c5eaebf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php +++ b/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Messages.php b/app/code/core/Mage/Adminhtml/Block/Messages.php index a3d87d936..b20b9fd89 100644 --- a/app/code/core/Mage/Adminhtml/Block/Messages.php +++ b/app/code/core/Mage/Adminhtml/Block/Messages.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php index 061990134..cc18b695a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php index 0fc385749..9ce6e8d90 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php index de6b86e8f..a3a28c537 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php index 20b101077..2cc1057fc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php index f18ad2ae3..ce4643d8e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php index 61d79ce5f..78c03a043 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php index c414344cb..06404a171 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php index c5c4f8351..6a3506db5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php index 36901fbdd..362fef4c6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php index 1077563ba..d1bd2e7e7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,10 +50,11 @@ protected function _toHtml() $template->setTemplateText($this->getRequest()->getParam('text')); $template->setTemplateStyles($this->getRequest()->getParam('styles')); } + $storeId = (int)$this->getRequest()->getParam('store_id'); if(!$storeId) { - $storeId = Mage::app()->getAnyStoreView()->getId(); + $storeId = Mage::app()->getDefaultStoreView()->getId(); } Varien_Profiler::start("newsletter_queue_proccessing"); @@ -72,6 +73,7 @@ protected function _toHtml() Varien_Profiler::stop("newsletter_queue_proccessing"); return $templateProcessed; + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php index ca89dadc7..ce2e05306 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php index b21d49c08..5df5227ca 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php index aa1be102d..6fb6122df 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php index 8f031c42d..206cc9a44 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php index 6bfcaa9ac..12966cfb4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php index 8f058cf1b..bbe59aecc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php index 1ed71df92..7ad2ed614 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php index 78a0827b7..330e1d522 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php index cd6848660..51958fb55 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php index 710d8f87d..d4f90232e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php index b41851f8e..be2807044 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php index acd3d3729..942eedb57 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php index e9ce6ccb0..ebe7c0100 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,7 +49,7 @@ protected function _toHtml() $storeId = (int)$this->getRequest()->getParam('store_id'); if(!$storeId) { - $storeId = Mage::app()->getAnyStoreView()->getId(); + $storeId = Mage::app()->getDefaultStoreView()->getId(); } Varien_Profiler::start("newsletter_template_proccessing"); diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php index 8e72a955b..8cb72aee1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Baseurl.php b/app/code/core/Mage/Adminhtml/Block/Notification/Baseurl.php index 484d03cae..f552a2f95 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Baseurl.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Baseurl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php index 39d7ae5c6..dd1a45042 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php index 1940307c3..41dca818a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php index c6eb48c95..5dbb63f18 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php index 713830e22..952728c1a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php b/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php index e1c62b80e..18ef015cf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Security.php b/app/code/core/Mage/Adminhtml/Block/Notification/Security.php index 4d7e0f19b..b63d3d3f7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Security.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Security.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Survey.php b/app/code/core/Mage/Adminhtml/Block/Notification/Survey.php index 8b82c22a7..4bb672040 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Survey.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Survey.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php index d5c89bf85..f23623452 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php index f982906ab..5d40b3089 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Page.php b/app/code/core/Mage/Adminhtml/Block/Page.php index 628dae936..6849f6918 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page.php +++ b/app/code/core/Mage/Adminhtml/Block/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Footer.php b/app/code/core/Mage/Adminhtml/Block/Page/Footer.php index 9c2760f9c..3087cea4c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Footer.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Footer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Head.php b/app/code/core/Mage/Adminhtml/Block/Page/Head.php index ee5b28670..a272bb978 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Head.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Head.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Header.php b/app/code/core/Mage/Adminhtml/Block/Page/Header.php index 8661d83a7..997c12cfc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Header.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Header.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php index f56311087..e8d6c7e24 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Notices.php b/app/code/core/Mage/Adminhtml/Block/Page/Notices.php index 55354d846..9ef0d7854 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Notices.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Notices.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php index 94215cb0b..8a216cc57 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php index 69e14c6ee..3bea9a1f6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php index f1a68cbbe..f6f8e7a26 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php index f03f451df..006ff5b97 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php index f455b17a1..80e337489 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php index ad22b0fad..a93062a15 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php index 13796c854..42782d615 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php index 95694bf89..908b41cf7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php index 8e98985a0..2c7893354 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php index 8632bd699..bb279c1e2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php index 45d2d152c..d532cb5d0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php index 6407cd9d1..86bb03358 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Permissions_Tab_Useredit extends Mage_Adminhtml_Block_Widget_Form diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php index 4e5cc4d1d..2acb2ccff 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Permissions_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User.php index 88e2874f5..1ddd4bfe7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php index f9296fad0..ca92f8a3a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php index 303e345d0..fedff3f06 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php index 3e15349ce..c3273267a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php index 372bb5e0c..d60aa79ce 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php index b7ac4cbfe..9dbb5698d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php index 20d62a557..1fd0e454d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php index 244963b9e..eb5574a54 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Permissions_UsernRoles extends Mage_Adminhtml_Block_Template diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php index 9f30c9326..56e071c39 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php index e6255bbd7..3d4af119d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php index d12515b0c..3c0951091 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php index a6df6d666..0f04f15f9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php index fde5342b2..80ce335b1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php index 0763f9f9f..41dbc3dbb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php index 816d6a51d..aff507432 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php index 35b19e333..8132172e6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php index ed9d8e986..c80a9fb04 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php index 70adb1232..65c365e09 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php index d95ed714d..00cc72834 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php b/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php index 0cae1d818..8593923fc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php b/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php index af0743e1b..d8ee24a55 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php index 79ed7e6e3..187f9e1f0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php index bf8ceaf17..73e693506 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php index bbbe39a01..41ca1eeb8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Js.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Js.php index 8b8f0e180..8020c849c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Js.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Js.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php index 8893c66a8..ffdaceb71 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php index 51ac9cf30..dd8df2880 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php index deeb0638b..a698a823d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php index ba73c6474..0892ab142 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php index aa92adb2d..33ed27488 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php index 6e4d7b424..b42d82024 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php index 418a1d62c..95e8735e6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php index bfb564270..9992a1495 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php index e7b7c8c06..d80b77356 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php index 5f8ecfd9e..d89baa8f5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php index e1a960d2c..9476f2cb3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php index bed4788cb..6cd82c3bb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php index 6d9da808f..5f36c49f8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php index 698e2791c..e878d07e1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php index 733747d30..b7c7964e0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php index 2c7dc7f82..fb95753b1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -200,7 +200,6 @@ protected function _prepareForm() $fieldset->addField('uses_per_customer', 'text', array( 'name' => 'uses_per_customer', 'label' => Mage::helper('salesrule')->__('Uses per Customer'), - 'note' => Mage::helper('salesrule')->__('Usage limit enforced for logged in customers only'), )); $dateFormatIso = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT); diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php index 611aef036..842a277ad 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php index 457e6bb17..58c655680 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php index 4f44e9e1f..4cfa531e3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php index 7193991a4..5d0117717 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php index eac74141b..5a373a2fc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php index 3a240559b..ceaa1e30d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php index 18ccb3e49..69090a260 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php index 5f99fa935..cf63898d9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php index e3516c93b..6ba3e8906 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php index 2889e6e7a..e657973d7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php index 89d01620d..3e3adc4bf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php index 0d8a5fae3..992f02342 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php b/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php index 4936c6244..e2bac1790 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php b/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php index c2dbe07cd..6280fde5b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php b/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php index 1c53d0304..4894081d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php index 6a7ad7300..07d41607e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php index 80a2093a5..de3981707 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php index 9e38ceb0b..624def81a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php index 065c95bf2..e45a574b4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php index 21998544c..6c6daaa72 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php index 48becb10b..bbb7ccccf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php b/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php index 7c186357f..272dbf9a5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php index c80d42dca..0f28841eb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php index a7945c967..1276e545e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php index 0b08e738c..ba42e17f2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php index cef0999c7..6edf97007 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php index ce95dbb34..4308216d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php index 519c2bbd8..7017b10e8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php index 9c38b61eb..095f1691c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Product.php index 80e343011..a5bcd8ca1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php index 5016dce30..01e351cda 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php index e3aba7427..192677718 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php index 591c8f654..7d4d619b8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php index 17dd208a8..e4690711f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php index 8bf820a96..76e22d113 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php index d63405f22..3d54a02e2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php index 1972a9b3d..0fc734626 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php index dd4409a65..8415f4d18 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php index 7bc822817..438268db8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php index e964be730..09a2b9e66 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php index 16715d5dd..477a655bb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php index 1bae210ad..f74f8d686 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php index 08bcb7584..be307bab3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php index 4b5965df7..e4569afea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php index 3d308465c..94a35c78d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php index b9840cb52..dcfa88822 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php index 052722541..38f5425cf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php index ca49bd9d4..d3d20eccf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php index 79c30bfc9..6098d4f9f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php index 128bcd770..9d3008b29 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php index d5517e62d..98600ad73 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php index 7e8097c2a..ae6cdfc95 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php index cfe024337..7bcd882b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php index 245391e6d..ef7e3a67c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php index ca7627927..60020b046 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php index 2f5ed2525..a83e266c2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php index aaeb7fcd5..288cf2e3d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php index 4b81c963b..0b8ea241c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php index 642aed597..d2c347e13 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php index 5fef9b5ea..d8d433871 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php index c458da999..63ba7c5c9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php index a927ae481..769a3aaef 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php index 85abf9060..02be84ec1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php index f2b70799b..378c9fc6c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php index 8b753887a..82e908e55 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Search.php b/app/code/core/Mage/Adminhtml/Block/Report/Search.php index 9a7ea1448..916d1c5f9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Search.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Search.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php index ef19487ab..2a88e0e63 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php index 539695a48..9f7df4961 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php index 35249e2bb..8812d778d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php index 578c4e50a..892b7cea0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php index 45cf22e1c..cc211cb80 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php index 0bb3507d7..30493389a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php index 1e28a5e9c..a8cb42bf4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php index 31aea6231..0e4c84769 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php index 1806f9382..566b3d20a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php index f7b20c375..9a050b2c6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php index 9b86e84d6..66750d383 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php index 0b1015e2c..6aa335d0b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php index 58055a70c..6a64a3f4c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php index 33f44982e..f44be6829 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php index 8a7cdfa34..28d29382e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php index a5e368809..531fdb6ef 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php index 00342f9eb..35021dd0b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php index 3fb086680..f8fa7ec0e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php index f5cb6eb0b..6dd000b51 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php index ada4f6dbe..0237461cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php index 5afc60c09..03497dd32 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Add.php b/app/code/core/Mage/Adminhtml/Block/Review/Add.php index f4b335683..553a9b710 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Add.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Add.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php index ff732c242..563c21afa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit.php index 774982411..c778957a6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php index e6eb5d133..e494d6bdd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php index 7cc09c7b7..561d20990 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php index cce2fc1ad..b129a6e69 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php index 1d6e0fbe0..d88eb1e3d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Main.php b/app/code/core/Mage/Adminhtml/Block/Review/Main.php index 1cd0c685a..8b5e7d8d0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php index c50c82b4b..0c29dc3ee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php index 69330bac1..9c0cf1b8e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php index aca2347fc..74912391b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales.php b/app/code/core/Mage/Adminhtml/Block/Sales.php index 2bda4bcf3..3d2b3eca2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php index 6f099b15b..d7b3b6339 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php index 4e8da8534..1c3253a93 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php index f217a0bb8..4920de854 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php index a14b98d4c..7d025530b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php index cf388c442..7bf5e9d3c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php index b384faf01..2da616f0b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php index a2afa91db..da753dad4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php index eef6558db..12b29fe4f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php index 71ab614e8..df4a81b28 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php index c4d62da60..84f2c7017 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php index ffac6038b..988f55b56 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order.php index 84b8e0d6f..4e33fd4e0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php index 1a84b74fb..df40439ca 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php index 200487fed..3fa6a27ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php index c2c8f7583..9cc9d59c9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php index 7e76f2bd8..94d82f032 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php index ffa5dfb2f..49a355bf7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php index 213012cba..0732a939d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php index 955eb6367..47cadc75b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php index 68dfbf5b0..f97857fbe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php index 18186251d..3e64fbf8c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php index c32449199..ba8a14f27 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php index 7c338e8cb..e90247e0a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php index df6ded6ba..0548833f9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php index 4ede30b92..fdd1ea225 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php index 7c788efb3..6b7e1fd48 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php index d78095b0e..66c0c2c5b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php index 56193fd92..0cf9db467 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php index d5316b2da..98e0cfe9b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php index c1ea98d78..d4ad8471b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php index 29fa999ac..ca7fa5c44 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php index 57b1b03ef..5531fa07a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php index 447843e3e..0ffba5c87 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php index 105314ddf..3f2033351 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php index 520a3dc19..c793a4b00 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php index 875761ee0..3b6d48389 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php index c1f554dc8..27b71d20f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php index 1591d1320..0a9106781 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php index b7d122bbd..a3723528f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php index 027e01db6..8d9a30f23 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php index aeb0262a9..5b3f781fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php index f94ec1af6..42fbebf71 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php index cbdbcf0de..0085622bf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php index 4b1c31935..b47d4b3f0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php index dc17acaa8..16e563604 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php index 7691c5103..00c539984 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php index 2d3deaf79..fbf9616b8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php index 0b56a5875..b5333f051 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php index 2c33b8ec8..c1526aeca 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php index 9a5bdab0f..a1563a7c0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php index 743599a34..5f6dfee61 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php index de38c7009..a2b95e777 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php index 17d20fedb..794c4c29c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php index 727404835..88ed7d5ac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php index c1f5d5a2c..b066fb32c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php index bc0a5713c..235c6c92f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php index c8e1bf1f6..12506bd13 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php index e027edaba..a6c0ec8da 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php index e858233ec..3c6a8ab84 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php index 6330cc870..d9cbfc664 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php index 626dc83df..7b4690654 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php index ca998133e..7c5b32a55 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php index 93fc55f8c..b3137bece 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php index 908ede0a8..933d3e4cf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php index d404214b4..8bfb3934c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php index 800c56ed6..33467cf7a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,14 +30,8 @@ * * @author Magento Core Team */ -class Mage_Adminhtml_Block_Sales_Order_Create_Totals_Subtotal extends - Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default +class Mage_Adminhtml_Block_Sales_Order_Create_Totals_Subtotal extends Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default { - /** - * Template file path - * - * @var string - */ protected $_template = 'sales/order/create/totals/subtotal.phtml'; /** @@ -47,15 +41,9 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Totals_Subtotal extends */ public function displayBoth() { - // Check without store parameter - we will get admin configuration value - $displayBoth = Mage::getSingleton('tax/config')->displayCartSubtotalBoth(); - - // If trying to display the subtotal with and without taxes, need to ensure the information is present - if ($displayBoth) { - // Verify that the value for 'subtotal including tax' (or excluding tax) exists - $value = $this->getTotal()->getValueInclTax(); - $displayBoth = isset( $value ); - } - return $displayBoth; + /** + * Check without store parameter - we wil get admin configuration value + */ + return Mage::getSingleton('tax/config')->displayCartSubtotalBoth(); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php index 4cf848583..a43c7a8dc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php index 41201a72f..3b66c6edd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php index cb0a8f23d..60e6f4f05 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php index 9678987db..0d5934908 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Adjustments extends Mage_Adminhtml_Block_Template diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php index f89179a8b..1bcbc1eb3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php index 64f042704..830430310 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php index 29c05bd8e..99b2d5984 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php index e2dcdefcc..45749f444 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php index 060f7759a..5253d7fed 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php index d915a204e..5d5ca166f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php index 8ca3540c3..faf2ab490 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php index baa9b22de..819dcfdab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -131,8 +131,7 @@ protected function _prepareColumns() array( 'caption' => Mage::helper('sales')->__('View'), 'url' => array('base'=>'*/sales_order/view'), - 'field' => 'order_id', - 'data-column' => 'action', + 'field' => 'order_id' ) ), 'filter' => false, diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php index e95530376..595b5eca1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php index d0206fd9a..46a417a07 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php index c16b27a60..a748827f9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php index a049dfe1e..b72774245 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php index dba753d03..00ee3bfec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php index 76fbdc8f0..ce854eb01 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php index 3384cb943..0e2833122 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php index 3f5d51160..e286c4b4d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php index 5c69938d3..581513faa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php index d9357a37f..d64a5cc60 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php index 783c9c540..57a775218 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php index 5d988d5fd..283b3ed8c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php index 2cd238a80..eea64e79e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php index e17183d11..28b544aff 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php index 1b4345ad9..aec82cfb2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php index 96bd83fab..5d1ce53f7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php index 1bbb1d909..875c7a8c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php index 570621c6e..d0b78bb1e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php index f61aca63c..526166542 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php index 95d64d7f4..3c338ea27 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php index d86498c42..922afee38 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php index 8847be28a..f4fc35bb4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php index 1e48bb94c..1c25a2c58 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php index eb0c6d2b5..754b39cea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php index d2d4bfe86..dafd40bbf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php index 2a363597b..a97305a3d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php index a2365447d..1c93db2b6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php index 410b01ffe..7c574cd2d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php index ff266c2c1..b27dd3ad6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php index be7152938..efc72324c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php index 61efd1955..f8e89bcb6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php index 57003f20e..fe8ca7186 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php index e1b609b35..5df522553 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php index 9e45bf289..0762853d8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php index 243d1c2cc..5ea652c26 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php index 82e90ea69..e9b3e9055 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php index 175c80bbb..e442ce1e0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php index d543908a6..3b4f3414d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php index 1a64918cc..2eedb7db4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php index 279abbd5a..8c0a5e135 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php index 5d439b785..88216ce1e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php index 76dc474a2..3f27d539a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php index 781746ddf..d526b1b2d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php index e8c4d8666..1eef8e8b2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php index c1eee2edb..3956011d2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php index 86f873078..512df263f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php index 1cb839a34..e36480892 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php index bda890f7c..2b3a3bf4a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php index 23c7be4c3..fa8af55ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php index 8fbb96eba..b70d41798 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php index e073c5225..63f7d12bd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php index dd4ff918a..2c6f552a2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php index b21b6414c..44dacc279 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php index 9b517f96b..ef80fd7c5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php index fc842c917..6ebe3eb72 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php index d00239c20..8f897c0ed 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php index e14b02b1c..a37dbf90c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php index 61ea9200f..778b288dd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php b/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php index 9d05a9d11..483b8dc3f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap.php b/app/code/core/Mage/Adminhtml/Block/Sitemap.php index cc80e1c38..4f6898801 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php index 055de6ba6..4ba90679a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php index b1de7da38..1e228b835 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php index 692246b06..7a89048e4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php index b316a8e3f..ec80a0c8a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php index 5e8d91dbc..4a342069b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php index c3e5bd10a..12434717c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php index d08ca0e44..9103b8324 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php index d7e11cfea..878a5e418 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php index 2e347c76d..b0af0e1c1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php index 4e56db9fa..321cf9244 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php index 27dcb3e12..7aebc35ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php index 661645ac2..9226718f4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php index 853f86a22..d64079755 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php index 8355a6be2..11930420f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php index 2be6d4bc0..dbc7a4183 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php index 9ff098168..b19f5062a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php index fdd22d751..ade6dbdc2 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php index e5e16f66a..18ad8262c 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php index 2905b2ffa..89b1e4159 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php index 48375a652..9e5a31461 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php index bd627a887..89427d8da 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php index c5cec5ac6..6c740a0a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php index 9179b73e5..7e01277d9 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php index 1d883c80a..fc54a8669 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php index 9b7249b10..8951fc170 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php index 5561ed6e1..1974e724b 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php index af30011c4..03a4b6c89 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php index a5603971e..8c901bc84 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php index e17e7d193..19bba3865 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php index 33dd3a3b8..a3ac7485e 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php index 33694bad3..77e3a581f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php index 7a113acb3..c149a7e37 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php index 0450ed803..94b382070 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php b/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php index 5fe734688..62b5ce988 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php index 4cf22b199..2ace5efb8 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php index 96f0b52fc..6a9a54ab3 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php index e106c2f74..d3fc00eb5 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php index b4a94890a..abddb63ac 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php index c3f87fbb2..3a06be34e 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php index a05d29eb6..886219c41 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php index 43bb300d0..ace84ddd0 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php index df4b16c85..ea2bdcbc4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php index f931d5dc2..b5967171e 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php index 1586110cf..fa163ada0 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php index 64fe7d8e1..10e4f1217 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php index 5dbbc3034..922be9783 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php index bae859137..32d6c6fd0 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php index 22375b08b..1467b1e7f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php index 5bea56783..33f1f79d1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php index 08a46bccf..88f508bc4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php index 4a140b042..ec52344dc 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php index 97158ceb1..571a119a2 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php index 9632105ea..723dbb1a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php index 462a9de9b..29f7890d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency.php b/app/code/core/Mage/Adminhtml/Block/System/Currency.php index 8f78a0cc9..093189ca4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php index 9c22e1bf0..8bd1788aa 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php index f23304a05..b9f9501bc 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php index 051db3b01..9aedb2d5f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php index 55b98ab8b..8a6e64dc3 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php index a902698d8..c6e85c005 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php index 21f366ba1..6d6de1128 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design.php b/app/code/core/Mage/Adminhtml/Block/System/Design.php index f70b3aafa..fb3264226 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php index 606872592..200a969ee 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php index a1d92c2a1..ede18bfb9 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_System_Design_Edit_Tab_General extends Mage_Adminhtml_Block_Widget_Form diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php index 471c598b8..b6a1da9b9 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php index 5b826d9fb..db8ced8ad 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php index 7598fd5c8..2cada5de8 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php index 1ff7b0929..55b6bedb4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php index 7f1ece185..c59109faa 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php index e516a41f2..e5a3a133e 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php index 7c97a18b5..fe0c64ea9 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php index 0d3fb4a21..e187a6c73 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php index cf7b98694..04a9301d4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php index 9e0316f30..3cf75176e 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php index 2b34a83f8..f81bd4026 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php index d7c50c89b..95575d014 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php index 986aee00d..0f4d9dae4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php index 31f8b016f..f8c02d2cb 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php index 9cfacf923..d7429fa86 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php index 1a172cc71..56f39e675 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php index c81aebb73..087c3019c 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php index 4cdcafbf4..0bc079f8a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php index 0e7a52f03..1ea423d3f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php index 8ef632c5d..01eb5b268 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php index 98c8ddc9d..b447e0fee 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php index f5b251cc5..f792c3a79 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php index 72f7f11ce..44bfb5735 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Variable.php b/app/code/core/Mage/Adminhtml/Block/System/Variable.php index 39a047351..c74c3cdb3 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php index acc294edd..75922811f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php index 885e65057..103ce4872 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php index f44964351..fa5b9d56f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag.php b/app/code/core/Mage/Adminhtml/Block/Tag.php index 2835e0a36..6e0727a89 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php index 9a7fb09c6..17073c53b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php index 923b66be4..ebac96d33 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php index 5d366ae98..8fddf49c6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php index fde8a3ca3..3926aa421 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php index ce1cdcf89..3a50afd57 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php index 0f570b493..2a2a62a61 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php index fc622abf0..0fbdf01d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php index f0314732a..c73715c78 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php index 1844a3e3f..74768d188 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php index 2fda2f519..6f3760239 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php index 26f2f3838..d5b9de9fd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php b/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php index d9542eb2c..e9d5ebffe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Product.php b/app/code/core/Mage/Adminhtml/Block/Tag/Product.php index 9854ab173..696d55571 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php index 9565bd04c..d6551836e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php index 727f5d883..c6243ad99 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php index d6059d567..eb7baddfc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php index 819bcc795..b1b05cec3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php index 1a4c0b715..357a73d8e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php index 164b98da5..5f1a86c8b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class.php index 530482545..2712c784e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php index ca5521d72..1bd163775 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php index a2af17530..5e15d2ded 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php index d1de8f567..6ed7ea85a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php index b1b65e723..6c4352768 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php index ae8df8f92..68aae6d8e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Tax_Rate_Grid extends Mage_Adminhtml_Block_Widget_Grid diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php index 2edccd4ec..de1617ca3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php index 282309d68..b062a0c85 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php index 611c5ca29..411425ce2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php index f74e8ad8d..3bf2b6270 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php index 21c69dc69..b883c6e3b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php index 250977e97..ef1ad8051 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php index d96ef2d7a..ecc6ec5ce 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php index 546fac470..3fd747d8d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php index ac09bff48..7801f54cb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php index fd114a8c8..55328900f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php index e6f5afb99..876b125b9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Grid diff --git a/app/code/core/Mage/Adminhtml/Block/Template.php b/app/code/core/Mage/Adminhtml/Block/Template.php index f9074c32f..559d7a3ff 100644 --- a/app/code/core/Mage/Adminhtml/Block/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Text/List.php b/app/code/core/Mage/Adminhtml/Block/Text/List.php index e723204df..bdb8e5541 100644 --- a/app/code/core/Mage/Adminhtml/Block/Text/List.php +++ b/app/code/core/Mage/Adminhtml/Block/Text/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php index ab3a3d20d..0b542bf6a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php index b70b55664..4105e0b2d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php index 4bfffa07e..55513b15d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php index e9ae922e8..8a8154ac6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php index e814911b4..9d8692f4a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php index 6ff376e25..fde4fd3d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php index 9834eb452..31b66fab0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php index 5b452695a..8e7b3ef57 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget.php b/app/code/core/Mage/Adminhtml/Block/Widget.php index 96a7fcb7c..ae6c85295 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php index 383b81fb5..e8e62c79f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php index 3668b520d..4c36f4970 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php index 03be5fc45..dfbf5d309 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php index 2fb852a78..cb5e1698a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php index 6d0ca9e56..51c4bc92a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php index 3957d1296..8d956b2e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php index 59f4cf4a7..09d96db27 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php index c1a97e3f5..d53d6f2a5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php index 8ba70c117..05797a44b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php index c7b6e2636..56fdc470c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php index 4c51b6107..7f954a052 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php index 738910a5d..948d645a9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php index 631cb9297..71ff34913 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index eb1f91a0b..55342622f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php index c8c0146c4..697d30360 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php index f8960cf6a..26432c0b7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php index d1b564340..2820e6f9f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php index 27e7d5387..d0c7c1663 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php index 6f7f96916..bdcaa4931 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php index ac1d74195..bfdec0e61 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php index bca87fce7..bb774ae1d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php index 85ae4a0a1..80a4b6459 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php index 5e5f320f2..0340d1e75 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php index 4a35e4730..dcc24236f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php index a3f732047..ab6d05e8a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php index 83cdf3e81..25bdeed74 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php index c92bbe5d3..8607ece4f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php index 1055e1f23..40d79c3c8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php index 5d7178aa9..b2521b41a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php index fd7a37bad..bc0e789a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php index fb2959b14..c2b91a552 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php index b64b944ef..955a3d3b9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php index 3b585976f..6898357e8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php index 8515db8b5..cfb9f0bae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php index 049bf4155..d956e6248 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php index 8cbb03b1d..0b1607e77 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php index 34fcb4593..2695907ef 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php index 84905a586..fddb170cb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php index 7d42ea129..702a733d1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php index 23c49babc..b0497ba08 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php index 2e129d8a9..800b1b0a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php index fe4ccce7f..8491b302d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php index 05936100b..94b78462d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php index 17f05eb11..77011c2d1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php index de38ebc0f..0777ab321 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php index e567c0709..cc1c435e5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php index 32bf9483f..f03d09dce 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php index 75625e06b..49e738ed2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php index 2e365b81d..db2193bc6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php index 8f490f1de..13fe852c2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php index 97503417b..9b32e7f96 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php index f1884f7ca..ed9021142 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php index 1e191829d..52d2c9171 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php index 08b8a2602..466b6db8a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php index 0fa22956d..4f713c884 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php index bd0db1b05..514c3ed89 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php index 74880c61c..83e853950 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php index 8113a55af..0b77cfb64 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php index 5e84e05a6..85032254d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php index 4194c350e..ba90422b4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php index 543a7dfbd..42b7e9ee6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php index 840a32a0c..92b06442e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php index 1a9f5b063..c90d38876 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Controller/Action.php b/app/code/core/Mage/Adminhtml/Controller/Action.php index 9c1b93041..9c4067d03 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Action.php +++ b/app/code/core/Mage/Adminhtml/Controller/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php b/app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php index 34ebbba8a..63ad1ff32 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php index bff6e87ff..4c0eeb47b 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php index 564d7bcb6..7fe134d22 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php index 90c4f2932..6fa7e270c 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Exception.php b/app/code/core/Mage/Adminhtml/Exception.php index a3708264c..a9bf43f67 100644 --- a/app/code/core/Mage/Adminhtml/Exception.php +++ b/app/code/core/Mage/Adminhtml/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Addresses.php b/app/code/core/Mage/Adminhtml/Helper/Addresses.php index 82905de41..7b7f9113b 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Addresses.php +++ b/app/code/core/Mage/Adminhtml/Helper/Addresses.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog.php b/app/code/core/Mage/Adminhtml/Helper/Catalog.php index bbfff132c..f44f95f7d 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Helper/Catalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php index b2fa1f70d..295a51296 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php +++ b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php index 4ff2b9eaa..a247db85b 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php index 7fa367ceb..e32a8ba6a 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php index b8b08cad0..eb7f5bef9 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php +++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php index 2f0f62812..42469e524 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php +++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Data.php b/app/code/core/Mage/Adminhtml/Helper/Data.php index da221e100..1142280b5 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Data.php +++ b/app/code/core/Mage/Adminhtml/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Js.php b/app/code/core/Mage/Adminhtml/Helper/Js.php index cba3a7fba..a3ccb9b1f 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Js.php +++ b/app/code/core/Mage/Adminhtml/Helper/Js.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Media/Js.php b/app/code/core/Mage/Adminhtml/Helper/Media/Js.php index ebbdd7bfc..888fd5bfe 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Media/Js.php +++ b/app/code/core/Mage/Adminhtml/Helper/Media/Js.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Rss.php b/app/code/core/Mage/Adminhtml/Helper/Rss.php index 00ca848d6..f4fe3c158 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Rss.php +++ b/app/code/core/Mage/Adminhtml/Helper/Rss.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Sales.php b/app/code/core/Mage/Adminhtml/Helper/Sales.php index 155966e63..94f64a030 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Sales.php +++ b/app/code/core/Mage/Adminhtml/Helper/Sales.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Config.php b/app/code/core/Mage/Adminhtml/Model/Config.php index 88669d2b9..0edd4b588 100644 --- a/app/code/core/Mage/Adminhtml/Model/Config.php +++ b/app/code/core/Mage/Adminhtml/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Config/Data.php b/app/code/core/Mage/Adminhtml/Model/Config/Data.php index cde1166b9..437e257bb 100644 --- a/app/code/core/Mage/Adminhtml/Model/Config/Data.php +++ b/app/code/core/Mage/Adminhtml/Model/Config/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php index a7903d13f..d2bea0fd4 100644 --- a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php +++ b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Email/Template.php b/app/code/core/Mage/Adminhtml/Model/Email/Template.php index a7e31e25f..450b7d344 100644 --- a/app/code/core/Mage/Adminhtml/Model/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Model/Email/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Extension.php b/app/code/core/Mage/Adminhtml/Model/Extension.php index b6f5b6cc9..f51dc47de 100644 --- a/app/code/core/Mage/Adminhtml/Model/Extension.php +++ b/app/code/core/Mage/Adminhtml/Model/Extension.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php b/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php index d6b7ac9e8..f1a4843f1 100644 --- a/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php +++ b/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php index e51354965..c67519d3e 100644 --- a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php +++ b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php b/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php index dd4b051fa..92a4e2bfb 100644 --- a/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php +++ b/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Observer.php b/app/code/core/Mage/Adminhtml/Model/Observer.php index 15b2beb24..2c645a532 100644 --- a/app/code/core/Mage/Adminhtml/Model/Observer.php +++ b/app/code/core/Mage/Adminhtml/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Report/Item.php b/app/code/core/Mage/Adminhtml/Model/Report/Item.php index dfbfdefa3..789ce3a0b 100644 --- a/app/code/core/Mage/Adminhtml/Model/Report/Item.php +++ b/app/code/core/Mage/Adminhtml/Model/Report/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_Report_Item extends Varien_Object diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order.php index 7c51b18a1..ac22e93fa 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sales/Order.php +++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php index e7bf51833..8e81cb9eb 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php +++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php index a81de73da..e5be3c489 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php +++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php b/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php index 5c352781b..e869b82e1 100644 --- a/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Customer.php b/app/code/core/Mage/Adminhtml/Model/Search/Customer.php index bb8365e18..c662b6d13 100644 --- a/app/code/core/Mage/Adminhtml/Model/Search/Customer.php +++ b/app/code/core/Mage/Adminhtml/Model/Search/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Order.php b/app/code/core/Mage/Adminhtml/Model/Search/Order.php index 8be13751f..28cbfbc38 100644 --- a/app/code/core/Mage/Adminhtml/Model/Search/Order.php +++ b/app/code/core/Mage/Adminhtml/Model/Search/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Session.php b/app/code/core/Mage/Adminhtml/Model/Session.php index aa19c5a40..dce3c218b 100644 --- a/app/code/core/Mage/Adminhtml/Model/Session.php +++ b/app/code/core/Mage/Adminhtml/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Session/Quote.php b/app/code/core/Mage/Adminhtml/Model/Session/Quote.php index 6020470db..f3ea515a2 100644 --- a/app/code/core/Mage/Adminhtml/Model/Session/Quote.php +++ b/app/code/core/Mage/Adminhtml/Model/Session/Quote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php index 73d6a7bc9..9fa42eea8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custompath.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custompath.php index 99f3b4998..9dad321d7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custompath.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custompath.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Observer.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Observer.php index c0d843045..1a57e44f0 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Observer.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php index 78e6c6eb6..ad362e73d 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php index 07a5b3382..55d17a58e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php index 8fab5abcd..aa431e276 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php index 472f23d73..85abd2bd6 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php index 8f2fe83cf..8cdb8f252 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php index 08c0dede9..d7ed98bb7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php index 6a8f43276..449a3a438 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,31 +35,21 @@ class Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock extends Mage_Core_Model_Config_Data { - /** - * @var Mage_CatalogInventory_Model_Stock_Status - */ - protected $_stockStatusModel; - - public function __construct($parameters = array()) - { - if (!empty($parameters['stock_status_model'])) { - $this->_stockStatusModel = $parameters['stock_status_model']; - } else { - $this->_stockStatusModel = Mage::getSingleton('cataloginventory/stock_status'); - } - - parent::__construct($parameters); - } - - /** +/** * After change Catalog Inventory Manage value process * * @return Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock */ protected function _afterSave() { - if ($this->getValue() != $this->getOldValue()) { - $this->_stockStatusModel->rebuild(); + $newValue = $this->getValue(); + $oldValue = Mage::getConfig()->getNode( + Mage_CatalogSearch_Model_Fulltext::XML_PATH_CATALOG_SEARCH_TYPE, + $this->getScope(), + $this->getScopeId() + ); + if ($newValue != $oldValue) { + Mage::getSingleton('cataloginventory/stock_status')->rebuild(); } return $this; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php index 52a8a80c4..f066a6ea5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php index 824760474..d39ecfebe 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cookie.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cookie.php index bb68528c5..4d0209ec8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cookie.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cookie.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php index 367332909..9227c6bb7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php index 2cfca89dc..66ee5f736 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php index 9afcc191e..17750ebcc 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php index 70efdaef7..ba403e79b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php index 4ab8793c0..fc4743077 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Address/Street.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Address/Street.php index 2a09fdb9c..acce398cb 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Address/Street.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Address/Street.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php index ac3c0a04d..2ccc34a0a 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Address.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Address.php index 94ca54b0b..af76e6775 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Address.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Customer.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Customer.php index 290c7035f..b926ddc80 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Customer.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php index 588fe4f27..5bb0743e4 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php index d662ec9af..69b33463e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php index fdcca6672..7bbb5d5c3 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php index 110510c37..85a9f9ff7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Logo.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Logo.php index c87f6aab5..0e109c8ba 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Logo.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Logo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php index e9bf6c280..e32627b1f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php index 3cbdf5104..b32e7a42c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php index 08e6bd649..2586420cd 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php index e3cdf98b6..d4e875bf1 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php index 687aaa7b4..d84a04d69 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php index 705b863fd..b4bb18b14 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php index 74d243a4e..3f094d8ba 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php index 8bfaa84a3..686dec2bb 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php index 247961df1..4a2199518 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php index 5f715eb39..0c40b6aa4 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php index 677572d75..0b4dc6f39 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php index 0e8908be9..96d6f74ab 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php index 749d6ab5d..146baac15 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Secure.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Secure.php index a097aa9dd..2a71da0b0 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Secure.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Secure.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php index 6b6b76acf..d5e0c403c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php index 0ad18b092..29ee7cabb 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php index c77089c6d..53d6c2d9b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php index 4bd691ca8..057324ddd 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php index 4acf72763..8f7c36f1d 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php index 83398a54b..2af267929 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php index bc8f93b6b..e0eacd8a6 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php index dde37b04b..390bfd6c0 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php index 0dcaee1db..af033b8af 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php index b55ef4557..df0fc1f45 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php index e6bd227c5..d43b2e577 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php index 5e5263df9..4768c5688 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php index 4ccb15223..73f61079c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php index 391392365..e9af370e8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php index b84ffb77c..7fb54d6af 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php index 912336af1..abc9f7949 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php index fdbe54435..8f1bfc78d 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php index ef0cc0f00..b111eed92 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php index a6634544a..deae15f28 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Checktype.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Checktype.php index 891455cc2..6787797fa 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Checktype.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Checktype.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php index 402d4f1c0..0d4f5da88 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Cms_Page diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php index ca2aac38d..b9d79a788 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php index 2b189647a..074a59e21 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php index 498fc580e..6c2eb077e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php index 0723604b2..915f2fb57 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php index 895759964..032aaac65 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php index 1c88c004c..50225d94e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php index e24d64005..a87d24191 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php index 5d049ef03..448bccd5a 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group/Multiselect.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group/Multiselect.php index 40e2c3031..206db1092 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group/Multiselect.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group/Multiselect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php index 9a5ae557b..10dc84901 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php index 4f71abe39..c61688f07 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Package diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php index cbd1cefca..e75698641 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php index 9cc153e47..bd994e3c4 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Dev_Dbautoup diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php index 0d4d1a5f3..60445290d 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php index 7f47cc8f3..955422f3e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php index f10118b76..c24550d1e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php index e2b48d945..04a49dfd4 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php index 3c6d8fe79..3d1d9f48f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php index 06c6a48a3..35a68e274 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php index 8132f34b3..0b21be594 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php index 67765c641..6760f2618 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php index 794619696..6d790becd 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php index 6ef86a66e..6e80ee92f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php index b5168e33d..c48866229 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php index 83bd02947..2d3fd0ba8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php index 919ec03f0..c7ba07ddf 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php index 71dc6417a..eea92f6e6 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php index 6d2b80a83..013a1f923 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Nooptreq diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php index 31f6d2cc0..493dda99a 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php index 262270434..e7829ceea 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php index 2e9660247..5bd58dd16 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php index 311d69faa..ff6ba892f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php index 2f0d57a58..bbcd495fd 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php index 30c86cd90..5a392e5e9 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php index d286a239f..c82b691fc 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php index db08bb25c..8755b5344 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php index 18369b763..f3d50feb9 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php index 23e735c30..787beb389 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php index be7bfb96d..7cdd3cc63 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php index 0e666319b..13a90424c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php index 398ac3a85..087bfa5f0 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php index c5181cc0a..e68207506 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php index b55085e3f..c8b284717 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Security/Domainpolicy.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Security/Domainpolicy.php deleted file mode 100644 index 5422b3f6a..000000000 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Security/Domainpolicy.php +++ /dev/null @@ -1,58 +0,0 @@ -_helper = isset($options['helper']) ? $options['helper'] : Mage::helper('adminhtml'); - } - - /** - * @return array - */ - public function toOptionArray() - { - return array( - array( - 'value' => Mage_Core_Model_Domainpolicy::FRAME_POLICY_ALLOW, - 'label' => $this->_helper->__('Enabled'), - ), - array( - 'value' => Mage_Core_Model_Domainpolicy::FRAME_POLICY_ORIGIN, - 'label' => $this->_helper->__('Only from same domain'), - ), - ); - } -} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php index ba7d8144b..ae07711fa 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php index d655f55cf..a92d8678f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php index e9e7a72a2..77019970b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php index 74ec0c24e..13004b268 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php index 0253d0623..96dad27f5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php index 1c9169a80..5b9d0d4d8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php index 6b2cc40c2..3c6f3efa6 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php index 13c980874..96fad798b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php index 558a275a1..c7287962d 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php index 03f331e57..687f12c55 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Tax_Apply_On diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php index 350e825c2..61ae9e3c9 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Tax_Basedon diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php index 7434f416b..e8004a778 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Tax_Catalog diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php index 827fa5c22..a1cb6e8bb 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php index 30736daa5..d68113f87 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Web_Protocol diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Redirect.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Redirect.php index 67dee79d9..6ae0cd8ec 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Redirect.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Redirect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Web_Redirect diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php index 916461580..a71f8baa6 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php index 24776272b..f5f0218d0 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php index 240365a36..f895377b6 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Store.php index c1f11a3cd..b071c3b18 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Url.php b/app/code/core/Mage/Adminhtml/Model/Url.php index 2199f2bbf..adc679659 100644 --- a/app/code/core/Mage/Adminhtml/Model/Url.php +++ b/app/code/core/Mage/Adminhtml/Model/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_Url extends Mage_Core_Model_Url diff --git a/app/code/core/Mage/Adminhtml/controllers/AjaxController.php b/app/code/core/Mage/Adminhtml/controllers/AjaxController.php index 549236d79..272622433 100644 --- a/app/code/core/Mage/Adminhtml/controllers/AjaxController.php +++ b/app/code/core/Mage/Adminhtml/controllers/AjaxController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php index 405df77db..7dfb825ed 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php index b5d612bb2..596482f07 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Api_UserController extends Mage_Adminhtml_Controller_Action diff --git a/app/code/core/Mage/Adminhtml/controllers/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/CacheController.php index 60a84a530..06833d634 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CacheController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CacheController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php index 68751ab42..5ca1eef8a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php index 791ee41e6..79036a44d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -314,9 +314,9 @@ public function saveAction() $category->setAttributeSetId($category->getDefaultAttributeSetId()); if (isset($data['category_products']) && - !$category->getProductsReadonly() - ) { - $products = Mage::helper('core/string')->parseQueryStr($data['category_products']); + !$category->getProductsReadonly()) { + $products = array(); + parse_str($data['category_products'], $products); $category->setPostedProducts($products); } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php index ada2e14ae..605b679c4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -120,7 +120,6 @@ public function saveAction() $stockItem = Mage::getModel('cataloginventory/stock_item'); $stockItem->setProcessIndexEvents(false); $stockItemSaved = false; - $changedProductIds = array(); foreach ($this->_getHelper()->getProductIds() as $productId) { $stockItem->setData(array()); @@ -137,7 +136,6 @@ public function saveAction() if ($stockDataChanged) { $stockItem->save(); $stockItemSaved = true; - $changedProductIds[] = $productId; } } @@ -146,10 +144,6 @@ public function saveAction() Mage_CatalogInventory_Model_Stock_Item::ENTITY, Mage_Index_Model_Event::TYPE_SAVE ); - - Mage::dispatchEvent('catalog_product_stock_item_mass_change', array( - 'products' => $changedProductIds, - )); } } @@ -165,6 +159,9 @@ public function saveAction() $actionModel->updateWebsites($productIds, $websiteAddData, 'add'); } + /** + * @deprecated since 1.3.2.2 + */ Mage::dispatchEvent('catalog_product_to_website_change', array( 'products' => $productIds )); diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php index 14e2b22e8..184d62eb5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -161,12 +161,6 @@ protected function _filterPostData($data) $value = $helperCatalog->stripTags($value); } } - - if (!empty($data['option']) && !empty($data['option']['value']) && is_array($data['option']['value'])) { - foreach ($data['option']['value'] as $key => $values) { - $data['option']['value'][$key] = array_map(array($helperCatalog, 'stripTags'), $values); - } - } } return $data; } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php index 415e021b8..4cd9c4817 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php index 429fe4a11..a4dd0fcab 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php index 027dacef5..235426bac 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php index 118faff74..9cbe01afa 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php index 800ba0648..1333ddcb5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php index 1c461814e..f32e6b20f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php index b5723252e..141ed33da 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php index 609bb7d2c..961e9da96 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/CatalogController.php index 5732a77ec..e00b54f27 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CatalogController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php b/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php index 1d5d9238c..f838f8aec 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php index 1634f702e..a45d1dae8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php index f1077a418..efc6d7467 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php index dc2aa8c8c..cad3d1e20 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php index eb425576c..74bff81b4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php index ea242392d..bb22e6d49 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php index 2988e0b0d..b5be63f91 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,14 +42,14 @@ public function directiveAction() { $directive = $this->getRequest()->getParam('___directive'); $directive = Mage::helper('core')->urlDecode($directive); - $url = Mage::getModel('cms/adminhtml_template_filter')->filter($directive); + $url = Mage::getModel('core/email_template_filter')->filter($directive); try { $image = Varien_Image_Adapter::factory('GD2'); $image->open($url); $image->display(); } catch (Exception $e) { $image = Varien_Image_Adapter::factory('GD2'); - $image->open(Mage::getSingleton('cms/wysiwyg_config')->getSkinImagePlaceholderPath()); + $image->open(Mage::getSingleton('cms/wysiwyg_config')->getSkinImagePlaceholderUrl()); $image->display(); /* $image = imagecreate(100, 100); diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php index 2d7eeb21b..d9c434a2c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php index fdaaeb058..9472b1ca5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php index 87aa580a4..65481cd3a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php index d39242dd3..c5edb11cf 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Customer_OnlineController extends Mage_Adminhtml_Controller_Action diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php index b16cf8808..4e0f2fe2a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php index 0f4ea1e52..e53a8797f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php index bfc263152..47a19fa58 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/DashboardController.php b/app/code/core/Mage/Adminhtml/controllers/DashboardController.php index 09ffc4c6f..987747ad5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/DashboardController.php +++ b/app/code/core/Mage/Adminhtml/controllers/DashboardController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/IndexController.php b/app/code/core/Mage/Adminhtml/controllers/IndexController.php index b0bf2160b..70d2bf0c5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/IndexController.php +++ b/app/code/core/Mage/Adminhtml/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/JsonController.php b/app/code/core/Mage/Adminhtml/controllers/JsonController.php index a4d0405d3..72908bb34 100644 --- a/app/code/core/Mage/Adminhtml/controllers/JsonController.php +++ b/app/code/core/Mage/Adminhtml/controllers/JsonController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php index 715c4b687..fb93fb4ae 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php index 117d4388c..5faf0b858 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php index f283adcb9..0ac200da4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php index e21066074..f568e2dee 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,6 +58,7 @@ public function indexAction() $this->renderLayout(); } + /** * Drop Newsletter queue template */ @@ -66,7 +67,7 @@ public function dropAction () $this->loadLayout('newsletter_queue_preview'); $this->renderLayout(); } - + /** * Preview Newsletter queue template */ @@ -80,7 +81,7 @@ public function previewAction() } // set default value for selected store - $data['preview_store_id'] = Mage::app()->getAnyStoreView()->getId(); + $data['preview_store_id'] = Mage::app()->getDefaultStoreView()->getId(); $this->getLayout()->getBlock('preview_form')->setFormData($data); $this->renderLayout(); @@ -203,8 +204,8 @@ public function editAction() $this->_setActiveMenu('newsletter/queue'); $this->_addBreadcrumb( - Mage::helper('newsletter')->__('Newsletter Queue'), - Mage::helper('newsletter')->__('Newsletter Queue'), + Mage::helper('newsletter')->__('Newsletter Queue'), + Mage::helper('newsletter')->__('Newsletter Queue'), $this->getUrl('*/newsletter_queue') ); $this->_addBreadcrumb(Mage::helper('newsletter')->__('Edit Queue'), Mage::helper('newsletter')->__('Edit Queue')); diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php index 5929a3a71..600b3afd1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php index 41e536858..c05b2fe3a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -235,7 +235,7 @@ public function previewAction () } // set default value for selected store - $data['preview_store_id'] = Mage::app()->getAnyStoreView()->getId(); + $data['preview_store_id'] = Mage::app()->getDefaultStoreView()->getId(); $this->getLayout()->getBlock('preview_form')->setFormData($data); $this->renderLayout(); diff --git a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php index 479126188..176cd6818 100644 --- a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php +++ b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php index 77fab67eb..d1a1a6f50 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php index 40ad2b0e9..e706e3329 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Permissions_UserController extends Mage_Adminhtml_Controller_Action diff --git a/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php b/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php index b3dbe4aa4..bd2c8a578 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/PollController.php b/app/code/core/Mage/Adminhtml/controllers/PollController.php index 414b9e95d..f9d5343f7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/PollController.php +++ b/app/code/core/Mage/Adminhtml/controllers/PollController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php index 543e5ea1b..f15dfa675 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php index 9fac9fb12..442df14a0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php index b185c07da..5c9a8b9ef 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/PromoController.php b/app/code/core/Mage/Adminhtml/controllers/PromoController.php index 77c1d832d..f98165e57 100644 --- a/app/code/core/Mage/Adminhtml/controllers/PromoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/PromoController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/RatingController.php b/app/code/core/Mage/Adminhtml/controllers/RatingController.php index c1362fa48..ccb5a0c2c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/RatingController.php +++ b/app/code/core/Mage/Adminhtml/controllers/RatingController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php index ee28e5dc6..763048459 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php index 8e678810b..13bf03a01 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php index b7fbe5451..208243d7f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php index cf2632da4..fa92865f1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php index 48b4f08ea..36ea2ccdd 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php index c1055d279..ba605f5e0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php index e9192c99d..3cd935cfb 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/ReportController.php b/app/code/core/Mage/Adminhtml/controllers/ReportController.php index 88ca4baba..2a3147e6b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/ReportController.php +++ b/app/code/core/Mage/Adminhtml/controllers/ReportController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php index 79dfce675..763bf58aa 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php index 2f153a909..be43d8d1d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php index 4d8435ef5..ac0582133 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php index 331b25cc1..ccec65998 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php index 873a8dcc5..7830878c7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php index 5a44ec40b..e893174a3 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php index aeca8d634..b005adc2f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -392,7 +392,7 @@ public function addCommentAction() isset($data['is_customer_notified']), isset($data['is_visible_on_front']) ); - $creditmemo->getCommentsCollection()->save(); + $creditmemo->save(); $creditmemo->sendUpdateEmail(!empty($data['is_customer_notified']), $data['comment']); $this->loadLayout(); diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php index 7ab7e5223..502e0a76f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php index 4477e4ffa..f9f24aabf 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php index cd52f6212..b5e341462 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php index 106ea9d9c..469c0a408 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php index 3d7083754..2b9b2bb08 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php index cdfbb7887..c8ed25d07 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php index 9ad73b536..87dbad37d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php index 536cc6dee..011e29cb4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php index eb2b23c25..238a414b2 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/SalesController.php index 9c27c0000..0d711d3b7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SalesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SalesController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php index 61f6e6808..2e42222b7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/SurveyController.php b/app/code/core/Mage/Adminhtml/controllers/SurveyController.php index 201933e4d..bb0b8c32f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SurveyController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SurveyController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php index 533ccbe80..b15105b12 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php index 43c9bc116..ada621457 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php index 747703e3c..38deadaad 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php index 6af766910..9552cadb9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php index 48114fba5..b56b80f6c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php index 4bab2f35e..df6673034 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php index 098594038..8be1066a9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php index 15f201968..6472a85d8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php index 44617c281..6b0e0dd80 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php index 3e7bd5e74..58c1f1393 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php index 4cff251ec..7f65393d1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php index e75d71e17..0dafeb48b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/SystemController.php b/app/code/core/Mage/Adminhtml/controllers/SystemController.php index aaf1aa36c..d9698c7e4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SystemController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SystemController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/TagController.php b/app/code/core/Mage/Adminhtml/controllers/TagController.php index 2b7d279f5..7625bffd9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TagController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php index b6d359c54..582683e72 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php index 54b6ca106..d9de23c91 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php index 103b1c18d..eaf4072e1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php index b59f99b11..9311c2360 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php index 3e6b397b7..af5d7bd81 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/TaxController.php b/app/code/core/Mage/Adminhtml/controllers/TaxController.php index e389954ae..285a69b6c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TaxController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TaxController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php index c8b400800..3f70581f6 100644 --- a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/etc/adminhtml.xml b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml index 0f5a1ccb2..9b5c0ad82 100644 --- a/app/code/core/Mage/Adminhtml/etc/adminhtml.xml +++ b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml index 5bb641907..aaad3f037 100644 --- a/app/code/core/Mage/Adminhtml/etc/config.xml +++ b/app/code/core/Mage/Adminhtml/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Adminhtml/etc/jstranslator.xml b/app/code/core/Mage/Adminhtml/etc/jstranslator.xml index b6a6bf233..789acf106 100644 --- a/app/code/core/Mage/Adminhtml/etc/jstranslator.xml +++ b/app/code/core/Mage/Adminhtml/etc/jstranslator.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/Controller/Action.php b/app/code/core/Mage/Api/Controller/Action.php index db39bbe50..15bcfde7c 100644 --- a/app/code/core/Mage/Api/Controller/Action.php +++ b/app/code/core/Mage/Api/Controller/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Exception.php b/app/code/core/Mage/Api/Exception.php index af7775ac0..6384a31b7 100644 --- a/app/code/core/Mage/Api/Exception.php +++ b/app/code/core/Mage/Api/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php index c6a5fd538..e63082b08 100644 --- a/app/code/core/Mage/Api/Helper/Data.php +++ b/app/code/core/Mage/Api/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl.php b/app/code/core/Mage/Api/Model/Acl.php index 3506c1771..12a664a1e 100644 --- a/app/code/core/Mage/Api/Model/Acl.php +++ b/app/code/core/Mage/Api/Model/Acl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php b/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php index 0a8ac7bc1..c2cea9a5b 100644 --- a/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php +++ b/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php index ca87c43b1..aec1db270 100644 --- a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Resource.php b/app/code/core/Mage/Api/Model/Acl/Resource.php index 9c89baadb..88569aaf9 100644 --- a/app/code/core/Mage/Api/Model/Acl/Resource.php +++ b/app/code/core/Mage/Api/Model/Acl/Resource.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Role.php b/app/code/core/Mage/Api/Model/Acl/Role.php index b0b93f5ae..41f090867 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role.php +++ b/app/code/core/Mage/Api/Model/Acl/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Generic.php b/app/code/core/Mage/Api/Model/Acl/Role/Generic.php index 3d95bba54..d6806691a 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Generic.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Generic.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Group.php b/app/code/core/Mage/Api/Model/Acl/Role/Group.php index 58e84b96e..40383f265 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Group.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Registry.php b/app/code/core/Mage/Api/Model/Acl/Role/Registry.php index b0a12e031..58c82f8e4 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Registry.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Registry.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Role/User.php b/app/code/core/Mage/Api/Model/Acl/Role/User.php index 5e08c6009..2c92d3bde 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/User.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Config.php b/app/code/core/Mage/Api/Model/Config.php index 86dbb01f0..f683a430c 100644 --- a/app/code/core/Mage/Api/Model/Config.php +++ b/app/code/core/Mage/Api/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,7 +44,6 @@ public function __construct($sourceData=null) { $this->setCacheId('config_api'); $this->setCacheTags(array(self::CACHE_TAG)); - $this->setCacheChecksum(null); parent::__construct($sourceData); $this->_construct(); diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl.php b/app/code/core/Mage/Api/Model/Mysql4/Acl.php index 9bf54b4a4..136c53825 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Acl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php index bb6acf24d..86ebc1edd 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php index 30b8f005c..bd90f0fdb 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php index a34754729..7f5fef02d 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Role.php index c3198f7ea..6bd9234cf 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Role.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php index 584f24613..198eded7f 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles.php b/app/code/core/Mage/Api/Model/Mysql4/Roles.php index cdca6516a..c7a8fa2ed 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Roles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php index 1672c7467..9965146ca 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php index 87d07caad..4965135ec 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules.php b/app/code/core/Mage/Api/Model/Mysql4/Rules.php index 0a9307339..5cb2b137f 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Rules.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Rules.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php index 9db282b65..428e134f8 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/User.php b/app/code/core/Mage/Api/Model/Mysql4/User.php index 29e27718a..f255bf297 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/User.php +++ b/app/code/core/Mage/Api/Model/Mysql4/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php index 71e21ddfc..46ecdff07 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Abstract.php b/app/code/core/Mage/Api/Model/Resource/Abstract.php index e826e26bb..dde720e4e 100644 --- a/app/code/core/Mage/Api/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Api/Model/Resource/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Acl.php b/app/code/core/Mage/Api/Model/Resource/Acl.php index a38b5e90f..aa9c7d75d 100644 --- a/app/code/core/Mage/Api/Model/Resource/Acl.php +++ b/app/code/core/Mage/Api/Model/Resource/Acl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Acl/Role.php b/app/code/core/Mage/Api/Model/Resource/Acl/Role.php index 1e332caa5..ed8263755 100644 --- a/app/code/core/Mage/Api/Model/Resource/Acl/Role.php +++ b/app/code/core/Mage/Api/Model/Resource/Acl/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php b/app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php index 7baacb0ad..f36bcf3ff 100644 --- a/app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php b/app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php index c0936fbe5..398ddd6f5 100644 --- a/app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Role.php b/app/code/core/Mage/Api/Model/Resource/Role.php index 2df1febf1..8b328edf0 100644 --- a/app/code/core/Mage/Api/Model/Resource/Role.php +++ b/app/code/core/Mage/Api/Model/Resource/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Role/Collection.php b/app/code/core/Mage/Api/Model/Resource/Role/Collection.php index 15441ebb7..96071a560 100644 --- a/app/code/core/Mage/Api/Model/Resource/Role/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Role/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Roles.php b/app/code/core/Mage/Api/Model/Resource/Roles.php index 42daeb01e..611c7686b 100644 --- a/app/code/core/Mage/Api/Model/Resource/Roles.php +++ b/app/code/core/Mage/Api/Model/Resource/Roles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php b/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php index 98a2901a2..339f6639f 100644 --- a/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php b/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php index e5d1739ce..35b8d3241 100644 --- a/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Rules.php b/app/code/core/Mage/Api/Model/Resource/Rules.php index 8fe10692e..46bdfe299 100644 --- a/app/code/core/Mage/Api/Model/Resource/Rules.php +++ b/app/code/core/Mage/Api/Model/Resource/Rules.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php b/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php index 8486cdbef..efaa047fe 100644 --- a/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/User.php b/app/code/core/Mage/Api/Model/Resource/User.php index 07d63508a..8d9a346dd 100644 --- a/app/code/core/Mage/Api/Model/Resource/User.php +++ b/app/code/core/Mage/Api/Model/Resource/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/User/Collection.php b/app/code/core/Mage/Api/Model/Resource/User/Collection.php index 435ce71d9..a81bffb1b 100644 --- a/app/code/core/Mage/Api/Model/Resource/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/User/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Role.php b/app/code/core/Mage/Api/Model/Role.php index 8cc35e97b..968c70f21 100644 --- a/app/code/core/Mage/Api/Model/Role.php +++ b/app/code/core/Mage/Api/Model/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Roles.php b/app/code/core/Mage/Api/Model/Roles.php index d0634e322..5d2a6360e 100644 --- a/app/code/core/Mage/Api/Model/Roles.php +++ b/app/code/core/Mage/Api/Model/Roles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Rules.php b/app/code/core/Mage/Api/Model/Rules.php index 5645e85cb..959228357 100644 --- a/app/code/core/Mage/Api/Model/Rules.php +++ b/app/code/core/Mage/Api/Model/Rules.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Server.php b/app/code/core/Mage/Api/Model/Server.php index 1a63305a6..f973778e0 100644 --- a/app/code/core/Mage/Api/Model/Server.php +++ b/app/code/core/Mage/Api/Model/Server.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php index 8c98fc9ab..bd2366fea 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php index 7c1bc71cc..a57df0d87 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php index 1174e9c4d..4a9a80569 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Server/Handler.php b/app/code/core/Mage/Api/Model/Server/Handler.php index a51e97857..b6126abfe 100644 --- a/app/code/core/Mage/Api/Model/Server/Handler.php +++ b/app/code/core/Mage/Api/Model/Server/Handler.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php index 008ac3b6c..4183d0fea 100644 --- a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php +++ b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php index 7402d119d..6049fd0c2 100644 --- a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Server/V2/Handler.php b/app/code/core/Mage/Api/Model/Server/V2/Handler.php index eff612188..398e39589 100644 --- a/app/code/core/Mage/Api/Model/Server/V2/Handler.php +++ b/app/code/core/Mage/Api/Model/Server/V2/Handler.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php index 30bb65aa8..b04a86a5a 100644 --- a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php index 1765dfbac..1bbd4724c 100644 --- a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php +++ b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Session.php b/app/code/core/Mage/Api/Model/Session.php index 3f09a4b81..64ad760e0 100644 --- a/app/code/core/Mage/Api/Model/Session.php +++ b/app/code/core/Mage/Api/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/User.php b/app/code/core/Mage/Api/Model/User.php index 058768d4a..ca41612d5 100644 --- a/app/code/core/Mage/Api/Model/User.php +++ b/app/code/core/Mage/Api/Model/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config.php b/app/code/core/Mage/Api/Model/Wsdl/Config.php index 32fc1fd01..587d2a908 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php index 9d77ebe93..2754e4a34 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php index c26214307..df8d4ac97 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/controllers/IndexController.php b/app/code/core/Mage/Api/controllers/IndexController.php index c696ca3e8..c8f069588 100644 --- a/app/code/core/Mage/Api/controllers/IndexController.php +++ b/app/code/core/Mage/Api/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/controllers/SoapController.php b/app/code/core/Mage/Api/controllers/SoapController.php index 399458bd9..53e7194e8 100644 --- a/app/code/core/Mage/Api/controllers/SoapController.php +++ b/app/code/core/Mage/Api/controllers/SoapController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/controllers/V2/SoapController.php b/app/code/core/Mage/Api/controllers/V2/SoapController.php index 83b6531a4..9c282f78a 100644 --- a/app/code/core/Mage/Api/controllers/V2/SoapController.php +++ b/app/code/core/Mage/Api/controllers/V2/SoapController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/controllers/XmlrpcController.php b/app/code/core/Mage/Api/controllers/XmlrpcController.php index 5b74e299b..ef9ceda9f 100644 --- a/app/code/core/Mage/Api/controllers/XmlrpcController.php +++ b/app/code/core/Mage/Api/controllers/XmlrpcController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/etc/adminhtml.xml b/app/code/core/Mage/Api/etc/adminhtml.xml index fc347633e..5cb93c521 100644 --- a/app/code/core/Mage/Api/etc/adminhtml.xml +++ b/app/code/core/Mage/Api/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/etc/api.xml b/app/code/core/Mage/Api/etc/api.xml index 321bb869f..eca59df70 100644 --- a/app/code/core/Mage/Api/etc/api.xml +++ b/app/code/core/Mage/Api/etc/api.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/etc/config.xml b/app/code/core/Mage/Api/etc/config.xml index 9b6f17c11..578736d1e 100644 --- a/app/code/core/Mage/Api/etc/config.xml +++ b/app/code/core/Mage/Api/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/etc/system.xml b/app/code/core/Mage/Api/etc/system.xml index 4a73fec08..7e3a1686a 100644 --- a/app/code/core/Mage/Api/etc/system.xml +++ b/app/code/core/Mage/Api/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php b/app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php index 860844a18..88813ad37 100644 --- a/app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php index 0f9ba3700..882e07df6 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php index 64688fcd9..dcf8d3be5 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php index b02d4b5ad..d716e620f 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 2f93340be..630fa6a05 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php index ca4133a5c..3d6f632f1 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php index c7cb1e418..8a0ab8142 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php index 5f52c50ca..2a86133a2 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php index 8d7aa1c92..c8a794cbc 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php index 7a473225a..fc359b639 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php index ad3dd257c..aa8d38d88 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tab/Resource.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tab/Resource.php index 983c1fb5b..b55e9ac75 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tab/Resource.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tab/Resource.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php index 30390312a..10f2b2f05 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php b/app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php index 57e4df66b..ddf20580e 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php index 56585de86..8589b0bbc 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php index 0f0592164..f6eccd45a 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php index 65b938d66..d600356da 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php index 49c34de78..8fbab73e9 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Resources.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Resources.php index 0d51b6fbb..a2f708f16 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Resources.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Resources.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php index 53cd214fa..4c2689767 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php index 4e1707b16..b78a8042f 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Exception.php b/app/code/core/Mage/Api2/Exception.php index 1bd4db69d..118a69fa7 100644 --- a/app/code/core/Mage/Api2/Exception.php +++ b/app/code/core/Mage/Api2/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Helper/Data.php b/app/code/core/Mage/Api2/Helper/Data.php index 5fed78692..39b8cd07b 100644 --- a/app/code/core/Mage/Api2/Helper/Data.php +++ b/app/code/core/Mage/Api2/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl.php b/app/code/core/Mage/Api2/Model/Acl.php index 04e63db16..403e2f358 100644 --- a/app/code/core/Mage/Api2/Model/Acl.php +++ b/app/code/core/Mage/Api2/Model/Acl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter.php b/app/code/core/Mage/Api2/Model/Acl/Filter.php index 9a1594d9b..78c36b1b6 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Filter.php +++ b/app/code/core/Mage/Api2/Model/Acl/Filter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php index 77096567e..0bf591fad 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php +++ b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/Operation.php b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/Operation.php index ccfd3f1c8..fc463c72c 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/Operation.php +++ b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/Operation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php index fc76cb6c9..2b55a1fd9 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php +++ b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Global.php b/app/code/core/Mage/Api2/Model/Acl/Global.php index 6e1ad4791..2145ca169 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Role.php b/app/code/core/Mage/Api2/Model/Acl/Global/Role.php index d10ccc3ee..7c96cb365 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Role.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule.php index 66fe651eb..8f743f193 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Permission.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Permission.php index d375175ff..328045b45 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Permission.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Permission.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Privilege.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Privilege.php index 4abb9ce06..9f461845d 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Privilege.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Privilege.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php index 110c3dfa4..e7fbf0801 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php index ebadd7ff8..c28611ade 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/PermissionInterface.php b/app/code/core/Mage/Api2/Model/Acl/PermissionInterface.php index bac93383d..ff8ecc3a9 100644 --- a/app/code/core/Mage/Api2/Model/Acl/PermissionInterface.php +++ b/app/code/core/Mage/Api2/Model/Acl/PermissionInterface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Auth.php b/app/code/core/Mage/Api2/Model/Auth.php index 5aa02b7e3..6070a65bb 100644 --- a/app/code/core/Mage/Api2/Model/Auth.php +++ b/app/code/core/Mage/Api2/Model/Auth.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Auth/Adapter.php b/app/code/core/Mage/Api2/Model/Auth/Adapter.php index 46c2b617e..e7885770a 100644 --- a/app/code/core/Mage/Api2/Model/Auth/Adapter.php +++ b/app/code/core/Mage/Api2/Model/Auth/Adapter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php b/app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php index 464fead4f..89cd3982c 100644 --- a/app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php +++ b/app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php b/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php index b7be5caaf..c0eff8e35 100644 --- a/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php +++ b/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Auth/User.php b/app/code/core/Mage/Api2/Model/Auth/User.php index 83542ab89..fac2a0c4b 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User.php +++ b/app/code/core/Mage/Api2/Model/Auth/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Auth/User/Abstract.php b/app/code/core/Mage/Api2/Model/Auth/User/Abstract.php index f1045e438..af56f07ef 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User/Abstract.php +++ b/app/code/core/Mage/Api2/Model/Auth/User/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Auth/User/Admin.php b/app/code/core/Mage/Api2/Model/Auth/User/Admin.php index ff99b8532..190587e36 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User/Admin.php +++ b/app/code/core/Mage/Api2/Model/Auth/User/Admin.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Auth/User/Customer.php b/app/code/core/Mage/Api2/Model/Auth/User/Customer.php index d4b192c24..c7b7ea33e 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User/Customer.php +++ b/app/code/core/Mage/Api2/Model/Auth/User/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Auth/User/Guest.php b/app/code/core/Mage/Api2/Model/Auth/User/Guest.php index 6e96069d3..b86d0a2ff 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User/Guest.php +++ b/app/code/core/Mage/Api2/Model/Auth/User/Guest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Config.php b/app/code/core/Mage/Api2/Model/Config.php index 6a8d26222..c08e55fa1 100644 --- a/app/code/core/Mage/Api2/Model/Config.php +++ b/app/code/core/Mage/Api2/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Dispatcher.php b/app/code/core/Mage/Api2/Model/Dispatcher.php index 072962d5f..67f1feef9 100644 --- a/app/code/core/Mage/Api2/Model/Dispatcher.php +++ b/app/code/core/Mage/Api2/Model/Dispatcher.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Multicall.php b/app/code/core/Mage/Api2/Model/Multicall.php index 4ac8864a1..067ac10c0 100644 --- a/app/code/core/Mage/Api2/Model/Multicall.php +++ b/app/code/core/Mage/Api2/Model/Multicall.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Observer.php b/app/code/core/Mage/Api2/Model/Observer.php index 51d06344d..ef36cba2f 100644 --- a/app/code/core/Mage/Api2/Model/Observer.php +++ b/app/code/core/Mage/Api2/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Renderer.php b/app/code/core/Mage/Api2/Model/Renderer.php index 9845044db..762fb10b9 100644 --- a/app/code/core/Mage/Api2/Model/Renderer.php +++ b/app/code/core/Mage/Api2/Model/Renderer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Renderer/Interface.php b/app/code/core/Mage/Api2/Model/Renderer/Interface.php index c507e391f..9774ac39d 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Interface.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Renderer/Json.php b/app/code/core/Mage/Api2/Model/Renderer/Json.php index d7cd37c6b..80a676d26 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Json.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Json.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Renderer/Query.php b/app/code/core/Mage/Api2/Model/Renderer/Query.php index fbebd2218..389e487ae 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Query.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Query.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Renderer/Xml.php b/app/code/core/Mage/Api2/Model/Renderer/Xml.php index 26b6b8719..0c3d47add 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Xml.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Xml.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php b/app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php index 0032aefad..b370c2982 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Request.php b/app/code/core/Mage/Api2/Model/Request.php index cea160491..1b63c9df8 100644 --- a/app/code/core/Mage/Api2/Model/Request.php +++ b/app/code/core/Mage/Api2/Model/Request.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Request/Internal.php b/app/code/core/Mage/Api2/Model/Request/Internal.php index b38a13f59..99e743e55 100644 --- a/app/code/core/Mage/Api2/Model/Request/Internal.php +++ b/app/code/core/Mage/Api2/Model/Request/Internal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter.php b/app/code/core/Mage/Api2/Model/Request/Interpreter.php index 4f77525f8..72182e089 100644 --- a/app/code/core/Mage/Api2/Model/Request/Interpreter.php +++ b/app/code/core/Mage/Api2/Model/Request/Interpreter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter/Interface.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Interface.php index 770ab1c84..b2d6cf3dc 100644 --- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Interface.php +++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php index ff1d14cc4..a9f052bd1 100644 --- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php +++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php index 43446cdd6..abbcec9c3 100644 --- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php +++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php index 76e2c86b1..74f992c16 100644 --- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php +++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource.php b/app/code/core/Mage/Api2/Model/Resource.php index d38f01d29..7a4d27109 100644 --- a/app/code/core/Mage/Api2/Model/Resource.php +++ b/app/code/core/Mage/Api2/Model/Resource.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php index 2277ebe67..e7b91f015 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php index ed61604f8..e880f1733 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php index 41d621b8f..255da7892 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php index fd9b75d30..39e878959 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php index a3250f62c..9cefe7f32 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php index e2815965e..3bd73f5c5 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Setup.php b/app/code/core/Mage/Api2/Model/Resource/Setup.php index a66a38687..85e973ba9 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Setup.php +++ b/app/code/core/Mage/Api2/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator.php b/app/code/core/Mage/Api2/Model/Resource/Validator.php index 1d470227e..b91b33199 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php b/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php index 14fb70569..3e99d2a71 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php b/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php index c494190eb..aa7c17901 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Response.php b/app/code/core/Mage/Api2/Model/Response.php index 14b0448f6..af7d1d7c8 100644 --- a/app/code/core/Mage/Api2/Model/Response.php +++ b/app/code/core/Mage/Api2/Model/Response.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Route/Abstract.php b/app/code/core/Mage/Api2/Model/Route/Abstract.php index 869e8f4a8..18876a865 100644 --- a/app/code/core/Mage/Api2/Model/Route/Abstract.php +++ b/app/code/core/Mage/Api2/Model/Route/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Route/ApiType.php b/app/code/core/Mage/Api2/Model/Route/ApiType.php index 2985b9abe..cca593bf2 100644 --- a/app/code/core/Mage/Api2/Model/Route/ApiType.php +++ b/app/code/core/Mage/Api2/Model/Route/ApiType.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Route/Interface.php b/app/code/core/Mage/Api2/Model/Route/Interface.php index 755e9fc55..a628f12db 100644 --- a/app/code/core/Mage/Api2/Model/Route/Interface.php +++ b/app/code/core/Mage/Api2/Model/Route/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Route/Rest.php b/app/code/core/Mage/Api2/Model/Route/Rest.php index d2576e4ea..adab0d953 100644 --- a/app/code/core/Mage/Api2/Model/Route/Rest.php +++ b/app/code/core/Mage/Api2/Model/Route/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Router.php b/app/code/core/Mage/Api2/Model/Router.php index 68b536a93..bc82138b9 100644 --- a/app/code/core/Mage/Api2/Model/Router.php +++ b/app/code/core/Mage/Api2/Model/Router.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Server.php b/app/code/core/Mage/Api2/Model/Server.php index bc057adbf..ff4f6fb37 100644 --- a/app/code/core/Mage/Api2/Model/Server.php +++ b/app/code/core/Mage/Api2/Model/Server.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php index 7957a3071..dfd0c2766 100644 --- a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php +++ b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php index 5723d412b..3796b5a13 100644 --- a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php +++ b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/etc/adminhtml.xml b/app/code/core/Mage/Api2/etc/adminhtml.xml index a036ecef5..e4ac3575a 100644 --- a/app/code/core/Mage/Api2/etc/adminhtml.xml +++ b/app/code/core/Mage/Api2/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api2/etc/config.xml b/app/code/core/Mage/Api2/etc/config.xml index ab1b0614d..7fea9c897 100644 --- a/app/code/core/Mage/Api2/etc/config.xml +++ b/app/code/core/Mage/Api2/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php b/app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php index 7e1b71c58..29b514227 100644 --- a/app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php +++ b/app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php b/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php index 434035208..55583c8ac 100644 --- a/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php +++ b/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php b/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php index 45fefb20f..4106a80f3 100644 --- a/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php +++ b/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/Helper/Data.php b/app/code/core/Mage/Authorizenet/Helper/Data.php index e28b562c6..e18f7975b 100644 --- a/app/code/core/Mage/Authorizenet/Helper/Data.php +++ b/app/code/core/Mage/Authorizenet/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost.php b/app/code/core/Mage/Authorizenet/Model/Directpost.php index b7429b43f..8d2d138ce 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php index da19c5479..6a0240512 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php index 9660e239f..9ac6067c2 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Response.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Response.php index f8a88c046..a34e093ee 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Response.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Response.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php index d22656032..e3d9c5d26 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php b/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php index e6cf5a5a7..6b57ecbf8 100644 --- a/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php +++ b/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php b/app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php index 7a6b21094..001f0e31c 100644 --- a/app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php +++ b/app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/etc/config.xml b/app/code/core/Mage/Authorizenet/etc/config.xml index 0822fc4d0..c39452766 100644 --- a/app/code/core/Mage/Authorizenet/etc/config.xml +++ b/app/code/core/Mage/Authorizenet/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Authorizenet/etc/system.xml b/app/code/core/Mage/Authorizenet/etc/system.xml index a6bbbd753..0e834b8a9 100644 --- a/app/code/core/Mage/Authorizenet/etc/system.xml +++ b/app/code/core/Mage/Authorizenet/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Backup/Exception.php b/app/code/core/Mage/Backup/Exception.php index 753089a6b..d8aaccebc 100644 --- a/app/code/core/Mage/Backup/Exception.php +++ b/app/code/core/Mage/Backup/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Helper/Data.php b/app/code/core/Mage/Backup/Helper/Data.php index 3c3d330b6..ab2414f41 100644 --- a/app/code/core/Mage/Backup/Helper/Data.php +++ b/app/code/core/Mage/Backup/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Backup.php b/app/code/core/Mage/Backup/Model/Backup.php index dd7aa36e8..982d995e9 100644 --- a/app/code/core/Mage/Backup/Model/Backup.php +++ b/app/code/core/Mage/Backup/Model/Backup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php b/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php index f0860acfe..3dd49fd09 100644 --- a/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php +++ b/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Config/Source/Type.php b/app/code/core/Mage/Backup/Model/Config/Source/Type.php index 092ba090a..9a6f7e568 100644 --- a/app/code/core/Mage/Backup/Model/Config/Source/Type.php +++ b/app/code/core/Mage/Backup/Model/Config/Source/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Db.php b/app/code/core/Mage/Backup/Model/Db.php index 04d344d1f..1a4592eb4 100644 --- a/app/code/core/Mage/Backup/Model/Db.php +++ b/app/code/core/Mage/Backup/Model/Db.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Fs/Collection.php b/app/code/core/Mage/Backup/Model/Fs/Collection.php index 840bcb2b3..3b27cf7b0 100644 --- a/app/code/core/Mage/Backup/Model/Fs/Collection.php +++ b/app/code/core/Mage/Backup/Model/Fs/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Mysql4/Db.php b/app/code/core/Mage/Backup/Model/Mysql4/Db.php index 409f13bd3..5caf356cb 100644 --- a/app/code/core/Mage/Backup/Model/Mysql4/Db.php +++ b/app/code/core/Mage/Backup/Model/Mysql4/Db.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Observer.php b/app/code/core/Mage/Backup/Model/Observer.php index 730f8dfdf..8464a67a4 100644 --- a/app/code/core/Mage/Backup/Model/Observer.php +++ b/app/code/core/Mage/Backup/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Resource/Db.php b/app/code/core/Mage/Backup/Model/Resource/Db.php index 384ecec60..0dae3ab5c 100644 --- a/app/code/core/Mage/Backup/Model/Resource/Db.php +++ b/app/code/core/Mage/Backup/Model/Resource/Db.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php index 8a8528a47..b6e976281 100644 --- a/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/etc/adminhtml.xml b/app/code/core/Mage/Backup/etc/adminhtml.xml index 36eb441de..56ccb04d1 100644 --- a/app/code/core/Mage/Backup/etc/adminhtml.xml +++ b/app/code/core/Mage/Backup/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Backup/etc/config.xml b/app/code/core/Mage/Backup/etc/config.xml index 83c984f1c..3bee75239 100644 --- a/app/code/core/Mage/Backup/etc/config.xml +++ b/app/code/core/Mage/Backup/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Backup/etc/system.xml b/app/code/core/Mage/Backup/etc/system.xml index 251682844..4db8f030d 100644 --- a/app/code/core/Mage/Backup/etc/system.xml +++ b/app/code/core/Mage/Backup/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php index ce3c87d4d..34a17a3c2 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php index a187dc3a1..69a331da8 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php index b9b7d16f6..881cca09c 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php index 393881c46..5f1270254 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php index cdeb4829c..0760d0c9d 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php index 42efdd4af..cf88fc013 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php index 9a39ec779..5aeb227a2 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php index ecdf46011..3d6ff4f28 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php index 047acd012..8783307ef 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php index 19cc8fcb6..dfee813d7 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php index 8199e2641..642340d88 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php index 745822d9d..f96e1ee94 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php index 1c2cf528b..e0e59c526 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php index 785d82a75..4f4b3639d 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php index e4a40c75d..d78614145 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php index 96ee18d12..473dd815d 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php index 5cafeed7e..7afffdc2e 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php index b6f8fe2c2..ebc623ea8 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,7 +36,7 @@ class Mage_Bundle_Block_Catalog_Product_Price extends Mage_Catalog_Block_Product public function isRatesGraterThenZero() { - $_request = Mage::getSingleton('tax/calculation')->getDefaultRateRequest(); + $_request = Mage::getSingleton('tax/calculation')->getRateRequest(false, false, false); $_request->setProductClassId($this->getProduct()->getTaxClassId()); $defaultTax = Mage::getSingleton('tax/calculation')->getRate($_request); @@ -60,7 +60,7 @@ public function displayBothPrices() $product->getPriceModel()->getIsPricesCalculatedByIndex() !== false) { return false; } - return $this->helper('tax')->displayBothPrices(Mage::app()->getStore()->getId()); + return $this->helper('tax')->displayBothPrices(); } /** diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php index a7bf702c5..e5c5b69ff 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php index d832f317f..3342effea 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php index e2126e0ad..eed6b7362 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php index a7b73e8e7..4b438576d 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php index 644a1d186..240000af6 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php index 54df2b57b..32f438d02 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php index 63b1acda3..f4da411fa 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php index 4149caeb4..863c5682f 100644 --- a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php index 8f6acf56c..3fb7a4775 100644 --- a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php b/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php index ab918ae3f..99068ca00 100644 --- a/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php +++ b/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Helper/Data.php b/app/code/core/Mage/Bundle/Helper/Data.php index 8fea959d4..3d7a90c5a 100644 --- a/app/code/core/Mage/Bundle/Helper/Data.php +++ b/app/code/core/Mage/Bundle/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php b/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php index d9949902c..c66ee84e7 100644 --- a/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php +++ b/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php index abf230e65..520c4320b 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php index 64ee265fe..cd36f63af 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php index 2c7c96037..dc1e318dd 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option.php index c82c8c47e..2a40e4289 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php index 4a31b62f6..dda65a0a9 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php b/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php index c63c3a04a..dfb980c29 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php index c7636d235..11bc52367 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php index 9422c4891..bd0e00fbd 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Observer.php b/app/code/core/Mage/Bundle/Model/Observer.php index 3a09747d6..01446cfe6 100644 --- a/app/code/core/Mage/Bundle/Model/Observer.php +++ b/app/code/core/Mage/Bundle/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Option.php b/app/code/core/Mage/Bundle/Model/Option.php index 4dd8d6537..c3265a2e3 100644 --- a/app/code/core/Mage/Bundle/Model/Option.php +++ b/app/code/core/Mage/Bundle/Model/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Price/Index.php b/app/code/core/Mage/Bundle/Model/Price/Index.php index fa1e1a4e2..af3d3934b 100644 --- a/app/code/core/Mage/Bundle/Model/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Price/Index.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php index eea9c68ca..5be3447c0 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php +++ b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Product/Price.php b/app/code/core/Mage/Bundle/Model/Product/Price.php index 50a7fbba5..b69b18490 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Price.php +++ b/app/code/core/Mage/Bundle/Model/Product/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -190,16 +190,16 @@ public function getPricesDependingOnTax($product, $which = null, $includeTax = n */ public function getTotalPrices($product, $which = null, $includeTax = null, $takeTierPrice = true) { + $isPriceFixedType = ($product->getPriceType() == self::PRICE_TYPE_FIXED); $this->_isPricesCalculatedByIndex = ($product->getData('min_price') && $product->getData('max_price')); $taxHelper = $this->_getHelperData('tax'); - if ($this->_isPricesCalculatedByIndex) { + if ($this->_isPricesCalculatedByIndex && !$includeTax) { $minimalPrice = $taxHelper->getPrice($product, $product->getData('min_price'), $includeTax, null, null, null, null, null, false); $maximalPrice = $taxHelper->getPrice($product, $product->getData('max_price'), $includeTax, null, null, null, null, null, false); } else { - $isPriceFixedType = ($product->getPriceType() == self::PRICE_TYPE_FIXED); /** * Check if product price is fixed */ diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php index c1b08e835..6bb0a68f8 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Type.php +++ b/app/code/core/Mage/Bundle/Model/Product/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Resource/Bundle.php b/app/code/core/Mage/Bundle/Model/Resource/Bundle.php index a36c83a37..ed8cdc017 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Bundle.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Bundle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php index d7181fdba..0fe3f7d51 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php index 9de8a9f25..76353dc13 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Resource/Option.php b/app/code/core/Mage/Bundle/Model/Resource/Option.php index c966dd86b..3f2976a17 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Option.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php b/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php index 13408fcfc..138a6adcc 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php index cf2d72e32..f892ef7b7 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Resource/Selection.php b/app/code/core/Mage/Bundle/Model/Resource/Selection.php index d71b41e39..bcbdc7f1e 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Selection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php b/app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php index 98c015532..6c9eb962c 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php index b0d3838c9..228c654dc 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php index 6409d24ea..a49526f5e 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php index b200a8e7d..7d12b9eb8 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php index 70b7c048e..bf48a8eb2 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Selection.php b/app/code/core/Mage/Bundle/Model/Selection.php index bf018c1b0..552f1bca9 100644 --- a/app/code/core/Mage/Bundle/Model/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Selection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php b/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php index 0ad233c6c..35f1732ee 100644 --- a/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php +++ b/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php b/app/code/core/Mage/Bundle/Model/Source/Option/Type.php index 11f20bd9b..e6b33e43b 100644 --- a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php +++ b/app/code/core/Mage/Bundle/Model/Source/Option/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php index a79d09d84..dfb1620ca 100644 --- a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php +++ b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php index 0263a5320..832ff9ef3 100644 --- a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php +++ b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/controllers/Product/EditController.php b/app/code/core/Mage/Bundle/controllers/Product/EditController.php index 2ca3d0192..d25094d3f 100644 --- a/app/code/core/Mage/Bundle/controllers/Product/EditController.php +++ b/app/code/core/Mage/Bundle/controllers/Product/EditController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/controllers/SelectionController.php b/app/code/core/Mage/Bundle/controllers/SelectionController.php index b9c7a9594..46868d684 100644 --- a/app/code/core/Mage/Bundle/controllers/SelectionController.php +++ b/app/code/core/Mage/Bundle/controllers/SelectionController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php index 3b7f4f495..807ca8725 100644 --- a/app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/etc/config.xml b/app/code/core/Mage/Bundle/etc/config.xml index 12b82a7fe..3babf074f 100644 --- a/app/code/core/Mage/Bundle/etc/config.xml +++ b/app/code/core/Mage/Bundle/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php b/app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php index 56889f90a..71dc491c7 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php index 25a791f88..7b45b6a9e 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php index 3cec696d8..8993c2b7a 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php index 33bcfbfa4..9bd0e1f05 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php index 723100e29..d60d49b3b 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.10-0.1.11.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.10-0.1.11.php index 16048706c..303039cd5 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.10-0.1.11.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.10-0.1.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.11-0.1.12.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.11-0.1.12.php index 38822f034..7e237e735 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.11-0.1.12.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.11-0.1.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.12-0.1.13.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.12-0.1.13.php index 24a2825c4..4cf842849 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.12-0.1.13.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.12-0.1.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php index c44d6c75e..41ae7ac06 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php index c3d6445c2..727bdb4be 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php index d97aaf483..589e5a880 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php index fcddbf5e7..5cb52bec3 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php index 5f068be90..0e1ccaf4f 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.7-0.1.8.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.7-0.1.8.php index ee567b2fc..73f20f320 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.7-0.1.8.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.7-0.1.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.8-0.1.9.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.8-0.1.9.php index 59c5d4b1f..faefb646a 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.8-0.1.9.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.8-0.1.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.9-0.1.10.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.9-0.1.10.php index 8daa14ee1..8297963fe 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.9-0.1.10.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.9-0.1.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index cdbe6c77d..fbb0d0e8b 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php index 66fd16abc..e0fd51f5f 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php index 01d50c2fe..ea4165c6a 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Block/Captcha.php b/app/code/core/Mage/Captcha/Block/Captcha.php index b6000b286..0964c2be6 100644 --- a/app/code/core/Mage/Captcha/Block/Captcha.php +++ b/app/code/core/Mage/Captcha/Block/Captcha.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Block/Captcha/Zend.php b/app/code/core/Mage/Captcha/Block/Captcha/Zend.php index cda2d2ed3..fa0c687b7 100644 --- a/app/code/core/Mage/Captcha/Block/Captcha/Zend.php +++ b/app/code/core/Mage/Captcha/Block/Captcha/Zend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Helper/Data.php b/app/code/core/Mage/Captcha/Helper/Data.php index e6b3e1254..91e25b7eb 100644 --- a/app/code/core/Mage/Captcha/Helper/Data.php +++ b/app/code/core/Mage/Captcha/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Config/Font.php b/app/code/core/Mage/Captcha/Model/Config/Font.php index 61d46083e..e0cefed5f 100644 --- a/app/code/core/Mage/Captcha/Model/Config/Font.php +++ b/app/code/core/Mage/Captcha/Model/Config/Font.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Config/Form/Abstract.php b/app/code/core/Mage/Captcha/Model/Config/Form/Abstract.php index 35e4ae19a..4500d39ae 100644 --- a/app/code/core/Mage/Captcha/Model/Config/Form/Abstract.php +++ b/app/code/core/Mage/Captcha/Model/Config/Form/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Config/Form/Backend.php b/app/code/core/Mage/Captcha/Model/Config/Form/Backend.php index c9d66241a..515d12ec8 100644 --- a/app/code/core/Mage/Captcha/Model/Config/Form/Backend.php +++ b/app/code/core/Mage/Captcha/Model/Config/Form/Backend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php b/app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php index e6cf2b78d..b29ab34c7 100644 --- a/app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php +++ b/app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Config/Mode.php b/app/code/core/Mage/Captcha/Model/Config/Mode.php index 6a18bb56b..71d56a3c1 100644 --- a/app/code/core/Mage/Captcha/Model/Config/Mode.php +++ b/app/code/core/Mage/Captcha/Model/Config/Mode.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Interface.php b/app/code/core/Mage/Captcha/Model/Interface.php index 170bdbd77..868eee90e 100644 --- a/app/code/core/Mage/Captcha/Model/Interface.php +++ b/app/code/core/Mage/Captcha/Model/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Observer.php b/app/code/core/Mage/Captcha/Model/Observer.php index de038f969..c074259ab 100644 --- a/app/code/core/Mage/Captcha/Model/Observer.php +++ b/app/code/core/Mage/Captcha/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Resource/Log.php b/app/code/core/Mage/Captcha/Model/Resource/Log.php index 39f0c9a8c..670c7317a 100644 --- a/app/code/core/Mage/Captcha/Model/Resource/Log.php +++ b/app/code/core/Mage/Captcha/Model/Resource/Log.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Zend.php b/app/code/core/Mage/Captcha/Model/Zend.php index 5755a4411..3becf5018 100644 --- a/app/code/core/Mage/Captcha/Model/Zend.php +++ b/app/code/core/Mage/Captcha/Model/Zend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php b/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php index 1db79569a..bb26b8ea2 100644 --- a/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php +++ b/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/controllers/RefreshController.php b/app/code/core/Mage/Captcha/controllers/RefreshController.php index 39abbf71e..2e6f546d5 100644 --- a/app/code/core/Mage/Captcha/controllers/RefreshController.php +++ b/app/code/core/Mage/Captcha/controllers/RefreshController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/etc/config.xml b/app/code/core/Mage/Captcha/etc/config.xml index e4a05f8a5..36ab5e048 100644 --- a/app/code/core/Mage/Captcha/etc/config.xml +++ b/app/code/core/Mage/Captcha/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Captcha/etc/system.xml b/app/code/core/Mage/Captcha/etc/system.xml index 92597a6b3..8012a0df2 100644 --- a/app/code/core/Mage/Captcha/etc/system.xml +++ b/app/code/core/Mage/Captcha/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Captcha/sql/captcha_setup/install-1.7.0.0.0.php b/app/code/core/Mage/Captcha/sql/captcha_setup/install-1.7.0.0.0.php index 1bfe51b46..e3204993f 100644 --- a/app/code/core/Mage/Captcha/sql/captcha_setup/install-1.7.0.0.0.php +++ b/app/code/core/Mage/Captcha/sql/captcha_setup/install-1.7.0.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /* @var $installer Mage_Core_Model_Resource_Setup */ diff --git a/app/code/core/Mage/Catalog/Block/Breadcrumbs.php b/app/code/core/Mage/Catalog/Block/Breadcrumbs.php index 8aa779d85..690843466 100644 --- a/app/code/core/Mage/Catalog/Block/Breadcrumbs.php +++ b/app/code/core/Mage/Catalog/Block/Breadcrumbs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Category/View.php b/app/code/core/Mage/Catalog/Block/Category/View.php index e8a452d5e..c8eea5d7c 100644 --- a/app/code/core/Mage/Catalog/Block/Category/View.php +++ b/app/code/core/Mage/Catalog/Block/Category/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Category/Widget/Link.php b/app/code/core/Mage/Catalog/Block/Category/Widget/Link.php index 35e7e6987..23ea27a82 100644 --- a/app/code/core/Mage/Catalog/Block/Category/Widget/Link.php +++ b/app/code/core/Mage/Catalog/Block/Category/Widget/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php index f51422529..366af4653 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php index 8e79b2ca5..ad964ed2c 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php index 81b83dfac..cad7f20de 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php index 98a8f7550..6d08ab8d6 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php index 31072e4ab..673cdd80b 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Layer/State.php b/app/code/core/Mage/Catalog/Block/Layer/State.php index d77e579a1..0ae02da9d 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/State.php +++ b/app/code/core/Mage/Catalog/Block/Layer/State.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Layer/View.php b/app/code/core/Mage/Catalog/Block/Layer/View.php index be7765134..0c71648de 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/View.php +++ b/app/code/core/Mage/Catalog/Block/Layer/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Navigation.php b/app/code/core/Mage/Catalog/Block/Navigation.php index 0eba1ca07..d2b549422 100644 --- a/app/code/core/Mage/Catalog/Block/Navigation.php +++ b/app/code/core/Mage/Catalog/Block/Navigation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product.php b/app/code/core/Mage/Catalog/Block/Product.php index 1bfbf732d..01fcc0188 100644 --- a/app/code/core/Mage/Catalog/Block/Product.php +++ b/app/code/core/Mage/Catalog/Block/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Abstract.php index de0a3d41b..99c8fea9a 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php index ae02e72c2..9e8400cd6 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/List.php b/app/code/core/Mage/Catalog/Block/Product/Compare/List.php index f88c16e18..c447194b7 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Compare/List.php +++ b/app/code/core/Mage/Catalog/Block/Product/Compare/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php index e7cc7bad3..4b8888e0a 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php +++ b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Gallery.php b/app/code/core/Mage/Catalog/Block/Product/Gallery.php index 2e5e03d20..5953227c7 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Gallery.php +++ b/app/code/core/Mage/Catalog/Block/Product/Gallery.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/List.php b/app/code/core/Mage/Catalog/Block/Product/List.php index 39db5768a..088617acd 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List.php +++ b/app/code/core/Mage/Catalog/Block/Product/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php index 666fef082..6994cb2de 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php b/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php index f4b512294..1ac4ce45f 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Catalog_Block_Product_List_Promotion extends Mage_Catalog_Block_Product_List diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Random.php b/app/code/core/Mage/Catalog/Block/Product/List/Random.php index 5ff7e2f9c..5f75c56fb 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Random.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Random.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Related.php b/app/code/core/Mage/Catalog/Block/Product/List/Related.php index d8b4a127b..b8f140674 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Related.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Related.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php index 9ff69dfbf..2f82989c6 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php index f818fc114..7ab8e9630 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/New.php b/app/code/core/Mage/Catalog/Block/Product/New.php index c26c0298a..a08fdd0c9 100644 --- a/app/code/core/Mage/Catalog/Block/Product/New.php +++ b/app/code/core/Mage/Catalog/Block/Product/New.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Price.php b/app/code/core/Mage/Catalog/Block/Product/Price.php index cf7aa8291..cde7ff381 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Price.php +++ b/app/code/core/Mage/Catalog/Block/Product/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Price/Template.php b/app/code/core/Mage/Catalog/Block/Product/Price/Template.php index b36ac15b5..5ec49478d 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Price/Template.php +++ b/app/code/core/Mage/Catalog/Block/Product/Price/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Send.php b/app/code/core/Mage/Catalog/Block/Product/Send.php index 89d97f4a4..beecd5ba9 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Send.php +++ b/app/code/core/Mage/Catalog/Block/Product/Send.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View.php b/app/code/core/Mage/Catalog/Block/Product/View.php index 8c75b628f..b58237282 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View.php +++ b/app/code/core/Mage/Catalog/Block/Product/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -141,7 +141,7 @@ public function getJsonConfig() return Mage::helper('core')->jsonEncode($config); } - $_request = Mage::getSingleton('tax/calculation')->getDefaultRateRequest(); + $_request = Mage::getSingleton('tax/calculation')->getRateRequest(false, false, false); /* @var $product Mage_Catalog_Model_Product */ $product = $this->getProduct(); $_request->setProductClassId($product->getTaxClassId()); @@ -165,12 +165,10 @@ public function getJsonConfig() $_tierPrices = array(); $_tierPricesInclTax = array(); foreach ($product->getTierPrice() as $tierPrice) { - $_tierPrices[] = Mage::helper('core')->currency( - Mage::helper('tax')->getPrice($product, (float)$tierPrice['website_price'], false) - $_priceExclTax - , false, false); + $_tierPrices[] = Mage::helper('core')->currency($tierPrice['website_price'], false, false); $_tierPricesInclTax[] = Mage::helper('core')->currency( - Mage::helper('tax')->getPrice($product, (float)$tierPrice['website_price'], true) - $_priceInclTax - , false, false); + Mage::helper('tax')->getPrice($product, (int)$tierPrice['website_price'], true), + false, false); } $config = array( 'productId' => $product->getId(), diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php index 7f45b0309..20436b11b 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Additional.php b/app/code/core/Mage/Catalog/Block/Product/View/Additional.php index 8c74361d0..0c0f27b98 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Additional.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Additional.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php index 78f3cf019..da065ef84 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Description.php b/app/code/core/Mage/Catalog/Block/Product/View/Description.php index ddf950932..0f850467f 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Description.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Description.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Media.php b/app/code/core/Mage/Catalog/Block/Product/View/Media.php index 74363e272..ae14826a3 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Media.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Media.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options.php b/app/code/core/Mage/Catalog/Block/Product/View/Options.php index 9d49d47fe..88c245e91 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php index 949af0d8d..285c0587d 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php index 96375737f..59defccd3 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php index 92715cd61..1f59c9ae3 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php index a3c97f373..c6d38c829 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php index 55efd41e2..9fef8fc06 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php index e55ac4cf6..1c7bab4fd 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Price.php b/app/code/core/Mage/Catalog/Block/Product/View/Price.php index 083ec5429..e1bf3592f 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Price.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php index 4d8bf8f40..716cd87ce 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php index 81617558e..bdb63fa8f 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -230,7 +230,7 @@ public function getJsonConfig() $taxCalculation->setCustomer(Mage::registry('current_customer')); } - $_request = $taxCalculation->getDefaultRateRequest(); + $_request = $taxCalculation->getRateRequest(false, false, false); $_request->setProductClassId($currentProduct->getTaxClassId()); $defaultTax = $taxCalculation->getRate($_request); diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php index d16e5afad..3da3aa168 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php index 87a388958..8d8d26cad 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php index ae787e64d..96758eec0 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php b/app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php index b30fe79d6..e7d63c812 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php +++ b/app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Widget/Link.php b/app/code/core/Mage/Catalog/Block/Product/Widget/Link.php index 8c3f74666..4baf33fe5 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Widget/Link.php +++ b/app/code/core/Mage/Catalog/Block/Product/Widget/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Widget/New.php b/app/code/core/Mage/Catalog/Block/Product/Widget/New.php index 3248ddffc..5643b2215 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Widget/New.php +++ b/app/code/core/Mage/Catalog/Block/Product/Widget/New.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php index 8c35ba3ba..49d67c325 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php index fc2e83d9e..2daf2e67f 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php index 8e24af4b4..3f1497270 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php index d53fc0bf2..0e2f00b87 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php index 808002543..e566231d0 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Widget/Link.php b/app/code/core/Mage/Catalog/Block/Widget/Link.php index bff082981..2737a8e79 100644 --- a/app/code/core/Mage/Catalog/Block/Widget/Link.php +++ b/app/code/core/Mage/Catalog/Block/Widget/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Exception.php b/app/code/core/Mage/Catalog/Exception.php index c96025fb0..92cb7159a 100644 --- a/app/code/core/Mage/Catalog/Exception.php +++ b/app/code/core/Mage/Catalog/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Category.php b/app/code/core/Mage/Catalog/Helper/Category.php index a4985274a..1044c7943 100644 --- a/app/code/core/Mage/Catalog/Helper/Category.php +++ b/app/code/core/Mage/Catalog/Helper/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Category/Flat.php b/app/code/core/Mage/Catalog/Helper/Category/Flat.php index c1b1b4254..bf32740fe 100644 --- a/app/code/core/Mage/Catalog/Helper/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Helper/Category/Flat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php index 6ac6813b1..19bdf00d8 100644 --- a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php +++ b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php index 7ddc287b5..97f8ac5d5 100644 --- a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php +++ b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Data.php b/app/code/core/Mage/Catalog/Helper/Data.php index c96bf4882..1c27136f7 100644 --- a/app/code/core/Mage/Catalog/Helper/Data.php +++ b/app/code/core/Mage/Catalog/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Flat/Abstract.php b/app/code/core/Mage/Catalog/Helper/Flat/Abstract.php index 523db682d..3fd8c299e 100644 --- a/app/code/core/Mage/Catalog/Helper/Flat/Abstract.php +++ b/app/code/core/Mage/Catalog/Helper/Flat/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Image.php b/app/code/core/Mage/Catalog/Helper/Image.php index d0eada683..52b3930e5 100644 --- a/app/code/core/Mage/Catalog/Helper/Image.php +++ b/app/code/core/Mage/Catalog/Helper/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Map.php b/app/code/core/Mage/Catalog/Helper/Map.php index 826fd5d8c..f3d8d29b7 100644 --- a/app/code/core/Mage/Catalog/Helper/Map.php +++ b/app/code/core/Mage/Catalog/Helper/Map.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Output.php b/app/code/core/Mage/Catalog/Helper/Output.php index 272e273a3..3eb71dae6 100644 --- a/app/code/core/Mage/Catalog/Helper/Output.php +++ b/app/code/core/Mage/Catalog/Helper/Output.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product.php b/app/code/core/Mage/Catalog/Helper/Product.php index 8cdab44e1..0afe5aafe 100644 --- a/app/code/core/Mage/Catalog/Helper/Product.php +++ b/app/code/core/Mage/Catalog/Helper/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Compare.php b/app/code/core/Mage/Catalog/Helper/Product/Compare.php index 8f2eb7a24..95549d3af 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Compare.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Compare.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Configuration.php b/app/code/core/Mage/Catalog/Helper/Product/Configuration.php index a8e3fed41..58c7bcd39 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Configuration.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Configuration.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php b/app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php index a273e4b32..889581c21 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Flat.php b/app/code/core/Mage/Catalog/Helper/Product/Flat.php index 4236507de..2215e9d66 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Flat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Options.php b/app/code/core/Mage/Catalog/Helper/Product/Options.php index 2d09824a6..83aa7c155 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Options.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Options.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url.php b/app/code/core/Mage/Catalog/Helper/Product/Url.php index ed3e58e74..625b99a93 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php index 647bc368a..b0e6d2330 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php index ab2deb151..9a80be5ef 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/View.php b/app/code/core/Mage/Catalog/Helper/Product/View.php index 26491cab5..52c8c0b9b 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/View.php +++ b/app/code/core/Mage/Catalog/Helper/Product/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Abstract.php b/app/code/core/Mage/Catalog/Model/Abstract.php index 2d31510ca..bdc3eea77 100644 --- a/app/code/core/Mage/Catalog/Model/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api/Resource.php b/app/code/core/Mage/Catalog/Model/Api/Resource.php index 3962f6481..20a312a81 100644 --- a/app/code/core/Mage/Catalog/Model/Api/Resource.php +++ b/app/code/core/Mage/Catalog/Model/Api/Resource.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product.php b/app/code/core/Mage/Catalog/Model/Api2/Product.php index 8a7874008..f8e9c1093 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Category.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category.php index 698a1c6e5..13f68dcbb 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php index edc653ce4..89eea95e4 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php index 1d3fae34c..5e38ca585 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.php index 9100de1df..7d7f7ed49 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.php index d4d285f7d..7f56bdedc 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image.php index 7e04281d5..0be8c1a0a 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php index d0dfd6b77..0c03a52bb 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php index bbc41bfad..8929b5e45 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.php index b6c220282..378f74fba 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.php index 7506a5453..a1dda50bd 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php index 6fa5e9810..62f8c039e 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php index d9b457213..197a8a691 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -278,14 +278,9 @@ protected function _getPrice($price, $includingTax = null, $shippingAddress = nu } } if ($taxClassId && $priceIncludesTax) { - $taxHelper = Mage::helper('tax'); - if ($taxHelper->isCrossBorderTradeEnabled($store)) { - $includingPercent = $percent; - } else { - $request = Mage::getSingleton('tax/calculation')->getDefaultRateRequest($store); - $includingPercent = Mage::getSingleton('tax/calculation') - ->getRate($request->setProductClassId($taxClassId)); - } + $request = Mage::getSingleton('tax/calculation')->getRateRequest(false, false, false, $store); + $includingPercent = Mage::getSingleton('tax/calculation') + ->getRate($request->setProductClassId($taxClassId)); } if ($percent === false || is_null($percent)) { diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php index 61947ab95..7f4defc96 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.php index a24c4ed14..642c21e0d 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.php index 43d39f975..3a430bb05 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php index 297131b90..a7c9404aa 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Website.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website.php index bf4f35bc8..0a57958b6 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php index 44cba5094..b97193685 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.php index b44f7a206..18456e56a 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php index 19b1e5227..d64b3dc60 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php index 25a81a4f1..516258acc 100644 --- a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php +++ b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php index 5338bea63..e9c790a27 100644 --- a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php index 8fbcf014f..035de28cc 100644 --- a/app/code/core/Mage/Catalog/Model/Category.php +++ b/app/code/core/Mage/Catalog/Model/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Api.php b/app/code/core/Mage/Catalog/Model/Category/Api.php index 498edb2cb..6efd48aaa 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Api.php +++ b/app/code/core/Mage/Catalog/Model/Category/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Api/V2.php b/app/code/core/Mage/Catalog/Model/Category/Api/V2.php index 81de183d1..a8a947ef8 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Category/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php index 5b24caee2..b0a4aa781 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php index cb5cf9465..e9936e854 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php index c1f2af162..96e9a31a2 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php index beb699865..497511759 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php index 61f9bdb57..105e0fa3e 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php index bc368c5e5..366dc6d0d 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php index 7d468f10d..9adf261ff 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php index 63527305d..c07ee20c5 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php index 5c0e85b93..407281bac 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php index d297f88e7..e0a79d538 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php index 08bf98169..3bd521934 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php +++ b/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Url.php b/app/code/core/Mage/Catalog/Model/Category/Url.php index c565ec75c..94a333af6 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Url.php +++ b/app/code/core/Mage/Catalog/Model/Category/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Config.php b/app/code/core/Mage/Catalog/Model/Config.php index 7550d03fa..ce7a98e6c 100644 --- a/app/code/core/Mage/Catalog/Model/Config.php +++ b/app/code/core/Mage/Catalog/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Convert.php b/app/code/core/Mage/Catalog/Model/Convert.php index c74baae21..bc9b1c5ff 100644 --- a/app/code/core/Mage/Catalog/Model/Convert.php +++ b/app/code/core/Mage/Catalog/Model/Convert.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php index 7344a6239..fb41be767 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php index 60b388e46..0572740dc 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php index 0fd78e0f3..3b27b06eb 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Design.php b/app/code/core/Mage/Catalog/Model/Design.php index 08f324b65..a9325e4c7 100644 --- a/app/code/core/Mage/Catalog/Model/Design.php +++ b/app/code/core/Mage/Catalog/Model/Design.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Entity/Attribute.php b/app/code/core/Mage/Catalog/Model/Entity/Attribute.php index 580429263..c5ee7171e 100644 --- a/app/code/core/Mage/Catalog/Model/Entity/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Entity/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php index 44d515a70..a688c3762 100644 --- a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php +++ b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php index fdd518d25..28c5c5e64 100644 --- a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Factory.php b/app/code/core/Mage/Catalog/Model/Factory.php index 6a473c799..c4a8bc954 100644 --- a/app/code/core/Mage/Catalog/Model/Factory.php +++ b/app/code/core/Mage/Catalog/Model/Factory.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Index.php b/app/code/core/Mage/Catalog/Model/Index.php index 7f8923607..9bd790b22 100644 --- a/app/code/core/Mage/Catalog/Model/Index.php +++ b/app/code/core/Mage/Catalog/Model/Index.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Indexer/Url.php b/app/code/core/Mage/Catalog/Model/Indexer/Url.php index d81cb5897..10a01ffd8 100644 --- a/app/code/core/Mage/Catalog/Model/Indexer/Url.php +++ b/app/code/core/Mage/Catalog/Model/Indexer/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer.php b/app/code/core/Mage/Catalog/Model/Layer.php index 0b4f484ae..6a8d02134 100644 --- a/app/code/core/Mage/Catalog/Model/Layer.php +++ b/app/code/core/Mage/Catalog/Model/Layer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php index 375940ba1..dee6ddd61 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php index b1edd0dcb..82b4ec370 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php index e5a6f7aac..b098f2b71 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php index a84b1404e..eb545aeeb 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php index 6c7de2674..9958051a5 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php index 0a5a8ba75..234ec9280 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -229,7 +229,7 @@ protected function _getCacheKey() . '_ATTR_' . $this->getAttributeModel()->getAttributeCode() . '_LOC_' ; - $taxReq = Mage::getSingleton('tax/calculation')->getDefaultRateRequest(); + $taxReq = Mage::getSingleton('tax/calculation')->getRateRequest(false, false, false); $key.= implode('_', $taxReq->getData()); return $key; diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php index 21b2833d3..30ad47b71 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/State.php b/app/code/core/Mage/Catalog/Model/Layer/State.php index c401eea17..48d1018d1 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/State.php +++ b/app/code/core/Mage/Catalog/Model/Layer/State.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Observer.php b/app/code/core/Mage/Catalog/Model/Observer.php index 57dea3450..66fef8c77 100644 --- a/app/code/core/Mage/Catalog/Model/Observer.php +++ b/app/code/core/Mage/Catalog/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php index 5a4f832f6..b1a45629a 100644 --- a/app/code/core/Mage/Catalog/Model/Product.php +++ b/app/code/core/Mage/Catalog/Model/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -1940,12 +1940,7 @@ public function processBuyRequest(Varien_Object $buyRequest) /* add product custom options data */ $customOptions = $buyRequest->getOptions(); if (is_array($customOptions)) { - foreach ($customOptions as $key => $value) { - if ($value === '') { - unset($customOptions[$key]); - } - } - $options->setOptions($customOptions); + $options->setOptions(array_diff($buyRequest->getOptions(), array(''))); } /* add product type selected options data */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Action.php b/app/code/core/Mage/Catalog/Model/Product/Action.php index 2ba1c8a5b..1273c3545 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Action.php +++ b/app/code/core/Mage/Catalog/Model/Product/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -80,11 +80,6 @@ public function updateAttributes($productIds, $attrData, $storeId) Mage::getSingleton('index/indexer')->processEntityAction( $this, Mage_Catalog_Model_Product::ENTITY, Mage_Index_Model_Event::TYPE_MASS_ACTION ); - - Mage::dispatchEvent('catalog_product_attribute_update_after', array( - 'product_ids' => $productIds, - )); - return $this; } diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php index 2c4efccfc..8004ca7ff 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php index eaf01249e..317927873 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php index d42addc57..5b795184c 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php index eed24b1f8..becf38ddf 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Boolean.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Boolean.php index d2e1fe07a..769d4e8a8 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Boolean.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Boolean.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php index 0c4213499..e05f67335 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php index 637a59933..0a758ec9e 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php index a6a50e197..7c53ce563 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Msrp.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Msrp.php index d0522178b..8322d808a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Msrp.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Msrp.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php index b66e441cc..a0fb8b6ff 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php index e5bcca94c..9c51eb102 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php index fda88ccaf..69af44a26 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php index 95c8e3cbf..bb12670a5 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php @@ -20,13 +20,13 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * - * Start Date attribute backend + * Speical Start Date attribute backend * * @category Mage * @package Mage_Catalog @@ -48,6 +48,10 @@ protected function _getValueForSave($object) if ($startDate === false) { return false; } + if ($startDate == '' && $object->getSpecialPrice()) { + $startDate = Mage::app()->getLocale()->date(); + } + return $startDate; } @@ -64,6 +68,8 @@ public function beforeSave($object) if ($startDate === false) { return $this; } + + $object->setData($this->getAttribute()->getName(), $startDate); parent::beforeSave($object); return $this; } diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate/Specialprice.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate/Specialprice.php deleted file mode 100644 index 26ec3b65e..000000000 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate/Specialprice.php +++ /dev/null @@ -1,77 +0,0 @@ - - */ - -class Mage_Catalog_Model_Product_Attribute_Backend_Startdate_Specialprice - extends Mage_Catalog_Model_Product_Attribute_Backend_Startdate -{ - /** - * Get attribute value for save. - * - * @param Varien_Object $object - * @return string|bool - */ - protected function _getValueForSave($object) - { - $attributeName = $this->getAttribute()->getName(); - $startDate = $object->getData($attributeName); - if ($startDate === false) { - return false; - } - if ($startDate == '' && $object->getSpecialPrice()) { - $startDate = Mage::app()->getLocale()->date(); - } - - return $startDate; - } - - /** - * Before save hook. - * Prepare attribute value for save - * - * @param Varien_Object $object - * @return Mage_Catalog_Model_Product_Attribute_Backend_Startdate - */ - public function beforeSave($object) - { - $startDate = $this->_getValueForSave($object); - if ($startDate === false) { - return $this; - } - - $object->setData($this->getAttribute()->getName(), $startDate); - parent::beforeSave($object); - return $this; - } -} diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php index 1060be6ff..3241264e2 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php index 2b3433537..2086ac08b 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php index 360a72f68..3eb50a54e 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php index 88efc908d..5a997a430 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php index a31e0161a..d68c7f534 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php index 944cdc2fc..a3ce49e50 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php index 3d5a234cb..00e3f861e 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php index 37cdf9cd8..09a5093ad 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Boolean.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Boolean.php index 24020f442..6f062931d 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Boolean.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Boolean.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php index 5d0a34036..f79dd1b5b 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php index 99b2785f7..be581257d 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php index 8fe839892..e609d9d84 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.php index 1d1c8459d..39c22f6f8 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php index b759453c9..e76421826 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Price.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Price.php index fb4cac10c..efc7f874d 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php index 2fc8bc0a6..31f7b0b22 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php index ec2bcc7b4..c8a13566f 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php index 29828ebf9..a8b4b8fcb 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/List.php b/app/code/core/Mage/Catalog/Model/Product/Compare/List.php index 29e58beac..299cd88c2 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Compare/List.php +++ b/app/code/core/Mage/Catalog/Model/Product/Compare/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Condition.php b/app/code/core/Mage/Catalog/Model/Product/Condition.php index 162ed6a96..c624371ee 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Condition.php +++ b/app/code/core/Mage/Catalog/Model/Product/Condition.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php b/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php index 47e093c15..a5f63baaa 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php +++ b/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Interface.php b/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Interface.php index 9aa153020..cba967f8e 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Interface.php +++ b/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option.php b/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option.php index 06f8d8d0d..abbe6ee40 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option.php +++ b/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option/Interface.php b/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option/Interface.php index bfa5373d6..5417a3ec5 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option/Interface.php +++ b/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php index 1cabb2d67..dcc58e8e1 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php index 4082a4873..d8593142d 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php index d6d8a436e..74312dd31 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Image.php b/app/code/core/Mage/Catalog/Model/Product/Image.php index b2ba542dc..f66aaab48 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Image.php +++ b/app/code/core/Mage/Catalog/Model/Product/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php index 986d4cb40..c798b0f3a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php +++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -61,15 +61,6 @@ class Mage_Catalog_Model_Product_Indexer_Eav extends Mage_Index_Model_Indexer_Ab ) ); - /** - * The list of attributes that have an effect on other attributes - * - * @var array - */ - protected $_dependentAttributes = array( - 'status' - ); - /** * Retrieve Indexer name * @@ -149,21 +140,6 @@ protected function _attributeIsIndexable($attribute) return $attribute->isIndexable(); } - /** - * Check that attribute has an effects on other attributes - * - * @param Mage_Catalog_Model_Resource_Eav_Attribute|string $attribute - * @return bool - */ - protected function _attributeIsDependent($attribute) - { - if ($attribute instanceof Mage_Catalog_Model_Resource_Eav_Attribute) { - $attribute = $attribute->getAttributeCode(); - } - - return in_array($attribute, $this->_dependentAttributes); - } - /** * Register data required by process in event object * @@ -178,9 +154,7 @@ protected function _registerCatalogProductSaveEvent(Mage_Index_Model_Event $even $reindexEav = $product->getForceReindexRequired(); foreach ($attributes as $attribute) { $attributeCode = $attribute->getAttributeCode(); - if (($this->_attributeIsIndexable($attribute) || $this->_attributeIsDependent($attribute)) - && $product->dataHasChangedFor($attributeCode) - ) { + if ($this->_attributeIsIndexable($attribute) && $product->dataHasChangedFor($attributeCode)) { $reindexEav = true; break; } @@ -220,20 +194,15 @@ protected function _registerCatalogProductDeleteEvent(Mage_Index_Model_Event $ev */ protected function _registerCatalogProductMassActionEvent(Mage_Index_Model_Event $event) { + $reindexEav = false; + /* @var $actionObject Varien_Object */ $actionObject = $event->getDataObject(); - $attrData = $actionObject->getAttributesData(); - $reindexEav = false; - - // check if force reindex required - if (isset($attrData['force_reindex_required']) && $attrData['force_reindex_required']) { - $reindexEav = true; - } - // check if attributes changed + $attrData = $actionObject->getAttributesData(); if (is_array($attrData)) { foreach (array_keys($attrData) as $attributeCode) { - if ($this->_attributeIsIndexable($attributeCode) || $this->_attributeIsDependent($attributeCode)) { + if ($this->_attributeIsIndexable($attributeCode)) { $reindexEav = true; break; } diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php index 28d76a8d6..16c30af36 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Catalog_Model_Product_Indexer_Flat extends Mage_Index_Model_Indexer_Abstract diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php index 57ed8e3c6..505f75b73 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Link.php b/app/code/core/Mage/Catalog/Model/Product/Link.php index 63bdd49b3..c027302dd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Link.php +++ b/app/code/core/Mage/Catalog/Model/Product/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Link/Api.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api.php index 2e1dafd27..75de58d08 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Link/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Link/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php index 77812a30b..dff10f4dc 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Media/Config.php b/app/code/core/Mage/Catalog/Model/Product/Media/Config.php index 5772b3333..e269ddcd1 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Media/Config.php +++ b/app/code/core/Mage/Catalog/Model/Product/Media/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option.php b/app/code/core/Mage/Catalog/Model/Product/Option.php index 9b28bc6fe..2ff069dc4 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Api.php b/app/code/core/Mage/Catalog/Model/Product/Option/Api.php index 09b8f0303..f7774ac52 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.php index 4e2c8bb69..a55fc9dbf 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php b/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php index 1eea084ac..e99a84a25 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php index 6dfe51239..c99071359 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php index 94f01557c..6c8f923ae 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php index 60a5395c1..a938172cd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php index 36b4a36c9..44551ef65 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php index efa1691ad..d9985e3b1 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php index 142f25a16..a7684e725 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api.php index ff89a604c..ad715bd36 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php index f421fcbfe..d6d6af37f 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Status.php b/app/code/core/Mage/Catalog/Model/Product/Status.php index d6d9f02ef..8f2345f55 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Product/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type.php b/app/code/core/Mage/Catalog/Model/Product/Type.php index b23152588..1f6cfbef6 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php index ea8893215..b64322605 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Api.php b/app/code/core/Mage/Catalog/Model/Product/Type/Api.php index a218ed9f4..937dc7b8e 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php index 551bf16b9..91fbb69f0 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php index 6a0966909..14ed0788e 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php index cc6fdd49e..c365f7fa2 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php index df80dac13..3104b214c 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php index ab60723d3..59f22185b 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php index 07d3a632a..6c67aef36 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php index b3405ddf8..ff49ef1a6 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php index a1d80b3d5..8b25b1af7 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php index 70f6c88a1..3d981476a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Url.php b/app/code/core/Mage/Catalog/Model/Product/Url.php index bd92a8bd0..30560fa30 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Url.php +++ b/app/code/core/Mage/Catalog/Model/Product/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Visibility.php b/app/code/core/Mage/Catalog/Model/Product/Visibility.php index bd2401b54..7761c2c50 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Visibility.php +++ b/app/code/core/Mage/Catalog/Model/Product/Visibility.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Website.php b/app/code/core/Mage/Catalog/Model/Product/Website.php index bea742b16..faf88bb59 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Product/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Abstract.php index 95699dfa7..d1d782992 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Attribute.php index ab8f1682c..664c38e06 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category.php b/app/code/core/Mage/Catalog/Model/Resource/Category.php index 07c65546b..ac6362344 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php index 066678c24..fbce1d904 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php index 6e4c80298..fb55812d5 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Layout.php index a55c6c32b..e26d5c4cd 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Layout.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Layout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Mode.php index c34ab6158..de8e00138 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Mode.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Mode.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Page.php index 91f36db6e..ea6889b0e 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Page.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php index 74714a1d1..48e11bedf 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php index 02d960a86..3ba6907de 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php index 3ad49dbb1..ae30add3b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php index 22df45c19..8f4b14bd0 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php index bfe331372..c793ba7ab 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php index f067d1d07..b7ec4a9a0 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Config.php b/app/code/core/Mage/Catalog/Model/Resource/Config.php index bb6380c61..08df25c55 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Config.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php index 7342a11b3..2ee52cdc6 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php index bfdc12704..eeee2b782 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php index fa852ce0b..d216eae36 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php index 377aa5410..b441e4a0a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php index 7d6608cb5..4aabca6a7 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php index fec552689..fe862d933 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php index a1d340eab..81c0b0530 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php index ec5bdea2a..36b3dea0c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php index c71744390..3148493d9 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php index 97d562f95..741c737b8 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php index 6379f9436..b553a1293 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php index 56381aa5a..f2a1ae05b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php index 65917254f..d557c0549 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php index 95f8b17c2..463a3d20a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php index 8d0efe735..c4bb2c465 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php index a95bcfbc1..b37114f82 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php index dedf73f02..7f7fb9375 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php index 455fed29b..38ceb9c93 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php index a0e4c12a7..f134c9b8e 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php index af6bbe4f5..908f1075a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php index f01cf104a..e23163a5b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php index deecdcf0e..b60b2db22 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php index 638594d40..5630eff72 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php index b2db86138..c5b74d69d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php index 451a54198..72594598d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php index a114bbe2a..8f372dd7f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php index f4dd22474..106ce34b2 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php index 5c50a1d1d..7f796eea2 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php index 1a3daee75..1c0777df5 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php index 89ba79ac0..54d521d0b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php index 01ef49794..621ff7fec 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php index 5d4438119..501a86383 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php index 96fa2b3f9..9ad9467bf 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php index babd160e5..c75508863 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php index 2224d3642..a3cf326d8 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php index 65f42c28b..8defdebfa 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php index 8b9b29492..d41170f0c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php index 38fe274d3..c498a9082 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php index 19bf247bb..38c410518 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php index d24789322..a3dd92abb 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php index f0e557bc4..e4ac19b06 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php index f204065c0..4efe3fe89 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php index c374bdcf9..526b88a1e 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php index 3e956fb58..8b935ed55 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php index 9d6656fe0..a03e4558c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php index 3f422e8c4..ee93b4b4d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php index c28067484..83a9b3cab 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php index 578521fad..60ed7782a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php index f2991f7a6..d6f251565 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php index 5516a7724..25044e952 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php index 514584818..5448cc577 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php index 03d488fe5..bef7fab57 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php index ac4cee52f..d96959622 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php index a087be04d..79bb3406a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php index ce6377dc6..9e3c4fafd 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php index fb4e94477..dadcd3627 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php index 7c0810b9b..0c349aa18 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php index d9f6cf062..8f8f06c4f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php index 390c8a47d..27cf9150c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php index 74edad06e..25ec781d2 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php index 00e5fec82..cc22e09f3 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Catalog/Model/Resource/Helper/Mysql4.php index 4f68bb1ee..eb67e3270 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Helper/Mysql4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php index 1f5075a23..3a691181d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php index fdffe754d..00cc54bac 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php index 1ba0462e1..1029728cb 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Product.php index e0b2555c2..166b4d0a3 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Action.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Action.php index dd610b69f..a34d7ae20 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Action.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php index 4c8273785..cacbab793 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php index 5ce890dac..ceba98c84 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php index e232d3842..edf562d23 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php index d593e7c09..e06c1f64a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php index 67e421960..8b2cf892f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php index e7bfb449f..f9a773262 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php index 6166d8ba0..d932e23d8 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php index 2fa89b421..1830cacc1 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php index 642a55fd6..20573d53e 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php index 5e1206985..d123fe72d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php index 65452795d..212dcc06a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php index 612253f93..d82b36ea3 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php index 1bb06c038..4506245d5 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -234,7 +234,7 @@ public function getMainTable() public function isBuilt($storeView = null) { if ($storeView === null) { - $storeId = Mage::app()->getAnyStoreView()->getId(); + $storeId = Mage::app()->getDefaultStoreView()->getId(); } elseif (is_int($storeView)) { $storeId = $storeView; } else { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php index 05f6c1545..5744699f6 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Abstract.php index f98f6fb08..8e6c68015 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php index 87ac217d5..6f95c0e7b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php index 3a831fc2f..7733b524c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php index 3ce53eec7..53f6862f4 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php index f2ce8ef37..915d2398d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -121,9 +121,6 @@ protected function _prepareSelectIndex($entityIds = null, $attributeId = null) ) ->where('s.store_id != 0'); - $statusCond = $adapter->quoteInto(' = ?', Mage_Catalog_Model_Product_Status::STATUS_ENABLED); - $this->_addAttributeToSelect($subSelect, 'status', 'd.entity_id', 's.store_id', $statusCond); - if (!is_null($entityIds)) { $subSelect->where('d.entity_id IN(?)', $entityIds); } diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php index f7d45424c..881f3b86b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php index dae4b0fb8..dd7772474 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -165,10 +165,9 @@ protected function _applyConfigurableOption() array('le' => $this->getTable('catalog/product')), 'le.entity_id = l.product_id', array()) + ->where('le.required_options=0') ->group(array('l.parent_id', 'i.customer_group_id', 'i.website_id', 'l.product_id')); - $this->_addWebsiteJoinToSelect($select, true); - $this->_addProductWebsiteJoinToSelect($select, 'cw.website_id', 'le.entity_id'); $priceExpression = $write->getCheckSql('apw.value_id IS NOT NULL', 'apw.pricing_value', 'apd.pricing_value'); $percentExpr = $write->getCheckSql('apw.value_id IS NOT NULL', 'apw.is_percent', 'apd.is_percent'); @@ -193,9 +192,6 @@ protected function _applyConfigurableOption() 'group_price' => $groupPriceColumn, )); - $statusCond = $write->quoteInto(' = ?', Mage_Catalog_Model_Product_Status::STATUS_ENABLED); - $this->_addAttributeToSelect($select, 'status', 'le.entity_id', 'cs.store_id', $statusCond); - $query = $select->insertFromSelect($coaTable); $write->query($query); @@ -231,22 +227,6 @@ protected function _applyConfigurableOption() $query = $select->crossUpdateFromSelect($table); $write->query($query); - $select = $write->select() - ->from($table) - ->join( - array('e' => $this->getTable('catalog/product')), - 'e.entity_id = i.entity_id', - array()) - ->joinLeft( - array('coa' => $coaTable), - 'coa.parent_id = i.entity_id', - array()) - ->where('e.type_id = ?', $this->getTypeId()) - ->where('coa.parent_id IS NULL'); - - $query = $select->deleteFromSelect('i'); - $write->query($query); - $write->delete($coaTable); $write->delete($copTable); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php index 47be31e16..df1da0e51 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php index 03a988bbd..e09f3d064 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,7 +81,7 @@ protected function _prepareGroupedProductPriceData($entityIds = null) $select = $write->select() ->from(array('e' => $this->getTable('catalog/product')), 'entity_id') - ->join( + ->joinLeft( array('l' => $this->getTable('catalog/product_link')), 'e.entity_id = l.product_id AND l.link_type_id=' . Mage_Catalog_Model_Product_Link::LINK_TYPE_GROUPED, array()) @@ -94,11 +94,11 @@ protected function _prepareGroupedProductPriceData($entityIds = null) $minCheckSql = $write->getCheckSql('le.required_options = 0', 'i.min_price', 0); $maxCheckSql = $write->getCheckSql('le.required_options = 0', 'i.max_price', 0); $select->columns('website_id', 'cw') - ->join( + ->joinLeft( array('le' => $this->getTable('catalog/product')), 'le.entity_id = l.linked_product_id', array()) - ->join( + ->joinLeft( array('i' => $table), 'i.entity_id = l.linked_product_id AND i.website_id = cw.website_id' . ' AND i.customer_group_id = cg.customer_group_id', @@ -115,9 +115,6 @@ protected function _prepareGroupedProductPriceData($entityIds = null) ->group(array('e.entity_id', 'cg.customer_group_id', 'cw.website_id')) ->where('e.type_id=?', $this->getTypeId()); - $statusCond = $write->quoteInto(' = ?', Mage_Catalog_Model_Product_Status::STATUS_ENABLED); - $this->_addAttributeToSelect($select, 'status', 'e.entity_id', 'cs.store_id', $statusCond); - if (!is_null($entityIds)) { $select->where('l.product_id IN(?)', $entityIds); } diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php index 8a21729b7..03e1c7994 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php index 8ace4e8b0..b49428c42 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php index 4943ca3b4..2a1ad5b49 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php index 203de518d..f48015ff8 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php index 759990eca..0eaef1c8d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Collection.php index 5c2face22..8a5e48f74 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php index e7fddc5f7..bc460fb75 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php index d397ad943..61ece9fff 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Relation.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Relation.php index 33f47b013..0d94eb399 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Relation.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Relation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php index fdd58e205..fd451c185 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php index 376fbfa6a..23c7f07ad 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php index b13bb23fa..1cd8279ff 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php index 77b3296a3..95adf59a8 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Product/Collection.php index 68c981ecd..998390eba 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php index 1e2282737..42b0a2cee 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Setup.php b/app/code/core/Mage/Catalog/Model/Resource/Setup.php index d56e2f517..880341e0f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Setup.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -772,7 +772,7 @@ public function getDefaultEntities() 'input' => 'select', 'source' => 'catalog/entity_product_attribute_design_options_container', 'required' => false, - 'default' => 'container1', + 'default' => 'container2', 'sort_order' => 6, 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE, 'group' => 'Design', diff --git a/app/code/core/Mage/Catalog/Model/Resource/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Url.php index c7b4832cc..772978b34 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Url.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Session.php b/app/code/core/Mage/Catalog/Model/Session.php index 97094a1fe..bf1ebf96d 100644 --- a/app/code/core/Mage/Catalog/Model/Session.php +++ b/app/code/core/Mage/Catalog/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php index 518616d9b..7f1115235 100644 --- a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php index e2b347a26..49363368c 100644 --- a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php index 7740f0d1e..b6ac3aa0b 100644 --- a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php +++ b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Template/Filter.php b/app/code/core/Mage/Catalog/Model/Template/Filter.php index 1b4209b64..51ebb1851 100644 --- a/app/code/core/Mage/Catalog/Model/Template/Filter.php +++ b/app/code/core/Mage/Catalog/Model/Template/Filter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php index c3e8048ae..62866a0d6 100644 --- a/app/code/core/Mage/Catalog/Model/Url.php +++ b/app/code/core/Mage/Catalog/Model/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/controllers/CategoryController.php b/app/code/core/Mage/Catalog/controllers/CategoryController.php index 906a8bb1d..d5e46657d 100644 --- a/app/code/core/Mage/Catalog/controllers/CategoryController.php +++ b/app/code/core/Mage/Catalog/controllers/CategoryController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/controllers/IndexController.php b/app/code/core/Mage/Catalog/controllers/IndexController.php index e89d05303..5fc729dc8 100644 --- a/app/code/core/Mage/Catalog/controllers/IndexController.php +++ b/app/code/core/Mage/Catalog/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/controllers/Product/CompareController.php b/app/code/core/Mage/Catalog/controllers/Product/CompareController.php index 2b4bd4983..ec250e068 100644 --- a/app/code/core/Mage/Catalog/controllers/Product/CompareController.php +++ b/app/code/core/Mage/Catalog/controllers/Product/CompareController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/controllers/ProductController.php b/app/code/core/Mage/Catalog/controllers/ProductController.php index 2d75afa44..513c407e3 100644 --- a/app/code/core/Mage/Catalog/controllers/ProductController.php +++ b/app/code/core/Mage/Catalog/controllers/ProductController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php index d1a5a8738..e88ce95f5 100644 --- a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php +++ b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php index 16fb4320b..98011e040 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php index 2bded9fd1..9c94ed136 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php index 6daee125d..f38f5262d 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var $installer Mage_Catalog_Model_Resource_Setup */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php index 6d51c2679..2af071f7e 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php index f4fcc4787..82a603f4f 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/etc/adminhtml.xml b/app/code/core/Mage/Catalog/etc/adminhtml.xml index bc4af2805..4d7f33bd5 100644 --- a/app/code/core/Mage/Catalog/etc/adminhtml.xml +++ b/app/code/core/Mage/Catalog/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/api.xml b/app/code/core/Mage/Catalog/etc/api.xml index 80de66134..75cc992ff 100644 --- a/app/code/core/Mage/Catalog/etc/api.xml +++ b/app/code/core/Mage/Catalog/etc/api.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/api2.xml b/app/code/core/Mage/Catalog/etc/api2.xml index 78874d2ae..89e187445 100644 --- a/app/code/core/Mage/Catalog/etc/api2.xml +++ b/app/code/core/Mage/Catalog/etc/api2.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/config.xml b/app/code/core/Mage/Catalog/etc/config.xml index 84ee0d3be..5d530dbc7 100644 --- a/app/code/core/Mage/Catalog/etc/config.xml +++ b/app/code/core/Mage/Catalog/etc/config.xml @@ -21,14 +21,14 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - 1.6.0.0.19 + 1.6.0.0.18 @@ -789,9 +789,9 @@ grid-list - 12,24,36 + 9,15,30 5,10,15,20,25 - 12 + 9 10 0 position diff --git a/app/code/core/Mage/Catalog/etc/convert.xml b/app/code/core/Mage/Catalog/etc/convert.xml index cc7f8de46..1bb48c229 100644 --- a/app/code/core/Mage/Catalog/etc/convert.xml +++ b/app/code/core/Mage/Catalog/etc/convert.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/system.xml b/app/code/core/Mage/Catalog/etc/system.xml index 6cc76295b..8b149f5f4 100644 --- a/app/code/core/Mage/Catalog/etc/system.xml +++ b/app/code/core/Mage/Catalog/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/widget.xml b/app/code/core/Mage/Catalog/etc/widget.xml index 9fe3c62e9..69c394637 100644 --- a/app/code/core/Mage/Catalog/etc/widget.xml +++ b/app/code/core/Mage/Catalog/etc/widget.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php index 240dbf1a6..0ced7e052 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.57-0.7.58.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.57-0.7.58.php index b76e0c697..5e91b9707 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.57-0.7.58.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.57-0.7.58.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.63-0.7.64.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.63-0.7.64.php index 0055201da..aebe87a22 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.63-0.7.64.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.63-0.7.64.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php index 0316e2f77..a65c0f176 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php index 86dc22ebe..95b067f9a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php index 5432a53bb..720dbad00 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php index a8823e0a1..d386fa050 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php index 7482c5c23..3a211b3a0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php index 7c7d93f23..a0f9d6252 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php index 38e79cea4..c09149d8a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php index 55e4c4e0a..e9049c655 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php index 11e08754e..71893039b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php index fbd96d0ea..2662c3040 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php index 4dab153f4..6d104222b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup()->run(" diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php index c0f1b3e96..2379a13e4 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php index 11e08754e..71893039b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php index 970658153..07a92b57f 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php index 56ea74d85..bfe5a6478 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php index 55e4c4e0a..e9049c655 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php index 1244cbbf6..dcc8288c1 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php index 814cbb915..6a0d4268b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php index f06cb1848..2f1bf6cde 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php index 68bb00fda..7050014d9 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php index 9f22269c2..9fe1aa077 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php index 38745629e..f7357c843 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php index 38745629e..f7357c843 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php index c47aa149a..107de2d45 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php index b7192e6d8..cbaebc03d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php index bd3b8da3c..de600666d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php index 4f33fc5dd..0bdbc3919 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php index 44d964a15..970f19f93 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php index eb964c7c8..1be01035e 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php index f7b265de3..f6adb2a95 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php index d8df1f3d3..141e9ce83 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php index 7e24feeff..2df2c2ad0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php index 73a2f487a..da7474449 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php index 256dc88ee..16f669c51 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php index 0a7a437b3..119d2938f 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php index 25407bae7..48cb268de 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php index 483e85e18..2dc28eb06 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php index b688f86a9..81d6e1e4b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php index 93d17405a..47f786de7 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php index 439e70050..18caf6098 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php index 7f7e37ebf..e5926c273 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php index a653ad804..92ec4641c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php index b52255ac8..b14ebe3b1 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php index 37d0ac723..57d5b1685 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php index fa0614662..e5b3e577c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php index 9b9abb2c9..0a2980e06 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php index 8ba9bd4da..2d639b9a0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php index d3e3082a0..8cbe15949 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php index 256ff6c8c..e017e219c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php index 4cb126a35..be2bae64a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php index 300bebbd7..3cd943a1e 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php index 471a4f882..e01d8ffe6 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php index 970f8d19c..5f1bf2e8c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php index 79bf60a7c..04943717e 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php index a9278ecd5..8066206c4 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php index ccdc1939d..97daf703b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php index 2616f0310..5708aeb84 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php index 0554dea09..d595d3cf0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php index 55e4c4e0a..e9049c655 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php index 19c2e932a..676aa9cf9 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php index 6b9413055..c9d0ca283 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php index 72c94e234..024b15f65 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php index 2521e04f0..604481411 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php index 2df85fc91..b8bc9d3c2 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php index aaf71d791..ef5cb1095 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php index 5a6eccb9e..6eca8e7dc 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php index 3365dd510..ab2d1407a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php index 7fe871681..75c11ff54 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php index 632a89a3c..d621927d0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php index f3894ff5f..0ab26c495 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php index 17a2916ef..2e75cc419 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.71-0.7.72.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.71-0.7.72.php index 50766324a..f42a09f7e 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.71-0.7.72.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.71-0.7.72.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.72-0.7.73.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.72-0.7.73.php index 8c2d645f3..09fe37ebf 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.72-0.7.73.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.72-0.7.73.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.73-1.4.0.0.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.73-1.4.0.0.0.php index 99874bd13..ac5ab3f5c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.73-1.4.0.0.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.73-1.4.0.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php index 9da484226..d134fed23 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php index 2a9569e65..7e4914bdb 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php index 110cd8326..89b886a3d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php index 30ed68f37..33597767b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php index 260de5363..6261d00d9 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php index 21d595cd8..e2299ec70 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php index 5c64f52c9..90a1ebbd6 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php index c92e6a96d..9213a23b7 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php index 58de80104..4db5c7285 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php @@ -20,6 +20,6 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php index c6f45f1e1..fe7862257 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php index 84cbe0de7..3ee42cddd 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php index 38e535d37..742804060 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php index e4b04f15b..935e37ed5 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php index 1c5ddac4e..a9ccd273c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php index 70fc4f899..2eed4758d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php index ad51f5335..c58f068d6 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php index 6e6e94761..2883b7a59 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php index 6d75d27f2..9d9b46c77 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php index 59bbe56d7..dfffa5bfe 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php index 15aaf8131..d2a43234b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php index 900a775e1..b162918b7 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php index afaa52c8a..0565f7f1b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php index 869196a45..faaf296e2 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php index 8c2fd5a4f..bdf92fe99 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php index f0beb2293..db0aa4131 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php index f4066ebab..73afcf02f 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php index c7ef8d516..edcca4ced 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php index 875ff3c5a..3481df982 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php index 94c3a2ba4..2bec159d3 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php index 9b481f154..bf117889a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php index 449af0f82..6ac31b71e 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php index ff32633c6..2835e62dd 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php index bc57e5f7c..68168c8eb 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php index 861d35a29..eda86a541 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php index 29d419484..37387c618 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php index 87c0d0004..9437df667 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php index bd0dfd577..235fea8a0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php index 0480062e5..de098e573 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php index 51a5e9073..57e74a3bf 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php index bdb5989ae..22cb0aa84 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php index 0d6312cb7..0cd3986d0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php index 9bfdc3401..561790211 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php index 4633481b9..576fd7375 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index ae54fb1a7..dd0ccb83e 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php index dcceeb272..5cd832a8a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php index 4a8395fe4..9efe0bef0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php index 698fad888..d004dfd85 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php index ee8362e59..f1cd34c9d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php index 561a90191..032e99125 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php index 3f739aa8f..4f5648694 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php index 08fc39ee5..9edc750f4 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php deleted file mode 100644 index 25cb3d366..000000000 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php +++ /dev/null @@ -1,34 +0,0 @@ -updateAttribute( - Mage_Catalog_Model_Product::ENTITY, - 'special_from_date', - 'backend_model', - 'catalog/product_attribute_backend_startdate_specialprice' -); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php index db10259a6..1a0ba909d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php index ddbf58830..444af5677 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php index 29ba4cebc..a6cbf805c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php index 41778b39c..0bcf7c6f1 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php index 35fc18523..875070c1c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php index cf7b8f841..e1ccbe623 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php index f7190f227..870d58511 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Aggregation.php index 9d90661fa..c0364e78d 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Aggregation.php +++ b/app/code/core/Mage/CatalogIndex/Model/Aggregation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Attribute.php index 3ea5f82e1..5b3353400 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Attribute.php +++ b/app/code/core/Mage/CatalogIndex/Model/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php index 0a24f358a..910e3b13a 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php +++ b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php index 08b16c871..e9ca7e4d6 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php +++ b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php index 4791cb370..e0187d592 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php index 74b1b55e5..81a01bfe2 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php index ed4ff3c23..8d3d5816e 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php index 61b679744..d52357405 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php index 538512558..e4b40b0ae 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Indexer.php index c51060d7b..9f87ad76c 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php index c3d9de527..621ed896e 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php index 1ef285791..27bc9d451 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php index 96dcdc23f..991d430bf 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php index fbe6edb94..f2bbb87d0 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php index ef091ca68..6f28beaf5 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php index fa3da7523..6fa080fe2 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php index 780de2c77..fc9668fd1 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php index aa4e425e0..91a642078 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php index 0e072100a..4cfa3fb52 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php index 945f3852a..4185fdaa8 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php index 253ed7466..1fd14ef6c 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php index 32e836f05..9c6d06638 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php index b06f130ac..dc4f7481b 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php index 5fb943231..939a75c3d 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php index 7a11a87d6..20a3a65c2 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php index a1f744a1a..72d8e47c6 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php index cae53853e..de5703c89 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php index b44c8caaa..25163c30a 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php index 79d1c653f..f17c0c0d5 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php index 8d3a2de9e..986044a4a 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Observer.php b/app/code/core/Mage/CatalogIndex/Model/Observer.php index 818ab115b..b9d45ad2f 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Observer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Price.php b/app/code/core/Mage/CatalogIndex/Model/Price.php index 3d1d500ce..a1b6ccda1 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Abstract.php index 963431824..56d417960 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php index bc1e5ce67..a4e1b664d 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php index 040b9ed37..c7f479792 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php index 16f308d75..130729ba3 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Configurable.php index 726e36543..b1bdb9dec 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Configurable.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php index c47efde4e..7e0fc8440 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php index 58f91c599..602173a87 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php index 2b860c7ef..0eb9ba030 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php index 0f6885b2a..2f5b6b71c 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Minimalprice.php index b68974e60..cc7ef2230 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Minimalprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Minimalprice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Price.php index f872131b9..5f3ab9474 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Price.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Price.php index 5cb68db33..b5c236561 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Retreiver.php index bbe0b1a3d..fd9dc778a 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Retreiver.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Retreiver.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php index 0b981a713..3bda04679 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Retreiver.php index 6c686f444..599f48ba5 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Retreiver.php +++ b/app/code/core/Mage/CatalogIndex/Model/Retreiver.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/etc/config.xml b/app/code/core/Mage/CatalogIndex/etc/config.xml index 6a1b901fe..4303d56da 100644 --- a/app/code/core/Mage/CatalogIndex/etc/config.xml +++ b/app/code/core/Mage/CatalogIndex/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php index 9d36a4bcf..25420515e 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php index ab320f347..a082e9300 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php index 0cd2f5f53..d58f4d041 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php index 465e93ade..ee1a612fa 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php index 7292235a1..cacb8025e 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php index cbf17f377..888bb5afd 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php index 76080fac9..9cb176e40 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php index cb0f6157f..bfc0a5899 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php index 639355a63..dad7b59aa 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php index de8ba69b7..71dcf6886 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php index 5ad68aa99..2ca123c44 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php index 82330d481..cbe7b0445 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 9cb461c09..0fe126920 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogIndex - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php b/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php index f0c33e6cd..c1397cc73 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php +++ b/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php b/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php index f9cfdf66b..68ce67aa5 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php +++ b/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php b/app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php index 378571617..4f92ca3ef 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php +++ b/app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php index 6f5cbab10..dab56f5bb 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Composite.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Composite.php index 73654d468..da58666e6 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Composite.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Composite.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php index 2ba270190..0c7562844 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Configurable.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Configurable.php index 2583a7aee..ccaf3b968 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Configurable.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php index 57f45484d..2167229bc 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Helper/Data.php b/app/code/core/Mage/CatalogInventory/Helper/Data.php index 7bc359f9b..4e606133d 100644 --- a/app/code/core/Mage/CatalogInventory/Helper/Data.php +++ b/app/code/core/Mage/CatalogInventory/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php b/app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php index 518cbd696..a13bae4c7 100644 --- a/app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php +++ b/app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item.php index 0920fc145..63f2c0161 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php index afb6a2f8c..54ec9ce86 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php +++ b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php index 04a8b77ba..73d7749bb 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php +++ b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php index 0226971b2..1c70c96b8 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php index fa9a0fb71..b40362a1c 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php index d62c5cb75..a9976c5df 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php index eaec07fa9..6a3d015c2 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php index 8680787dc..1913e5141 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php index 4353ff2b3..46bcb2cd2 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php index 1db7aa94e..734a5ac2b 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php index 3d65d0796..7ef72dee7 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php index 02062ae70..79b545c20 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php index a6cacc467..7a9671cd5 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php index 240bf47b2..e3ac3994d 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Observer.php b/app/code/core/Mage/CatalogInventory/Model/Observer.php index c094784ce..3a4af2ed9 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Observer.php +++ b/app/code/core/Mage/CatalogInventory/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -896,35 +896,6 @@ public function prepareCatalogProductIndexSelect(Varien_Event_Observer $observer return $this; } - /** - * Add stock status filter to select - * - * @param Varien_Event_Observer $observer - * @return Mage_CatalogInventory_Model_Observer - */ - public function addStockStatusFilterToSelect(Varien_Event_Observer $observer) - { - $select = $observer->getEvent()->getSelect(); - $entityField = $observer->getEvent()->getEntityField(); - $websiteField = $observer->getEvent()->getWebsiteField(); - - if ($entityField === null || $websiteField === null) { - return $this; - } - - if (!($entityField instanceof Zend_Db_Expr)) { - $entityField = new Zend_Db_Expr($entityField); - } - if (!($websiteField instanceof Zend_Db_Expr)) { - $websiteField = new Zend_Db_Expr($websiteField); - } - - Mage::getResourseSingleton('cataloginventory/stock_status') - ->prepareCatalogProductIndexSelect($select, $entityField, $websiteField); - - return $this; - } - /** * Lock DB rows for order products * diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php index a637fa643..503d73db0 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Configurable.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Configurable.php index 49d1a8eee..25b05f1f2 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Configurable.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Default.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Default.php index 785a75941..64c265e8b 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Default.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php index c80939aa0..66539a257 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Interface.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Interface.php index ade4d0abc..fd43dc95e 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Interface.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php index c2f821d2d..e0b2130f1 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php index ffc0e3807..7582c58ad 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php index e8836ed1c..5187711bb 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php index 2ce955015..80f29fff8 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php b/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php index 83966e6dd..68493724f 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php +++ b/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php index 00a642e27..e3f6846db 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Stock.php index 5b1ca4658..0885b7a39 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php index 264ea93a2..4ec7c60b7 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php index 5e1e756a5..a3c8a453d 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php index 7a213c142..2d2bff6fe 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php index d0fbdc0dd..c791128a9 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minqty.php b/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minqty.php index 807f2d1bf..b6d286d78 100644 --- a/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minqty.php +++ b/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minqty.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php b/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php index 6cd97d0c9..8590dd50e 100644 --- a/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php +++ b/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php b/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php index ba8019c71..73458ac57 100644 --- a/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php +++ b/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml b/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml index a4dd95b27..7cb4ee4ee 100644 --- a/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml +++ b/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/etc/api.xml b/app/code/core/Mage/CatalogInventory/etc/api.xml index ece409eb0..09d224107 100644 --- a/app/code/core/Mage/CatalogInventory/etc/api.xml +++ b/app/code/core/Mage/CatalogInventory/etc/api.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/etc/api2.xml b/app/code/core/Mage/CatalogInventory/etc/api2.xml index 04df79d21..be8d80783 100644 --- a/app/code/core/Mage/CatalogInventory/etc/api2.xml +++ b/app/code/core/Mage/CatalogInventory/etc/api2.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/etc/config.xml b/app/code/core/Mage/CatalogInventory/etc/config.xml index 184033b43..83f022c1d 100644 --- a/app/code/core/Mage/CatalogInventory/etc/config.xml +++ b/app/code/core/Mage/CatalogInventory/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -230,14 +230,6 @@ - - - - cataloginventory/observer - prepareCatalogProductIndexSelect - - - diff --git a/app/code/core/Mage/CatalogInventory/etc/system.xml b/app/code/core/Mage/CatalogInventory/etc/system.xml index b600b57c9..09d972121 100644 --- a/app/code/core/Mage/CatalogInventory/etc/system.xml +++ b/app/code/core/Mage/CatalogInventory/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php index a86f63b95..ed303afe8 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php index e7e0a4c79..719e4534a 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php index 655a37acc..19a7d68b9 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php index 3859b2a99..2ae92ec0c 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php index 2bf8420e6..abc6a6077 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php index 6c27e2743..b8a455554 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php index a68080c0c..926c7a96e 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.5-0.7.6.php index 9818c2e24..25cf1ff12 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.6-0.7.7.php index 60b733d2b..4e34338df 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.7-0.7.8.php index 62d8b3df2..5fa6d6561 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index d369d988b..1ced2f883 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php index 4afdfe9ff..3447f05fc 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php index 115651541..0f7ce075c 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Helper/Data.php b/app/code/core/Mage/CatalogRule/Helper/Data.php index dcd3c877e..9e1e9bf1e 100644 --- a/app/code/core/Mage/CatalogRule/Helper/Data.php +++ b/app/code/core/Mage/CatalogRule/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php index 83fb0e0f8..3697dd311 100644 --- a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php +++ b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php index f841a048e..ee4aa266a 100644 --- a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php +++ b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Flag.php b/app/code/core/Mage/CatalogRule/Model/Flag.php index cf0c22ee0..b209b4bf1 100644 --- a/app/code/core/Mage/CatalogRule/Model/Flag.php +++ b/app/code/core/Mage/CatalogRule/Model/Flag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php index e945c7872..264a7d907 100644 --- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php +++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php index 163e6df72..004a85fac 100644 --- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php index d7607e048..40250aeff 100644 --- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php +++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php index e5d80492f..bb6c253fb 100644 --- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Observer.php b/app/code/core/Mage/CatalogRule/Model/Observer.php index 76795c39d..a968d0143 100644 --- a/app/code/core/Mage/CatalogRule/Model/Observer.php +++ b/app/code/core/Mage/CatalogRule/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php index 81c1637fb..155e791bf 100644 --- a/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php +++ b/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Collection.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Collection.php index 014b959df..a1630410c 100644 --- a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php index 99d0c5600..00e2dfb1d 100644 --- a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php +++ b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php index e00a2ddc9..75994b92b 100644 --- a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Rule.php b/app/code/core/Mage/CatalogRule/Model/Rule.php index 674687ba8..6e0a9c329 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -391,7 +391,7 @@ public function calcProductPriceRule(Mage_Catalog_Model_Product $product, $price $priceRules ? $priceRules : $price ); } else { - $priceRules = ($priceRules ? $priceRules : $price); + $priceRules = $price; } if ($ruleData['action_stop']) { break; @@ -459,7 +459,7 @@ protected function _invalidateCache() * * @return string */ - public function toString($format = '') + public function toString($format='') { return ''; } diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php index f66d90881..4fe6b8345 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php index a1257ac5e..fbbc8e416 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php index 19c8c7a43..d6119bbb5 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php index a020c0cf0..6849d3722 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,7 +40,7 @@ public function validate(Varien_Object $object) { $attrCode = $this->getAttribute(); if ('category_ids' == $attrCode) { - return $this->validateAttribute($object->getCategoryIds()); + return $this->validateAttribute($object->getAvailableInCategories()); } if ('attribute_set_id' == $attrCode) { return $this->validateAttribute($object->getData($attrCode)); diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php b/app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php index 64a970840..3062a4d9c 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/etc/adminhtml.xml b/app/code/core/Mage/CatalogRule/etc/adminhtml.xml index e7f55cae0..296802b74 100644 --- a/app/code/core/Mage/CatalogRule/etc/adminhtml.xml +++ b/app/code/core/Mage/CatalogRule/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogRule/etc/config.xml b/app/code/core/Mage/CatalogRule/etc/config.xml index 181b3a8bb..3bd4a6cfe 100644 --- a/app/code/core/Mage/CatalogRule/etc/config.xml +++ b/app/code/core/Mage/CatalogRule/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php index e9dcf3538..a2e8baa2c 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php index a39e926c2..c20e00d05 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php index 0535d882b..e221842fc 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php index 259d6f255..f58362293 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php index c3f735b56..ae9e99ed3 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php index 56d934c7b..e7b7bf66a 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php index 7ee9b026e..9c10aa7e5 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php index 4d9853508..5b76f27af 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php index c5c9f03af..bb4432c3f 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php index dcca41f24..cfacafbb0 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,8 +52,4 @@ $installer->getTable('core/website'), 'website_id', 'CASCADE', 'CASCADE' ); -$installer->run( - "ALTER TABLE `{$ruleGroupWebsiteTable}` ADD PRIMARY KEY ( `rule_id` , `customer_group_id`, `website_id` )" -); - -$installer->endSetup(); +$installer->run("ALTER TABLE `{$ruleGroupWebsiteTable}` ADD PRIMARY KEY ( `rule_id` , `customer_group_id`, `website_id` )"); diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.8-0.7.9.php index 137699122..c3bccb11d 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.9-0.7.10.php index 23d2e6672..760def1a9 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index c59e5ece0..a3a611a00 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php index 051a7bde0..8703320a5 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php index addc321b1..a8f22dfdb 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php index 9f735a4da..817a5e128 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php index 43813e479..04549b5ef 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php +++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php index 078231ea9..4a70fc787 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php +++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,12 +57,9 @@ public function setListOrders() { $availableOrders = $category->getAvailableSortByOptions(); unset($availableOrders['position']); - $availableOrders = array_merge(array( - 'relevance' => $this->__('Relevance') - ), $availableOrders); + $this->getChild('search_result_list') - ->setAvailableOrders($availableOrders) - ->setSortBy('relevance'); + ->setAvailableOrders($availableOrders); } public function setListModes() { diff --git a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php index 760455a75..16ddb91a3 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php +++ b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Layer.php b/app/code/core/Mage/CatalogSearch/Block/Layer.php index 2bdafc9a0..62b4ae708 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Layer.php +++ b/app/code/core/Mage/CatalogSearch/Block/Layer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php b/app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php index 27a1ce65f..6cd93bb05 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Result.php b/app/code/core/Mage/CatalogSearch/Block/Result.php index 14047294b..e1e933db0 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Result.php +++ b/app/code/core/Mage/CatalogSearch/Block/Result.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Term.php b/app/code/core/Mage/CatalogSearch/Block/Term.php index 2ab4fdc81..dbef3829c 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Term.php +++ b/app/code/core/Mage/CatalogSearch/Block/Term.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Helper/Data.php b/app/code/core/Mage/CatalogSearch/Helper/Data.php index 3743b08aa..8b79b54a5 100644 --- a/app/code/core/Mage/CatalogSearch/Helper/Data.php +++ b/app/code/core/Mage/CatalogSearch/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Advanced.php index 873e53909..5c3990cd2 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Advanced.php +++ b/app/code/core/Mage/CatalogSearch/Model/Advanced.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -163,9 +163,6 @@ public function addFilters($values) continue; } $value = $values[$attribute->getAttributeCode()]; - if (!is_array($value)) { - $value = trim($value); - } if ($attribute->getAttributeCode() == 'price') { $value['from'] = isset($value['from']) ? trim($value['from']) : ''; diff --git a/app/code/core/Mage/CatalogSearch/Model/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Fulltext.php index 630d35963..014f3a8be 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Fulltext.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php b/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php index df444eff6..e762bbe1f 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php +++ b/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php index adc88117c..4bb5fe590 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -277,17 +277,12 @@ protected function _registerCatalogProductEvent(Mage_Index_Model_Event $event) case Mage_Index_Model_Event::TYPE_MASS_ACTION: /* @var $actionObject Varien_Object */ $actionObject = $event->getDataObject(); - $attrData = $actionObject->getAttributesData(); - $rebuildIndex = false; - $reindexData = array(); - // check if force reindex required - if (isset($attrData['force_reindex_required']) && $attrData['force_reindex_required']) { - $rebuildIndex = true; - $reindexData['catalogsearch_force_reindex'] = $attrData['force_reindex_required']; - } + $reindexData = array(); + $rebuildIndex = false; // check if status changed + $attrData = $actionObject->getAttributesData(); if (isset($attrData['status'])) { $rebuildIndex = true; $reindexData['catalogsearch_status'] = $attrData['status']; @@ -394,10 +389,6 @@ protected function _processEvent(Mage_Index_Model_Event $event) } else if (!empty($data['catalogsearch_product_ids'])) { // mass action $productIds = $data['catalogsearch_product_ids']; - $parentIds = $this->_getResource()->getRelationsByChild($productIds); - if (!empty($parentIds)) { - $productIds = array_merge($productIds, $parentIds); - } if (!empty($data['catalogsearch_website_ids'])) { $websiteIds = $data['catalogsearch_website_ids']; diff --git a/app/code/core/Mage/CatalogSearch/Model/Layer.php b/app/code/core/Mage/CatalogSearch/Model/Layer.php index af9beb389..908c31549 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Layer.php +++ b/app/code/core/Mage/CatalogSearch/Model/Layer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php index 6eed0a131..1571ea328 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php index dd3cce65a..00a8da4de 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php index 0c70b52bd..2ed41cd45 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php index 9223481b1..c2f1b10ad 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php index f844d8875..d4afd3449 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php index dfc52c5c8..3da9afbcf 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php index 8006dffbf..9bc9081f5 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php index d037efba5..7d05d5dee 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php index 2d0400d29..7900dbf96 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php index 667390de6..1697387eb 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Query.php b/app/code/core/Mage/CatalogSearch/Model/Query.php index f5a790e56..5fff78d89 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Query.php +++ b/app/code/core/Mage/CatalogSearch/Model/Query.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php index ca3396812..2ec9cadb0 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced/Collection.php index 106c98f6e..f25ffe7f2 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,7 +53,8 @@ public function addFieldsToFilter($fields) if (!is_numeric($attributeId)) { $field = 't1.'.$attributeId; - } else { + } + else { $storeId = $this->getStoreId(); $onCondition = 't1.entity_id = t2.entity_id' . ' AND t1.attribute_id = t2.attribute_id' @@ -71,27 +72,31 @@ public function addFieldsToFilter($fields) $select->where('t1.entity_id = price_index.entity_id'); } - $field = $this->getConnection()->getIfNullSql('t2.value', 't1.value'); + $field = $this->getConnection()->getCheckSql('t2.value_id>0', 't2.value', 't1.value'); + } if (is_array($conditionValue)) { - if (isset($conditionValue['in'])) { + if (isset($conditionValue['in'])){ $conditionData[] = array('in' => $conditionValue['in']); - } elseif (isset($conditionValue['in_set'])) { + } + elseif (isset($conditionValue['in_set'])) { $conditionParts = array(); foreach ($conditionValue['in_set'] as $value) { $conditionParts[] = array('finset' => $value); } $conditionData[] = $conditionParts; - } elseif (isset($conditionValue['like'])) { + } + elseif (isset($conditionValue['like'])) { $conditionData[] = array ('like' => $conditionValue['like']); - } elseif (isset($conditionValue['from']) && isset($conditionValue['to'])) { + } + elseif (isset($conditionValue['from']) && isset($conditionValue['to'])) { $invalidDateMessage = Mage::helper('catalogsearch')->__('Specified date is invalid.'); if ($conditionValue['from']) { if (!Zend_Date::isDate($conditionValue['from'])) { Mage::throwException($invalidDateMessage); } - if (!is_numeric($conditionValue['from'])) { + if (!is_numeric($conditionValue['from'])){ $conditionValue['from'] = Mage::getSingleton('core/date') ->gmtDate(null, $conditionValue['from']); if (!$conditionValue['from']) { @@ -104,7 +109,7 @@ public function addFieldsToFilter($fields) if (!Zend_Date::isDate($conditionValue['to'])) { Mage::throwException($invalidDateMessage); } - if (!is_numeric($conditionValue['to'])) { + if (!is_numeric($conditionValue['to'])){ $conditionValue['to'] = Mage::getSingleton('core/date') ->gmtDate(null, $conditionValue['to']); if (!$conditionValue['to']) { @@ -113,11 +118,13 @@ public function addFieldsToFilter($fields) } $conditionData[] = array('lteq' => $conditionValue['to']); } + } } else { $conditionData[] = array('eq' => $conditionValue); } + foreach ($conditionData as $data) { $select->where($conn->prepareSqlCondition($field, $data)); } diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php index 185acf014..b3338066d 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -152,7 +152,6 @@ protected function _rebuildStoreIndex($storeId, $productIds = null) $statusVals = Mage::getSingleton('catalog/product_status')->getVisibleStatusIds(); $allowedVisibilityValues = $this->_engine->getAllowedVisibility(); - $websiteId = Mage::app()->getStore($storeId)->getWebsite()->getId(); $lastProductId = 0; while (true) { $products = $this->_getSearchableProducts($storeId, $staticFields, $productIds, $lastProductId); @@ -165,8 +164,7 @@ protected function _rebuildStoreIndex($storeId, $productIds = null) foreach ($products as $productData) { $lastProductId = $productData['entity_id']; $productAttributes[$productData['entity_id']] = $productData['entity_id']; - $productChildren = $this->_getProductChildrenIds($productData['entity_id'], - $productData['type_id'], $websiteId); + $productChildren = $this->_getProductChildIds($productData['entity_id'], $productData['type_id']); $productRelations[$productData['entity_id']] = $productChildren; if ($productChildren) { foreach ($productChildren as $productChildId) { @@ -196,25 +194,13 @@ protected function _rebuildStoreIndex($storeId, $productIds = null) $productData['entity_id'] => $productAttr ); - $hasChildren = false; if ($productChildren = $productRelations[$productData['entity_id']]) { foreach ($productChildren as $productChildId) { if (isset($productAttributes[$productChildId])) { - $productChildAttr = $productAttributes[$productChildId]; - if (!isset($productChildAttr[$status->getId()]) - || !in_array($productChildAttr[$status->getId()], $statusVals) - ) { - continue; - } - - $hasChildren = true; - $productIndex[$productChildId] = $productChildAttr; + $productIndex[$productChildId] = $productAttributes[$productChildId]; } } } - if (!is_null($productChildren) && !$hasChildren) { - continue; - } $index = $this->_prepareProductIndex($productIndex, $productData, $storeId); @@ -276,16 +262,6 @@ protected function _getSearchableProducts($storeId, array $staticFields, $produc ->limit($limit) ->order('e.entity_id'); - /** - * Add additional external limitation - */ - Mage::dispatchEvent('prepare_catalog_product_index_select', array( - 'select' => $select, - 'entity_field' => new Zend_Db_Expr('e.entity_id'), - 'website_field' => new Zend_Db_Expr('website.website_id'), - 'store_field' => $storeId - )); - $result = $writeAdapter->fetchAll($select); return $result; @@ -428,7 +404,7 @@ protected function _getSearchableAttributes($backendType = null) } $attributes = $productAttributeCollection->getItems(); - Mage::dispatchEvent('catalogsearch_searchable_attributes_load_after', array( + Mage::dispatchEvent('catelogsearch_searchable_attributes_load_after', array( 'engine' => $this->_engine, 'attributes' => $attributes )); @@ -512,13 +488,12 @@ protected function _getProductAttributes($storeId, array $productIds, array $att { $result = array(); $selects = array(); - $websiteId = Mage::app()->getStore($storeId)->getWebsiteId(); $adapter = $this->_getWriteAdapter(); $ifStoreValue = $adapter->getCheckSql('t_store.value_id > 0', 't_store.value', 't_default.value'); foreach ($attributeTypes as $backendType => $attributeIds) { if ($attributeIds) { $tableName = $this->getTable(array('catalog/product', $backendType)); - $select = $adapter->select() + $selects[] = $adapter->select() ->from( array('t_default' => $tableName), array('entity_id', 'attribute_id')) @@ -533,18 +508,6 @@ protected function _getProductAttributes($storeId, array $productIds, array $att ->where('t_default.store_id=?', 0) ->where('t_default.attribute_id IN (?)', $attributeIds) ->where('t_default.entity_id IN (?)', $productIds); - - /** - * Add additional external limitation - */ - Mage::dispatchEvent('prepare_catalog_product_index_select', array( - 'select' => $select, - 'entity_field' => new Zend_Db_Expr('t_default.entity_id'), - 'website_field' => $websiteId, - 'store_field' => new Zend_Db_Expr('t_store.store_id') - )); - - $selects[] = $select; } } @@ -580,12 +543,11 @@ protected function _getProductTypeInstance($typeId) /** * Return all product children ids * - * @param $productId - * @param $typeId - * @param null|int $websiteId - * @return array|null + * @param int $productId Product Entity Id + * @param string $typeId Super Product Link Type + * @return array */ - protected function _getProductChildrenIds($productId, $typeId, $websiteId = null) + protected function _getProductChildIds($productId, $typeId) { $typeInstance = $this->_getProductTypeInstance($typeId); $relation = $typeInstance->isComposite() @@ -597,35 +559,16 @@ protected function _getProductChildrenIds($productId, $typeId, $websiteId = null ->from( array('main' => $this->getTable($relation->getTable())), array($relation->getChildFieldName())) - ->where("main.{$relation->getParentFieldName()} = ?", $productId); + ->where("{$relation->getParentFieldName()}=?", $productId); if (!is_null($relation->getWhere())) { $select->where($relation->getWhere()); } - - Mage::dispatchEvent('prepare_product_children_id_list_select', array( - 'select' => $select, - 'entity_field' => 'main.product_id', - 'website_field' => $websiteId - )); - return $this->_getReadAdapter()->fetchCol($select); } return null; } - /** - * Return all product children ids - * - * @param int $productId Product Entity Id - * @param string $typeId Super Product Link Type - * @return array|null - */ - protected function _getProductChildIds($productId, $typeId) - { - return $this->_getProductChildrenIds($productId, $typeId); - } - /** * Retrieve Product Emulator (Varien Object) * diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php index 8247ab97a..4fc49732d 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php index b9de47e73..adc726e86 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php index 9dee0d855..0d474a47e 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php index e2ab28806..38dd72b31 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Query.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Query.php index ebe801f8a..ec90a9051 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Query.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Query.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,25 +52,13 @@ protected function _construct() */ public function loadByQuery(Mage_Core_Model_Abstract $object, $value) { - $readAdapter = $this->_getReadAdapter(); - $select = $readAdapter->select(); - - $synonymSelect = clone $select; - $synonymSelect + $select = $this->_getReadAdapter()->select() ->from($this->getMainTable()) - ->where('store_id = ?', $object->getStoreId()); - - $querySelect = clone $synonymSelect; - $querySelect->where('query_text = ?', $value); - - $synonymSelect->where('synonym_for = ?', $value); - - $select->union(array($querySelect, "($synonymSelect)"), Zend_Db_Select::SQL_UNION_ALL) + ->where('synonym_for=? OR query_text=?', $value) + ->where('store_id=?', $object->getStoreId()) ->order('synonym_for ASC') ->limit(1); - - $data = $readAdapter->fetchRow($select); - if ($data) { + if ($data = $this->_getReadAdapter()->fetchRow($select)) { $object->setData($data); $this->_afterLoad($object); } diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php index ef4cd14e3..184afdc74 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php index b02971e0e..b13ecf235 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Session.php b/app/code/core/Mage/CatalogSearch/Model/Session.php index f2b23f26e..016c637c3 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Session.php +++ b/app/code/core/Mage/CatalogSearch/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php b/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php index cd301d79f..347ee9436 100644 --- a/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php +++ b/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php index c4e2bf3ee..fde86a894 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php b/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php index 5dfd95366..7f595400a 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/controllers/ResultController.php b/app/code/core/Mage/CatalogSearch/controllers/ResultController.php index 2344264cd..56dfdbd41 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/ResultController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/ResultController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/controllers/TermController.php b/app/code/core/Mage/CatalogSearch/controllers/TermController.php index e012ce067..64e30203e 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/TermController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/TermController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml b/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml index 1ad1dedaa..19a44d84b 100644 --- a/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml +++ b/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogSearch/etc/config.xml b/app/code/core/Mage/CatalogSearch/etc/config.xml index 63b416be9..797f36977 100644 --- a/app/code/core/Mage/CatalogSearch/etc/config.xml +++ b/app/code/core/Mage/CatalogSearch/etc/config.xml @@ -21,14 +21,14 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - 1.8.2.0 + 1.6.0.0 diff --git a/app/code/core/Mage/CatalogSearch/etc/system.xml b/app/code/core/Mage/CatalogSearch/etc/system.xml index 026d761fa..3b2bfbb41 100644 --- a/app/code/core/Mage/CatalogSearch/etc/system.xml +++ b/app/code/core/Mage/CatalogSearch/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php index b2c88f431..13d8ab160 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php index d199a84a3..b3a8eb52d 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php index 10a75542b..5c431a629 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php index 8020cee0a..8f3b53515 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php index 1ebce1dcc..380d4547e 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php index 3af1b51a7..b9d6a156a 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php index 41c0db505..f2ea2ae91 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php index aaef67918..b6b29fd4d 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 81780d305..f297c536e 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.0.php deleted file mode 100644 index d209bc3c1..000000000 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.0.php +++ /dev/null @@ -1,33 +0,0 @@ -getConnection(); - -$tableName = $installer->getTable('catalogsearch/search_query'); -$indexNameToCreate = $installer->getIdxName($tableName, array('synonym_for')); -$connection->addIndex($tableName, $indexNameToCreate, array('synonym_for')); diff --git a/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php index 61d9a67c9..398f39abf 100644 --- a/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php +++ b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Block/Adminhtml/Validation/Form.php b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation/Form.php index 15cf45b10..55c5506d5 100644 --- a/app/code/core/Mage/Centinel/Block/Adminhtml/Validation/Form.php +++ b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Block/Authentication.php b/app/code/core/Mage/Centinel/Block/Authentication.php index b7da0b790..006e5ab1a 100644 --- a/app/code/core/Mage/Centinel/Block/Authentication.php +++ b/app/code/core/Mage/Centinel/Block/Authentication.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Block/Authentication/Complete.php b/app/code/core/Mage/Centinel/Block/Authentication/Complete.php index 236f9daf6..b2f5b94b3 100644 --- a/app/code/core/Mage/Centinel/Block/Authentication/Complete.php +++ b/app/code/core/Mage/Centinel/Block/Authentication/Complete.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Block/Authentication/Start.php b/app/code/core/Mage/Centinel/Block/Authentication/Start.php index 7ba38a74f..564f1bced 100644 --- a/app/code/core/Mage/Centinel/Block/Authentication/Start.php +++ b/app/code/core/Mage/Centinel/Block/Authentication/Start.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Block/Logo.php b/app/code/core/Mage/Centinel/Block/Logo.php index ca71cd42f..b678d1324 100644 --- a/app/code/core/Mage/Centinel/Block/Logo.php +++ b/app/code/core/Mage/Centinel/Block/Logo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Helper/Data.php b/app/code/core/Mage/Centinel/Helper/Data.php index 34abd7ee6..82db8554e 100644 --- a/app/code/core/Mage/Centinel/Helper/Data.php +++ b/app/code/core/Mage/Centinel/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Model/Api.php b/app/code/core/Mage/Centinel/Model/Api.php index 2f600dc98..42c32e8c7 100644 --- a/app/code/core/Mage/Centinel/Model/Api.php +++ b/app/code/core/Mage/Centinel/Model/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Model/Config.php b/app/code/core/Mage/Centinel/Model/Config.php index e40e73367..7253ed38e 100644 --- a/app/code/core/Mage/Centinel/Model/Config.php +++ b/app/code/core/Mage/Centinel/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Model/Observer.php b/app/code/core/Mage/Centinel/Model/Observer.php index 675f35c5d..5866b1104 100644 --- a/app/code/core/Mage/Centinel/Model/Observer.php +++ b/app/code/core/Mage/Centinel/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Model/Service.php b/app/code/core/Mage/Centinel/Model/Service.php index 80509da20..f2813ef3c 100644 --- a/app/code/core/Mage/Centinel/Model/Service.php +++ b/app/code/core/Mage/Centinel/Model/Service.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Model/Session.php b/app/code/core/Mage/Centinel/Model/Session.php index 5a7f0c574..9728d3de8 100644 --- a/app/code/core/Mage/Centinel/Model/Session.php +++ b/app/code/core/Mage/Centinel/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Model/State/Jcb.php b/app/code/core/Mage/Centinel/Model/State/Jcb.php index 981cfbb13..10830acc7 100644 --- a/app/code/core/Mage/Centinel/Model/State/Jcb.php +++ b/app/code/core/Mage/Centinel/Model/State/Jcb.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Model/State/Mastercard.php b/app/code/core/Mage/Centinel/Model/State/Mastercard.php index 512d90636..2d9243a73 100644 --- a/app/code/core/Mage/Centinel/Model/State/Mastercard.php +++ b/app/code/core/Mage/Centinel/Model/State/Mastercard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Model/State/Visa.php b/app/code/core/Mage/Centinel/Model/State/Visa.php index 6e652c21a..7c912417e 100644 --- a/app/code/core/Mage/Centinel/Model/State/Visa.php +++ b/app/code/core/Mage/Centinel/Model/State/Visa.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Model/StateAbstract.php b/app/code/core/Mage/Centinel/Model/StateAbstract.php index 55b26e61e..72000cc98 100644 --- a/app/code/core/Mage/Centinel/Model/StateAbstract.php +++ b/app/code/core/Mage/Centinel/Model/StateAbstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php b/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php index 0d35da603..59f682d3c 100644 --- a/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php +++ b/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/controllers/IndexController.php b/app/code/core/Mage/Centinel/controllers/IndexController.php index e428ea25f..c89f55d75 100644 --- a/app/code/core/Mage/Centinel/controllers/IndexController.php +++ b/app/code/core/Mage/Centinel/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/etc/config.xml b/app/code/core/Mage/Centinel/etc/config.xml index fbc70b0d0..e719fca20 100644 --- a/app/code/core/Mage/Centinel/etc/config.xml +++ b/app/code/core/Mage/Centinel/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Centinel/etc/system.xml b/app/code/core/Mage/Centinel/etc/system.xml index 29f8a946f..eca3b62fc 100644 --- a/app/code/core/Mage/Centinel/etc/system.xml +++ b/app/code/core/Mage/Centinel/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/Block/Agreements.php b/app/code/core/Mage/Checkout/Block/Agreements.php index 75e07dce5..5be209a99 100644 --- a/app/code/core/Mage/Checkout/Block/Agreements.php +++ b/app/code/core/Mage/Checkout/Block/Agreements.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Checkout_Block_Agreements extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Checkout/Block/Cart.php b/app/code/core/Mage/Checkout/Block/Cart.php index 05af51960..f5b784f62 100644 --- a/app/code/core/Mage/Checkout/Block/Cart.php +++ b/app/code/core/Mage/Checkout/Block/Cart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Abstract.php b/app/code/core/Mage/Checkout/Block/Cart/Abstract.php index 9e58d8c2a..6615f40ce 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Abstract.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Coupon.php b/app/code/core/Mage/Checkout/Block/Cart/Coupon.php index acb2c7255..0fc042592 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Coupon.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Coupon.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php b/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php index d5f24f530..acedbf86c 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Configure.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Configure.php index a1f6a3e9d..d596eba56 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Configure.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Configure.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php index 812a03ff5..b672ec34a 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -229,39 +229,6 @@ public function getDeleteUrl() ); } - /** - * Get item ajax delete url - * - * @return string - */ - public function getAjaxDeleteUrl() - { - return $this->getUrl( - 'checkout/cart/ajaxDelete', - array( - 'id'=>$this->getItem()->getId(), - Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $this->helper('core/url')->getEncodedUrl(), - '_secure' => $this->_getApp()->getStore()->isCurrentlySecure(), - ) - ); - } - - /** - * Get item ajax update url - * - * @return string - */ - public function getAjaxUpdateUrl() - { - return $this->getUrl( - 'checkout/cart/ajaxUpdate', - array( - 'id'=>$this->getItem()->getId(), - Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $this->helper('core/url')->getEncodedUrl(), - '_secure' => $this->_getApp()->getStore()->isCurrentlySecure(), - ) - ); - } /** * Get quote item qty * @@ -480,16 +447,4 @@ public function getCacheTags() return array_merge(parent::getCacheTags(), $tags); } - - /** - * Returns true if user is going through checkout process now. - * - * @return bool - */ - public function isOnCheckoutPage() - { - $module = $this->getRequest()->getModuleName(); - $controller = $this->getRequest()->getControllerName(); - return $module == 'checkout' && ($controller == 'onepage' || $controller == 'multishipping'); - } } diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php index 4f1c5e794..8c19d2a56 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php index 16a36fc50..8adc63874 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Minicart.php b/app/code/core/Mage/Checkout/Block/Cart/Minicart.php deleted file mode 100644 index 928333f42..000000000 --- a/app/code/core/Mage/Checkout/Block/Cart/Minicart.php +++ /dev/null @@ -1,49 +0,0 @@ - - */ -class Mage_Checkout_Block_Cart_Minicart extends Mage_Checkout_Block_Cart_Abstract -{ - /** - * Get shopping cart items qty based on configuration (summary qty or items qty) - * - * @return int | float - */ - public function getSummaryCount() - { - if ($this->getData('summary_qty')) { - return $this->getData('summary_qty'); - } - return Mage::getSingleton('checkout/cart')->getSummaryQty(); - } -} diff --git a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php b/app/code/core/Mage/Checkout/Block/Cart/Shipping.php index f069ca8c1..9af1099f0 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php index 3e689a8de..5706478c5 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,10 +32,9 @@ * @package Mage_Checkout * @author Magento Core Team */ -class Mage_Checkout_Block_Cart_Sidebar extends Mage_Checkout_Block_Cart_Minicart +class Mage_Checkout_Block_Cart_Sidebar extends Mage_Checkout_Block_Cart_Abstract { - const XML_PATH_CHECKOUT_SIDEBAR_COUNT = 'checkout/sidebar/count'; - const XML_PATH_CHECKOUT_MINICART_VISIBLE_ITEMS_COUNT = 'checkout/cart/minicart_visible_items'; + const XML_PATH_CHECKOUT_SIDEBAR_COUNT = 'checkout/sidebar/count'; /** * Class constructor @@ -154,6 +153,19 @@ protected function _getShippingTaxAmount() return $quote->getShippingAddress()->getShippingTaxAmount(); } + /** + * Get shopping cart items qty based on configuration (summary qty or items qty) + * + * @return int | float + */ + public function getSummaryCount() + { + if ($this->getData('summary_qty')) { + return $this->getData('summary_qty'); + } + return Mage::getSingleton('checkout/cart')->getSummaryQty(); + } + /** * Get incl/excl tax label * @@ -297,14 +309,4 @@ public function getCacheTags() $this->getItemsTags($items) ); } - - /** - * Get form key - * - * @return string - */ - public function getFormKey() - { - return Mage::getSingleton('core/session')->getFormKey(); - } } diff --git a/app/code/core/Mage/Checkout/Block/Cart/Totals.php b/app/code/core/Mage/Checkout/Block/Cart/Totals.php index fc2fc45bc..8430067d6 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Totals.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Links.php b/app/code/core/Mage/Checkout/Block/Links.php index 920f3ec86..73b6579b6 100644 --- a/app/code/core/Mage/Checkout/Block/Links.php +++ b/app/code/core/Mage/Checkout/Block/Links.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php b/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php index 2f98142de..5efc74169 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php b/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php index 9e2eef7c7..970f861ae 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php index efc7e9937..274381461 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php b/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php index 89a99b82c..c0f756f92 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php b/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php index 8ca3eb91e..a4a94b59a 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Link.php b/app/code/core/Mage/Checkout/Block/Multishipping/Link.php index 3da5558a2..21dab0e28 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Link.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php index 3a0b17da8..7aef08844 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php b/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php index bec18623d..31d43e8d8 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php index 69d9756ff..f96a42ddc 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/State.php b/app/code/core/Mage/Checkout/Block/Multishipping/State.php index 731318167..3de898f59 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/State.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/State.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php b/app/code/core/Mage/Checkout/Block/Multishipping/Success.php index fc12b8720..af2e7f9db 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Success.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage.php b/app/code/core/Mage/Checkout/Block/Onepage.php index 036a6370a..a59ae56ae 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage.php +++ b/app/code/core/Mage/Checkout/Block/Onepage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php b/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php index c9a3fe413..187dce61d 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php index d84ce0777..82204f1fe 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Failure.php b/app/code/core/Mage/Checkout/Block/Onepage/Failure.php index 322e825f1..24f33d0fc 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Failure.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Failure.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Link.php b/app/code/core/Mage/Checkout/Block/Onepage/Link.php index 059fd5a68..ab101d068 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Link.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Login.php b/app/code/core/Mage/Checkout/Block/Onepage/Login.php index ab0ba00bc..04951bf4f 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Login.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Login.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment.php index c6f40e8cd..42b82cb93 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Payment.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php index f24a3bd2b..df4d9b05e 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php index 389b208d3..34cabd9f0 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Progress.php b/app/code/core/Mage/Checkout/Block/Onepage/Progress.php index 554428988..ca34bf15a 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Progress.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Progress.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Review.php b/app/code/core/Mage/Checkout/Block/Onepage/Review.php index 26ea2227d..3b26ca848 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Review.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php b/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php index 08c3c2fdf..0ef10c185 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php index 0b2838e2c..f0d6ccd5d 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php index 309624d27..71bb01c14 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php index b9a4dd01d..c31d1dcaa 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php index e0eb0c6b8..696727065 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Success.php b/app/code/core/Mage/Checkout/Block/Onepage/Success.php index f5db59b48..4930b3ae3 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Success.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Success.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Success.php b/app/code/core/Mage/Checkout/Block/Success.php index c0116fb60..6417cd23f 100644 --- a/app/code/core/Mage/Checkout/Block/Success.php +++ b/app/code/core/Mage/Checkout/Block/Success.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Total/Default.php b/app/code/core/Mage/Checkout/Block/Total/Default.php index f6637c2db..3ad83e484 100644 --- a/app/code/core/Mage/Checkout/Block/Total/Default.php +++ b/app/code/core/Mage/Checkout/Block/Total/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Total/Nominal.php b/app/code/core/Mage/Checkout/Block/Total/Nominal.php index ed3d72052..db3a0d59c 100644 --- a/app/code/core/Mage/Checkout/Block/Total/Nominal.php +++ b/app/code/core/Mage/Checkout/Block/Total/Nominal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Total/Tax.php b/app/code/core/Mage/Checkout/Block/Total/Tax.php index 6425b9072..c27d6a7f7 100644 --- a/app/code/core/Mage/Checkout/Block/Total/Tax.php +++ b/app/code/core/Mage/Checkout/Block/Total/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Controller/Action.php b/app/code/core/Mage/Checkout/Controller/Action.php index ec8f58517..daf835441 100644 --- a/app/code/core/Mage/Checkout/Controller/Action.php +++ b/app/code/core/Mage/Checkout/Controller/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Exception.php b/app/code/core/Mage/Checkout/Exception.php index a2ea6cca0..968b753ae 100644 --- a/app/code/core/Mage/Checkout/Exception.php +++ b/app/code/core/Mage/Checkout/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Helper/Cart.php b/app/code/core/Mage/Checkout/Helper/Cart.php index 016f59220..0a53e8dc6 100644 --- a/app/code/core/Mage/Checkout/Helper/Cart.php +++ b/app/code/core/Mage/Checkout/Helper/Cart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Helper/Data.php b/app/code/core/Mage/Checkout/Helper/Data.php index 792e7eecc..28d91588f 100644 --- a/app/code/core/Mage/Checkout/Helper/Data.php +++ b/app/code/core/Mage/Checkout/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Helper/Url.php b/app/code/core/Mage/Checkout/Helper/Url.php index 251f52931..467895791 100644 --- a/app/code/core/Mage/Checkout/Helper/Url.php +++ b/app/code/core/Mage/Checkout/Helper/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Agreement.php b/app/code/core/Mage/Checkout/Model/Agreement.php index 14b45a79f..3daead19c 100644 --- a/app/code/core/Mage/Checkout/Model/Agreement.php +++ b/app/code/core/Mage/Checkout/Model/Agreement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource.php b/app/code/core/Mage/Checkout/Model/Api/Resource.php index dddc0cbd0..4abde29d0 100644 --- a/app/code/core/Mage/Checkout/Model/Api/Resource.php +++ b/app/code/core/Mage/Checkout/Model/Api/Resource.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php b/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php index 752a53bdf..93ba26e53 100644 --- a/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php +++ b/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php b/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php index 282cfdd4b..7075d1014 100644 --- a/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php +++ b/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart.php b/app/code/core/Mage/Checkout/Model/Cart.php index df16205bf..3c5c62eaf 100644 --- a/app/code/core/Mage/Checkout/Model/Cart.php +++ b/app/code/core/Mage/Checkout/Model/Cart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Api.php index 268941ba3..2eb4fb933 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Api/V2.php index 10d9f171d..a994e7036 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php index 2c6360f7b..d6c9219e0 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.php index 9db5ca295..89b71d076 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php index 176882602..617a7c711 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php index be4648567..96a5ccb54 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Interface.php b/app/code/core/Mage/Checkout/Model/Cart/Interface.php index 132e67bab..ddd6dd5a1 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Interface.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php index 95ca21de5..fcd6c5a1c 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php index a699775ef..52dca5cbb 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php index a12253e7c..4ef2db71d 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php index 2aa9775cc..373129939 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php index 05c79b6f2..d85396efd 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.php index 17153d3f4..313789e47 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php b/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php index 368ebb9fe..6932b5281 100644 --- a/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php +++ b/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Checkout_Model_Config_Source_Cart_Summary diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php index d71c3c0de..6e0ea49ce 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php index 3394f97ee..9ffac9e6a 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php b/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php index 6e49f2759..2fa4bc0c6 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php b/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php index b51a256cf..eef034400 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Observer.php b/app/code/core/Mage/Checkout/Model/Observer.php index 6fbf0775b..ffbe84681 100644 --- a/app/code/core/Mage/Checkout/Model/Observer.php +++ b/app/code/core/Mage/Checkout/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Resource/Agreement.php b/app/code/core/Mage/Checkout/Model/Resource/Agreement.php index f933db091..475f0a61f 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Agreement.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Agreement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php b/app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php index bde4334f2..4d07126c5 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Resource/Cart.php b/app/code/core/Mage/Checkout/Model/Resource/Cart.php index 590ae8b55..9f736148e 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Cart.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Cart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Resource/Setup.php b/app/code/core/Mage/Checkout/Model/Resource/Setup.php index 693ed43d9..da2885f75 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Setup.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Session.php b/app/code/core/Mage/Checkout/Model/Session.php index 5287b72df..bdac82306 100644 --- a/app/code/core/Mage/Checkout/Model/Session.php +++ b/app/code/core/Mage/Checkout/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Type/Abstract.php b/app/code/core/Mage/Checkout/Model/Type/Abstract.php index 719724dc9..c7ea819e2 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Abstract.php +++ b/app/code/core/Mage/Checkout/Model/Type/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php index 0bd5dc155..9eaa50e65 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php +++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php index 5dfaecd78..5ef5afe1e 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php +++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Type/Onepage.php b/app/code/core/Mage/Checkout/Model/Type/Onepage.php index 9e1141cd7..315e9d817 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Onepage.php +++ b/app/code/core/Mage/Checkout/Model/Type/Onepage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php index 109daa510..43e97c0f6 100644 --- a/app/code/core/Mage/Checkout/controllers/CartController.php +++ b/app/code/core/Mage/Checkout/controllers/CartController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -116,23 +116,6 @@ protected function _initProduct() return false; } - /** - * Predispatch: remove isMultiShipping option from quote - * - * @return Mage_Checkout_CartController - */ - public function preDispatch() - { - parent::preDispatch(); - - $cart = $this->_getCart(); - if ($cart->getQuote()->getIsMultiShipping()) { - $cart->getQuote()->setIsMultiShipping(false); - } - - return $this; - } - /** * Shopping cart display action */ @@ -594,88 +577,4 @@ public function couponPostAction() $this->_goBack(); } - - /** - * Minicart delete action - */ - public function ajaxDeleteAction() - { - if (!$this->_validateFormKey()) { - Mage::throwException('Invalid form key'); - } - $id = (int) $this->getRequest()->getParam('id'); - $result = array(); - if ($id) { - try { - $this->_getCart()->removeItem($id)->save(); - - $result['qty'] = $this->_getCart()->getSummaryQty(); - - $this->loadLayout(); - $result['content'] = $this->getLayout()->getBlock('minicart_content')->toHtml(); - - $result['success'] = 1; - $result['message'] = $this->__('Item was removed successfully.'); - } catch (Exception $e) { - $result['success'] = 0; - $result['error'] = $this->__('Can not remove the item.'); - } - } - - $this->getResponse()->setHeader('Content-type', 'application/json'); - $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result)); - } - - /** - * Minicart ajax update qty action - */ - public function ajaxUpdateAction() - { - if (!$this->_validateFormKey()) { - Mage::throwException('Invalid form key'); - } - $id = (int)$this->getRequest()->getParam('id'); - $qty = $this->getRequest()->getParam('qty'); - $result = array(); - if ($id) { - try { - $cart = $this->_getCart(); - if (isset($qty)) { - $filter = new Zend_Filter_LocalizedToNormalized( - array('locale' => Mage::app()->getLocale()->getLocaleCode()) - ); - $qty = $filter->filter($qty); - } - - $quoteItem = $cart->getQuote()->getItemById($id); - if (!$quoteItem) { - Mage::throwException($this->__('Quote item is not found.')); - } - if ($qty == 0) { - $cart->removeItem($id); - } else { - $quoteItem->setQty($qty)->save(); - } - $this->_getCart()->save(); - - $this->loadLayout(); - $result['content'] = $this->getLayout()->getBlock('minicart_content')->toHtml(); - - $result['qty'] = $this->_getCart()->getSummaryQty(); - - if (!$quoteItem->getHasError()) { - $result['message'] = $this->__('Item was updated successfully.'); - } else { - $result['notice'] = $quoteItem->getMessage(); - } - $result['success'] = 1; - } catch (Exception $e) { - $result['success'] = 0; - $result['error'] = $this->__('Can not save item.'); - } - } - - $this->getResponse()->setHeader('Content-type', 'application/json'); - $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result)); - } } diff --git a/app/code/core/Mage/Checkout/controllers/IndexController.php b/app/code/core/Mage/Checkout/controllers/IndexController.php index 8c6c6b0ae..c77b7d0ec 100644 --- a/app/code/core/Mage/Checkout/controllers/IndexController.php +++ b/app/code/core/Mage/Checkout/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php b/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php index 76f4b2996..278402f43 100644 --- a/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php +++ b/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/controllers/MultishippingController.php b/app/code/core/Mage/Checkout/controllers/MultishippingController.php index 4c4164b3d..9e944aea9 100644 --- a/app/code/core/Mage/Checkout/controllers/MultishippingController.php +++ b/app/code/core/Mage/Checkout/controllers/MultishippingController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/controllers/OnepageController.php b/app/code/core/Mage/Checkout/controllers/OnepageController.php index 15b0a6c78..04c1bdcc3 100644 --- a/app/code/core/Mage/Checkout/controllers/OnepageController.php +++ b/app/code/core/Mage/Checkout/controllers/OnepageController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/etc/adminhtml.xml b/app/code/core/Mage/Checkout/etc/adminhtml.xml index 2095fe459..7844fc09d 100644 --- a/app/code/core/Mage/Checkout/etc/adminhtml.xml +++ b/app/code/core/Mage/Checkout/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/api.xml b/app/code/core/Mage/Checkout/etc/api.xml index d5faea02b..4eda26195 100644 --- a/app/code/core/Mage/Checkout/etc/api.xml +++ b/app/code/core/Mage/Checkout/etc/api.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/config.xml b/app/code/core/Mage/Checkout/etc/config.xml index 05f3358ff..af4ef3a5a 100644 --- a/app/code/core/Mage/Checkout/etc/config.xml +++ b/app/code/core/Mage/Checkout/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/jstranslator.xml b/app/code/core/Mage/Checkout/etc/jstranslator.xml index 338088184..44c9d8b12 100644 --- a/app/code/core/Mage/Checkout/etc/jstranslator.xml +++ b/app/code/core/Mage/Checkout/etc/jstranslator.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/system.xml b/app/code/core/Mage/Checkout/etc/system.xml index 61c6acacd..e6af3a9db 100644 --- a/app/code/core/Mage/Checkout/etc/system.xml +++ b/app/code/core/Mage/Checkout/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php b/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php index bfac7a6cf..288a9b0ae 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php index f9af6bd09..cd3bfff01 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php index 36aecef61..890d1970f 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php index d01c6addf..a0bc3de2b 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php index af5dcf13b..f0afef019 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php index f70699512..fa0bae871 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php index f12c97387..342af70f9 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 4f0d2270b..0efe64f47 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Block/Block.php b/app/code/core/Mage/Cms/Block/Block.php index 06ba1c0f3..3d2484d32 100644 --- a/app/code/core/Mage/Cms/Block/Block.php +++ b/app/code/core/Mage/Cms/Block/Block.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Block/Page.php b/app/code/core/Mage/Cms/Block/Page.php index b4f98f51d..7aee4fcfe 100644 --- a/app/code/core/Mage/Cms/Block/Page.php +++ b/app/code/core/Mage/Cms/Block/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Block/Widget/Block.php b/app/code/core/Mage/Cms/Block/Widget/Block.php index 518bcf49e..b2603f1ea 100644 --- a/app/code/core/Mage/Cms/Block/Widget/Block.php +++ b/app/code/core/Mage/Cms/Block/Widget/Block.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php index bf577c819..7ddb85db2 100644 --- a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php +++ b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Controller/Router.php b/app/code/core/Mage/Cms/Controller/Router.php index 1919dc36b..a355d04c3 100644 --- a/app/code/core/Mage/Cms/Controller/Router.php +++ b/app/code/core/Mage/Cms/Controller/Router.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Helper/Data.php b/app/code/core/Mage/Cms/Helper/Data.php index 50655c194..f78189833 100644 --- a/app/code/core/Mage/Cms/Helper/Data.php +++ b/app/code/core/Mage/Cms/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Helper/Page.php b/app/code/core/Mage/Cms/Helper/Page.php index ad53ddacb..5f1ffe326 100644 --- a/app/code/core/Mage/Cms/Helper/Page.php +++ b/app/code/core/Mage/Cms/Helper/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php index 9ed196d6a..6ed84a0eb 100644 --- a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php +++ b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -100,8 +100,7 @@ public function getTreeNodeName() */ public function convertPathToId($path) { - $storageRoot = realpath($this->getStorageRoot()); - $path = str_replace($storageRoot, '', $path); + $path = str_replace($this->getStorageRoot(), '', $path); return $this->idEncode($path); } @@ -114,9 +113,8 @@ public function convertPathToId($path) public function convertIdToPath($id) { $path = $this->idDecode($id); - $storageRoot = realpath($this->getStorageRoot()); - if (!strstr($path, $storageRoot)) { - $path = $storageRoot . DS . $path; + if (!strstr($path, $this->getStorageRoot())) { + $path = $this->getStorageRoot() . $path; } return $path; } @@ -225,8 +223,7 @@ public function getCurrentPath() public function getCurrentUrl() { if (!$this->_currentUrl) { - $mediaPath = realpath(Mage::getConfig()->getOptions()->getMediaDir()); - $path = str_replace($mediaPath, '', $this->getCurrentPath()); + $path = str_replace(Mage::getConfig()->getOptions()->getMediaDir(), '', $this->getCurrentPath()); $path = trim($path, DS); $this->_currentUrl = Mage::app()->getStore($this->_storeId)->getBaseUrl('media') . $this->convertPathToUrl($path) . '/'; diff --git a/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php b/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php deleted file mode 100644 index 594526b17..000000000 --- a/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php +++ /dev/null @@ -1,57 +0,0 @@ - - */ -class Mage_Cms_Model_Adminhtml_Template_Filter extends Mage_Cms_Model_Template_Filter -{ - /** - * Retrieve media file local path directive - * - * @internal to avoid usage of urls at functions sensitive to "allow_url_fopen" php setting at GD2 adapter - * - * @param array $construction - * - * @return string - * - * @throws Mage_Core_Exception - */ - public function mediaDirective($construction) - { - $params = $this->_getIncludeParameters($construction[2]); - if (!isset($params['url'])) { - Mage::throwException('Undefined url parameter for media directive.'); - } - - return Mage::getBaseDir('media') . DS . $params['url']; - } -} diff --git a/app/code/core/Mage/Cms/Model/Block.php b/app/code/core/Mage/Cms/Model/Block.php index 9fa814cd4..ca35316ec 100644 --- a/app/code/core/Mage/Cms/Model/Block.php +++ b/app/code/core/Mage/Cms/Model/Block.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block.php b/app/code/core/Mage/Cms/Model/Mysql4/Block.php index 73b2dcb5d..8c48cdfc8 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Block.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Block.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php index b7200944f..86688ddaf 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page.php b/app/code/core/Mage/Cms/Model/Mysql4/Page.php index ead48716c..6bfdad4a3 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Page.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php index 5c6e602b1..168eee343 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php b/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php index d04036f90..deb6b7a05 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Observer.php b/app/code/core/Mage/Cms/Model/Observer.php index 6616fc92d..00fe6702b 100644 --- a/app/code/core/Mage/Cms/Model/Observer.php +++ b/app/code/core/Mage/Cms/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Page.php b/app/code/core/Mage/Cms/Model/Page.php index f88082e49..bdbdffc78 100644 --- a/app/code/core/Mage/Cms/Model/Page.php +++ b/app/code/core/Mage/Cms/Model/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Resource/Block.php b/app/code/core/Mage/Cms/Model/Resource/Block.php index 819614394..844e2ad47 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Block.php +++ b/app/code/core/Mage/Cms/Model/Resource/Block.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php b/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php index 7dcb4f76d..618602ff0 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php +++ b/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Resource/Page.php b/app/code/core/Mage/Cms/Model/Resource/Page.php index fff5e0e03..95095b890 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Page.php +++ b/app/code/core/Mage/Cms/Model/Resource/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php b/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php index 1ec08baf6..a56c3fac7 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php +++ b/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Resource/Page/Service.php b/app/code/core/Mage/Cms/Model/Resource/Page/Service.php index 9827e32ce..f1abab16d 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Page/Service.php +++ b/app/code/core/Mage/Cms/Model/Resource/Page/Service.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Template/Filter.php b/app/code/core/Mage/Cms/Model/Template/Filter.php index 99ad112cf..1ec980496 100644 --- a/app/code/core/Mage/Cms/Model/Template/Filter.php +++ b/app/code/core/Mage/Cms/Model/Template/Filter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php index 4b835d429..e39aac7c9 100644 --- a/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php +++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,30 +34,13 @@ class Mage_Cms_Model_Wysiwyg_Config extends Varien_Object { /** - * Wysiwyg behaviour: enabled + * Wysiwyg behaviour */ const WYSIWYG_ENABLED = 'enabled'; - - /** - * Wysiwyg behaviour: hidden - */ const WYSIWYG_HIDDEN = 'hidden'; - - /** - * Wysiwyg behaviour: disabled - */ const WYSIWYG_DISABLED = 'disabled'; - - /** - * constant for image directory - */ const IMAGE_DIRECTORY = 'wysiwyg'; - /** - * Path to skin image placeholder file - */ - const WYSIWYG_SKIN_IMAGE_PLACEHOLDER_FILE = 'images/wysiwyg/skin_image.png'; - /** * Return Wysiwyg config as Varien_Object * @@ -71,7 +54,7 @@ class Mage_Cms_Model_Wysiwyg_Config extends Varien_Object * files_browser_*: Files Browser (media, images) settings * encode_directives: Encode template directives with JS or not * - * @param $data array constructor params to override default config values + * @param $data Varien_Object constructor params to override default config values * @return Varien_Object */ public function getConfig($data = array()) @@ -102,10 +85,8 @@ public function getConfig($data = array()) $config->addData(array( 'add_images' => true, 'files_browser_window_url' => Mage::getSingleton('adminhtml/url')->getUrl('*/cms_wysiwyg_images/index'), - 'files_browser_window_width' - => (int) Mage::getConfig()->getNode('adminhtml/cms/browser/window_width'), - 'files_browser_window_height' - => (int) Mage::getConfig()->getNode('adminhtml/cms/browser/window_height'), + 'files_browser_window_width' => (int) Mage::getConfig()->getNode('adminhtml/cms/browser/window_width'), + 'files_browser_window_height'=> (int) Mage::getConfig()->getNode('adminhtml/cms/browser/window_height'), )); } @@ -119,24 +100,13 @@ public function getConfig($data = array()) } /** - * Return the URL for skin image placeholder + * Return URL for skin images placeholder * * @return string */ public function getSkinImagePlaceholderUrl() { - return Mage::getDesign()->getSkinUrl(self::WYSIWYG_SKIN_IMAGE_PLACEHOLDER_FILE); - } - - /** - * Return the path to the skin image placeholder - * - * @return string - */ - public function getSkinImagePlaceholderPath() - { - return Mage::getModel('core/design_package')->getSkinBaseDir(array('_area' => 'adminhtml')) . DS . - self::WYSIWYG_SKIN_IMAGE_PLACEHOLDER_FILE; + return Mage::getDesign()->getSkinUrl('images/wysiwyg/skin_image.png'); } /** diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php index 9a5d81910..810d3a5a0 100644 --- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php +++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php index 4da46008d..b92658e51 100644 --- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php +++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/controllers/IndexController.php b/app/code/core/Mage/Cms/controllers/IndexController.php index 413f5de99..cd6340ddd 100644 --- a/app/code/core/Mage/Cms/controllers/IndexController.php +++ b/app/code/core/Mage/Cms/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/controllers/PageController.php b/app/code/core/Mage/Cms/controllers/PageController.php index 8ee32bde7..0071c78a2 100644 --- a/app/code/core/Mage/Cms/controllers/PageController.php +++ b/app/code/core/Mage/Cms/controllers/PageController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php index 403e59c88..2bfdf6da2 100644 --- a/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,11 +28,7 @@ array( 'title' => 'Footer Links', 'identifier' => 'footer_links', - 'content' => " -", + 'content' => "", 'is_active' => 1, 'stores' => 0 ) @@ -46,30 +42,7 @@ 'meta_description' => 'Page description', 'identifier' => 'no-route', - 'content' => " -

Whoops, our bad...

-
-
The page you requested was not found, and we have a fine guess why.
-
-
    -
  • If you typed the URL directly, please make sure the spelling is correct.
    • -
  • If you clicked on a link to get here, the link is outdated.
    • -
-
-
-
-
What can you do?
-
Have no fear, help is near! There are many ways you can get back on track with Magento Store.
-
-
    -
  • Go back to the previous page.
    • -
  • Use the search bar at the top of the page to search for your products.
    • -
  • Follow these links to get you back on track!
    Store Home - | My Account
    • -
-
-
-", + 'content' => "

Whoops, our bad...

\r\n
\r\n
The page you requested was not found, and we have a fine guess why.
\r\n
\r\n
    \r\n
  • If you typed the URL directly, please make sure the spelling is correct.
    • \r\n
  • If you clicked on a link to get here, the link is outdated.
    • \r\n
\r\n
\r\n
\r\n
What can you do?
\r\n
Have no fear, help is near! There are many ways you can get back on track with Magento Store.
\r\n
\r\n
    \r\n
  • Go back to the previous page.
    • \r\n
  • Use the search bar at the top of the page to search for your products.
    • \r\n
  • Follow these links to get you back on track!
    Store Home | My Account
\r\n", 'is_active' => 1, 'stores' => array(0), 'sort_order' => 0 @@ -78,7 +51,7 @@ 'title' => 'Home page', 'root_template' => 'two_columns_right', 'identifier' => 'home', - 'content' => "

Home Page

", + 'content' => "

Home Page

\r\n", 'is_active' => 1, 'stores' => array(0), 'sort_order' => 0 @@ -87,42 +60,7 @@ 'title' => 'About Us', 'root_template' => 'two_columns_right', 'identifier' => 'about-magento-demo-store', - 'content' => " -
-

About Magento Store

-
-
-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. -Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, -tempus vitae, iaculis semper, pede.

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. -Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, -porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta.

-
-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. -Duis lobortis. Nulla nec velit.

-

Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. -Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada -fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, -tempus nec, tempor nec, justo.

-

Maecenas ullamcorper, odio vel tempus egestas, dui orci faucibus orci, sit amet aliquet lectus dolor et quam. -Pellentesque consequat luctus purus. Nunc et risus. Etiam a nibh. Phasellus dignissim metus eget nisi. -Vestibulum sapien dolor, aliquet nec, porta ac, malesuada a, libero. Praesent feugiat purus eget est. -Nulla facilisi. Vestibulum tincidunt sapien eu velit. Mauris purus. Maecenas eget mauris eu orci accumsan feugiat. -Pellentesque eget velit. Nunc tincidunt.

-
-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. -Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. -Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, -faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper

-

Maecenas ullamcorper, odio vel tempus egestas, dui orci faucibus orci, -sit amet aliquet lectus dolor et quam. Pellentesque consequat luctus purus.

-

Nunc et risus. Etiam a nibh. Phasellus dignissim metus eget nisi.

-
-

To all of you, from all of us at Magento Store - Thank you and Happy eCommerce!

-

John Doe
-Some important guy

-
", + 'content' => "
\r\n

About Magento Store

\r\n
\r\n
\r\n

\"Varien\"

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede.

\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta.

\r\n
\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit.

\r\n

Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.

\r\n

Maecenas ullamcorper, odio vel tempus egestas, dui orci faucibus orci, sit amet aliquet lectus dolor et quam. Pellentesque consequat luctus purus. Nunc et risus. Etiam a nibh. Phasellus dignissim metus eget nisi. Vestibulum sapien dolor, aliquet nec, porta ac, malesuada a, libero. Praesent feugiat purus eget est. Nulla facilisi. Vestibulum tincidunt sapien eu velit. Mauris purus. Maecenas eget mauris eu orci accumsan feugiat. Pellentesque eget velit. Nunc tincidunt.

\r\n
\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper

\r\n

Maecenas ullamcorper, odio vel tempus egestas, dui orci faucibus orci, sit amet aliquet lectus dolor et quam. Pellentesque consequat luctus purus.

\r\n

Nunc et risus. Etiam a nibh. Phasellus dignissim metus eget nisi.

\r\n
\r\n

To all of you, from all of us at Magento Store - Thank you and Happy eCommerce!

\r\n

John Doe
Some important guy

\r\n
", 'is_active' => 1, 'stores' => array(0), 'sort_order' => 0 @@ -131,76 +69,7 @@ 'title' => 'Customer Service', 'root_template' => 'three_columns', 'identifier' => 'customer-service', - 'content' => "
-

Customer Service

-
- -
-
Shipping & Delivery
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. -Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. -Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, -faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. -Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. -Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, -justo.
-
Privacy & Security
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. -Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. -Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, -faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. -Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. -Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, -justo.
-
Returns & Replacements
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. -Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. -Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, -faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. -Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. -Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, -justo.
-
Ordering
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. -Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. -Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, -faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. -Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. -Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, -justo.
-
Payment, Pricing & Promotions
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. -Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. -Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, -faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. -Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. -Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, -justo.
-
Viewing Orders
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. -Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. -Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, -faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. - Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. - Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, - justo.
-
Updating Account Information
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. - Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. - Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, - faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. - Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. - Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, - justo.
-
", + 'content' => "
\r\n

Customer Service

\r\n
\r\n\r\n
\r\n
Shipping & Delivery
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Privacy & Security
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Returns & Replacements
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Ordering
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Payment, Pricing & Promotions
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Viewing Orders
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Updating Account Information
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
", 'is_active' => 1, 'stores' => array(0), 'sort_order' => 0 @@ -209,129 +78,7 @@ 'title' => 'Enable Cookies', 'root_template' => 'one_column', 'identifier' => 'enable-cookies', - 'content' => "
-
    -
  • -
      -
    • Please enable cookies in your web browser to continue.
      • -
    -
    • -
-
-

What are Cookies?

-
-

Cookies are short pieces of data that are sent to your computer when you visit a website. - On later visits, this data is then returned to that website. Cookies allow us to recognize you automatically - whenever you visit our site so that we can personalize your experience and provide you with better service. - We also use cookies (and similar browser data, such as Flash cookies) for fraud prevention and other purposes. - If your web browser is set to refuse cookies from our website, you will not be able to complete a purchase - or take advantage of certain features of our website, such as storing items in your Shopping Cart or - receiving personalized recommendations. As a result, we strongly encourage you to configure your web - browser to accept cookies from our website.

-

Enabling Cookies

- -

Internet Explorer 7.x

-
    -
  1. -

    Start Internet Explorer

    -
    2. -
  2. -

    Under the Tools menu, click Internet Options

    -

    \"\"

    -
    3. -
  3. -

    Click the Privacy tab

    -

    \"\"

    -
    4. -
  4. -

    Click the Advanced button

    -

    \"\"

    -
    5. -
  5. -

    Put a check mark in the box for Override Automatic Cookie Handling, - put another check mark in the Always accept session cookies box

    -

    \"\"

    -
    6. -
  6. -

    Click OK

    -

    \"\"

    -
    7. -
  7. -

    Click OK

    -

    \"\"

    -
    8. -
  8. -

    Restart Internet Explore

    -
    9. -
-

Back to Top

-

Internet Explorer 6.x

-
    -
  1. -

    Select Internet Options from the Tools menu

    -

    \"\"

    -
    2. -
  2. -

    Click on the Privacy tab

    -
    3. -
  3. -

    Click the Default button (or manually slide the bar down to Medium) - under Settings. Click OK

    -

    \"\"

    -
    4. -
-

Back to Top

-

Mozilla/Firefox

-
    -
  1. -

    Click on the Tools-menu in Mozilla

    -
    2. -
  2. -

    Click on the Options... item in the menu - a new window open

    -
    3. -
  3. -

    Click on the Privacy selection in the left part of the window. (See image below)

    -

    \"\"

    -
    4. -
  4. -

    Expand the Cookies section

    -
    5. -
  5. -

    Check the Enable cookies and Accept cookies normally checkboxes

    -
    6. -
  6. -

    Save changes by clicking Ok.

    -
    7. -
-

Back to Top

-

Opera 7.x

-
    -
  1. -

    Click on the Tools menu in Opera

    -
    2. -
  2. -

    Click on the Preferences... item in the menu - a new window open

    -
    3. -
  3. -

    Click on the Privacy selection near the bottom left of the window. (See image below)

    -

    \"\"

    -
    4. -
  4. -

    The Enable cookies checkbox must be checked, and Accept all cookies - should be selected in the "Normal cookies" drop-down

    -
    5. -
  5. -

    Save changes by clicking Ok

    -
    6. -
-

Back to Top

-
-", + 'content' => "
\r\n
    \r\n
  • \r\n
      \r\n
    • Please enable cookies in your web browser to continue.
      • \r\n
    \r\n
    • \r\n
\r\n
\r\n

What are Cookies?

\r\n
\r\n

Cookies are short pieces of data that are sent to your computer when you visit a website. On later visits, this data is then returned to that website. Cookies allow us to recognize you automatically whenever you visit our site so that we can personalize your experience and provide you with better service. We also use cookies (and similar browser data, such as Flash cookies) for fraud prevention and other purposes. If your web browser is set to refuse cookies from our website, you will not be able to complete a purchase or take advantage of certain features of our website, such as storing items in your Shopping Cart or receiving personalized recommendations. As a result, we strongly encourage you to configure your web browser to accept cookies from our website.

\r\n

Enabling Cookies

\r\n \r\n

Internet Explorer 7.x

\r\n
    \r\n
  1. \r\n

    Start Internet Explorer

    \r\n
    2. \r\n
  2. \r\n

    Under the Tools menu, click Internet Options

    \r\n

    \"\"

    \r\n
    3. \r\n
  3. \r\n

    Click the Privacy tab

    \r\n

    \"\"

    \r\n
    4. \r\n
  4. \r\n

    Click the Advanced button

    \r\n

    \"\"

    \r\n
    5. \r\n
  5. \r\n

    Put a check mark in the box for Override Automatic Cookie Handling, put another check mark in the Always accept session cookies box

    \r\n

    \"\"

    \r\n
    6. \r\n
  6. \r\n

    Click OK

    \r\n

    \"\"

    \r\n
    7. \r\n
  7. \r\n

    Click OK

    \r\n

    \"\"

    \r\n
    8. \r\n
  8. \r\n

    Restart Internet Explore

    \r\n
    9. \r\n
\r\n

Back to Top

\r\n

Internet Explorer 6.x

\r\n
    \r\n
  1. \r\n

    Select Internet Options from the Tools menu

    \r\n

    \"\"

    \r\n
    2. \r\n
  2. \r\n

    Click on the Privacy tab

    \r\n
    3. \r\n
  3. \r\n

    Click the Default button (or manually slide the bar down to Medium) under Settings. Click OK

    \r\n

    \"\"

    \r\n
    4. \r\n
\r\n

Back to Top

\r\n

Mozilla/Firefox

\r\n
    \r\n
  1. \r\n

    Click on the Tools-menu in Mozilla

    \r\n
    2. \r\n
  2. \r\n

    Click on the Options... item in the menu - a new window open

    \r\n
    3. \r\n
  3. \r\n

    Click on the Privacy selection in the left part of the window. (See image below)

    \r\n

    \"\"

    \r\n
    4. \r\n
  4. \r\n

    Expand the Cookies section

    \r\n
    5. \r\n
  5. \r\n

    Check the Enable cookies and Accept cookies normally checkboxes

    \r\n
    6. \r\n
  6. \r\n

    Save changes by clicking Ok.

    \r\n
    7. \r\n
\r\n

Back to Top

\r\n

Opera 7.x

\r\n
    \r\n
  1. \r\n

    Click on the Tools menu in Opera

    \r\n
    2. \r\n
  2. \r\n

    Click on the Preferences... item in the menu - a new window open

    \r\n
    3. \r\n
  3. \r\n

    Click on the Privacy selection near the bottom left of the window. (See image below)

    \r\n

    \"\"

    \r\n
    4. \r\n
  4. \r\n

    The Enable cookies checkbox must be checked, and Accept all cookies should be selected in the "Normal cookies" drop-down

    \r\n
    5. \r\n
  5. \r\n

    Save changes by clicking Ok

    \r\n
    6. \r\n
\r\n

Back to Top

\r\n
\r\n", 'is_active' => 1, 'stores' => array(0) ) @@ -350,26 +97,3 @@ foreach ($cmsPages as $data) { Mage::getModel('cms/page')->setData($data)->save(); } - -$content = ' -
-
- Company -
- -
'; - -$cmsBlock = array( - 'title' => 'Footer Links Company', - 'identifier' => 'footer_links_company', - 'content' => $content, - 'is_active' => 1, - 'stores' => 0 -); - -Mage::getModel('cms/block')->setData($cmsBlock)->save(); diff --git a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php index 421714c2f..68b98e64b 100644 --- a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php index 81abc780e..a2f7e9588 100644 --- a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $content = "

This website requires cookies to provide all of its features. For more " . diff --git a/app/code/core/Mage/Cms/etc/adminhtml.xml b/app/code/core/Mage/Cms/etc/adminhtml.xml index 7274c9b73..d34a30565 100644 --- a/app/code/core/Mage/Cms/etc/adminhtml.xml +++ b/app/code/core/Mage/Cms/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cms/etc/config.xml b/app/code/core/Mage/Cms/etc/config.xml index ebf6ad326..efc4b1f98 100644 --- a/app/code/core/Mage/Cms/etc/config.xml +++ b/app/code/core/Mage/Cms/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cms/etc/system.xml b/app/code/core/Mage/Cms/etc/system.xml index 016db67f8..c9403269c 100644 --- a/app/code/core/Mage/Cms/etc/system.xml +++ b/app/code/core/Mage/Cms/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cms/etc/widget.xml b/app/code/core/Mage/Cms/etc/widget.xml index 2722580b1..dac81de8e 100644 --- a/app/code/core/Mage/Cms/etc/widget.xml +++ b/app/code/core/Mage/Cms/etc/widget.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php b/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php index 1b6c78f19..c8ef80fd9 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php index e4689b840..f7a874d44 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php index 453272d4a..ed71fda8e 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php index 715f8d5b4..67099f265 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php index 7d4eea9e7..04128e299 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.11-0.7.12.php index 71af7065f..c6b54f19e 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.11-0.7.12.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.11-0.7.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.12-0.7.13.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.12-0.7.13.php index 1c701df8f..11b51bcdf 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.12-0.7.13.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.12-0.7.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php index 33790e20d..570e890d9 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php index bf36cc94a..59606bb32 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php index 229a98f00..02b9cfb57 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php index e8b26da3e..961eed16b 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php index cca0032a8..075f60e8e 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php index b8ae7fc9b..8788a90f2 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index bd34c2175..20d7dd3ee 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Compiler/Block/Process.php b/app/code/core/Mage/Compiler/Block/Process.php index 8997e277f..e374a5176 100644 --- a/app/code/core/Mage/Compiler/Block/Process.php +++ b/app/code/core/Mage/Compiler/Block/Process.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Compiler - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Compiler/Helper/Data.php b/app/code/core/Mage/Compiler/Helper/Data.php index 1773fe4da..ef96f202c 100644 --- a/app/code/core/Mage/Compiler/Helper/Data.php +++ b/app/code/core/Mage/Compiler/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Compiler - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Compiler/Model/Process.php b/app/code/core/Mage/Compiler/Model/Process.php index 240202533..5dbe7d7ed 100644 --- a/app/code/core/Mage/Compiler/Model/Process.php +++ b/app/code/core/Mage/Compiler/Model/Process.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Compiler - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Compiler/controllers/Adminhtml/Compiler/ProcessController.php b/app/code/core/Mage/Compiler/controllers/Adminhtml/Compiler/ProcessController.php index 35a577529..71e55b3e2 100644 --- a/app/code/core/Mage/Compiler/controllers/Adminhtml/Compiler/ProcessController.php +++ b/app/code/core/Mage/Compiler/controllers/Adminhtml/Compiler/ProcessController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Compiler - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Compiler/controllers/ProcessController.php b/app/code/core/Mage/Compiler/controllers/ProcessController.php index ae20db0b6..219f8ab91 100644 --- a/app/code/core/Mage/Compiler/controllers/ProcessController.php +++ b/app/code/core/Mage/Compiler/controllers/ProcessController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Compiler - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Compiler/etc/adminhtml.xml b/app/code/core/Mage/Compiler/etc/adminhtml.xml index 946fdc0d6..1aca9a952 100644 --- a/app/code/core/Mage/Compiler/etc/adminhtml.xml +++ b/app/code/core/Mage/Compiler/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Compiler - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Compiler/etc/compilation.xml b/app/code/core/Mage/Compiler/etc/compilation.xml index 94cd0845f..4f46d73f1 100644 --- a/app/code/core/Mage/Compiler/etc/compilation.xml +++ b/app/code/core/Mage/Compiler/etc/compilation.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Compiler - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Compiler/etc/config.xml b/app/code/core/Mage/Compiler/etc/config.xml index 72216a6fa..92c15ab2c 100644 --- a/app/code/core/Mage/Compiler/etc/config.xml +++ b/app/code/core/Mage/Compiler/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Compiler - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit.php b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit.php index f6df0e979..5618eae5b 100644 --- a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit.php +++ b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Form.php b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Form.php index 022e5feea..63edbec07 100644 --- a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Form.php +++ b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Abstract.php b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Abstract.php index 3197e0320..f7cf2b3f8 100644 --- a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Abstract.php +++ b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Authors.php b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Authors.php index 107df8440..7dc59b0a5 100644 --- a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Authors.php +++ b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Authors.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Contents.php b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Contents.php index 68c8f4389..d0c5163f2 100644 --- a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Contents.php +++ b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Contents.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Depends.php b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Depends.php index 8c5be47e1..b87bb2970 100644 --- a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Depends.php +++ b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Depends.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php index 0d53ee85a..e2f71c425 100644 --- a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php +++ b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php index 0502d4222..a17d43909 100644 --- a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php +++ b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Local.php b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Local.php index 236831fb7..1966b102f 100644 --- a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Local.php +++ b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Local.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Package.php b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Package.php index 5701b0cdd..5ae187717 100644 --- a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Package.php +++ b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Package.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Release.php b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Release.php index 0241f7661..0dc184386 100644 --- a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Release.php +++ b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Release.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tabs.php b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tabs.php index df13c4de7..c6f1fa129 100644 --- a/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tabs.php +++ b/app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Helper/Data.php b/app/code/core/Mage/Connect/Helper/Data.php index 1046f8dd2..6b50c8d73 100644 --- a/app/code/core/Mage/Connect/Helper/Data.php +++ b/app/code/core/Mage/Connect/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Model/Extension.php b/app/code/core/Mage/Connect/Model/Extension.php index 5e041634b..f95fbaa5a 100644 --- a/app/code/core/Mage/Connect/Model/Extension.php +++ b/app/code/core/Mage/Connect/Model/Extension.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Model/Extension/Collection.php b/app/code/core/Mage/Connect/Model/Extension/Collection.php index 91ba3e6cf..5d308dc41 100644 --- a/app/code/core/Mage/Connect/Model/Extension/Collection.php +++ b/app/code/core/Mage/Connect/Model/Extension/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/Model/Session.php b/app/code/core/Mage/Connect/Model/Session.php index 86e12c966..5c20bb381 100644 --- a/app/code/core/Mage/Connect/Model/Session.php +++ b/app/code/core/Mage/Connect/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/controllers/Adminhtml/Extension/CustomController.php b/app/code/core/Mage/Connect/controllers/Adminhtml/Extension/CustomController.php index dae3cecc1..9d7bb3d90 100644 --- a/app/code/core/Mage/Connect/controllers/Adminhtml/Extension/CustomController.php +++ b/app/code/core/Mage/Connect/controllers/Adminhtml/Extension/CustomController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/controllers/Adminhtml/Extension/LocalController.php b/app/code/core/Mage/Connect/controllers/Adminhtml/Extension/LocalController.php index ff4559296..b5e46e02a 100644 --- a/app/code/core/Mage/Connect/controllers/Adminhtml/Extension/LocalController.php +++ b/app/code/core/Mage/Connect/controllers/Adminhtml/Extension/LocalController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Connect/etc/adminhtml.xml b/app/code/core/Mage/Connect/etc/adminhtml.xml index 8c145db0e..c88e195e3 100644 --- a/app/code/core/Mage/Connect/etc/adminhtml.xml +++ b/app/code/core/Mage/Connect/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Connect/etc/config.xml b/app/code/core/Mage/Connect/etc/config.xml index 71e5976ad..6341f6194 100644 --- a/app/code/core/Mage/Connect/etc/config.xml +++ b/app/code/core/Mage/Connect/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/Helper/Data.php b/app/code/core/Mage/Contacts/Helper/Data.php index 14ce6fe8e..5b2b8197a 100644 --- a/app/code/core/Mage/Contacts/Helper/Data.php +++ b/app/code/core/Mage/Contacts/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Contacts - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php b/app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php index 1f4e6cd45..a1045ff83 100644 --- a/app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php +++ b/app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Contacts - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Contacts/controllers/IndexController.php b/app/code/core/Mage/Contacts/controllers/IndexController.php index d510de537..5490b68d8 100644 --- a/app/code/core/Mage/Contacts/controllers/IndexController.php +++ b/app/code/core/Mage/Contacts/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Contacts - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Contacts/etc/adminhtml.xml b/app/code/core/Mage/Contacts/etc/adminhtml.xml index f61246b3b..f96b00a40 100644 --- a/app/code/core/Mage/Contacts/etc/adminhtml.xml +++ b/app/code/core/Mage/Contacts/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Contacts - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/etc/config.xml b/app/code/core/Mage/Contacts/etc/config.xml index 999b3fdfd..0bd462626 100644 --- a/app/code/core/Mage/Contacts/etc/config.xml +++ b/app/code/core/Mage/Contacts/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Contacts - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/etc/system.xml b/app/code/core/Mage/Contacts/etc/system.xml index 8f3aea5f6..6d43c5d57 100644 --- a/app/code/core/Mage/Contacts/etc/system.xml +++ b/app/code/core/Mage/Contacts/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Contacts - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php b/app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php index 3c0c4c136..36936cdb3 100644 --- a/app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Contacts - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php index be3708b0f..006a9d7a1 100644 --- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php +++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Contacts - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php index d094673d7..0836ac385 100644 --- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Contacts - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php index 42aba89b3..f1681b083 100644 --- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Contacts - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php index f793f4372..d8b94e4cc 100644 --- a/app/code/core/Mage/Core/Block/Abstract.php +++ b/app/code/core/Mage/Core/Block/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Flush.php b/app/code/core/Mage/Core/Block/Flush.php index ffcfae471..345924f5d 100644 --- a/app/code/core/Mage/Core/Block/Flush.php +++ b/app/code/core/Mage/Core/Block/Flush.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Html/Calendar.php b/app/code/core/Mage/Core/Block/Html/Calendar.php index acf7770ef..2b6506ed9 100644 --- a/app/code/core/Mage/Core/Block/Html/Calendar.php +++ b/app/code/core/Mage/Core/Block/Html/Calendar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Html/Date.php b/app/code/core/Mage/Core/Block/Html/Date.php index 675e56a27..f84577b64 100644 --- a/app/code/core/Mage/Core/Block/Html/Date.php +++ b/app/code/core/Mage/Core/Block/Html/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Html/Link.php b/app/code/core/Mage/Core/Block/Html/Link.php index a2d53fff6..af9e7382b 100644 --- a/app/code/core/Mage/Core/Block/Html/Link.php +++ b/app/code/core/Mage/Core/Block/Html/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Html/Select.php b/app/code/core/Mage/Core/Block/Html/Select.php index aff16a326..8170c6e14 100644 --- a/app/code/core/Mage/Core/Block/Html/Select.php +++ b/app/code/core/Mage/Core/Block/Html/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Messages.php b/app/code/core/Mage/Core/Block/Messages.php index f3d361376..13c1ba290 100644 --- a/app/code/core/Mage/Core/Block/Messages.php +++ b/app/code/core/Mage/Core/Block/Messages.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Profiler.php b/app/code/core/Mage/Core/Block/Profiler.php index 9f80bc816..8233982ee 100644 --- a/app/code/core/Mage/Core/Block/Profiler.php +++ b/app/code/core/Mage/Core/Block/Profiler.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Store/Switcher.php b/app/code/core/Mage/Core/Block/Store/Switcher.php index d3631ff3a..b11ad3598 100644 --- a/app/code/core/Mage/Core/Block/Store/Switcher.php +++ b/app/code/core/Mage/Core/Block/Store/Switcher.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Template.php b/app/code/core/Mage/Core/Block/Template.php index a6d310bb9..8e703e304 100644 --- a/app/code/core/Mage/Core/Block/Template.php +++ b/app/code/core/Mage/Core/Block/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Template/Facade.php b/app/code/core/Mage/Core/Block/Template/Facade.php index 1005519cb..da19c6640 100644 --- a/app/code/core/Mage/Core/Block/Template/Facade.php +++ b/app/code/core/Mage/Core/Block/Template/Facade.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Template/Smarty.php b/app/code/core/Mage/Core/Block/Template/Smarty.php index 4373164ce..3b106cf7f 100644 --- a/app/code/core/Mage/Core/Block/Template/Smarty.php +++ b/app/code/core/Mage/Core/Block/Template/Smarty.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Template/Zend.php b/app/code/core/Mage/Core/Block/Template/Zend.php index 332e8b588..bf1610537 100644 --- a/app/code/core/Mage/Core/Block/Template/Zend.php +++ b/app/code/core/Mage/Core/Block/Template/Zend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text.php b/app/code/core/Mage/Core/Block/Text.php index 11a473ed0..ae0497e78 100644 --- a/app/code/core/Mage/Core/Block/Text.php +++ b/app/code/core/Mage/Core/Block/Text.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/List.php b/app/code/core/Mage/Core/Block/Text/List.php index 20107a1ed..36ccf64e8 100644 --- a/app/code/core/Mage/Core/Block/Text/List.php +++ b/app/code/core/Mage/Core/Block/Text/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/List/Item.php b/app/code/core/Mage/Core/Block/Text/List/Item.php index ff982e666..4bdc3b21f 100644 --- a/app/code/core/Mage/Core/Block/Text/List/Item.php +++ b/app/code/core/Mage/Core/Block/Text/List/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/List/Link.php b/app/code/core/Mage/Core/Block/Text/List/Link.php index 141876139..e437fa8fc 100644 --- a/app/code/core/Mage/Core/Block/Text/List/Link.php +++ b/app/code/core/Mage/Core/Block/Text/List/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag.php b/app/code/core/Mage/Core/Block/Text/Tag.php index 8cfa9adab..07cb134ef 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag.php +++ b/app/code/core/Mage/Core/Block/Text/Tag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Css.php b/app/code/core/Mage/Core/Block/Text/Tag/Css.php index 984807045..cfec61028 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Css.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Css.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php b/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php index 3fd521a3c..d55151018 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Debug.php b/app/code/core/Mage/Core/Block/Text/Tag/Debug.php index db9b30377..18aea13f9 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Debug.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Debug.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Js.php b/app/code/core/Mage/Core/Block/Text/Tag/Js.php index 0e2fd8a4d..b868a2df8 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Js.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Js.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Meta.php b/app/code/core/Mage/Core/Block/Text/Tag/Meta.php index f8e06c23d..e8a873c82 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Meta.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Meta.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Front/Action.php b/app/code/core/Mage/Core/Controller/Front/Action.php index 748860bdb..5494c1a54 100644 --- a/app/code/core/Mage/Core/Controller/Front/Action.php +++ b/app/code/core/Mage/Core/Controller/Front/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Front/Router.php b/app/code/core/Mage/Core/Controller/Front/Router.php index dcbfdc427..a35155dcf 100644 --- a/app/code/core/Mage/Core/Controller/Front/Router.php +++ b/app/code/core/Mage/Core/Controller/Front/Router.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Request/Http.php b/app/code/core/Mage/Core/Controller/Request/Http.php index bb2325f5e..144adadb3 100644 --- a/app/code/core/Mage/Core/Controller/Request/Http.php +++ b/app/code/core/Mage/Core/Controller/Request/Http.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -252,13 +252,9 @@ public function getBasePath() return $path; } - /** - * @param bool $raw - * @return string - */ - public function getBaseUrl($raw = false) + public function getBaseUrl() { - $url = parent::getBaseUrl($raw); + $url = parent::getBaseUrl(); $url = str_replace('\\', '/', $url); return $url; } diff --git a/app/code/core/Mage/Core/Controller/Response/Http.php b/app/code/core/Mage/Core/Controller/Response/Http.php index 3433d2a6c..4d9bbbcb1 100644 --- a/app/code/core/Mage/Core/Controller/Response/Http.php +++ b/app/code/core/Mage/Core/Controller/Response/Http.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,7 +74,6 @@ public function sendHeaders() } } } - return parent::sendHeaders(); } @@ -106,13 +105,4 @@ public function setRedirect($url, $code = 302) return parent::setRedirect(self::$_transportObject->getUrl(), self::$_transportObject->getCode()); } - - /** - * Method send already collected headers and exit from script - */ - public function sendHeadersAndExit() - { - $this->sendHeaders(); - exit; - } } diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php index 5be7ba914..64e997e06 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Action.php +++ b/app/code/core/Mage/Core/Controller/Varien/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Varien/Exception.php b/app/code/core/Mage/Core/Controller/Varien/Exception.php index 3a20b60c2..51de3760d 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Exception.php +++ b/app/code/core/Mage/Core/Controller/Varien/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Varien/Front.php b/app/code/core/Mage/Core/Controller/Varien/Front.php index 2423b603e..7e4fcdc02 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Front.php +++ b/app/code/core/Mage/Core/Controller/Varien/Front.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php b/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php index 95b23e4e5..2fa87c477 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php b/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php index f588d20a7..bccf6bbfa 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php index 6315fdb14..3fbcaeaa7 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php index e6eea7ed5..afff14a0e 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,7 +43,7 @@ public function collectRoutes($configArea, $useRouterName) $modules = array((string)$routerConfig->args->module); if ($routerConfig->args->modules) { foreach ($routerConfig->args->modules->children() as $customModule) { - if ((string)$customModule) { + if ($customModule) { if ($before = $customModule->getAttribute('before')) { $position = array_search($before, $modules); if ($position === false) { diff --git a/app/code/core/Mage/Core/Exception.php b/app/code/core/Mage/Core/Exception.php index abbc998a9..b59a6a148 100644 --- a/app/code/core/Mage/Core/Exception.php +++ b/app/code/core/Mage/Core/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/Abstract.php b/app/code/core/Mage/Core/Helper/Abstract.php index 12c0debbe..056851232 100644 --- a/app/code/core/Mage/Core/Helper/Abstract.php +++ b/app/code/core/Mage/Core/Helper/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/Array.php b/app/code/core/Mage/Core/Helper/Array.php deleted file mode 100644 index f1a81116d..000000000 --- a/app/code/core/Mage/Core/Helper/Array.php +++ /dev/null @@ -1,58 +0,0 @@ - $value) { - if (is_array($value)) { - if (array_key_exists($key, $baseArray)) { - $baseArray[$key] = $this->mergeRecursiveWithoutOverwriteNumKeys($baseArray[$key], $value); - } else { - $baseArray[$key] = $value; - } - } else { - if ($key) { - $baseArray[$key] = $value; - } else { - $baseArray[] = $value; - } - } - } - - return $baseArray; - } -} diff --git a/app/code/core/Mage/Core/Helper/Cookie.php b/app/code/core/Mage/Core/Helper/Cookie.php index ead2d1f62..6ccad93e8 100644 --- a/app/code/core/Mage/Core/Helper/Cookie.php +++ b/app/code/core/Mage/Core/Helper/Cookie.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php index a160e03bf..6fd879522 100644 --- a/app/code/core/Mage/Core/Helper/Data.php +++ b/app/code/core/Mage/Core/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -253,6 +253,7 @@ public function getRandomString($len, $chars = null) if (is_null($chars)) { $chars = self::CHARS_LOWERS . self::CHARS_UPPERS . self::CHARS_DIGITS; } + mt_srand(10000000*(double)microtime()); for ($i = 0, $str = '', $lc = strlen($chars)-1; $i < $len; $i++) { $str .= $chars[mt_rand(0, $lc)]; } diff --git a/app/code/core/Mage/Core/Helper/File/Storage.php b/app/code/core/Mage/Core/Helper/File/Storage.php index 496d8ace8..e437597e4 100644 --- a/app/code/core/Mage/Core/Helper/File/Storage.php +++ b/app/code/core/Mage/Core/Helper/File/Storage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/File/Storage/Database.php b/app/code/core/Mage/Core/Helper/File/Storage/Database.php index a9487d7c9..0e279d095 100644 --- a/app/code/core/Mage/Core/Helper/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Helper/File/Storage/Database.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/Hint.php b/app/code/core/Mage/Core/Helper/Hint.php index a4aced0c7..8cbbe92c2 100644 --- a/app/code/core/Mage/Core/Helper/Hint.php +++ b/app/code/core/Mage/Core/Helper/Hint.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/Http.php b/app/code/core/Mage/Core/Helper/Http.php index 5517cacae..8ee36e6ce 100644 --- a/app/code/core/Mage/Core/Helper/Http.php +++ b/app/code/core/Mage/Core/Helper/Http.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/Js.php b/app/code/core/Mage/Core/Helper/Js.php index 0015a8c14..8caf5facd 100644 --- a/app/code/core/Mage/Core/Helper/Js.php +++ b/app/code/core/Mage/Core/Helper/Js.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/String.php b/app/code/core/Mage/Core/Helper/String.php index 941f22903..9bdc0d82f 100644 --- a/app/code/core/Mage/Core/Helper/String.php +++ b/app/code/core/Mage/Core/Helper/String.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,11 +33,6 @@ class Mage_Core_Helper_String extends Mage_Core_Helper_Abstract { const ICONV_CHARSET = 'UTF-8'; - /** - * @var Mage_Core_Helper_Array - */ - protected $_arrayHelper; - /** * Truncate a string to a certain length if necessary, appending the $etc string. * $remainder will contain the string that has been replaced with $etc. @@ -308,172 +303,4 @@ public function ksortMultibyte(array &$sort) return $sort; } - /** - * Parse query string to array - * - * @param string $str - * @return array - */ - public function parseQueryStr($str) - { - $argSeparator = '&'; - $result = array(); - $partsQueryStr = explode($argSeparator, $str); - - foreach ($partsQueryStr as $partQueryStr) { - if ($this->_validateQueryStr($partQueryStr)) { - $param = $this->_explodeAndDecodeParam($partQueryStr); - $param = $this->_handleRecursiveParamForQueryStr($param); - $result = $this->_appendParam($result, $param); - } - } - return $result; - } - - /** - * Validate query pair string - * - * @param string $str - * @return bool - */ - protected function _validateQueryStr($str) - { - if (!$str || (strpos($str, '=') === false)) { - return false; - } - return true; - } - - /** - * Prepare param - * - * @param string $str - * @return array - */ - protected function _explodeAndDecodeParam($str) - { - $preparedParam = array(); - $param = explode('=', $str); - $preparedParam['key'] = urldecode(array_shift($param)); - $preparedParam['value'] = urldecode(array_shift($param)); - - return $preparedParam; - } - - /** - * Append param to general result - * - * @param array $result - * @param array $param - * @return array - */ - protected function _appendParam(array $result, array $param) - { - $key = $param['key']; - $value = $param['value']; - - if ($key) { - if (is_array($value) && array_key_exists($key, $result)) { - $helper = $this->getArrayHelper(); - $result[$key] = $helper->mergeRecursiveWithoutOverwriteNumKeys($result[$key], $value); - } else { - $result[$key] = $value; - } - } - - return $result; - } - - /** - * Handle param recursively - * - * @param array $param - * @return array - */ - protected function _handleRecursiveParamForQueryStr(array $param) - { - $value = $param['value']; - $key = $param['key']; - - $subKeyBrackets = $this->_getLastSubkey($key); - $subKey = $this->_getLastSubkey($key, false); - if ($subKeyBrackets) { - if ($subKey) { - $param['value'] = array($subKey => $value); - } else { - $param['value'] = array($value); - } - $param['key'] = $this->_removeSubkeyPartFromKey($key, $subKeyBrackets); - $param = $this->_handleRecursiveParamForQueryStr($param); - } - - return $param; - } - - /** - * Remove subkey part from key - * - * @param string $key - * @param string $subKeyBrackets - * @return string - */ - protected function _removeSubkeyPartFromKey($key, $subKeyBrackets) - { - return substr($key, 0, strrpos($key, $subKeyBrackets)); - } - - /** - * Get last part key from query array - * - * @param string $key - * @param bool $withBrackets - * @return string - */ - protected function _getLastSubkey($key, $withBrackets = true) - { - $subKey = ''; - $leftBracketSymbol = '['; - $rightBracketSymbol = ']'; - - $firstPos = strrpos($key, $leftBracketSymbol); - $lastPos = strrpos($key, $rightBracketSymbol); - - if (($firstPos !== false || $lastPos !== false) - && $firstPos < $lastPos - ) { - $keyLenght = $lastPos - $firstPos + 1; - $subKey = substr($key, $firstPos, $keyLenght); - if (!$withBrackets) { - $subKey = ltrim($subKey, $leftBracketSymbol); - $subKey = rtrim($subKey, $rightBracketSymbol); - } - } - return $subKey; - } - - /** - * Set array helper - * - * @param Mage_Core_Helper_Abstract $helper - * @return Mage_Core_Helper_String - */ - public function setArrayHelper(Mage_Core_Helper_Abstract $helper) - { - $this->_arrayHelper = $helper; - return $this; - } - - /** - * Get Array Helper - * - * @return Mage_Core_Helper_Array - */ - public function getArrayHelper() - { - if (!$this->_arrayHelper) { - $this->_arrayHelper = Mage::helper('core/array'); - } - return $this->_arrayHelper; - } - } diff --git a/app/code/core/Mage/Core/Helper/Translate.php b/app/code/core/Mage/Core/Helper/Translate.php index ff5c3a034..b2cca6fbf 100644 --- a/app/code/core/Mage/Core/Helper/Translate.php +++ b/app/code/core/Mage/Core/Helper/Translate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/Url.php b/app/code/core/Mage/Core/Helper/Url.php index b68cb8d36..8818909f8 100644 --- a/app/code/core/Mage/Core/Helper/Url.php +++ b/app/code/core/Mage/Core/Helper/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/Url/Rewrite.php b/app/code/core/Mage/Core/Helper/Url/Rewrite.php index 4eaea8c38..96e64fea9 100644 --- a/app/code/core/Mage/Core/Helper/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Helper/Url/Rewrite.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Abstract.php b/app/code/core/Mage/Core/Model/Abstract.php index becc133b2..71a11ee27 100644 --- a/app/code/core/Mage/Core/Model/Abstract.php +++ b/app/code/core/Mage/Core/Model/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php index da28a0f6d..ff56bc885 100644 --- a/app/code/core/Mage/Core/Model/App.php +++ b/app/code/core/Mage/Core/Model/App.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/App/Area.php b/app/code/core/Mage/Core/Model/App/Area.php index 7611d9b52..759076994 100644 --- a/app/code/core/Mage/Core/Model/App/Area.php +++ b/app/code/core/Mage/Core/Model/App/Area.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/App/Emulation.php b/app/code/core/Mage/Core/Model/App/Emulation.php index cbb89184a..9c980ccde 100644 --- a/app/code/core/Mage/Core/Model/App/Emulation.php +++ b/app/code/core/Mage/Core/Model/App/Emulation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Cache.php b/app/code/core/Mage/Core/Model/Cache.php index ac99ae2dc..e29d0b7f8 100644 --- a/app/code/core/Mage/Core/Model/Cache.php +++ b/app/code/core/Mage/Core/Model/Cache.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -76,7 +76,7 @@ class Mage_Core_Model_Cache */ protected $_defaultBackendOptions = array( 'hashed_directory_level' => 1, - 'hashed_directory_perm' => 0777, + 'hashed_directory_umask' => 0777, 'file_name_prefix' => 'mage', ); diff --git a/app/code/core/Mage/Core/Model/Calculator.php b/app/code/core/Mage/Core/Model/Calculator.php index 162240297..835e09a00 100644 --- a/app/code/core/Mage/Core/Model/Calculator.php +++ b/app/code/core/Mage/Core/Model/Calculator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php index 2e7c0098d..b17c24f39 100644 --- a/app/code/core/Mage/Core/Model/Config.php +++ b/app/code/core/Mage/Core/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Config/Base.php b/app/code/core/Mage/Core/Model/Config/Base.php index 4aeb867d4..b137cd17f 100644 --- a/app/code/core/Mage/Core/Model/Config/Base.php +++ b/app/code/core/Mage/Core/Model/Config/Base.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Config/Data.php b/app/code/core/Mage/Core/Model/Config/Data.php index 569216a2c..2b5f01c84 100644 --- a/app/code/core/Mage/Core/Model/Config/Data.php +++ b/app/code/core/Mage/Core/Model/Config/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Config/Element.php b/app/code/core/Mage/Core/Model/Config/Element.php index 8fe87ea5d..509a5ca24 100644 --- a/app/code/core/Mage/Core/Model/Config/Element.php +++ b/app/code/core/Mage/Core/Model/Config/Element.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Config/Options.php b/app/code/core/Mage/Core/Model/Config/Options.php index 71929f19a..f0cd1424c 100644 --- a/app/code/core/Mage/Core/Model/Config/Options.php +++ b/app/code/core/Mage/Core/Model/Config/Options.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Config/System.php b/app/code/core/Mage/Core/Model/Config/System.php index 2ec74ffcc..55d292fef 100644 --- a/app/code/core/Mage/Core/Model/Config/System.php +++ b/app/code/core/Mage/Core/Model/Config/System.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Convert.php b/app/code/core/Mage/Core/Model/Convert.php index f954182b6..57ad8ffe1 100644 --- a/app/code/core/Mage/Core/Model/Convert.php +++ b/app/code/core/Mage/Core/Model/Convert.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Cookie.php b/app/code/core/Mage/Core/Model/Cookie.php index 114943e2a..d37916bf5 100644 --- a/app/code/core/Mage/Core/Model/Cookie.php +++ b/app/code/core/Mage/Core/Model/Cookie.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Date.php b/app/code/core/Mage/Core/Model/Date.php index fe59e4a5a..b031b5327 100644 --- a/app/code/core/Mage/Core/Model/Date.php +++ b/app/code/core/Mage/Core/Model/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Design.php b/app/code/core/Mage/Core/Model/Design.php index 3fc7cb210..1439df6e7 100644 --- a/app/code/core/Mage/Core/Model/Design.php +++ b/app/code/core/Mage/Core/Model/Design.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Design/Config.php b/app/code/core/Mage/Core/Model/Design/Config.php deleted file mode 100644 index db146b784..000000000 --- a/app/code/core/Mage/Core/Model/Design/Config.php +++ /dev/null @@ -1,121 +0,0 @@ - - */ -class Mage_Core_Model_Design_Config extends Varien_Simplexml_Config -{ - protected $_designRoot; - - /** - * Assemble themes inheritance config - * - */ - public function __construct(array $params = array()) - { - if (isset($params['designRoot'])) { - if (!is_dir($params['designRoot'])) { - throw new Mage_Core_Exception("Design root '{$params['designRoot']}' isn't a directory."); - } - $this->_designRoot = $params['designRoot']; - } else { - $this->_designRoot = Mage::getBaseDir('design'); - } - $this->_cacheChecksum = null; - $this->setCacheId('config_theme'); - $this->setCache(Mage::app()->getCache()); - if (!$this->loadCache()) { - $this->loadString(''); - $path = str_replace('/', DS, $this->_designRoot . '/*/*/*/etc/theme.xml'); - $files = glob($path); - foreach ($files as $file) { - $config = new Varien_Simplexml_Config(); - $config->loadFile($file); - list($area, $package, $theme) = $this->_getThemePathSegments($file); - $this->setNode($area . '/' . $package . '/' . $theme, null); - $this->getNode($area . '/' . $package . '/' . $theme)->extend($config->getNode()); - } - $this->saveCache(); - } - } - - /** - * Load cache - * - * @return boolean - */ - public function loadCache() - { - if ($this->_canUseCache()) { - return parent::loadCache(); - } - return false; - } - - /** - * Save cache - * - * @param array $tags - * @return Mage_Core_Model_Design_Config - */ - public function saveCache($tags = null) - { - if ($this->_canUseCache()) { - $tags = is_array($tags) ? $tags : array(); - if (!in_array(Mage_Core_Model_Config::CACHE_TAG, $tags)) { - $tags[] = Mage_Core_Model_Config::CACHE_TAG; - } - parent::saveCache($tags); - } - return $this; - } - - /** - * @return bool - */ - protected function _canUseCache() - { - return (bool)Mage::app()->useCache('config'); - } - - /** - * Get area, package and theme from path .../app/design/{area}/{package}/{theme}/etc/theme.xml - * - * @param string $filePath - * @return array - */ - protected function _getThemePathSegments($filePath) - { - $segments = array_reverse(explode(DS, $filePath)); - return array($segments[4], $segments[3], $segments[2]); - } -} diff --git a/app/code/core/Mage/Core/Model/Design/Fallback.php b/app/code/core/Mage/Core/Model/Design/Fallback.php deleted file mode 100644 index 93335eab6..000000000 --- a/app/code/core/Mage/Core/Model/Design/Fallback.php +++ /dev/null @@ -1,206 +0,0 @@ - - */ -class Mage_Core_Model_Design_Fallback -{ - /** - * @var Mage_Core_Model_Design_Config - */ - protected $_config = null; - - /** - * @var Mage_Core_Model_Store - */ - protected $_store = null; - - /** - * Use for caching fallback schemes - * - * @var array - */ - protected $_cachedSchemes = array(); - - /** - * Used to find circular dependencies - * - * @var array - */ - protected $_visited; - - /** - * Constructor - */ - public function __construct(array $params = array()) - { - $this->_config = isset($params['config']) ? $params['config'] : Mage::getModel('core/design_config'); - } - - /** - * Retrieve store - * - * @return Mage_Core_Model_Store - */ - public function getStore() - { - if ($this->_store === null) { - return Mage::app()->getStore(); - } - return $this->_store; - } - - /** - * @param $store string|integer|Mage_Core_Model_Store - * @return $this - */ - public function setStore($store) - { - if (!$store instanceof Mage_Core_Model_Store) { - $store = Mage::app()->getStore($store); - } - $this->_store = $store; - $this->_cachedSchemes = array(); - return $this; - } - - /** - * Get fallback scheme - * - * @param string $area - * @param string $package - * @param string $theme - * @return array - */ - public function getFallbackScheme($area, $package, $theme) - { - $cacheKey = $area . '/' . $package . '/' . $theme; - - if (!isset($this->_cachedSchemes[$cacheKey])) { - - if ($this->_isInheritanceDefined($area, $package, $theme)) { - $scheme = $this->_getFallbackScheme($area, $package, $theme); - } else { - $scheme = $this->_getLegacyFallbackScheme(); - } - - $this->_cachedSchemes[$cacheKey] = $scheme; - } - - return $this->_cachedSchemes[$cacheKey]; - } - - /** - * Check if inheritance defined in theme config - * - * @param $area - * @param $package - * @param $theme - * @return bool - */ - protected function _isInheritanceDefined($area, $package, $theme) - { - $path = $area . '/' . $package . '/' . $theme . '/parent'; - return $this->_config->getNode($path) !== false; - } - - /** - * Get fallback scheme according to theme config - * - * @param string $area - * @param string $package - * @param string $theme - * @return array - * @throws Mage_Core_Exception - */ - protected function _getFallbackScheme($area, $package, $theme) - { - $scheme = array(array()); - $this->_visited = array(); - while ($parent = (string)$this->_config->getNode($area . '/' . $package . '/' . $theme . '/parent')) { - - $this->_checkVisited($area, $package, $theme); - - $parts = explode('/', $parent); - if (count($parts) !== 2) { - throw new Mage_Core_Exception('Parent node should be defined as "package/theme"'); - } - list($package, $theme) = $parts; - $scheme[] = array('_package' => $package, '_theme' => $theme); - } - - return $scheme; - } - - /** - * Prevent circular inheritance - * - * @param string $area - * @param string $package - * @param string $theme - * @throws Mage_Core_Exception - * @return array - */ - protected function _checkVisited($area, $package, $theme) - { - $path = $area . '/' . $package . '/' . $theme; - if (in_array($path, $this->_visited)) { - throw new Mage_Core_Exception( - 'Circular inheritance in theme ' . $package . '/' . $theme - ); - } - $this->_visited[] = $path; - } - - /** - * Get fallback scheme when inheritance is not defined (backward compatibility) - * - * @return array - */ - protected function _getLegacyFallbackScheme() - { - return array( - array(), - array('_theme' => $this->_getFallbackTheme()), - array('_theme' => Mage_Core_Model_Design_Package::DEFAULT_THEME), - ); - } - - /** - * Default theme getter - * @return string - */ - protected function _getFallbackTheme() - { - return $this->getStore()->getConfig('design/theme/default'); - } -} diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php index ce520dbac..f3c8b2739 100644 --- a/app/code/core/Mage/Core/Model/Design/Package.php +++ b/app/code/core/Mage/Core/Model/Design/Package.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -82,16 +82,8 @@ class Mage_Core_Model_Design_Package */ protected $_callbackFileDir; - /** - * @var Mage_Core_Model_Design_Config - */ protected $_config = null; - /** - * @var Mage_Core_Model_Design_Fallback - */ - protected $_fallback = null; - /** * Whether theme/skin hierarchy should be checked via fallback mechanism * @TODO: implement setter for this value @@ -99,18 +91,6 @@ class Mage_Core_Model_Design_Package */ protected $_shouldFallback = true; - public function __construct() - { - if (is_null($this->_config)) { - $this->_config = Mage::getSingleton('core/design_config'); - } - if (is_null($this->_fallback)) { - $this->_fallback = Mage::getSingleton('core/design_fallback', array( - 'config' => $this->_config, - )); - } - } - /** * Set store * @@ -119,9 +99,6 @@ public function __construct() */ public function setStore($store) { - if ($this->_fallback) { - $this->_fallback->setStore($store); - } $this->_store = $store; return $this; } @@ -441,19 +418,24 @@ public function getFilename($file, array $params) { Varien_Profiler::start(__METHOD__); $this->updateParamDefaults($params); - $result = $this->_fallback( - $file, - $params, - $this->_fallback->getFallbackScheme( - $params['_area'], - $params['_package'], - $params['_theme'] - ) - ); + $result = $this->_fallback($file, $params, array( + array(), + array('_theme' => $this->getFallbackTheme()), + array('_theme' => self::DEFAULT_THEME), + )); Varien_Profiler::stop(__METHOD__); return $result; } + /** + * Default theme getter + * @return string + */ + public function getFallbackTheme() + { + return Mage::getStoreConfig('design/theme/default', $this->getStore()); + } + public function getLayoutFilename($file, array $params=array()) { $params['_type'] = 'layout'; @@ -490,15 +472,11 @@ public function getSkinUrl($file = null, array $params = array()) } $this->updateParamDefaults($params); if (!empty($file)) { - $result = $this->_fallback( - $file, - $params, - $this->_fallback->getFallbackScheme( - $params['_area'], - $params['_package'], - $params['_theme'] - ) - ); + $result = $this->_fallback($file, $params, array( + array(), + array('_theme' => $this->getFallbackTheme()), + array('_theme' => self::DEFAULT_THEME), + )); } $result = $this->getSkinBaseUrl($params) . (empty($file) ? '' : $file); Varien_Profiler::stop(__METHOD__); @@ -877,14 +855,4 @@ protected function _prepareUrl($uri) } return $uri; } - - /** - * Default theme getter - * @return string - * @deprecated since 1.8.2.0 - */ - public function getFallbackTheme() - { - return Mage::getStoreConfig('design/theme/default', $this->getStore()); - } } diff --git a/app/code/core/Mage/Core/Model/Design/Source/Apply.php b/app/code/core/Mage/Core/Model/Design/Source/Apply.php index d5bd1c5bb..22be385fd 100644 --- a/app/code/core/Mage/Core/Model/Design/Source/Apply.php +++ b/app/code/core/Mage/Core/Model/Design/Source/Apply.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Design/Source/Design.php b/app/code/core/Mage/Core/Model/Design/Source/Design.php index 09cdb7129..58e93a0e8 100644 --- a/app/code/core/Mage/Core/Model/Design/Source/Design.php +++ b/app/code/core/Mage/Core/Model/Design/Source/Design.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Domainpolicy.php b/app/code/core/Mage/Core/Model/Domainpolicy.php deleted file mode 100644 index 0598a6f8f..000000000 --- a/app/code/core/Mage/Core/Model/Domainpolicy.php +++ /dev/null @@ -1,133 +0,0 @@ - - */ -class Mage_Core_Model_Domainpolicy -{ - /** - * X-Frame-Options allow (header is absent) - */ - const FRAME_POLICY_ALLOW = 1; - - /** - * X-Frame-Options SAMEORIGIN - */ - const FRAME_POLICY_ORIGIN = 2; - - /** - * Path to backend domain policy settings - */ - const XML_DOMAIN_POLICY_BACKEND = 'admin/security/domain_policy_backend'; - - /** - * Path to frontend domain policy settings - */ - const XML_DOMAIN_POLICY_FRONTEND = 'admin/security/domain_policy_frontend'; - - /** - * Current store - * - * @var Mage_Core_Model_Store - */ - protected $_store; - - public function __construct($options = array()) - { - $this->_store = isset($options['store']) ? $options['store'] : Mage::app()->getStore(); - } - - /** - * Add X-Frame-Options header to response, depends on config settings - * - * @var Varien_Object $observer - * @return $this - */ - public function addDomainPolicyHeader($observer) - { - /** @var Mage_Core_Controller->getCurrentAreaDomainPolicy_Varien_Action $action */ - $action = $observer->getControllerAction(); - $policy = null; - - if ('adminhtml' == $action->getLayout()->getArea()) { - $policy = $this->getBackendPolicy(); - } elseif('frontend' == $action->getLayout()->getArea()) { - $policy = $this->getFrontendPolicy(); - } - - if ($policy) { - /** @var Mage_Core_Controller_Response_Http $response */ - $response = $action->getResponse(); - $response->setHeader('X-Frame-Options', $policy, true); - } - - return $this; - } - - /** - * Get backend policy - * - * @return string|null - */ - public function getBackendPolicy() - { - return $this->_getDomainPolicyByCode((int)(string)$this->_store->getConfig(self::XML_DOMAIN_POLICY_BACKEND)); - } - - /** - * Get frontend policy - * - * @return string|null - */ - public function getFrontendPolicy() - { - return $this->_getDomainPolicyByCode((int)(string)$this->_store->getConfig(self::XML_DOMAIN_POLICY_FRONTEND)); - } - - - - /** - * Return string representation for policy code - * - * @param $policyCode - * @return string|null - */ - protected function _getDomainPolicyByCode($policyCode) - { - switch($policyCode) { - case self::FRAME_POLICY_ALLOW: - $policy = null; - break; - default: - $policy = 'SAMEORIGIN'; - } - - return $policy; - } -} diff --git a/app/code/core/Mage/Core/Model/Email.php b/app/code/core/Mage/Core/Model/Email.php index e94f6e6d9..5ff07ce30 100644 --- a/app/code/core/Mage/Core/Model/Email.php +++ b/app/code/core/Mage/Core/Model/Email.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Email/Info.php b/app/code/core/Mage/Core/Model/Email/Info.php index f1c878e82..042139e3c 100644 --- a/app/code/core/Mage/Core/Model/Email/Info.php +++ b/app/code/core/Mage/Core/Model/Email/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Email/Template.php b/app/code/core/Mage/Core/Model/Email/Template.php index c7512b563..77b1f34c4 100644 --- a/app/code/core/Mage/Core/Model/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Email/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Email/Template/Filter.php b/app/code/core/Mage/Core/Model/Email/Template/Filter.php index 065159aaa..634a98961 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Filter.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Filter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Email/Template/Mailer.php b/app/code/core/Mage/Core/Model/Email/Template/Mailer.php index 0cf53a473..9be0310a5 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Mailer.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Mailer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Email/Transport.php b/app/code/core/Mage/Core/Model/Email/Transport.php index 6c6c5d754..b79e0efa2 100644 --- a/app/code/core/Mage/Core/Model/Email/Transport.php +++ b/app/code/core/Mage/Core/Model/Email/Transport.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Encryption.php b/app/code/core/Mage/Core/Model/Encryption.php index 1e14bebeb..321051365 100644 --- a/app/code/core/Mage/Core/Model/Encryption.php +++ b/app/code/core/Mage/Core/Model/Encryption.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Factory.php b/app/code/core/Mage/Core/Model/Factory.php index f22fae7b2..072609c1d 100644 --- a/app/code/core/Mage/Core/Model/Factory.php +++ b/app/code/core/Mage/Core/Model/Factory.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/File/Storage.php b/app/code/core/Mage/Core/Model/File/Storage.php index d2763258a..a9da7658f 100644 --- a/app/code/core/Mage/Core/Model/File/Storage.php +++ b/app/code/core/Mage/Core/Model/File/Storage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +46,6 @@ class Mage_Core_Model_File_Storage extends Mage_Core_Model_Abstract const XML_PATH_STORAGE_MEDIA = 'default/system/media_storage_configuration/media_storage'; const XML_PATH_STORAGE_MEDIA_DATABASE = 'default/system/media_storage_configuration/media_database'; const XML_PATH_MEDIA_RESOURCE_WHITELIST = 'default/system/media_storage_configuration/allowed_resources'; - const XML_PATH_MEDIA_RESOURCE_IGNORED = 'default/system/media_storage_configuration/ignored_resources'; const XML_PATH_MEDIA_UPDATE_TIME = 'system/media_storage_configuration/configuration_update_time'; diff --git a/app/code/core/Mage/Core/Model/File/Storage/Abstract.php b/app/code/core/Mage/Core/Model/File/Storage/Abstract.php index 5d9d361b7..1267e8d79 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Abstract.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/File/Storage/Database.php b/app/code/core/Mage/Core/Model/File/Storage/Database.php index 4c7740097..1797e0a33 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Database.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/File/Storage/Database/Abstract.php b/app/code/core/Mage/Core/Model/File/Storage/Database/Abstract.php index 281c4776c..383a32a78 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Database/Abstract.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Database/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php b/app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php index bbadcd4ca..4960cc3b3 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/File/Storage/File.php b/app/code/core/Mage/Core/Model/File/Storage/File.php index 6a6b7ea0b..da598621c 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/File.php +++ b/app/code/core/Mage/Core/Model/File/Storage/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/File/Storage/Flag.php b/app/code/core/Mage/Core/Model/File/Storage/Flag.php index 2f45fb94b..ef8e3b007 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Flag.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Flag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/File/Uploader.php b/app/code/core/Mage/Core/Model/File/Uploader.php index c9e50da17..f91785194 100644 --- a/app/code/core/Mage/Core/Model/File/Uploader.php +++ b/app/code/core/Mage/Core/Model/File/Uploader.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php index 4d98d6422..a33628ebe 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php +++ b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php b/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php index eee0604c3..b460cc6f3 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php +++ b/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Flag.php b/app/code/core/Mage/Core/Model/Flag.php index 1a9f3ac74..7487892e1 100644 --- a/app/code/core/Mage/Core/Model/Flag.php +++ b/app/code/core/Mage/Core/Model/Flag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Input/Filter.php b/app/code/core/Mage/Core/Model/Input/Filter.php index e4d5ef4ad..337a1eca0 100644 --- a/app/code/core/Mage/Core/Model/Input/Filter.php +++ b/app/code/core/Mage/Core/Model/Input/Filter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php b/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php index 0b53c2ec9..4ba9fe8ab 100644 --- a/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php +++ b/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Language.php b/app/code/core/Mage/Core/Model/Language.php index f0fc00e69..57637be42 100644 --- a/app/code/core/Mage/Core/Model/Language.php +++ b/app/code/core/Mage/Core/Model/Language.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Layout.php b/app/code/core/Mage/Core/Model/Layout.php index f793b60e9..f3f6bde39 100644 --- a/app/code/core/Mage/Core/Model/Layout.php +++ b/app/code/core/Mage/Core/Model/Layout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Layout/Data.php b/app/code/core/Mage/Core/Model/Layout/Data.php index 87d9a3ddb..39b317db6 100644 --- a/app/code/core/Mage/Core/Model/Layout/Data.php +++ b/app/code/core/Mage/Core/Model/Layout/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Layout/Element.php b/app/code/core/Mage/Core/Model/Layout/Element.php index ab53e4152..77b68439d 100644 --- a/app/code/core/Mage/Core/Model/Layout/Element.php +++ b/app/code/core/Mage/Core/Model/Layout/Element.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Layout/Update.php b/app/code/core/Mage/Core/Model/Layout/Update.php index f8296e9b7..89f535a26 100644 --- a/app/code/core/Mage/Core/Model/Layout/Update.php +++ b/app/code/core/Mage/Core/Model/Layout/Update.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -417,20 +417,14 @@ public function getFileLayoutUpdatesXml($area, $package, $theme, $storeId = null $elementClass = $this->getElementClass(); $updatesRoot = Mage::app()->getConfig()->getNode($area.'/layout/updates'); Mage::dispatchEvent('core_layout_update_updates_get_after', array('updates' => $updatesRoot)); - $updates = $updatesRoot->asArray(); - $themeUpdates = Mage::getSingleton('core/design_config')->getNode("$area/$package/$theme/layout/updates"); - if ($themeUpdates && is_array($themeUpdates->asArray())) { - //array_values() to ensure that theme-specific layouts don't override, but add to module layouts - $updates = array_merge($updates, array_values($themeUpdates->asArray())); - } $updateFiles = array(); - foreach ($updates as $updateNode) { - if (!empty($updateNode['file'])) { - $module = isset($updateNode['@']['module']) ? $updateNode['@']['module'] : false; + foreach ($updatesRoot->children() as $updateNode) { + if ($updateNode->file) { + $module = $updateNode->getAttribute('module'); if ($module && Mage::getStoreConfigFlag('advanced/modules_disable_output/' . $module, $storeId)) { continue; } - $updateFiles[] = $updateNode['file']; + $updateFiles[] = (string)$updateNode->file; } } // custom local layout updates file - load always last diff --git a/app/code/core/Mage/Core/Model/Locale.php b/app/code/core/Mage/Core/Model/Locale.php index e5116e9e1..8d28aa8fe 100644 --- a/app/code/core/Mage/Core/Model/Locale.php +++ b/app/code/core/Mage/Core/Model/Locale.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -511,13 +511,12 @@ public function date($date = null, $part = null, $locale = null, $useTimezone = * @param mixed $store Information about store * @param string|integer|Zend_Date|array|null $date date in UTC * @param boolean $includeTime flag for including time to date - * @param string|null $format * @return Zend_Date */ - public function storeDate($store=null, $date=null, $includeTime=false, $format = null) + public function storeDate($store=null, $date=null, $includeTime=false) { $timezone = Mage::app()->getStore($store)->getConfig(self::XML_PATH_DEFAULT_TIMEZONE); - $date = new Zend_Date($date, $format, $this->getLocale()); + $date = new Zend_Date($date, null, $this->getLocale()); $date->setTimezone($timezone); if (!$includeTime) { $date->setHour(0) diff --git a/app/code/core/Mage/Core/Model/Locale/Config.php b/app/code/core/Mage/Core/Model/Locale/Config.php index 4781a553f..012f00e6b 100644 --- a/app/code/core/Mage/Core/Model/Locale/Config.php +++ b/app/code/core/Mage/Core/Model/Locale/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Core_Model_Locale_Config diff --git a/app/code/core/Mage/Core/Model/Log/Adapter.php b/app/code/core/Mage/Core/Model/Log/Adapter.php index e4ceb0809..6544fc4ee 100644 --- a/app/code/core/Mage/Core/Model/Log/Adapter.php +++ b/app/code/core/Mage/Core/Model/Log/Adapter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Logger.php b/app/code/core/Mage/Core/Model/Logger.php index da10e6f40..0d3fde4df 100644 --- a/app/code/core/Mage/Core/Model/Logger.php +++ b/app/code/core/Mage/Core/Model/Logger.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Magento/Api.php b/app/code/core/Mage/Core/Model/Magento/Api.php index 81c1dc8d1..3764fb9a0 100644 --- a/app/code/core/Mage/Core/Model/Magento/Api.php +++ b/app/code/core/Mage/Core/Model/Magento/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Magento/Api/V2.php b/app/code/core/Mage/Core/Model/Magento/Api/V2.php index b3d6e7e2e..633b1f283 100644 --- a/app/code/core/Mage/Core/Model/Magento/Api/V2.php +++ b/app/code/core/Mage/Core/Model/Magento/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Message.php b/app/code/core/Mage/Core/Model/Message.php index 09a4d579e..dc6cd4ef6 100644 --- a/app/code/core/Mage/Core/Model/Message.php +++ b/app/code/core/Mage/Core/Model/Message.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Message/Abstract.php b/app/code/core/Mage/Core/Model/Message/Abstract.php index 903fd69dd..9580087f6 100644 --- a/app/code/core/Mage/Core/Model/Message/Abstract.php +++ b/app/code/core/Mage/Core/Model/Message/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Message/Collection.php b/app/code/core/Mage/Core/Model/Message/Collection.php index a400d729a..2e3677898 100644 --- a/app/code/core/Mage/Core/Model/Message/Collection.php +++ b/app/code/core/Mage/Core/Model/Message/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Message/Error.php b/app/code/core/Mage/Core/Model/Message/Error.php index af1defe98..3da856576 100644 --- a/app/code/core/Mage/Core/Model/Message/Error.php +++ b/app/code/core/Mage/Core/Model/Message/Error.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Message/Notice.php b/app/code/core/Mage/Core/Model/Message/Notice.php index c753ba9d0..2f7f4a1b8 100644 --- a/app/code/core/Mage/Core/Model/Message/Notice.php +++ b/app/code/core/Mage/Core/Model/Message/Notice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Message/Success.php b/app/code/core/Mage/Core/Model/Message/Success.php index 5a913cd5d..805b6462f 100644 --- a/app/code/core/Mage/Core/Model/Message/Success.php +++ b/app/code/core/Mage/Core/Model/Message/Success.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Message/Warning.php b/app/code/core/Mage/Core/Model/Message/Warning.php index c41ecac39..5034f116c 100644 --- a/app/code/core/Mage/Core/Model/Message/Warning.php +++ b/app/code/core/Mage/Core/Model/Message/Warning.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/Abstract.php index 692bfb7fc..6a68827e7 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Abstract.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Cache.php b/app/code/core/Mage/Core/Model/Mysql4/Cache.php index 0741b25f8..0fed340b4 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Cache.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Cache.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php index 4e0f2371c..4a6c2c06c 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config.php b/app/code/core/Mage/Core/Model/Mysql4/Config.php index 5e14e07a4..7402f996e 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Config.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php b/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php index c806d9f97..dac173c07 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php index 7d71057e1..ee532ac36 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design.php b/app/code/core/Mage/Core/Model/Mysql4/Design.php index dd5582955..240529c13 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php index 4680c1b30..eb346c2cd 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php index 6e4e168e6..305ad506c 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php index 294b852e8..90e53f29c 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php index 50ea507ac..8ac238a88 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php index 6080e8092..bda1cba9a 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php index 0e3e62fb6..bd2775f58 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php +++ b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php index aef2697e2..bd7627986 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php index 12e338ca7..9e87d3025 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php +++ b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php index 37ae5413d..cdc5cb8a3 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php +++ b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Flag.php b/app/code/core/Mage/Core/Model/Mysql4/Flag.php index b2986eafd..c8ffefdaf 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Flag.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Flag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Language.php b/app/code/core/Mage/Core/Model/Mysql4/Language.php index 8c1957ad5..87f2dd1ac 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Language.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Language.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php index e20cf5587..1d306eb79 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Layout.php b/app/code/core/Mage/Core/Model/Mysql4/Layout.php index ed7d1f91b..98949af6d 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Layout.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Layout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Resource.php b/app/code/core/Mage/Core/Model/Mysql4/Resource.php index 1a64ee7af..d9caa3466 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Resource.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Resource.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Session.php b/app/code/core/Mage/Core/Model/Mysql4/Session.php index c1c2d3d51..5ca1436b7 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Session.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store.php b/app/code/core/Mage/Core/Model/Mysql4/Store.php index 1481f3f94..0fd45d06a 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php index 6b1b88c1d..67a4de328 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php index 048cfbd7a..02a5e8070 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php index 97914c8d6..e7f53c7a2 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate.php b/app/code/core/Mage/Core/Model/Mysql4/Translate.php index 014027e41..d4e680d80 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Translate.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Translate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php index 28676b73f..966cc6ca4 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php index 10e1c013b..b0695651b 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php index 1e5df53ec..dbd3632f6 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Variable.php b/app/code/core/Mage/Core/Model/Mysql4/Variable.php index 16a2dff9b..1bede068d 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Variable.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Variable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php index e041c5c6c..b372dd5e1 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website.php b/app/code/core/Mage/Core/Model/Mysql4/Website.php index 40a14706f..914243f48 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Website.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php index 68c269b34..5f3e5eae4 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Observer.php b/app/code/core/Mage/Core/Model/Observer.php index 3e93fc92c..e2d2f8d8d 100644 --- a/app/code/core/Mage/Core/Model/Observer.php +++ b/app/code/core/Mage/Core/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource.php b/app/code/core/Mage/Core/Model/Resource.php index 4d9f46f5f..63ae045de 100644 --- a/app/code/core/Mage/Core/Model/Resource.php +++ b/app/code/core/Mage/Core/Model/Resource.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Abstract.php index 31e2dcd1e..5ddd0ed94 100644 --- a/app/code/core/Mage/Core/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Cache.php b/app/code/core/Mage/Core/Model/Resource/Cache.php index 6472504b3..d9ec91788 100644 --- a/app/code/core/Mage/Core/Model/Resource/Cache.php +++ b/app/code/core/Mage/Core/Model/Resource/Cache.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Config.php b/app/code/core/Mage/Core/Model/Resource/Config.php index a7e9ff769..171f3c1a2 100644 --- a/app/code/core/Mage/Core/Model/Resource/Config.php +++ b/app/code/core/Mage/Core/Model/Resource/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Config/Data.php b/app/code/core/Mage/Core/Model/Resource/Config/Data.php index 94c606a40..b9cf1ef27 100644 --- a/app/code/core/Mage/Core/Model/Resource/Config/Data.php +++ b/app/code/core/Mage/Core/Model/Resource/Config/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php b/app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php index 2cef7318f..d84ab6060 100644 --- a/app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php index de709e225..b6937ab69 100644 --- a/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php index 842ae7492..4f789ef9d 100644 --- a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Design.php b/app/code/core/Mage/Core/Model/Resource/Design.php index 9d750fb0b..85d3445a7 100644 --- a/app/code/core/Mage/Core/Model/Resource/Design.php +++ b/app/code/core/Mage/Core/Model/Resource/Design.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Design/Collection.php b/app/code/core/Mage/Core/Model/Resource/Design/Collection.php index dfe4f8400..68cfd5cbf 100644 --- a/app/code/core/Mage/Core/Model/Resource/Design/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Design/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Design/Package/Collection.php b/app/code/core/Mage/Core/Model/Resource/Design/Package/Collection.php index 4692a1ddc..c2fefbde9 100644 --- a/app/code/core/Mage/Core/Model/Resource/Design/Package/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Design/Package/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Email/Template.php b/app/code/core/Mage/Core/Model/Resource/Email/Template.php index 13202e50c..7b75f7ca3 100644 --- a/app/code/core/Mage/Core/Model/Resource/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Resource/Email/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php b/app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php index 3baa14cb9..e0a9c7743 100644 --- a/app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php index 94785b4ac..d4db9d8af 100644 --- a/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php index 6740cc6f6..42a591a94 100644 --- a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php +++ b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/Abstract.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/Abstract.php index cb4eb37cf..16f39f2c9 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php index 8791f9cfa..d7ef1d531 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php index a19f5e36e..776268aea 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php index e0425061c..f1d820f13 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,12 +41,6 @@ class Mage_Core_Model_Resource_File_Storage_File */ protected $_mediaBaseDirectory = null; - /** - * List of files/directories that should be ignored when cleaning and reading files from the filesystem - * @var array - */ - protected $_ignoredFiles; - /** * Files at storage * @@ -72,13 +66,12 @@ public function getStorageData($dir = '') $files = array(); $directories = array(); $currentDir = $this->getMediaBaseDirectory() . $dir; - $ignoredFiles = array_merge(array('.', '..'), $this->_getIgnoredFiles()); if (is_dir($currentDir)) { $dh = opendir($currentDir); if ($dh) { while (($file = readdir($dh)) !== false) { - if (in_array($file, $ignoredFiles)) { + if ($file == '.' || $file == '..' || $file == '.svn' || $file == '.htaccess') { continue; } @@ -113,13 +106,12 @@ public function getStorageData($dir = '') public function clear($dir = '') { $currentDir = $this->getMediaBaseDirectory() . $dir; - $ignoredFiles = array_merge(array('.', '..'), $this->_getIgnoredFiles()); if (is_dir($currentDir)) { $dh = opendir($currentDir); if ($dh) { while (($file = readdir($dh)) !== false) { - if (in_array($file, $ignoredFiles)) { + if ($file == '.' || $file == '..') { continue; } @@ -138,20 +130,6 @@ public function clear($dir = '') return $this; } - /** - * Returns list of files/directories that should be ignored when cleaning and reading files from the filesystem - * @return array - */ - protected function _getIgnoredFiles() - { - if (null === $this->_ignoredFiles) { - $ignored = (string)Mage::app()->getConfig() - ->getNode(Mage_Core_Model_File_Storage::XML_PATH_MEDIA_RESOURCE_IGNORED); - $this->_ignoredFiles = $ignored ? explode(',', $ignored) : array(); - } - return $this->_ignoredFiles; - } - /** * Save directory to storage * diff --git a/app/code/core/Mage/Core/Model/Resource/Flag.php b/app/code/core/Mage/Core/Model/Resource/Flag.php index 5f828a636..7838067ce 100644 --- a/app/code/core/Mage/Core/Model/Resource/Flag.php +++ b/app/code/core/Mage/Core/Model/Resource/Flag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php index 7db57ec81..6de795981 100644 --- a/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php index 97dac004a..bc7888ba6 100644 --- a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Iterator.php b/app/code/core/Mage/Core/Model/Resource/Iterator.php index c8842f5ad..a436bdf4f 100644 --- a/app/code/core/Mage/Core/Model/Resource/Iterator.php +++ b/app/code/core/Mage/Core/Model/Resource/Iterator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Language.php b/app/code/core/Mage/Core/Model/Resource/Language.php index 51e8766d0..ae1bf5162 100644 --- a/app/code/core/Mage/Core/Model/Resource/Language.php +++ b/app/code/core/Mage/Core/Model/Resource/Language.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Language/Collection.php b/app/code/core/Mage/Core/Model/Resource/Language/Collection.php index def54dbda..bd807b6c1 100644 --- a/app/code/core/Mage/Core/Model/Resource/Language/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Language/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Layout.php b/app/code/core/Mage/Core/Model/Resource/Layout.php index 5e6aa771b..f363b563a 100644 --- a/app/code/core/Mage/Core/Model/Resource/Layout.php +++ b/app/code/core/Mage/Core/Model/Resource/Layout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Resource.php b/app/code/core/Mage/Core/Model/Resource/Resource.php index 53b201bc5..464dd8c38 100644 --- a/app/code/core/Mage/Core/Model/Resource/Resource.php +++ b/app/code/core/Mage/Core/Model/Resource/Resource.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Session.php b/app/code/core/Mage/Core/Model/Resource/Session.php index 5264dcdb1..bcb5ceaa1 100644 --- a/app/code/core/Mage/Core/Model/Resource/Session.php +++ b/app/code/core/Mage/Core/Model/Resource/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php index 049948a44..b1afa6948 100644 --- a/app/code/core/Mage/Core/Model/Resource/Setup.php +++ b/app/code/core/Mage/Core/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php b/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php index 45a0e1a14..103d37f01 100644 --- a/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php +++ b/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Store.php b/app/code/core/Mage/Core/Model/Resource/Store.php index 739c5c0e3..d8515a7bb 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store.php +++ b/app/code/core/Mage/Core/Model/Resource/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Store/Collection.php b/app/code/core/Mage/Core/Model/Resource/Store/Collection.php index fd719be84..d9fd5a541 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Store/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Store/Group.php b/app/code/core/Mage/Core/Model/Resource/Store/Group.php index facfc8a55..dcc7cc1fa 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Resource/Store/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Store/Group/Collection.php b/app/code/core/Mage/Core/Model/Resource/Store/Group/Collection.php index b7984cb39..c40ac9b88 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store/Group/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Store/Group/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Transaction.php b/app/code/core/Mage/Core/Model/Resource/Transaction.php index 08c868632..5c140fd5b 100644 --- a/app/code/core/Mage/Core/Model/Resource/Transaction.php +++ b/app/code/core/Mage/Core/Model/Resource/Transaction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Translate.php b/app/code/core/Mage/Core/Model/Resource/Translate.php index e60d89142..193db228f 100644 --- a/app/code/core/Mage/Core/Model/Resource/Translate.php +++ b/app/code/core/Mage/Core/Model/Resource/Translate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Translate/String.php b/app/code/core/Mage/Core/Model/Resource/Translate/String.php index 22b3197c0..a0ad92a99 100644 --- a/app/code/core/Mage/Core/Model/Resource/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Resource/Translate/String.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php index 037398c47..92af064d3 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db.php b/app/code/core/Mage/Core/Model/Resource/Type/Db.php index 697d55612..6122ea0e4 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php index 95d5dee6b..a01fd611f 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php index 1810be23e..822d55859 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php index acca539d9..f3b5a9d09 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php index fda08e14b..ada8af2ee 100644 --- a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php index 10c1ae715..3b3a124c8 100644 --- a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Variable.php b/app/code/core/Mage/Core/Model/Resource/Variable.php index 57687825b..3ee1fa685 100644 --- a/app/code/core/Mage/Core/Model/Resource/Variable.php +++ b/app/code/core/Mage/Core/Model/Resource/Variable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php b/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php index 2a213aefb..84c6f34c5 100644 --- a/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Website.php b/app/code/core/Mage/Core/Model/Resource/Website.php index 8a04b66b5..cdaa607bb 100644 --- a/app/code/core/Mage/Core/Model/Resource/Website.php +++ b/app/code/core/Mage/Core/Model/Resource/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Website/Collection.php b/app/code/core/Mage/Core/Model/Resource/Website/Collection.php index 241323222..564c34ed9 100644 --- a/app/code/core/Mage/Core/Model/Resource/Website/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Website/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Session.php b/app/code/core/Mage/Core/Model/Session.php index 2e54de201..6994275c9 100644 --- a/app/code/core/Mage/Core/Model/Session.php +++ b/app/code/core/Mage/Core/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Session/Abstract.php b/app/code/core/Mage/Core/Model/Session/Abstract.php index a6940fdcd..64b21cbfe 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php index c100f9097..c7849c403 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php index 97668e61c..8c4905907 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Session/Exception.php b/app/code/core/Mage/Core/Model/Session/Exception.php index 6b4b87f3c..d162baf77 100644 --- a/app/code/core/Mage/Core/Model/Session/Exception.php +++ b/app/code/core/Mage/Core/Model/Session/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Source/Email/Variables.php b/app/code/core/Mage/Core/Model/Source/Email/Variables.php index 6991b65aa..8b5950be7 100644 --- a/app/code/core/Mage/Core/Model/Source/Email/Variables.php +++ b/app/code/core/Mage/Core/Model/Source/Email/Variables.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php index 14b3429d8..70be67845 100644 --- a/app/code/core/Mage/Core/Model/Store.php +++ b/app/code/core/Mage/Core/Model/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Store/Api.php b/app/code/core/Mage/Core/Model/Store/Api.php index 6bbc4c492..ba6f71130 100644 --- a/app/code/core/Mage/Core/Model/Store/Api.php +++ b/app/code/core/Mage/Core/Model/Store/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Store/Api/V2.php b/app/code/core/Mage/Core/Model/Store/Api/V2.php index a044073e1..e071102cf 100644 --- a/app/code/core/Mage/Core/Model/Store/Api/V2.php +++ b/app/code/core/Mage/Core/Model/Store/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Store/Exception.php b/app/code/core/Mage/Core/Model/Store/Exception.php index c2c7f0021..6a627368a 100644 --- a/app/code/core/Mage/Core/Model/Store/Exception.php +++ b/app/code/core/Mage/Core/Model/Store/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Store/Group.php b/app/code/core/Mage/Core/Model/Store/Group.php index faaa42216..f0afda81d 100644 --- a/app/code/core/Mage/Core/Model/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Store/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Store/Observer.php b/app/code/core/Mage/Core/Model/Store/Observer.php index 7cc065a7e..877cdc838 100644 --- a/app/code/core/Mage/Core/Model/Store/Observer.php +++ b/app/code/core/Mage/Core/Model/Store/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Template.php b/app/code/core/Mage/Core/Model/Template.php index 24ebd0007..420d7a4b9 100644 --- a/app/code/core/Mage/Core/Model/Template.php +++ b/app/code/core/Mage/Core/Model/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Translate.php b/app/code/core/Mage/Core/Model/Translate.php index 977a37c58..e2b44361f 100644 --- a/app/code/core/Mage/Core/Model/Translate.php +++ b/app/code/core/Mage/Core/Model/Translate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Translate/Expr.php b/app/code/core/Mage/Core/Model/Translate/Expr.php index bec1ea60f..25e79e5bd 100644 --- a/app/code/core/Mage/Core/Model/Translate/Expr.php +++ b/app/code/core/Mage/Core/Model/Translate/Expr.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Translate/Inline.php b/app/code/core/Mage/Core/Model/Translate/Inline.php index c707f1d6b..3705ecadd 100644 --- a/app/code/core/Mage/Core/Model/Translate/Inline.php +++ b/app/code/core/Mage/Core/Model/Translate/Inline.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Translate/String.php b/app/code/core/Mage/Core/Model/Translate/String.php index 215025b1b..8adcf014a 100644 --- a/app/code/core/Mage/Core/Model/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Translate/String.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Url.php b/app/code/core/Mage/Core/Model/Url.php index 69c67ab52..5f78549b2 100644 --- a/app/code/core/Mage/Core/Model/Url.php +++ b/app/code/core/Mage/Core/Model/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Url/Rewrite.php index efedb3d85..43f3cb0fa 100644 --- a/app/code/core/Mage/Core/Model/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Model/Url/Rewrite.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite/Interface.php b/app/code/core/Mage/Core/Model/Url/Rewrite/Interface.php index 5dd0d1447..1720916a6 100644 --- a/app/code/core/Mage/Core/Model/Url/Rewrite/Interface.php +++ b/app/code/core/Mage/Core/Model/Url/Rewrite/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php index a12c87ab5..773c78103 100644 --- a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php +++ b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -140,7 +140,7 @@ protected function _rewriteDb() $fromStore = $this->_request->getQuery('___from_store'); if (!$this->_rewrite->getId() && $fromStore) { - $stores = $this->_app->getStores(false, true); + $stores = $this->_app->getStores(); if (!empty($stores[$fromStore])) { /** @var $store Mage_Core_Model_Store */ $store = $stores[$fromStore]; @@ -160,7 +160,7 @@ protected function _rewriteDb() $this->_setStoreCodeCookie($currentStore->getCode()); - $targetUrl = $currentStore->getBaseUrl() . $this->_rewrite->getRequestPath(); + $targetUrl = $this->_request->getBaseUrl() . '/' . $this->_rewrite->getRequestPath(); $this->_sendRedirectHeaders($targetUrl, true); } diff --git a/app/code/core/Mage/Core/Model/Url/Validator.php b/app/code/core/Mage/Core/Model/Url/Validator.php index 232031b0d..914d75ac0 100644 --- a/app/code/core/Mage/Core/Model/Url/Validator.php +++ b/app/code/core/Mage/Core/Model/Url/Validator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Variable.php b/app/code/core/Mage/Core/Model/Variable.php index a2dce4255..3a7f935cb 100644 --- a/app/code/core/Mage/Core/Model/Variable.php +++ b/app/code/core/Mage/Core/Model/Variable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Variable/Config.php b/app/code/core/Mage/Core/Model/Variable/Config.php index 58ad57f59..6f4c1b64e 100644 --- a/app/code/core/Mage/Core/Model/Variable/Config.php +++ b/app/code/core/Mage/Core/Model/Variable/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Variable/Observer.php b/app/code/core/Mage/Core/Model/Variable/Observer.php index 937df19d4..56b3ce5bb 100644 --- a/app/code/core/Mage/Core/Model/Variable/Observer.php +++ b/app/code/core/Mage/Core/Model/Variable/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Website.php b/app/code/core/Mage/Core/Model/Website.php index 52803fee9..e0d47c382 100644 --- a/app/code/core/Mage/Core/Model/Website.php +++ b/app/code/core/Mage/Core/Model/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/controllers/AjaxController.php b/app/code/core/Mage/Core/controllers/AjaxController.php index a142489c2..33be8472f 100644 --- a/app/code/core/Mage/Core/controllers/AjaxController.php +++ b/app/code/core/Mage/Core/controllers/AjaxController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/controllers/IndexController.php b/app/code/core/Mage/Core/controllers/IndexController.php index 759dbe30c..5911d19d6 100644 --- a/app/code/core/Mage/Core/controllers/IndexController.php +++ b/app/code/core/Mage/Core/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/etc/api.xml b/app/code/core/Mage/Core/etc/api.xml index 09950f5e2..0717564ae 100644 --- a/app/code/core/Mage/Core/etc/api.xml +++ b/app/code/core/Mage/Core/etc/api.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml index 317b8b5c7..b361a687f 100644 --- a/app/code/core/Mage/Core/etc/config.xml +++ b/app/code/core/Mage/Core/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -152,16 +152,6 @@ core/url_rewrite_request - - - - - Mage_Core_Model_Domainpolicy - addDomainPolicyHeader - - - - @@ -251,7 +241,7 @@ frontend default - rwd + default default default @@ -298,7 +288,6 @@ css_secure js - .svn,.htaccess @@ -388,8 +377,6 @@ 1 - 2 - 2 diff --git a/app/code/core/Mage/Core/etc/jstranslator.xml b/app/code/core/Mage/Core/etc/jstranslator.xml index 27c37a98a..3e138ca21 100644 --- a/app/code/core/Mage/Core/etc/jstranslator.xml +++ b/app/code/core/Mage/Core/etc/jstranslator.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index 5cf12a9ce..a43aab7ac 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -1110,26 +1110,6 @@ 0 0 - - - select - Enabling ability to run Magento in a frame is not recommended for security reasons. - adminhtml/system_config_source_security_domainpolicy - 4 - 1 - 0 - 0 - - - - Enabling ability to run Magento in a frame is not recommended for security reasons. - select - 5 - adminhtml/system_config_source_security_domainpolicy - 1 - 0 - 0 - diff --git a/app/code/core/Mage/Core/functions.php b/app/code/core/Mage/Core/functions.php index 42833369e..a42274762 100644 --- a/app/code/core/Mage/Core/functions.php +++ b/app/code/core/Mage/Core/functions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php b/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php index 35725061a..e80bd43cf 100644 --- a/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-data-upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-data-upgrade-1.6.0.2-1.6.0.3.php index 29739f677..ed29d43eb 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-data-upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-data-upgrade-1.6.0.2-1.6.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php index 33b0efd98..c0a457d6e 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php index 1aff49926..28888ffbe 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php index 91cc89908..2e9cd736f 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php index 0d9c2ecf8..ba6e2a407 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php index c4ee8b9c2..a8c9430ec 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php index 38d975219..98eff0965 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,16 +29,7 @@ $installer->startSetup(); -$rows = $installer->_conn->fetchAll( - "select * from {$this->getTable('core_config_data')} where - path in ( - 'paypal/wpp/api_password', 'paypal/wpp/api_signature', 'paypal/wpp/api_username', - 'paypal/wps/business_account', 'paypal/wpuk/user', 'paypal/wpuk/pwd', 'carriers/dhl/id', - 'carriers/dhl/password', 'carriers/dhl/shipping_key', 'carriers/dhl/shipping_intlkey', - 'carriers/fedex/account', 'carriers/ups/account_license_number', 'carriers/ups/username', - 'carriers/usps/userid', 'payment/authorizenet/login', 'payment/authorizenet/trans_key', - 'payment/verisign/pwd', 'payment/verisign/user')" -); +$rows = $installer->_conn->fetchAll("select * from {$this->getTable('core_config_data')} where path in ('paypal/wpp/api_password', 'paypal/wpp/api_signature', 'paypal/wpp/api_username', 'paypal/wps/business_account', 'paypal/wpuk/user', 'paypal/wpuk/pwd', 'carriers/dhl/id', 'carriers/dhl/password', 'carriers/dhl/shipping_key', 'carriers/dhl/shipping_intlkey', 'carriers/fedex/account', 'carriers/ups/account_license_number', 'carriers/ups/username', 'carriers/usps/userid', 'payment/authorizenet/login', 'payment/authorizenet/trans_key', 'payment/verisign/pwd', 'payment/verisign/user')"); $hlp = Mage::helper('core'); foreach ($rows as $r) { @@ -47,4 +38,3 @@ $installer->_conn->update($this->getTable('core_config_data'), $r, 'config_id='.$r['config_id']); } } -$installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php index 510e6d2cf..95fd4b7fe 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php index e53eaf6ae..5b111d9e8 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php index 2f3d410d6..be142b54f 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php index 09b71d24d..93443f3a4 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php index f867d0031..bea7295dc 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php index d3eee505b..0f2c9edc1 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php index c0056b481..8b4626f30 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php index d8fef4f5c..9fdb42f16 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php index f5dfe1c92..25a512739 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php index 038d079e8..5063819e8 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.13-0.8.14.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.13-0.8.14.php index b5da4007f..f5b50d896 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.13-0.8.14.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.13-0.8.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php index a666d10b0..855b1dda9 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php index ca9017c6e..e236f9248 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php index 4db585f02..796f2941d 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.17-0.8.18.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.17-0.8.18.php index fa68e9be6..bd94c0a29 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.17-0.8.18.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.17-0.8.18.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.18-0.8.19.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.18-0.8.19.php index f3809140e..4a875e65f 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.18-0.8.19.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.18-0.8.19.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.19-0.8.20.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.19-0.8.20.php index 918d3cd25..9d20735eb 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.19-0.8.20.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.19-0.8.20.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php index b20bf950a..1ee23de1b 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.20-0.8.21.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.20-0.8.21.php index 0e788d1fb..e339b9894 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.20-0.8.21.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.20-0.8.21.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.21-0.8.22.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.21-0.8.22.php index 38f2dd7c8..0d2834028 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.21-0.8.22.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.21-0.8.22.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.22-0.8.23.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.22-0.8.23.php index c7d3b3a6a..5de7a2c19 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.22-0.8.23.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.22-0.8.23.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.23-0.8.24.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.23-0.8.24.php index a31d7f761..e41dee879 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.23-0.8.24.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.23-0.8.24.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.24-0.8.25.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.24-0.8.25.php index 8fc711bad..ccf0958d4 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.24-0.8.25.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.24-0.8.25.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.25-0.8.26.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.25-0.8.26.php index 1225540d1..45facdcf5 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.25-0.8.26.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.25-0.8.26.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.26-0.8.27.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.26-0.8.27.php index 7bad6c85c..fbecae751 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.26-0.8.27.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.26-0.8.27.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.27-0.8.28.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.27-0.8.28.php index ecec1861d..97449e65e 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.27-0.8.28.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.27-0.8.28.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php index 67e56bdb6..a804f1ddf 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php index d12c7e5f1..80de608e1 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php index 184db601e..9e4a19475 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php index bb2a3b952..807113c45 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php index 8ec1b15b7..03476e9b3 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php index fffa3f6bf..ac48d6c0c 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php index 74dbee1e1..3f2f3d362 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index ffed4a7d5..a8b141350 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php index 44ae52ece..613a7f414 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php index a18c323da..b72bb7a64 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php index 944f54e44..08b5c5cd0 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/Exception.php b/app/code/core/Mage/Cron/Exception.php index 5dcd34e4a..317cf5d9d 100644 --- a/app/code/core/Mage/Cron/Exception.php +++ b/app/code/core/Mage/Cron/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/Helper/Data.php b/app/code/core/Mage/Cron/Helper/Data.php index 02cd94123..0dd686d18 100644 --- a/app/code/core/Mage/Cron/Helper/Data.php +++ b/app/code/core/Mage/Cron/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php b/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php index fc31607a2..9679dd02b 100644 --- a/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php +++ b/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php b/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php index b72f6be9d..1b79b5a9c 100644 --- a/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php +++ b/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/Model/Observer.php b/app/code/core/Mage/Cron/Model/Observer.php index f399abafe..617fe4266 100644 --- a/app/code/core/Mage/Cron/Model/Observer.php +++ b/app/code/core/Mage/Cron/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -350,11 +350,16 @@ protected function _getAlwaysJobSchedule($jobCode) if ($schedule->getId() === null) { $ts = strftime('%Y-%m-%d %H:%M:00', time()); $schedule->setJobCode($jobCode) + ->setStatus(Mage_Cron_Model_Schedule::STATUS_RUNNING) ->setCreatedAt($ts) - ->setScheduledAt($ts); + ->setScheduledAt($ts) + ->save(); + return $schedule; + } else if ($schedule->getStatus() != Mage_Cron_Model_Schedule::STATUS_RUNNING) { + $schedule->tryLockJob($schedule->getStatus()); + return $schedule; } - $schedule->setStatus(Mage_Cron_Model_Schedule::STATUS_RUNNING)->save(); - return $schedule; + return false; } } diff --git a/app/code/core/Mage/Cron/Model/Resource/Schedule.php b/app/code/core/Mage/Cron/Model/Resource/Schedule.php index 5d5c3b294..5bd9d618c 100644 --- a/app/code/core/Mage/Cron/Model/Resource/Schedule.php +++ b/app/code/core/Mage/Cron/Model/Resource/Schedule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/Model/Resource/Schedule/Collection.php b/app/code/core/Mage/Cron/Model/Resource/Schedule/Collection.php index 7fd7b4714..dcbf8d36b 100644 --- a/app/code/core/Mage/Cron/Model/Resource/Schedule/Collection.php +++ b/app/code/core/Mage/Cron/Model/Resource/Schedule/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/Model/Schedule.php b/app/code/core/Mage/Cron/Model/Schedule.php index 69184ccc2..3379be7c7 100644 --- a/app/code/core/Mage/Cron/Model/Schedule.php +++ b/app/code/core/Mage/Cron/Model/Schedule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/etc/config.xml b/app/code/core/Mage/Cron/etc/config.xml index dd9557bae..7c5b8807b 100644 --- a/app/code/core/Mage/Cron/etc/config.xml +++ b/app/code/core/Mage/Cron/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cron/etc/system.xml b/app/code/core/Mage/Cron/etc/system.xml index 3d9f6f62e..8459f0ea7 100644 --- a/app/code/core/Mage/Cron/etc/system.xml +++ b/app/code/core/Mage/Cron/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cron/sql/cron_setup/install-1.6.0.0.php b/app/code/core/Mage/Cron/sql/cron_setup/install-1.6.0.0.php index f4f78ea39..59841c7df 100644 --- a/app/code/core/Mage/Cron/sql/cron_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Cron/sql/cron_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php index d72070710..5286063ee 100644 --- a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,6 +34,7 @@ SET SQL_MODE=''; +SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0; SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO'; /*Table structure for table `cron_schedule` */ @@ -59,7 +60,7 @@ /*Data for the table `cron_schedule` */ SET SQL_MODE=@OLD_SQL_MODE; - +SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; "); diff --git a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php index c261144f0..88b488e42 100644 --- a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index e05281402..1a57f1d0f 100644 --- a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php index 9c54d62ef..80321cd7e 100644 --- a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php +++ b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CurrencySymbol - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CurrencySymbol/Helper/Data.php b/app/code/core/Mage/CurrencySymbol/Helper/Data.php index d76264f21..e2581d4fc 100644 --- a/app/code/core/Mage/CurrencySymbol/Helper/Data.php +++ b/app/code/core/Mage/CurrencySymbol/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CurrencySymbol - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CurrencySymbol/Model/Observer.php b/app/code/core/Mage/CurrencySymbol/Model/Observer.php index 1bedebcec..fb2dbc6df 100644 --- a/app/code/core/Mage/CurrencySymbol/Model/Observer.php +++ b/app/code/core/Mage/CurrencySymbol/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CurrencySymbol - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php index 05b1aeea2..b9307e150 100644 --- a/app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php +++ b/app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CurrencySymbol - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php index cdf3ac9c6..850512c87 100644 --- a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php +++ b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CurrencySymbol - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml b/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml index 2f4256487..947b9c181 100644 --- a/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml +++ b/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CurrencySymbol - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CurrencySymbol/etc/config.xml b/app/code/core/Mage/CurrencySymbol/etc/config.xml index 7f32b497d..3734028c1 100644 --- a/app/code/core/Mage/CurrencySymbol/etc/config.xml +++ b/app/code/core/Mage/CurrencySymbol/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CurrencySymbol - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/Block/Account.php b/app/code/core/Mage/Customer/Block/Account.php index aafae540a..be0c86de5 100644 --- a/app/code/core/Mage/Customer/Block/Account.php +++ b/app/code/core/Mage/Customer/Block/Account.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard.php b/app/code/core/Mage/Customer/Block/Account/Dashboard.php index c2eb45bef..67abbf995 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php index fd7766888..f439b5b11 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php index 5fda847d0..9d8346fc1 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php index 3561c0e95..5f9dadaa9 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php index 47d60bbad..023825c78 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php index 4afa4a0df..19276e013 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php index 8b7415462..681631ab6 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php b/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php index bc72e665f..1b46f178a 100644 --- a/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php +++ b/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Navigation.php b/app/code/core/Mage/Customer/Block/Account/Navigation.php index a050425a7..d808f352f 100644 --- a/app/code/core/Mage/Customer/Block/Account/Navigation.php +++ b/app/code/core/Mage/Customer/Block/Account/Navigation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Resetpassword.php b/app/code/core/Mage/Customer/Block/Account/Resetpassword.php index 11f00de73..e2f0d0c39 100644 --- a/app/code/core/Mage/Customer/Block/Account/Resetpassword.php +++ b/app/code/core/Mage/Customer/Block/Account/Resetpassword.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Address/Book.php b/app/code/core/Mage/Customer/Block/Address/Book.php index cb07b4b20..9f82e9901 100644 --- a/app/code/core/Mage/Customer/Block/Address/Book.php +++ b/app/code/core/Mage/Customer/Block/Address/Book.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Address/Edit.php b/app/code/core/Mage/Customer/Block/Address/Edit.php index 816a47f4d..6c539a392 100644 --- a/app/code/core/Mage/Customer/Block/Address/Edit.php +++ b/app/code/core/Mage/Customer/Block/Address/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php index ecc0071a8..978041361 100644 --- a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php +++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php index 815074caa..068d6aaa5 100644 --- a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php +++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Form/Edit.php b/app/code/core/Mage/Customer/Block/Form/Edit.php index f382299af..d7dc1a229 100644 --- a/app/code/core/Mage/Customer/Block/Form/Edit.php +++ b/app/code/core/Mage/Customer/Block/Form/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Form/Login.php b/app/code/core/Mage/Customer/Block/Form/Login.php index 7a2b3d097..cdb110d72 100644 --- a/app/code/core/Mage/Customer/Block/Form/Login.php +++ b/app/code/core/Mage/Customer/Block/Form/Login.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Form/Register.php b/app/code/core/Mage/Customer/Block/Form/Register.php index a7d210bcd..2294e59ba 100644 --- a/app/code/core/Mage/Customer/Block/Form/Register.php +++ b/app/code/core/Mage/Customer/Block/Form/Register.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Newsletter.php b/app/code/core/Mage/Customer/Block/Newsletter.php index d75fe960f..845a47730 100644 --- a/app/code/core/Mage/Customer/Block/Newsletter.php +++ b/app/code/core/Mage/Customer/Block/Newsletter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Widget/Abstract.php b/app/code/core/Mage/Customer/Block/Widget/Abstract.php index ce8c75d22..9b5553a41 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Abstract.php +++ b/app/code/core/Mage/Customer/Block/Widget/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Widget/Dob.php b/app/code/core/Mage/Customer/Block/Widget/Dob.php index 19fcfb5aa..312fdfd7b 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Dob.php +++ b/app/code/core/Mage/Customer/Block/Widget/Dob.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Widget/Gender.php b/app/code/core/Mage/Customer/Block/Widget/Gender.php index ae3e5ba95..6b985fc51 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Gender.php +++ b/app/code/core/Mage/Customer/Block/Widget/Gender.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Widget/Name.php b/app/code/core/Mage/Customer/Block/Widget/Name.php index 63f59c466..a9d5aeac1 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Name.php +++ b/app/code/core/Mage/Customer/Block/Widget/Name.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php b/app/code/core/Mage/Customer/Block/Widget/Taxvat.php index 20bf9998e..ef9ad921c 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php +++ b/app/code/core/Mage/Customer/Block/Widget/Taxvat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Exception.php b/app/code/core/Mage/Customer/Exception.php index ee7815d3b..8e51fce25 100644 --- a/app/code/core/Mage/Customer/Exception.php +++ b/app/code/core/Mage/Customer/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Helper/Address.php b/app/code/core/Mage/Customer/Helper/Address.php index d009e91d1..28d118dab 100644 --- a/app/code/core/Mage/Customer/Helper/Address.php +++ b/app/code/core/Mage/Customer/Helper/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Helper/Data.php b/app/code/core/Mage/Customer/Helper/Data.php index dc65f92e1..4eccf9635 100644 --- a/app/code/core/Mage/Customer/Helper/Data.php +++ b/app/code/core/Mage/Customer/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Address.php b/app/code/core/Mage/Customer/Model/Address.php index 34cee0aa0..782289edd 100644 --- a/app/code/core/Mage/Customer/Model/Address.php +++ b/app/code/core/Mage/Customer/Model/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Address/Abstract.php b/app/code/core/Mage/Customer/Model/Address/Abstract.php index fc42e47bf..c6eacfe67 100644 --- a/app/code/core/Mage/Customer/Model/Address/Abstract.php +++ b/app/code/core/Mage/Customer/Model/Address/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -365,29 +365,6 @@ public function validate() $this->implodeStreetAddress(); - $this->_basicCheck(); - - if (!$this->_getErrors()) { - Mage::dispatchEvent('customer_address_validation_after', array('address' => $this)); - } - - $errors = $this->_getErrors(); - - $this->_resetErrors(); - - if (empty($errors) || $this->getShouldIgnoreValidation()) { - return true; - } - return $errors; - } - - /** - * Perform basic validation - * - * @return void - */ - protected function _basicCheck() - { if (!Zend_Validate::is($this->getFirstname(), 'NotEmpty')) { $this->addError(Mage::helper('customer')->__('Please enter the first name.')); } @@ -420,11 +397,22 @@ protected function _basicCheck() } if ($this->getCountryModel()->getRegionCollection()->getSize() - && !Zend_Validate::is($this->getRegionId(), 'NotEmpty') - && Mage::helper('directory')->isRegionRequired($this->getCountryId()) + && !Zend_Validate::is($this->getRegionId(), 'NotEmpty') + && Mage::helper('directory')->isRegionRequired($this->getCountryId()) ) { $this->addError(Mage::helper('customer')->__('Please enter the state/province.')); } + + Mage::dispatchEvent('customer_address_validation_after', array('address' => $this)); + + $errors = $this->_getErrors(); + + $this->_resetErrors(); + + if (empty($errors) || $this->getShouldIgnoreValidation()) { + return true; + } + return $errors; } /** diff --git a/app/code/core/Mage/Customer/Model/Address/Api.php b/app/code/core/Mage/Customer/Model/Address/Api.php index 67659c92c..900630e37 100644 --- a/app/code/core/Mage/Customer/Model/Address/Api.php +++ b/app/code/core/Mage/Customer/Model/Address/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Address/Api/V2.php b/app/code/core/Mage/Customer/Model/Address/Api/V2.php index 68c548d74..c7a97a1fc 100644 --- a/app/code/core/Mage/Customer/Model/Address/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Address/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Address/Config.php b/app/code/core/Mage/Customer/Model/Address/Config.php index d0a3f6ed3..3aa3a68c1 100644 --- a/app/code/core/Mage/Customer/Model/Address/Config.php +++ b/app/code/core/Mage/Customer/Model/Address/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api/Resource.php b/app/code/core/Mage/Customer/Model/Api/Resource.php index f125d3765..d79504705 100644 --- a/app/code/core/Mage/Customer/Model/Api/Resource.php +++ b/app/code/core/Mage/Customer/Model/Api/Resource.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer.php b/app/code/core/Mage/Customer/Model/Api2/Customer.php index d6fb021da..377d8708e 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address.php index 0cc3b23bc..52f96a547 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest.php index 96ad94157..418585e93 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Admin/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Admin/V1.php index b047779b2..dfd8297e5 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Admin/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Admin/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Customer/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Customer/V1.php index 5bbd56f7e..7764d5fa2 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Customer/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Customer/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php index ca17a83ce..9d375fc90 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest.php index 2e88b6f5c..0f2b2cbe8 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Admin/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Admin/V1.php index eff629219..bc34e4d4f 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Admin/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Admin/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php index af5fd58c8..089ffaf78 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute.php b/app/code/core/Mage/Customer/Model/Attribute.php index 07e7182c9..bb2130313 100644 --- a/app/code/core/Mage/Customer/Model/Attribute.php +++ b/app/code/core/Mage/Customer/Model/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Backend/Data/Boolean.php b/app/code/core/Mage/Customer/Model/Attribute/Backend/Data/Boolean.php index e3f94187e..aff6fce1c 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Backend/Data/Boolean.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Backend/Data/Boolean.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data.php b/app/code/core/Mage/Customer/Model/Attribute/Data.php index 779cee8ea..bde57e1a9 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Abstract.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Abstract.php index 29aaecd78..3fd3297cb 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Abstract.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Boolean.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Boolean.php index e2f5ce807..fc9fe0754 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Boolean.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Boolean.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php index 3a7390d2f..84ccf8d08 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/File.php b/app/code/core/Mage/Customer/Model/Attribute/Data/File.php index 9f1d3e2c0..8f58cc037 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/File.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Hidden.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Hidden.php index 91fbdc0e5..479c8da83 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Hidden.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Hidden.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php index 119a88374..b41c4315c 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Multiline.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Multiline.php index ea7a5dc20..f096be4fa 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Multiline.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Multiline.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Multiselect.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Multiselect.php index 284cb1a70..ae52d0fd2 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Multiselect.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Multiselect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Postcode.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Postcode.php index f8c7f01fa..f67c93fdb 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Postcode.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Postcode.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Select.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Select.php index 3f7d80113..39a178f27 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Select.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php index 077b8f629..245e98b4c 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.php index 8d4ec80d5..33bfb6d62 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Config/Share.php b/app/code/core/Mage/Customer/Model/Config/Share.php index ad17e9c97..6517216e8 100644 --- a/app/code/core/Mage/Customer/Model/Config/Share.php +++ b/app/code/core/Mage/Customer/Model/Config/Share.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php index c31ac985d..c2fd56369 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php index c26d13388..b8df40c5b 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php index 89afe2934..ae81b8a06 100644 --- a/app/code/core/Mage/Customer/Model/Customer.php +++ b/app/code/core/Mage/Customer/Model/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Customer/Api.php b/app/code/core/Mage/Customer/Model/Customer/Api.php index 7a3430340..e9869db39 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Api.php +++ b/app/code/core/Mage/Customer/Model/Customer/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Customer/Api/V2.php b/app/code/core/Mage/Customer/Model/Customer/Api/V2.php index 2c097f72f..e9a561bd0 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Customer/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php index a9cddeaa2..fcd91f9ac 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php index b86c5df95..85f3e8701 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php index 7fcc37363..1d90dc68c 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php index 3a9f7d1f0..30715d7e1 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php index c43490aac..a599db9b5 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php index 377b61556..44b52d539 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php index 19a95a6fc..4f708a86d 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php index 000a06090..c747d7fd8 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Address.php b/app/code/core/Mage/Customer/Model/Entity/Address.php index 2f1ced145..061fd49b4 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php index 031e9f2dc..9664882af 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php index 743131574..2f126c9ef 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Collection.php index ddb3db93e..84d86bce0 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php index 3a0743504..dd6b82d53 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php index 4779196f4..ae6f6d591 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php index b2a86c44b..dfe0e3c6d 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Attribute.php b/app/code/core/Mage/Customer/Model/Entity/Attribute.php index 95a2c77ae..5d0751e48 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Attribute.php +++ b/app/code/core/Mage/Customer/Model/Entity/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php index 5a302ee47..a47d07d85 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Customer.php b/app/code/core/Mage/Customer/Model/Entity/Customer.php index 8686be522..0106b7ca1 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Customer.php +++ b/app/code/core/Mage/Customer/Model/Entity/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php index 5530b6b37..9c4852948 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Form/Attribute.php b/app/code/core/Mage/Customer/Model/Entity/Form/Attribute.php index 56bb5c476..cccdfb2e4 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Form/Attribute.php +++ b/app/code/core/Mage/Customer/Model/Entity/Form/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Form/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Form/Attribute/Collection.php index 9483b96ff..ef5225b98 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Form/Attribute/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Form/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Group.php b/app/code/core/Mage/Customer/Model/Entity/Group.php index 3fb5ef0a5..45d5c00f1 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Group.php +++ b/app/code/core/Mage/Customer/Model/Entity/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php index 5296ac59c..7110505c5 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Setup.php b/app/code/core/Mage/Customer/Model/Entity/Setup.php index f0b4fcb7f..be2e282ea 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Setup.php +++ b/app/code/core/Mage/Customer/Model/Entity/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php index d008ee5ae..3db9cf359 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Form.php b/app/code/core/Mage/Customer/Model/Form.php index dd2a2d0a3..002f8d687 100644 --- a/app/code/core/Mage/Customer/Model/Form.php +++ b/app/code/core/Mage/Customer/Model/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Group.php b/app/code/core/Mage/Customer/Model/Group.php index 73d9f8d12..24b17aac5 100644 --- a/app/code/core/Mage/Customer/Model/Group.php +++ b/app/code/core/Mage/Customer/Model/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Group/Api.php b/app/code/core/Mage/Customer/Model/Group/Api.php index 9afe02572..a655bdea4 100644 --- a/app/code/core/Mage/Customer/Model/Group/Api.php +++ b/app/code/core/Mage/Customer/Model/Group/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Group/Api/V2.php b/app/code/core/Mage/Customer/Model/Group/Api/V2.php index d014d6e9a..5c571c036 100644 --- a/app/code/core/Mage/Customer/Model/Group/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Group/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Observer.php b/app/code/core/Mage/Customer/Model/Observer.php index 2eef83a12..f2b2a22cc 100644 --- a/app/code/core/Mage/Customer/Model/Observer.php +++ b/app/code/core/Mage/Customer/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Address.php b/app/code/core/Mage/Customer/Model/Resource/Address.php index bd79af187..82b6bb9ba 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Region.php index ea73a010b..92d22ffc3 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.php b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.php index 3ccadb841..86aa030e9 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Collection.php index cd68b9320..83e93e392 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Country.php b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Country.php index 075d6a16a..621901fd7 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Country.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Region.php b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Region.php index 35e444f92..4ee4a34bc 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Region.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Address/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Address/Collection.php index d89931f52..86e74852f 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Attribute.php b/app/code/core/Mage/Customer/Model/Resource/Attribute.php index ecd766f30..067e58a57 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Attribute.php +++ b/app/code/core/Mage/Customer/Model/Resource/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Attribute/Collection.php index fe0bdd49a..bb6af9579 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Attribute/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Customer.php b/app/code/core/Mage/Customer/Model/Resource/Customer.php index 45c37c9bc..d9c490d8e 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Customer.php +++ b/app/code/core/Mage/Customer/Model/Resource/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Customer/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Customer/Collection.php index 97b7a15a9..fc7b143f0 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Customer/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php b/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php index f572968b5..75483240d 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php +++ b/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Form/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Form/Attribute/Collection.php index b627e5bdc..930bfe5f1 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Form/Attribute/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Form/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Group.php b/app/code/core/Mage/Customer/Model/Resource/Group.php index dc0368c15..0d3c2e472 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Group.php +++ b/app/code/core/Mage/Customer/Model/Resource/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Group/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Group/Collection.php index bf408cb47..358684ffa 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Group/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Group/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Setup.php b/app/code/core/Mage/Customer/Model/Resource/Setup.php index 4e45d0f39..34c4584ec 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Setup.php +++ b/app/code/core/Mage/Customer/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Wishlist/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Wishlist/Collection.php index 782f75b69..606a5ffec 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Wishlist/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Wishlist/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Session.php b/app/code/core/Mage/Customer/Model/Session.php index e56f8f0f4..266b06e53 100644 --- a/app/code/core/Mage/Customer/Model/Session.php +++ b/app/code/core/Mage/Customer/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -213,6 +213,7 @@ public function login($username, $password) if ($customer->authenticate($username, $password)) { $this->setCustomerAsLoggedIn($customer); + $this->renewSession(); return true; } return false; @@ -221,7 +222,6 @@ public function login($username, $password) public function setCustomerAsLoggedIn($customer) { $this->setCustomer($customer); - $this->renewSession(); Mage::dispatchEvent('customer_login', array('customer'=>$customer)); return $this; } diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php index ab1f6911a..2e2063f5b 100644 --- a/app/code/core/Mage/Customer/controllers/AccountController.php +++ b/app/code/core/Mage/Customer/controllers/AccountController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -229,7 +229,8 @@ protected function _loginPostRedirect() public function logoutAction() { $this->_getSession()->logout() - ->renewSession(); + ->renewSession() + ->setBeforeAuthUrl($this->_getRefererUrl()); $this->_redirect('*/*/logoutSuccess'); } @@ -332,6 +333,7 @@ protected function _successProcessRegistration(Mage_Customer_Model_Customer $cus $url = $this->_getUrl('*/*/index', array('_secure' => true)); } else { $session->setCustomerAsLoggedIn($customer); + $session->renewSession(); $url = $this->_welcomeCustomer($customer); } $this->_redirectSuccess($url); @@ -598,6 +600,7 @@ public function confirmAction() throw new Exception($this->__('Failed to confirm customer account.')); } + $session->renewSession(); // log in and send greeting email, then die happy $session->setCustomerAsLoggedIn($customer); $successUrl = $this->_welcomeCustomer($customer, true); diff --git a/app/code/core/Mage/Customer/controllers/AddressController.php b/app/code/core/Mage/Customer/controllers/AddressController.php index a2d00c080..160926166 100644 --- a/app/code/core/Mage/Customer/controllers/AddressController.php +++ b/app/code/core/Mage/Customer/controllers/AddressController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/controllers/ReviewController.php b/app/code/core/Mage/Customer/controllers/ReviewController.php index 647c240a0..e94061979 100644 --- a/app/code/core/Mage/Customer/controllers/ReviewController.php +++ b/app/code/core/Mage/Customer/controllers/ReviewController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php b/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php index 38c6344f3..2275474ca 100644 --- a/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php +++ b/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/etc/adminhtml.xml b/app/code/core/Mage/Customer/etc/adminhtml.xml index d81be99b0..dd887564c 100644 --- a/app/code/core/Mage/Customer/etc/adminhtml.xml +++ b/app/code/core/Mage/Customer/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/etc/api.xml b/app/code/core/Mage/Customer/etc/api.xml index b9570f4b3..785876cb8 100644 --- a/app/code/core/Mage/Customer/etc/api.xml +++ b/app/code/core/Mage/Customer/etc/api.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/etc/api2.xml b/app/code/core/Mage/Customer/etc/api2.xml index 17d63a750..5d9010856 100644 --- a/app/code/core/Mage/Customer/etc/api2.xml +++ b/app/code/core/Mage/Customer/etc/api2.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/etc/config.xml b/app/code/core/Mage/Customer/etc/config.xml index e65596b1b..420c12882 100644 --- a/app/code/core/Mage/Customer/etc/config.xml +++ b/app/code/core/Mage/Customer/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/etc/system.xml b/app/code/core/Mage/Customer/etc/system.xml index d35352dcc..8328b2d20 100644 --- a/app/code/core/Mage/Customer/etc/system.xml +++ b/app/code/core/Mage/Customer/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/sql/customer_setup/install-1.6.0.0.php b/app/code/core/Mage/Customer/sql/customer_setup/install-1.6.0.0.php index c82b3e83f..104911cb7 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.11-1.4.0.0.12.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.11-1.4.0.0.12.php index 02912f5f5..eccebfa15 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.11-1.4.0.0.12.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.11-1.4.0.0.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php index 29b77eb03..3f75d145c 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php index 7f0af7b0c..ab0705d80 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.8-1.4.0.0.9.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.8-1.4.0.0.9.php index 218f54b40..5379c67da 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.8-1.4.0.0.9.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.8-1.4.0.0.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php index 3fb470cc2..8af66c0d1 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php index c69f57d62..c08dc699f 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-1.4.0.0.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-1.4.0.0.0.php index f2b01df9f..701f0c179 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-1.4.0.0.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-1.4.0.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php index 53601773a..2964e3b12 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php index a773767bb..8f8a38a0d 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php index 9e8c77a56..791bd16e2 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php index b2b36744c..5be007d6f 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php index 3674f4f26..6387d0627 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.11-0.8.12.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.11-0.8.12.php index a89495c57..a71510b3a 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.11-0.8.12.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.11-0.8.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.12-1.4.0.0.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.12-1.4.0.0.0.php index 6994fd006..fdb9d4064 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.12-1.4.0.0.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.12-1.4.0.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php index 709d0b467..f9f9a6e95 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php index 02fc1192b..6b5df5b70 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php index 511bc75b0..bab1e8ef0 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php index a13855305..31e2fe454 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php index c2edbd470..42fdbb185 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php index d4538057c..86193c115 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php index 7480f7538..3e5cbea16 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php index 8634402aa..63db9b3f7 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php index bc4114180..8f4ef0558 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php index 28f0544cc..206fc5cd4 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php index af4f0e6c1..3ee084769 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php index 97071471a..c63c85239 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php index ebbe01497..1ddd48b3d 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php index 43564206c..ab9e70772 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /* @var $installer Mage_Customer_Model_Entity_Setup */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php index 14308b70d..e5a687a6c 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php index 68e26da2a..30f962f8c 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php index 412c25812..c6d99f3ac 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index df82bcb02..f666f8078 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php index ade3a33ee..9ead8b385 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php index 6f62d3c8d..930f474bf 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0-1.6.2.0.1.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0-1.6.2.0.1.php index 1e64a5077..ea4bab996 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0-1.6.2.0.1.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0-1.6.2.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.php index d0fb65879..0b1a186a6 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Helper/Data.php b/app/code/core/Mage/Dataflow/Helper/Data.php index 75735c1f7..d90394601 100644 --- a/app/code/core/Mage/Dataflow/Helper/Data.php +++ b/app/code/core/Mage/Dataflow/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Batch.php b/app/code/core/Mage/Dataflow/Model/Batch.php index ae616ac88..99394d907 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch.php +++ b/app/code/core/Mage/Dataflow/Model/Batch.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php index 9631f5ff6..4ab284d36 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Batch/Export.php index 2f38f348a..b320e642b 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Export.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Batch/Import.php index b5c6e9a5b..e82c8afe6 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Import.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Io.php b/app/code/core/Mage/Dataflow/Model/Batch/Io.php index 3b62d5313..8b0455859 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Io.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Io.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert.php b/app/code/core/Mage/Dataflow/Model/Convert.php index a762bc617..bf45bad41 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert.php +++ b/app/code/core/Mage/Dataflow/Model/Convert.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action.php b/app/code/core/Mage/Dataflow/Model/Convert/Action.php index e5776759d..c4a4e45c5 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Action.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php index 7b96a8da1..38baac7c0 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php index 60aade62a..7edca5d3b 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php index 0eece3689..2bd175809 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php index 5a9d2cc76..b2d444b18 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php index 98f485b4f..66407eaef 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php index 82923d758..87a3bf0a2 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php index 15604249d..1de36852f 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php index 522101e1f..6c091a9cd 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php index 050b9397a..c8194289d 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php index 24442b06f..77a6660ab 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php index 20aecb1ef..66e03d248 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php index 25be76290..ceda0c6a4 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php index ec1f08907..52f86c099 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php index eff9d87db..a94806c26 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php index d81febb93..4290d04ab 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php index 324bd2cd8..b76c99ac6 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Exception.php b/app/code/core/Mage/Dataflow/Model/Convert/Exception.php index f34ccef21..9d0f4ab6b 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Exception.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php index c1c22c385..58e8d4d2b 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Dataflow_Model_Session_Adapter_Iterator extends Mage_Dataflow_Model_Convert_Adapter_Abstract diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/File/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/File/Csv.php index 39d97715c..93b80ab54 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/File/Csv.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/File/Csv.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Dataflow_Model_Convert_Iterator_File_Csv extends Mage_Dataflow_Model_Convert_Parser_Abstract diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php index ca6ef8b0b..59a4cfdea 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Interface.php index f50b9c1b6..4574a58e4 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Abstract.php index d8a611d86..6630cbf7a 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php index 94d8485c9..8553c1c2b 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Interface.php index 24036cc7c..53a7539c2 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php index 588330e00..0f7cf73ee 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php index 090e51c9c..b0b282c95 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php index 23bdd51f0..c53f1fcfb 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php index 3cbfa68f9..ce5753b30 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php index 2faf0ddf4..d25bbf19c 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile.php index 2ef186133..61c759648 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php index 707669d90..83fa3ec7c 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php index d30cd7f04..8bdb441f4 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php index ebeae7a0f..16cd168b0 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php index 5bf452e3d..8739efe63 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php index be4d3dd82..fc1aab8b6 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php index 025aef6d3..d2365c47e 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php index 4b0d61a68..706f6f325 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Import.php b/app/code/core/Mage/Dataflow/Model/Import.php index f2014d51b..94c7e9ad4 100644 --- a/app/code/core/Mage/Dataflow/Model/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Import.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php index b06cb5c95..0ed5dd87d 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php index c56d5dab9..c38d6bb5f 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php index 5a10b1c9c..b242bac20 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php index 818932f3c..1370080b4 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php index 1dca4fbf5..b8203cd03 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php index cf42a87ad..2953edecc 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php index 534ec86ad..14661a6f4 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php index 3eecc892f..452aa80b1 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php index f11c65134..19fb29438 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php index f81b89108..f98a02b75 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php index da249bf82..88432507c 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php index 350d0a205..cb29a0b8c 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php index 097a54bee..3b266744f 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Profile.php b/app/code/core/Mage/Dataflow/Model/Profile.php index 360d3a3f6..74d95d05f 100644 --- a/app/code/core/Mage/Dataflow/Model/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Profile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Profile/History.php index 165732126..d404adf16 100644 --- a/app/code/core/Mage/Dataflow/Model/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Profile/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch.php index ae084532a..a1955c3f7 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Abstract.php index 09dfe9640..81ebb6ebf 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Collection.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Collection.php index 8ab5136d3..ab8e0c71c 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php index 4096c8419..5e3f17b09 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php index 4f9ec4807..7a95c0279 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Import.php b/app/code/core/Mage/Dataflow/Model/Resource/Import.php index 4a183f015..0aca760dc 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Import.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Import/Collection.php b/app/code/core/Mage/Dataflow/Model/Resource/Import/Collection.php index 62098efac..0106dac59 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Import/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Import/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Profile.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile.php index 8e0f9d6fb..da3b05e76 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile/Collection.php index d12d29228..913191e36 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php index 371ec1c5a..0dbf6e7f5 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History/Collection.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History/Collection.php index debfe0181..410d603d0 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Session.php b/app/code/core/Mage/Dataflow/Model/Resource/Session.php index 7967481a0..157ba9bbc 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Session.php b/app/code/core/Mage/Dataflow/Model/Session.php index 5b11d67b7..e29d57991 100644 --- a/app/code/core/Mage/Dataflow/Model/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php index 332831234..2a099edd9 100644 --- a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php +++ b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php index 548f1f6a6..aaac41352 100644 --- a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php +++ b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/data/dataflow_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Dataflow/data/dataflow_setup/data-install-1.6.0.0.php index 95932b81d..df945ad39 100644 --- a/app/code/core/Mage/Dataflow/data/dataflow_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Dataflow/data/dataflow_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -92,5 +92,3 @@ foreach ($dataflowData as $bind) { Mage::getModel('dataflow/profile')->setData($bind)->save(); } - -$installer->endSetup(); diff --git a/app/code/core/Mage/Dataflow/etc/config.xml b/app/code/core/Mage/Dataflow/etc/config.xml index 8bb4e5730..4c5d91c40 100644 --- a/app/code/core/Mage/Dataflow/etc/config.xml +++ b/app/code/core/Mage/Dataflow/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/install-1.6.0.0.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/install-1.6.0.0.php index 3a892b081..c26bbf5ea 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php index bdc07fa61..195afce8f 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php index 9a399dd98..c2b07c82c 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup()->run(" diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php index 5adba0b43..71059287e 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup()->run(" diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php index 748e0c293..e1cbadf22 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php index f5185bf06..6d2e44d5b 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 02e6bb314..94ea8928e 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php index 8913ddc3c..2d2a5e129 100644 --- a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php +++ b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php index 1fe121f6c..8aa5b6d7e 100644 --- a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php +++ b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Block/Currency.php b/app/code/core/Mage/Directory/Block/Currency.php index 983001427..c79e8a093 100644 --- a/app/code/core/Mage/Directory/Block/Currency.php +++ b/app/code/core/Mage/Directory/Block/Currency.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Block/Data.php b/app/code/core/Mage/Directory/Block/Data.php index b0ddc2133..cbab40c92 100644 --- a/app/code/core/Mage/Directory/Block/Data.php +++ b/app/code/core/Mage/Directory/Block/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Exception.php b/app/code/core/Mage/Directory/Exception.php index 525814a88..e270a4213 100644 --- a/app/code/core/Mage/Directory/Exception.php +++ b/app/code/core/Mage/Directory/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Helper/Data.php b/app/code/core/Mage/Directory/Helper/Data.php index 1313c7f21..f2bb4c15c 100644 --- a/app/code/core/Mage/Directory/Helper/Data.php +++ b/app/code/core/Mage/Directory/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Helper/Url.php b/app/code/core/Mage/Directory/Helper/Url.php index 0804214b6..ed947bab1 100644 --- a/app/code/core/Mage/Directory/Helper/Url.php +++ b/app/code/core/Mage/Directory/Helper/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Country.php b/app/code/core/Mage/Directory/Model/Country.php index b98ccfd61..c36790146 100644 --- a/app/code/core/Mage/Directory/Model/Country.php +++ b/app/code/core/Mage/Directory/Model/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Country/Api.php b/app/code/core/Mage/Directory/Model/Country/Api.php index 9a2ec092b..decc7774d 100644 --- a/app/code/core/Mage/Directory/Model/Country/Api.php +++ b/app/code/core/Mage/Directory/Model/Country/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Country/Api/V2.php b/app/code/core/Mage/Directory/Model/Country/Api/V2.php index 45e01fd6f..0785c123a 100644 --- a/app/code/core/Mage/Directory/Model/Country/Api/V2.php +++ b/app/code/core/Mage/Directory/Model/Country/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Country/Format.php b/app/code/core/Mage/Directory/Model/Country/Format.php index cedc65f32..a8bc9ffbb 100644 --- a/app/code/core/Mage/Directory/Model/Country/Format.php +++ b/app/code/core/Mage/Directory/Model/Country/Format.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Currency.php b/app/code/core/Mage/Directory/Model/Currency.php index 531807a92..0d55fd86b 100644 --- a/app/code/core/Mage/Directory/Model/Currency.php +++ b/app/code/core/Mage/Directory/Model/Currency.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Currency/Filter.php b/app/code/core/Mage/Directory/Model/Currency/Filter.php index a0ea765db..78a1e03e4 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Filter.php +++ b/app/code/core/Mage/Directory/Model/Currency/Filter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php b/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php index 6d11ee0ea..3f8ff2c8a 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php index ef26122bf..d72c98d3f 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country.php b/app/code/core/Mage/Directory/Model/Mysql4/Country.php index 079887d92..1d8d4371a 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php index 1cf65247e..ba2416994 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php index 69463d1c2..57713919e 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php index 72d75d92d..5e4cee25c 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Currency.php b/app/code/core/Mage/Directory/Model/Mysql4/Currency.php index 1911ad97b..84eab28e5 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Currency.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Currency.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php index 39768d98a..27048d1dc 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region.php b/app/code/core/Mage/Directory/Model/Mysql4/Region.php index 53bc21805..6399cadf3 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Region.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php index 03813a4f1..9e0c51def 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Observer.php b/app/code/core/Mage/Directory/Model/Observer.php index 0cc4db60c..90166281a 100644 --- a/app/code/core/Mage/Directory/Model/Observer.php +++ b/app/code/core/Mage/Directory/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Region.php b/app/code/core/Mage/Directory/Model/Region.php index 4cefc924a..c0cffec3c 100644 --- a/app/code/core/Mage/Directory/Model/Region.php +++ b/app/code/core/Mage/Directory/Model/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Region/Api.php b/app/code/core/Mage/Directory/Model/Region/Api.php index ac6f2eb99..a70174784 100644 --- a/app/code/core/Mage/Directory/Model/Region/Api.php +++ b/app/code/core/Mage/Directory/Model/Region/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Region/Api/V2.php b/app/code/core/Mage/Directory/Model/Region/Api/V2.php index 1e2240b95..7c424f40b 100644 --- a/app/code/core/Mage/Directory/Model/Region/Api/V2.php +++ b/app/code/core/Mage/Directory/Model/Region/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Resource/Country.php b/app/code/core/Mage/Directory/Model/Resource/Country.php index 6502916b9..680cf85a8 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php index 84e9069e7..35cfe6f94 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Resource/Country/Format.php b/app/code/core/Mage/Directory/Model/Resource/Country/Format.php index 0d6ce8b16..6ee3d0c14 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country/Format.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country/Format.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Resource/Country/Format/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Country/Format/Collection.php index 77ac50778..20bdb76e3 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country/Format/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country/Format/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Resource/Currency.php b/app/code/core/Mage/Directory/Model/Resource/Currency.php index 1e884fe1c..421fd939b 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Currency.php +++ b/app/code/core/Mage/Directory/Model/Resource/Currency.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php index 6ee6ca9ea..992be34ae 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Resource/Region.php b/app/code/core/Mage/Directory/Model/Resource/Region.php index cc9438ac9..e0fa8591a 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Region.php +++ b/app/code/core/Mage/Directory/Model/Resource/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php index 77f68159b..5be2d5ff0 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/controllers/CurrencyController.php b/app/code/core/Mage/Directory/controllers/CurrencyController.php index 6c1ca20ef..6acc9c111 100644 --- a/app/code/core/Mage/Directory/controllers/CurrencyController.php +++ b/app/code/core/Mage/Directory/controllers/CurrencyController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php index d6e704f2b..c4f22d5d3 100644 --- a/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.0-1.6.0.1.php index efc468274..b4d8d8531 100644 --- a/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.0-1.6.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/etc/api.xml b/app/code/core/Mage/Directory/etc/api.xml index ffd5bc099..1ad6a3612 100644 --- a/app/code/core/Mage/Directory/etc/api.xml +++ b/app/code/core/Mage/Directory/etc/api.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Directory/etc/config.xml b/app/code/core/Mage/Directory/etc/config.xml index f50fc3fcb..b2ce2d975 100644 --- a/app/code/core/Mage/Directory/etc/config.xml +++ b/app/code/core/Mage/Directory/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Directory/etc/system.xml b/app/code/core/Mage/Directory/etc/system.xml index 7a860981f..050a6693b 100644 --- a/app/code/core/Mage/Directory/etc/system.xml +++ b/app/code/core/Mage/Directory/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Directory/sql/directory_setup/install-1.6.0.0.php b/app/code/core/Mage/Directory/sql/directory_setup/install-1.6.0.0.php index 42cfd7d9c..08f8babc7 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php index c30e3c171..d929f2bd4 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php index dce954cd0..327978070 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php index b178cd0a3..beef69b5b 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,7 +39,5 @@ UNIQUE KEY `country_type` (`country_id`,`type`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Countries format'; -ALTER TABLE {$this->getTable('directory_country')}, - DROP COLUMN `address_template_plain`, DROP COLUMN `address_template_html`; +ALTER TABLE {$this->getTable('directory_country')}, DROP COLUMN `address_template_plain`, DROP COLUMN `address_template_html`; "); -$installer->endSetup(); diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php index dd418f8e3..e900e9b11 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,10 +29,7 @@ $installer->startSetup() ->run(" -INSERT INTO {$this->getTable('core_email_template')} (`template_code`, `template_text`, `template_type`, -`template_subject`, `template_sender_name`, `template_sender_email`, `added_at`, `modified_at`) VALUES -('Currency Update Warnings', 'Currency update warnings:\r\n\r\n\r\n{{var warnings}}', 1, -'Currency Update Warnings', NULL, NULL, '2008-01-30 14:10:31', '2008-01-30 16:02:47'); +INSERT INTO {$this->getTable('core_email_template')} (`template_code`, `template_text`, `template_type`, `template_subject`, `template_sender_name`, `template_sender_email`, `added_at`, `modified_at`) VALUES +('Currency Update Warnings', 'Currency update warnings:\r\n\r\n\r\n{{var warnings}}', 1, 'Currency Update Warnings', NULL, NULL, '2008-01-30 14:10:31', '2008-01-30 16:02:47'); "); -$installer->endSetup(); diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php index 31cf0efdd..3e2375272 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php index 77cdf52a2..0151eb05a 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.10-0.8.11.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.10-0.8.11.php index ef791e379..f5b2ecad9 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.10-0.8.11.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.10-0.8.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php index 5160ce751..6b080fca5 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php index 705962127..60ad6304a 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php index eaaa2f803..5b7520e21 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.5-0.8.6.php index 38287026d..c2a464b58 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.5-0.8.6.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.5-0.8.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php index 24c0922bb..77ab1158f 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.7-0.8.8.php index b4b8a7223..93f77c280 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.7-0.8.8.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.7-0.8.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.8-0.8.9.php index de446509a..7f9255bc0 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.8-0.8.9.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.8-0.8.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.9-0.8.10.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.9-0.8.10.php index 8f4d8fa58..93a0ca41b 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.9-0.8.10.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.9-0.8.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index f92ddfff6..bc98793fe 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php index c891d87ab..1e7e57e23 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php index 0609dda29..653130bcc 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php index 472d82350..fe94189e9 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php index ce3324104..f16559a22 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index 974512e34..be2866e16 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php index a641214ff..dbacf0bff 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php index 3684b9008..d86274406 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php index 5e0a7f3e6..e4aa2c54a 100644 --- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php +++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php index 00508ffe3..7e381f77d 100644 --- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php +++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php index 23c24c130..8d59a63a7 100644 --- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php +++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php index 4f4999502..ede7c625f 100644 --- a/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Checkout/Success.php b/app/code/core/Mage/Downloadable/Block/Checkout/Success.php index bf3f85006..23b6bb730 100644 --- a/app/code/core/Mage/Downloadable/Block/Checkout/Success.php +++ b/app/code/core/Mage/Downloadable/Block/Checkout/Success.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php b/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php index 528f36c8d..b2b729c4c 100644 --- a/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php +++ b/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php index 7b9007dd5..56f6464dd 100644 --- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php index edc18aec0..9b9083968 100644 --- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php index 4fe1f52ad..556323bc4 100644 --- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php b/app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php index d551cc7ef..7e7efde70 100644 --- a/app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php +++ b/app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Helper/Data.php b/app/code/core/Mage/Downloadable/Helper/Data.php index 77bad04bf..aee67bcc0 100644 --- a/app/code/core/Mage/Downloadable/Helper/Data.php +++ b/app/code/core/Mage/Downloadable/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Helper/Download.php b/app/code/core/Mage/Downloadable/Helper/Download.php index 2dcd9a90e..e061a6301 100644 --- a/app/code/core/Mage/Downloadable/Helper/Download.php +++ b/app/code/core/Mage/Downloadable/Helper/Download.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Helper/File.php b/app/code/core/Mage/Downloadable/Helper/File.php index 05238b3eb..32883817d 100644 --- a/app/code/core/Mage/Downloadable/Helper/File.php +++ b/app/code/core/Mage/Downloadable/Helper/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php b/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php index 5ead5041c..1c48c2e3d 100644 --- a/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Link.php b/app/code/core/Mage/Downloadable/Model/Link.php index e7b33da63..21c462910 100644 --- a/app/code/core/Mage/Downloadable/Model/Link.php +++ b/app/code/core/Mage/Downloadable/Model/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api.php b/app/code/core/Mage/Downloadable/Model/Link/Api.php index 07ddf7f02..676a10d22 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php b/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php index 726b7442b..ebe93fc49 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php b/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php index c8d02e683..a79d9c2e0 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php index 497d2269e..1c7561e1f 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Link/Purchased.php b/app/code/core/Mage/Downloadable/Model/Link/Purchased.php index 39a6af69c..f2ce6eb32 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Purchased.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Purchased.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php b/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php index cd21c3c92..90a2f67b7 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php index 9ed4e5f80..a7b61e449 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php index 6eb0623eb..282e9ce0b 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php index f7ee6f8cf..1214e3e65 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php index 2427d04f3..bb3eabd7e 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php index 416b983ca..80c0cdf03 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php index cf7a880c2..0436b53d2 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php index 87b79caae..652e33c2b 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php index 4a3f443d3..a5551abe1 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php index 8c6daf311..eb13b2056 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Observer.php b/app/code/core/Mage/Downloadable/Model/Observer.php index abc017329..0051541ab 100644 --- a/app/code/core/Mage/Downloadable/Model/Observer.php +++ b/app/code/core/Mage/Downloadable/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Product/Price.php b/app/code/core/Mage/Downloadable/Model/Product/Price.php index 2b1596801..eebe0d47d 100644 --- a/app/code/core/Mage/Downloadable/Model/Product/Price.php +++ b/app/code/core/Mage/Downloadable/Model/Product/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Product/Type.php b/app/code/core/Mage/Downloadable/Model/Product/Type.php index 96288847a..e5a0c22a9 100644 --- a/app/code/core/Mage/Downloadable/Model/Product/Type.php +++ b/app/code/core/Mage/Downloadable/Model/Product/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Indexer/Price.php b/app/code/core/Mage/Downloadable/Model/Resource/Indexer/Price.php index 14f23496e..c4335e0d5 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Indexer/Price.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Indexer/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link.php b/app/code/core/Mage/Downloadable/Model/Resource/Link.php index 82abb7f56..7570e1d24 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link/Collection.php b/app/code/core/Mage/Downloadable/Model/Resource/Link/Collection.php index 92a1fc2eb..340c3b458 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased.php b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased.php index 7bbea10c8..1a6f2e8b8 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Collection.php b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Collection.php index 391fa731b..259b3ff02 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item.php b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item.php index 53cbef81e..9f891d387 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item/Collection.php b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item/Collection.php index b3d7ee1bc..ff924f4c6 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Sample.php b/app/code/core/Mage/Downloadable/Model/Resource/Sample.php index 7fbfaf1c3..b3ee19147 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Sample.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Sample.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Sample/Collection.php b/app/code/core/Mage/Downloadable/Model/Resource/Sample/Collection.php index 9979cf872..4b4e26ca2 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Sample/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Sample/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php index b605093d4..e72f28cbf 100644 --- a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php +++ b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php index a06955752..184ae4f4c 100644 --- a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php +++ b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php index 069ae5e43..2a8e33a5a 100644 --- a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php +++ b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Sample.php b/app/code/core/Mage/Downloadable/Model/Sample.php index d1dc365de..24d3482f2 100644 --- a/app/code/core/Mage/Downloadable/Model/Sample.php +++ b/app/code/core/Mage/Downloadable/Model/Sample.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php index e2a8bcb7d..1e3d762e4 100644 --- a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php +++ b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php index 1779f9fc2..8fb5abf77 100644 --- a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php +++ b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php index 522e85cb8..e7dc583b9 100644 --- a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php +++ b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php index a2a138cf7..f95c32e06 100644 --- a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php +++ b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/CustomerController.php b/app/code/core/Mage/Downloadable/controllers/CustomerController.php index 84de4c4cf..5d8930099 100644 --- a/app/code/core/Mage/Downloadable/controllers/CustomerController.php +++ b/app/code/core/Mage/Downloadable/controllers/CustomerController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/DownloadController.php b/app/code/core/Mage/Downloadable/controllers/DownloadController.php index d142381be..3cdac61d5 100644 --- a/app/code/core/Mage/Downloadable/controllers/DownloadController.php +++ b/app/code/core/Mage/Downloadable/controllers/DownloadController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/FileController.php b/app/code/core/Mage/Downloadable/controllers/FileController.php index e921dd418..85d6092ff 100644 --- a/app/code/core/Mage/Downloadable/controllers/FileController.php +++ b/app/code/core/Mage/Downloadable/controllers/FileController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/Product/EditController.php b/app/code/core/Mage/Downloadable/controllers/Product/EditController.php index d243d5596..f0f360bf6 100644 --- a/app/code/core/Mage/Downloadable/controllers/Product/EditController.php +++ b/app/code/core/Mage/Downloadable/controllers/Product/EditController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/data/downloadable_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Downloadable/data/downloadable_setup/data-install-1.6.0.0.php index 71fd07e4b..a69bf0281 100644 --- a/app/code/core/Mage/Downloadable/data/downloadable_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Downloadable/data/downloadable_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var $installer Mage_Downloadable_Model_Resource_Setup */ diff --git a/app/code/core/Mage/Downloadable/etc/adminhtml.xml b/app/code/core/Mage/Downloadable/etc/adminhtml.xml index 35aae43fe..dbbc7b2c4 100644 --- a/app/code/core/Mage/Downloadable/etc/adminhtml.xml +++ b/app/code/core/Mage/Downloadable/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/etc/api.xml b/app/code/core/Mage/Downloadable/etc/api.xml index 8f692d80c..5885f61f8 100644 --- a/app/code/core/Mage/Downloadable/etc/api.xml +++ b/app/code/core/Mage/Downloadable/etc/api.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/etc/config.xml b/app/code/core/Mage/Downloadable/etc/config.xml index a7492bf51..f71f766c0 100644 --- a/app/code/core/Mage/Downloadable/etc/config.xml +++ b/app/code/core/Mage/Downloadable/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/etc/system.xml b/app/code/core/Mage/Downloadable/etc/system.xml index 747b62fc6..0b099c389 100644 --- a/app/code/core/Mage/Downloadable/etc/system.xml +++ b/app/code/core/Mage/Downloadable/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/install-1.6.0.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/install-1.6.0.0.php index 76656ad78..12c3d8958 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php index 6a00bc220..046a0e837 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-1.4.0.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-1.4.0.0.php index fedf56460..2841ee0c0 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-1.4.0.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-1.4.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php index ac5784c08..1b999eb0b 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php index 6bb56115c..377e78700 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php index bf28c9fda..fdbdd0d38 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php index d9fb5ee75..11dad093c 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php index d0893222f..4bfccebb0 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php index 552af9e7d..d2f99e5e5 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.14-0.1.15.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.14-0.1.15.php index 49b64e47f..2893a9ebf 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.14-0.1.15.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.14-0.1.15.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php index 5ff49bf11..7906fb7c3 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php index 42d7b483f..f182563c3 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php index 774203cdd..aea50a47f 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php index 9dfbae599..6e96560b1 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php index 89f6dedb0..05a13c0f6 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php index 1a5e0c06d..0c307cadf 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php index dbe800c32..b0fe60af2 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php index e6ae9e8e7..d307ca79a 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php index 48d7f14da..233e61771 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.3.9-1.4.0.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.3.9-1.4.0.0.php index a9b77df5f..76975f435 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.3.9-1.4.0.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.3.9-1.4.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php index a2adbe71b..023eb3a9e 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php index 16460677c..12071eb8c 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php index 76aa9762d..c93e4ec7a 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index c420763c3..684d38224 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.6.0.0.1-1.6.0.0.2.php index 4dca83999..61b42808f 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.6.0.0.1-1.6.0.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0-1.6.0.0.1.php index 5c0d28943..fec5f3a91 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0-1.6.0.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php index c36df2fcf..7ac078eb0 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Js.php index 3c2a8f6de..b825f4104 100644 --- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Js.php +++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Js.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php index c2ebf4abe..516afa8d5 100644 --- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php +++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php index 60e62a737..31a9cb915 100644 --- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php +++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php index 584a20b72..ae20fdd9d 100644 --- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php +++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Exception.php b/app/code/core/Mage/Eav/Exception.php index cab032c77..60321914b 100644 --- a/app/code/core/Mage/Eav/Exception.php +++ b/app/code/core/Mage/Eav/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Helper/Data.php b/app/code/core/Mage/Eav/Helper/Data.php index c6b751e19..35abdb24a 100644 --- a/app/code/core/Mage/Eav/Helper/Data.php +++ b/app/code/core/Mage/Eav/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php index 9bbc22280..24eab7101 100644 --- a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php +++ b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype diff --git a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php index 846ba8bd4..52f3bce27 100644 --- a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php +++ b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute.php b/app/code/core/Mage/Eav/Model/Attribute.php index aeb5c6a77..5a2626e27 100644 --- a/app/code/core/Mage/Eav/Model/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data.php b/app/code/core/Mage/Eav/Model/Attribute/Data.php index 1ac846130..fca2867d2 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php index 7d77c3d54..f275bcce0 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Boolean.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Boolean.php index 34967216a..09edab65a 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Boolean.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Boolean.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php index 660f20dd0..d8362ef8f 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Datetime.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Datetime.php index fab415385..1ebed2e13 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Datetime.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php index a73fa7f88..ff61dc4bc 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Hidden.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Hidden.php index 55647c7bd..778b63816 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Hidden.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Hidden.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php index ba812020e..2f836f170 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php index 3f1980eef..3a7ae1265 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php index bd3a6f044..652c5cdb4 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php index be58ba605..e21b9490f 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php index a3a030095..475409184 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Textarea.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Textarea.php index 5d2bd0f5a..d4b8472c1 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Textarea.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Textarea.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Config.php b/app/code/core/Mage/Eav/Model/Config.php index e8da143e8..70ba2f98e 100644 --- a/app/code/core/Mage/Eav/Model/Config.php +++ b/app/code/core/Mage/Eav/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php index 21e683534..8b7dee6d8 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php +++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php index ec91431d6..7dabff379 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php +++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php index 2ae1fb067..006eef061 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity.php b/app/code/core/Mage/Eav/Model/Entity.php index fc69c804e..115b61b7c 100644 --- a/app/code/core/Mage/Eav/Model/Entity.php +++ b/app/code/core/Mage/Eav/Model/Entity.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Abstract.php index b7c5aa818..4607735be 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Entity/Attribute.php index 7ba58de85..ad29e2845 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php index d2bc0b92c..5b95c0705 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php index 07df514bc..e4f74de9f 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php index 9cb4acc9c..ac41befe8 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php index dfb340458..3833173f9 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php index caff7b56d..535b2dd20 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php index c65c5b8e1..126e77b6b 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php index fe0fa8f63..e7fb3cc2b 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Serialized.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Serialized.php index 7669b6504..4ef925d83 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Serialized.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Serialized.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php index a27d586bc..a9d4f1ab7 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php index b71f604c5..8bb2c5ea5 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,19 +33,6 @@ */ class Mage_Eav_Model_Entity_Attribute_Backend_Time_Created extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { - - /** - * Returns date format if it matches a certain mask. - * @param $date - * @return null|string - */ - protected function _getFormat($date) - { - if (is_string($date) && preg_match('#^\d{4,4}-\d{2,2}-\d{2,2} \d{2,2}:\d{2,2}:\d{2,2}$#', $date)) { - return 'yyyy-MM-dd HH:mm:ss'; - } - return null; - } /** * Set created date * Set created date in UTC time zone @@ -63,7 +50,7 @@ public function beforeSave($object) } } else { // convert to UTC - $zendDate = Mage::app()->getLocale()->utcDate(null, $date, true, $this->_getFormat($date)); + $zendDate = Mage::app()->getLocale()->utcDate(null, $date, true); $object->setData($attributeCode, $zendDate->getIso()); } @@ -81,7 +68,7 @@ public function afterLoad($object) $attributeCode = $this->getAttribute()->getAttributeCode(); $date = $object->getData($attributeCode); - $zendDate = Mage::app()->getLocale()->storeDate(null, $date, true, $this->_getFormat($date)); + $zendDate = Mage::app()->getLocale()->storeDate(null, $date, true); $object->setData($attributeCode, $zendDate->getIso()); parent::afterLoad($object); diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php index 450adbc2c..ea67482e6 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php index 30e9a7705..483e14c6b 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php index f20182c09..bf5113be7 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php index 749cc3552..4ed7e08fb 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php index d3c6bdb56..3a00b11a8 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php index d453832ab..cc40f1bdf 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php index 777725741..6f424665c 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php index ef1082d54..9e8e9de7e 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php index 7952f5a05..e78bea5ea 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php index c0878117e..662c56e82 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php index 7412ea9ae..04a3b1439 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php index 04d20e482..9e661656b 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php index 89c24f8a4..f99b07694 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php index 3c602f99c..f80333f4c 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php index aa707284b..3643fa778 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php index dae2039bf..4e70a2000 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection.php b/app/code/core/Mage/Eav/Model/Entity/Collection.php index b1b2ba631..de2704ad9 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Collection.php +++ b/app/code/core/Mage/Eav/Model/Entity/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php index 8fdbc0648..6af0c3a28 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php index 9608d5aba..04c2576dd 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php index f7894cfd3..aef8a8076 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php +++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php index e6327a7af..c58078943 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php index 730a628f9..f53aea2b7 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php +++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Interface.php index ec31672df..00b1d57f8 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Setup.php b/app/code/core/Mage/Eav/Model/Entity/Setup.php index 6f3395e0d..56e4c4396 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Setup.php +++ b/app/code/core/Mage/Eav/Model/Entity/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Store.php b/app/code/core/Mage/Eav/Model/Entity/Store.php index 47f943d60..080bb9604 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Type.php b/app/code/core/Mage/Eav/Model/Entity/Type.php index b84a88d24..3494b9cbd 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Entity/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -163,7 +163,6 @@ public function getAttributeSetCollection() * * @param int $storeId * @return string - * @throws Exception */ public function fetchNewIncrementId($storeId = null) { @@ -181,41 +180,36 @@ public function fetchNewIncrementId($storeId = null) // Start transaction to run SELECT ... FOR UPDATE $this->_getResource()->beginTransaction(); - try { - $entityStoreConfig = Mage::getModel('eav/entity_store') - ->loadByEntityStore($this->getId(), $storeId); + $entityStoreConfig = Mage::getModel('eav/entity_store') + ->loadByEntityStore($this->getId(), $storeId); - if (!$entityStoreConfig->getId()) { - $entityStoreConfig - ->setEntityTypeId($this->getId()) - ->setStoreId($storeId) - ->setIncrementPrefix($storeId) - ->save(); - } - - $incrementInstance = Mage::getModel($this->getIncrementModel()) - ->setPrefix($entityStoreConfig->getIncrementPrefix()) - ->setPadLength($this->getIncrementPadLength()) - ->setPadChar($this->getIncrementPadChar()) - ->setLastId($entityStoreConfig->getIncrementLastId()) - ->setEntityTypeId($entityStoreConfig->getEntityTypeId()) - ->setStoreId($entityStoreConfig->getStoreId()); - - /** - * do read lock on eav/entity_store to solve potential timing issues - * (most probably already done by beginTransaction of entity save) - */ - $incrementId = $incrementInstance->getNextId(); - $entityStoreConfig->setIncrementLastId($incrementId); - $entityStoreConfig->save(); - - // Commit increment_last_id changes - $this->_getResource()->commit(); - } catch (Exception $e) { - $this->_getResource()->rollBack(); - throw $e; + if (!$entityStoreConfig->getId()) { + $entityStoreConfig + ->setEntityTypeId($this->getId()) + ->setStoreId($storeId) + ->setIncrementPrefix($storeId) + ->save(); } + $incrementInstance = Mage::getModel($this->getIncrementModel()) + ->setPrefix($entityStoreConfig->getIncrementPrefix()) + ->setPadLength($this->getIncrementPadLength()) + ->setPadChar($this->getIncrementPadChar()) + ->setLastId($entityStoreConfig->getIncrementLastId()) + ->setEntityTypeId($entityStoreConfig->getEntityTypeId()) + ->setStoreId($entityStoreConfig->getStoreId()); + + /** + * do read lock on eav/entity_store to solve potential timing issues + * (most probably already done by beginTransaction of entity save) + */ + $incrementId = $incrementInstance->getNextId(); + $entityStoreConfig->setIncrementLastId($incrementId); + $entityStoreConfig->save(); + + // Commit increment_last_id changes + $this->_getResource()->commit(); + return $incrementId; } @@ -269,7 +263,7 @@ public function getEntityTablePrefix() return $tablePrefix; } - + /** * Get default attribute set identifier for etity type * diff --git a/app/code/core/Mage/Eav/Model/Form.php b/app/code/core/Mage/Eav/Model/Form.php index 56806d344..e1d8a0559 100644 --- a/app/code/core/Mage/Eav/Model/Form.php +++ b/app/code/core/Mage/Eav/Model/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Form/Element.php b/app/code/core/Mage/Eav/Model/Form/Element.php index 7b831f1a6..b7d3d5787 100644 --- a/app/code/core/Mage/Eav/Model/Form/Element.php +++ b/app/code/core/Mage/Eav/Model/Form/Element.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Form/Fieldset.php b/app/code/core/Mage/Eav/Model/Form/Fieldset.php index 7d3179a80..9e805069a 100644 --- a/app/code/core/Mage/Eav/Model/Form/Fieldset.php +++ b/app/code/core/Mage/Eav/Model/Form/Fieldset.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Form/Type.php b/app/code/core/Mage/Eav/Model/Form/Type.php index d1dc253d1..34ecdd3b0 100644 --- a/app/code/core/Mage/Eav/Model/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Form/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Config.php b/app/code/core/Mage/Eav/Model/Mysql4/Config.php index 2d4f330e8..4ec55fd28 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Config.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php index 18528d4db..06452d3d1 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php index f3a2d9ebc..849495909 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php index e357ac7d6..294e82b9e 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php index 3a036c601..c95882613 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php index 1b083072a..90a3290aa 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php index 004b0a66d..564d0a8d9 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php index a52af2392..b306b6186 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php index e7f58c35a..a2a8a2400 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php index cddaaffec..a91974da8 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php index 0404538b7..d1fa10527 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php index eca6c35ea..cea390ab3 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php index b173df6c2..8ef5314b0 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php index 4894953d7..d4c1edd16 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php index e50024fe4..ffbe124ef 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php index ce6abd671..c7254c98b 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php index 27917bccf..fda7cbb0a 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php index f0821bd1e..e2a3ca87c 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Attribute.php b/app/code/core/Mage/Eav/Model/Resource/Attribute.php index 78788b3ea..9b9216f8e 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Resource/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php index bdb5335e6..23f18c896 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Config.php b/app/code/core/Mage/Eav/Model/Resource/Config.php index cfebcd03c..0782bc07b 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Config.php +++ b/app/code/core/Mage/Eav/Model/Resource/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php index 17f0c4493..780d78284 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php index cd46b582b..76158b940 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php index b3ef0193e..88d1b5055 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group/Collection.php index f5a0b2232..fd4e611b1 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php index aac6071f8..78eaab181 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php index 22f0bb206..090086a7c 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php index b2f2322bf..175a88f99 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set/Collection.php index 294a32651..e1b201786 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php index 0e595e7ef..c8414f3d0 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Type.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Type.php index 5bcbab57c..d6095dcc3 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Type/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Type/Collection.php index 9d825f8e5..076284837 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Type/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Type/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Attribute.php b/app/code/core/Mage/Eav/Model/Resource/Form/Attribute.php index a5ea5510f..39003c7fa 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php index 594e29129..0131dc3d3 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Element.php b/app/code/core/Mage/Eav/Model/Resource/Form/Element.php index a66fd8a8f..8cbdd6ecc 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Element.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Element.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Element/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Element/Collection.php index 579646d87..70f2fa72a 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Element/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Element/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php index 914091d70..cdbdf4e20 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset/Collection.php index 4b7cd9064..c3e0b4d43 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Type.php b/app/code/core/Mage/Eav/Model/Resource/Form/Type.php index d61443461..50c8a14d5 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Type/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Type/Collection.php index d15c6878a..9abefffd6 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Type/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Type/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Eav/Model/Resource/Helper/Mysql4.php index 3afe291b4..9ff21a849 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Eav/Model/Resource/Helper/Mysql4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/etc/config.xml b/app/code/core/Mage/Eav/etc/config.xml index 5562c6a7b..3785ecb0d 100644 --- a/app/code/core/Mage/Eav/etc/config.xml +++ b/app/code/core/Mage/Eav/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Eav/sql/eav_setup/install-1.6.0.0.php b/app/code/core/Mage/Eav/sql/eav_setup/install-1.6.0.0.php index 9e8124467..2a8208044 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php index fb3429bd8..688c736d5 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php index 56ab99b91..8ab493dd7 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php index 483fafb28..2587e8854 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.10-0.7.11.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.10-0.7.11.php index 2f4fab4e4..5c3c86d09 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.10-0.7.11.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.10-0.7.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.11-0.7.12.php index 3033d8de8..761eaf209 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.11-0.7.12.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.11-0.7.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.12-0.7.13.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.12-0.7.13.php index b3faa97a6..67b54a185 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.12-0.7.13.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.12-0.7.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.13-0.7.14.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.13-0.7.14.php index 03f7d8543..d790ef836 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.13-0.7.14.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.13-0.7.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.14-0.7.15.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.14-0.7.15.php index 123b44d89..9f5a3543a 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.14-0.7.15.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.14-0.7.15.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.15-0.7.16.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.15-0.7.16.php index dad2bfa15..2e4c211f0 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.15-0.7.16.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.15-0.7.16.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.2-0.7.3.php index 5b1199206..0d1cdf106 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.3-0.7.4.php index 213d2f5b8..7ce22dfdb 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.4-0.7.5.php index 4cc665f70..0ed32b687 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.5-0.7.6.php index d9564f757..5650eb2ec 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.6-0.7.7.php index 41b0717e0..1b1b818ff 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php index fa08a88d6..8386ab02b 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php index 0c6b307df..9f0cf98da 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php index 6a02cd3ca..53dc6882b 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 0211588d2..565c15e1e 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php index d4f7dd575..aa3ba2daf 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Eav - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php index dc6cda521..5f1c9f3ab 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php index c988ea04e..6161031f1 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php index e14b4518a..72c4a5e2a 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php index 2f7bb8e87..a5430b5dd 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php index 85c128ef2..0a4c4b733 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php index b29a51124..2acd834df 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php index 059f25008..8c834c291 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Form.php b/app/code/core/Mage/GiftMessage/Block/Message/Form.php index 1641d81ef..1fd44f971 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Form.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Helper.php b/app/code/core/Mage/GiftMessage/Block/Message/Helper.php index a1fa1d59e..129d9d702 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Helper.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Helper.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php index 2ec78a0e5..67d37cdf5 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Helper/Data.php b/app/code/core/Mage/GiftMessage/Helper/Data.php index 7d552d5a9..2cbe5b7df 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Data.php +++ b/app/code/core/Mage/GiftMessage/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Helper/Message.php b/app/code/core/Mage/GiftMessage/Helper/Message.php index 93383b4e0..8a7fb80f2 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Message.php +++ b/app/code/core/Mage/GiftMessage/Helper/Message.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Helper/Url.php b/app/code/core/Mage/GiftMessage/Helper/Url.php index 4c85ffc6a..d9c3c3e3f 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Url.php +++ b/app/code/core/Mage/GiftMessage/Helper/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Api.php b/app/code/core/Mage/GiftMessage/Model/Api.php index 78054914a..5cd39e672 100644 --- a/app/code/core/Mage/GiftMessage/Model/Api.php +++ b/app/code/core/Mage/GiftMessage/Model/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Api/V2.php b/app/code/core/Mage/GiftMessage/Model/Api/V2.php index 0f6ac519c..42f6372e4 100644 --- a/app/code/core/Mage/GiftMessage/Model/Api/V2.php +++ b/app/code/core/Mage/GiftMessage/Model/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php index 053115efd..52b59ad1c 100644 --- a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php +++ b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php index abd839e56..0f210c21d 100644 --- a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php +++ b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Message.php b/app/code/core/Mage/GiftMessage/Model/Message.php index dcd8c5e14..aab36a8e5 100644 --- a/app/code/core/Mage/GiftMessage/Model/Message.php +++ b/app/code/core/Mage/GiftMessage/Model/Message.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php index 2acb5140d..3735a193b 100644 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php +++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php index 72e7b7ea7..1a9600615 100644 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php +++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php index 8b87d00e8..b2b31a9bc 100644 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Observer.php b/app/code/core/Mage/GiftMessage/Model/Observer.php index 51d607cff..ef8d19f80 100644 --- a/app/code/core/Mage/GiftMessage/Model/Observer.php +++ b/app/code/core/Mage/GiftMessage/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Resource/Message.php b/app/code/core/Mage/GiftMessage/Model/Resource/Message.php index 65894d8e4..fa2285129 100644 --- a/app/code/core/Mage/GiftMessage/Model/Resource/Message.php +++ b/app/code/core/Mage/GiftMessage/Model/Resource/Message.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Resource/Message/Collection.php b/app/code/core/Mage/GiftMessage/Model/Resource/Message/Collection.php index e0358a1a3..03a933310 100644 --- a/app/code/core/Mage/GiftMessage/Model/Resource/Message/Collection.php +++ b/app/code/core/Mage/GiftMessage/Model/Resource/Message/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php b/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php index 0513e9c48..6f0250ac9 100644 --- a/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php +++ b/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/controllers/IndexController.php b/app/code/core/Mage/GiftMessage/controllers/IndexController.php index da82fcd9d..a5b235130 100644 --- a/app/code/core/Mage/GiftMessage/controllers/IndexController.php +++ b/app/code/core/Mage/GiftMessage/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/etc/api.xml b/app/code/core/Mage/GiftMessage/etc/api.xml index c835acaf1..3afc7d28f 100644 --- a/app/code/core/Mage/GiftMessage/etc/api.xml +++ b/app/code/core/Mage/GiftMessage/etc/api.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GiftMessage/etc/config.xml b/app/code/core/Mage/GiftMessage/etc/config.xml index aa7a32580..38794ad99 100644 --- a/app/code/core/Mage/GiftMessage/etc/config.xml +++ b/app/code/core/Mage/GiftMessage/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GiftMessage/etc/system.xml b/app/code/core/Mage/GiftMessage/etc/system.xml index 57f0f2e7c..b532e2d38 100644 --- a/app/code/core/Mage/GiftMessage/etc/system.xml +++ b/app/code/core/Mage/GiftMessage/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/install-1.6.0.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/install-1.6.0.0.php index 39f7e17a9..7cc342ee3 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php index 009063d7f..ed770713e 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php index e83d53210..f11443b84 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup() diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php index 5d6ec9374..507e82afa 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php index 0df04343a..30ae62234 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.2-0.7.3.php index c483868ac..0792b0ede 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.3-0.7.4.php index f7a36b02b..6c755ed64 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.4-0.7.5.php index cff3390d7..89e0e9664 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.5-0.7.6.php index 347c3fcef..b9221ac70 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index aa2da2c45..469fa18ab 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php index 8407a235f..877b357dc 100644 --- a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php +++ b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleAnalytics - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php index 27cc17ef1..e74632b40 100644 --- a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php +++ b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleAnalytics - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php index 2c230c2ae..bc197324f 100644 --- a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php +++ b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleAnalytics - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml b/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml index 3912a2300..ab8607b08 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_GoogleAnalytics - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleAnalytics/etc/config.xml b/app/code/core/Mage/GoogleAnalytics/etc/config.xml index fa886137d..6759ae2cd 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/config.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_GoogleAnalytics - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleAnalytics/etc/system.xml b/app/code/core/Mage/GoogleAnalytics/etc/system.xml index 70c82027f..e2a357542 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/system.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_GoogleAnalytics - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Captcha.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Captcha.php index b14e0886a..8ce793f49 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Captcha.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Captcha.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items.php index e9ab41477..a26a9c717 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php index c02b706ac..2474ca351 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Product.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Product.php index dda94f99c..959f2ca40 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Product.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Renderer/Id.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Renderer/Id.php index cb2452a93..3ffc15a43 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Renderer/Id.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Renderer/Id.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Store/Switcher.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Store/Switcher.php index 857c18ea5..82f688def 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Store/Switcher.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Store/Switcher.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types.php index 64abb4bda..7d2cd12cd 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php index 65b0d8633..067a5443a 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Attributes.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Attributes.php index e5a887d75..814aa6674 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Attributes.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Attributes.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Form.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Form.php index cd05b8642..ccd1e3415 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Form.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Grid.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Grid.php index 36e8edaf8..0faccb781 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Grid.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Renderer/Country.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Renderer/Country.php index 351efb468..80bff63c6 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Renderer/Country.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Renderer/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Helper/Data.php b/app/code/core/Mage/GoogleBase/Helper/Data.php index dd7f38058..08ee7ee08 100644 --- a/app/code/core/Mage/GoogleBase/Helper/Data.php +++ b/app/code/core/Mage/GoogleBase/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Attribute.php b/app/code/core/Mage/GoogleBase/Model/Attribute.php index 90dd405f8..78a8b2cb9 100644 --- a/app/code/core/Mage/GoogleBase/Model/Attribute.php +++ b/app/code/core/Mage/GoogleBase/Model/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Config.php b/app/code/core/Mage/GoogleBase/Model/Config.php index 24ac70fec..b957454a8 100644 --- a/app/code/core/Mage/GoogleBase/Model/Config.php +++ b/app/code/core/Mage/GoogleBase/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Item.php b/app/code/core/Mage/GoogleBase/Model/Item.php index d3f7c6825..e9b4cd93f 100644 --- a/app/code/core/Mage/GoogleBase/Model/Item.php +++ b/app/code/core/Mage/GoogleBase/Model/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute.php index 481bf7343..8d72445b4 100644 --- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute.php +++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute/Collection.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute/Collection.php index 239f6343d..716ccb353 100644 --- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute/Collection.php +++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Item.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Item.php index a522a870a..f5c37021f 100644 --- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Item.php +++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Item/Collection.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Item/Collection.php index e9bf16dc8..f51703ee5 100644 --- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Item/Collection.php +++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Type.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Type.php index a01799fd8..c663bfa8c 100644 --- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Type.php +++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Type/Collection.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Type/Collection.php index a81899c8d..1b61cfea9 100644 --- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Type/Collection.php +++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Type/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Observer.php b/app/code/core/Mage/GoogleBase/Model/Observer.php index b3fb7a4e8..0dddedb09 100644 --- a/app/code/core/Mage/GoogleBase/Model/Observer.php +++ b/app/code/core/Mage/GoogleBase/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Resource/Attribute.php b/app/code/core/Mage/GoogleBase/Model/Resource/Attribute.php index cedd23f95..51145adb3 100644 --- a/app/code/core/Mage/GoogleBase/Model/Resource/Attribute.php +++ b/app/code/core/Mage/GoogleBase/Model/Resource/Attribute.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Resource/Attribute/Collection.php b/app/code/core/Mage/GoogleBase/Model/Resource/Attribute/Collection.php index 07d6ec3ec..dc051c1cd 100644 --- a/app/code/core/Mage/GoogleBase/Model/Resource/Attribute/Collection.php +++ b/app/code/core/Mage/GoogleBase/Model/Resource/Attribute/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Resource/Item.php b/app/code/core/Mage/GoogleBase/Model/Resource/Item.php index 770058bff..c4d1cf761 100644 --- a/app/code/core/Mage/GoogleBase/Model/Resource/Item.php +++ b/app/code/core/Mage/GoogleBase/Model/Resource/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Resource/Item/Collection.php b/app/code/core/Mage/GoogleBase/Model/Resource/Item/Collection.php index d274590ea..646f102ff 100644 --- a/app/code/core/Mage/GoogleBase/Model/Resource/Item/Collection.php +++ b/app/code/core/Mage/GoogleBase/Model/Resource/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Resource/Type.php b/app/code/core/Mage/GoogleBase/Model/Resource/Type.php index 65c373592..ce7eceff0 100644 --- a/app/code/core/Mage/GoogleBase/Model/Resource/Type.php +++ b/app/code/core/Mage/GoogleBase/Model/Resource/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Resource/Type/Collection.php b/app/code/core/Mage/GoogleBase/Model/Resource/Type/Collection.php index aaf86edb7..37b6db40a 100644 --- a/app/code/core/Mage/GoogleBase/Model/Resource/Type/Collection.php +++ b/app/code/core/Mage/GoogleBase/Model/Resource/Type/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Service.php b/app/code/core/Mage/GoogleBase/Model/Service.php index 001e83c62..2869fa662 100644 --- a/app/code/core/Mage/GoogleBase/Model/Service.php +++ b/app/code/core/Mage/GoogleBase/Model/Service.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Service/Feed.php b/app/code/core/Mage/GoogleBase/Model/Service/Feed.php index 2383fcfd2..6f93ed7f9 100644 --- a/app/code/core/Mage/GoogleBase/Model/Service/Feed.php +++ b/app/code/core/Mage/GoogleBase/Model/Service/Feed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Service/Item.php b/app/code/core/Mage/GoogleBase/Model/Service/Item.php index edfcd2ebe..fba3a6b03 100644 --- a/app/code/core/Mage/GoogleBase/Model/Service/Item.php +++ b/app/code/core/Mage/GoogleBase/Model/Service/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Source/Accounttype.php b/app/code/core/Mage/GoogleBase/Model/Source/Accounttype.php index c728d65c0..06e46a471 100644 --- a/app/code/core/Mage/GoogleBase/Model/Source/Accounttype.php +++ b/app/code/core/Mage/GoogleBase/Model/Source/Accounttype.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Source/Authtype.php b/app/code/core/Mage/GoogleBase/Model/Source/Authtype.php index 74dc43c65..8f1cb118a 100644 --- a/app/code/core/Mage/GoogleBase/Model/Source/Authtype.php +++ b/app/code/core/Mage/GoogleBase/Model/Source/Authtype.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Source/Country.php b/app/code/core/Mage/GoogleBase/Model/Source/Country.php index 17cb6fc8f..a71667414 100644 --- a/app/code/core/Mage/GoogleBase/Model/Source/Country.php +++ b/app/code/core/Mage/GoogleBase/Model/Source/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Source/Statuses.php b/app/code/core/Mage/GoogleBase/Model/Source/Statuses.php index 57e4a2a1a..a219eb8fc 100644 --- a/app/code/core/Mage/GoogleBase/Model/Source/Statuses.php +++ b/app/code/core/Mage/GoogleBase/Model/Source/Statuses.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/Model/Type.php b/app/code/core/Mage/GoogleBase/Model/Type.php index 54de52200..99d56ae25 100644 --- a/app/code/core/Mage/GoogleBase/Model/Type.php +++ b/app/code/core/Mage/GoogleBase/Model/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/ItemsController.php b/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/ItemsController.php index ddd02a552..4b17262b0 100644 --- a/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/ItemsController.php +++ b/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/ItemsController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/SelectionController.php b/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/SelectionController.php index 5f27e0762..dcc126a7e 100644 --- a/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/SelectionController.php +++ b/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/SelectionController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/TypesController.php b/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/TypesController.php index 5f59cec23..e7eddd9f9 100644 --- a/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/TypesController.php +++ b/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/TypesController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -253,7 +253,7 @@ public function _getStore() { $storeId = (int) $this->getRequest()->getParam('store', 0); if ($storeId == 0) { - return Mage::app()->getAnyStoreView(); + return Mage::app()->getDefaultStoreView(); } return Mage::app()->getStore($storeId); } diff --git a/app/code/core/Mage/GoogleBase/controllers/ItemsController.php b/app/code/core/Mage/GoogleBase/controllers/ItemsController.php index 8fcfd9634..71d00a6f7 100644 --- a/app/code/core/Mage/GoogleBase/controllers/ItemsController.php +++ b/app/code/core/Mage/GoogleBase/controllers/ItemsController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/controllers/SelectionController.php b/app/code/core/Mage/GoogleBase/controllers/SelectionController.php index d1d3ecc72..e5358fdd7 100644 --- a/app/code/core/Mage/GoogleBase/controllers/SelectionController.php +++ b/app/code/core/Mage/GoogleBase/controllers/SelectionController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/controllers/TypesController.php b/app/code/core/Mage/GoogleBase/controllers/TypesController.php index 4e45809ba..1548d96be 100644 --- a/app/code/core/Mage/GoogleBase/controllers/TypesController.php +++ b/app/code/core/Mage/GoogleBase/controllers/TypesController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/etc/adminhtml.xml b/app/code/core/Mage/GoogleBase/etc/adminhtml.xml index 6c3d66f81..8508a19ce 100644 --- a/app/code/core/Mage/GoogleBase/etc/adminhtml.xml +++ b/app/code/core/Mage/GoogleBase/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleBase/etc/config.xml b/app/code/core/Mage/GoogleBase/etc/config.xml index 773bc66fe..82aa1776f 100644 --- a/app/code/core/Mage/GoogleBase/etc/config.xml +++ b/app/code/core/Mage/GoogleBase/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleBase/etc/system.xml b/app/code/core/Mage/GoogleBase/etc/system.xml index cee8917dc..475947822 100644 --- a/app/code/core/Mage/GoogleBase/etc/system.xml +++ b/app/code/core/Mage/GoogleBase/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/install-1.6.0.0.php b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/install-1.6.0.0.php index 00ba145a5..ed816258c 100644 --- a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-install-0.1.0.php index c3f06d839..313c3ad4b 100644 --- a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-install-0.1.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.0-0.1.1.php index 64b0da243..fcd0a8368 100644 --- a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.0-0.1.1.php +++ b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.0-0.1.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.1-0.1.2.php index 28f8075e5..48153d378 100644 --- a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.1-0.1.2.php +++ b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.1-0.1.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index ea85295e4..c65f01d56 100644 --- a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleBase - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleCheckout/Model/Payment.php b/app/code/core/Mage/GoogleCheckout/Model/Payment.php index c686f7f74..a6e38a37a 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Payment.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleCheckout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleCheckout/etc/config.xml b/app/code/core/Mage/GoogleCheckout/etc/config.xml index ba2711216..fad1ddd81 100644 --- a/app/code/core/Mage/GoogleCheckout/etc/config.xml +++ b/app/code/core/Mage/GoogleCheckout/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_GoogleCheckout - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php index 1b9842601..5e7ebf3ed 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php index 3017eb136..55f7e186b 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php index 12df1c234..93e2d6c12 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php index e02b7bb4e..b5d103ede 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php index 9fa38379c..d1380d490 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Frame/Result.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Frame/Result.php index 1c1287178..ee168890c 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Frame/Result.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Frame/Result.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Helper/Data.php b/app/code/core/Mage/ImportExport/Helper/Data.php index fd25b206c..8407627e6 100644 --- a/app/code/core/Mage/ImportExport/Helper/Data.php +++ b/app/code/core/Mage/ImportExport/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Abstract.php b/app/code/core/Mage/ImportExport/Model/Abstract.php index 3a56301df..3f371d290 100644 --- a/app/code/core/Mage/ImportExport/Model/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Config.php b/app/code/core/Mage/ImportExport/Model/Config.php index a4bef38c9..f06778bee 100644 --- a/app/code/core/Mage/ImportExport/Model/Config.php +++ b/app/code/core/Mage/ImportExport/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export.php b/app/code/core/Mage/ImportExport/Model/Export.php index af9d4b7bd..928ace192 100644 --- a/app/code/core/Mage/ImportExport/Model/Export.php +++ b/app/code/core/Mage/ImportExport/Model/Export.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php index 95824cf47..3ac0a9cc3 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php index e7591f7c2..313fea418 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php index a7432febe..1673a9921 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php index d4e414453..c5b07f2f2 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php index dc090b466..d6646fee8 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php index 51d8aa4a2..638ffc46f 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Configurable.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Configurable.php index 04bd0374c..fd8e6dbf7 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Configurable.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Grouped.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Grouped.php index 753f75340..b2ba495b0 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Grouped.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php index a0c76889b..8a149eff9 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import.php b/app/code/core/Mage/ImportExport/Model/Import.php index cd8e6209e..8281d420e 100644 --- a/app/code/core/Mage/ImportExport/Model/Import.php +++ b/app/code/core/Mage/ImportExport/Model/Import.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Adapter.php b/app/code/core/Mage/ImportExport/Model/Import/Adapter.php index e7cda29eb..2e75db86e 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Adapter.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Adapter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php index 388589e9b..9de194c58 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php index 8d5d4976f..f07f1a7cb 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php index 654d9dfdc..6c815ed68 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php index a47a42555..ab7336200 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php index 4ca29114e..429504da9 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php index b2c6a57f2..daaa72a2b 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php index a2d9e5bd6..c1ed7bcfc 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php index 898eb8b14..a64b7b0e0 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php index 2e9b38933..50e2b095f 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Simple.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Simple.php index 428130caa..64165025f 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Simple.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Simple.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product.php b/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product.php index e503d60ca..9a4b223bd 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php b/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php index bdf30128b..a32cadf9a 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Uploader.php b/app/code/core/Mage/ImportExport/Model/Import/Uploader.php index f2c2c1f6b..b4208845b 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Uploader.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Uploader.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php b/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php index 137135fe2..3f88cd3d3 100644 --- a/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php +++ b/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php b/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php index 493eaaa66..a8ab1521e 100644 --- a/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php index 05ee6961c..c89a17b56 100644 --- a/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php index a7bb49634..69d2e90af 100644 --- a/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php b/app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php index f14deb169..0b49aaa67 100644 --- a/app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php +++ b/app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Resource/Setup.php b/app/code/core/Mage/ImportExport/Model/Resource/Setup.php index ab522cb4f..bb33ea48b 100644 --- a/app/code/core/Mage/ImportExport/Model/Resource/Setup.php +++ b/app/code/core/Mage/ImportExport/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Source/Export/Entity.php b/app/code/core/Mage/ImportExport/Model/Source/Export/Entity.php index 2d426dd59..0907ed6b8 100644 --- a/app/code/core/Mage/ImportExport/Model/Source/Export/Entity.php +++ b/app/code/core/Mage/ImportExport/Model/Source/Export/Entity.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Source/Export/Format.php b/app/code/core/Mage/ImportExport/Model/Source/Export/Format.php index 9730a7e24..c934f9d10 100644 --- a/app/code/core/Mage/ImportExport/Model/Source/Export/Format.php +++ b/app/code/core/Mage/ImportExport/Model/Source/Export/Format.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php b/app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php index 77a333272..0fa2c74bb 100644 --- a/app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php +++ b/app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php b/app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php index f88022800..de971e81f 100644 --- a/app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php +++ b/app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php index 82bb479be..612d74968 100644 --- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php +++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php index 9b051cbb9..6ed09d678 100644 --- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php +++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/etc/adminhtml.xml b/app/code/core/Mage/ImportExport/etc/adminhtml.xml index c0245f867..e0b413cdb 100644 --- a/app/code/core/Mage/ImportExport/etc/adminhtml.xml +++ b/app/code/core/Mage/ImportExport/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ImportExport/etc/config.xml b/app/code/core/Mage/ImportExport/etc/config.xml index 158152704..8bf3cb3ec 100644 --- a/app/code/core/Mage/ImportExport/etc/config.xml +++ b/app/code/core/Mage/ImportExport/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ImportExport/sql/importexport_setup/install-1.6.0.0.php b/app/code/core/Mage/ImportExport/sql/importexport_setup/install-1.6.0.0.php index 2be304b02..2e9f31971 100644 --- a/app/code/core/Mage/ImportExport/sql/importexport_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/ImportExport/sql/importexport_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-install-0.1.0.php index 427fe9c4e..a429191ad 100644 --- a/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-install-0.1.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php index 68729d16b..50edcbed8 100644 --- a/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Notifications.php b/app/code/core/Mage/Index/Block/Adminhtml/Notifications.php index c4276efca..6c7589758 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Notifications.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Notifications.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process.php b/app/code/core/Mage/Index/Block/Adminhtml/Process.php index cf8a5c434..99cf4e23f 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php index f4df6cae8..a215b4d3b 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Form.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Form.php index f1760d3a3..001db4c56 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Form.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tab/Main.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tab/Main.php index 0192a8b11..77288cc3c 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tab/Main.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tab/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tabs.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tabs.php index 1e36f1424..3e6b1f42a 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tabs.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php index d6238ef85..966be1391 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid/Massaction.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid/Massaction.php index e57872261..03bd5efc1 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid/Massaction.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid/Massaction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Helper/Data.php b/app/code/core/Mage/Index/Helper/Data.php index d55c18ed4..e729b035c 100644 --- a/app/code/core/Mage/Index/Helper/Data.php +++ b/app/code/core/Mage/Index/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Event.php b/app/code/core/Mage/Index/Model/Event.php index 8a4d94112..8d89c2bac 100644 --- a/app/code/core/Mage/Index/Model/Event.php +++ b/app/code/core/Mage/Index/Model/Event.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Indexer.php b/app/code/core/Mage/Index/Model/Indexer.php index 00a00f81c..c3f842a32 100644 --- a/app/code/core/Mage/Index/Model/Indexer.php +++ b/app/code/core/Mage/Index/Model/Indexer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Indexer/Abstract.php b/app/code/core/Mage/Index/Model/Indexer/Abstract.php index 564013cce..201ce3531 100644 --- a/app/code/core/Mage/Index/Model/Indexer/Abstract.php +++ b/app/code/core/Mage/Index/Model/Indexer/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Mysql4/Abstract.php b/app/code/core/Mage/Index/Model/Mysql4/Abstract.php index 8b3a44fe6..9fac41bed 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Abstract.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Mysql4/Event.php b/app/code/core/Mage/Index/Model/Mysql4/Event.php index 3585d6032..08023f767 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Event.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Event.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php b/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php index 4ca1be342..baffb7061 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Mysql4/Process.php b/app/code/core/Mage/Index/Model/Mysql4/Process.php index d06f57868..496622a14 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Process.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Process.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php b/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php index a1d058b11..c1386e3b5 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Mysql4/Setup.php b/app/code/core/Mage/Index/Model/Mysql4/Setup.php index ca0f7233d..1146f213c 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Observer.php b/app/code/core/Mage/Index/Model/Observer.php index 00c0efc50..df1a2092b 100644 --- a/app/code/core/Mage/Index/Model/Observer.php +++ b/app/code/core/Mage/Index/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Process.php b/app/code/core/Mage/Index/Model/Process.php index adcf3b18c..3b0122cd9 100644 --- a/app/code/core/Mage/Index/Model/Process.php +++ b/app/code/core/Mage/Index/Model/Process.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Resource/Abstract.php b/app/code/core/Mage/Index/Model/Resource/Abstract.php index 22274b6ea..e4480cc4f 100644 --- a/app/code/core/Mage/Index/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Index/Model/Resource/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Resource/Event.php b/app/code/core/Mage/Index/Model/Resource/Event.php index 525811573..9fcaa083e 100644 --- a/app/code/core/Mage/Index/Model/Resource/Event.php +++ b/app/code/core/Mage/Index/Model/Resource/Event.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Resource/Event/Collection.php b/app/code/core/Mage/Index/Model/Resource/Event/Collection.php index f151148c6..d153b129b 100644 --- a/app/code/core/Mage/Index/Model/Resource/Event/Collection.php +++ b/app/code/core/Mage/Index/Model/Resource/Event/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Index/Model/Resource/Helper/Mysql4.php index 368e73505..dd7858e14 100644 --- a/app/code/core/Mage/Index/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Index/Model/Resource/Helper/Mysql4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Resource/Process.php b/app/code/core/Mage/Index/Model/Resource/Process.php index dab3cb9a5..e1ae288d0 100644 --- a/app/code/core/Mage/Index/Model/Resource/Process.php +++ b/app/code/core/Mage/Index/Model/Resource/Process.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Resource/Process/Collection.php b/app/code/core/Mage/Index/Model/Resource/Process/Collection.php index 39ab7dde6..81dd24f41 100644 --- a/app/code/core/Mage/Index/Model/Resource/Process/Collection.php +++ b/app/code/core/Mage/Index/Model/Resource/Process/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Resource/Setup.php b/app/code/core/Mage/Index/Model/Resource/Setup.php index 1d55fedab..3113b5ef7 100644 --- a/app/code/core/Mage/Index/Model/Resource/Setup.php +++ b/app/code/core/Mage/Index/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php b/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php index 46d3de372..865ee7dfe 100644 --- a/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php +++ b/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Index_Adminhtml_ProcessController extends Mage_Adminhtml_Controller_Action diff --git a/app/code/core/Mage/Index/etc/adminhtml.xml b/app/code/core/Mage/Index/etc/adminhtml.xml index 8998b9177..c38b70466 100644 --- a/app/code/core/Mage/Index/etc/adminhtml.xml +++ b/app/code/core/Mage/Index/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Index/etc/config.xml b/app/code/core/Mage/Index/etc/config.xml index e18029ca1..ea3e52a70 100644 --- a/app/code/core/Mage/Index/etc/config.xml +++ b/app/code/core/Mage/Index/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Index/sql/index_setup/install-1.6.0.0.php b/app/code/core/Mage/Index/sql/index_setup/install-1.6.0.0.php index d57dc5c52..fdf44744b 100644 --- a/app/code/core/Mage/Index/sql/index_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Index/sql/index_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/sql/index_setup/mysql4-install-1.4.0.0.php b/app/code/core/Mage/Index/sql/index_setup/mysql4-install-1.4.0.0.php index bae1169c6..5410d7f8f 100644 --- a/app/code/core/Mage/Index/sql/index_setup/mysql4-install-1.4.0.0.php +++ b/app/code/core/Mage/Index/sql/index_setup/mysql4-install-1.4.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php b/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php index e61aa1afb..d720ca667 100644 --- a/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php +++ b/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php b/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php index 1a8cc6acf..3c640a3f4 100644 --- a/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php +++ b/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 78ab75695..8cdcd0cc1 100644 --- a/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Index - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Abstract.php b/app/code/core/Mage/Install/Block/Abstract.php index 3f27d8bf2..1deccd5e5 100644 --- a/app/code/core/Mage/Install/Block/Abstract.php +++ b/app/code/core/Mage/Install/Block/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Admin.php b/app/code/core/Mage/Install/Block/Admin.php index 42b2a3309..72d2e2e32 100644 --- a/app/code/core/Mage/Install/Block/Admin.php +++ b/app/code/core/Mage/Install/Block/Admin.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Begin.php b/app/code/core/Mage/Install/Block/Begin.php index e853040d4..eebdd1dad 100644 --- a/app/code/core/Mage/Install/Block/Begin.php +++ b/app/code/core/Mage/Install/Block/Begin.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Config.php b/app/code/core/Mage/Install/Block/Config.php index b523fb581..780e3875c 100644 --- a/app/code/core/Mage/Install/Block/Config.php +++ b/app/code/core/Mage/Install/Block/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Db/Main.php b/app/code/core/Mage/Install/Block/Db/Main.php index 18becc0fd..3709af400 100644 --- a/app/code/core/Mage/Install/Block/Db/Main.php +++ b/app/code/core/Mage/Install/Block/Db/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Db/Type.php b/app/code/core/Mage/Install/Block/Db/Type.php index d2162a78b..5bb3e87cd 100644 --- a/app/code/core/Mage/Install/Block/Db/Type.php +++ b/app/code/core/Mage/Install/Block/Db/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Db/Type/Mysql4.php b/app/code/core/Mage/Install/Block/Db/Type/Mysql4.php index f3e30b7bf..4ef6188ca 100644 --- a/app/code/core/Mage/Install/Block/Db/Type/Mysql4.php +++ b/app/code/core/Mage/Install/Block/Db/Type/Mysql4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Download.php b/app/code/core/Mage/Install/Block/Download.php index a49e81839..fe05b2f16 100644 --- a/app/code/core/Mage/Install/Block/Download.php +++ b/app/code/core/Mage/Install/Block/Download.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/End.php b/app/code/core/Mage/Install/Block/End.php index 2473f2f20..47a1023c1 100644 --- a/app/code/core/Mage/Install/Block/End.php +++ b/app/code/core/Mage/Install/Block/End.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Locale.php b/app/code/core/Mage/Install/Block/Locale.php index 2250ac836..1623062bd 100644 --- a/app/code/core/Mage/Install/Block/Locale.php +++ b/app/code/core/Mage/Install/Block/Locale.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/State.php b/app/code/core/Mage/Install/Block/State.php index 6fbf4e3b7..051347169 100644 --- a/app/code/core/Mage/Install/Block/State.php +++ b/app/code/core/Mage/Install/Block/State.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Controller/Action.php b/app/code/core/Mage/Install/Controller/Action.php index c30e541f8..d8f7aed7e 100644 --- a/app/code/core/Mage/Install/Controller/Action.php +++ b/app/code/core/Mage/Install/Controller/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Helper/Data.php b/app/code/core/Mage/Install/Helper/Data.php index e0a4abe22..77eb04f38 100644 --- a/app/code/core/Mage/Install/Helper/Data.php +++ b/app/code/core/Mage/Install/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Config.php b/app/code/core/Mage/Install/Model/Config.php index 645ae1704..69c3c0949 100644 --- a/app/code/core/Mage/Install/Model/Config.php +++ b/app/code/core/Mage/Install/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer.php b/app/code/core/Mage/Install/Model/Installer.php index 836307663..b045c1b71 100644 --- a/app/code/core/Mage/Install/Model/Installer.php +++ b/app/code/core/Mage/Install/Model/Installer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Abstract.php b/app/code/core/Mage/Install/Model/Installer/Abstract.php index 9026675b2..6b6ecbb9c 100644 --- a/app/code/core/Mage/Install/Model/Installer/Abstract.php +++ b/app/code/core/Mage/Install/Model/Installer/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Config.php b/app/code/core/Mage/Install/Model/Installer/Config.php index 071f9b4ba..6081f8686 100644 --- a/app/code/core/Mage/Install/Model/Installer/Config.php +++ b/app/code/core/Mage/Install/Model/Installer/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Console.php b/app/code/core/Mage/Install/Model/Installer/Console.php index ad2a6a329..786b8979c 100644 --- a/app/code/core/Mage/Install/Model/Installer/Console.php +++ b/app/code/core/Mage/Install/Model/Installer/Console.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Data.php b/app/code/core/Mage/Install/Model/Installer/Data.php index c34341c66..1bf1f5660 100644 --- a/app/code/core/Mage/Install/Model/Installer/Data.php +++ b/app/code/core/Mage/Install/Model/Installer/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Db.php b/app/code/core/Mage/Install/Model/Installer/Db.php index bde3de3d3..03f686d0b 100644 --- a/app/code/core/Mage/Install/Model/Installer/Db.php +++ b/app/code/core/Mage/Install/Model/Installer/Db.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php b/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php index 8d19dbd5d..7ed751a76 100644 --- a/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php +++ b/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php b/app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php index fb8058dd3..fc90abbfe 100644 --- a/app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php +++ b/app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Env.php b/app/code/core/Mage/Install/Model/Installer/Env.php index b05ac0d81..e0ce4ae61 100644 --- a/app/code/core/Mage/Install/Model/Installer/Env.php +++ b/app/code/core/Mage/Install/Model/Installer/Env.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Filesystem.php b/app/code/core/Mage/Install/Model/Installer/Filesystem.php index 3fabf6e06..431dfadf2 100644 --- a/app/code/core/Mage/Install/Model/Installer/Filesystem.php +++ b/app/code/core/Mage/Install/Model/Installer/Filesystem.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Pear.php b/app/code/core/Mage/Install/Model/Installer/Pear.php index a441833a5..07dc04746 100644 --- a/app/code/core/Mage/Install/Model/Installer/Pear.php +++ b/app/code/core/Mage/Install/Model/Installer/Pear.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Observer.php b/app/code/core/Mage/Install/Model/Observer.php index 357b858bb..9b3646e8a 100644 --- a/app/code/core/Mage/Install/Model/Observer.php +++ b/app/code/core/Mage/Install/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Session.php b/app/code/core/Mage/Install/Model/Session.php index a321d1dcc..2713b7ff4 100644 --- a/app/code/core/Mage/Install/Model/Session.php +++ b/app/code/core/Mage/Install/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Wizard.php b/app/code/core/Mage/Install/Model/Wizard.php index e412f662f..2ebe8e98d 100644 --- a/app/code/core/Mage/Install/Model/Wizard.php +++ b/app/code/core/Mage/Install/Model/Wizard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/controllers/IndexController.php b/app/code/core/Mage/Install/controllers/IndexController.php index 93cafeffa..4fa96f867 100644 --- a/app/code/core/Mage/Install/controllers/IndexController.php +++ b/app/code/core/Mage/Install/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/controllers/WizardController.php b/app/code/core/Mage/Install/controllers/WizardController.php index 6214bd829..4769814f5 100644 --- a/app/code/core/Mage/Install/controllers/WizardController.php +++ b/app/code/core/Mage/Install/controllers/WizardController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/etc/config.xml b/app/code/core/Mage/Install/etc/config.xml index 2c7772dfa..92f31b439 100644 --- a/app/code/core/Mage/Install/etc/config.xml +++ b/app/code/core/Mage/Install/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Install/etc/install.xml b/app/code/core/Mage/Install/etc/install.xml index 2d36c3826..0a71ae861 100644 --- a/app/code/core/Mage/Install/etc/install.xml +++ b/app/code/core/Mage/Install/etc/install.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Install - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Log/Helper/Data.php b/app/code/core/Mage/Log/Helper/Data.php index 753bd0e4f..7176c8bfc 100644 --- a/app/code/core/Mage/Log/Helper/Data.php +++ b/app/code/core/Mage/Log/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Aggregation.php b/app/code/core/Mage/Log/Model/Aggregation.php index ac68c870e..13fd92c35 100644 --- a/app/code/core/Mage/Log/Model/Aggregation.php +++ b/app/code/core/Mage/Log/Model/Aggregation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Cron.php b/app/code/core/Mage/Log/Model/Cron.php index 0de6f311c..b54fecd7c 100644 --- a/app/code/core/Mage/Log/Model/Cron.php +++ b/app/code/core/Mage/Log/Model/Cron.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Customer.php b/app/code/core/Mage/Log/Model/Customer.php index 2ebace3a6..bf47c6f77 100644 --- a/app/code/core/Mage/Log/Model/Customer.php +++ b/app/code/core/Mage/Log/Model/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Log.php b/app/code/core/Mage/Log/Model/Log.php index 067e16869..7d344d0b7 100644 --- a/app/code/core/Mage/Log/Model/Log.php +++ b/app/code/core/Mage/Log/Model/Log.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php b/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php index 7d5c76523..6931e410d 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Mysql4/Customer.php b/app/code/core/Mage/Log/Model/Mysql4/Customer.php index 53642ea02..bc6d344ef 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Customer.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Mysql4/Log.php b/app/code/core/Mage/Log/Model/Mysql4/Log.php index dd683a5ed..13e90365c 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Log.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Log.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor.php index 2fe852181..e4caf706b 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php index abd0fbe4b..885db2d95 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php index dc0a83b26..58ac7d572 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php index 1d532d061..02da36bbf 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Resource/Aggregation.php b/app/code/core/Mage/Log/Model/Resource/Aggregation.php index 0d8fdb25c..a1df22d3f 100644 --- a/app/code/core/Mage/Log/Model/Resource/Aggregation.php +++ b/app/code/core/Mage/Log/Model/Resource/Aggregation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Resource/Customer.php b/app/code/core/Mage/Log/Model/Resource/Customer.php index a866be985..4716ca333 100644 --- a/app/code/core/Mage/Log/Model/Resource/Customer.php +++ b/app/code/core/Mage/Log/Model/Resource/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Resource/Log.php b/app/code/core/Mage/Log/Model/Resource/Log.php index 6f5d6eca7..0c60412ac 100644 --- a/app/code/core/Mage/Log/Model/Resource/Log.php +++ b/app/code/core/Mage/Log/Model/Resource/Log.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor.php b/app/code/core/Mage/Log/Model/Resource/Visitor.php index 5fdcb735c..753318455 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -131,7 +131,7 @@ protected function _afterLoad(Mage_Core_Model_Abstract $object) // Add information about quote to visitor $adapter = $this->_getReadAdapter(); $select = $adapter->select()->from($this->getTable('log/quote_table'), 'quote_id') - ->where('visitor_id = ?', $object->getId())->order('quote_id DESC')->limit(1); + ->where('visitor_id = ?', $object->getId())->limit(1); $result = $adapter->query($select)->fetch(); if (isset($result['quote_id'])) { $object->setQuoteId((int) $result['quote_id']); diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor/Collection.php b/app/code/core/Mage/Log/Model/Resource/Visitor/Collection.php index 673f38565..87d7d05a9 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor/Collection.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php b/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php index 03e7a838a..0ec55f16a 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor/Online/Collection.php b/app/code/core/Mage/Log/Model/Resource/Visitor/Online/Collection.php index 2d62de4c2..3ab61aa33 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor/Online/Collection.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor/Online/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Visitor.php b/app/code/core/Mage/Log/Model/Visitor.php index 893adbe40..93ce75c25 100644 --- a/app/code/core/Mage/Log/Model/Visitor.php +++ b/app/code/core/Mage/Log/Model/Visitor.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -161,33 +161,15 @@ public function initByRequest($observer) $this->setData($this->_getSession()->getVisitorData()); $this->initServerData(); - $visitorId = $this->getId(); - if (!$visitorId) { + if (!$this->getId()) { $this->setFirstVisitAt(now()); $this->setIsNewVisitor(true); $this->save(); - } - if (!$visitorId || $this->_isVisitorSessionNew()) { Mage::dispatchEvent('visitor_init', array('visitor' => $this)); } return $this; } - /** - * Check is session new - * - * @return bool - */ - protected function _isVisitorSessionNew() - { - $visitorData = $this->_getSession()->getVisitorData(); - $visitorSessionId = null; - if (is_array($visitorData) && isset($visitorData['session_id'])) { - $visitorSessionId = $visitorData['session_id']; - } - return $this->_getSession()->getSessionId() != $visitorSessionId; - } - /** * Saving visitor information by request * diff --git a/app/code/core/Mage/Log/Model/Visitor/Online.php b/app/code/core/Mage/Log/Model/Visitor/Online.php index 27c216771..798dcee2c 100644 --- a/app/code/core/Mage/Log/Model/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Visitor/Online.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/data/log_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Log/data/log_setup/data-install-1.6.0.0.php index 540b3d71a..24b27e055 100644 --- a/app/code/core/Mage/Log/data/log_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Log/data/log_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/etc/config.xml b/app/code/core/Mage/Log/etc/config.xml index 7ce9ab935..8d3c33862 100644 --- a/app/code/core/Mage/Log/etc/config.xml +++ b/app/code/core/Mage/Log/etc/config.xml @@ -21,14 +21,14 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - 1.6.1.0 + 1.6.0.0 diff --git a/app/code/core/Mage/Log/etc/system.xml b/app/code/core/Mage/Log/etc/system.xml index e6b093c83..ff05475fc 100644 --- a/app/code/core/Mage/Log/etc/system.xml +++ b/app/code/core/Mage/Log/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Log/sql/log_setup/install-1.6.0.0.php b/app/code/core/Mage/Log/sql/log_setup/install-1.6.0.0.php index 0dc96176c..2c4e869b8 100644 --- a/app/code/core/Mage/Log/sql/log_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Log/sql/log_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php index 0cf44fa2e..01edb06e5 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php index f1b984acd..5982ae9fa 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php index cc9104ef4..d341fd802 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.3-0.7.4.php index 2a2ff4fd4..1e9612a19 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.4-0.7.5.php index b6be55223..e48199b03 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.5-0.7.6.php index fc87bc848..c1c67b645 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.6-0.7.7.php index c7ee79da9..49d10a708 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index ed56a9876..07569c08d 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Log - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php deleted file mode 100644 index 4d70ad76e..000000000 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php +++ /dev/null @@ -1,35 +0,0 @@ -startSetup(); - -$installer->getConnection()->dropIndex($installer->getTable('log/url_table'), 'PRIMARY'); -$installer->getConnection()->addIndex($installer->getTable('log/url_table'), 'url_id', array('url_id')); - -$installer->endSetup(); - diff --git a/app/code/core/Mage/Media/Helper/Data.php b/app/code/core/Mage/Media/Helper/Data.php index a939f93e3..d1bde4cbe 100644 --- a/app/code/core/Mage/Media/Helper/Data.php +++ b/app/code/core/Mage/Media/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Media - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Media/Model/File/Image.php b/app/code/core/Mage/Media/Model/File/Image.php index 306a2526e..0db61cae2 100644 --- a/app/code/core/Mage/Media/Model/File/Image.php +++ b/app/code/core/Mage/Media/Model/File/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Media - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Media/Model/Image.php b/app/code/core/Mage/Media/Model/Image.php index 51557d314..fded7a652 100644 --- a/app/code/core/Mage/Media/Model/Image.php +++ b/app/code/core/Mage/Media/Model/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Media - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Media/Model/Image/Config/Interface.php b/app/code/core/Mage/Media/Model/Image/Config/Interface.php index 8618ed417..f5df436d5 100644 --- a/app/code/core/Mage/Media/Model/Image/Config/Interface.php +++ b/app/code/core/Mage/Media/Model/Image/Config/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Media - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Media/etc/config.xml b/app/code/core/Mage/Media/etc/config.xml index 10a1cb115..a671f1188 100644 --- a/app/code/core/Mage/Media/etc/config.xml +++ b/app/code/core/Mage/Media/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Media - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Newsletter/Block/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Subscribe.php index 77b743101..0709a1e09 100644 --- a/app/code/core/Mage/Newsletter/Block/Subscribe.php +++ b/app/code/core/Mage/Newsletter/Block/Subscribe.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Helper/Data.php b/app/code/core/Mage/Newsletter/Helper/Data.php index 776164020..2249406b9 100644 --- a/app/code/core/Mage/Newsletter/Helper/Data.php +++ b/app/code/core/Mage/Newsletter/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Message.php b/app/code/core/Mage/Newsletter/Model/Message.php index 7246f4f81..f62d5e4f2 100644 --- a/app/code/core/Mage/Newsletter/Model/Message.php +++ b/app/code/core/Mage/Newsletter/Model/Message.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php index 55a0e9db6..8efc3b3bb 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php index 2bc8e12af..97245ad5c 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php index f6b97e9ac..34ceff500 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php index c2f4452eb..9802b6633 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php index aa4b44919..6ab3381d8 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php index 0b8e25a58..a2754a660 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php index 1fece8249..430543f91 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php index aa00a6774..0c4e2aa88 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Observer.php b/app/code/core/Mage/Newsletter/Model/Observer.php index d9101ef4a..afe45952a 100644 --- a/app/code/core/Mage/Newsletter/Model/Observer.php +++ b/app/code/core/Mage/Newsletter/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Problem.php b/app/code/core/Mage/Newsletter/Model/Problem.php index bca253733..5366d38d3 100644 --- a/app/code/core/Mage/Newsletter/Model/Problem.php +++ b/app/code/core/Mage/Newsletter/Model/Problem.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Queue.php b/app/code/core/Mage/Newsletter/Model/Queue.php index 5e6e24f27..4aeea21c0 100644 --- a/app/code/core/Mage/Newsletter/Model/Queue.php +++ b/app/code/core/Mage/Newsletter/Model/Queue.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Problem.php b/app/code/core/Mage/Newsletter/Model/Resource/Problem.php index a6eeb8936..955004d1e 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Problem.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Problem.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Problem/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Problem/Collection.php index 288280f6c..f207c8e6a 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Problem/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Problem/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Queue.php b/app/code/core/Mage/Newsletter/Model/Resource/Queue.php index 2f95294c9..8b56f95d6 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Queue.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Queue.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php index bb0fda37e..d28876fa0 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php index 3cb96c5be..3ba6c2d36 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php index 50c526abd..f47d2574a 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Template.php b/app/code/core/Mage/Newsletter/Model/Resource/Template.php index 95ada6056..4d5637c80 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Template/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Template/Collection.php index 5c49a498b..3f100323c 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Template/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Template/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Session.php b/app/code/core/Mage/Newsletter/Model/Session.php index 00297b5c2..dd5d60ca7 100644 --- a/app/code/core/Mage/Newsletter/Model/Session.php +++ b/app/code/core/Mage/Newsletter/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Subscriber.php index 88229afd3..49462c672 100644 --- a/app/code/core/Mage/Newsletter/Model/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Subscriber.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Template.php b/app/code/core/Mage/Newsletter/Model/Template.php index 1c946cccd..8b6ee315d 100644 --- a/app/code/core/Mage/Newsletter/Model/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Template/Filter.php b/app/code/core/Mage/Newsletter/Model/Template/Filter.php index eaee857c4..fa0660eea 100644 --- a/app/code/core/Mage/Newsletter/Model/Template/Filter.php +++ b/app/code/core/Mage/Newsletter/Model/Template/Filter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/controllers/ManageController.php b/app/code/core/Mage/Newsletter/controllers/ManageController.php index 2cc347064..177d17d0d 100644 --- a/app/code/core/Mage/Newsletter/controllers/ManageController.php +++ b/app/code/core/Mage/Newsletter/controllers/ManageController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/controllers/SubscriberController.php b/app/code/core/Mage/Newsletter/controllers/SubscriberController.php index b8a4f7535..4fba17c7c 100644 --- a/app/code/core/Mage/Newsletter/controllers/SubscriberController.php +++ b/app/code/core/Mage/Newsletter/controllers/SubscriberController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.0-1.6.0.1.php index de4ff5bbd..c5c05153f 100644 --- a/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.0-1.6.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/etc/adminhtml.xml b/app/code/core/Mage/Newsletter/etc/adminhtml.xml index 6e4464fed..c643e90ec 100644 --- a/app/code/core/Mage/Newsletter/etc/adminhtml.xml +++ b/app/code/core/Mage/Newsletter/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Newsletter/etc/config.xml b/app/code/core/Mage/Newsletter/etc/config.xml index 1081076b1..f999268f8 100644 --- a/app/code/core/Mage/Newsletter/etc/config.xml +++ b/app/code/core/Mage/Newsletter/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Newsletter/etc/system.xml b/app/code/core/Mage/Newsletter/etc/system.xml index dd7d85e29..6481cfbfc 100644 --- a/app/code/core/Mage/Newsletter/etc/system.xml +++ b/app/code/core/Mage/Newsletter/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/install-1.6.0.0.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/install-1.6.0.0.php index 5e0665234..5ac3c9388 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php index c4b13e0ed..758a4ea4b 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php index 2bcc96941..43441e193 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php index 7a38d35ba..ff13b9df1 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.0-0.8.1.php index 91adc13b4..db210dd09 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.1-0.8.2.php index e889bfa89..c11bf6366 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.1-0.8.2.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.1-0.8.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.2-0.8.3.php index f2edf4214..f9e69a6f8 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index a53ad20fd..2487c7fff 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Newsletter - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.php index d631a4b4a..f19feaf7f 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token/Grid.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token/Grid.php index e29f6b96b..f133f568c 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token/Grid.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize.php index a60710967..eb1470898 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize/Button.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize/Button.php index 4ac385fbd..8186fd8af 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize/Button.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize/Button.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens.php index dddb19b06..233e59a96 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens/Grid.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens/Grid.php index 95794ca23..751ca3b35 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens/Grid.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer.php index ba8fe69ac..9ecbbe10e 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php index d67d746be..ec2bcead3 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php index 58ff1d344..501cb3473 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php index 08dd86933..ff9a099d1 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Authorize.php b/app/code/core/Mage/Oauth/Block/Authorize.php index 671ebe465..58f932b29 100644 --- a/app/code/core/Mage/Oauth/Block/Authorize.php +++ b/app/code/core/Mage/Oauth/Block/Authorize.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php b/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php index ee370b25f..3e45601c8 100644 --- a/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php +++ b/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Authorize/Button.php b/app/code/core/Mage/Oauth/Block/Authorize/Button.php index 11232fa28..dccbdd542 100644 --- a/app/code/core/Mage/Oauth/Block/Authorize/Button.php +++ b/app/code/core/Mage/Oauth/Block/Authorize/Button.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Authorize/ButtonBaseAbstract.php b/app/code/core/Mage/Oauth/Block/Authorize/ButtonBaseAbstract.php index cb8738581..71af34d1a 100644 --- a/app/code/core/Mage/Oauth/Block/Authorize/ButtonBaseAbstract.php +++ b/app/code/core/Mage/Oauth/Block/Authorize/ButtonBaseAbstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/AuthorizeBaseAbstract.php b/app/code/core/Mage/Oauth/Block/AuthorizeBaseAbstract.php index 1fe8f6255..0da54a3eb 100644 --- a/app/code/core/Mage/Oauth/Block/AuthorizeBaseAbstract.php +++ b/app/code/core/Mage/Oauth/Block/AuthorizeBaseAbstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Customer/Token/List.php b/app/code/core/Mage/Oauth/Block/Customer/Token/List.php index be4fc8023..dc695a9e0 100644 --- a/app/code/core/Mage/Oauth/Block/Customer/Token/List.php +++ b/app/code/core/Mage/Oauth/Block/Customer/Token/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Exception.php b/app/code/core/Mage/Oauth/Exception.php index c0bd69399..903114ec4 100644 --- a/app/code/core/Mage/Oauth/Exception.php +++ b/app/code/core/Mage/Oauth/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Helper/Data.php b/app/code/core/Mage/Oauth/Helper/Data.php index 1d1798502..ed4a2f236 100644 --- a/app/code/core/Mage/Oauth/Helper/Data.php +++ b/app/code/core/Mage/Oauth/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Consumer.php b/app/code/core/Mage/Oauth/Model/Consumer.php index 795d0b311..e690de713 100644 --- a/app/code/core/Mage/Oauth/Model/Consumer.php +++ b/app/code/core/Mage/Oauth/Model/Consumer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Consumer/Validator/KeyLength.php b/app/code/core/Mage/Oauth/Model/Consumer/Validator/KeyLength.php index 537fbc8d0..8b9bfe168 100644 --- a/app/code/core/Mage/Oauth/Model/Consumer/Validator/KeyLength.php +++ b/app/code/core/Mage/Oauth/Model/Consumer/Validator/KeyLength.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Nonce.php b/app/code/core/Mage/Oauth/Model/Nonce.php index 6b7e24e94..7b854b5e4 100644 --- a/app/code/core/Mage/Oauth/Model/Nonce.php +++ b/app/code/core/Mage/Oauth/Model/Nonce.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Observer.php b/app/code/core/Mage/Oauth/Model/Observer.php index 1166e65a2..88d9ab53a 100644 --- a/app/code/core/Mage/Oauth/Model/Observer.php +++ b/app/code/core/Mage/Oauth/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Resource/Consumer.php b/app/code/core/Mage/Oauth/Model/Resource/Consumer.php index 6f6753252..708dfbe8f 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Consumer.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Consumer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Resource/Consumer/Collection.php b/app/code/core/Mage/Oauth/Model/Resource/Consumer/Collection.php index 1fa37925d..e867835f4 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Consumer/Collection.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Consumer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Resource/Nonce.php b/app/code/core/Mage/Oauth/Model/Resource/Nonce.php index a68a5eceb..66915fd72 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Nonce.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Nonce.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Resource/Nonce/Collection.php b/app/code/core/Mage/Oauth/Model/Resource/Nonce/Collection.php index 7eeb90990..90c551259 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Nonce/Collection.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Nonce/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Resource/Setup.php b/app/code/core/Mage/Oauth/Model/Resource/Setup.php index 506c03586..918b22100 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Setup.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Resource/Token.php b/app/code/core/Mage/Oauth/Model/Resource/Token.php index 2e4b10af0..8d8d875f4 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Token.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Token.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Resource/Token/Collection.php b/app/code/core/Mage/Oauth/Model/Resource/Token/Collection.php index 83eaf5753..9f7f144a2 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Token/Collection.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Token/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Server.php b/app/code/core/Mage/Oauth/Model/Server.php index 8f8fb45bc..7fd9349b0 100644 --- a/app/code/core/Mage/Oauth/Model/Server.php +++ b/app/code/core/Mage/Oauth/Model/Server.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Token.php b/app/code/core/Mage/Oauth/Model/Token.php index 282aeaece..630a3c6ab 100644 --- a/app/code/core/Mage/Oauth/Model/Token.php +++ b/app/code/core/Mage/Oauth/Model/Token.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php index 312e529d3..e3da2aac7 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizeController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizeController.php index 8d2cfb0fb..9b79db4ff 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizeController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizeController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php index 0e4125ce4..ff4f7cb97 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php index dfdf2fad2..85a7e9e04 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/AuthorizeController.php b/app/code/core/Mage/Oauth/controllers/AuthorizeController.php index 7f80e3c22..cee7f0a9e 100644 --- a/app/code/core/Mage/Oauth/controllers/AuthorizeController.php +++ b/app/code/core/Mage/Oauth/controllers/AuthorizeController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php b/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php index 4453e721e..82ae49e2e 100644 --- a/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/InitiateController.php b/app/code/core/Mage/Oauth/controllers/InitiateController.php index fd94dd96f..8b1528da1 100644 --- a/app/code/core/Mage/Oauth/controllers/InitiateController.php +++ b/app/code/core/Mage/Oauth/controllers/InitiateController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/TokenController.php b/app/code/core/Mage/Oauth/controllers/TokenController.php index 7faaa72b5..fc4e1cb1a 100644 --- a/app/code/core/Mage/Oauth/controllers/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/TokenController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/etc/adminhtml.xml b/app/code/core/Mage/Oauth/etc/adminhtml.xml index 8374002ec..0a8b8e424 100644 --- a/app/code/core/Mage/Oauth/etc/adminhtml.xml +++ b/app/code/core/Mage/Oauth/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Oauth/etc/config.xml b/app/code/core/Mage/Oauth/etc/config.xml index 024519b4f..076c57c82 100644 --- a/app/code/core/Mage/Oauth/etc/config.xml +++ b/app/code/core/Mage/Oauth/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Oauth/etc/system.xml b/app/code/core/Mage/Oauth/etc/system.xml index e56633ece..b6ccb1df1 100644 --- a/app/code/core/Mage/Oauth/etc/system.xml +++ b/app/code/core/Mage/Oauth/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Oauth/sql/oauth_setup/install-1.0.0.0.php b/app/code/core/Mage/Oauth/sql/oauth_setup/install-1.0.0.0.php index 3ee189347..0b3210825 100644 --- a/app/code/core/Mage/Oauth/sql/oauth_setup/install-1.0.0.0.php +++ b/app/code/core/Mage/Oauth/sql/oauth_setup/install-1.0.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Page/Block/Html.php b/app/code/core/Mage/Page/Block/Html.php index 330a53ab9..710d90074 100644 --- a/app/code/core/Mage/Page/Block/Html.php +++ b/app/code/core/Mage/Page/Block/Html.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php b/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php index 456ab0b4d..e6568e8da 100644 --- a/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php +++ b/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Html/CookieNotice.php b/app/code/core/Mage/Page/Block/Html/CookieNotice.php index 4e7edcc19..220c08c4b 100644 --- a/app/code/core/Mage/Page/Block/Html/CookieNotice.php +++ b/app/code/core/Mage/Page/Block/Html/CookieNotice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Html/Footer.php b/app/code/core/Mage/Page/Block/Html/Footer.php index cb3cee775..dcbda204a 100644 --- a/app/code/core/Mage/Page/Block/Html/Footer.php +++ b/app/code/core/Mage/Page/Block/Html/Footer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Html/Head.php b/app/code/core/Mage/Page/Block/Html/Head.php index f1e9cf1c6..76cf03da1 100644 --- a/app/code/core/Mage/Page/Block/Html/Head.php +++ b/app/code/core/Mage/Page/Block/Html/Head.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,7 +41,6 @@ class Mage_Page_Block_Html_Head extends Mage_Core_Block_Template protected function _construct() { $this->setTemplate('page/html/head.phtml'); - $this->setData('is_enterprise', Mage::getEdition() == Mage::EDITION_ENTERPRISE); } /** @@ -192,16 +191,11 @@ public function getCssJsHtml() continue; } if (!empty($if)) { - // open !IE conditional using raw value - if (strpos($if, ">") !== false) { - $html .= $if . "\n"; - } else { - $html .= '") !== false) { - $html .= '' . "\n"; - } else { - $html .= '' . "\n"; - } + $html .= ''."\n"; } } return $html; @@ -244,8 +233,7 @@ public function getCssJsHtml() * @param callback $mergeCallback * @return string */ - protected function &_prepareStaticAndSkinElements($format, array $staticItems, array $skinItems, - $mergeCallback = null) + protected function &_prepareStaticAndSkinElements($format, array $staticItems, array $skinItems, $mergeCallback = null) { $designPackage = Mage::getDesign(); $baseJsUrl = Mage::getBaseUrl('js'); diff --git a/app/code/core/Mage/Page/Block/Html/Header.php b/app/code/core/Mage/Page/Block/Html/Header.php index fca7a5529..17763d62d 100644 --- a/app/code/core/Mage/Page/Block/Html/Header.php +++ b/app/code/core/Mage/Page/Block/Html/Header.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -63,14 +63,6 @@ public function getLogoSrc() return $this->getSkinUrl($this->_data['logo_src']); } - public function getLogoSrcSmall() - { - if (empty($this->_data['logo_src_small'])) { - $this->_data['logo_src_small'] = Mage::getStoreConfig('design/header/logo_src_small'); - } - return $this->getSkinUrl($this->_data['logo_src_small']); - } - public function getLogoAlt() { if (empty($this->_data['logo_alt'])) { diff --git a/app/code/core/Mage/Page/Block/Html/Notices.php b/app/code/core/Mage/Page/Block/Html/Notices.php index d18d73547..156c8c71d 100644 --- a/app/code/core/Mage/Page/Block/Html/Notices.php +++ b/app/code/core/Mage/Page/Block/Html/Notices.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Html/Pager.php b/app/code/core/Mage/Page/Block/Html/Pager.php index 12553acf7..82473695b 100644 --- a/app/code/core/Mage/Page/Block/Html/Pager.php +++ b/app/code/core/Mage/Page/Block/Html/Pager.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Html/Toplinks.php b/app/code/core/Mage/Page/Block/Html/Toplinks.php index 5f37671ca..5e372e3d7 100644 --- a/app/code/core/Mage/Page/Block/Html/Toplinks.php +++ b/app/code/core/Mage/Page/Block/Html/Toplinks.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Html/Topmenu.php b/app/code/core/Mage/Page/Block/Html/Topmenu.php index a285f01f5..2c77d677e 100644 --- a/app/code/core/Mage/Page/Block/Html/Topmenu.php +++ b/app/code/core/Mage/Page/Block/Html/Topmenu.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -76,12 +76,7 @@ public function getHtml($outermostClass = '', $childrenWrapClass = '') $this->_menu->setOutermostClass($outermostClass); $this->_menu->setChildrenWrapClass($childrenWrapClass); - if ($renderer = $this->getChild('catalog.topnav.renderer')) { - $renderer->setMenuTree($this->_menu)->setChildrenWrapClass($childrenWrapClass); - $html = $renderer->toHtml(); - } else { - $html = $this->_getHtml($this->_menu, $childrenWrapClass); - } + $html = $this->_getHtml($this->_menu, $childrenWrapClass); Mage::dispatchEvent('page_block_html_topmenu_gethtml_after', array( 'menu' => $this->_menu, @@ -97,7 +92,6 @@ public function getHtml($outermostClass = '', $childrenWrapClass = '') * @param Varien_Data_Tree_Node $menuTree * @param string $childrenWrapClass * @return string - * @deprecated since 1.8.2.0 use child block catalog.topnav.renderer instead */ protected function _getHtml(Varien_Data_Tree_Node $menuTree, $childrenWrapClass) { diff --git a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php deleted file mode 100644 index eb6b002cc..000000000 --- a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php +++ /dev/null @@ -1,92 +0,0 @@ - - */ -class Mage_Page_Block_Html_Topmenu_Renderer extends Mage_Page_Block_Html_Topmenu -{ - protected $_templateFile; - - /** - * Renders block html - * @return string - * @throws Exception - */ - protected function _toHtml() - { - $this->_addCacheTags(); - $menuTree = $this->getMenuTree(); - $childrenWrapClass = $this->getChildrenWrapClass(); - if (!$this->getTemplate() || is_null($menuTree) || is_null($childrenWrapClass)) { - throw new Exception("Top-menu renderer isn't fully configured."); - } - - $includeFilePath = realpath(Mage::getBaseDir('design') . DS . $this->getTemplateFile()); - if (strpos($includeFilePath, realpath(Mage::getBaseDir('design'))) === 0 || $this->_getAllowSymlinks()) { - $this->_templateFile = $includeFilePath; - } else { - throw new Exception('Not valid template file:' . $this->_templateFile); - } - return $this->render($menuTree, $childrenWrapClass); - } - - /** - * Add cache tags - * - * @return void - */ - protected function _addCacheTags() - { - $parentBlock = $this->getParentBlock(); - if ($parentBlock) { - $this->addCacheTag($parentBlock->getCacheTags()); - } - } - - /** - * Fetches template. If template has return statement, than its value is used and direct output otherwise. - * @param Varien_Data_Tree_Node $menuTree - * @param $childrenWrapClass - * @return string - */ - public function render(Varien_Data_Tree_Node $menuTree, $childrenWrapClass) - { - ob_start(); - $html = include $this->_templateFile; - $directOutput = ob_get_clean(); - - if (is_string($html)) { - return $html; - } else { - return $directOutput; - } - } -} diff --git a/app/code/core/Mage/Page/Block/Html/Welcome.php b/app/code/core/Mage/Page/Block/Html/Welcome.php index 4bda18ea3..d98084a05 100644 --- a/app/code/core/Mage/Page/Block/Html/Welcome.php +++ b/app/code/core/Mage/Page/Block/Html/Welcome.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Html/Wrapper.php b/app/code/core/Mage/Page/Block/Html/Wrapper.php index e982f7f42..b317de916 100644 --- a/app/code/core/Mage/Page/Block/Html/Wrapper.php +++ b/app/code/core/Mage/Page/Block/Html/Wrapper.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Js/Cookie.php b/app/code/core/Mage/Page/Block/Js/Cookie.php index c9240e854..e059a5316 100644 --- a/app/code/core/Mage/Page/Block/Js/Cookie.php +++ b/app/code/core/Mage/Page/Block/Js/Cookie.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Js/Translate.php b/app/code/core/Mage/Page/Block/Js/Translate.php index 6885479b0..83601df12 100644 --- a/app/code/core/Mage/Page/Block/Js/Translate.php +++ b/app/code/core/Mage/Page/Block/Js/Translate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Redirect.php b/app/code/core/Mage/Page/Block/Redirect.php index 0f39fec80..aa30d4b2a 100644 --- a/app/code/core/Mage/Page/Block/Redirect.php +++ b/app/code/core/Mage/Page/Block/Redirect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Switch.php b/app/code/core/Mage/Page/Block/Switch.php index f1744603e..b43dcd53d 100644 --- a/app/code/core/Mage/Page/Block/Switch.php +++ b/app/code/core/Mage/Page/Block/Switch.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Template/Container.php b/app/code/core/Mage/Page/Block/Template/Container.php index 4aa6d7cf4..7d1f720c2 100644 --- a/app/code/core/Mage/Page/Block/Template/Container.php +++ b/app/code/core/Mage/Page/Block/Template/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Template/Links.php b/app/code/core/Mage/Page/Block/Template/Links.php index 288365d33..2f606eb3c 100644 --- a/app/code/core/Mage/Page/Block/Template/Links.php +++ b/app/code/core/Mage/Page/Block/Template/Links.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Template/Links/Block.php b/app/code/core/Mage/Page/Block/Template/Links/Block.php index 7a7eecfda..ee77fa3fc 100644 --- a/app/code/core/Mage/Page/Block/Template/Links/Block.php +++ b/app/code/core/Mage/Page/Block/Template/Links/Block.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Helper/Data.php b/app/code/core/Mage/Page/Helper/Data.php index 0ad897cd9..b580f1bf9 100644 --- a/app/code/core/Mage/Page/Helper/Data.php +++ b/app/code/core/Mage/Page/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Helper/Html.php b/app/code/core/Mage/Page/Helper/Html.php index 5538fc9a3..f1757ee42 100644 --- a/app/code/core/Mage/Page/Helper/Html.php +++ b/app/code/core/Mage/Page/Helper/Html.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Helper/Layout.php b/app/code/core/Mage/Page/Helper/Layout.php index 48f675eeb..05711ff61 100644 --- a/app/code/core/Mage/Page/Helper/Layout.php +++ b/app/code/core/Mage/Page/Helper/Layout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Model/Config.php b/app/code/core/Mage/Page/Model/Config.php index 369dc65be..63936ce0c 100644 --- a/app/code/core/Mage/Page/Model/Config.php +++ b/app/code/core/Mage/Page/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Model/Source/Layout.php b/app/code/core/Mage/Page/Model/Source/Layout.php index 6d96280ef..291dcc02e 100644 --- a/app/code/core/Mage/Page/Model/Source/Layout.php +++ b/app/code/core/Mage/Page/Model/Source/Layout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/etc/config.xml b/app/code/core/Mage/Page/etc/config.xml index 0cb85e0a3..e14e52285 100644 --- a/app/code/core/Mage/Page/etc/config.xml +++ b/app/code/core/Mage/Page/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -126,11 +126,10 @@

images/logo.gif Magento Commerce - images/logo.gif Default welcome msg!
- &copy; 2014 Magento Demo Store. All Rights Reserved. + &copy; 2013 Magento Demo Store. All Rights Reserved.
diff --git a/app/code/core/Mage/Page/etc/system.xml b/app/code/core/Mage/Page/etc/system.xml index 3593bc276..e5430baa7 100644 --- a/app/code/core/Mage/Page/etc/system.xml +++ b/app/code/core/Mage/Page/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -159,14 +159,6 @@ 1 1 - - - text - 25 - 1 - 1 - 1 - text diff --git a/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php b/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php index 49bb0aaa6..68282630f 100644 --- a/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php +++ b/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PageCache - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PageCache/Helper/Data.php b/app/code/core/Mage/PageCache/Helper/Data.php index 0183c21c7..1ae9315d1 100644 --- a/app/code/core/Mage/PageCache/Helper/Data.php +++ b/app/code/core/Mage/PageCache/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PageCache - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PageCache/Model/Control/Interface.php b/app/code/core/Mage/PageCache/Model/Control/Interface.php index 93f9921cb..6d26934e6 100644 --- a/app/code/core/Mage/PageCache/Model/Control/Interface.php +++ b/app/code/core/Mage/PageCache/Model/Control/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PageCache - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PageCache/Model/Control/Zend.php b/app/code/core/Mage/PageCache/Model/Control/Zend.php index 8532911bc..20d675cc0 100644 --- a/app/code/core/Mage/PageCache/Model/Control/Zend.php +++ b/app/code/core/Mage/PageCache/Model/Control/Zend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PageCache - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PageCache/Model/Observer.php b/app/code/core/Mage/PageCache/Model/Observer.php index ee8082785..78274a995 100644 --- a/app/code/core/Mage/PageCache/Model/Observer.php +++ b/app/code/core/Mage/PageCache/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PageCache - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PageCache/Model/System/Config/Source/Controls.php b/app/code/core/Mage/PageCache/Model/System/Config/Source/Controls.php index 46f0cbc3b..5a5a855a6 100644 --- a/app/code/core/Mage/PageCache/Model/System/Config/Source/Controls.php +++ b/app/code/core/Mage/PageCache/Model/System/Config/Source/Controls.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PageCache - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php b/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php index bd0dc3b80..7b6fa58aa 100644 --- a/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php +++ b/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PageCache - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PageCache/etc/adminhtml.xml b/app/code/core/Mage/PageCache/etc/adminhtml.xml index fe3539b23..e420c3f24 100644 --- a/app/code/core/Mage/PageCache/etc/adminhtml.xml +++ b/app/code/core/Mage/PageCache/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_PageCache - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/PageCache/etc/config.xml b/app/code/core/Mage/PageCache/etc/config.xml index 5db33c076..a153a7dce 100644 --- a/app/code/core/Mage/PageCache/etc/config.xml +++ b/app/code/core/Mage/PageCache/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_PageCache - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/PageCache/etc/system.xml b/app/code/core/Mage/PageCache/etc/system.xml index 21763b1fd..c84f230a5 100644 --- a/app/code/core/Mage/PageCache/etc/system.xml +++ b/app/code/core/Mage/PageCache/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_PageCache - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php b/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php index b7b2039a7..0119621f5 100644 --- a/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php +++ b/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php b/app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php index 8f7b1dfed..8bbe01658 100644 --- a/app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php +++ b/app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Helper/Data.php b/app/code/core/Mage/Paygate/Helper/Data.php index 1f923f7ae..ce82b5f86 100644 --- a/app/code/core/Mage/Paygate/Helper/Data.php +++ b/app/code/core/Mage/Paygate/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet.php b/app/code/core/Mage/Paygate/Model/Authorizenet.php index 3887460b8..4c72d8544 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php index 445a5a390..9d6cf0fc2 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php index 1dcb56919..c1dd483d5 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Request.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Request.php index 398f2a6a6..19024cf89 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Request.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Request.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Result.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Result.php index 04faf4ccb..1e159ee3d 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Result.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Result.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Source/Cctype.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Source/Cctype.php index 76d0b7a8f..735547a07 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Source/Cctype.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Source/Cctype.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Source/PaymentAction.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Source/PaymentAction.php index fe96886b6..60f361348 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Source/PaymentAction.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Source/PaymentAction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php index d77adee07..60caa490a 100644 --- a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php +++ b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php index 82061fb33..00672ed08 100644 --- a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php +++ b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug.php index fdc410d03..53c40f35b 100644 --- a/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug.php +++ b/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug/Collection.php b/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug/Collection.php index 3443d0daa..1f52c7f08 100644 --- a/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug/Collection.php +++ b/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php b/app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php index 96c7c219c..37b17b095 100644 --- a/app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php +++ b/app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/controllers/Authorizenet/PaymentController.php b/app/code/core/Mage/Paygate/controllers/Authorizenet/PaymentController.php index a1e2a6c11..30358e37d 100644 --- a/app/code/core/Mage/Paygate/controllers/Authorizenet/PaymentController.php +++ b/app/code/core/Mage/Paygate/controllers/Authorizenet/PaymentController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/etc/config.xml b/app/code/core/Mage/Paygate/etc/config.xml index a6266f3da..59d2f1063 100644 --- a/app/code/core/Mage/Paygate/etc/config.xml +++ b/app/code/core/Mage/Paygate/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paygate/etc/system.xml b/app/code/core/Mage/Paygate/etc/system.xml index c12c6c75e..5102e089b 100644 --- a/app/code/core/Mage/Paygate/etc/system.xml +++ b/app/code/core/Mage/Paygate/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paygate/sql/paygate_setup/install-1.6.0.0.php b/app/code/core/Mage/Paygate/sql/paygate_setup/install-1.6.0.0.php index 300dc81a6..2c424c72b 100644 --- a/app/code/core/Mage/Paygate/sql/paygate_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Paygate/sql/paygate_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-data-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-data-upgrade-0.7.0-0.7.1.php index f6cc915cd..537010c1c 100644 --- a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-data-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-data-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-install-0.7.0.php index e21c3bb95..ac6d7c2aa 100644 --- a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-upgrade-0.7.0-0.7.1.php index 7c40df8c3..dfe8d75eb 100644 --- a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paygate - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Catalog/Product/View/Profile.php b/app/code/core/Mage/Payment/Block/Catalog/Product/View/Profile.php index 9f6c78f82..c90852069 100644 --- a/app/code/core/Mage/Payment/Block/Catalog/Product/View/Profile.php +++ b/app/code/core/Mage/Payment/Block/Catalog/Product/View/Profile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form.php b/app/code/core/Mage/Payment/Block/Form.php index f94cf6903..9ffd747db 100644 --- a/app/code/core/Mage/Payment/Block/Form.php +++ b/app/code/core/Mage/Payment/Block/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Banktransfer.php b/app/code/core/Mage/Payment/Block/Form/Banktransfer.php index a98a4c7d7..045a400da 100644 --- a/app/code/core/Mage/Payment/Block/Form/Banktransfer.php +++ b/app/code/core/Mage/Payment/Block/Form/Banktransfer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php b/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php index c7f762ef0..ffe965890 100644 --- a/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php +++ b/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Cc.php b/app/code/core/Mage/Payment/Block/Form/Cc.php index 24bad8118..99cac568e 100644 --- a/app/code/core/Mage/Payment/Block/Form/Cc.php +++ b/app/code/core/Mage/Payment/Block/Form/Cc.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Ccsave.php b/app/code/core/Mage/Payment/Block/Form/Ccsave.php index 0255c85b2..a4a7ddd64 100644 --- a/app/code/core/Mage/Payment/Block/Form/Ccsave.php +++ b/app/code/core/Mage/Payment/Block/Form/Ccsave.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Checkmo.php b/app/code/core/Mage/Payment/Block/Form/Checkmo.php index 21d70c92e..916e0d263 100644 --- a/app/code/core/Mage/Payment/Block/Form/Checkmo.php +++ b/app/code/core/Mage/Payment/Block/Form/Checkmo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Container.php b/app/code/core/Mage/Payment/Block/Form/Container.php index 059aa05e4..6fb75d704 100644 --- a/app/code/core/Mage/Payment/Block/Form/Container.php +++ b/app/code/core/Mage/Payment/Block/Form/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Purchaseorder.php b/app/code/core/Mage/Payment/Block/Form/Purchaseorder.php index 05d7472e5..a55240584 100644 --- a/app/code/core/Mage/Payment/Block/Form/Purchaseorder.php +++ b/app/code/core/Mage/Payment/Block/Form/Purchaseorder.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Info.php b/app/code/core/Mage/Payment/Block/Info.php index 13f28b0fa..56a9982f1 100644 --- a/app/code/core/Mage/Payment/Block/Info.php +++ b/app/code/core/Mage/Payment/Block/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Info/Banktransfer.php b/app/code/core/Mage/Payment/Block/Info/Banktransfer.php index 6c3c719ff..aea33f457 100644 --- a/app/code/core/Mage/Payment/Block/Info/Banktransfer.php +++ b/app/code/core/Mage/Payment/Block/Info/Banktransfer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Info/Cc.php b/app/code/core/Mage/Payment/Block/Info/Cc.php index a045176e3..e03c93c6b 100644 --- a/app/code/core/Mage/Payment/Block/Info/Cc.php +++ b/app/code/core/Mage/Payment/Block/Info/Cc.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Info/Ccsave.php b/app/code/core/Mage/Payment/Block/Info/Ccsave.php index 4fab924d6..2dbe9cd42 100644 --- a/app/code/core/Mage/Payment/Block/Info/Ccsave.php +++ b/app/code/core/Mage/Payment/Block/Info/Ccsave.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Info/Checkmo.php b/app/code/core/Mage/Payment/Block/Info/Checkmo.php index 8a2527106..1be68c340 100644 --- a/app/code/core/Mage/Payment/Block/Info/Checkmo.php +++ b/app/code/core/Mage/Payment/Block/Info/Checkmo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Info/Container.php b/app/code/core/Mage/Payment/Block/Info/Container.php index c8a7e1eab..744012934 100644 --- a/app/code/core/Mage/Payment/Block/Info/Container.php +++ b/app/code/core/Mage/Payment/Block/Info/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php b/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php index 2ab7146ce..d2bd5db29 100644 --- a/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php +++ b/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Exception.php b/app/code/core/Mage/Payment/Exception.php index c0a2b322c..ec478aa99 100644 --- a/app/code/core/Mage/Payment/Exception.php +++ b/app/code/core/Mage/Payment/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php index d60e7f3e5..05b5bdb19 100644 --- a/app/code/core/Mage/Payment/Helper/Data.php +++ b/app/code/core/Mage/Payment/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Billing/Agreement/MethodInterface.php b/app/code/core/Mage/Payment/Model/Billing/Agreement/MethodInterface.php index 53e2bbf5d..eeeb8f6cf 100644 --- a/app/code/core/Mage/Payment/Model/Billing/Agreement/MethodInterface.php +++ b/app/code/core/Mage/Payment/Model/Billing/Agreement/MethodInterface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Billing/AgreementAbstract.php b/app/code/core/Mage/Payment/Model/Billing/AgreementAbstract.php index 261511796..a1a8870ba 100644 --- a/app/code/core/Mage/Payment/Model/Billing/AgreementAbstract.php +++ b/app/code/core/Mage/Payment/Model/Billing/AgreementAbstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Config.php b/app/code/core/Mage/Payment/Model/Config.php index e13f2a704..543f10abc 100644 --- a/app/code/core/Mage/Payment/Model/Config.php +++ b/app/code/core/Mage/Payment/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Info.php b/app/code/core/Mage/Payment/Model/Info.php index b5fdca1f7..1c02c28af 100644 --- a/app/code/core/Mage/Payment/Model/Info.php +++ b/app/code/core/Mage/Payment/Model/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Info/Exception.php b/app/code/core/Mage/Payment/Model/Info/Exception.php index 0ba4c0298..d7d7993dc 100644 --- a/app/code/core/Mage/Payment/Model/Info/Exception.php +++ b/app/code/core/Mage/Payment/Model/Info/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Abstract.php b/app/code/core/Mage/Payment/Model/Method/Abstract.php index e4d96d79f..7429d1e4c 100644 --- a/app/code/core/Mage/Payment/Model/Method/Abstract.php +++ b/app/code/core/Mage/Payment/Model/Method/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Banktransfer.php b/app/code/core/Mage/Payment/Model/Method/Banktransfer.php index 9599e856e..0a9b26520 100644 --- a/app/code/core/Mage/Payment/Model/Method/Banktransfer.php +++ b/app/code/core/Mage/Payment/Model/Method/Banktransfer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Cashondelivery.php b/app/code/core/Mage/Payment/Model/Method/Cashondelivery.php index 59458b2a0..025c59539 100644 --- a/app/code/core/Mage/Payment/Model/Method/Cashondelivery.php +++ b/app/code/core/Mage/Payment/Model/Method/Cashondelivery.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Cc.php b/app/code/core/Mage/Payment/Model/Method/Cc.php index 154201680..ccf240ee3 100644 --- a/app/code/core/Mage/Payment/Model/Method/Cc.php +++ b/app/code/core/Mage/Payment/Model/Method/Cc.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -105,10 +105,6 @@ public function validate() || ($this->OtherCcType($info->getCcType()) && $this->validateCcNumOther($ccNumber))) { $ccType = 'OT'; - $discoverNetworkRegexp = '/^(30[0-5]\d{13}|3095\d{12}|35(2[8-9]\d{12}|[3-8]\d{13})|36\d{12}' - . '|3[8-9]\d{14}|6011(0\d{11}|[2-4]\d{11}|74\d{10}|7[7-9]\d{10}|8[6-9]\d{10}|9\d{11})' - . '|62(2(12[6-9]\d{10}|1[3-9]\d{11}|[2-8]\d{12}|9[0-1]\d{11}|92[0-5]\d{10})|[4-6]\d{13}' - . '|8[2-8]\d{12})|6(4[4-9]\d{13}|5\d{14}))$/'; $ccTypeRegExpList = array( //Solo, Switch or Maestro. International safe /* @@ -119,34 +115,33 @@ public function validate() */ // Solo only 'SO' => '/(^(6334)[5-9](\d{11}$|\d{13,14}$))|(^(6767)(\d{12}$|\d{14,15}$))/', + 'SM' => '/(^(5[0678])\d{11,18}$)|(^(6[^05])\d{11,18}$)|(^(601)[^1]\d{9,16}$)|(^(6011)\d{9,11}$)' + . '|(^(6011)\d{13,16}$)|(^(65)\d{11,13}$)|(^(65)\d{15,18}$)' + . '|(^(49030)[2-9](\d{10}$|\d{12,13}$))|(^(49033)[5-9](\d{10}$|\d{12,13}$))' + . '|(^(49110)[1-2](\d{10}$|\d{12,13}$))|(^(49117)[4-9](\d{10}$|\d{12,13}$))' + . '|(^(49118)[0-2](\d{10}$|\d{12,13}$))|(^(4936)(\d{12}$|\d{14,15}$))/', // Visa 'VI' => '/^4[0-9]{12}([0-9]{3})?$/', // Master Card 'MC' => '/^5[1-5][0-9]{14}$/', // American Express 'AE' => '/^3[47][0-9]{13}$/', - // Discover Network - 'DI' => $discoverNetworkRegexp, - // Dinners Club (Belongs to Discover Network) - 'DICL' => $discoverNetworkRegexp, - // JCB (Belongs to Discover Network) - 'JCB' => $discoverNetworkRegexp, - - // Maestro & Switch - 'SM' => '/(^(5[0678])\d{11,18}$)|(^(6[^05])\d{11,18}$)|(^(601)[^1]\d{9,16}$)|(^(6011)\d{9,11}$)' - . '|(^(6011)\d{13,16}$)|(^(65)\d{11,13}$)|(^(65)\d{15,18}$)' - . '|(^(49030)[2-9](\d{10}$|\d{12,13}$))|(^(49033)[5-9](\d{10}$|\d{12,13}$))' - . '|(^(49110)[1-2](\d{10}$|\d{12,13}$))|(^(49117)[4-9](\d{10}$|\d{12,13}$))' - . '|(^(49118)[0-2](\d{10}$|\d{12,13}$))|(^(4936)(\d{12}$|\d{14,15}$))/' + // Discovery + 'DI' => '/^6011[0-9]{12}$/', + // JCB + 'JCB' => '/^(3[0-9]{15}|(2131|1800)[0-9]{11})$/' ); - $specifiedCCType = $info->getCcType(); - if (array_key_exists($specifiedCCType, $ccTypeRegExpList)) { - $ccTypeRegExp = $ccTypeRegExpList[$specifiedCCType]; - if (!preg_match($ccTypeRegExp, $ccNumber)) { - $errorMsg = Mage::helper('payment')->__('Credit card number mismatch with credit card type.'); + foreach ($ccTypeRegExpList as $ccTypeMatch=>$ccTypeRegExp) { + if (preg_match($ccTypeRegExp, $ccNumber)) { + $ccType = $ccTypeMatch; + break; } } + + if (!$this->OtherCcType($info->getCcType()) && $ccType!=$info->getCcType()) { + $errorMsg = Mage::helper('payment')->__('Credit card number mismatch with credit card type.'); + } } else { $errorMsg = Mage::helper('payment')->__('Invalid Credit Card Number'); diff --git a/app/code/core/Mage/Payment/Model/Method/Ccsave.php b/app/code/core/Mage/Payment/Model/Method/Ccsave.php index b29324d10..82c68077a 100644 --- a/app/code/core/Mage/Payment/Model/Method/Ccsave.php +++ b/app/code/core/Mage/Payment/Model/Method/Ccsave.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Checkmo.php b/app/code/core/Mage/Payment/Model/Method/Checkmo.php index 1326dcb7a..85a54a415 100644 --- a/app/code/core/Mage/Payment/Model/Method/Checkmo.php +++ b/app/code/core/Mage/Payment/Model/Method/Checkmo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Free.php b/app/code/core/Mage/Payment/Model/Method/Free.php index d3fbb1a69..5a563322b 100644 --- a/app/code/core/Mage/Payment/Model/Method/Free.php +++ b/app/code/core/Mage/Payment/Model/Method/Free.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Purchaseorder.php b/app/code/core/Mage/Payment/Model/Method/Purchaseorder.php index e48b13a6a..c92516ef7 100644 --- a/app/code/core/Mage/Payment/Model/Method/Purchaseorder.php +++ b/app/code/core/Mage/Payment/Model/Method/Purchaseorder.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Observer.php b/app/code/core/Mage/Payment/Model/Observer.php index 95f58dc0c..040582afd 100644 --- a/app/code/core/Mage/Payment/Model/Observer.php +++ b/app/code/core/Mage/Payment/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Paygate/Request.php b/app/code/core/Mage/Payment/Model/Paygate/Request.php index ef5b51062..165e74fa6 100644 --- a/app/code/core/Mage/Payment/Model/Paygate/Request.php +++ b/app/code/core/Mage/Payment/Model/Paygate/Request.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Paygate/Result.php b/app/code/core/Mage/Payment/Model/Paygate/Result.php index 8ad3d4ca7..4d24910e0 100644 --- a/app/code/core/Mage/Payment/Model/Paygate/Result.php +++ b/app/code/core/Mage/Payment/Model/Paygate/Result.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Recurring/Profile.php b/app/code/core/Mage/Payment/Model/Recurring/Profile.php index 591648f62..66f63b4d2 100644 --- a/app/code/core/Mage/Payment/Model/Recurring/Profile.php +++ b/app/code/core/Mage/Payment/Model/Recurring/Profile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Recurring/Profile/MethodInterface.php b/app/code/core/Mage/Payment/Model/Recurring/Profile/MethodInterface.php index 8bc9a75bb..fe907a089 100644 --- a/app/code/core/Mage/Payment/Model/Recurring/Profile/MethodInterface.php +++ b/app/code/core/Mage/Payment/Model/Recurring/Profile/MethodInterface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Source/Cctype.php b/app/code/core/Mage/Payment/Model/Source/Cctype.php index 599cc4629..0a4669849 100644 --- a/app/code/core/Mage/Payment/Model/Source/Cctype.php +++ b/app/code/core/Mage/Payment/Model/Source/Cctype.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Source/Invoice.php b/app/code/core/Mage/Payment/Model/Source/Invoice.php index f6579c026..d4750cdc7 100644 --- a/app/code/core/Mage/Payment/Model/Source/Invoice.php +++ b/app/code/core/Mage/Payment/Model/Source/Invoice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/etc/adminhtml.xml b/app/code/core/Mage/Payment/etc/adminhtml.xml index c4b30ce79..7570f2bf9 100644 --- a/app/code/core/Mage/Payment/etc/adminhtml.xml +++ b/app/code/core/Mage/Payment/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Payment/etc/config.xml b/app/code/core/Mage/Payment/etc/config.xml index 7addbd276..301fa3ec5 100644 --- a/app/code/core/Mage/Payment/etc/config.xml +++ b/app/code/core/Mage/Payment/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Payment/etc/system.xml b/app/code/core/Mage/Payment/etc/system.xml index 961613ab4..ae70f5582 100644 --- a/app/code/core/Mage/Payment/etc/system.xml +++ b/app/code/core/Mage/Payment/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Payment - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details.php index cd06c5b87..fea09b77a 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php index 63a19fc28..9963f5cae 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php index f6a470c4a..9d6c205a1 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php index 063db4303..d9d6c00a7 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php index eba963f7f..73a876dcc 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,11 +29,6 @@ */ class Mage_Paypal_Block_Adminhtml_System_Config_ApiWizard extends Mage_Adminhtml_Block_System_Config_Form_Field { - /** - * @var string - */ - protected $_wizardTemplate = 'paypal/system/config/api_wizard.phtml'; - /** * Set template to itself */ @@ -41,7 +36,7 @@ protected function _prepareLayout() { parent::_prepareLayout(); if (!$this->getTemplate()) { - $this->setTemplate($this->_wizardTemplate); + $this->setTemplate('paypal/system/config/api_wizard.phtml'); } return $this; } @@ -67,43 +62,14 @@ public function render(Varien_Data_Form_Element_Abstract $element) protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) { $originalData = $element->getOriginalData(); - $elementHtmlId = $element->getHtmlId(); - $this->addData(array_merge( - $this->_getButtonData($elementHtmlId, $originalData), - $this->_getSandboxButtonData($elementHtmlId, $originalData) - )); - return $this->_toHtml(); - } - - /** - * Prepare button data - * - * @param string $elementHtmlId - * @param array $originalData - * @return array - */ - protected function _getButtonData($elementHtmlId, $originalData) - { - return array( + $this->addData(array( 'button_label' => Mage::helper('paypal')->__($originalData['button_label']), 'button_url' => $originalData['button_url'], - 'html_id' => $elementHtmlId, - ); - } - - /** - * Prepare sandbox button data - * - * @param string $elementHtmlId - * @param array $originalData - * @return array - */ - protected function _getSandboxButtonData($elementHtmlId, $originalData) - { - return array( + 'html_id' => $element->getHtmlId(), 'sandbox_button_label' => Mage::helper('paypal')->__($originalData['sandbox_button_label']), 'sandbox_button_url' => $originalData['sandbox_button_url'], - 'sandbox_html_id' => 'sandbox_' . $elementHtmlId, - ); + 'sandbox_html_id' => 'sandbox_' . $element->getHtmlId(), + )); + return $this->_toHtml(); } } diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php deleted file mode 100644 index 45ea9363a..000000000 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php +++ /dev/null @@ -1,48 +0,0 @@ - - */ -class Mage_Paypal_Block_Adminhtml_System_Config_Field_SolutionType - extends Mage_Adminhtml_Block_System_Config_Form_Field -{ - /** - * Enter description here... - * - * @param Varien_Data_Form_Element_Abstract $element - * @return string - */ - public function render(Varien_Data_Form_Element_Abstract $element) - { - $countryCode = Mage::helper('paypal')->getConfigurationCountryCode(); - if ($countryCode == 'DE') { - return Mage::getBlockSingleton('paypal/adminhtml_System_config_field_hidden')->render($element); - } - - return parent::render($element); - } -} diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php deleted file mode 100644 index f1e5477e8..000000000 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php +++ /dev/null @@ -1,143 +0,0 @@ - - */ -class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Deprecated - extends Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Payment -{ - /** - * Get was enabled config path - * - * @param Varien_Data_Form_Element_Abstract $element - * @return string - */ - protected function _getWasActiveConfigPath(Varien_Data_Form_Element_Abstract $element) - { - $groupConfig = $this->getGroup($element)->asArray(); - return isset($groupConfig['was_enabled_path']) ? $groupConfig['was_enabled_path'] : ''; - } - - /** - * Check whether solution was enabled - * - * @param Varien_Data_Form_Element_Abstract $element - * @return bool - */ - protected function _wasActive(Varien_Data_Form_Element_Abstract $element) - { - $wasActiveConfigPath = $this->_getWasActiveConfigPath($element); - return empty($wasActiveConfigPath) - ? false - : (bool)(string)$this->_getConfigDataModel()->getConfigDataValue($wasActiveConfigPath); - } - - /** - * Set solution as was enabled - * - * @param Varien_Data_Form_Element_Abstract $element - * @return Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Deprecated - */ - protected function _setWasActive(Varien_Data_Form_Element_Abstract $element) - { - $wasActiveConfigPath = $this->_getWasActiveConfigPath($element); - Mage::getConfig()->saveConfig($wasActiveConfigPath, 1); - return $this; - } - - /** - * Get config data model - * - * @return Mage_Core_Model_Config - */ - protected function _getConfigModel() - { - if (!$this->hasConfigModel()) { - $this->setConfigModel(Mage::getConfig()); - } - - return $this->getConfigModel(); - } - - /** - * Get all websites - * - * @return array - */ - protected function _getWebsites() - { - if (!$this->hasWebsites()) { - $this->setWebsites(Mage::app()->getWebsites()); - } - - return $this->getWebsites(); - } - - /** - * Check whether current payment method is enabled on any scope - * - * @param string $activityPath - * @return bool - */ - public function isPaymentEnabledAnyScope($activityPath) - { - if ((bool)(string)$this->_getConfigModel()->getNode($activityPath, 'default')) { - return true; - } - foreach ($this->_getWebsites() as $website) { - if ((bool)(string)$this->_getConfigModel()->getNode($activityPath, 'website', (int)$website->getId())) { - return true; - } - } - - return false; - } - - /** - * Do not render solution if disabled - * - * @param Varien_Data_Form_Element_Abstract $element - * @return string - */ - public function render(Varien_Data_Form_Element_Abstract $element) - { - if ($this->_wasActive($element)) { - return parent::render($element); - } - - if ($this->_isPaymentEnabled($element, array($this, 'isPaymentEnabledAnyScope'))) { - $this->_setWasActive($element); - return parent::render($element); - } - - return ''; - } -} diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php index a59b50aeb..17a6cb660 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php index 162f34d4b..3f4dd27d4 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php index e1fe6bcc7..a0d871ed1 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php index 6105b9387..600785531 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php index 33e0385fb..b1691f30a 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -242,27 +242,6 @@ protected function _getExtraJs($element, $tooltipsExist = false) } paypalConflictsObject.ecCheckAvailability(); paypalConflictsObject.sharePayflowEnabling(enabler, isEvent); - }, - - handleBmlEnabler: function(event) { - required = Event.element(event); - var bml = $(required).bmlEnabler; - if (required.value == "1") { - bml.value = "1"; - } - paypalConflictsObject.toggleBmlEnabler(required); - }, - - toggleBmlEnabler: function(required) { - var bml = $(required).bmlEnabler; - if (!bml) { - return; - } - if (required.value != "1") { - bml.value = "0"; - $(bml).disable(); - } - $(bml).requiresObj.indicateEnabled(); } }; @@ -318,19 +297,8 @@ protected function _getExtraJs($element, $tooltipsExist = false) } } - $$(".paypal-bml").each(function(bmlEnabler) { - $(bmlEnabler).classNames().each(function(className) { - if (className.indexOf("requires-") !== -1) { - var required = $(className.replace("requires-", "")); - required.bmlEnabler = bmlEnabler; - Event.observe(required, "change", paypalConflictsObject.handleBmlEnabler); - } - }); - }); - $$(".paypal-enabler").each(function(enablerElement) { paypalConflictsObject.checkPaymentConflicts(enablerElement, "initial"); - paypalConflictsObject.toggleBmlEnabler(enablerElement); }); if (paypalConflictsObject.isConflict || paypalConflictsObject.ecMissed) { var notification = \'' . $this->helper('core')->jsQuoteEscape($this->__('The following error(s) occured:')) . '\'; diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php index 2ed4fe1c8..db1049c5b 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,10 +50,9 @@ protected function _getFrontendClass($element) * Check whether current payment method is enabled * * @param Varien_Data_Form_Element_Abstract $element - * @param callback|null $configCallback * @return bool */ - protected function _isPaymentEnabled($element, $configCallback = null) + protected function _isPaymentEnabled($element) { $groupConfig = $this->getGroup($element)->asArray(); $activityPath = isset($groupConfig['activity_path']) ? $groupConfig['activity_path'] : ''; @@ -62,29 +61,11 @@ protected function _isPaymentEnabled($element, $configCallback = null) return false; } - if ($configCallback && is_callable($configCallback)) { - $isPaymentEnabled = call_user_func($configCallback, $activityPath); - } else { - $isPaymentEnabled = (bool)(string)$this->_getConfigDataModel()->getConfigDataValue($activityPath); - } + $isPaymentEnabled = (string)Mage::getSingleton('adminhtml/config_data')->getConfigDataValue($activityPath); return (bool)$isPaymentEnabled; } - /** - * Get config data model - * - * @return Mage_Adminhtml_Model_Config_Data - */ - protected function _getConfigDataModel() - { - if (!$this->hasConfigDataModel()) { - $this->setConfigDataModel(Mage::getSingleton('adminhtml/config_data')); - } - - return $this->getConfigDataModel(); - } - /** * Return header title part of html for payment solution * diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php index b1f2f431d..9bd3b0853 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php index 2d7ea7151..0027f87b2 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php index 20743aa0a..13ae72586 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Bml/Banners.php b/app/code/core/Mage/Paypal/Block/Bml/Banners.php deleted file mode 100644 index 2f6e529d0..000000000 --- a/app/code/core/Mage/Paypal/Block/Bml/Banners.php +++ /dev/null @@ -1,85 +0,0 @@ -_section = $section; - } - - /** - * @param int $position - */ - public function setPosition($position = 0) - { - $this->_position = $position; - } - - /** - * Getter for paypal config - * - * @return Mage_Paypal_Model_Config - */ - protected function _getConfig() - { - return Mage::getSingleton('paypal/config'); - } - - /** - * Disable block output if banner turned off or PublisherId is miss - * - * @return string - */ - protected function _toHtml() - { - $publisherId = $this->_getConfig()->getBmlPublisherId(); - $display = $this->_getConfig()->getBmlDisplay($this->_section); - $position = $this->_getConfig()->getBmlPosition($this->_section); - if (!$publisherId || $display == 0 || $this->_position != $position) { - return ''; - } - $this->setPublisherId($publisherId); - $this->setSize($this->_getConfig()->getBmlSize($this->_section)); - return parent::_toHtml(); - } -} diff --git a/app/code/core/Mage/Paypal/Block/Bml/Form.php b/app/code/core/Mage/Paypal/Block/Bml/Form.php deleted file mode 100644 index d3bb22f37..000000000 --- a/app/code/core/Mage/Paypal/Block/Bml/Form.php +++ /dev/null @@ -1,58 +0,0 @@ -_config = Mage::getModel('paypal/config')->setMethod($this->getMethodCode()); - $mark = Mage::getConfig()->getBlockClassName('core/template'); - $mark = new $mark; - $mark->setTemplate('paypal/payment/mark.phtml') - ->setPaymentAcceptanceMarkHref('https://www.securecheckout.billmelater.com/paycapture-content/' - . 'fetch?hash=AU826TU8&content=/bmlweb/ppwpsiw.html') - ->setPaymentAcceptanceMarkSrc('https://www.paypalobjects.com/en_US/i/logo/logo_BMLPP_90x34.gif') - ->setPaymentWhatIs('See terms'); - $this->setTemplate('paypal/payment/redirect.phtml') - ->setRedirectMessage( - Mage::helper('paypal')->__('You will be redirected to the PayPal website.') - ) - ->setMethodTitle('') // Output PayPal mark, omit title - ->setMethodLabelAfterHtml($mark->toHtml()); - } -} diff --git a/app/code/core/Mage/Paypal/Block/Express/Form.php b/app/code/core/Mage/Paypal/Block/Express/Form.php index 56db62af9..6970f8330 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Form.php +++ b/app/code/core/Mage/Paypal/Block/Express/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Express/Review.php b/app/code/core/Mage/Paypal/Block/Express/Review.php index 35d368ade..b6f0e85b2 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -202,6 +202,8 @@ protected function _beforeToHtml() { $methodInstance = $this->_quote->getPayment()->getMethodInstance(); $this->setPaymentMethodTitle($methodInstance->getTitle()); + $this->setUpdateOrderSubmitUrl($this->getUrl("{$this->_paypalActionPrefix}/express/updateOrder")); + $this->setUpdateShippingMethodsUrl($this->getUrl("{$this->_paypalActionPrefix}/express/updateShippingMethods")); $this->setShippingRateRequired(true); if ($this->_quote->getIsVirtual()) { @@ -223,11 +225,9 @@ protected function _beforeToHtml() } } - $canEditShippingAddress = $this->_quote->getMayEditShippingAddress() && $this->_quote->getPayment() - ->getAdditionalInformation(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_BUTTON) == 1; // misc shipping parameters $this->setShippingMethodSubmitUrl($this->getUrl("{$this->_paypalActionPrefix}/express/saveShippingMethod")) - ->setCanEditShippingAddress($canEditShippingAddress) + ->setCanEditShippingAddress($this->_quote->getMayEditShippingAddress()) ->setCanEditShippingMethod($this->_quote->getMayEditShippingMethod()) ; } diff --git a/app/code/core/Mage/Paypal/Block/Express/Review/Billing.php b/app/code/core/Mage/Paypal/Block/Express/Review/Billing.php index 2954c0c38..d8ea9fdf1 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review/Billing.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review/Billing.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Express/Review/Details.php b/app/code/core/Mage/Paypal/Block/Express/Review/Details.php index 3eac3e7b3..0014662ab 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review/Details.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review/Details.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.php b/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.php index 18f814734..112dfa423 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Express/Shortcut.php b/app/code/core/Mage/Paypal/Block/Express/Shortcut.php index 07f835fa8..f2a4c820d 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Shortcut.php +++ b/app/code/core/Mage/Paypal/Block/Express/Shortcut.php @@ -20,23 +20,12 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Paypal expess checkout shortcut link - * - * @method string getShortcutHtmlId() - * @method string getImageUrl() - * @method string getCheckoutUrl() - * @method string getBmlShortcutHtmlId() - * @method string getBmlCheckoutUrl() - * @method string getBmlImageUrl() - * @method string getIsBmlEnabled() - * @method string getConfirmationUrl() - * @method string getIsInCatalogProduct() - * @method string getConfirmationMessage() */ class Mage_Paypal_Block_Express_Shortcut extends Mage_Core_Block_Template { @@ -65,7 +54,7 @@ class Mage_Paypal_Block_Express_Shortcut extends Mage_Core_Block_Template * * @var string */ - protected $_startAction = 'paypal/express/start/button/1'; + protected $_startAction = 'paypal/express/start'; /** * Express checkout model factory name @@ -74,9 +63,6 @@ class Mage_Paypal_Block_Express_Shortcut extends Mage_Core_Block_Template */ protected $_checkoutType = 'paypal/express_checkout'; - /** - * @return Mage_Core_Block_Abstract - */ protected function _beforeToHtml() { $result = parent::_beforeToHtml(); @@ -120,9 +106,8 @@ protected function _beforeToHtml() // set misc data $this->setShortcutHtmlId($this->helper('core')->uniqHash('ec_shortcut_')) - ->setCheckoutUrl($this->getUrl($this->_startAction)); - - $this->_getBmlShortcut($quote); + ->setCheckoutUrl($this->getUrl($this->_startAction)) + ; // use static image if in catalog if ($isInCatalog || null === $quote) { @@ -146,25 +131,6 @@ protected function _beforeToHtml() return $result; } - /** - * @param $quote - * - * @return Mage_Paypal_Block_Express_Shortcut - */ - protected function _getBmlShortcut($quote) - { - $bml = Mage::helper('payment')->getMethodInstance(Mage_Paypal_Model_Config::METHOD_BML); - $isBmlEnabled = $bml && $bml->isAvailable($quote); - $this->setBmlShortcutHtmlId($this->helper('core')->uniqHash('ec_shortcut_bml_')) - ->setBmlCheckoutUrl($this->getUrl('paypal/bml/start/button/1')) - ->setBmlImageUrl('https://www.paypalobjects.com/webstatic/en_US/btn/btn_bml_SM.png') - ->setMarketMessage('https://www.paypalobjects.com/webstatic/en_US/btn/btn_bml_text.png') - ->setMarketMessageUrl('https://www.securecheckout.billmelater.com/paycapture-content/' - . 'fetch?hash=AU826TU8&content=/bmlweb/ppwpsiw.html') - ->setIsBmlEnabled($isBmlEnabled); - return $this; - } - /** * Render the block if needed * diff --git a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Form.php b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Form.php index b073a8b79..0e14db2de 100644 --- a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Form.php +++ b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php index ab6a6259d..88e9c16d4 100644 --- a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php +++ b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php index 166745d06..1429fb61e 100644 --- a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php +++ b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Iframe.php b/app/code/core/Mage/Paypal/Block/Iframe.php index bcffc2095..a0ec26ca1 100644 --- a/app/code/core/Mage/Paypal/Block/Iframe.php +++ b/app/code/core/Mage/Paypal/Block/Iframe.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Logo.php b/app/code/core/Mage/Paypal/Block/Logo.php index 563fa3557..33fd171b2 100644 --- a/app/code/core/Mage/Paypal/Block/Logo.php +++ b/app/code/core/Mage/Paypal/Block/Logo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php index 17c33c754..3cebe8341 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php index 10b9d9c63..5e661f715 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Info.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Info.php index cdea8121b..884e1cd5b 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Info.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Review.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Review.php index 3e2fc544a..479cdd95c 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Review.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php index b35f9529b..319c16ae3 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php index aa80040e8..7957944f0 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php index a15bfa63a..cd3d8bda1 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Review.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Review.php index 521ba6f54..8a73f70d0 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Review.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payment/Info.php b/app/code/core/Mage/Paypal/Block/Payment/Info.php index 52d5b40fb..d3951e0c9 100644 --- a/app/code/core/Mage/Paypal/Block/Payment/Info.php +++ b/app/code/core/Mage/Paypal/Block/Payment/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Standard/Form.php b/app/code/core/Mage/Paypal/Block/Standard/Form.php index 1153379db..33ccd1b32 100644 --- a/app/code/core/Mage/Paypal/Block/Standard/Form.php +++ b/app/code/core/Mage/Paypal/Block/Standard/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Standard/Redirect.php b/app/code/core/Mage/Paypal/Block/Standard/Redirect.php index 16ff732e0..74d8119a3 100644 --- a/app/code/core/Mage/Paypal/Block/Standard/Redirect.php +++ b/app/code/core/Mage/Paypal/Block/Standard/Redirect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Paypal_Block_Standard_Redirect extends Mage_Core_Block_Abstract diff --git a/app/code/core/Mage/Paypal/Controller/Express/Abstract.php b/app/code/core/Mage/Paypal/Controller/Express/Abstract.php index d87738705..85918b310 100644 --- a/app/code/core/Mage/Paypal/Controller/Express/Abstract.php +++ b/app/code/core/Mage/Paypal/Controller/Express/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,24 +67,10 @@ public function startAction() } $customer = Mage::getSingleton('customer/session')->getCustomer(); - $quoteCheckoutMethod = $this->_getQuote()->getCheckoutMethod(); if ($customer && $customer->getId()) { $this->_checkout->setCustomerWithAddressChange( $customer, $this->_getQuote()->getBillingAddress(), $this->_getQuote()->getShippingAddress() ); - } elseif ((!$quoteCheckoutMethod - || $quoteCheckoutMethod != Mage_Checkout_Model_Type_Onepage::METHOD_REGISTER) - && !Mage::helper('checkout')->isAllowedGuestCheckout( - $this->_getQuote(), - $this->_getQuote()->getStoreId() - )) { - Mage::getSingleton('core/session')->addNotice( - Mage::helper('paypal')->__('To proceed to Checkout, please log in using your email address.') - ); - $this->redirectLogin(); - Mage::getSingleton('customer/session') - ->setBeforeAuthUrl(Mage::getUrl('*/*/*', array('_current' => true))); - return; } // billing agreement @@ -94,9 +80,6 @@ public function startAction() $this->_checkout->setIsBillingAgreementRequested($isBARequested); } - // Bill Me Later - $this->_checkout->setIsBml((bool)$this->getRequest()->getParam('bml')); - // giropay $this->_checkout->prepareGiropayUrls( Mage::getUrl('checkout/onepage/success'), @@ -104,8 +87,7 @@ public function startAction() Mage::getUrl('checkout/onepage/success') ); - $button = (bool)$this->getRequest()->getParam(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_BUTTON); - $token = $this->_checkout->start(Mage::getUrl('*/*/return'), Mage::getUrl('*/*/cancel'), $button); + $token = $this->_checkout->start(Mage::getUrl('*/*/return'), Mage::getUrl('*/*/cancel')); if ($token && $url = $this->_checkout->getRedirectUrl()) { $this->_initToken($token); $this->getResponse()->setRedirect($url); @@ -175,25 +157,13 @@ public function cancelAction() */ public function returnAction() { - if ($this->getRequest()->getParam('retry_authorization') == 'true' - && is_array($this->_getCheckoutSession()->getPaypalTransactionData()) - ) { - $this->_forward('placeOrder'); - return; - } try { - $this->_getCheckoutSession()->unsPaypalTransactionData(); - $this->_checkout = $this->_initCheckout(); + $this->_initCheckout(); $this->_checkout->returnFromPaypal($this->_initToken()); - - if ($this->_checkout->canSkipOrderReviewStep()) { - $this->_forward('placeOrder'); - } else { - $this->_redirect('*/*/review'); - } - + $this->_redirect('*/*/review'); return; - } catch (Mage_Core_Exception $e) { + } + catch (Mage_Core_Exception $e) { Mage::getSingleton('checkout/session')->addError($e->getMessage()); } catch (Exception $e) { @@ -295,13 +265,43 @@ public function updateShippingMethodsAction() } catch (Mage_Core_Exception $e) { $this->_getSession()->addError($e->getMessage()); } catch (Exception $e) { - $this->_getSession()->addError($this->__('Unable to update shipping method.')); + $this->_getSession()->addError($this->__('Unable to update Order data.')); Mage::logException($e); } $this->getResponse()->setBody(''); } + /** + * Update Order (combined action for ajax and regular request) + */ + public function updateOrderAction() + { + try { + $isAjax = $this->getRequest()->getParam('isAjax'); + $this->_initCheckout(); + $this->_checkout->updateOrder($this->getRequest()->getParams()); + if ($isAjax) { + $this->loadLayout('paypal_express_review_details'); + $this->getResponse()->setBody($this->getLayout()->getBlock('root') + ->setQuote($this->_getQuote()) + ->toHtml()); + return; + } + } catch (Mage_Core_Exception $e) { + $this->_getSession()->addError($e->getMessage()); + } catch (Exception $e) { + $this->_getSession()->addError($this->__('Unable to update Order data.')); + Mage::logException($e); + } + if ($isAjax) { + $this->getResponse()->setBody(''); + } else { + $this->_redirect('*/*/review'); + } + } + /** * Submit the order */ @@ -358,88 +358,22 @@ public function placeOrderAction() $this->_initToken(false); // no need in token anymore $this->_redirect('checkout/onepage/success'); return; - } catch (Mage_Paypal_Model_Api_ProcessableException $e) { - $this->_processPaypalApiError($e); - } catch (Mage_Core_Exception $e) { - Mage::helper('checkout')->sendPaymentFailedEmail($this->_getQuote(), $e->getMessage()); + } + catch (Mage_Core_Exception $e) { $this->_getSession()->addError($e->getMessage()); - $this->_redirect('*/*/review'); - } catch (Exception $e) { - Mage::helper('checkout')->sendPaymentFailedEmail( - $this->_getQuote(), - $this->__('Unable to place the order.') - ); + } + catch (Exception $e) { $this->_getSession()->addError($this->__('Unable to place the order.')); Mage::logException($e); - $this->_redirect('*/*/review'); - } - } - - /** - * Process PayPal API's processable errors - * - * @param Mage_Paypal_Model_Api_ProcessableException $exception - * @throws Mage_Paypal_Model_Api_ProcessableException - */ - protected function _processPaypalApiError($exception) - { - switch ($exception->getCode()) { - case Mage_Paypal_Model_Api_ProcessableException::API_MAX_PAYMENT_ATTEMPTS_EXCEEDED: - case Mage_Paypal_Model_Api_ProcessableException::API_TRANSACTION_EXPIRED: - $this->getResponse()->setRedirect( - $this->_getQuote()->getPayment()->getCheckoutRedirectUrl() - ); - break; - case Mage_Paypal_Model_Api_ProcessableException::API_DO_EXPRESS_CHECKOUT_FAIL: - $this->_redirectSameToken(); - break; - case Mage_Paypal_Model_Api_ProcessableException::API_UNABLE_TRANSACTION_COMPLETE: - if ($this->_config->getPaymentAction() == Mage_Payment_Model_Method_Abstract::ACTION_ORDER) { - $paypalTransactionData = $this->_getCheckoutSession()->getPaypalTransactionData(); - $this->getResponse()->setRedirect( - $this->_config->getExpressCheckoutOrderUrl($paypalTransactionData['transaction_id']) - ); - } else { - $this->_redirectSameToken(); - } - break; - default: - $this->_redirectToCartAndShowError($exception->getUserMessage()); - break; } - - } - - /** - * Redirect customer back to PayPal with the same token - */ - protected function _redirectSameToken() - { - $token = $this->_initToken(); - $this->getResponse()->setRedirect( - $this->_config->getExpressCheckoutStartUrl($token) - ); - } - - /** - * Redirect customer to shopping cart and show error message - * - * @param string $errorMessage - */ - protected function _redirectToCartAndShowError($errorMessage) - { - $cart = Mage::getSingleton('checkout/cart'); - $cart->getCheckoutSession()->addError($errorMessage); - $this->_redirect('checkout/cart'); + $this->_redirect('*/*/review'); } /** * Instantiate quote and checkout - * - * @return Mage_Paypal_Model_Express_Checkout * @throws Mage_Core_Exception */ - protected function _initCheckout() + private function _initCheckout() { $quote = $this->_getQuote(); if (!$quote->hasItems() || $quote->getHasError()) { @@ -450,8 +384,6 @@ protected function _initCheckout() 'config' => $this->_config, 'quote' => $quote, )); - - return $this->_checkout; } /** @@ -500,7 +432,7 @@ private function _getSession() * * @return Mage_Checkout_Model_Session */ - protected function _getCheckoutSession() + private function _getCheckoutSession() { return Mage::getSingleton('checkout/session'); } @@ -508,7 +440,7 @@ protected function _getCheckoutSession() /** * Return checkout quote object * - * @return Mage_Sales_Model_Quote + * @return Mage_Sale_Model_Quote */ private function _getQuote() { diff --git a/app/code/core/Mage/Paypal/Exception.php b/app/code/core/Mage/Paypal/Exception.php index 3e28f1b5b..a97b3a783 100644 --- a/app/code/core/Mage/Paypal/Exception.php +++ b/app/code/core/Mage/Paypal/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Helper/Checkout.php b/app/code/core/Mage/Paypal/Helper/Checkout.php index 42b39ecb5..47d80701d 100644 --- a/app/code/core/Mage/Paypal/Helper/Checkout.php +++ b/app/code/core/Mage/Paypal/Helper/Checkout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Helper/Data.php b/app/code/core/Mage/Paypal/Helper/Data.php index d5487a885..0e7a4e40f 100644 --- a/app/code/core/Mage/Paypal/Helper/Data.php +++ b/app/code/core/Mage/Paypal/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -76,23 +76,4 @@ public function getElementBackendConfig(Varien_Data_Form_Element_Abstract $eleme } return Mage::helper('core')->jsonEncode($config); } - - /** - * Get selected merchant country code in system configuration - * - * @return string - */ - public function getConfigurationCountryCode() - { - $requestParam = Mage_Paypal_Block_Adminhtml_System_Config_Field_Country::REQUEST_PARAM_COUNTRY; - $countryCode = Mage::app()->getRequest()->getParam($requestParam); - if (is_null($countryCode) || preg_match('/^[a-zA-Z]{2}$/', $countryCode) == 0) { - $countryCode = (string)Mage::getSingleton('adminhtml/config_data') - ->getConfigDataValue('paypal/general/merchant_country'); - } - if (empty($countryCode)) { - $countryCode = Mage::helper('core')->getDefaultCountry(); - } - return $countryCode; - } } diff --git a/app/code/core/Mage/Paypal/Helper/Hss.php b/app/code/core/Mage/Paypal/Helper/Hss.php index c5805e308..d7bf8c72d 100644 --- a/app/code/core/Mage/Paypal/Helper/Hss.php +++ b/app/code/core/Mage/Paypal/Helper/Hss.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Api/Abstract.php b/app/code/core/Mage/Paypal/Model/Api/Abstract.php index 75933fa65..c2f702826 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Abstract.php +++ b/app/code/core/Mage/Paypal/Model/Api/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Api/Nvp.php b/app/code/core/Mage/Paypal/Model/Api/Nvp.php index bab5d2960..fae9f1e19 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Nvp.php +++ b/app/code/core/Mage/Paypal/Model/Api/Nvp.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -99,7 +99,6 @@ class Mage_Paypal_Model_Api_Nvp extends Mage_Paypal_Model_Api_Abstract 'PAYFLOWCOLOR' => 'payflowcolor', 'LOCALECODE' => 'locale_code', 'PAL' => 'pal', - 'USERSELECTEDFUNDINGSOURCE' => 'funding_source', // transaction info 'TRANSACTIONID' => 'transaction_id', @@ -230,7 +229,6 @@ class Mage_Paypal_Model_Api_Nvp extends Mage_Paypal_Model_Api_Abstract 'GIROPAYCANCELURL', 'GIROPAYSUCCESSURL', 'BANKTXNPENDINGURL', 'PAGESTYLE', 'HDRIMG', 'HDRBORDERCOLOR', 'HDRBACKCOLOR', 'PAYFLOWCOLOR', 'LOCALECODE', 'BILLINGTYPE', 'SUBJECT', 'ITEMAMT', 'SHIPPINGAMT', 'TAXAMT', 'REQBILLINGADDRESS', - 'USERSELECTEDFUNDINGSOURCE' ); protected $_setExpressCheckoutResponse = array('TOKEN'); @@ -640,6 +638,11 @@ public function callDoExpressCheckoutPayment() $request = $this->_exportToRequest($this->_doExpressCheckoutPaymentRequest); $this->_exportLineItems($request); + if ($this->getAddress()) { + $request = $this->_importAddresses($request); + $request['ADDROVERRIDE'] = 1; + } + $response = $this->call(self::DO_EXPRESS_CHECKOUT_PAYMENT, $request); $this->_importFromResponse($this->_paymentInformationResponse, $response); $this->_importFromResponse($this->_doExpressCheckoutPaymentResponse, $response); @@ -945,7 +948,7 @@ public function call($methodName, array $request) try { $http = new Varien_Http_Adapter_Curl(); $config = array( - 'timeout' => 60, + 'timeout' => 30, 'verifypeer' => $this->_config->verifyPeer ); @@ -1024,105 +1027,31 @@ public function setRawResponseNeeded($flag) /** * Handle logical errors * - * @param array $response - * @throws Mage_Core_Exception + * @param array */ protected function _handleCallErrors($response) - { - $errors = $this->_extractErrorsFromResponse($response); - $errorsCount = count($errors); - - if (!$errorsCount) { - return; - } - - $exceptionCode = 0; - - if ($errorsCount == 1 && $this->_isProcessableError($errors[0]['code'])) { - $exceptionCode = $errors[0]['code']; - $exceptionClass = 'Mage_Paypal_Model_Api_ProcessableException'; - } else { - $exceptionClass = 'Mage_Core_Exception'; - } - - $errorMessages = array(); - - foreach ($errors as $error) { - $errorMessages[] = $error['message']; - $this->_callErrors[] = $error['code']; - } - - $errorMessages = implode(' ', array_values($errorMessages)); - $exceptionLogMessage = sprintf('PayPal NVP gateway errors: %s Correlation ID: %s. Version: %s.', - $errors, - isset($response['CORRELATIONID']) ? $response['CORRELATIONID'] : '', - isset($response['VERSION']) ? $response['VERSION'] : '' - ); - - $exception = new $exceptionClass($exceptionLogMessage, $exceptionCode); - Mage::logException($exception); - - $exception->setMessage(Mage::helper('paypal')->__('PayPal gateway has rejected request. %s', $errorMessages)); - - throw $exception; - } - - /** - * Format error message from error code, short error message and long error message - * - * @param string $errorCode - * @param string $shortErrorMessage - * @param string $longErrorMessage - * @return string - */ - protected function _formatErrorMessage($errorCode, $shortErrorMessage, $longErrorMessage) - { - $longErrorMessage = preg_replace('/\.$/', '', $longErrorMessage); - $shortErrorMessage = preg_replace('/\.$/', '', $shortErrorMessage); - - return $longErrorMessage ? sprintf('%s (#%s: %s).', $longErrorMessage, $errorCode, $shortErrorMessage) - : sprintf('#%s: %s.', $errorCode, $shortErrorMessage); - } - - - /** - * Check whether PayPal error can be processed - * - * @param int $errorCode - * @return bool - */ - protected function _isProcessableError($errorCode) - { - $processableErrorsList = $this->getProcessableErrors(); - - if (!$processableErrorsList || !is_array($processableErrorsList)) { - return false; - } - - return in_array($errorCode, $processableErrorsList); - } - - /** - * Extract errors from PayPal's response and return them in array - * - * @param array $response - * @return array - */ - protected function _extractErrorsFromResponse($response) { $errors = array(); - for ($i = 0; isset($response["L_ERRORCODE{$i}"]); $i++) { - $errorCode = $response["L_ERRORCODE{$i}"]; - $errorMessage = $this->_formatErrorMessage($errorCode, $response["L_SHORTMESSAGE{$i}"], - $response["L_LONGMESSAGE{$i}"]); - $errors[] = array ( - 'code' => $errorCode, - 'message' => $errorMessage - ); + $longMessage = isset($response["L_LONGMESSAGE{$i}"]) + ? preg_replace('/\.$/', '', $response["L_LONGMESSAGE{$i}"]) : ''; + $shortMessage = preg_replace('/\.$/', '', $response["L_SHORTMESSAGE{$i}"]); + $errors[] = $longMessage + ? sprintf('%s (#%s: %s).', $longMessage, $response["L_ERRORCODE{$i}"], $shortMessage) + : sprintf('#%s: %s.', $response["L_ERRORCODE{$i}"], $shortMessage); + $this->_callErrors[] = $response["L_ERRORCODE{$i}"]; + } + if ($errors) { + $errors = implode(' ', $errors); + $e = Mage::exception('Mage_Core', sprintf('PayPal NVP gateway errors: %s Correlation ID: %s. Version: %s.', + $errors, + isset($response['CORRELATIONID']) ? $response['CORRELATIONID'] : '', + isset($response['VERSION']) ? $response['VERSION'] : '' + )); + Mage::logException($e); + $e->setMessage(Mage::helper('paypal')->__('PayPal gateway has rejected request. %s', $errors)); + throw $e; } - - return $errors; } /** @@ -1231,8 +1160,18 @@ protected function _exportAddressses($data) Varien_Object_Mapper::accumulateByMap($data, $shippingAddress, $this->_shippingAddressMap); $this->_applyStreetAndRegionWorkarounds($shippingAddress); // PayPal doesn't provide detailed shipping name fields, so the name will be overwritten + $firstName = $data['SHIPTONAME']; + $lastName = null; + if (isset($data['FIRSTNAME']) && $data['LASTNAME']) { + $firstName = $data['FIRSTNAME']; + $lastName = $data['LASTNAME']; + } $shippingAddress->addData(array( - 'firstname' => $data['SHIPTONAME'], + 'prefix' => null, + 'firstname' => $firstName, + 'middlename' => null, + 'lastname' => $lastName, + 'suffix' => null, )); $this->setExportedShippingAddress($shippingAddress); } diff --git a/app/code/core/Mage/Paypal/Model/Api/ProcessableException.php b/app/code/core/Mage/Paypal/Model/Api/ProcessableException.php deleted file mode 100644 index d2774be4f..000000000 --- a/app/code/core/Mage/Paypal/Model/Api/ProcessableException.php +++ /dev/null @@ -1,69 +0,0 @@ -getCode()) { - case self::API_INTERNAL_ERROR: - case self::API_UNABLE_PROCESS_PAYMENT_ERROR_CODE: - $message = Mage::helper('paypal')->__("I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you."); - break; - case self::API_COUNTRY_FILTER_DECLINE: - case self::API_MAXIMUM_AMOUNT_FILTER_DECLINE: - case self::API_OTHER_FILTER_DECLINE: - $message = Mage::helper('paypal')->__("I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."); - break; - default: - $message = $this->getMessage(); - } - - return $message; - } -} diff --git a/app/code/core/Mage/Paypal/Model/Api/Standard.php b/app/code/core/Mage/Paypal/Model/Api/Standard.php index 927c30148..2886801cc 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Standard.php +++ b/app/code/core/Mage/Paypal/Model/Api/Standard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Bml.php b/app/code/core/Mage/Paypal/Model/Bml.php deleted file mode 100644 index 45e5b52d0..000000000 --- a/app/code/core/Mage/Paypal/Model/Bml.php +++ /dev/null @@ -1,53 +0,0 @@ -isMethodActive(self::METHOD_WPP_EXPRESS)) { - $result = false; - } - break; case self::METHOD_WPP_PE_EXPRESS: // check for direct payments dependence if ($this->isMethodActive(self::METHOD_WPP_PE_DIRECT)) { @@ -393,12 +370,6 @@ public function isMethodAvailable($methodCode = null) $result = false; } break; - case self::METHOD_WPP_PE_BML: - // check for express payments dependence - if (!$this->isMethodActive(self::METHOD_WPP_PE_EXPRESS)) { - $result = false; - } - break; case self::METHOD_BILLING_AGREEMENT: $result = $this->isWppApiAvailabe(); break; @@ -515,7 +486,6 @@ public function getCountryMethods($countryCode = null) 'other' => array( self::METHOD_WPS, self::METHOD_WPP_EXPRESS, - self::METHOD_BML, self::METHOD_BILLING_AGREEMENT, ), 'US' => array( @@ -525,10 +495,8 @@ public function getCountryMethods($countryCode = null) self::METHOD_PAYFLOWPRO, self::METHOD_PAYFLOWLINK, self::METHOD_WPP_EXPRESS, - self::METHOD_BML, self::METHOD_BILLING_AGREEMENT, self::METHOD_WPP_PE_EXPRESS, - self::METHOD_WPP_PE_BML, ), 'CA' => array( self::METHOD_WPP_DIRECT, @@ -536,7 +504,6 @@ public function getCountryMethods($countryCode = null) self::METHOD_PAYFLOWPRO, self::METHOD_PAYFLOWLINK, self::METHOD_WPP_EXPRESS, - self::METHOD_BML, self::METHOD_BILLING_AGREEMENT, ), 'GB' => array( @@ -545,97 +512,57 @@ public function getCountryMethods($countryCode = null) self::METHOD_WPP_PE_DIRECT, self::METHOD_HOSTEDPRO, self::METHOD_WPP_EXPRESS, - self::METHOD_BML, self::METHOD_BILLING_AGREEMENT, self::METHOD_WPP_PE_EXPRESS, - self::METHOD_WPP_PE_BML, ), 'AU' => array( self::METHOD_WPS, self::METHOD_PAYFLOWPRO, self::METHOD_HOSTEDPRO, self::METHOD_WPP_EXPRESS, - self::METHOD_BML, self::METHOD_BILLING_AGREEMENT, ), 'NZ' => array( self::METHOD_WPS, self::METHOD_PAYFLOWPRO, self::METHOD_WPP_EXPRESS, - self::METHOD_BML, self::METHOD_BILLING_AGREEMENT, ), 'JP' => array( self::METHOD_WPS, self::METHOD_HOSTEDPRO, self::METHOD_WPP_EXPRESS, - self::METHOD_BML, self::METHOD_BILLING_AGREEMENT, ), 'FR' => array( self::METHOD_WPS, self::METHOD_HOSTEDPRO, self::METHOD_WPP_EXPRESS, - self::METHOD_BML, self::METHOD_BILLING_AGREEMENT, ), 'IT' => array( self::METHOD_WPS, self::METHOD_HOSTEDPRO, self::METHOD_WPP_EXPRESS, - self::METHOD_BML, self::METHOD_BILLING_AGREEMENT, ), 'ES' => array( self::METHOD_WPS, self::METHOD_HOSTEDPRO, self::METHOD_WPP_EXPRESS, - self::METHOD_BML, self::METHOD_BILLING_AGREEMENT, ), 'HK' => array( self::METHOD_WPS, self::METHOD_HOSTEDPRO, self::METHOD_WPP_EXPRESS, - self::METHOD_BML, self::METHOD_BILLING_AGREEMENT, ), ); if ($countryCode === null) { return $countryMethods; } - return isset($countryMethods[$countryCode]) ? $countryMethods[$countryCode] : $countryMethods['other']; - } - - /** - * Return start url for PayPal Basic - * - * @param string $token - * @return string - */ - public function getPayPalBasicStartUrl($token) - { - $params = array( - 'cmd' => '_express-checkout', - 'token' => $token, - ); - - if ($this->isOrderReviewStepDisabled()) { - $params['useraction'] = 'commit'; - } - - return $this->getPaypalUrl($params); - } - - /** - * Check whether order review step enabled in configuration - * - * @return bool - */ - public function isOrderReviewStepDisabled() - { - return Mage::getStoreConfigFlag(self::XML_PATH_PAYPAL_EXPRESS_SKIP_ORDER_REVIEW_STEP_FLAG); - } + return isset($countryMethods[$countryCode]) ? $countryMethods[$countryCode] : $countryMethods['other']; } /** * Get url for dispatching customer to express checkout start @@ -651,20 +578,6 @@ public function getExpressCheckoutStartUrl($token) )); } - /** - * Get url for dispatching customer to checkout retrial - * - * @param string $orderId - * @return string - */ - public function getExpressCheckoutOrderUrl($orderId) - { - return $this->getPaypalUrl(array( - 'cmd' => '_express-checkout', - 'order_id' => $orderId, - )); - } - /** * Get url that allows to edit checkout details on paypal side * @@ -911,11 +824,21 @@ public function getAdditionalOptionsLogoUrl($localeCode, $type = false) /** * BN code getter * - * @return mixed + * @param string $countryCode ISO 3166-1 */ - public function getBuildNotationCode() + public function getBuildNotationCode($countryCode = null) { - return Mage::getStoreConfig("paypal/bncode", $this->_storeId); + $product = 'WPP'; + if ($this->_methodCode && isset($this->_buildNotationPPMap[$this->_methodCode])) { + $product = $this->_buildNotationPPMap[$this->_methodCode]; + } + if (null === $countryCode) { + $countryCode = $this->_matchBnCountryCode($this->getMerchantCountry()); + } + if ($countryCode) { + $countryCode = '_' . $countryCode; + } + return sprintf('Varien_Cart_%s%s', $product, $countryCode); } /** @@ -1219,12 +1142,6 @@ protected function _getSpecificConfigPath($fieldName) case self::METHOD_WPS: $path = $this->_mapStandardFieldset($fieldName); break; - case self::METHOD_BML: - $path = $this->_mapBmlFieldset($fieldName); - break; - case self::METHOD_WPP_PE_BML: - $path = $this->_mapBmlUkFieldset($fieldName); - break; case self::METHOD_WPP_EXPRESS: case self::METHOD_WPP_PE_EXPRESS: $path = $this->_mapExpressFieldset($fieldName); @@ -1242,7 +1159,6 @@ protected function _getSpecificConfigPath($fieldName) if ($path === null) { switch ($this->_methodCode) { case self::METHOD_WPP_EXPRESS: - case self::METHOD_BML: case self::METHOD_WPP_DIRECT: case self::METHOD_BILLING_AGREEMENT: case self::METHOD_HOSTEDPRO: @@ -1329,40 +1245,6 @@ protected function _mapExpressFieldset($fieldName) } } - /** - * Map PayPal Express Bill Me Later config fields - * - * @param string $fieldName - * @return string|null - */ - protected function _mapBmlFieldset($fieldName) - { - switch ($fieldName) - { - case 'allow_ba_signup': - return "payment/" . self::METHOD_WPP_EXPRESS . "/{$fieldName}"; - default: - return $this->_mapExpressFieldset($fieldName); - } - } - - /** - * Map PayPal Express Bill Me Later config fields (Payflow Edition) - * - * @param string $fieldName - * @return string|null - */ - protected function _mapBmlUkFieldset($fieldName) - { - switch ($fieldName) - { - case 'allow_ba_signup': - return "payment/" . self::METHOD_WPP_PE_EXPRESS . "/{$fieldName}"; - default: - return $this->_mapExpressFieldset($fieldName); - } - } - /** * Map PayPal Direct config fields * @@ -1533,54 +1415,5 @@ public function getApiCertificate() $websiteId = Mage::app()->getStore($this->_storeId)->getWebsiteId(); return Mage::getModel('paypal/cert')->loadByWebsite($websiteId, false)->getCertPath(); } - - - /** - * Get PublisherId from stored config - * - * @return mixed - */ - public function getBmlPublisherId() - { - return Mage::getStoreConfig('payment/paypal_express_bml/publisher_id', $this->_storeId); - } - - /** - * Get Display option from stored config - * @param $section - * - * @return mixed - */ - public function getBmlDisplay($section) - { - $display = Mage::getStoreConfig('payment/paypal_express_bml/'.$section.'_display', $this->_storeId); - $ecActive = Mage::getStoreConfig('payment/paypal_express/active', $this->_storeId); - $ecUkActive = Mage::getStoreConfig('payment/paypaluk_express/active', $this->_storeId); - $bmlActive = Mage::getStoreConfig('payment/paypal_express_bml/active', $this->_storeId); - $bmlUkActive = Mage::getStoreConfig('payment/paypaluk_express_bml/active', $this->_storeId); - return (($bmlActive && $ecActive) || ($bmlUkActive && $ecUkActive)) ? $display : 0; - } - - /** - * Get Position option from stored config - * @param $section - * - * @return mixed - */ - public function getBmlPosition($section) - { - return Mage::getStoreConfig('payment/paypal_express_bml/'.$section.'_position', $this->_storeId); - } - - /** - * Get Size option from stored config - * @param $section - * - * @return mixed - */ - public function getBmlSize($section) - { - return Mage::getStoreConfig('payment/paypal_express_bml/'.$section.'_size', $this->_storeId); - } } diff --git a/app/code/core/Mage/Paypal/Model/Direct.php b/app/code/core/Mage/Paypal/Model/Direct.php index b5e306b8d..441e7e612 100644 --- a/app/code/core/Mage/Paypal/Model/Direct.php +++ b/app/code/core/Mage/Paypal/Model/Direct.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Express.php b/app/code/core/Mage/Paypal/Model/Express.php index 16ff8afb6..f63018de0 100644 --- a/app/code/core/Mage/Paypal/Model/Express.php +++ b/app/code/core/Mage/Paypal/Model/Express.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -88,28 +88,6 @@ public function __construct($params = array()) $this->_pro = Mage::getModel($this->_proType); } $this->_pro->setMethod($this->_code); - $this->_setApiProcessableErrors(); - } - - /** - * Set processable error codes to API model - * - * @return Mage_Paypal_Model_Api_Nvp - */ - protected function _setApiProcessableErrors() - { - return $this->_pro->getApi()->setProcessableErrors( - array( - Mage_Paypal_Model_Api_ProcessableException::API_INTERNAL_ERROR, - Mage_Paypal_Model_Api_ProcessableException::API_UNABLE_PROCESS_PAYMENT_ERROR_CODE, - Mage_Paypal_Model_Api_ProcessableException::API_DO_EXPRESS_CHECKOUT_FAIL, - Mage_Paypal_Model_Api_ProcessableException::API_UNABLE_TRANSACTION_COMPLETE, - Mage_Paypal_Model_Api_ProcessableException::API_TRANSACTION_EXPIRED, - Mage_Paypal_Model_Api_ProcessableException::API_MAX_PAYMENT_ATTEMPTS_EXCEEDED, - Mage_Paypal_Model_Api_ProcessableException::API_COUNTRY_FILTER_DECLINE, - Mage_Paypal_Model_Api_ProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE, - Mage_Paypal_Model_Api_ProcessableException::API_OTHER_FILTER_DECLINE - )); } /** @@ -199,12 +177,7 @@ public function getConfigData($field, $storeId = null) */ public function order(Varien_Object $payment, $amount) { - $paypalTransactionData = Mage::getSingleton('checkout/session')->getPaypalTransactionData(); - if (!is_array($paypalTransactionData)) { - $this->_placeOrder($payment, $amount); - } else { - $this->_importToPayment($this->_pro->getApi()->setData($paypalTransactionData), $payment); - } + $this->_placeOrder($payment, $amount); $payment->setAdditionalInformation($this->_isOrderPaymentActionKey, true); @@ -215,7 +188,7 @@ public function order(Varien_Object $payment, $amount) $order = $payment->getOrder(); $orderTransactionId = $payment->getTransactionId(); - $api = $this->_callDoAuthorize($amount, $payment, $orderTransactionId); + $api = $this->_callDoAuthorize($amount, $payment, $payment->getTransactionId()); $state = Mage_Sales_Model_Order::STATE_PROCESSING; $status = true; @@ -575,7 +548,14 @@ protected function _placeOrder(Mage_Sales_Model_Order_Payment $payment, $amount) ->setInvNum($order->getIncrementId()) ->setCurrencyCode($order->getBaseCurrencyCode()) ->setPaypalCart(Mage::getModel('paypal/cart', array($order))) - ->setIsLineItemsEnabled($this->_pro->getConfig()->lineItemsEnabled); + ->setIsLineItemsEnabled($this->_pro->getConfig()->lineItemsEnabled) + ; + if ($order->getIsVirtual()) { + $api->setAddress($order->getBillingAddress())->setSuppressShipping(true); + } else { + $api->setAddress($order->getShippingAddress()); + $api->setBillingAddress($order->getBillingAddress()); + } // call api and get details from it $api->callDoExpressCheckoutPayment(); @@ -671,19 +651,10 @@ public function canCapture() * @param Varien_Object $payment * @param string $parentTransactionId * @return Mage_Paypal_Model_Api_Abstract - * @throws Mage_Paypal_Model_Api_ProcessableException */ protected function _callDoAuthorize($amount, $payment, $parentTransactionId) { - $apiData = $this->_pro->getApi()->getData(); - foreach ($apiData as $k => $v) { - if (is_object($v)) { - unset($apiData[$k]); - } - } - Mage::getSingleton('checkout/session')->setPaypalTransactionData($apiData); - $this->_pro->resetApi(); - $api = $this->_setApiProcessableErrors() + $api = $this->_pro->resetApi()->getApi() ->setAmount($amount) ->setCurrencyCode($payment->getOrder()->getBaseCurrencyCode()) ->setTransactionId($parentTransactionId) diff --git a/app/code/core/Mage/Paypal/Model/Express/Checkout.php b/app/code/core/Mage/Paypal/Model/Express/Checkout.php index f24f28015..b51d7eb60 100644 --- a/app/code/core/Mage/Paypal/Model/Express/Checkout.php +++ b/app/code/core/Mage/Paypal/Model/Express/Checkout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,13 +48,6 @@ class Mage_Paypal_Model_Express_Checkout const PAYMENT_INFO_TRANSPORT_REDIRECT = 'paypal_express_checkout_redirect_required'; const PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT = 'paypal_ec_create_ba'; - /** - * Flag which says that was used PayPal Express Checkout button for checkout - * Uses additional_information as storage - * @var string - */ - const PAYMENT_INFO_BUTTON = 'button'; - /** * @var Mage_Sales_Model_Quote */ @@ -113,13 +106,6 @@ class Mage_Paypal_Model_Express_Checkout */ protected $_isBARequested = false; - /** - * Flag for Bill Me Later mode - * - * @var bool - */ - protected $_isBml = false; - /** * Customer ID * @@ -164,8 +150,7 @@ public function __construct($params = array()) } else { throw new Exception('Config instance is required.'); } - $this->_customerSession = isset($params['session']) && $params['session'] instanceof Mage_Customer_Model_Session - ? $params['session'] : Mage::getSingleton('customer/session'); + $this->_customerSession = Mage::getSingleton('customer/session'); } /** @@ -242,16 +227,6 @@ public function setCustomerId($id) return $this; } - /** - * Set flag that forces to use BillMeLater - * - * @param bool $isBml - */ - public function setIsBml($isBml) - { - $this->_isBml = $isBml; - } - /** * Setter for customer * @@ -285,10 +260,9 @@ public function setCustomerWithAddressChange($customer, $billingAddress = null, * * @param string $returnUrl * @param string $cancelUrl - * @param bool|null $button * @return mixed */ - public function start($returnUrl, $cancelUrl, $button = null) + public function start($returnUrl, $cancelUrl) { $this->_quote->collectTotals(); @@ -299,16 +273,14 @@ public function start($returnUrl, $cancelUrl, $button = null) $this->_quote->reserveOrderId()->save(); // prepare API $this->_getApi(); - $solutionType = $this->_config->getMerchantCountry() == 'DE' - ? Mage_Paypal_Model_Config::EC_SOLUTION_TYPE_MARK : $this->_config->solutionType; $this->_api->setAmount($this->_quote->getBaseGrandTotal()) ->setCurrencyCode($this->_quote->getBaseCurrencyCode()) ->setInvNum($this->_quote->getReservedOrderId()) ->setReturnUrl($returnUrl) ->setCancelUrl($cancelUrl) - ->setSolutionType($solutionType) - ->setPaymentAction($this->_config->paymentAction); - + ->setSolutionType($this->_config->solutionType) + ->setPaymentAction($this->_config->paymentAction) + ; if ($this->_giropayUrls) { list($successUrl, $cancelUrl, $pendingUrl) = $this->_giropayUrls; $this->_api->addData(array( @@ -318,10 +290,6 @@ public function start($returnUrl, $cancelUrl, $button = null) )); } - if ($this->_isBml) { - $this->_api->setFundingSource('BML'); - } - $this->_setBillingAgreementRequest(); if ($this->_config->requireBillingAddress == Mage_Paypal_Model_Config::REQUIRE_BILLING_ADDRESS_ALL) { @@ -380,34 +348,13 @@ public function start($returnUrl, $cancelUrl, $button = null) // call API and redirect with token $this->_api->callSetExpressCheckout(); $token = $this->_api->getToken(); - $this->_redirectUrl = $button ? $this->_config->getExpressCheckoutStartUrl($token) - : $this->_config->getPayPalBasicStartUrl($token); + $this->_redirectUrl = $this->_config->getExpressCheckoutStartUrl($token); $this->_quote->getPayment()->unsAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT); - - // Set flag that we came from Express Checkout button - if (!empty($button)) { - $this->_quote->getPayment()->setAdditionalInformation(self::PAYMENT_INFO_BUTTON, 1); - } elseif ($this->_quote->getPayment()->hasAdditionalInformation(self::PAYMENT_INFO_BUTTON)) { - $this->_quote->getPayment()->unsAdditionalInformation(self::PAYMENT_INFO_BUTTON); - } - $this->_quote->getPayment()->save(); return $token; } - /** - * Check whether system can skip order review page before placing order - * - * @return bool - */ - public function canSkipOrderReviewStep() - { - $isOnepageCheckout = !$this->_quote->getPayment() - ->getAdditionalInformation(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_BUTTON); - return $this->_config->isOrderReviewStepDisabled() && $isOnepageCheckout; - } - /** * Update quote when returned from PayPal * rewrite billing address by paypal @@ -425,20 +372,25 @@ public function returnFromPaypal($token) $this->_ignoreAddressValidation(); + // import billing address + $billingAddress = $quote->getBillingAddress(); + $exportedBillingAddress = $this->_api->getExportedBillingAddress(); + $quote->setCustomerEmail($billingAddress->getEmail()); + $quote->setCustomerPrefix($billingAddress->getPrefix()); + $quote->setCustomerFirstname($billingAddress->getFirstname()); + $quote->setCustomerMiddlename($billingAddress->getMiddlename()); + $quote->setCustomerLastname($billingAddress->getLastname()); + $quote->setCustomerSuffix($billingAddress->getSuffix()); + $quote->setCustomerNote($exportedBillingAddress->getData('note')); + $this->_setExportedAddressData($billingAddress, $exportedBillingAddress); + // import shipping address $exportedShippingAddress = $this->_api->getExportedShippingAddress(); if (!$quote->getIsVirtual()) { $shippingAddress = $quote->getShippingAddress(); if ($shippingAddress) { - if ($exportedShippingAddress - && $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1 - ) { + if ($exportedShippingAddress) { $this->_setExportedAddressData($shippingAddress, $exportedShippingAddress); - // PayPal doesn't provide detailed shipping info: prefix, middlename, lastname, suffix - $shippingAddress->setPrefix(null); - $shippingAddress->setMiddlename(null); - $shippingAddress->setLastname(null); - $shippingAddress->setSuffix(null); $shippingAddress->setCollectShippingRates(true); $shippingAddress->setSameAsBilling(0); } @@ -458,26 +410,6 @@ public function returnFromPaypal($token) } } - // import billing address - $portBillingFromShipping = $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1 - && $this->_config->requireBillingAddress != Mage_Paypal_Model_Config::REQUIRE_BILLING_ADDRESS_ALL - && !$quote->isVirtual(); - if ($portBillingFromShipping) { - $billingAddress = clone $shippingAddress; - $billingAddress->unsAddressId() - ->unsAddressType(); - $data = $billingAddress->getData(); - $data['save_in_address_book'] = 0; - $quote->getBillingAddress()->addData($data); - $quote->getShippingAddress()->setSameAsBilling(1); - } else { - $billingAddress = $quote->getBillingAddress(); - } - $exportedBillingAddress = $this->_api->getExportedBillingAddress(); - $this->_setExportedAddressData($billingAddress, $exportedBillingAddress); - $billingAddress->setCustomerNotes($exportedBillingAddress->getData('note')); - $quote->setBillingAddress($billingAddress); - // import payment info $payment = $quote->getPayment(); $payment->setMethod($this->_methodType); @@ -559,9 +491,40 @@ public function updateShippingMethod($methodCode) if ($methodCode != $shippingAddress->getShippingMethod()) { $this->_ignoreAddressValidation(); $shippingAddress->setShippingMethod($methodCode)->setCollectShippingRates(true); - $this->_quote->collectTotals()->save(); + $this->_quote->collectTotals(); + } + } + } + + /** + * Update order data + * + * @param array $data + */ + public function updateOrder($data) + { + /** @var $checkout Mage_Checkout_Model_Type_Onepage */ + $checkout = Mage::getModel('checkout/type_onepage'); + + $this->_quote->setTotalsCollectedFlag(true); + $checkout->setQuote($this->_quote); + if (isset($data['billing'])) { + if (isset($data['customer-email'])) { + $data['billing']['email'] = $data['customer-email']; } + $checkout->saveBilling($data['billing'], 0); + } + if (!$this->_quote->getIsVirtual() && isset($data['shipping'])) { + $checkout->saveShipping($data['shipping'], 0); } + + if (isset($data['shipping_method'])) { + $this->updateShippingMethod($data['shipping_method']); + } + $this->_quote->setTotalsCollectedFlag(false); + $this->_quote->collectTotals(); + $this->_quote->setDataChanges(true); + $this->_quote->save(); } /** @@ -718,31 +681,20 @@ public function getCheckoutMethod() */ protected function _setExportedAddressData($address, $exportedAddress) { - // Exported data is more priority if we came from Express Checkout button - $isButton = (bool)$this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON); - if (!$isButton) { - foreach ($exportedAddress->getExportedKeys() as $key) { - $oldData = $address->getDataUsingMethod($key); - $isEmpty = null; - if (is_array($oldData)) { - foreach($oldData as $val) { - if(!empty($val)) { - $isEmpty = false; - break; - } - $isEmpty = true; + foreach ($exportedAddress->getExportedKeys() as $key) { + $oldData = $address->getDataUsingMethod($key); + $isEmpty = null; + if (is_array($oldData)) { + foreach($oldData as $val) { + if(!empty($val)) { + $isEmpty = false; + break; } - } - if (empty($oldData) || $isEmpty === true) { - $address->setDataUsingMethod($key, $exportedAddress->getData($key)); + $isEmpty = true; } } - } else { - foreach ($exportedAddress->getExportedKeys() as $key) { - $data = $exportedAddress->getData($key); - if (!empty($data)) { - $address->setDataUsingMethod($key, $data); - } + if (empty($oldData) || $isEmpty === true) { + $address->setDataUsingMethod($key, $exportedAddress->getData($key)); } } } diff --git a/app/code/core/Mage/Paypal/Model/Hostedpro.php b/app/code/core/Mage/Paypal/Model/Hostedpro.php index 9860af6b0..3ec9c0301 100644 --- a/app/code/core/Mage/Paypal/Model/Hostedpro.php +++ b/app/code/core/Mage/Paypal/Model/Hostedpro.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php b/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php index 05fdc6ef7..e0264aabb 100644 --- a/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php +++ b/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -156,18 +156,17 @@ protected function _getPaymentData(Mage_Paypal_Model_Hostedpro $paymentMethod) protected function _getOrderData(Mage_Sales_Model_Order $order) { $request = array( - 'subtotal' => $this->_formatPrice($order->getBaseSubtotal()), + 'subtotal' => $this->_formatPrice( + $this->_formatPrice($order->getPayment()->getBaseAmountAuthorized()) - + $this->_formatPrice($order->getBaseTaxAmount()) - + $this->_formatPrice($order->getBaseShippingAmount()) + ), 'tax' => $this->_formatPrice($order->getBaseTaxAmount()), 'shipping' => $this->_formatPrice($order->getBaseShippingAmount()), 'invoice' => $order->getIncrementId(), 'address_override' => 'true', 'currency_code' => $order->getBaseCurrencyCode(), - 'buyer_email' => $order->getCustomerEmail(), - 'discount' => $this->_formatPrice( - $order->getBaseGiftCardsAmount() - + abs($order->getBaseDiscountAmount()) - + $order->getBaseCustomerBalanceAmount() - ), + 'buyer_email' => $order->getCustomerEmail() ); // append to request billing address data diff --git a/app/code/core/Mage/Paypal/Model/Info.php b/app/code/core/Mage/Paypal/Model/Info.php index bf1d8f7e1..b495e34eb 100644 --- a/app/code/core/Mage/Paypal/Model/Info.php +++ b/app/code/core/Mage/Paypal/Model/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Ipn.php b/app/code/core/Mage/Paypal/Model/Ipn.php index 949c91cbc..b4e794d15 100644 --- a/app/code/core/Mage/Paypal/Model/Ipn.php +++ b/app/code/core/Mage/Paypal/Model/Ipn.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -130,33 +130,33 @@ public function processIpnRequest(array $request, Zend_Http_Client_Adapter_Inter */ protected function _postBack(Zend_Http_Client_Adapter_Interface $httpAdapter) { - $postbackQuery = http_build_query($this->_request) . '&cmd=_notify-validate'; - $postbackUrl = $this->_config->getPaypalUrl(); - $this->_debugData['postback_to'] = $postbackUrl; - - $httpAdapter->setConfig(array('verifypeer' => $this->_config->verifyPeer)); - $httpAdapter->write( - Zend_Http_Client::POST, - $postbackUrl, - '1.1', - array('Connection: close'), - $postbackQuery - ); - - try { - $postbackResult = $httpAdapter->read(); - } catch (Exception $e) { - $this->_debugData['http_error'] = array('error' => $e->getMessage(), 'code' => $e->getCode()); - throw $e; - } + $sReq = ''; + foreach ($this->_request as $k => $v) { + $sReq .= '&'.$k.'='.urlencode($v); + } + $sReq .= "&cmd=_notify-validate"; + $sReq = substr($sReq, 1); + $this->_debugData['postback'] = $sReq; + $this->_debugData['postback_to'] = $this->_config->getPaypalUrl(); + + $httpAdapter->setConfig(array('verifypeer' => $this->_config->verifyPeer)); + $httpAdapter->write(Zend_Http_Client::POST, $this->_config->getPaypalUrl(), '1.1', array( + 'Connection: close', + ), $sReq); + try { + $response = $httpAdapter->read(); + } catch (Exception $e) { + $this->_debugData['http_error'] = array('error' => $e->getMessage(), 'code' => $e->getCode()); + throw $e; + } + $this->_debugData['postback_result'] = $response; - $response = preg_split('/^\r?$/m', $postbackResult, 2); - $response = trim($response[1]); - if ($response != 'VERIFIED') { - $this->_debugData['postback'] = $postbackQuery; - $this->_debugData['postback_result'] = $postbackResult; - throw new Exception('PayPal IPN postback failure. See ' . self::DEFAULT_LOG_FILE . ' for details.'); - } + $response = preg_split('/^\r?$/m', $response, 2); + $response = trim($response[1]); + if ($response != 'VERIFIED') { + throw new Exception('PayPal IPN postback failure. See ' . self::DEFAULT_LOG_FILE . ' for details.'); + } + unset($this->_debugData['postback'], $this->_debugData['postback_result']); } /** @@ -281,6 +281,59 @@ protected function _processOrder() $comment->save(); throw $e; } + +// switch ($paymentStatus) { +// // paid +// case Mage_Paypal_Model_Info::PAYMENTSTATUS_COMPLETED: +// $this->_registerPaymentCapture(); +// break; +// +// // the holded payment was denied on paypal side +// case Mage_Paypal_Model_Info::PAYMENTSTATUS_DENIED: +// $this->_registerPaymentDenial(); +// break; +// +// // customer attempted to pay via bank account, but failed +// case Mage_Paypal_Model_Info::PAYMENTSTATUS_FAILED: +// // cancel order +// $this->_registerPaymentFailure(); +// break; +// +// // refund forced by PayPal +// case Mage_Paypal_Model_Info::PAYMENTSTATUS_REVERSED: // break is intentionally omitted +// case Mage_Paypal_Model_Info::PAYMENTSTATUS_UNREVERSED: // or returned back :) +// $this->_registerPaymentReversal(); +// break; +// +// // refund by merchant on PayPal side +// case Mage_Paypal_Model_Info::PAYMENTSTATUS_REFUNDED: +// $this->_registerPaymentRefund(); +// break; +// +// // payment was obtained, but money were not captured yet +// case Mage_Paypal_Model_Info::PAYMENTSTATUS_PENDING: +// $this->_registerPaymentPending(); +// break; +// +// // MassPayments success +// case Mage_Paypal_Model_Info::PAYMENTSTATUS_PROCESSED: +// $this->_registerMasspaymentsSuccess(); +// break; +// +// // authorization expire/void +// case Mage_Paypal_Model_Info::PAYMENTSTATUS_EXPIRED: // break is intentionally omitted +// case Mage_Paypal_Model_Info::PAYMENTSTATUS_VOIDED: +// $this->_registerPaymentVoid(); +// break; +// +// default: +// throw new Exception("Cannot handle payment status '{$paymentStatus}'."); +// } +// } catch (Mage_Core_Exception $e) { +// $comment = $this->_createIpnComment(Mage::helper('paypal')->__('Note: %s', $e->getMessage()), true); +// $comment->save(); +// throw $e; +// } } /** @@ -428,7 +481,6 @@ protected function _registerRecurringProfilePaymentCapture() $payment = $order->getPayment(); $payment->setTransactionId($this->getRequestData('txn_id')) - ->setCurrencyCode($this->getRequestData('mc_currency')) ->setPreparedMessage($this->_createIpnComment('')) ->setIsTransactionClosed(0); $order->save(); @@ -460,7 +512,6 @@ protected function _registerPaymentCapture($skipFraudDetection = false) $this->_importPaymentInformation(); $payment = $this->_order->getPayment(); $payment->setTransactionId($this->getRequestData('txn_id')) - ->setCurrencyCode($this->getRequestData('mc_currency')) ->setPreparedMessage($this->_createIpnComment('')) ->setParentTransactionId($parentTransactionId) ->setShouldCloseParentTransaction('Completed' === $this->getRequestData('auth_status')) @@ -608,10 +659,8 @@ protected function _registerPaymentAuthorization() ->setPreparedMessage($this->_createIpnComment('')) ->setTransactionId($this->getRequestData('txn_id')) ->setParentTransactionId($this->getRequestData('parent_txn_id')) - ->setCurrencyCode($this->getRequestData('mc_currency')) ->setIsTransactionClosed(0) ->registerAuthorizationNotification($this->getRequestData('mc_gross')); - if (!$this->_order->getEmailSent()) { $this->_order->sendNewOrderEmail(); } diff --git a/app/code/core/Mage/Paypal/Model/Method/Agreement.php b/app/code/core/Mage/Paypal/Model/Method/Agreement.php index c9eeb5c0f..4d40d8d4d 100644 --- a/app/code/core/Mage/Paypal/Model/Method/Agreement.php +++ b/app/code/core/Mage/Paypal/Model/Method/Agreement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php b/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php index 00e5a0db2..c44983bee 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php index 1938feb75..9871cc4c1 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php index 02c9e2a48..2af387538 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php index 1465be761..ebce16f90 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php b/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php index 52046e532..187c6ea36 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Observer.php b/app/code/core/Mage/Paypal/Model/Observer.php index 4233b12ae..0cae18042 100644 --- a/app/code/core/Mage/Paypal/Model/Observer.php +++ b/app/code/core/Mage/Paypal/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -127,7 +127,16 @@ public function setResponseAfterSaveOrder(Varien_Event_Observer $observer) */ public function loadCountryDependentSolutionsConfig(Varien_Event_Observer $observer) { - $countryCode = Mage::helper('paypal')->getConfigurationCountryCode(); + $requestParam = Mage_Paypal_Block_Adminhtml_System_Config_Field_Country::REQUEST_PARAM_COUNTRY; + $countryCode = Mage::app()->getRequest()->getParam($requestParam); + if (is_null($countryCode) || preg_match('/^[a-zA-Z]{2}$/', $countryCode) == 0) { + $countryCode = (string)Mage::getSingleton('adminhtml/config_data') + ->getConfigDataValue('paypal/general/merchant_country'); + } + if (empty($countryCode)) { + $countryCode = Mage::helper('core')->getDefaultCountry(); + } + $paymentGroups = $observer->getEvent()->getConfig()->getNode('sections/payment/groups'); $paymentsConfigs = $paymentGroups->xpath('paypal_payments/*/backend_config/' . $countryCode); if ($paymentsConfigs) { diff --git a/app/code/core/Mage/Paypal/Model/Payflow/Request.php b/app/code/core/Mage/Paypal/Model/Payflow/Request.php index 7d580cd05..56cf2b46a 100644 --- a/app/code/core/Mage/Paypal/Model/Payflow/Request.php +++ b/app/code/core/Mage/Paypal/Model/Payflow/Request.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Payflowadvanced.php b/app/code/core/Mage/Paypal/Model/Payflowadvanced.php index ddec195a4..a990b4b63 100644 --- a/app/code/core/Mage/Paypal/Model/Payflowadvanced.php +++ b/app/code/core/Mage/Paypal/Model/Payflowadvanced.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Payflowlink.php b/app/code/core/Mage/Paypal/Model/Payflowlink.php index d683ef8d6..668347d21 100644 --- a/app/code/core/Mage/Paypal/Model/Payflowlink.php +++ b/app/code/core/Mage/Paypal/Model/Payflowlink.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -440,14 +440,12 @@ protected function _buildBasicRequest(Varien_Object $payment) { $request = Mage::getModel('paypal/payflow_request'); $cscEditable = $this->getConfigData('csc_editable'); - $bnCode = Mage::getModel('paypal/config')->getBuildNotationCode(); $request ->setUser($this->getConfigData('user', $this->_getStoreId())) ->setVendor($this->getConfigData('vendor', $this->_getStoreId())) ->setPartner($this->getConfigData('partner', $this->_getStoreId())) ->setPwd($this->getConfigData('pwd', $this->_getStoreId())) ->setVerbosity($this->getConfigData('verbosity', $this->_getStoreId())) - ->setData('BNCODE', $bnCode) ->setTender(self::TENDER_CC) ->setCancelurl(http://github.com/$this-%3E_getCallbackUrl('cancelPayment')) ->setErrorurl(http://github.com/$this-%3E_getCallbackUrl('returnUrl')) diff --git a/app/code/core/Mage/Paypal/Model/Payflowpro.php b/app/code/core/Mage/Paypal/Model/Payflowpro.php index 42e8737ba..db9a2fe1b 100644 --- a/app/code/core/Mage/Paypal/Model/Payflowpro.php +++ b/app/code/core/Mage/Paypal/Model/Payflowpro.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -512,14 +512,12 @@ protected function _buildPlaceRequest(Varien_Object $payment, $amount) protected function _buildBasicRequest(Varien_Object $payment) { $request = new Varien_Object(); - $bnCode = Mage::getModel('paypal/config')->getBuildNotationCode(); $request ->setUser($this->getConfigData('user')) ->setVendor($this->getConfigData('vendor')) ->setPartner($this->getConfigData('partner')) ->setPwd($this->getConfigData('pwd')) ->setVerbosity($this->getConfigData('verbosity')) - ->setData('BNCODE', $bnCode) ->setTender(self::TENDER_CC) ->setRequestId($this->_generateRequestId()); return $request; diff --git a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php index 3a613ae3b..ac57b1444 100644 --- a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php +++ b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Pro.php b/app/code/core/Mage/Paypal/Model/Pro.php index e48943359..280dac8f3 100644 --- a/app/code/core/Mage/Paypal/Model/Pro.php +++ b/app/code/core/Mage/Paypal/Model/Pro.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Report/Settlement.php index 62eb78cba..05a779b85 100644 --- a/app/code/core/Mage/Paypal/Model/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Report/Settlement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php b/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php index 80cbf2f29..c9a7d0539 100644 --- a/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php +++ b/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Resource/Cert.php b/app/code/core/Mage/Paypal/Model/Resource/Cert.php index ac798f533..3687b7603 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Cert.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Cert.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php index 858b8cf91..533515a2a 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php index 5f2d07dc7..b8e3327af 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php index aaa267ab8..ee07d7412 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row.php index 4cc52b980..f887dbae8 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php index b813fa339..b73956a58 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Resource/Setup.php b/app/code/core/Mage/Paypal/Model/Resource/Setup.php index c9d58ad5b..10b364569 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Setup.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Session.php b/app/code/core/Mage/Paypal/Model/Session.php index 349d19168..0899dd0a0 100644 --- a/app/code/core/Mage/Paypal/Model/Session.php +++ b/app/code/core/Mage/Paypal/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Standard.php b/app/code/core/Mage/Paypal/Model/Standard.php index 1deb64809..7bc5246b3 100644 --- a/app/code/core/Mage/Paypal/Model/Standard.php +++ b/app/code/core/Mage/Paypal/Model/Standard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cert.php b/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cert.php index 16f68a1c1..ecf520f06 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cert.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cert.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cron.php b/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cron.php index 6988eb831..9b2b68c55 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cron.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cron.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Backend/MerchantCountry.php b/app/code/core/Mage/Paypal/Model/System/Config/Backend/MerchantCountry.php index 4f12c88cb..2236f31e5 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Backend/MerchantCountry.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Backend/MerchantCountry.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/AuthorizationAmounts.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/AuthorizationAmounts.php index 18d67422b..918e565bb 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/AuthorizationAmounts.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/AuthorizationAmounts.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlPosition.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlPosition.php deleted file mode 100644 index b10d68e50..000000000 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlPosition.php +++ /dev/null @@ -1,87 +0,0 @@ - Mage::helper('paypal')->__('Header (center)'), - '1' => Mage::helper('paypal')->__('Sidebar (right)') - ); - return $bmlPositionsHP; - } - - /** - * Bml positions source getter for Catalog Category Page - * - * @return array - */ - public function getBmlPositionsCCP() - { - $bmlPositionsCCP = array( - '0' => Mage::helper('paypal')->__('Header (center)'), - '1' => Mage::helper('paypal')->__('Sidebar (right)') - ); - return $bmlPositionsCCP; - } - - /** - * Bml positions source getter for Catalog Product Page - * - * @return array - */ - public function getBmlPositionsCPP() - { - $bmlPositionsCPP = array( - '0' => Mage::helper('paypal')->__('Header (center)'), - '1' => Mage::helper('paypal')->__('Near Bill Me Later checkout button') - ); - return $bmlPositionsCPP; - } - - /** - * Bml positions source getter for Checkout Cart Page - * - * @return array - */ - public function getBmlPositionsCheckout() - { - $bmlPositionsCheckout = array( - '0' => Mage::helper('paypal')->__('Header (center)'), - '1' => Mage::helper('paypal')->__('Near Bill Me Later checkout button') - ); - return $bmlPositionsCheckout; - } -} diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlSize.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlSize.php deleted file mode 100644 index 37c45b9ae..000000000 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlSize.php +++ /dev/null @@ -1,166 +0,0 @@ - Mage::helper('paypal')->__('190 x 100'), - '234x60' => Mage::helper('paypal')->__('234 x 60'), - '300x50' => Mage::helper('paypal')->__('300 x 50'), - '468x60' => Mage::helper('paypal')->__('468 x 60'), - '728x90' => Mage::helper('paypal')->__('728 x 90'), - '800x66' => Mage::helper('paypal')->__('800 x 66') - ); - } - - /** - * Options getter for Home Page and position Sidebar (right) - * - * @return array - */ - public function getBmlSizeHPS() - { - return array( - '120x90' => Mage::helper('paypal')->__('120 x 90'), - '190x100' => Mage::helper('paypal')->__('190 x 100'), - '234x60' => Mage::helper('paypal')->__('234 x 60'), - '120x240' => Mage::helper('paypal')->__('120 x 240'), - '120x600' => Mage::helper('paypal')->__('120 x 600'), - '234x400' => Mage::helper('paypal')->__('234 x 400'), - '250x250' => Mage::helper('paypal')->__('250 x 250') - ); - } - - /** - * Options getter for Catalog Category Page and position Center - * - * @return array - */ - public function getBmlSizeCCPC() - { - return array( - '190x100' => Mage::helper('paypal')->__('190 x 100'), - '234x60' => Mage::helper('paypal')->__('234 x 60'), - '300x50' => Mage::helper('paypal')->__('300 x 50'), - '468x60' => Mage::helper('paypal')->__('468 x 60'), - '728x90' => Mage::helper('paypal')->__('728 x 90'), - '800x66' => Mage::helper('paypal')->__('800 x 66') - ); - } - - /** - * Options getter for Catalog Category Page and position Sidebar (right) - * - * @return array - */ - public function getBmlSizeCCPS() - { - return array( - '120x90' => Mage::helper('paypal')->__('120 x 90'), - '190x100' => Mage::helper('paypal')->__('190 x 100'), - '234x60' => Mage::helper('paypal')->__('234 x 60'), - '120x240' => Mage::helper('paypal')->__('120 x 240'), - '120x600' => Mage::helper('paypal')->__('120 x 600'), - '234x400' => Mage::helper('paypal')->__('234 x 400'), - '250x250' => Mage::helper('paypal')->__('250 x 250') - ); - } - - /** - * Options getter for Catalog Product Page and position Center - * - * @return array - */ - public function getBmlSizeCPPC() - { - return array( - '190x100' => Mage::helper('paypal')->__('190 x 100'), - '234x60' => Mage::helper('paypal')->__('234 x 60'), - '300x50' => Mage::helper('paypal')->__('300 x 50'), - '468x60' => Mage::helper('paypal')->__('468 x 60'), - '728x90' => Mage::helper('paypal')->__('728 x 90'), - '800x66' => Mage::helper('paypal')->__('800 x 66') - ); - } - - /** - * Options getter for Catalog Product Page and position Near Bill Me Later checkout button - * - * @return array - */ - public function getBmlSizeCPPN() - { - return array( - '120x90' => Mage::helper('paypal')->__('120 x 90'), - '190x100' => Mage::helper('paypal')->__('190 x 100'), - '234x60' => Mage::helper('paypal')->__('234 x 60'), - '120x240' => Mage::helper('paypal')->__('120 x 240'), - '120x600' => Mage::helper('paypal')->__('120 x 600'), - '234x400' => Mage::helper('paypal')->__('234 x 400'), - '250x250' => Mage::helper('paypal')->__('250 x 250') - ); - } - - /** - * Options getter for Checkout Cart Page and position Center - * - * @return array - */ - public function getBmlSizeCheckoutC() - { - return array( - '234x60' => Mage::helper('paypal')->__('234 x 60'), - '300x50' => Mage::helper('paypal')->__('300 x 50'), - '468x60' => Mage::helper('paypal')->__('468 x 60'), - '728x90' => Mage::helper('paypal')->__('728 x 90'), - '800x66' => Mage::helper('paypal')->__('800 x 66') - ); - } - - /** - * Options getter for Checkout Cart Page and position Near Bill Me Later checkout button - * - * @return array - */ - public function getBmlSizeCheckoutN() - { - return array( - '234x60' => Mage::helper('paypal')->__('234 x 60'), - '300x50' => Mage::helper('paypal')->__('300 x 50'), - '468x60' => Mage::helper('paypal')->__('468 x 60') - ); - } -} diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/BuyerCountry.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/BuyerCountry.php index 8ec945d6e..8f5f1e8cb 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/BuyerCountry.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/BuyerCountry.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php index fa240b479..52ca22152 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/Logo.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/Logo.php index b41fbe58a..137c60c00 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/Logo.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/Logo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/MerchantCountry.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/MerchantCountry.php index d99164620..9012b7d91 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/MerchantCountry.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/MerchantCountry.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions.php index 1bde0f7e8..a3a74a5e9 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions/Express.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions/Express.php index 61681bd16..463ba640d 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions/Express.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions/Express.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/RequireBillingAddress.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/RequireBillingAddress.php index bc1476f01..3e7ed0c70 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/RequireBillingAddress.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/RequireBillingAddress.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/UrlMethod.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/UrlMethod.php index 9864365bb..4b8811894 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/UrlMethod.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/UrlMethod.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php b/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php index 2fa7cd2c8..ef643b300 100644 --- a/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php +++ b/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/controllers/BmlController.php b/app/code/core/Mage/Paypal/controllers/BmlController.php deleted file mode 100644 index 520b9bd1f..000000000 --- a/app/code/core/Mage/Paypal/controllers/BmlController.php +++ /dev/null @@ -1,42 +0,0 @@ -_forward('start', 'express', 'paypal', array( - 'bml' => 1, - 'button' => $this->getRequest()->getParam('button') - )); - } -} diff --git a/app/code/core/Mage/Paypal/controllers/ExpressController.php b/app/code/core/Mage/Paypal/controllers/ExpressController.php index ba71bcf87..e17a642f9 100644 --- a/app/code/core/Mage/Paypal/controllers/ExpressController.php +++ b/app/code/core/Mage/Paypal/controllers/ExpressController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/controllers/HostedproController.php b/app/code/core/Mage/Paypal/controllers/HostedproController.php index 7bb81d416..6cf1b30e1 100644 --- a/app/code/core/Mage/Paypal/controllers/HostedproController.php +++ b/app/code/core/Mage/Paypal/controllers/HostedproController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/controllers/IpnController.php b/app/code/core/Mage/Paypal/controllers/IpnController.php index 216974fb7..2b85bbb9b 100644 --- a/app/code/core/Mage/Paypal/controllers/IpnController.php +++ b/app/code/core/Mage/Paypal/controllers/IpnController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/controllers/PayflowController.php b/app/code/core/Mage/Paypal/controllers/PayflowController.php index 1cac74d8c..e99b51991 100644 --- a/app/code/core/Mage/Paypal/controllers/PayflowController.php +++ b/app/code/core/Mage/Paypal/controllers/PayflowController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,7 +81,6 @@ public function returnUrlAction() */ public function formAction() { - $this->getResponse()->setHeader('P3P', 'CP="CAO PSA OUR"'); $this->getResponse() ->setBody($this->_getIframeBlock()->toHtml()); } diff --git a/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php b/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php index a62936e55..c915a2116 100644 --- a/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php +++ b/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/controllers/StandardController.php b/app/code/core/Mage/Paypal/controllers/StandardController.php index c0937f114..132ca710c 100644 --- a/app/code/core/Mage/Paypal/controllers/StandardController.php +++ b/app/code/core/Mage/Paypal/controllers/StandardController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/data/paypal_setup/data-install-1.6.0.5.php b/app/code/core/Mage/Paypal/data/paypal_setup/data-install-1.6.0.5.php deleted file mode 100644 index 78b2c1e52..000000000 --- a/app/code/core/Mage/Paypal/data/paypal_setup/data-install-1.6.0.5.php +++ /dev/null @@ -1,45 +0,0 @@ -getConnection(); -$installer->startSetup(); -$data = array( - array('paypal_reversed', 'PayPal Reversed'), - array('paypal_canceled_reversal', 'PayPal Canceled Reversal') -); -$connection = $installer->getConnection()->insertArray( - $installer->getTable('sales/order_status'), - array('status', 'label'), - $data -); -/** - * Set default value for "skip order review page" option for Express Checkout for new installations - */ -$ecSkipOrderReviewStepFlagPath = 'payment/paypal_express/skip_order_review_step'; -Mage::getConfig()->saveConfig($ecSkipOrderReviewStepFlagPath, '1'); -$installer->endSetup(); diff --git a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php index de2969a97..52c7e1805 100644 --- a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.4-1.6.0.5.php b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.4-1.6.0.5.php deleted file mode 100644 index 62b87a638..000000000 --- a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.4-1.6.0.5.php +++ /dev/null @@ -1,32 +0,0 @@ -saveConfig($ecSkipOrderReviewStepFlagPath, '0'); diff --git a/app/code/core/Mage/Paypal/etc/adminhtml.xml b/app/code/core/Mage/Paypal/etc/adminhtml.xml index 068023f04..f79438eec 100644 --- a/app/code/core/Mage/Paypal/etc/adminhtml.xml +++ b/app/code/core/Mage/Paypal/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paypal/etc/config.xml b/app/code/core/Mage/Paypal/etc/config.xml index 3e6a7ae97..1513f6f85 100644 --- a/app/code/core/Mage/Paypal/etc/config.xml +++ b/app/code/core/Mage/Paypal/etc/config.xml @@ -21,14 +21,14 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - 1.6.0.5 + 1.6.0.4 @@ -131,9 +131,6 @@ paypal.xml - - bml.xml - @@ -181,7 +178,6 @@ - Magento_Cart_Community @@ -217,13 +213,7 @@ 29 1 1 - 1 - - paypal/bml - Bill Me Later - paypal - paypal/direct PayPal Payments Pro diff --git a/app/code/core/Mage/Paypal/etc/system.xml b/app/code/core/Mage/Paypal/etc/system.xml index b41fb6b97..883f394bc 100644 --- a/app/code/core/Mage/Paypal/etc/system.xml +++ b/app/code/core/Mage/Paypal/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -369,145 +369,6 @@ express,payments_advanced paypal-enabler - - Learn More]]> - - 31 - required_settings_enable_payflow_advanced - - - - - Why Advertise Financing?
- Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> - - text - 1 - 1 - 32 - - - - - - text - 1 - 1 - 1 - 20 - - - - - - payment/paypal_express_bml/homepage_size - select - paypal/system_config_source_bmlSize::getBmlSizeHPH - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeHPS - 1 - - - - - - text - 1 - 1 - 1 - 30 - - - - - - payment/paypal_express_bml/categorypage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCCPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCCPS - 1 - - - - - - - text - 1 - 1 - 1 - 40 - - - - - - payment/paypal_express_bml/productpage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCPPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCPPN - 1 - - - - - - - text - 1 - 1 - 1 - 50 - - - - - - payment/paypal_express_bml/checkout_size - select - paypal/system_config_source_bmlSize::getBmlSizeCheckoutC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCheckoutN - 1 - 1 - - - - - - @@ -1122,7 +983,6 @@ Ability for buyer to purchase without PayPal account. payment/paypal_express/solution_type select - paypal/adminhtml_system_config_field_solutionType paypal/config::getExpressCheckoutSolutionTypes 70 1 @@ -1152,16 +1012,6 @@ 1 1 - - - payment/paypal_express/skip_order_review_step - select - adminhtml/system_config_source_yesno - 95 - 1 - 1 - 1 - @@ -1255,145 +1105,6 @@ wpp_and_express_checkout paypal-enabler - - Learn More]]> - - 21 - wpp_required_settings_enable_wpp - - - - - Why Advertise Financing?
- Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> - - text - 1 - 1 - 22 - - - - - - text - 1 - 1 - 1 - 20 - - - - - - payment/paypal_express_bml/homepage_size - select - paypal/system_config_source_bmlSize::getBmlSizeHPH - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeHPS - 1 - - - - - - text - 1 - 1 - 1 - 30 - - - - - - payment/paypal_express_bml/categorypage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCCPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCCPS - 1 - - - - - - - text - 1 - 1 - 1 - 40 - - - - - - payment/paypal_express_bml/productpage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCPPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCPPN - 1 - - - - - - - text - 1 - 1 - 1 - 50 - - - - - - payment/paypal_express_bml/checkout_size - select - paypal/system_config_source_bmlSize::getBmlSizeCheckoutC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCheckoutN - 1 - 1 - - - - - - @@ -1652,7 +1363,6 @@ - @@ -1697,10 +1407,6 @@ http://www.youtube.com/watch?v=mdPjvziH_rk&list=PLF18B1094ABCD7CE8&index=6&feature=plpp_video Accept credit cards, debit cards and PayPal payments securely. - - paypal/adminhtml_system_config_fieldset_deprecated - payment/paypal_standard/was_active - @@ -2174,154 +1880,6 @@ paypal-enabler paypal-ec-pe - - - Learn More]]> - - payment/paypaluk_express_bml/active - select - adminhtml/system_config_source_yesno - 21 - 1 - 1 - 1 - paypal-bml - paypal_payflow_required_enable_paypal_payflow - - - - - Why Advertise Financing?
- Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> - - text - 1 - 1 - 22 - - - - - - text - 1 - 1 - 1 - 20 - - - - - - payment/paypal_express_bml/homepage_size - select - paypal/system_config_source_bmlSize::getBmlSizeHPH - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeHPS - 1 - - - - - - text - 1 - 1 - 1 - 30 - - - - - - payment/paypal_express_bml/categorypage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCCPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCCPS - 1 - - - - - - - text - 1 - 1 - 1 - 40 - - - - - - payment/paypal_express_bml/productpage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCPPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCPPN - 1 - - - - - - - text - 1 - 1 - 1 - 50 - - - - - - payment/paypal_express_bml/checkout_size - select - paypal/system_config_source_bmlSize::getBmlSizeCheckoutC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCheckoutN - 1 - 1 - - - - - - - @@ -2658,145 +2216,6 @@ payflow_link_required_enable_payflow_link,payflow_link_express_checkout paypal-enabler paypal-ec-enabler - - Learn More]]> - - 41 - payflow_link_required_enable_express_checkout - - - - - Why Advertise Financing?
- Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> - - text - 1 - 1 - 42 - - - - - - text - 1 - 1 - 1 - 20 - - - - - - payment/paypal_express_bml/homepage_size - select - paypal/system_config_source_bmlSize::getBmlSizeHPH - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeHPS - 1 - - - - - - text - 1 - 1 - 1 - 30 - - - - - - payment/paypal_express_bml/categorypage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCCPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCCPS - 1 - - - - - - - text - 1 - 1 - 1 - 40 - - - - - - payment/paypal_express_bml/productpage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCPPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCPPN - 1 - - - - - - - text - 1 - 1 - 1 - 50 - - - - - - payment/paypal_express_bml/checkout_size - select - paypal/system_config_source_bmlSize::getBmlSizeCheckoutC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCheckoutN - 1 - 1 - - - - - - @@ -2997,7 +2416,6 @@ - @@ -3033,8 +2451,7 @@ 40 paypal_group_all_in_one pp-general-uk - paypal/adminhtml_system_config_fieldset_deprecated - payment/paypaluk_direct/was_active + paypal/adminhtml_system_config_fieldset_payment payment/paypaluk_direct/active Accept payments in your shopping cart. PayPal will process your card payments through the Payflow Gateway. @@ -3145,142 +2562,6 @@ pp_pe_api_settings paypal-enabler paypal-ec-pe - - pp_pe_required_settings_enable_pp_pe - - - - - Why Advertise Financing?
- Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> - - text - 1 - 1 - 22 - - - - - - text - 1 - 1 - 1 - 20 - - - - - - payment/paypal_express_bml/homepage_size - select - paypal/system_config_source_bmlSize::getBmlSizeHPH - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeHPS - 1 - - - - - - text - 1 - 1 - 1 - 30 - - - - - - payment/paypal_express_bml/categorypage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCCPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCCPS - 1 - - - - - - text - 1 - 1 - 1 - 40 - - - - - - payment/paypal_express_bml/productpage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCPPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCPPN - 1 - - - - - - text - 1 - 1 - 1 - 50 - - - - - - payment/paypal_express_bml/checkout_size - select - paypal/system_config_source_bmlSize::getBmlSizeCheckoutC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCheckoutN - 1 - 1 - - - - - - - - - - @@ -3622,145 +2903,6 @@ pphs_required_settings_pphs paypal-enabler paypal-ec-separate - - Learn More]]> - - 21 - pphs_required_settings_pphs_enable - - - - - Why Advertise Financing?
- Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> - - text - 1 - 1 - 22 - - - - - - text - 1 - 1 - 1 - 20 - - - - - - payment/paypal_express_bml/homepage_size - select - paypal/system_config_source_bmlSize::getBmlSizeHPH - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeHPS - 1 - - - - - - text - 1 - 1 - 1 - 30 - - - - - - payment/paypal_express_bml/categorypage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCCPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCCPS - 1 - - - - - - - text - 1 - 1 - 1 - 40 - - - - - - payment/paypal_express_bml/productpage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCPPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCPPN - 1 - - - - - - - text - 1 - 1 - 1 - 50 - - - - - - payment/paypal_express_bml/checkout_size - select - paypal/system_config_source_bmlSize::getBmlSizeCheckoutC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCheckoutN - 1 - 1 - - - - - - @@ -4009,7 +3151,6 @@ - @@ -4083,238 +3224,6 @@ express_checkout_required_express_checkout paypal-enabler paypal-ec-enabler - - - Learn More]]> - - payment/paypal_express_bml/active - select - adminhtml/system_config_source_yesno - 21 - 1 - 1 - 1 - express_checkout_required_enable_express_checkout - paypal-bml - - - - - Why Advertise Financing?
- Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> - - text - 1 - 1 - 30 - - - - - payment/paypal_express_bml/publisher_id - 1 - 1 - 10 - 1 - - - - Get Publisher ID from PayPal - - paypal/adminhtml_system_config_bmlApiWizard - 15 - 1 - 1 - - - - text - 1 - 1 - 1 - 20 - - - - payment/paypal_express_bml/homepage_display - select - adminhtml/system_config_source_yesno - 1 - 1 - 10 - 1 - - - - payment/paypal_express_bml/homepage_position - select - paypal/system_config_source_bmlPosition::getBmlPositionsHP - 1 - 1 - 20 - 1 - - - - payment/paypal_express_bml/homepage_size - select - paypal/system_config_source_bmlSize::getBmlSizeHPH - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeHPS - 1 - - - - - - text - 1 - 1 - 1 - 30 - - - - payment/paypal_express_bml/categorypage_display - select - adminhtml/system_config_source_yesno - 1 - 1 - 10 - 1 - - - - payment/paypal_express_bml/categorypage_position - select - paypal/system_config_source_bmlPosition::getBmlPositionsCCP - 1 - 1 - 20 - 1 - - - - payment/paypal_express_bml/categorypage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCCPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCCPS - 1 - - - - - - text - 1 - 1 - 1 - 40 - - - - payment/paypal_express_bml/productpage_display - select - adminhtml/system_config_source_yesno - 1 - 1 - 10 - 1 - - - - payment/paypal_express_bml/productpage_position - select - paypal/system_config_source_bmlPosition::getBmlPositionsCPP - 1 - 1 - 20 - 1 - - - - payment/paypal_express_bml/productpage_size - select - paypal/system_config_source_bmlSize::getBmlSizeCPPC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCPPN - 1 - - - - - - text - 1 - 1 - 1 - 50 - - - - payment/paypal_express_bml/checkout_display - select - adminhtml/system_config_source_yesno - 1 - 1 - 10 - 1 - - - - payment/paypal_express_bml/checkout_position - select - paypal/system_config_source_bmlPosition::getBmlPositionsCheckout - 1 - 1 - 20 - 1 - - - - payment/paypal_express_bml/checkout_size - select - paypal/system_config_source_bmlSize::getBmlSizeCheckoutC - 1 - 1 - 30 - 1 - 0 - - - paypal/system_config_source_bmlSize::getBmlSizeCheckoutN - 1 - 1 - - - - - @@ -4354,7 +3263,6 @@ - diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/install-1.6.0.0.php b/app/code/core/Mage/Paypal/sql/paypal_setup/install-1.6.0.0.php index d52f79252..30858b3a7 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php index 1f1502e60..e401971e9 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-1.4.0.0.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-1.4.0.0.php index 53284e3f9..d371222bc 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-1.4.0.0.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-1.4.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php index f979a549d..fa15b3190 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.2-0.7.3.php index ba4117291..87a7185d9 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php index c115d8867..702fb78ae 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php index e0b4b6375..1c63fc7e4 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 88fe0c0f9..5ad387da7 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.0-1.6.0.1.php index 2569a6706..2d2996489 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.0-1.6.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.php index 7fde34c31..2714428d9 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php index 9006ab12d..3302af09f 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Paypal - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/Block/Bml/Form.php b/app/code/core/Mage/PaypalUk/Block/Bml/Form.php deleted file mode 100644 index 4ba08ffce..000000000 --- a/app/code/core/Mage/PaypalUk/Block/Bml/Form.php +++ /dev/null @@ -1,37 +0,0 @@ -getMethodInstance(Mage_Paypal_Model_Config::METHOD_WPP_PE_BML); - $isBmlEnabled = $bml && $bml->isAvailable($quote); - $this->setBmlShortcutHtmlId($this->helper('core')->uniqHash('ec_shortcut_bml_')) - ->setBmlCheckoutUrl($this->getUrl('paypaluk/bml/start/button/1')) - ->setBmlImageUrl('https://www.paypalobjects.com/webstatic/en_US/btn/btn_bml_SM.png') - ->setMarketMessage('https://www.paypalobjects.com/webstatic/en_US/btn/btn_bml_text.png') - ->setMarketMessageUrl('https://www.securecheckout.billmelater.com/paycapture-content/' - . 'fetch?hash=AU826TU8&content=/bmlweb/ppwpsiw.html') - ->setIsBmlEnabled($isBmlEnabled); - return $this; - } } diff --git a/app/code/core/Mage/PaypalUk/Helper/Data.php b/app/code/core/Mage/PaypalUk/Helper/Data.php index fcc110140..0c45ea349 100644 --- a/app/code/core/Mage/PaypalUk/Helper/Data.php +++ b/app/code/core/Mage/PaypalUk/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PaypalUk - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/Model/Api/Express/Nvp.php b/app/code/core/Mage/PaypalUk/Model/Api/Express/Nvp.php index 129b94833..7a85cfc11 100644 --- a/app/code/core/Mage/PaypalUk/Model/Api/Express/Nvp.php +++ b/app/code/core/Mage/PaypalUk/Model/Api/Express/Nvp.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PaypalUk - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php b/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php index 804f5b9a2..2f58b58bc 100644 --- a/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php +++ b/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PaypalUk - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -146,7 +146,6 @@ class Mage_PaypalUk_Model_Api_Nvp extends Mage_Paypal_Model_Api_Nvp 'XID' => 'centinel_xid', 'VPAS' => 'centinel_vpas_result', 'ECISUBMITTED3DS' => 'centinel_eci_result', - 'USERSELECTEDFUNDINGSOURCE' => 'funding_source', ); /** @@ -216,7 +215,6 @@ class Mage_PaypalUk_Model_Api_Nvp extends Mage_Paypal_Model_Api_Nvp protected $_setExpressCheckoutRequest = array( 'TENDER', 'AMT', 'CURRENCY', 'RETURNURL', 'CANCELURL', 'INVNUM', 'PAGESTYLE', 'HDRIMG', 'HDRBORDERCOLOR', 'HDRBACKCOLOR', 'PAYFLOWCOLOR', 'LOCALECODE', - 'USERSELECTEDFUNDINGSOURCE' ); protected $_setExpressCheckoutResponse = array('REPMSG', 'TOKEN'); /**#@-*/ diff --git a/app/code/core/Mage/PaypalUk/Model/Bml.php b/app/code/core/Mage/PaypalUk/Model/Bml.php deleted file mode 100644 index 168df7f07..000000000 --- a/app/code/core/Mage/PaypalUk/Model/Bml.php +++ /dev/null @@ -1,53 +0,0 @@ -_forward('start', 'express', 'paypaluk', array('bml' => 1)); - } -} diff --git a/app/code/core/Mage/PaypalUk/controllers/ExpressController.php b/app/code/core/Mage/PaypalUk/controllers/ExpressController.php index 83c89706f..10abb4019 100644 --- a/app/code/core/Mage/PaypalUk/controllers/ExpressController.php +++ b/app/code/core/Mage/PaypalUk/controllers/ExpressController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PaypalUk - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/etc/config.xml b/app/code/core/Mage/PaypalUk/etc/config.xml index 02292a9cb..b7413ec29 100644 --- a/app/code/core/Mage/PaypalUk/etc/config.xml +++ b/app/code/core/Mage/PaypalUk/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_PaypalUk - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -111,11 +111,6 @@ paypaluk/express - - paypaluk/bml - Bill Me Later - paypal - paypaluk/direct diff --git a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/install-1.6.0.0.php b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/install-1.6.0.0.php index 026fb1601..098b93a39 100644 --- a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PaypalUk - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php index 9b17eae07..820b2e7be 100644 --- a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PaypalUk - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/Block/Form/Remember.php b/app/code/core/Mage/Persistent/Block/Form/Remember.php index 9b9ea579a..bbd5cd284 100644 --- a/app/code/core/Mage/Persistent/Block/Form/Remember.php +++ b/app/code/core/Mage/Persistent/Block/Form/Remember.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/Block/Header/Additional.php b/app/code/core/Mage/Persistent/Block/Header/Additional.php index 9b33be8b6..f892e3aef 100644 --- a/app/code/core/Mage/Persistent/Block/Header/Additional.php +++ b/app/code/core/Mage/Persistent/Block/Header/Additional.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/Helper/Data.php b/app/code/core/Mage/Persistent/Helper/Data.php index 9c436fd77..da8ef6cb3 100644 --- a/app/code/core/Mage/Persistent/Helper/Data.php +++ b/app/code/core/Mage/Persistent/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/Helper/Session.php b/app/code/core/Mage/Persistent/Helper/Session.php index 57ebd37ab..7359542e5 100644 --- a/app/code/core/Mage/Persistent/Helper/Session.php +++ b/app/code/core/Mage/Persistent/Helper/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/Model/Observer.php b/app/code/core/Mage/Persistent/Model/Observer.php index fa3091a64..3e001ac20 100644 --- a/app/code/core/Mage/Persistent/Model/Observer.php +++ b/app/code/core/Mage/Persistent/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/Model/Observer/Session.php b/app/code/core/Mage/Persistent/Model/Observer/Session.php index 492b632b6..97974d27b 100644 --- a/app/code/core/Mage/Persistent/Model/Observer/Session.php +++ b/app/code/core/Mage/Persistent/Model/Observer/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/Model/Persistent/Config.php b/app/code/core/Mage/Persistent/Model/Persistent/Config.php index 846237e40..c17cf6b65 100644 --- a/app/code/core/Mage/Persistent/Model/Persistent/Config.php +++ b/app/code/core/Mage/Persistent/Model/Persistent/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/Model/Resource/Session.php b/app/code/core/Mage/Persistent/Model/Resource/Session.php index 23d16c696..8907517c7 100644 --- a/app/code/core/Mage/Persistent/Model/Resource/Session.php +++ b/app/code/core/Mage/Persistent/Model/Resource/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/Model/Session.php b/app/code/core/Mage/Persistent/Model/Session.php index 1ba037bf9..994e0e5d4 100644 --- a/app/code/core/Mage/Persistent/Model/Session.php +++ b/app/code/core/Mage/Persistent/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/controllers/IndexController.php b/app/code/core/Mage/Persistent/controllers/IndexController.php index 92cea0841..3115f0011 100644 --- a/app/code/core/Mage/Persistent/controllers/IndexController.php +++ b/app/code/core/Mage/Persistent/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/etc/adminhtml.xml b/app/code/core/Mage/Persistent/etc/adminhtml.xml index dc5cf5301..b0c7f3745 100644 --- a/app/code/core/Mage/Persistent/etc/adminhtml.xml +++ b/app/code/core/Mage/Persistent/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/etc/config.xml b/app/code/core/Mage/Persistent/etc/config.xml index 1957f88fb..6946b04b6 100644 --- a/app/code/core/Mage/Persistent/etc/config.xml +++ b/app/code/core/Mage/Persistent/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/etc/persistent.xml b/app/code/core/Mage/Persistent/etc/persistent.xml index 569c66ee8..c0e475534 100644 --- a/app/code/core/Mage/Persistent/etc/persistent.xml +++ b/app/code/core/Mage/Persistent/etc/persistent.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/etc/system.xml b/app/code/core/Mage/Persistent/etc/system.xml index c246f6a3c..bceccc438 100644 --- a/app/code/core/Mage/Persistent/etc/system.xml +++ b/app/code/core/Mage/Persistent/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/sql/persistent_setup/install-1.0.0.0.php b/app/code/core/Mage/Persistent/sql/persistent_setup/install-1.0.0.0.php index 28c0d23d1..9af00d819 100644 --- a/app/code/core/Mage/Persistent/sql/persistent_setup/install-1.0.0.0.php +++ b/app/code/core/Mage/Persistent/sql/persistent_setup/install-1.0.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Block/ActivePoll.php b/app/code/core/Mage/Poll/Block/ActivePoll.php index a3c224b0c..dd04efcf2 100644 --- a/app/code/core/Mage/Poll/Block/ActivePoll.php +++ b/app/code/core/Mage/Poll/Block/ActivePoll.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Block/Poll.php b/app/code/core/Mage/Poll/Block/Poll.php index 8cf0da11e..acc26b138 100644 --- a/app/code/core/Mage/Poll/Block/Poll.php +++ b/app/code/core/Mage/Poll/Block/Poll.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Helper/Data.php b/app/code/core/Mage/Poll/Helper/Data.php index 2b1778f9d..fdc29b6b2 100644 --- a/app/code/core/Mage/Poll/Helper/Data.php +++ b/app/code/core/Mage/Poll/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll.php index 4a2bfc109..93531232f 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php index fd129479c..5c6fca398 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php index bad189706..be5ebd38e 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php index 6e4f3c269..d35905d38 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php index 3d569f061..68e31355a 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Poll.php b/app/code/core/Mage/Poll/Model/Poll.php index 077cbe85b..7a335de8c 100644 --- a/app/code/core/Mage/Poll/Model/Poll.php +++ b/app/code/core/Mage/Poll/Model/Poll.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Poll/Answer.php b/app/code/core/Mage/Poll/Model/Poll/Answer.php index 27f893228..98d014acf 100644 --- a/app/code/core/Mage/Poll/Model/Poll/Answer.php +++ b/app/code/core/Mage/Poll/Model/Poll/Answer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Poll/Vote.php index 483a3c98b..e46250e95 100644 --- a/app/code/core/Mage/Poll/Model/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Poll/Vote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Resource/Poll.php b/app/code/core/Mage/Poll/Model/Resource/Poll.php index d3a86dba5..7772aa196 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Resource/Poll/Answer.php b/app/code/core/Mage/Poll/Model/Resource/Poll/Answer.php index 3a9d0fd06..41f74f71a 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll/Answer.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll/Answer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Resource/Poll/Answer/Collection.php b/app/code/core/Mage/Poll/Model/Resource/Poll/Answer/Collection.php index c4a6b704a..be6149b31 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll/Answer/Collection.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll/Answer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Resource/Poll/Collection.php b/app/code/core/Mage/Poll/Model/Resource/Poll/Collection.php index eb317f2b0..e5cdf2472 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll/Collection.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.php index d4af318b4..be58a9aac 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/controllers/VoteController.php b/app/code/core/Mage/Poll/controllers/VoteController.php index c6c7de045..66733f13d 100644 --- a/app/code/core/Mage/Poll/controllers/VoteController.php +++ b/app/code/core/Mage/Poll/controllers/VoteController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/data/poll_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Poll/data/poll_setup/data-install-1.6.0.0.php index 169312a05..6bcaf7880 100644 --- a/app/code/core/Mage/Poll/data/poll_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Poll/data/poll_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/etc/adminhtml.xml b/app/code/core/Mage/Poll/etc/adminhtml.xml index a35761126..7be69f60b 100644 --- a/app/code/core/Mage/Poll/etc/adminhtml.xml +++ b/app/code/core/Mage/Poll/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Poll/etc/config.xml b/app/code/core/Mage/Poll/etc/config.xml index d7f2eb512..29f555809 100644 --- a/app/code/core/Mage/Poll/etc/config.xml +++ b/app/code/core/Mage/Poll/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Poll/etc/system.xml b/app/code/core/Mage/Poll/etc/system.xml index 51e9b5eae..6af8525c0 100644 --- a/app/code/core/Mage/Poll/etc/system.xml +++ b/app/code/core/Mage/Poll/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Poll/sql/poll_setup/install-1.6.0.0.php b/app/code/core/Mage/Poll/sql/poll_setup/install-1.6.0.0.php index a0290c3f0..324f7faa2 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-install-0.7.0.php index 921588d3f..2ccf0d932 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.6.0-0.6.1.php b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.6.0-0.6.1.php index d27d28f10..5a486c4ec 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.6.0-0.6.1.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.6.0-0.6.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.7.1-0.7.2.php index 076eab465..6d29b57d5 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index f65fdd989..852350b5e 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Poll - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php b/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php index ee7ee7b22..19a86f874 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Price.php b/app/code/core/Mage/ProductAlert/Block/Email/Price.php index dbf68cf09..9393f2c67 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Price.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Stock.php b/app/code/core/Mage/ProductAlert/Block/Email/Stock.php index c6cdd770b..f03d5efa6 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Stock.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Block/Price.php b/app/code/core/Mage/ProductAlert/Block/Price.php index e1ffacef2..ade21fb28 100644 --- a/app/code/core/Mage/ProductAlert/Block/Price.php +++ b/app/code/core/Mage/ProductAlert/Block/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Block/Product/View.php b/app/code/core/Mage/ProductAlert/Block/Product/View.php index b556ea728..931ccef22 100644 --- a/app/code/core/Mage/ProductAlert/Block/Product/View.php +++ b/app/code/core/Mage/ProductAlert/Block/Product/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Block/Stock.php b/app/code/core/Mage/ProductAlert/Block/Stock.php index 9fdcfe7a6..636307ff3 100644 --- a/app/code/core/Mage/ProductAlert/Block/Stock.php +++ b/app/code/core/Mage/ProductAlert/Block/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Helper/Data.php b/app/code/core/Mage/ProductAlert/Helper/Data.php index 10cc37974..98d485ee5 100644 --- a/app/code/core/Mage/ProductAlert/Helper/Data.php +++ b/app/code/core/Mage/ProductAlert/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Email.php b/app/code/core/Mage/ProductAlert/Model/Email.php index 1a9227290..44b1b63b7 100644 --- a/app/code/core/Mage/ProductAlert/Model/Email.php +++ b/app/code/core/Mage/ProductAlert/Model/Email.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php index 129d7c5cc..25ea893c7 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php index b124d3bbb..04b8ad2a4 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php index 1c2fb5d1e..e51e10788 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php index a8c6b8de1..9fda094eb 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php index dc2291079..b3fee44f5 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php index 8eee3562e..ba95b4e7d 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Observer.php b/app/code/core/Mage/ProductAlert/Model/Observer.php index 0c2250e94..c91308b52 100644 --- a/app/code/core/Mage/ProductAlert/Model/Observer.php +++ b/app/code/core/Mage/ProductAlert/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Price.php b/app/code/core/Mage/ProductAlert/Model/Price.php index ecf4f164c..90f30b2e1 100644 --- a/app/code/core/Mage/ProductAlert/Model/Price.php +++ b/app/code/core/Mage/ProductAlert/Model/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php b/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php index 05a787fde..eb743384b 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Price.php b/app/code/core/Mage/ProductAlert/Model/Resource/Price.php index eaac18e47..3af1d212e 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Price.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php b/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php index af03fcdc8..82691c1c7 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Price/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Resource/Price/Customer/Collection.php index e183deccc..27438d407 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Price/Customer/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Price/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php b/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php index 038e457e5..ba047eaef 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php b/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php index 9a82129bc..2add7206c 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Customer/Collection.php index 1eaed4147..9231487ec 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Customer/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Stock.php b/app/code/core/Mage/ProductAlert/Model/Stock.php index 7f839618a..1cea5b8b8 100644 --- a/app/code/core/Mage/ProductAlert/Model/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Stock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/controllers/AddController.php b/app/code/core/Mage/ProductAlert/controllers/AddController.php index 479d3dd52..f13950faf 100644 --- a/app/code/core/Mage/ProductAlert/controllers/AddController.php +++ b/app/code/core/Mage/ProductAlert/controllers/AddController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php b/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php index 658d64f94..519863b96 100644 --- a/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php +++ b/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/etc/config.xml b/app/code/core/Mage/ProductAlert/etc/config.xml index 138f93390..68634f544 100644 --- a/app/code/core/Mage/ProductAlert/etc/config.xml +++ b/app/code/core/Mage/ProductAlert/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ProductAlert/etc/system.xml b/app/code/core/Mage/ProductAlert/etc/system.xml index c22dfa14b..499f3a007 100644 --- a/app/code/core/Mage/ProductAlert/etc/system.xml +++ b/app/code/core/Mage/ProductAlert/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ProductAlert/sql/productalert_setup/install-1.6.0.0.php b/app/code/core/Mage/ProductAlert/sql/productalert_setup/install-1.6.0.0.php index e3fcef6ba..82b451b84 100644 --- a/app/code/core/Mage/ProductAlert/sql/productalert_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/ProductAlert/sql/productalert_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-install-0.7.0.php index 35791cb7c..1a55c5ebf 100644 --- a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-0.7.1-0.7.2.php index 2e1f24de2..7735837c6 100644 --- a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index d4f046fa4..feb94534e 100644 --- a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_ProductAlert - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Block/Entity/Detailed.php b/app/code/core/Mage/Rating/Block/Entity/Detailed.php index 851af753c..67d822f43 100644 --- a/app/code/core/Mage/Rating/Block/Entity/Detailed.php +++ b/app/code/core/Mage/Rating/Block/Entity/Detailed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Helper/Data.php b/app/code/core/Mage/Rating/Helper/Data.php index c6d881df5..985a01009 100644 --- a/app/code/core/Mage/Rating/Helper/Data.php +++ b/app/code/core/Mage/Rating/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating.php index dcde97361..d6ace5448 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php index 4c8ed13a8..65ab1c455 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php index ab88e8ac6..c93d70be7 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php index 761d61506..b9a649fd4 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php index d358e0ece..ec1a600c6 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php index 99a7bdb95..392495fa2 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php index 3389139d7..491c719e2 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Observer.php b/app/code/core/Mage/Rating/Model/Observer.php index 2490dc319..6126e9009 100644 --- a/app/code/core/Mage/Rating/Model/Observer.php +++ b/app/code/core/Mage/Rating/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Rating.php b/app/code/core/Mage/Rating/Model/Rating.php index 4d443ea47..68e36e9be 100644 --- a/app/code/core/Mage/Rating/Model/Rating.php +++ b/app/code/core/Mage/Rating/Model/Rating.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Rating/Entity.php index 886f8307e..9794300c3 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Entity.php +++ b/app/code/core/Mage/Rating/Model/Rating/Entity.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Rating/Option.php b/app/code/core/Mage/Rating/Model/Rating/Option.php index abb57bb31..0a36f5716 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Option.php +++ b/app/code/core/Mage/Rating/Model/Rating/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php b/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php index 33765d6ed..d77fe8cfb 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php +++ b/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating.php b/app/code/core/Mage/Rating/Model/Resource/Rating.php index 8f483335e..d57a594fb 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php index 72d136d4e..478cc6e74 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php index f84239f16..d46add116 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php index d569ab801..a17c92208 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php index 1dcb4cc26..ff9879cfd 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote.php index b10ca351d..b8d99437c 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php index f2667f726..26a7298d9 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/data/rating_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Rating/data/rating_setup/data-install-1.6.0.0.php index 90c3219c7..c248cd699 100644 --- a/app/code/core/Mage/Rating/data/rating_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Rating/data/rating_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/etc/adminhtml.xml b/app/code/core/Mage/Rating/etc/adminhtml.xml index 15d070382..b3d58fca0 100644 --- a/app/code/core/Mage/Rating/etc/adminhtml.xml +++ b/app/code/core/Mage/Rating/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rating/etc/config.xml b/app/code/core/Mage/Rating/etc/config.xml index ef14d36e1..3480e14c0 100644 --- a/app/code/core/Mage/Rating/etc/config.xml +++ b/app/code/core/Mage/Rating/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rating/sql/rating_setup/install-1.6.0.0.php b/app/code/core/Mage/Rating/sql/rating_setup/install-1.6.0.0.php index 48eb46932..2101a5f2c 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-install-0.7.0.php index 296e062b9..436a874da 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.0-0.7.1.php index ae861df88..a7b5ae2cf 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.1-0.7.2.php index 995949cf9..02eefef46 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 4ef8bee58..a656e9ff2 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rating - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Block/Product/Abstract.php b/app/code/core/Mage/Reports/Block/Product/Abstract.php index 4b76c1965..2a8f28910 100644 --- a/app/code/core/Mage/Reports/Block/Product/Abstract.php +++ b/app/code/core/Mage/Reports/Block/Product/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Block/Product/Compared.php b/app/code/core/Mage/Reports/Block/Product/Compared.php index 2980b9764..d167b5410 100644 --- a/app/code/core/Mage/Reports/Block/Product/Compared.php +++ b/app/code/core/Mage/Reports/Block/Product/Compared.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Block/Product/Viewed.php b/app/code/core/Mage/Reports/Block/Product/Viewed.php index 00a20ec93..42b2efc73 100644 --- a/app/code/core/Mage/Reports/Block/Product/Viewed.php +++ b/app/code/core/Mage/Reports/Block/Product/Viewed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Block/Product/Widget/Compared.php b/app/code/core/Mage/Reports/Block/Product/Widget/Compared.php index c6b771a40..0733bd6e5 100644 --- a/app/code/core/Mage/Reports/Block/Product/Widget/Compared.php +++ b/app/code/core/Mage/Reports/Block/Product/Widget/Compared.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Block/Product/Widget/Viewed.php b/app/code/core/Mage/Reports/Block/Product/Widget/Viewed.php index f66cf1c27..ee149e7b2 100644 --- a/app/code/core/Mage/Reports/Block/Product/Widget/Viewed.php +++ b/app/code/core/Mage/Reports/Block/Product/Widget/Viewed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Exception.php b/app/code/core/Mage/Reports/Exception.php index ff826a467..5a8964c96 100644 --- a/app/code/core/Mage/Reports/Exception.php +++ b/app/code/core/Mage/Reports/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Helper/Data.php b/app/code/core/Mage/Reports/Helper/Data.php index b7b55912c..90bf60993 100644 --- a/app/code/core/Mage/Reports/Helper/Data.php +++ b/app/code/core/Mage/Reports/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Config.php b/app/code/core/Mage/Reports/Model/Config.php index 5a8e41ce2..3265e8c5b 100644 --- a/app/code/core/Mage/Reports/Model/Config.php +++ b/app/code/core/Mage/Reports/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Event.php b/app/code/core/Mage/Reports/Model/Event.php index 14c111f03..1f33f7ccc 100644 --- a/app/code/core/Mage/Reports/Model/Event.php +++ b/app/code/core/Mage/Reports/Model/Event.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Event/Observer.php b/app/code/core/Mage/Reports/Model/Event/Observer.php index 2e09c278a..e6961adb9 100644 --- a/app/code/core/Mage/Reports/Model/Event/Observer.php +++ b/app/code/core/Mage/Reports/Model/Event/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Event/Type.php b/app/code/core/Mage/Reports/Model/Event/Type.php index 79a350ac7..7d95a65a8 100644 --- a/app/code/core/Mage/Reports/Model/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Event/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Flag.php b/app/code/core/Mage/Reports/Model/Flag.php index bd74fef05..1a9d88e84 100644 --- a/app/code/core/Mage/Reports/Model/Flag.php +++ b/app/code/core/Mage/Reports/Model/Flag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Grouped/Collection.php b/app/code/core/Mage/Reports/Model/Grouped/Collection.php index 905973edd..eca8595b4 100644 --- a/app/code/core/Mage/Reports/Model/Grouped/Collection.php +++ b/app/code/core/Mage/Reports/Model/Grouped/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Reports_Model_Grouped_Collection diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php index ac9da16d7..e67226ab3 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php index 00e90ff6f..b3a1c78e0 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php index 8cfc29605..0055f4efd 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php index bc1b89ec2..1c084d2a8 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php index 2c8557140..7fdb71b36 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php index cc6aeca8d..e326762e0 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event.php b/app/code/core/Mage/Reports/Model/Mysql4/Event.php index 3cda7c5ce..41d968c4e 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php index b5e3d8b8e..1bbc610d7 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php index b1672357c..11cf726f2 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php index 0b3096deb..509ed931e 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php index 98b92df14..a6894d372 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php index 38a1c0f0f..01fb981e7 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php index 21b22d7dd..9fa8a9652 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php index d0379adc3..02bd42466 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php index f8f818807..e31448b80 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php index 95a42c352..424953fa6 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php index 3efa74202..b9d15b58d 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php index c056dbe54..f2bc0f724 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php index dc981572c..52f87a7b0 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php index d7620bc0f..b445e9767 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php index 33a2dd270..f893316d9 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php index ba5c528a5..a49c345e4 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php index a339999fb..1c8c67176 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php index 14716cc17..330172f02 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php index 47bd48652..de8b2c549 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php index 594a6406e..fa2602123 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php index e414b680c..3320cef81 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php index fd6e53b24..cc413456a 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php index 863972fcd..0d235f256 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php index 622a9737c..6ecd3cc61 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php index 6e4af3d40..b4a236199 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php index e3a5a40b5..ade5d6bcc 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php index b18514784..33f0badd3 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php index e5c283245..9bbe67ce7 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php index 6414ab98b..996fc25b6 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php index de5fad9dc..f21646292 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php index 2516cea3d..d5b9ed3fc 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php index 11a0bcab4..524d43df3 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php index f608cc8c8..3836992f3 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php b/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php index df6d62e58..74fb457d8 100644 --- a/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Product/Index/Compared.php b/app/code/core/Mage/Reports/Model/Product/Index/Compared.php index ec5401719..69219f0a2 100644 --- a/app/code/core/Mage/Reports/Model/Product/Index/Compared.php +++ b/app/code/core/Mage/Reports/Model/Product/Index/Compared.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php index aff57bb1d..57f6be213 100644 --- a/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Report.php b/app/code/core/Mage/Reports/Model/Report.php index 008c68734..280916324 100644 --- a/app/code/core/Mage/Reports/Model/Report.php +++ b/app/code/core/Mage/Reports/Model/Report.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php index f2acce8d2..2b6c83175 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Coupons/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Coupons/Collection.php index f58ae8601..8b2c0dbb2 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Coupons/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Coupons/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php index 19ac04a92..b59f12e22 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Customer/Orders/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Customer/Orders/Collection.php index 24d5fe173..b2a897e3e 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Customer/Orders/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Customer/Orders/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Customer/Totals/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Customer/Totals/Collection.php index fb50d983d..4dba3152d 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Customer/Totals/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Customer/Totals/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Entity/Summary/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Entity/Summary/Collection/Abstract.php index 1bfb58303..6c6d40dc3 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Entity/Summary/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Entity/Summary/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Event.php b/app/code/core/Mage/Reports/Model/Resource/Event.php index bcc7c556e..27c0fbaf3 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php index ebb8255bc..cf07d5c74 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Event/Type.php b/app/code/core/Mage/Reports/Model/Resource/Event/Type.php index f80575492..0b028bcc4 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php index d583345cf..570edce3f 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php b/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php index dcf0ca457..ea0b93c17 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php +++ b/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Reports/Model/Resource/Helper/Mysql4.php index 8af4d8f63..6c9fafdab 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Reports/Model/Resource/Helper/Mysql4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Invoiced/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Invoiced/Collection.php index c40a72d1b..f34b2d234 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Invoiced/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Invoiced/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php index a61d59280..4eccfe5f9 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php index b3feb4e35..00391ce0c 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Downloads/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Downloads/Collection.php index 5c1dadcdf..4cce64e5b 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Downloads/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Downloads/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php index b8a2628ad..95b37e219 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php index 0244028c7..c474ae71f 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared.php index d60153ea5..f4325c97a 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared/Collection.php index 44676717b..07ad909cf 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed.php index 85a8393c8..671f1229a 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed/Collection.php index ede3c31d5..3f7274bc8 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php index a617516ef..c16140153 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php index 422b4cfe3..0601fa00e 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php index d11de93f4..2ac3b8dc4 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php index 3e127f87b..7b64dc3cb 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php index 373547839..a5a2a80e4 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Refunded/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Refunded/Collection.php index 94d09bbc9..1cb7f6c5a 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Refunded/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Refunded/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php index 03fea0d43..65f768068 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php index 9a3cff087..dd56ff4b0 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php index 3f9bd6d84..c892878b0 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php index 25aca2d12..f4026d283 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php index c98c192a4..cb899eb8f 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php index f1688f254..cf89db0b7 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Review/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Review/Customer/Collection.php index b4232c051..1a797503f 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Review/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Review/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php index 8feb45566..0e74993dc 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Shipping/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Shipping/Collection.php index 0c45ab842..85b8650e1 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Shipping/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Shipping/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Shopcart/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Shopcart/Product/Collection.php index 2f177f1e1..5cfa107ac 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Shopcart/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Shopcart/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Tag/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tag/Collection.php index adb8d10b8..7cceb149c 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Tag/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Tag/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php index 97c6eb0c6..c2c31fb91 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Tag/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tag/Product/Collection.php index fa8701a64..5a9e22670 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Tag/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Tag/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Tax/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tax/Collection.php index 5a97b3ef3..ae49eaf52 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Tax/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Tax/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php index 5d0433e25..b4d02ca92 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php index 7d0ef0dd0..9daa8b338 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Session.php b/app/code/core/Mage/Reports/Model/Session.php index ed60bcaca..5a74df6ea 100644 --- a/app/code/core/Mage/Reports/Model/Session.php +++ b/app/code/core/Mage/Reports/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Test.php b/app/code/core/Mage/Reports/Model/Test.php index 69a30a995..1db39de09 100644 --- a/app/code/core/Mage/Reports/Model/Test.php +++ b/app/code/core/Mage/Reports/Model/Test.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Totals.php b/app/code/core/Mage/Reports/Model/Totals.php index 1a6a5d505..5f146d8d0 100644 --- a/app/code/core/Mage/Reports/Model/Totals.php +++ b/app/code/core/Mage/Reports/Model/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php index 47123e91c..a3eab8314 100644 --- a/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/etc/adminhtml.xml b/app/code/core/Mage/Reports/etc/adminhtml.xml index feb9045ef..fb123f45e 100644 --- a/app/code/core/Mage/Reports/etc/adminhtml.xml +++ b/app/code/core/Mage/Reports/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/etc/config.xml b/app/code/core/Mage/Reports/etc/config.xml index b4384b6b8..7916cc71d 100644 --- a/app/code/core/Mage/Reports/etc/config.xml +++ b/app/code/core/Mage/Reports/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/etc/system.xml b/app/code/core/Mage/Reports/etc/system.xml index b3bca8268..cb9ef59a3 100644 --- a/app/code/core/Mage/Reports/etc/system.xml +++ b/app/code/core/Mage/Reports/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/etc/widget.xml b/app/code/core/Mage/Reports/etc/widget.xml index 36384fa7c..cbe60fbcd 100644 --- a/app/code/core/Mage/Reports/etc/widget.xml +++ b/app/code/core/Mage/Reports/etc/widget.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/sql/reports_setup/install-1.6.0.0.php b/app/code/core/Mage/Reports/sql/reports_setup/install-1.6.0.0.php index 78052dc51..37fcec4cb 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php index c725bae83..494e58e1a 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.5.0.0.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.5.0.0.php index 8a34ead07..da5f4b329 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.5.0.0.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.5.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.6.0.0.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.6.0.0.php index d06857ffb..f904212a0 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.6.0.0.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php index ae956bebb..fc1f2d9d1 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.1-0.7.2.php index f5f647799..0314fa4bb 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.2-0.7.3.php index 5d7472382..399a37696 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.3-0.7.4.php index 3647d1291..824481d53 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.4-0.7.5.php index 39c7bf3c9..51346e6ff 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.5-0.7.7.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.5-0.7.7.php index 254dc2eed..c96552bff 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.5-0.7.7.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.5-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.7-0.7.8.php index cf4133213..f9dc76b2b 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.8-0.7.9.php index 9a1955345..8b30b1937 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.9-0.7.10.php index 388326920..90403e8cd 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index f572cc59f..3c94357c3 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Reports/sql/reports_setup/upgrade-1.6.0.0-1.6.0.0.1.php index d87436f95..f673744d6 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/upgrade-1.6.0.0-1.6.0.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Reports - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Block/Customer/List.php b/app/code/core/Mage/Review/Block/Customer/List.php index e9cdf9bea..2cb6aec43 100644 --- a/app/code/core/Mage/Review/Block/Customer/List.php +++ b/app/code/core/Mage/Review/Block/Customer/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Block/Customer/Recent.php b/app/code/core/Mage/Review/Block/Customer/Recent.php index fcb778bf5..30f53f5ae 100644 --- a/app/code/core/Mage/Review/Block/Customer/Recent.php +++ b/app/code/core/Mage/Review/Block/Customer/Recent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Block/Customer/View.php b/app/code/core/Mage/Review/Block/Customer/View.php index cfd6274db..0dfea6874 100644 --- a/app/code/core/Mage/Review/Block/Customer/View.php +++ b/app/code/core/Mage/Review/Block/Customer/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Block/Form.php b/app/code/core/Mage/Review/Block/Form.php index 891e5587c..9d81d9a66 100644 --- a/app/code/core/Mage/Review/Block/Form.php +++ b/app/code/core/Mage/Review/Block/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Block/Helper.php b/app/code/core/Mage/Review/Block/Helper.php index 6bbe1f887..93aa77768 100644 --- a/app/code/core/Mage/Review/Block/Helper.php +++ b/app/code/core/Mage/Review/Block/Helper.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Block/Product/View.php b/app/code/core/Mage/Review/Block/Product/View.php index 12bc934b8..ef8b56875 100644 --- a/app/code/core/Mage/Review/Block/Product/View.php +++ b/app/code/core/Mage/Review/Block/Product/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Block/Product/View/List.php b/app/code/core/Mage/Review/Block/Product/View/List.php index 3f67dda04..506084d0f 100644 --- a/app/code/core/Mage/Review/Block/Product/View/List.php +++ b/app/code/core/Mage/Review/Block/Product/View/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -62,6 +62,6 @@ protected function _beforeToHtml() public function getReviewUrl($id) { - return Mage::getUrl('review/product/view', array('id' => $id)); + return Mage::getUrl('*/*/view', array('id' => $id)); } } diff --git a/app/code/core/Mage/Review/Block/View.php b/app/code/core/Mage/Review/Block/View.php index c35d8ea98..605205d6a 100644 --- a/app/code/core/Mage/Review/Block/View.php +++ b/app/code/core/Mage/Review/Block/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Helper/Data.php b/app/code/core/Mage/Review/Helper/Data.php index 4b9a61362..bf9a9d597 100644 --- a/app/code/core/Mage/Review/Helper/Data.php +++ b/app/code/core/Mage/Review/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review.php b/app/code/core/Mage/Review/Model/Mysql4/Review.php index f8a3e1c71..637821366 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php index 02c61f481..a1d1d5033 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php index a555f46d9..41ed40fe4 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php index b95974b97..dfec95529 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php index 292806c1b..9d0327eb3 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php index f7fb74f10..2dcdbae9c 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Observer.php b/app/code/core/Mage/Review/Model/Observer.php index 8b009c2ed..e53b0ad88 100644 --- a/app/code/core/Mage/Review/Model/Observer.php +++ b/app/code/core/Mage/Review/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Resource/Review.php b/app/code/core/Mage/Review/Model/Resource/Review.php index 4609c7639..75d7cd908 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review.php +++ b/app/code/core/Mage/Review/Model/Resource/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Collection.php index 971c8d5ae..20fd437da 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Collection.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php index 40983c714..19b7eb0db 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Status.php b/app/code/core/Mage/Review/Model/Resource/Review/Status.php index 6036ffa82..755a4b3c9 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Status.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php index 1084631a3..dbe94cbef 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Summary.php b/app/code/core/Mage/Review/Model/Resource/Review/Summary.php index 8435f0f93..92eb0d516 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Summary.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Summary/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Summary/Collection.php index 895de6522..0ac8440ee 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Summary/Collection.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Summary/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Review.php b/app/code/core/Mage/Review/Model/Review.php index 3fcae1762..e1c4ff40b 100644 --- a/app/code/core/Mage/Review/Model/Review.php +++ b/app/code/core/Mage/Review/Model/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Review/Status.php b/app/code/core/Mage/Review/Model/Review/Status.php index 471a37ef0..5d5628bd9 100644 --- a/app/code/core/Mage/Review/Model/Review/Status.php +++ b/app/code/core/Mage/Review/Model/Review/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Review/Summary.php b/app/code/core/Mage/Review/Model/Review/Summary.php index 2f9c7adfb..97a5d78aa 100644 --- a/app/code/core/Mage/Review/Model/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Review/Summary.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Session.php b/app/code/core/Mage/Review/Model/Session.php index 03fd484b2..6fcf90e08 100644 --- a/app/code/core/Mage/Review/Model/Session.php +++ b/app/code/core/Mage/Review/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/controllers/CustomerController.php b/app/code/core/Mage/Review/controllers/CustomerController.php index cebc5bc15..208424629 100644 --- a/app/code/core/Mage/Review/controllers/CustomerController.php +++ b/app/code/core/Mage/Review/controllers/CustomerController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/controllers/ProductController.php b/app/code/core/Mage/Review/controllers/ProductController.php index 8d7f263fb..55c36aed3 100644 --- a/app/code/core/Mage/Review/controllers/ProductController.php +++ b/app/code/core/Mage/Review/controllers/ProductController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/data/review_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Review/data/review_setup/data-install-1.6.0.0.php index b127be6b9..d67e1db41 100644 --- a/app/code/core/Mage/Review/data/review_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Review/data/review_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/etc/adminhtml.xml b/app/code/core/Mage/Review/etc/adminhtml.xml index 3af632129..f1a3805d1 100644 --- a/app/code/core/Mage/Review/etc/adminhtml.xml +++ b/app/code/core/Mage/Review/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Review/etc/config.xml b/app/code/core/Mage/Review/etc/config.xml index 7f1f45b36..04a300acc 100644 --- a/app/code/core/Mage/Review/etc/config.xml +++ b/app/code/core/Mage/Review/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Review/etc/system.xml b/app/code/core/Mage/Review/etc/system.xml index 1beea203a..4c10e1405 100644 --- a/app/code/core/Mage/Review/etc/system.xml +++ b/app/code/core/Mage/Review/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Review/sql/review_setup/install-1.6.0.0.php b/app/code/core/Mage/Review/sql/review_setup/install-1.6.0.0.php index 59714295a..6e3f1dbf8 100644 --- a/app/code/core/Mage/Review/sql/review_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Review/sql/review_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-install-0.7.0.php index 4cd1fe821..dbcb94a64 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.0-0.7.1.php index 31e562607..59c4506ce 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php index 3bf5abc71..b3c461e4b 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php index 20d637acf..113e5565b 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.3-0.7.4.php index c572a441e..055cc6f8c 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.4-0.7.5.php index 23fd6e414..d8bf0ee2c 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.5-0.7.6.php index 74f694089..326eeb298 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 991d7e81b..198adc5f1 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Review - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Abstract.php b/app/code/core/Mage/Rss/Block/Abstract.php index 6af7d76b9..d86280a3f 100644 --- a/app/code/core/Mage/Rss/Block/Abstract.php +++ b/app/code/core/Mage/Rss/Block/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Rss_Block_Abstract extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Rss/Block/Catalog/Abstract.php b/app/code/core/Mage/Rss/Block/Catalog/Abstract.php index 70d20bf9f..977fa1781 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Abstract.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Rss_Block_Catalog_Abstract extends Mage_Rss_Block_Abstract diff --git a/app/code/core/Mage/Rss/Block/Catalog/Category.php b/app/code/core/Mage/Rss/Block/Catalog/Category.php index 66c5ea625..f0f850768 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Category.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Catalog/New.php b/app/code/core/Mage/Rss/Block/Catalog/New.php index bfc4265d0..40e816845 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/New.php +++ b/app/code/core/Mage/Rss/Block/Catalog/New.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php index 119f68596..d78e9e20d 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php +++ b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Catalog/Review.php b/app/code/core/Mage/Rss/Block/Catalog/Review.php index 47b98666d..af4d73b2d 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Review.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Catalog/Salesrule.php b/app/code/core/Mage/Rss/Block/Catalog/Salesrule.php index 2a96436a8..00513aefb 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Salesrule.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Salesrule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Catalog/Special.php b/app/code/core/Mage/Rss/Block/Catalog/Special.php index 14341a959..92d3a52c2 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Special.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Special.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Catalog/Tag.php b/app/code/core/Mage/Rss/Block/Catalog/Tag.php index 784975f7e..e643e98f1 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Tag.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Tag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/List.php b/app/code/core/Mage/Rss/Block/List.php index c870992b4..c22fee8c5 100644 --- a/app/code/core/Mage/Rss/Block/List.php +++ b/app/code/core/Mage/Rss/Block/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Order/Details.php b/app/code/core/Mage/Rss/Block/Order/Details.php index 99b79a399..1fc4d6c15 100644 --- a/app/code/core/Mage/Rss/Block/Order/Details.php +++ b/app/code/core/Mage/Rss/Block/Order/Details.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Rss_Block_Order_Details extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Rss/Block/Order/New.php b/app/code/core/Mage/Rss/Block/Order/New.php index 7cfc0c5bb..7d3ca9de3 100644 --- a/app/code/core/Mage/Rss/Block/Order/New.php +++ b/app/code/core/Mage/Rss/Block/Order/New.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Order/Status.php b/app/code/core/Mage/Rss/Block/Order/Status.php index e59bcde5b..6cabe5b80 100644 --- a/app/code/core/Mage/Rss/Block/Order/Status.php +++ b/app/code/core/Mage/Rss/Block/Order/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Wishlist.php b/app/code/core/Mage/Rss/Block/Wishlist.php index 14f6724e0..358ee7686 100644 --- a/app/code/core/Mage/Rss/Block/Wishlist.php +++ b/app/code/core/Mage/Rss/Block/Wishlist.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Helper/Catalog.php b/app/code/core/Mage/Rss/Helper/Catalog.php index 663121eba..02f1c4549 100644 --- a/app/code/core/Mage/Rss/Helper/Catalog.php +++ b/app/code/core/Mage/Rss/Helper/Catalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Helper/Data.php b/app/code/core/Mage/Rss/Helper/Data.php index b75da8e4f..cc18b506d 100644 --- a/app/code/core/Mage/Rss/Helper/Data.php +++ b/app/code/core/Mage/Rss/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Helper/Order.php b/app/code/core/Mage/Rss/Helper/Order.php index 1a2d8f46b..2a0a8e41c 100644 --- a/app/code/core/Mage/Rss/Helper/Order.php +++ b/app/code/core/Mage/Rss/Helper/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Model/Mysql4/Order.php b/app/code/core/Mage/Rss/Model/Mysql4/Order.php index 44d285b68..9ffbb0abd 100644 --- a/app/code/core/Mage/Rss/Model/Mysql4/Order.php +++ b/app/code/core/Mage/Rss/Model/Mysql4/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Model/Observer.php b/app/code/core/Mage/Rss/Model/Observer.php index 93efdebeb..6b5d2c635 100644 --- a/app/code/core/Mage/Rss/Model/Observer.php +++ b/app/code/core/Mage/Rss/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Model/Resource/Order.php b/app/code/core/Mage/Rss/Model/Resource/Order.php index 3fb3a7dcb..b415e24d9 100644 --- a/app/code/core/Mage/Rss/Model/Resource/Order.php +++ b/app/code/core/Mage/Rss/Model/Resource/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Model/Rss.php b/app/code/core/Mage/Rss/Model/Rss.php index 9576d5ea0..908134675 100644 --- a/app/code/core/Mage/Rss/Model/Rss.php +++ b/app/code/core/Mage/Rss/Model/Rss.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Model/Session.php b/app/code/core/Mage/Rss/Model/Session.php index bf016a97c..de2503584 100644 --- a/app/code/core/Mage/Rss/Model/Session.php +++ b/app/code/core/Mage/Rss/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Model/System/Config/Backend/Links.php b/app/code/core/Mage/Rss/Model/System/Config/Backend/Links.php index 303de6db6..494f15821 100644 --- a/app/code/core/Mage/Rss/Model/System/Config/Backend/Links.php +++ b/app/code/core/Mage/Rss/Model/System/Config/Backend/Links.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/controllers/CatalogController.php b/app/code/core/Mage/Rss/controllers/CatalogController.php index f3a33b4ec..d1e011f83 100644 --- a/app/code/core/Mage/Rss/controllers/CatalogController.php +++ b/app/code/core/Mage/Rss/controllers/CatalogController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/controllers/IndexController.php b/app/code/core/Mage/Rss/controllers/IndexController.php index ad4f31434..7b48f0f50 100644 --- a/app/code/core/Mage/Rss/controllers/IndexController.php +++ b/app/code/core/Mage/Rss/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/controllers/OrderController.php b/app/code/core/Mage/Rss/controllers/OrderController.php index 2013253bb..4274e6661 100644 --- a/app/code/core/Mage/Rss/controllers/OrderController.php +++ b/app/code/core/Mage/Rss/controllers/OrderController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/etc/adminhtml.xml b/app/code/core/Mage/Rss/etc/adminhtml.xml index 5e85b95e8..4dbbb7519 100644 --- a/app/code/core/Mage/Rss/etc/adminhtml.xml +++ b/app/code/core/Mage/Rss/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rss/etc/config.xml b/app/code/core/Mage/Rss/etc/config.xml index 0b0d0879f..d2d5cdc93 100644 --- a/app/code/core/Mage/Rss/etc/config.xml +++ b/app/code/core/Mage/Rss/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rss/etc/system.xml b/app/code/core/Mage/Rss/etc/system.xml index 75269b71a..4c4d94823 100644 --- a/app/code/core/Mage/Rss/etc/system.xml +++ b/app/code/core/Mage/Rss/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Rss - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rule/Block/Actions.php b/app/code/core/Mage/Rule/Block/Actions.php index 9e8ffa3e4..923732cea 100644 --- a/app/code/core/Mage/Rule/Block/Actions.php +++ b/app/code/core/Mage/Rule/Block/Actions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Block/Conditions.php b/app/code/core/Mage/Rule/Block/Conditions.php index 0b885a4ef..437951216 100644 --- a/app/code/core/Mage/Rule/Block/Conditions.php +++ b/app/code/core/Mage/Rule/Block/Conditions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Block/Editable.php b/app/code/core/Mage/Rule/Block/Editable.php index 9f7ad95a0..07379a3e4 100644 --- a/app/code/core/Mage/Rule/Block/Editable.php +++ b/app/code/core/Mage/Rule/Block/Editable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Block/Newchild.php b/app/code/core/Mage/Rule/Block/Newchild.php index 94105dc48..598212f7e 100644 --- a/app/code/core/Mage/Rule/Block/Newchild.php +++ b/app/code/core/Mage/Rule/Block/Newchild.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Block/Rule.php b/app/code/core/Mage/Rule/Block/Rule.php index 74c5d8323..8b890d19d 100644 --- a/app/code/core/Mage/Rule/Block/Rule.php +++ b/app/code/core/Mage/Rule/Block/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Helper/Data.php b/app/code/core/Mage/Rule/Helper/Data.php index 7c942b53e..74c853586 100644 --- a/app/code/core/Mage/Rule/Helper/Data.php +++ b/app/code/core/Mage/Rule/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Abstract.php b/app/code/core/Mage/Rule/Model/Abstract.php index e9c652748..212981bfc 100644 --- a/app/code/core/Mage/Rule/Model/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Action/Abstract.php b/app/code/core/Mage/Rule/Model/Action/Abstract.php index f705ea57e..7ddff9ff7 100644 --- a/app/code/core/Mage/Rule/Model/Action/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Action/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Action/Collection.php b/app/code/core/Mage/Rule/Model/Action/Collection.php index 3a184451e..d83a52965 100644 --- a/app/code/core/Mage/Rule/Model/Action/Collection.php +++ b/app/code/core/Mage/Rule/Model/Action/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Action/Interface.php b/app/code/core/Mage/Rule/Model/Action/Interface.php index f6d96e00f..68038e805 100644 --- a/app/code/core/Mage/Rule/Model/Action/Interface.php +++ b/app/code/core/Mage/Rule/Model/Action/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php index ab880db05..2a9e91b41 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Condition/Combine.php b/app/code/core/Mage/Rule/Model/Condition/Combine.php index 064091a2a..3285b3d03 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Combine.php +++ b/app/code/core/Mage/Rule/Model/Condition/Combine.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Condition/Interface.php b/app/code/core/Mage/Rule/Model/Condition/Interface.php index c0dc01fea..610712e67 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Interface.php +++ b/app/code/core/Mage/Rule/Model/Condition/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php index 02822e64d..4db755571 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -520,7 +520,7 @@ public function validate(Varien_Object $object) } if ('category_ids' == $attrCode) { - return $this->validateAttribute($object->getCategoryIds()); + return $this->validateAttribute($object->getAvailableInCategories()); } elseif (! isset($this->_entityAttributeValues[$object->getId()])) { if (!$object->getResource()) { return false; diff --git a/app/code/core/Mage/Rule/Model/Environment.php b/app/code/core/Mage/Rule/Model/Environment.php index 38c59a944..82ded1aa0 100644 --- a/app/code/core/Mage/Rule/Model/Environment.php +++ b/app/code/core/Mage/Rule/Model/Environment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Mysql4/Rule.php b/app/code/core/Mage/Rule/Model/Mysql4/Rule.php index e886333ea..43427b156 100644 --- a/app/code/core/Mage/Rule/Model/Mysql4/Rule.php +++ b/app/code/core/Mage/Rule/Model/Mysql4/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php index 57b0429f3..6f8d5b698 100644 --- a/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php +++ b/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Renderer/Actions.php b/app/code/core/Mage/Rule/Model/Renderer/Actions.php index 607a618b8..172612bc3 100644 --- a/app/code/core/Mage/Rule/Model/Renderer/Actions.php +++ b/app/code/core/Mage/Rule/Model/Renderer/Actions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Renderer/Conditions.php b/app/code/core/Mage/Rule/Model/Renderer/Conditions.php index 29f0646cf..703791c5f 100644 --- a/app/code/core/Mage/Rule/Model/Renderer/Conditions.php +++ b/app/code/core/Mage/Rule/Model/Renderer/Conditions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Resource/Abstract.php b/app/code/core/Mage/Rule/Model/Resource/Abstract.php index 28aaea955..50bedbb2d 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Resource/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule.php b/app/code/core/Mage/Rule/Model/Resource/Rule.php index 0448c0eed..e55c8ad80 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Rule.php +++ b/app/code/core/Mage/Rule/Model/Resource/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection.php index 50ca9f13b..d2c2fc376 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection.php +++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php index 6bf082ad5..41fce9a46 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php index edc3dea04..d7d3a40c0 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php +++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Rule.php b/app/code/core/Mage/Rule/Model/Rule.php index de9e2feae..8eb47e583 100644 --- a/app/code/core/Mage/Rule/Model/Rule.php +++ b/app/code/core/Mage/Rule/Model/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/etc/config.xml b/app/code/core/Mage/Rule/etc/config.xml index 1ffb661e3..103687c77 100644 --- a/app/code/core/Mage/Rule/etc/config.xml +++ b/app/code/core/Mage/Rule/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Rule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement.php index 56ba3d103..0784378f7 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/Grid.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/Grid.php index f159a070f..3a2fcf10c 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/Grid.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php index 7efc6fa9b..56fa4d062 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php index 2dbb9f6c4..8b0afd5e6 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php index 6240ace40..9e4a4d111 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php index 7434c12a1..be8b63974 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tabs.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tabs.php index 5a20d54f1..847f1fc59 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tabs.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php index 497ef7602..cdbdfd386 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php index 4445a6b88..afee52afb 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile.php index 1f9b2bc0f..b264c805a 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php index 93e4afb0d..ade6d2c0e 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php index 4879ea4f8..27949fd0b 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php index 3fd38ed98..6a6323827 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php index 690926c62..0a737f673 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php index 270dcbcb8..1204e7efd 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php index f787449c3..1f856faac 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Info.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Info.php index 9c04aa3c8..706419112 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Info.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php index 53bb7de70..ae549d5ee 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -140,7 +140,6 @@ protected function _prepareColumns() 'sortable' => false, 'index' => 'stores', 'is_system' => true, - 'data-column' => 'action', )); } diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php index 60b1ac343..4e1cea4cb 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php index ec26049da..b900c0862 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Order.php b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Order.php index a38ca8c5e..3f21ee7c1 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Order.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php index 279a94331..10ff5b36b 100644 --- a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php +++ b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Billing/Agreements.php b/app/code/core/Mage/Sales/Block/Billing/Agreements.php index 3ddaca1bf..73e5660ce 100644 --- a/app/code/core/Mage/Sales/Block/Billing/Agreements.php +++ b/app/code/core/Mage/Sales/Block/Billing/Agreements.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Guest/Links.php b/app/code/core/Mage/Sales/Block/Guest/Links.php index 343e195e9..bb61a92a1 100644 --- a/app/code/core/Mage/Sales/Block/Guest/Links.php +++ b/app/code/core/Mage/Sales/Block/Guest/Links.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Items/Abstract.php b/app/code/core/Mage/Sales/Block/Items/Abstract.php index 669127246..f41ef2f9d 100644 --- a/app/code/core/Mage/Sales/Block/Items/Abstract.php +++ b/app/code/core/Mage/Sales/Block/Items/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Comments.php b/app/code/core/Mage/Sales/Block/Order/Comments.php index b588c2ea6..dbe4b353c 100644 --- a/app/code/core/Mage/Sales/Block/Order/Comments.php +++ b/app/code/core/Mage/Sales/Block/Order/Comments.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Sales_Block_Order_Comments extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Sales/Block/Order/Creditmemo.php b/app/code/core/Mage/Sales/Block/Order/Creditmemo.php index 404a5ac42..919df37b1 100644 --- a/app/code/core/Mage/Sales/Block/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Block/Order/Creditmemo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Items.php b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Items.php index 4482634ac..c13671331 100644 --- a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php index 2a35462b1..26a33fe13 100644 --- a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Sales_Block_Order_Creditmemo_Totals extends Mage_Sales_Block_Order_Totals diff --git a/app/code/core/Mage/Sales/Block/Order/Details.php b/app/code/core/Mage/Sales/Block/Order/Details.php index 08bf9b0bd..e8564c605 100644 --- a/app/code/core/Mage/Sales/Block/Order/Details.php +++ b/app/code/core/Mage/Sales/Block/Order/Details.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php index d077c1ab1..0b2db4556 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php index 374b0c36a..d0fe0958b 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Items.php index 81603c4b7..719716acc 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php index 328de26d8..52b868e14 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php index 0422ddd95..adfbbaa09 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php index 50ca0d383..efeea02da 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php index 9c0915df2..39df9a03f 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/History.php b/app/code/core/Mage/Sales/Block/Order/History.php index 08cccd161..ffc981e04 100644 --- a/app/code/core/Mage/Sales/Block/Order/History.php +++ b/app/code/core/Mage/Sales/Block/Order/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Info.php b/app/code/core/Mage/Sales/Block/Order/Info.php index b2fc36803..7d3399b16 100644 --- a/app/code/core/Mage/Sales/Block/Order/Info.php +++ b/app/code/core/Mage/Sales/Block/Order/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Info/Buttons.php b/app/code/core/Mage/Sales/Block/Order/Info/Buttons.php index f87c99c71..dc46e0472 100644 --- a/app/code/core/Mage/Sales/Block/Order/Info/Buttons.php +++ b/app/code/core/Mage/Sales/Block/Order/Info/Buttons.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Invoice.php b/app/code/core/Mage/Sales/Block/Order/Invoice.php index 4f6dea2fc..75b08ca6c 100644 --- a/app/code/core/Mage/Sales/Block/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Block/Order/Invoice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Invoice/Items.php b/app/code/core/Mage/Sales/Block/Order/Invoice/Items.php index 080194b93..bcaa97a91 100644 --- a/app/code/core/Mage/Sales/Block/Order/Invoice/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Invoice/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php b/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php index e2b06d252..455d92230 100644 --- a/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Sales_Block_Order_Invoice_Totals extends Mage_Sales_Block_Order_Totals diff --git a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php index 0774bb31e..afb416e16 100644 --- a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php index 63a7d8a18..3f7699dbf 100644 --- a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php +++ b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Items.php b/app/code/core/Mage/Sales/Block/Order/Items.php index 361c5e223..8048843a8 100644 --- a/app/code/core/Mage/Sales/Block/Order/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Print.php b/app/code/core/Mage/Sales/Block/Order/Print.php index 984d21c75..154b01ae6 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print.php +++ b/app/code/core/Mage/Sales/Block/Order/Print.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php b/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php index a6e0ebe05..954b91269 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php b/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php index d9cff2b15..de1cebb1f 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php index af1dc6c48..449340326 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Recent.php b/app/code/core/Mage/Sales/Block/Order/Recent.php index ee399f360..dc6d361c4 100644 --- a/app/code/core/Mage/Sales/Block/Order/Recent.php +++ b/app/code/core/Mage/Sales/Block/Order/Recent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Shipment.php index a5632fd4f..663abe1d7 100644 --- a/app/code/core/Mage/Sales/Block/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Block/Order/Shipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Shipment/Items.php b/app/code/core/Mage/Sales/Block/Order/Shipment/Items.php index 3f112a6b3..7af32e4aa 100644 --- a/app/code/core/Mage/Sales/Block/Order/Shipment/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Shipment/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Tax.php b/app/code/core/Mage/Sales/Block/Order/Tax.php index 0b55b8931..fcbac6edc 100644 --- a/app/code/core/Mage/Sales/Block/Order/Tax.php +++ b/app/code/core/Mage/Sales/Block/Order/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Totals.php b/app/code/core/Mage/Sales/Block/Order/Totals.php index bb3b2f311..d989f074e 100644 --- a/app/code/core/Mage/Sales/Block/Order/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Sales_Block_Order_Totals extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Sales/Block/Order/View.php b/app/code/core/Mage/Sales/Block/Order/View.php index 6449b252c..70cac16a7 100644 --- a/app/code/core/Mage/Sales/Block/Order/View.php +++ b/app/code/core/Mage/Sales/Block/Order/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Payment/Form/Billing/Agreement.php b/app/code/core/Mage/Sales/Block/Payment/Form/Billing/Agreement.php index f2775a531..f47d977d3 100644 --- a/app/code/core/Mage/Sales/Block/Payment/Form/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Block/Payment/Form/Billing/Agreement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Payment/Info/Billing/Agreement.php b/app/code/core/Mage/Sales/Block/Payment/Info/Billing/Agreement.php index b8a5c6903..10fd16858 100644 --- a/app/code/core/Mage/Sales/Block/Payment/Info/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Block/Payment/Info/Billing/Agreement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php index a189bfc98..1b7b2c17e 100644 --- a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php +++ b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Recurring/Profiles.php b/app/code/core/Mage/Sales/Block/Recurring/Profiles.php index 266f212e6..c50d82e41 100644 --- a/app/code/core/Mage/Sales/Block/Recurring/Profiles.php +++ b/app/code/core/Mage/Sales/Block/Recurring/Profiles.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php index 1d6e40301..f46bd92fd 100644 --- a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php +++ b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php b/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php index 95e5566f9..850825205 100644 --- a/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php +++ b/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Controller/Abstract.php b/app/code/core/Mage/Sales/Controller/Abstract.php index 463dd7cc4..ed61bb532 100644 --- a/app/code/core/Mage/Sales/Controller/Abstract.php +++ b/app/code/core/Mage/Sales/Controller/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Exception.php b/app/code/core/Mage/Sales/Exception.php index e1b94b067..6ad9c8a05 100644 --- a/app/code/core/Mage/Sales/Exception.php +++ b/app/code/core/Mage/Sales/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Helper/Data.php b/app/code/core/Mage/Sales/Helper/Data.php index 4a8f7f35f..621baa26d 100644 --- a/app/code/core/Mage/Sales/Helper/Data.php +++ b/app/code/core/Mage/Sales/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Helper/Guest.php b/app/code/core/Mage/Sales/Helper/Guest.php index d20983af0..3431db34f 100644 --- a/app/code/core/Mage/Sales/Helper/Guest.php +++ b/app/code/core/Mage/Sales/Helper/Guest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -96,22 +96,17 @@ public function loadValidOrder() } if (!$errors) { - $toCookie = base64_encode($order->getProtectCode() . ':' . $incrementId); + $toCookie = base64_encode($order->getProtectCode()); Mage::getSingleton('core/cookie')->set($this->_cookieName, $toCookie, $this->_lifeTime, '/'); } } elseif (Mage::getSingleton('core/cookie')->get($this->_cookieName)) { - $fromCookie = Mage::getSingleton('core/cookie')->get($this->_cookieName); - $cookieData = explode(':', base64_decode($fromCookie)); - $protectCode = isset($cookieData[0]) ? $cookieData[0] : null; - $incrementId = isset($cookieData[1]) ? $cookieData[1] : null; + $fromCookie = Mage::getSingleton('core/cookie')->get($this->_cookieName); + $protectCode = base64_decode($fromCookie); - if (!empty($protectCode) && !empty($incrementId)) { - $order->loadByIncrementId($incrementId); - if ($order->getProtectCode() == $protectCode) { - Mage::getSingleton('core/cookie')->renew($this->_cookieName, $this->_lifeTime, '/'); - } else { - $errors = true; - } + if (!empty($protectCode)) { + $order->loadByAttribute('protect_code', $protectCode); + + Mage::getSingleton('core/cookie')->renew($this->_cookieName, $this->_lifeTime, '/'); } else { $errors = true; } diff --git a/app/code/core/Mage/Sales/Helper/Reorder.php b/app/code/core/Mage/Sales/Helper/Reorder.php index 0c3c314ce..ac8eaf683 100644 --- a/app/code/core/Mage/Sales/Helper/Reorder.php +++ b/app/code/core/Mage/Sales/Helper/Reorder.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Abstract.php b/app/code/core/Mage/Sales/Model/Abstract.php index 3a49b5932..5a1283d11 100644 --- a/app/code/core/Mage/Sales/Model/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api/Resource.php b/app/code/core/Mage/Sales/Model/Api/Resource.php index 0afb32b73..df9535119 100644 --- a/app/code/core/Mage/Sales/Model/Api/Resource.php +++ b/app/code/core/Mage/Sales/Model/Api/Resource.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order.php b/app/code/core/Mage/Sales/Model/Api2/Order.php index d273be972..bb433e6a7 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Address.php b/app/code/core/Mage/Sales/Model/Api2/Order/Address.php index d5c109988..e9cee8180 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest.php b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest.php index e3c8eec7c..a354573ce 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.php index d5f1f566d..bd0ddb2ea 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Customer/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Customer/V1.php index d57d40071..e42f4eb3a 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Customer/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Customer/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Comment.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment.php index 347ba3ed9..e36a1a62c 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php index 292e0b522..f693e3099 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php index 96536d581..2bbd9912d 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Customer/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Customer/V1.php index c0829d4a0..e1dab897d 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Customer/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Customer/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Item.php b/app/code/core/Mage/Sales/Model/Api2/Order/Item.php index 481a374ac..73aeb6002 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest.php b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest.php index 9d5be23a7..03f37edf3 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Admin/V1.php index a1ba0d7ed..3fce94fca 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Admin/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Customer/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Customer/V1.php index 9b6b3b6d7..bbd9094b3 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Customer/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Customer/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Rest.php b/app/code/core/Mage/Sales/Model/Api2/Order/Rest.php index d9f9594fd..52437bcf4 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Rest.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Admin/V1.php index c3480b14d..e8c5e0fc5 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Admin/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Customer/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Customer/V1.php index 02f02447f..bb477cdc5 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Customer/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Customer/V1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Billing/Agreement.php index c6845bce7..abcc9fd9c 100644 --- a/app/code/core/Mage/Sales/Model/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Model/Billing/Agreement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Config.php b/app/code/core/Mage/Sales/Model/Config.php index 594b3b885..2ee037817 100644 --- a/app/code/core/Mage/Sales/Model/Config.php +++ b/app/code/core/Mage/Sales/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Config/Ordered.php b/app/code/core/Mage/Sales/Model/Config/Ordered.php index 29882576c..8f1125912 100644 --- a/app/code/core/Mage/Sales/Model/Config/Ordered.php +++ b/app/code/core/Mage/Sales/Model/Config/Ordered.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Convert/Order.php b/app/code/core/Mage/Sales/Model/Convert/Order.php index 1733f196c..70fd2909a 100644 --- a/app/code/core/Mage/Sales/Model/Convert/Order.php +++ b/app/code/core/Mage/Sales/Model/Convert/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Convert/Quote.php b/app/code/core/Mage/Sales/Model/Convert/Quote.php index bf41d1a98..aa881d544 100644 --- a/app/code/core/Mage/Sales/Model/Convert/Quote.php +++ b/app/code/core/Mage/Sales/Model/Convert/Quote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Email/Template.php b/app/code/core/Mage/Sales/Model/Email/Template.php index e50521aed..89ee6aa62 100644 --- a/app/code/core/Mage/Sales/Model/Email/Template.php +++ b/app/code/core/Mage/Sales/Model/Email/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order.php b/app/code/core/Mage/Sales/Model/Entity/Order.php index 9278c0d67..9b2aeeb8b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Address.php b/app/code/core/Mage/Sales/Model/Entity/Order/Address.php index 29114d32c..c2efdd100 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php index 1a9093feb..5f929184d 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Billing.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Billing.php index 4faaef188..9de2a474a 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Billing.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Child.php index aebc7091a..bfe4c9adc 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Parent.php index 989f481db..1dfe3766b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php index 10b478467..4770aef3b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php index fde76abe7..a8ba9fb2c 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php index dc784a901..eba82a782 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Child.php index 2973f145e..d74da62ac 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Parent.php index 2fd2afb11..78461c546 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php index a2e31df04..36d21a31f 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php index 58c20eeb9..6479528f5 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php index 20f0e1f0f..2a636fcf4 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php index d257f9e09..2a703bf38 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php index a6ad10f81..757c283d0 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php index 1f68d807e..4fc6ae437 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Child.php index 3464a7226..41ef98ff6 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Item.php index 28613589e..239ba5515 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Order.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Order.php index f0f7d7fd5..3fe83bd21 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Order.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Parent.php index fe2a54785..f137924b2 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php index 5260dc8c3..772ca3826 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php index 98b19ab4d..d3c3264e6 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php index 846a59560..35bce76ca 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php index 66328066a..8a5ac31ee 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php index 0bff010c1..244ab3309 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Item.php index 3246b74cf..31e5a9027 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php index 125cbfd64..62f96d903 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Payment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Payment.php index 126daeaa4..b87d5ec83 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php index 5a950c3cd..2a4f44000 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php index 9ff46f807..334e387b3 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Child.php index d66b90d6a..4bab082f9 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Parent.php index d07aed18c..88d6c3b05 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php index a612a4179..92b56272e 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php index 69d8d758b..793a248b4 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php index fe5c76f40..fb711b0b8 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php index 2bfd87aba..81d3e58b5 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php index 70ae591bb..8fb901ce6 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php index f568665df..481c3d682 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php index 46341bc2c..b6dbc5e1f 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php index 4f3c849d2..ec9812cca 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php index 9b31756d3..1370d7d5b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote.php b/app/code/core/Mage/Sales/Model/Entity/Quote.php index 8878f3aa6..b5c2b5cd2 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php index 8a974efb3..ad63a96c1 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php index 9344fe874..7c8b6b660 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Child.php index d4be46f71..929a580d2 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Parent.php index 24ac13ee2..d1c1ba816 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php index 1f614849e..2e6dfb25b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php index 2f4e5a8e1..f58ad60e6 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php index 8534012e5..968a263d3 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php index d093765a5..09ad7e626 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php index fa8591c5e..310bbd4fd 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php index 8ad09a703..083c1cb6e 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php index 1aab7eb66..d0f892d2b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php index 23cf044c4..ab068aebc 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php index 5378417aa..16bb739fc 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php index 8010ccc77..4bcc7d3d6 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php index 04d4f07ec..73b60d647 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php index 6a7727c9f..4959a92e6 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php index 2ee6cb6ac..d834d9e02 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php index e949e205b..6299aeb62 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Item.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Item.php index 4bfecc221..e56498e95 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php index 2a6108555..490dcd185 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php index 84611abe4..d3d158232 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php index adde30b0e..83584fb8a 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php index 2c4b1972f..f00134b02 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Setup.php b/app/code/core/Mage/Sales/Model/Entity/Setup.php index a092f0cc2..7f14d38ed 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Setup.php +++ b/app/code/core/Mage/Sales/Model/Entity/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php index 1ff7ff360..24439b5a0 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php index dad4210ab..092925549 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php index 1635e220d..ba49dba66 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php index ba13e4813..d7249530f 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Order.php index d3c1e2d03..838ae2b80 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php index 641e5cba9..6b24c5114 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php index 0bcb68993..2f36c979c 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php index 4e771cc84..88eebe2c7 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php index 7a971be2f..37d864896 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php index 1bd55c187..0ef1e8ac5 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php index 99913cc02..4733f75db 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php index 1b28b56c9..47fab0ab2 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php index b5fd710bd..65f038faf 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php index 0e59f7c6d..049879a7e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php index caf362ec3..29051df55 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php index 4046765c1..de0741cc7 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php index 89432430c..c841d2d16 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php index 123932736..11d971b58 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php index 41aaece95..e128065dc 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php index 326077d9d..14590131a 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php index c3c0dc96b..4df0de435 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php index 6a6e1a40b..ff91ec152 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php index 471d8d373..24a7f1678 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php index fbba43291..1339f8a2b 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php index 9c30c796b..44a1ba5c4 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php index f0a41ff17..a5d84e137 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php index bae3057d9..f1fc8eec6 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php index fcb0aa9dd..5b080ef96 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php index e3b838ee3..cd9a65a85 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php index 14b024a81..f12c07575 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php index 3efe5f8cd..b15161f0b 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php index 143582234..9fcc59712 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php index 29f446585..b289f79e2 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php index 69d3a814a..0c7c89e4e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php index 7d3bd529b..fbb3c22ad 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php index a35d2884e..f2d83f096 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php index 46be6b677..1af7fb7b4 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php index 3629b78e0..dd8829214 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php index 4ff4d41f8..b23e910d8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php index 761627736..74607c5a1 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php index b343a9c85..fbf88f34d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php index dd395de27..1015564b4 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php index a8ef42cc0..4723d9b1f 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php index 9b8248fd0..7e2df1e8e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php index a1d0a294e..3703a8388 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php index 4b0dd6737..45a50f174 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php index af489c739..39fa20933 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php index fd394e4d5..546d86ccf 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php index 79e81899e..be9649ebe 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php index b5798bf9d..86ae3ef28 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php index 550c04471..d6c819ddb 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php index 9b79cf430..012fccefa 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php index a07357af6..1a82d1f27 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php index b01e4419e..3824aabb2 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/Collection.php index 8c31be7c7..eb1eca467 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php index 7a4d65dc5..1b15da48a 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php index 3cc975037..3bb13ed20 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php index 584c6f0e2..40e502600 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php index ac68d2976..8d1e3a670 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote.php index cf13ad4f5..d346614b3 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php index 8b5b3f800..39406d73e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php index 1837c7dd0..688d32487 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php index 907f7fa71..eeaad9a62 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php index 8a7645f8c..22d22d978 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php index 7b7e221fb..e0047e1c7 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php index a46bd3352..69e1dc4b6 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php index 2ee5b2c12..c34137d59 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php index 6bbfcf49a..55bc29268 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php index b482da885..6b25f8375 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php index 050d59480..6cfb490f9 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php index 1bb8a0cbb..e2e97ad9a 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php index 709392ab6..9b6a15cbd 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php index fc2a6c16e..402e9afba 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php index 0f95ab483..78c532a0b 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php index 4949272c5..e1b6485ab 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php index bda253797..4e3155758 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php index 4bf4859f2..a641f9d2e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php index 3284bb516..1ec277f27 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php index 8ff8d498c..21500144a 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php index f57be4fcf..8ecd85eff 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php index 45c557a3d..29112b3f3 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php index edd6c9c21..5fa2f373d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php index bb96106fb..1b63a6c39 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php index 2a5431702..b133743db 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php index 113c421f2..e81f208da 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php index 170dd1a9b..988124a6e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report.php b/app/code/core/Mage/Sales/Model/Mysql4/Report.php index 59ff8fe5c..fdf4b43b6 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php index 93a18407e..44d238c51 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php index fe458c431..78c9e09cf 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php index c65dd532f..dcfefcf9b 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php index ca5aae89e..9e37e9059 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php index efac0575e..86be1560d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php index 531c66c01..6a2fbdabd 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php index dd8a03b80..834e1a9f5 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php index 4959d465c..9d9a46ed2 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php index 052801897..d3df9efb1 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php index 1045e1e34..1b7e0e79f 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php index c27754813..10288b842 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php index 8b41a6efa..5e54b9ca3 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php index 4535c1a55..66823ad0b 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php index 0838de2de..d2786aac5 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php index 8f9eea72b..107d991c7 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php index 6726efca9..47f538b8d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php index 37292b8c3..2f39aa813 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php index a0602ab46..e4891eba9 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Observer.php b/app/code/core/Mage/Sales/Model/Observer.php index e525c7f43..a2203cb91 100644 --- a/app/code/core/Mage/Sales/Model/Observer.php +++ b/app/code/core/Mage/Sales/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php index 849249451..06ae6d941 100644 --- a/app/code/core/Mage/Sales/Model/Order.php +++ b/app/code/core/Mage/Sales/Model/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -1267,9 +1267,7 @@ public function sendNewOrderEmail() return $this; } - $emailSentAttributeValue = $this->hasEmailSent() - ? $this->getEmailSent() - : Mage::getModel('sales/order')->load($this->getId())->getData('email_sent'); + $emailSentAttributeValue = $this->load($this->getId())->getData('email_sent'); $this->setEmailSent((bool)$emailSentAttributeValue); if ($this->getEmailSent()) { return $this; diff --git a/app/code/core/Mage/Sales/Model/Order/Address.php b/app/code/core/Mage/Sales/Model/Order/Address.php index ae2b577e1..f2c9cba4f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Order/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Api.php b/app/code/core/Mage/Sales/Model/Order/Api.php index 3b6d567e8..330931002 100644 --- a/app/code/core/Mage/Sales/Model/Order/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Api/V2.php index 8483c90dc..8f286ca6c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Config.php b/app/code/core/Mage/Sales/Model/Order/Config.php index 2064bebac..f9ac4c42b 100644 --- a/app/code/core/Mage/Sales/Model/Order/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php index ce4bc37eb..6247038e2 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -659,7 +659,6 @@ public function setAdjustmentNegative($amount) * Adds comment to credit memo with additional possibility to send it to customer via email * and show it in customer account * - * @param string $comment * @param bool $notify * @param bool $visibleOnFront * diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php index 34dae8c41..0cf5c950f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.php index 384645ded..e9aebc2c1 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php index f3fbcda99..23966e50f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php index 55a17d8d9..cf5ae779b 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php index 1a143c0ef..25dcc0a95 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php index aa82f940a..2857fce78 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php index 8ec3da854..702063aab 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php index 1e91789f5..ed82428d9 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php index 14a6b3d94..01c44e5d4 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php index 2016b9307..2064f6a58 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php index 9e4b9c82d..bc5542791 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php index 172d7aedc..9bc6e8423 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,19 +54,17 @@ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) } $orderItemTax = $orderItem->getTaxInvoiced(); $baseOrderItemTax = $orderItem->getBaseTaxInvoiced(); - $orderItemHiddenTax = $orderItem->getHiddenTaxInvoiced(); - $baseOrderItemHiddenTax = $orderItem->getBaseHiddenTaxInvoiced(); $orderItemQty = $orderItem->getQtyInvoiced(); - if (($orderItemTax || $orderItemHiddenTax) && $orderItemQty) { + if ($orderItemTax && $orderItemQty) { /** * Check item tax amount */ $tax = $orderItemTax - $orderItem->getTaxRefunded(); $baseTax = $baseOrderItemTax - $orderItem->getTaxRefunded(); - $hiddenTax = $orderItemHiddenTax - $orderItem->getHiddenTaxRefunded(); - $baseHiddenTax = $baseOrderItemHiddenTax - $orderItem->getBaseHiddenTaxRefunded(); + $hiddenTax = $orderItem->getHiddenTaxAmount() - $orderItem->getHiddenTaxRefunded(); + $baseHiddenTax = $orderItem->getBaseHiddenTaxAmount() - $orderItem->getBaseHiddenTaxRefunded(); if (!$item->isLast()) { $availableQty = $orderItemQty - $orderItem->getQtyRefunded(); $tax = $creditmemo->roundPrice($tax / $availableQty * $item->getQty()); @@ -149,12 +147,11 @@ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) $baseTotalHiddenTax += $baseShippingHiddenTaxAmount; } - $allowedTax = $order->getTaxInvoiced() - $order->getTaxRefunded() - $creditmemo->getTaxAmount(); - $allowedBaseTax = $order->getBaseTaxInvoiced() - $order->getBaseTaxRefunded() - - $creditmemo->getBaseTaxAmount(); - $allowedHiddenTax = $order->getHiddenTaxInvoiced() + $order->getShippingHiddenTaxAmount() + $allowedTax = $order->getTaxAmount() - $order->getTaxRefunded(); + $allowedBaseTax = $order->getBaseTaxAmount() - $order->getBaseTaxRefunded(); + $allowedHiddenTax = $order->getHiddenTaxAmount() + $order->getShippingHiddenTaxAmount() - $order->getHiddenTaxRefunded() - $order->getShippingHiddenTaxRefunded(); - $allowedBaseHiddenTax = $order->getBaseHiddenTaxInvoiced() + $order->getBaseShippingHiddenTaxAmount() + $allowedBaseHiddenTax = $order->getBaseHiddenTaxAmount() + $order->getBaseShippingHiddenTaxAmount() - $order->getBaseHiddenTaxRefunded() - $order->getBaseShippingHiddenTaxRefunded(); diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Invoice.php index befbe83dd..39a8b9512 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php index 3c0a441fa..51ecde3c0 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php index caa7c2e72..9569f9af6 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php index 9212c3ded..5c35121af 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php index dd57e258d..21f8c6c24 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php index cbd10de94..15813275c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php index 50698d5a9..c6a2a7973 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php index 19bf9766e..feb93c1a0 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php index 44ea9f3ef..f8561e100 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,8 +74,10 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) * Also the subtotal is without weee */ - $discount = $orderItemDiscount - $orderItem->getDiscountInvoiced(); - $baseDiscount = $baseOrderItemDiscount - $orderItem->getBaseDiscountInvoiced(); + $discount = $orderItemDiscount - $orderItem->getDiscountInvoiced() + - $orderItem->getDiscountAppliedForWeeeTax(); + $baseDiscount = $baseOrderItemDiscount - $orderItem->getBaseDiscountInvoiced() + - $orderItem->getBaseDiscountAppliedForWeeeTax(); if (!$item->isLast()) { $activeQty = $orderItemQty - $orderItem->getQtyInvoiced(); diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php index 66f055f57..f57c06588 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php index ef7b3c131..a40378106 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php index 15d61e769..02d3d3e88 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php index e852de472..25bbcc7d9 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,7 +47,7 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) $orderItem = $item->getOrderItem(); $orderItemQty = $orderItem->getQtyOrdered(); - if (($orderItem->getTaxAmount() || $orderItem->getHiddenTaxAmount()) && $orderItemQty) { + if ($orderItem->getTaxAmount() && $orderItemQty) { if ($item->getOrderItem()->isDummy()) { continue; } diff --git a/app/code/core/Mage/Sales/Model/Order/Item.php b/app/code/core/Mage/Sales/Model/Order/Item.php index 3d1ca1811..15e892c8a 100644 --- a/app/code/core/Mage/Sales/Model/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Payment.php b/app/code/core/Mage/Sales/Model/Order/Payment.php index 43ce82ed9..d9f312710 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -501,13 +501,12 @@ public function registerCaptureNotification($amount, $skipFraudDetection = false // register new capture if (!$invoice) { - $isSameCurrency = $this->_isSameCurrency(); - if ($isSameCurrency && $this->_isCaptureFinal($amount)) { + if ($this->_isCaptureFinal($amount)) { $invoice = $order->prepareInvoice()->register(); $order->addRelatedObject($invoice); $this->setCreatedInvoice($invoice); } else { - if (!$skipFraudDetection || !$isSameCurrency) { + if (!$skipFraudDetection) { $this->setIsFraudDetected(true); } $this->_updateTotals(array('base_amount_paid_online' => $amount)); @@ -519,7 +518,7 @@ public function registerCaptureNotification($amount, $skipFraudDetection = false $message = Mage::helper('sales')->__('Capturing amount of %s is pending approval on gateway.', $this->_formatPrice($amount)); $state = Mage_Sales_Model_Order::STATE_PAYMENT_REVIEW; if ($this->getIsFraudDetected()) { - $message = Mage::helper('sales')->__('Order is suspended as its capture amount %s is suspected to be fraudulent.', $this->_formatPrice($amount, $this->getCurrencyCode())); + $message = Mage::helper('sales')->__('Order is suspended as its capture amount %s is suspected to be fraudulent.', $this->_formatPrice($amount)); $status = Mage_Sales_Model_Order::STATUS_FRAUD; } } else { @@ -527,7 +526,7 @@ public function registerCaptureNotification($amount, $skipFraudDetection = false $state = Mage_Sales_Model_Order::STATE_PROCESSING; if ($this->getIsFraudDetected()) { $state = Mage_Sales_Model_Order::STATE_PAYMENT_REVIEW; - $message = Mage::helper('sales')->__('Order is suspended as its capture amount %s is suspected to be fraudulent.', $this->_formatPrice($amount, $this->getCurrencyCode())); + $message = Mage::helper('sales')->__('Order is suspended as its capture amount %s is suspected to be fraudulent.', $this->_formatPrice($amount)); $status = Mage_Sales_Model_Order::STATUS_FRAUD; } // register capture for an existing invoice @@ -1068,8 +1067,7 @@ protected function _authorize($isOnline, $amount) { // check for authorization amount to be equal to grand total $this->setShouldCloseParentTransaction(false); - $isSameCurrency = $this->_isSameCurrency(); - if (!$isSameCurrency || !$this->_isCaptureFinal($amount)) { + if (!$this->_isCaptureFinal($amount)) { $this->setIsFraudDetected(true); } @@ -1096,7 +1094,7 @@ protected function _authorize($isOnline, $amount) } else { if ($this->getIsFraudDetected()) { $state = Mage_Sales_Model_Order::STATE_PAYMENT_REVIEW; - $message = Mage::helper('sales')->__('Order is suspended as its authorizing amount %s is suspected to be fraudulent.', $this->_formatPrice($amount, $this->getCurrencyCode())); + $message = Mage::helper('sales')->__('Order is suspended as its authorizing amount %s is suspected to be fraudulent.', $this->_formatPrice($amount)); $status = Mage_Sales_Model_Order::STATUS_FRAUD; } else { $message = Mage::helper('sales')->__('Authorized amount of %s.', $this->_formatPrice($amount)); @@ -1422,15 +1420,11 @@ protected function _formatAmount($amount, $asFloat = false) /** * Format price with currency sign * @param float $amount - * @param null|string $currency * @return string */ - protected function _formatPrice($amount, $currency = null) + protected function _formatPrice($amount) { - return $this->getOrder()->getBaseCurrency()->formatTxt( - $amount, - $currency ? array('currency' => $currency) : array() - ); + return $this->getOrder()->getBaseCurrency()->formatTxt($amount); } /** @@ -1547,16 +1541,6 @@ protected function _isCaptureFinal($amountToCapture) return false; } - /** - * Check whether payment currency corresponds to order currency - * - * @return bool - */ - protected function _isSameCurrency() - { - return !$this->getCurrencyCode() || $this->getCurrencyCode() == $this->getOrder()->getBaseCurrencyCode(); - } - /** * Before object save manipulations * diff --git a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php index 8c8e10519..39baccc1f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php index 9522f952b..42f886284 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php index 64ab0c7fb..0750b0867 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php index b837dca01..271cc83af 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php index 75916cdb4..d6967cf7f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php index e7346359f..9013aebe8 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php index e7eb3ebd0..98f6fbc84 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php index b93a12a9c..d5339ddb6 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php index 17628c08f..f2552ae96 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php index deeb861ae..138a5a8be 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php index 14ccfe8e8..aa0cd94e9 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment/Packaging.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment/Packaging.php index 0f3284563..beeca82c1 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment/Packaging.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment/Packaging.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php index 4c521db98..fa7c6794a 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Shipment.php index 9d07565a8..f1994d8bb 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php index c1b2d3645..ab7a370f3 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php index 7f308562e..31d76ea5f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php index 7897f7346..54f37131f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php index fad97ae6f..4a582fd6c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php index 65062d386..7757f6d01 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Status.php b/app/code/core/Mage/Sales/Model/Order/Status.php index 551874d5d..b260f2938 100644 --- a/app/code/core/Mage/Sales/Model/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Order/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Order/Status/History.php index 28bb2ebd6..d302bbe0e 100644 --- a/app/code/core/Mage/Sales/Model/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Order/Status/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Tax.php b/app/code/core/Mage/Sales/Model/Order/Tax.php index 1e431e6eb..5575ae933 100644 --- a/app/code/core/Mage/Sales/Model/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Total.php b/app/code/core/Mage/Sales/Model/Order/Total.php index 0e2da736e..2cff0f7c3 100644 --- a/app/code/core/Mage/Sales/Model/Order/Total.php +++ b/app/code/core/Mage/Sales/Model/Order/Total.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Total/Abstract.php index cb6a009db..a1fe49624 100644 --- a/app/code/core/Mage/Sales/Model/Order/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Total/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php b/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php index b06f83e28..71a401f2e 100644 --- a/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php +++ b/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Payment/Method/Billing/AgreementAbstract.php b/app/code/core/Mage/Sales/Model/Payment/Method/Billing/AgreementAbstract.php index aa53a1b80..57f8df495 100644 --- a/app/code/core/Mage/Sales/Model/Payment/Method/Billing/AgreementAbstract.php +++ b/app/code/core/Mage/Sales/Model/Payment/Method/Billing/AgreementAbstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -62,11 +62,10 @@ public function isAvailable($quote = null) $quote->getCustomer()->getId() ); $isAvailableBA = count($availableBA) > 0; - $this->_canUseForMultishipping = $this->_canUseCheckout = $this->_canUseInternal = $isAvailableBA; + $this->_canUseCheckout = $this->_canUseInternal = $isAvailableBA; } $this->_isAvailable = parent::isAvailable($quote) && $this->_isAvailable($quote); $this->_canUseCheckout = ($this->_isAvailable && $this->_canUseCheckout); - $this->_canUseForMultishipping = ($this->_isAvailable && $this->_canUseForMultishipping); $this->_canUseInternal = ($this->_isAvailable && $this->_canUseInternal); } return $this->_isAvailable; diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php index 8782fbf14..93966264a 100644 --- a/app/code/core/Mage/Sales/Model/Quote.php +++ b/app/code/core/Mage/Sales/Model/Quote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address.php b/app/code/core/Mage/Sales/Model/Quote/Address.php index 2ebbe8eb4..145d2b78d 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Quote/Address/Item.php index 105aff5d7..bb83562bc 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Item.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php index 12681741a..1343866b1 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total.php index ea253de79..d7423f129 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php index d0bc9b348..7da03d2e9 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php index c7d254079..9561a37ad 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php index d4ce751e5..8a2433254 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php index 7e4bb0e71..4073db2e8 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php index c52234cd5..d2955afd0 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Msrp.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Msrp.php index 628b005c3..6ce9ad392 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Msrp.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Msrp.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php index dbc96210d..932a85749 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Collector.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Collector.php index a2b2c44e0..5c0ab834e 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Collector.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Collector.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Initial.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Initial.php index 564cbbb0a..6d7001a65 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Initial.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Initial.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Trial.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Trial.php index 1c439821a..66e219e0b 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Trial.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Trial.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/RecurringAbstract.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/RecurringAbstract.php index d61638c08..67799473c 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/RecurringAbstract.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/RecurringAbstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php index e880848f5..6c024776c 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php index 728ddb99a..b6fe695aa 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php index 1d445865d..e467ce0d5 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php index 4a3bbf1e9..c692c80bd 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php index ec918d11b..87108aad8 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Config.php b/app/code/core/Mage/Sales/Model/Quote/Config.php index d5591cfff..cee047b7c 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Config.php +++ b/app/code/core/Mage/Sales/Model/Quote/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Item.php b/app/code/core/Mage/Sales/Model/Quote/Item.php index 4ffdf3f92..72a894f61 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php index 2b068a477..1c8e6e626 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Item/Option.php b/app/code/core/Mage/Sales/Model/Quote/Item/Option.php index d578d69f8..1a5049312 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item/Option.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Quote/Payment.php index 9ebaab181..1ee47a7bc 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Quote/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Recurring/Profile.php index f9a94b388..21b0e3ac0 100644 --- a/app/code/core/Mage/Sales/Model/Recurring/Profile.php +++ b/app/code/core/Mage/Sales/Model/Recurring/Profile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -248,6 +248,36 @@ public function canFetchUpdate() { return $this->getMethodInstance()->canGetRecurringProfileDetails(); } +// +//// public function billOutstandingAmount($baseAmount, Varien_Object $info = null) +//// { +//// +//// } +//// +//// public function canBillOutstandingAmount() +//// { +//// // check method instance? +//// } +// +// public function processSubmissionNotification(Varien_Object $info) +// { +// // confirmation that this profile was created on the gateway +// } +// +// public function processPaymentNotification(Varien_Object $info) +// { +// // create new order basing on original order item and addresses +// } +// +// public function processStateNotification(Varien_Object $info) +// { +// // update self state +// } +// +//// public function loadByInternalReferenceId($internalReferenceId) +//// { +//// +//// } /** * Initialize new order based on profile data diff --git a/app/code/core/Mage/Sales/Model/Resource/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Abstract.php index 93e4e4ec2..ef01c772e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement.php index 31f85776c..3c724c312 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement/Collection.php index 55d813b29..393d3ea9f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php index 165f71feb..7fd856ab0 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Helper/Interface.php b/app/code/core/Mage/Sales/Model/Resource/Helper/Interface.php index aae2edc4a..ff1f0998e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Helper/Interface.php +++ b/app/code/core/Mage/Sales/Model/Resource/Helper/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Sales/Model/Resource/Helper/Mysql4.php index e0ab2649e..4b55a776b 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Sales/Model/Resource/Helper/Mysql4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order.php b/app/code/core/Mage/Sales/Model/Resource/Order.php index c6e929bbc..02f47eb09 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php index 8ce57e273..ba109a0d6 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Address.php b/app/code/core/Mage/Sales/Model/Resource/Order/Address.php index 54363fc88..e18c5eb31 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Address/Collection.php index abe284126..9f1b4fdd4 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Address/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Billing.php b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Billing.php index 6bae70b08..20896bcb2 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Billing.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Child.php index d9c322444..e5d8c6bbb 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Parent.php index 8e25caec5..7e37859b4 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php index db83436a8..be749e8b2 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php index b69dd1914..bdd80301d 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Collection/Abstract.php index 101de5c98..d6fb1672a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Comment/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Comment/Collection/Abstract.php index 6562ddf74..64b0a3330 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Comment/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Comment/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php index 1e699d5f9..b2fc023fa 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Child.php index 20c4cc042..6971e6359 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Parent.php index 9205f1b53..dfa768054 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php index e14c4420e..ffa175bd6 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment.php index c14910995..5d30d8b6c 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php index 571bcfbe2..38b47db95 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Grid/Collection.php index 6c64596a0..db2d0a3fc 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Grid/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item.php index 9303aa2b7..404f8ea08 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php index 201748094..bf58761df 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php index 0c6cdc0ad..8019c8bf6 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php index d0586a34c..acd6efa3b 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Child.php index 50640e42a..45ab444d0 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Item.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Item.php index c105b0e91..79885fc84 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Order.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Order.php index 9c6d2e5da..1fae10c57 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Parent.php index 59abeb05a..6cffc2629 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php index a1fca1320..cd36d602b 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment.php index 60ab24589..197246faf 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php index 88b1d53e0..e0882bc50 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Grid/Collection.php index 7e5a46fd1..8df504082 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Grid/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item.php index 342e3bcaa..046ff5b69 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php index 8e8831ab2..cfa4b7016 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Item.php b/app/code/core/Mage/Sales/Model/Resource/Order/Item.php index 125e31a66..8583295bb 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php index 8408ac6e2..827042fcd 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php index 274205ed6..6f7da1d58 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Collection.php index 6f68c3822..20b929941 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php index 7ae5b34f7..b4e6bfff3 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php index 93ce2a05e..32e75fc14 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php index 217b9c99f..38095d98f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php index c465174dc..1766861bc 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Parent.php index c05e12a31..d1ad4f8b2 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Collection.php index f5cc35b74..db3f2afa7 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment.php index 39db5b75a..76220b87e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php index 039eb3fa2..fb2e7ce67 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Grid/Collection.php index 2f8699072..626b7045b 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Grid/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item.php index a24715b76..3ed73dfe9 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php index 1ce0a134d..45b998229 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track.php index b045c3b1b..2ffe473ef 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php index 1bc7ffff2..c2aef9552 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status.php index c1f312948..6e79718de 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status/Collection.php index b40169442..4aa15e645 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History.php index 33a277ebc..9022a1c51 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php index bb45fabcd..2c56b62d3 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Tax.php b/app/code/core/Mage/Sales/Model/Resource/Order/Tax.php index 593e3fb12..0ce7a1162 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php index 318f4f7a4..8acc55ef6 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote.php b/app/code/core/Mage/Sales/Model/Resource/Quote.php index 4db1f6126..3e976a539 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address.php index 378ab3b37..6c003e304 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend.php index fce8db6e0..7059424be 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Child.php index 42ff19b4d..ef7ba9d08 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Child.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Parent.php index 4eac516fa..9208e331f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Parent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Region.php index 824849f8b..0d455a231 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php index 36ae8ea1c..b08b69d42 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php index 051e20097..0b11e3376 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php index 369ec7726..a7436183a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php index 500331340..77c147841 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php index 03bd7c73c..5793c98da 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php index a3931d95f..471d3c3ef 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php index 1bed24d34..fb5f4526c 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php index 3c4b34bee..b18150ccd 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item.php index 32a2d4e4a..6586b63bf 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item/Collection.php index a614fd4a7..8a8d288da 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate.php index ba409e586..b891f92a7 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php index 932f215a7..39d91c2dc 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Collection.php index a4c8fb11e..4f599b42c 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item.php index d225724b9..6b7297beb 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php index e36923d5f..46aa367e2 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option.php index 477b37f71..31b2916cd 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php index 638af4232..80ca5167f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php index 2dde7d861..d4c100752 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Payment/Collection.php index 6292f0a69..61ca88207 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Payment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php index 7cb63cf3f..bdf45f375 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php +++ b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile/Collection.php index 837b26ebd..6d0ea64c5 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report.php b/app/code/core/Mage/Sales/Model/Resource/Report.php index a26995459..ced6bd0e8 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Report/Abstract.php index 5e398261d..84021d6b9 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php index defb9bbe0..b1170a440 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php index aad4e481e..b5de0f96e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Report/Collection/Abstract.php index 177c324b3..4ee645d6e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Collection/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php index 708a5105b..611b0f2bd 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php index 93e0290b6..2b07a302f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php index 5daacd280..62c2714e3 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order.php index d6d7fa6e2..a2e6c1375 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php index c2891bdc8..528a2e19c 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php index ba9749ea5..3932a8186 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php index af764569c..5d90e7b1a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat/Collection.php index 76b1de03d..ab2cabbf3 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php index 94c9233de..343e41b16 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php index e0cc8a01c..bf53da456 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php index 8c93a3303..31c837384 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php index 534d29b31..b386afe97 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php index 60ef18a26..bd929e684 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php index 299b21521..0ace2b1e7 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php index 2fdd0a446..30e128f85 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Setup.php b/app/code/core/Mage/Sales/Model/Resource/Setup.php index 2a57df361..33d06fd07 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Setup.php +++ b/app/code/core/Mage/Sales/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Service/Order.php b/app/code/core/Mage/Sales/Model/Service/Order.php index c0708266d..63bd0be10 100644 --- a/app/code/core/Mage/Sales/Model/Service/Order.php +++ b/app/code/core/Mage/Sales/Model/Service/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Service/Quote.php b/app/code/core/Mage/Sales/Model/Service/Quote.php index 2e24644d8..419f384eb 100644 --- a/app/code/core/Mage/Sales/Model/Service/Quote.php +++ b/app/code/core/Mage/Sales/Model/Service/Quote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Status/List.php b/app/code/core/Mage/Sales/Model/Status/List.php index ba2efbe5b..5a3b57412 100644 --- a/app/code/core/Mage/Sales/Model/Status/List.php +++ b/app/code/core/Mage/Sales/Model/Status/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/controllers/Billing/AgreementController.php b/app/code/core/Mage/Sales/controllers/Billing/AgreementController.php index d3517a417..8fd93641f 100644 --- a/app/code/core/Mage/Sales/controllers/Billing/AgreementController.php +++ b/app/code/core/Mage/Sales/controllers/Billing/AgreementController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/controllers/DownloadController.php b/app/code/core/Mage/Sales/controllers/DownloadController.php index 22d61c365..4b1d73267 100644 --- a/app/code/core/Mage/Sales/controllers/DownloadController.php +++ b/app/code/core/Mage/Sales/controllers/DownloadController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/controllers/GuestController.php b/app/code/core/Mage/Sales/controllers/GuestController.php index 62d11e7fc..9160d61e1 100644 --- a/app/code/core/Mage/Sales/controllers/GuestController.php +++ b/app/code/core/Mage/Sales/controllers/GuestController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/controllers/OrderController.php b/app/code/core/Mage/Sales/controllers/OrderController.php index 8d1dbc08a..16e63d248 100644 --- a/app/code/core/Mage/Sales/controllers/OrderController.php +++ b/app/code/core/Mage/Sales/controllers/OrderController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php b/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php index 0e3a4cfc2..74afeaa9d 100644 --- a/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php +++ b/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/data/sales_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Sales/data/sales_setup/data-install-1.6.0.0.php index 32e0d43e9..40fb5a542 100644 --- a/app/code/core/Mage/Sales/data/sales_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Sales/data/sales_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php b/app/code/core/Mage/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php index 5096d83bb..520097e4d 100644 --- a/app/code/core/Mage/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php +++ b/app/code/core/Mage/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/doc/test.php b/app/code/core/Mage/Sales/doc/test.php index fc0277aab..4f594343a 100644 --- a/app/code/core/Mage/Sales/doc/test.php +++ b/app/code/core/Mage/Sales/doc/test.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ include "lib/Varien/Object.php"; diff --git a/app/code/core/Mage/Sales/etc/adminhtml.xml b/app/code/core/Mage/Sales/etc/adminhtml.xml index ab1985424..5f1a4a2a6 100644 --- a/app/code/core/Mage/Sales/etc/adminhtml.xml +++ b/app/code/core/Mage/Sales/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/api.xml b/app/code/core/Mage/Sales/etc/api.xml index 080b357d3..57430fae2 100644 --- a/app/code/core/Mage/Sales/etc/api.xml +++ b/app/code/core/Mage/Sales/etc/api.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/api2.xml b/app/code/core/Mage/Sales/etc/api2.xml index 047f8dfe8..150a0f897 100644 --- a/app/code/core/Mage/Sales/etc/api2.xml +++ b/app/code/core/Mage/Sales/etc/api2.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml index d00654f1e..5bb43d7d0 100644 --- a/app/code/core/Mage/Sales/etc/config.xml +++ b/app/code/core/Mage/Sales/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/system.xml b/app/code/core/Mage/Sales/etc/system.xml index e56807696..0291ad402 100644 --- a/app/code/core/Mage/Sales/etc/system.xml +++ b/app/code/core/Mage/Sales/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/widget.xml b/app/code/core/Mage/Sales/etc/widget.xml index 8a9f3f0df..1fb5d4f57 100644 --- a/app/code/core/Mage/Sales/etc/widget.xml +++ b/app/code/core/Mage/Sales/etc/widget.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/sql/sales_setup/install-1.6.0.0.php b/app/code/core/Mage/Sales/sql/sales_setup/install-1.6.0.0.php index d36a9f413..8c64716a7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.7.0.php index 2dd94b374..0c222518c 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -66,9 +66,7 @@ /*Data for the table `sales_discount_coupon` */ -insert into {$this->getTable('sales_discount_coupon')}(`coupon_id`,`coupon_code`,`discount_percent`,`discount_fixed`, - `is_active`,`from_date`,`to_date`,`min_subtotal`,`limit_products`,`limit_categories`,`limit_attributes`) -values (1,'test',10.0000,0.0000,1,'0000-00-00 00:00:00','0000-00-00 00:00:00',0.0000,'','',''); +insert into {$this->getTable('sales_discount_coupon')}(`coupon_id`,`coupon_code`,`discount_percent`,`discount_fixed`,`is_active`,`from_date`,`to_date`,`min_subtotal`,`limit_products`,`limit_categories`,`limit_attributes`) values (1,'test',10.0000,0.0000,1,'0000-00-00 00:00:00','0000-00-00 00:00:00',0.0000,'','',''); /*Table structure for table `sales_invoice_entity` */ @@ -87,10 +85,8 @@ PRIMARY KEY (`entity_id`), KEY `FK_sales_invoice_entity_type` (`entity_type_id`), KEY `FK_sales_invoice_entity_store` (`store_id`), - CONSTRAINT `FK_sales_invoice_entity_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_invoice_entity_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_invoice_entity` */ @@ -110,14 +106,10 @@ KEY `FK_sales_invoice_entity_datetime_attribute` (`attribute_id`), KEY `FK_sales_invoice_entity_datetime_store` (`store_id`), KEY `FK_sales_invoice_entity_datetime` (`entity_id`), - CONSTRAINT `FK_sales_invoice_entity_datetime` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_invoice_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_datetime_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_datetime_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_datetime_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_invoice_entity_datetime` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_invoice_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_datetime_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_datetime_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_datetime_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_invoice_entity_datetime` */ @@ -138,14 +130,10 @@ KEY `FK_sales_invoice_entity_decimal_attribute` (`attribute_id`), KEY `FK_sales_invoice_entity_decimal_store` (`store_id`), KEY `FK_sales_invoice_entity_decimal` (`entity_id`), - CONSTRAINT `FK_sales_invoice_entity_decimal` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_invoice_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_decimal_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_decimal_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_decimal_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_invoice_entity_decimal` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_invoice_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_decimal_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_decimal_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_decimal_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_invoice_entity_decimal` */ @@ -166,14 +154,10 @@ KEY `FK_sales_invoice_entity_int_attribute` (`attribute_id`), KEY `FK_sales_invoice_entity_int_store` (`store_id`), KEY `FK_sales_invoice_entity_int` (`entity_id`), - CONSTRAINT `FK_sales_invoice_entity_int` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_invoice_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_int_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_int_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_int_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_invoice_entity_int` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_invoice_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_int_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_int_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_int_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_invoice_entity_int` */ @@ -193,14 +177,10 @@ KEY `FK_sales_invoice_entity_text_attribute` (`attribute_id`), KEY `FK_sales_invoice_entity_text_store` (`store_id`), KEY `FK_sales_invoice_entity_text` (`entity_id`), - CONSTRAINT `FK_sales_invoice_entity_text` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_invoice_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_text_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_text_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_text_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_invoice_entity_text` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_invoice_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_text_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_text_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_text_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_invoice_entity_text` */ @@ -220,14 +200,10 @@ KEY `FK_sales_invoice_entity_varchar_attribute` (`attribute_id`), KEY `FK_sales_invoice_entity_varchar_store` (`store_id`), KEY `FK_sales_invoice_entity_varchar` (`entity_id`), - CONSTRAINT `FK_sales_invoice_entity_varchar` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_invoice_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_varchar_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_varchar_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_invoice_entity_varchar_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_invoice_entity_varchar` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_invoice_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_varchar_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_varchar_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_invoice_entity_varchar_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_invoice_entity_varchar` */ @@ -248,10 +224,8 @@ PRIMARY KEY (`entity_id`), KEY `FK_sales_order_entity_type` (`entity_type_id`), KEY `FK_sales_order_entity_store` (`store_id`), - CONSTRAINT `FK_sales_order_entity_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_order_entity_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; /*Data for the table `sales_order_entity` */ @@ -271,14 +245,10 @@ KEY `FK_sales_order_entity_datetime_attribute` (`attribute_id`), KEY `FK_sales_order_entity_datetime_store` (`store_id`), KEY `FK_sales_order_entity_datetime` (`entity_id`), - CONSTRAINT `FK_sales_order_entity_datetime` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_order_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_datetime_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_datetime_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_datetime_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_order_entity_datetime` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_order_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_datetime_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_datetime_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_datetime_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_order_entity_datetime` */ @@ -298,14 +268,10 @@ KEY `FK_sales_order_entity_decimal_attribute` (`attribute_id`), KEY `FK_sales_order_entity_decimal_store` (`store_id`), KEY `FK_sales_order_entity_decimal` (`entity_id`), - CONSTRAINT `FK_sales_order_entity_decimal` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_order_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_decimal_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_decimal_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_decimal_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_order_entity_decimal` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_order_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_decimal_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_decimal_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_decimal_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_order_entity_decimal` */ @@ -325,14 +291,10 @@ KEY `FK_sales_order_entity_int_attribute` (`attribute_id`), KEY `FK_sales_order_entity_int_store` (`store_id`), KEY `FK_sales_order_entity_int` (`entity_id`), - CONSTRAINT `FK_sales_order_entity_int` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_order_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_int_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_int_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_int_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_order_entity_int` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_order_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_int_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_int_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_int_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_order_entity_int` */ @@ -352,14 +314,10 @@ KEY `FK_sales_order_entity_text_attribute` (`attribute_id`), KEY `FK_sales_order_entity_text_store` (`store_id`), KEY `FK_sales_order_entity_text` (`entity_id`), - CONSTRAINT `FK_sales_order_entity_text` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_order_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_text_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_text_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_text_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_order_entity_text` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_order_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_text_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_text_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_text_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_order_entity_text` */ @@ -379,14 +337,10 @@ KEY `FK_sales_order_entity_varchar_attribute` (`attribute_id`), KEY `FK_sales_order_entity_varchar_store` (`store_id`), KEY `FK_sales_order_entity_varchar` (`entity_id`), - CONSTRAINT `FK_sales_order_entity_varchar` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_order_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_varchar_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_varchar_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_order_entity_varchar_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_order_entity_varchar` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_order_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_varchar_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_varchar_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_order_entity_varchar_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_order_entity_varchar` */ @@ -407,10 +361,8 @@ PRIMARY KEY (`entity_id`), KEY `FK_sales_quote_entity_type` (`entity_type_id`), KEY `FK_sales_quote_entity_store` (`store_id`), - CONSTRAINT `FK_sales_quote_entity_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_quote_entity_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; /*Table structure for table `sales_quote_entity_datetime` */ @@ -428,14 +380,10 @@ KEY `FK_sales_quote_entity_datetime_attribute` (`attribute_id`), KEY `FK_sales_quote_entity_datetime_store` (`store_id`), KEY `FK_sales_quote_entity_datetime` (`entity_id`), - CONSTRAINT `FK_sales_quote_entity_datetime` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_quote_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_datetime_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_datetime_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_datetime_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_quote_entity_datetime` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_quote_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_datetime_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_datetime_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_datetime_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_quote_entity_datetime` */ @@ -455,14 +403,10 @@ KEY `FK_sales_quote_entity_decimal_attribute` (`attribute_id`), KEY `FK_sales_quote_entity_decimal_store` (`store_id`), KEY `FK_sales_quote_entity_decimal` (`entity_id`), - CONSTRAINT `FK_sales_quote_entity_decimal` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_quote_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_decimal_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_decimal_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_decimal_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_quote_entity_decimal` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_quote_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_decimal_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_decimal_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_decimal_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -481,14 +425,10 @@ KEY `FK_sales_quote_entity_int_attribute` (`attribute_id`), KEY `FK_sales_quote_entity_int_store` (`store_id`), KEY `FK_sales_quote_entity_int` (`entity_id`), - CONSTRAINT `FK_sales_quote_entity_int` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_quote_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_int_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_int_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_int_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_quote_entity_int` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_quote_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_int_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_int_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_int_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -507,14 +447,10 @@ KEY `FK_sales_quote_entity_text_attribute` (`attribute_id`), KEY `FK_sales_quote_entity_text_store` (`store_id`), KEY `FK_sales_quote_entity_text` (`entity_id`), - CONSTRAINT `FK_sales_quote_entity_text` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_quote_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_text_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_text_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_text_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_quote_entity_text` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_quote_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_text_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_text_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_text_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_quote_entity_text` */ @@ -534,14 +470,10 @@ KEY `FK_sales_quote_entity_varchar_attribute` (`attribute_id`), KEY `FK_sales_quote_entity_varchar_store` (`store_id`), KEY `FK_sales_quote_entity_varchar` (`entity_id`), - CONSTRAINT `FK_sales_quote_entity_varchar` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_quote_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_varchar_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_varchar_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_entity_varchar_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_quote_entity_varchar` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_quote_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_varchar_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_varchar_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_entity_varchar_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Table structure for table `sales_quote_rule` */ @@ -563,8 +495,7 @@ `actions_serialized` text NOT NULL, PRIMARY KEY (`quote_rule_id`), KEY `rule_name` (`name`), - KEY `is_active` (`is_active`,`start_at`,`expire_at`,`coupon_code`,`customer_registered`, - `customer_new_buyer`,`show_in_catalog`,`sort_order`) + KEY `is_active` (`is_active`,`start_at`,`expire_at`,`coupon_code`,`customer_registered`,`customer_new_buyer`,`show_in_catalog`,`sort_order`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_quote_rule` */ @@ -585,10 +516,8 @@ PRIMARY KEY (`entity_id`), KEY `FK_sales_quote_temp_type` (`entity_type_id`), KEY `FK_sales_quote_temp_store` (`store_id`), - CONSTRAINT `FK_sales_quote_temp_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_quote_temp_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; /*Data for the table `sales_quote_temp` */ @@ -608,14 +537,10 @@ KEY `FK_sales_quote_temp_datetime_attribute` (`attribute_id`), KEY `FK_sales_quote_temp_datetime_store` (`store_id`), KEY `FK_sales_quote_temp_datetime` (`entity_id`), - CONSTRAINT `FK_sales_quote_temp_datetime` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_quote_temp')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_datetime_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_datetime_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_datetime_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_quote_temp_datetime` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_quote_temp')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_datetime_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_datetime_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_datetime_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_quote_temp_datetime` */ @@ -635,14 +560,10 @@ KEY `FK_sales_quote_temp_decimal_attribute` (`attribute_id`), KEY `FK_sales_quote_temp_decimal_store` (`store_id`), KEY `FK_sales_quote_temp_decimal` (`entity_id`), - CONSTRAINT `FK_sales_quote_temp_decimal` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_quote_temp')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_decimal_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_decimal_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_decimal_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_quote_temp_decimal` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_quote_temp')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_decimal_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_decimal_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_decimal_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_quote_temp_decimal` */ @@ -662,14 +583,10 @@ KEY `FK_sales_quote_temp_int_attribute` (`attribute_id`), KEY `FK_sales_quote_temp_int_store` (`store_id`), KEY `FK_sales_quote_temp_int` (`entity_id`), - CONSTRAINT `FK_sales_quote_temp_int` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_quote_temp')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_int_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_int_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_int_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_quote_temp_int` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_quote_temp')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_int_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_int_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_int_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_quote_temp_int` */ @@ -689,14 +606,10 @@ KEY `FK_sales_quote_temp_text_attribute` (`attribute_id`), KEY `FK_sales_quote_temp_text_store` (`store_id`), KEY `FK_sales_quote_temp_text` (`entity_id`), - CONSTRAINT `FK_sales_quote_temp_text` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_quote_temp')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_text_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_text_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_text_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_quote_temp_text` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_quote_temp')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_text_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_text_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_text_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_quote_temp_text` */ @@ -716,19 +629,16 @@ KEY `FK_sales_quote_temp_varchar_attribute` (`attribute_id`), KEY `FK_sales_quote_temp_varchar_store` (`store_id`), KEY `FK_sales_quote_temp_varchar` (`entity_id`), - CONSTRAINT `FK_sales_quote_temp_varchar` FOREIGN KEY (`entity_id`) - REFERENCES {$this->getTable('sales_quote_temp')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_varchar_attribute` FOREIGN KEY (`attribute_id`) - REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_varchar_entity_type` FOREIGN KEY (`entity_type_id`) - REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_sales_quote_temp_varchar_store` FOREIGN KEY (`store_id`) - REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `FK_sales_quote_temp_varchar` FOREIGN KEY (`entity_id`) REFERENCES {$this->getTable('sales_quote_temp')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_varchar_attribute` FOREIGN KEY (`attribute_id`) REFERENCES {$this->getTable('eav_attribute')} (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_varchar_entity_type` FOREIGN KEY (`entity_type_id`) REFERENCES {$this->getTable('eav_entity_type')} (`entity_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_sales_quote_temp_varchar_store` FOREIGN KEY (`store_id`) REFERENCES {$this->getTable('core_store')} (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*Data for the table `sales_quote_temp_varchar` */ /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; "); $installer->installEntities(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.8.11.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.8.11.php index dd65da75d..9564a6743 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.8.11.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.8.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.9.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.9.0.php index 2cc1cbcf5..bc18425a1 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.9.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.9.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-1.4.0.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-1.4.0.0.php index 054f02e35..942e92947 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-1.4.0.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-1.4.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php index cf0310bd6..e8bc66889 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.0-0.7.1.php index 7264b2e51..27529b1a7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.1-0.7.2.php index bfe0e1948..aab198b8a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php index 4a3f39b81..003313b92 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.9-0.7.10.php index edff45418..50e5ca841 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.0-0.8.1.php index a3603b7e7..f4f46e63f 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.1-0.8.2.php index 7e9d44006..b20c9028a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.1-0.8.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.1-0.8.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.11-0.8.12.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.11-0.8.12.php index f0bbc6163..fc6373d72 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.11-0.8.12.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.11-0.8.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.12-0.8.13.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.12-0.8.13.php index 94c1dcb24..59a9ce068 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.12-0.8.13.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.12-0.8.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php index 93f6bb285..e266e2a5e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.14-0.8.15.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.14-0.8.15.php index 97bae400f..5a2c3181a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.14-0.8.15.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.14-0.8.15.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.15-0.8.16.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.15-0.8.16.php index 1801519c3..6f284b141 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.15-0.8.16.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.15-0.8.16.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.16-0.8.17.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.16-0.8.17.php index 73051d69b..94354a67a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.16-0.8.17.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.16-0.8.17.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.17-0.8.18.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.17-0.8.18.php index c578a3f72..7a3b729dd 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.17-0.8.18.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.17-0.8.18.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.18-0.8.19.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.18-0.8.19.php index 5a592babb..83fc920de 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.18-0.8.19.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.18-0.8.19.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.19-0.8.20.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.19-0.8.20.php index 63b720892..671b2cf2e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.19-0.8.20.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.19-0.8.20.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.2-0.8.3.php index 5723c0503..98a94c6a8 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.20-0.8.21.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.20-0.8.21.php index 9dd89f63e..cadced598 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.20-0.8.21.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.20-0.8.21.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.21-0.8.22.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.21-0.8.22.php index e3fb2b775..034f7668b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.21-0.8.22.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.21-0.8.22.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.22-0.8.23.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.22-0.8.23.php index 594117bb3..089525b69 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.22-0.8.23.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.22-0.8.23.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.23-0.8.24.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.23-0.8.24.php index 022aeb5a7..16df35498 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.23-0.8.24.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.23-0.8.24.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.24-0.8.25.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.24-0.8.25.php index 2aa87f39f..02ed6cd00 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.24-0.8.25.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.24-0.8.25.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.25-0.8.26.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.25-0.8.26.php index 8e631369f..51d4a3f31 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.25-0.8.26.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.25-0.8.26.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.26-0.8.27.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.26-0.8.27.php index 30a2a7186..057095691 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.26-0.8.27.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.26-0.8.27.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.27-0.8.28.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.27-0.8.28.php index 64b474348..9910d3f95 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.27-0.8.28.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.27-0.8.28.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.28-0.8.29.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.28-0.8.29.php index 9e51143b2..c5d807c06 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.28-0.8.29.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.28-0.8.29.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.29-0.9.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.29-0.9.0.php index 01d7653e7..e56398d16 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.29-0.9.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.29-0.9.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php index 7e9dd1226..6f50148b6 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.6-0.8.7.php index 5723c0503..98a94c6a8 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.6-0.8.7.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.6-0.8.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.7-0.8.8.php index 349c5e510..84cb99fb2 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.7-0.8.8.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.7-0.8.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.8-0.8.9.php index 0d6c646a5..a09aa4fa8 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.8-0.8.9.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.8-0.8.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.0-0.9.1.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.0-0.9.1.php index 2fcfef0d2..2c893e98c 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.0-0.9.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.0-0.9.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php index 1e7ab33a9..e6bce90b8 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php index 9e53dafbd..37b86045a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php index 66fad10cf..f38e8817f 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php index 934349b60..a8efba4e6 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php index cd1769e8e..04d3c7162 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php index e4214f46a..7d07b1ee3 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php index 0f3a379c2..84e319b13 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php index 281cd810c..86fbfe944 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php index 1b8772673..c0aa35491 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php index a5d46185a..87a23a1fb 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php index 5bd55b2f7..75044de6e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php index 367dfe7e3..f35a16c44 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php index 745687b7d..d0fafb31e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php index 915e218d4..7942aed7d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.22-0.9.23.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.22-0.9.23.php index 9dbd3d4e3..aa2e42700 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.22-0.9.23.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.22-0.9.23.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.23-0.9.24.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.23-0.9.24.php index 83b2fe673..62547b003 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.23-0.9.24.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.23-0.9.24.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php index fe8d3487a..49b184e9b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php index fd6d11dd8..c13464a8e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php index 833eff0f2..f891860fb 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php index 8d5715434..34ef0846b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php index 2d99e9af3..b4ea3d1b2 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php index 276453151..bc13bd919 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php index 0b27a50f9..eb715416e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php index 9fe574694..7e54da76f 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php index 7c7abd0ad..6485a9f6c 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php index 5100d4798..15b468368 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php index 0ed3d6bd2..cd2abb535 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php index 25738396f..a14453061 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php index 4d2ff3fa9..6b0b2aa70 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php index 5c5d7fb6a..966126977 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php index b9b656025..5bbb6955e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.38-0.9.39.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.38-0.9.39.php index 328249199..e38bed411 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.38-0.9.39.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.38-0.9.39.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.39-0.9.40.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.39-0.9.40.php index 2ca0ec350..3c3d5f4e1 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.39-0.9.40.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.39-0.9.40.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php index 8376fd506..98e9887f6 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.40-0.9.41.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.40-0.9.41.php index 6b8df08b4..2ddd5a93c 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.40-0.9.41.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.40-0.9.41.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.41-0.9.42.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.41-0.9.42.php index 001282ad9..2aa882e44 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.41-0.9.42.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.41-0.9.42.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.42-0.9.43.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.42-0.9.43.php index 155f9d361..9f2be7945 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.42-0.9.43.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.42-0.9.43.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.43-0.9.44.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.43-0.9.44.php index 3aa50cdf7..d4978039f 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.43-0.9.44.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.43-0.9.44.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.44-0.9.45.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.44-0.9.45.php index 1bf37ecfc..2b8170f1e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.44-0.9.45.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.44-0.9.45.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.45-0.9.46.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.45-0.9.46.php index 44d84eeaf..24fa9994a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.45-0.9.46.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.45-0.9.46.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php index e1ea13ff2..eb5437b09 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.47-0.9.48.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.47-0.9.48.php index 66a6efb03..af7a2a6fb 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.47-0.9.48.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.47-0.9.48.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.48-0.9.49.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.48-0.9.49.php index de46efefa..3c43a1962 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.48-0.9.49.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.48-0.9.49.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.49-0.9.50.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.49-0.9.50.php index 2062a6728..bf7049a05 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.49-0.9.50.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.49-0.9.50.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php index 3a985d56d..2ff01f867 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php index bd9fe89df..3da01178b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.51-0.9.52.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.51-0.9.52.php index be05e8b38..7b120b4c7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.51-0.9.52.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.51-0.9.52.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.52-0.9.53.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.52-0.9.53.php index c8c91cd92..60087c5fd 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.52-0.9.53.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.52-0.9.53.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.53-0.9.54.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.53-0.9.54.php index 36eceb77f..9ffdeb748 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.53-0.9.54.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.53-0.9.54.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.54-0.9.55.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.54-0.9.55.php index 4d54dd763..059ac252a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.54-0.9.55.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.54-0.9.55.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.55-0.9.56.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.55-0.9.56.php index 59192686d..5a5ce692d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.55-0.9.56.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.55-0.9.56.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php index 3246d79af..9fe3a35c4 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php index 5bac77525..3d861d0b9 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php index ff6755aed..a90e36a8c 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php index 78c9c744c..fa85aaef1 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.3.99-1.4.0.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.3.99-1.4.0.0.php index bb96ab3e0..e8605e8dd 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.3.99-1.4.0.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.3.99-1.4.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php index ba2ebc107..db5a57761 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php index 810d1094d..ac086c00e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.15-1.4.0.16.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.15-1.4.0.16.php index b41ec1e92..e8d5c5c84 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.15-1.4.0.16.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.15-1.4.0.16.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.16-1.4.0.17.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.16-1.4.0.17.php index 1f078cdcf..4f3c77f3c 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.16-1.4.0.17.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.16-1.4.0.17.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.17-1.4.0.18.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.17-1.4.0.18.php index cef9c80dc..58d9d3cad 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.17-1.4.0.18.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.17-1.4.0.18.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.18-1.4.0.19.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.18-1.4.0.19.php index fc2164844..edd3f8662 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.18-1.4.0.19.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.18-1.4.0.19.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.19-1.4.0.20.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.19-1.4.0.20.php index b1e3c0ac7..cfd2c770f 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.19-1.4.0.20.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.19-1.4.0.20.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php index e7d27fc1c..c09c13401 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.20-1.4.0.21.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.20-1.4.0.21.php index ac7d842b9..141464476 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.20-1.4.0.21.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.20-1.4.0.21.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.21-1.4.0.22.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.21-1.4.0.22.php index 85617d531..5fd971373 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.21-1.4.0.22.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.21-1.4.0.22.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.22-1.4.0.23.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.22-1.4.0.23.php index c29211ae7..04083a929 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.22-1.4.0.23.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.22-1.4.0.23.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.23-1.4.0.24.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.23-1.4.0.24.php index 72ba4d3e6..d150b2d5e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.23-1.4.0.24.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.23-1.4.0.24.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /* @var $installer Mage_Sales_Model_Entity_Setup */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.24-1.4.0.25.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.24-1.4.0.25.php index 0abf4361f..854fb846b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.24-1.4.0.25.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.24-1.4.0.25.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /* @var $installer Mage_Sales_Model_Entity_Setup */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.3-1.4.0.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.3-1.4.0.4.php index de1b20bf5..3c0687ec2 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.3-1.4.0.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.3-1.4.0.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.4-1.4.0.5.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.4-1.4.0.5.php index 7300fe833..e58805d41 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.4-1.4.0.5.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.4-1.4.0.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.5-1.4.0.6.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.5-1.4.0.6.php index 036733af1..7e1a257da 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.5-1.4.0.6.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.5-1.4.0.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.6-1.4.0.7.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.6-1.4.0.7.php index 15ad8a1f8..f2443717d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.6-1.4.0.7.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.6-1.4.0.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.7-1.4.0.8.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.7-1.4.0.8.php index ca3d1d5fc..df73cd5c0 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.7-1.4.0.8.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.7-1.4.0.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.8-1.4.0.15.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.8-1.4.0.15.php index 063041c54..539efee06 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.8-1.4.0.15.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.8-1.4.0.15.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index d86e6f3ab..46e1bcfe7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.0-1.6.0.1.php index 2f7b7343b..b999e1eb7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.0-1.6.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.php index 90cbf62b6..a0ac48b56 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php index 9353fad9b..7ebc2e242 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php index 1eb6eb31d..00ad2aee6 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php index e799f37ea..3c97943e0 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.5-1.6.0.6.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.5-1.6.0.6.php index 2bff04942..7c2171901 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.5-1.6.0.6.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.5-1.6.0.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.php index 97fd7b60d..cf5c1df7b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php index 78044709b..7e3f381af 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Exception.php b/app/code/core/Mage/SalesRule/Exception.php index 0b56f9fdb..ca0da0c52 100644 --- a/app/code/core/Mage/SalesRule/Exception.php +++ b/app/code/core/Mage/SalesRule/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Helper/Coupon.php b/app/code/core/Mage/SalesRule/Helper/Coupon.php index cebacbf30..f78425352 100644 --- a/app/code/core/Mage/SalesRule/Helper/Coupon.php +++ b/app/code/core/Mage/SalesRule/Helper/Coupon.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Helper/Data.php b/app/code/core/Mage/SalesRule/Helper/Data.php index 338fa1d7d..55cdae9cf 100644 --- a/app/code/core/Mage/SalesRule/Helper/Data.php +++ b/app/code/core/Mage/SalesRule/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Coupon.php b/app/code/core/Mage/SalesRule/Model/Coupon.php index e9c046160..83da7b426 100644 --- a/app/code/core/Mage/SalesRule/Model/Coupon.php +++ b/app/code/core/Mage/SalesRule/Model/Coupon.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Coupon/Codegenerator.php b/app/code/core/Mage/SalesRule/Model/Coupon/Codegenerator.php index 5cf5f24ff..a55d06535 100644 --- a/app/code/core/Mage/SalesRule/Model/Coupon/Codegenerator.php +++ b/app/code/core/Mage/SalesRule/Model/Coupon/Codegenerator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Coupon/CodegeneratorInterface.php b/app/code/core/Mage/SalesRule/Model/Coupon/CodegeneratorInterface.php index 5e8e9beba..f049afbda 100644 --- a/app/code/core/Mage/SalesRule/Model/Coupon/CodegeneratorInterface.php +++ b/app/code/core/Mage/SalesRule/Model/Coupon/CodegeneratorInterface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php b/app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php index b86c55707..517d88891 100644 --- a/app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php +++ b/app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php index a7bac631a..387667a1a 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php index 2bc90a036..81093d126 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php index 4ecd7208d..f79d10dbc 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php index 3a066c8bd..87df6df05 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php index b608d800b..84c68256e 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php index ee0909614..63dd76a94 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php index 243e9fb0f..a2f102e11 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php index c6651f3b1..a43bf3533 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php index 71db4f879..195d5b94d 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php index 33b9d7647..fdcadbc07 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php index 01575d55a..c205048ac 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php index ce3ad7e2e..ce9764368 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Observer.php b/app/code/core/Mage/SalesRule/Model/Observer.php index c804510b1..559a37e98 100644 --- a/app/code/core/Mage/SalesRule/Model/Observer.php +++ b/app/code/core/Mage/SalesRule/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php index d29f98761..9b341c521 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -77,7 +77,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address) $this->_calculator->initTotals($items, $address); $address->setDiscountDescription(array()); - $items = $this->_calculator->sortItemsByPriority($items); + foreach ($items as $item) { if ($item->getNoDiscount()) { $item->setDiscountAmount(0); diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php b/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php index af61357e3..46f9e14ff 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php b/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php index cbbfbe5dc..debbe5587 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php index 184f2b684..befe7dbe6 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php index c00a6c751..a66f6f137 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php index e29436e02..80af6485d 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php index bd7d877cc..fb9de52db 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule.php index 441ad3d01..d72bc0c2a 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php index d3cf73735..edff06734 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php index b8fd63de0..fe7ac5c97 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Updatedat/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Updatedat/Collection.php index 88d858c18..5439305f2 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Updatedat/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Updatedat/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule.php index 384bb1b9b..288db56c2 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php index b6636751d..134808aae 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,40 +85,20 @@ public function setValidationFilter($websiteId, $customerGroupId, $couponCode = $this->addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now); $select = $this->getSelect(); - $connection = $this->getConnection(); if (strlen($couponCode)) { $select->joinLeft( array('rule_coupons' => $this->getTable('salesrule/coupon')), - $connection->quoteInto( - 'main_table.rule_id = rule_coupons.rule_id AND main_table.coupon_type != ?', - Mage_SalesRule_Model_Rule::COUPON_TYPE_NO_COUPON - ), + 'main_table.rule_id = rule_coupons.rule_id ', array('code') ); - - $noCouponCondition = $connection->quoteInto( - 'main_table.coupon_type = ? ', - Mage_SalesRule_Model_Rule::COUPON_TYPE_NO_COUPON - ); - - $orWhereConditions = array( - $connection->quoteInto( - '(main_table.coupon_type = ? AND rule_coupons.type = 0)', - Mage_SalesRule_Model_Rule::COUPON_TYPE_AUTO - ), - $connection->quoteInto( - '(main_table.coupon_type = ? AND main_table.use_auto_generation = 1 AND rule_coupons.type = 1)', - Mage_SalesRule_Model_Rule::COUPON_TYPE_SPECIFIC - ), - $connection->quoteInto( - '(main_table.coupon_type = ? AND main_table.use_auto_generation = 0 AND rule_coupons.type = 0)', - Mage_SalesRule_Model_Rule::COUPON_TYPE_SPECIFIC - ), - ); - $orWhereCondition = implode(' OR ', $orWhereConditions); - $select->where( - $noCouponCondition . ' OR ((' . $orWhereCondition . ') AND rule_coupons.code = ?)', $couponCode - ); + $select->where('(main_table.coupon_type = ? ', Mage_SalesRule_Model_Rule::COUPON_TYPE_NO_COUPON) + ->orWhere('(main_table.coupon_type = ? AND rule_coupons.type = 0', + Mage_SalesRule_Model_Rule::COUPON_TYPE_AUTO) + ->orWhere('main_table.coupon_type = ? AND main_table.use_auto_generation = 1 ' . + 'AND rule_coupons.type = 1', Mage_SalesRule_Model_Rule::COUPON_TYPE_SPECIFIC) + ->orWhere('main_table.coupon_type = ? AND main_table.use_auto_generation = 0 ' . + 'AND rule_coupons.type = 0)', Mage_SalesRule_Model_Rule::COUPON_TYPE_SPECIFIC) + ->where('rule_coupons.code = ?)', $couponCode); } else { $this->addFieldToFilter('main_table.coupon_type', Mage_SalesRule_Model_Rule::COUPON_TYPE_NO_COUPON); } @@ -127,7 +107,7 @@ public function setValidationFilter($websiteId, $customerGroupId, $couponCode = } return $this; - } + } /** * Filter collection by website(s), customer group(s) and date. diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php index 0f8a1dcdf..934fce1e6 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer/Collection.php index 515ba6476..6ea3b4d7b 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product.php index a016066f8..ac19a206f 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product/Collection.php index 544ad6b6c..5c2c69946 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule.php b/app/code/core/Mage/SalesRule/Model/Rule.php index 7af4c2929..69a5faaa4 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Action/Collection.php b/app/code/core/Mage/SalesRule/Model/Rule/Action/Collection.php index c9d0d9d81..d5e61f61c 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Action/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Action/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Action/Product.php b/app/code/core/Mage/SalesRule/Model/Rule/Action/Product.php index fd1a83f1b..ddcb402ca 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Action/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Action/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Address.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Address.php index 844bfe662..adc4140ff 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Address.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Combine.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Combine.php index 7fd10706b..f56c0a1bd 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Combine.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Combine.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php index 80f9508dc..7c7513669 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php index 61311e1b0..3901f0d67 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php index bd08d0974..813db8557 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php index 6a1d5daa6..e169bd7b2 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Rule/Customer.php index 31c16bca3..c582defce 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Customer.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Product.php b/app/code/core/Mage/SalesRule/Model/Rule/Product.php index 8833d7852..331f7421d 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/System/Config/Source/Coupon/Format.php b/app/code/core/Mage/SalesRule/Model/System/Config/Source/Coupon/Format.php index 1ec040ef8..373bd41a2 100644 --- a/app/code/core/Mage/SalesRule/Model/System/Config/Source/Coupon/Format.php +++ b/app/code/core/Mage/SalesRule/Model/System/Config/Source/Coupon/Format.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php index 255c2ee07..9c1b5f658 100644 --- a/app/code/core/Mage/SalesRule/Model/Validator.php +++ b/app/code/core/Mage/SalesRule/Model/Validator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -94,13 +94,6 @@ class Mage_SalesRule_Model_Validator extends Mage_Core_Model_Abstract */ protected $_cartFixedRuleUsedForAddress = array(); - /** - * Defines if rule with stop further rules is already applied - * - * @var bool - */ - protected $_stopFurtherRules = false; - /** * Init validator * Init process load collection of rules for specific website, @@ -313,10 +306,6 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item) $appliedRuleIds = array(); foreach ($this->_getRules() as $rule) { - if ($this->_stopFurtherRules) { - break; - } - /* @var $rule Mage_SalesRule_Model_Rule */ if (!$this->_canProcessRule($rule, $address)) { continue; @@ -511,7 +500,6 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item) $this->_addDiscountDescription($address, $rule); if ($rule->getStopRulesProcessing()) { - $this->_stopFurtherRules = true; break; } } @@ -626,11 +614,6 @@ public function processWeeeAmount(Mage_Sales_Model_Quote_Address $address, $item $totalWeeeDiscount += $weeeDiscount; } - if (!$totalBaseWeeeDiscount && !$totalWeeeDiscount) { - //skip further processing if there is no weee discount associated with the item - continue; - } - $discountPercentage = $item->getDiscountPercent(); $totalWeeeDiscount = $this->_roundWithDeltas($discountPercentage, @@ -651,9 +634,9 @@ public function processWeeeAmount(Mage_Sales_Model_Quote_Address $address, $item $item, null, 'total_weee_discount', $totalWeeeDiscount); } + $item->setDiscountAmount($item->getDiscountAmount() + $totalWeeeDiscount); + $item->setBaseDiscountAmount($item->getBaseDiscountAmount() + $totalBaseWeeeDiscount); if ($includeInSubtotal) { - $item->setDiscountAmount($item->getDiscountAmount() + $totalWeeeDiscount); - $item->setBaseDiscountAmount($item->getBaseDiscountAmount() + $totalBaseWeeeDiscount); $address->addTotalAmount('discount', -$totalWeeeDiscount); $address->addBaseTotalAmount('discount', -$totalBaseWeeeDiscount); } else { @@ -899,7 +882,7 @@ public function initTotals($items, Mage_Sales_Model_Quote_Address $address) ); } } - $this->_stopFurtherRules = false; + return $this; } @@ -1054,27 +1037,4 @@ protected function _getSingleton($name) { protected function _getHelper($name) { return Mage::helper($name); } - - /** - * Return items list sorted by possibility to apply prioritized rules - * - * @param array $items - * @return array $items - */ - public function sortItemsByPriority($items) - { - $itemsSorted = array(); - foreach ($this->_getRules() as $rule) { - foreach ($items as $itemKey => $itemValue) { - if ($rule->getActions()->validate($itemValue)) { - unset($items[$itemKey]); - array_push($itemsSorted, $itemValue); - } - } - } - if (!empty($itemsSorted)) { - $items = array_merge($itemsSorted, $items); - } - return $items; - } } diff --git a/app/code/core/Mage/SalesRule/etc/adminhtml.xml b/app/code/core/Mage/SalesRule/etc/adminhtml.xml index b5bdfacf5..f2526f196 100644 --- a/app/code/core/Mage/SalesRule/etc/adminhtml.xml +++ b/app/code/core/Mage/SalesRule/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/SalesRule/etc/config.xml b/app/code/core/Mage/SalesRule/etc/config.xml index 6b7d42ef8..d5df25364 100644 --- a/app/code/core/Mage/SalesRule/etc/config.xml +++ b/app/code/core/Mage/SalesRule/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/SalesRule/etc/system.xml b/app/code/core/Mage/SalesRule/etc/system.xml index ba3f30258..b706d6417 100644 --- a/app/code/core/Mage/SalesRule/etc/system.xml +++ b/app/code/core/Mage/SalesRule/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/install-1.6.0.0.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/install-1.6.0.0.php index 7ce602bf6..1d67bd265 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-0.7.0.php index 794039314..0c0126cc2 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-1.4.0.0.0.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-1.4.0.0.0.php index f0755347f..ab3ef791c 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-1.4.0.0.0.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-1.4.0.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.0-0.7.1.php index 3fdc8c826..89f80efa3 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.1-0.7.2.php index a033d56a3..777b24dba 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.10-0.7.11.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.10-0.7.11.php index 69cd62ce6..dad788f31 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.10-0.7.11.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.10-0.7.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.11-0.7.12.php index 958d5b696..c72064e35 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.11-0.7.12.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.11-0.7.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.2-0.7.3.php index ae181d6b1..4c86c42f2 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.3-0.7.4.php index 526621cdd..bafa5de68 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php index 23f4fff78..438f88fc3 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.5-0.7.6.php index e7880001d..40304ae0a 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.6-0.7.7.php index 5cd765302..adae5f963 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.7-0.7.8.php index fc288703e..408ad54ce 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.8-0.7.9.php index 4d4d213fb..31934439f 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.9-0.7.10.php index 129f845b1..4cdfe64cd 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php index 7226a4b09..d60a0c7db 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php index 14a7a4e0c..47fbac17e 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php index fe5e3925b..0123a3640 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php index 3779d65a1..3d6788fe5 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php index d4d4d4b5e..f1510ae6a 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php index 74c6d563f..833470941 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 32b0cefeb..62c47fb6a 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.php index 2c38d1bb0..c9d2b580d 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.php index 79f4fb750..b2ab17579 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.2-1.6.0.3.php index 1e32cce28..60f44566d 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.2-1.6.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_SalesRule - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Block/Send.php b/app/code/core/Mage/Sendfriend/Block/Send.php index 45dfc7fd6..786829f6d 100644 --- a/app/code/core/Mage/Sendfriend/Block/Send.php +++ b/app/code/core/Mage/Sendfriend/Block/Send.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Helper/Data.php b/app/code/core/Mage/Sendfriend/Helper/Data.php index 49eb5746b..c91c20843 100644 --- a/app/code/core/Mage/Sendfriend/Helper/Data.php +++ b/app/code/core/Mage/Sendfriend/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php index 274a5c297..e706d1676 100644 --- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php +++ b/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php index 749b5037d..e45ee91a7 100644 --- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php +++ b/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php index 598191297..b4342e54c 100644 --- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Observer.php b/app/code/core/Mage/Sendfriend/Model/Observer.php index 965c21e1c..a14e915ef 100644 --- a/app/code/core/Mage/Sendfriend/Model/Observer.php +++ b/app/code/core/Mage/Sendfriend/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php index 4a0753e6e..2fd4b989b 100644 --- a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php +++ b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend/Collection.php b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend/Collection.php index ae843f21e..bf7c869b0 100644 --- a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend/Collection.php +++ b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php b/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php index 531c096e4..2af7e7842 100644 --- a/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php +++ b/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Sendfriend.php index 9c2bfd3c6..63b75e673 100644 --- a/app/code/core/Mage/Sendfriend/Model/Sendfriend.php +++ b/app/code/core/Mage/Sendfriend/Model/Sendfriend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/controllers/ProductController.php b/app/code/core/Mage/Sendfriend/controllers/ProductController.php index 0ba3836a0..2ed595067 100644 --- a/app/code/core/Mage/Sendfriend/controllers/ProductController.php +++ b/app/code/core/Mage/Sendfriend/controllers/ProductController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/etc/config.xml b/app/code/core/Mage/Sendfriend/etc/config.xml index cccfa65b9..96ac57fd6 100644 --- a/app/code/core/Mage/Sendfriend/etc/config.xml +++ b/app/code/core/Mage/Sendfriend/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sendfriend/etc/system.xml b/app/code/core/Mage/Sendfriend/etc/system.xml index bbac412ad..c344e29c2 100644 --- a/app/code/core/Mage/Sendfriend/etc/system.xml +++ b/app/code/core/Mage/Sendfriend/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/install-1.6.0.0.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/install-1.6.0.0.php index e3fbeb69c..cf938c56e 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php index 26cf35212..dc2583f36 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php index f86661429..17f67f635 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.2-0.7.3.php index d595b4c83..a1f8fdf5e 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.3-0.7.4.php index e5f43673b..494717ae8 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 4b1d8914b..a6e1d3fc3 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sendfriend - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Block/Tracking/Ajax.php b/app/code/core/Mage/Shipping/Block/Tracking/Ajax.php index 80ff1f514..335e2febd 100644 --- a/app/code/core/Mage/Shipping/Block/Tracking/Ajax.php +++ b/app/code/core/Mage/Shipping/Block/Tracking/Ajax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Block/Tracking/Popup.php b/app/code/core/Mage/Shipping/Block/Tracking/Popup.php index 870e2216a..311c91eb1 100644 --- a/app/code/core/Mage/Shipping/Block/Tracking/Popup.php +++ b/app/code/core/Mage/Shipping/Block/Tracking/Popup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Exception.php b/app/code/core/Mage/Shipping/Exception.php index 17746848e..6a0cfe0e4 100644 --- a/app/code/core/Mage/Shipping/Exception.php +++ b/app/code/core/Mage/Shipping/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Helper/Data.php b/app/code/core/Mage/Shipping/Helper/Data.php index 73ce9beaf..ad750f39f 100644 --- a/app/code/core/Mage/Shipping/Helper/Data.php +++ b/app/code/core/Mage/Shipping/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php index 10fb6a825..44512aca0 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php b/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php index 36bf27b9a..572cbe4bc 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php index a145cefbe..47dcdf34a 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Interface.php b/app/code/core/Mage/Shipping/Model/Carrier/Interface.php index 2186f9357..cf97d28d1 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Interface.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php b/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php index 88e5c46bc..ef83478b4 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php index 59505ca41..25a7c1833 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Config.php b/app/code/core/Mage/Shipping/Model/Config.php index 66fe7d08b..0d9354fd6 100644 --- a/app/code/core/Mage/Shipping/Model/Config.php +++ b/app/code/core/Mage/Shipping/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Info.php b/app/code/core/Mage/Shipping/Model/Info.php index 3df274f83..807249248 100644 --- a/app/code/core/Mage/Shipping/Model/Info.php +++ b/app/code/core/Mage/Shipping/Model/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php index 04f13c577..40ccf06b5 100644 --- a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php index 542cda6e6..95852776b 100644 --- a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php +++ b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rate/Abstract.php b/app/code/core/Mage/Shipping/Model/Rate/Abstract.php index a4104ed31..cc9810dfa 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rate/Request.php b/app/code/core/Mage/Shipping/Model/Rate/Request.php index 689b34c50..e6e95d09f 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Request.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Request.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result.php b/app/code/core/Mage/Shipping/Model/Rate/Result.php index 575bbf4a6..85d8e7955 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php b/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php index 4cbd54e11..8a0df9217 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php b/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php index 24843dc0b..1708d57b1 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php b/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php index b8438ce9f..24a8e3fbc 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php index 6f02fd6f4..ed9903814 100644 --- a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php index 3ab49d675..d92c87694 100644 --- a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php +++ b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Shipment/Request.php b/app/code/core/Mage/Shipping/Model/Shipment/Request.php index ca0481cb3..e1ac41d9f 100644 --- a/app/code/core/Mage/Shipping/Model/Shipment/Request.php +++ b/app/code/core/Mage/Shipping/Model/Shipment/Request.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Shipment/Return.php b/app/code/core/Mage/Shipping/Model/Shipment/Return.php index a7c253980..83e3d974f 100644 --- a/app/code/core/Mage/Shipping/Model/Shipment/Return.php +++ b/app/code/core/Mage/Shipping/Model/Shipment/Return.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Shipping.php b/app/code/core/Mage/Shipping/Model/Shipping.php index d6e6a254b..88acdad3f 100644 --- a/app/code/core/Mage/Shipping/Model/Shipping.php +++ b/app/code/core/Mage/Shipping/Model/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Source/HandlingAction.php b/app/code/core/Mage/Shipping/Model/Source/HandlingAction.php index 8f02f7e35..4b543c5de 100644 --- a/app/code/core/Mage/Shipping/Model/Source/HandlingAction.php +++ b/app/code/core/Mage/Shipping/Model/Source/HandlingAction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Shipping_Model_Source_HandlingAction diff --git a/app/code/core/Mage/Shipping/Model/Source/HandlingType.php b/app/code/core/Mage/Shipping/Model/Source/HandlingType.php index 0fc0e8196..420ad6baf 100644 --- a/app/code/core/Mage/Shipping/Model/Source/HandlingType.php +++ b/app/code/core/Mage/Shipping/Model/Source/HandlingType.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Shipping_Model_Source_HandlingType diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result.php b/app/code/core/Mage/Shipping/Model/Tracking/Result.php index c10a7c4c5..d38faed0f 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result/Abstract.php b/app/code/core/Mage/Shipping/Model/Tracking/Result/Abstract.php index fe7686034..5a4b66eeb 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php b/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php index c8bcab0b1..6fa07fbd1 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php b/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php index 73804a2cf..f81b85965 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/controllers/ShippingController.php b/app/code/core/Mage/Shipping/controllers/ShippingController.php index 2273a9e69..927858f04 100644 --- a/app/code/core/Mage/Shipping/controllers/ShippingController.php +++ b/app/code/core/Mage/Shipping/controllers/ShippingController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/controllers/TrackingController.php b/app/code/core/Mage/Shipping/controllers/TrackingController.php index e862e8be0..58636c953 100644 --- a/app/code/core/Mage/Shipping/controllers/TrackingController.php +++ b/app/code/core/Mage/Shipping/controllers/TrackingController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/etc/adminhtml.xml b/app/code/core/Mage/Shipping/etc/adminhtml.xml index 20f36c573..d7b8a5dec 100644 --- a/app/code/core/Mage/Shipping/etc/adminhtml.xml +++ b/app/code/core/Mage/Shipping/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Shipping/etc/config.xml b/app/code/core/Mage/Shipping/etc/config.xml index b18e66f7e..ebd2b8541 100644 --- a/app/code/core/Mage/Shipping/etc/config.xml +++ b/app/code/core/Mage/Shipping/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Shipping/etc/system.xml b/app/code/core/Mage/Shipping/etc/system.xml index fa5256d95..18990f59a 100644 --- a/app/code/core/Mage/Shipping/etc/system.xml +++ b/app/code/core/Mage/Shipping/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Shipping/sql/shipping_setup/install-1.6.0.0.php b/app/code/core/Mage/Shipping/sql/shipping_setup/install-1.6.0.0.php index f795be93d..b85de787f 100644 --- a/app/code/core/Mage/Shipping/sql/shipping_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Shipping/sql/shipping_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-install-0.7.0.php index 7f6af76ef..5547c3ccb 100644 --- a/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 5550a4a61..9776b9392 100644 --- a/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Shipping - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Helper/Data.php b/app/code/core/Mage/Sitemap/Helper/Data.php index b261f28f9..c8d5e53bb 100644 --- a/app/code/core/Mage/Sitemap/Helper/Data.php +++ b/app/code/core/Mage/Sitemap/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php index 10b58fb2b..a7dd1f2d9 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php index b3e09d7fb..46e6984a1 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php index 3f115275a..37e542019 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php index 435c89834..5d19cc588 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php index d4bbe87b4..fe41e720b 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Observer.php b/app/code/core/Mage/Sitemap/Model/Observer.php index 3fbcf2c4d..7f8d220d8 100644 --- a/app/code/core/Mage/Sitemap/Model/Observer.php +++ b/app/code/core/Mage/Sitemap/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php index 02eca5386..698396833 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php index 64c1ec217..4eaca68e5 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php index 7b4610274..b1a57251e 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php b/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php index 7c484c77c..bad03bdc3 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php index 4691f2031..a4f3fa170 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap/Collection.php b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap/Collection.php index cd3187e6d..c5bd56b6a 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap/Collection.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Sitemap.php index f2682394f..67b519d8a 100644 --- a/app/code/core/Mage/Sitemap/Model/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Sitemap.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -152,12 +152,7 @@ public function generateXml() $changefreq = (string)Mage::getStoreConfig('sitemap/category/changefreq', $storeId); $priority = (string)Mage::getStoreConfig('sitemap/category/priority', $storeId); $collection = Mage::getResourceModel('sitemap/catalog_category')->getCollection($storeId); - $categories = new Varien_Object(); - $categories->setItems($collection); - Mage::dispatchEvent('sitemap_categories_generating_before', array( - 'collection' => $categories - )); - foreach ($categories->getItems() as $item) { + foreach ($collection as $item) { $xml = sprintf( '%s%s%s%.1f', htmlspecialchars($baseUrl . $item->getUrl()), @@ -175,12 +170,7 @@ public function generateXml() $changefreq = (string)Mage::getStoreConfig('sitemap/product/changefreq', $storeId); $priority = (string)Mage::getStoreConfig('sitemap/product/priority', $storeId); $collection = Mage::getResourceModel('sitemap/catalog_product')->getCollection($storeId); - $products = new Varien_Object(); - $products->setItems($collection); - Mage::dispatchEvent('sitemap_products_generating_before', array( - 'collection' => $products - )); - foreach ($products->getItems() as $item) { + foreach ($collection as $item) { $xml = sprintf( '%s%s%s%.1f', htmlspecialchars($baseUrl . $item->getUrl()), diff --git a/app/code/core/Mage/Sitemap/etc/adminhtml.xml b/app/code/core/Mage/Sitemap/etc/adminhtml.xml index c137c0868..c1e3be2a9 100644 --- a/app/code/core/Mage/Sitemap/etc/adminhtml.xml +++ b/app/code/core/Mage/Sitemap/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sitemap/etc/config.xml b/app/code/core/Mage/Sitemap/etc/config.xml index 0310b7cdd..bdaf2c7f7 100644 --- a/app/code/core/Mage/Sitemap/etc/config.xml +++ b/app/code/core/Mage/Sitemap/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sitemap/etc/system.xml b/app/code/core/Mage/Sitemap/etc/system.xml index add736b27..893bbeeff 100644 --- a/app/code/core/Mage/Sitemap/etc/system.xml +++ b/app/code/core/Mage/Sitemap/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sitemap/sql/sitemap_setup/install-1.6.0.0.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/install-1.6.0.0.php index 895aefb0a..8a2167577 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-install-0.7.0.php index 25f7d631f..05f712ba7 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.0-0.7.1.php index ccb905c67..cf3a46db3 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.1-0.7.2.php index c282ec6fe..f9a842b5f 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 0c550f19b..94c8a9492 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sitemap - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Block/All.php b/app/code/core/Mage/Tag/Block/All.php index 6b2b7736b..042be18e9 100644 --- a/app/code/core/Mage/Tag/Block/All.php +++ b/app/code/core/Mage/Tag/Block/All.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Block/Customer/Edit.php b/app/code/core/Mage/Tag/Block/Customer/Edit.php index 686520c88..db06653b2 100644 --- a/app/code/core/Mage/Tag/Block/Customer/Edit.php +++ b/app/code/core/Mage/Tag/Block/Customer/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Block/Customer/Recent.php b/app/code/core/Mage/Tag/Block/Customer/Recent.php index 719eb3f47..72321a1de 100644 --- a/app/code/core/Mage/Tag/Block/Customer/Recent.php +++ b/app/code/core/Mage/Tag/Block/Customer/Recent.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Block/Customer/Tags.php b/app/code/core/Mage/Tag/Block/Customer/Tags.php index 8caad3668..e90c1fc3d 100644 --- a/app/code/core/Mage/Tag/Block/Customer/Tags.php +++ b/app/code/core/Mage/Tag/Block/Customer/Tags.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Block/Customer/View.php b/app/code/core/Mage/Tag/Block/Customer/View.php index da513f4cf..b43536f52 100644 --- a/app/code/core/Mage/Tag/Block/Customer/View.php +++ b/app/code/core/Mage/Tag/Block/Customer/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Block/Popular.php b/app/code/core/Mage/Tag/Block/Popular.php index ba3e30dd3..93dc52af2 100644 --- a/app/code/core/Mage/Tag/Block/Popular.php +++ b/app/code/core/Mage/Tag/Block/Popular.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Block/Product/List.php b/app/code/core/Mage/Tag/Block/Product/List.php index 2c9bd4470..94c13af69 100644 --- a/app/code/core/Mage/Tag/Block/Product/List.php +++ b/app/code/core/Mage/Tag/Block/Product/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Block/Product/Result.php b/app/code/core/Mage/Tag/Block/Product/Result.php index 39af7488a..3bb112115 100644 --- a/app/code/core/Mage/Tag/Block/Product/Result.php +++ b/app/code/core/Mage/Tag/Block/Product/Result.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Helper/Data.php b/app/code/core/Mage/Tag/Helper/Data.php index 89e4a9f9c..0fb393aef 100644 --- a/app/code/core/Mage/Tag/Helper/Data.php +++ b/app/code/core/Mage/Tag/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Api.php b/app/code/core/Mage/Tag/Model/Api.php index 215982cd2..1cc6dbb71 100644 --- a/app/code/core/Mage/Tag/Model/Api.php +++ b/app/code/core/Mage/Tag/Model/Api.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Api/V2.php b/app/code/core/Mage/Tag/Model/Api/V2.php index 74a033aab..59989792b 100644 --- a/app/code/core/Mage/Tag/Model/Api/V2.php +++ b/app/code/core/Mage/Tag/Model/Api/V2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php index 8b9adeb34..dd4c40bfe 100644 --- a/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php +++ b/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Indexer/Summary.php index 989f127d9..f260df7e5 100644 --- a/app/code/core/Mage/Tag/Model/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Indexer/Summary.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php index eef133566..36617f235 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php index 26d8a9a91..88393c09d 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php index 47bfe5dfb..e3b190e12 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php index 8859e9fce..feefc99ef 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag.php index 8fb88b44c..7910ad789 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Tag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php index dff0da35f..d9b228513 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php index 6aeb99d17..737c2ccc0 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php index 8dc2ce415..ffda0e640 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php +++ b/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php index b1ea28590..6573f5f5f 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php index cc51fdf8e..562168d21 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php +++ b/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php index 7527baa04..9c8b2f278 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php +++ b/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag.php b/app/code/core/Mage/Tag/Model/Resource/Tag.php index f92961dd6..2fcfaf0ba 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Tag.php +++ b/app/code/core/Mage/Tag/Model/Resource/Tag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php index 4a8ffbcc3..cfe0a5fab 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php +++ b/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php index 6f99bb09d..8784164c3 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php +++ b/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Session.php b/app/code/core/Mage/Tag/Model/Session.php index f2caa2ac0..96f31d00e 100644 --- a/app/code/core/Mage/Tag/Model/Session.php +++ b/app/code/core/Mage/Tag/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Tag.php b/app/code/core/Mage/Tag/Model/Tag.php index 12670c579..af4813d98 100644 --- a/app/code/core/Mage/Tag/Model/Tag.php +++ b/app/code/core/Mage/Tag/Model/Tag.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Tag/Relation.php index 0bfde2ee1..d3e17364e 100644 --- a/app/code/core/Mage/Tag/Model/Tag/Relation.php +++ b/app/code/core/Mage/Tag/Model/Tag/Relation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/controllers/CustomerController.php b/app/code/core/Mage/Tag/controllers/CustomerController.php index cb70f8f45..87763ca2c 100644 --- a/app/code/core/Mage/Tag/controllers/CustomerController.php +++ b/app/code/core/Mage/Tag/controllers/CustomerController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/controllers/IndexController.php b/app/code/core/Mage/Tag/controllers/IndexController.php index aa0c3a7ca..26623ae7c 100644 --- a/app/code/core/Mage/Tag/controllers/IndexController.php +++ b/app/code/core/Mage/Tag/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/controllers/ListController.php b/app/code/core/Mage/Tag/controllers/ListController.php index 968eedcf0..80d542de4 100644 --- a/app/code/core/Mage/Tag/controllers/ListController.php +++ b/app/code/core/Mage/Tag/controllers/ListController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/controllers/ProductController.php b/app/code/core/Mage/Tag/controllers/ProductController.php index 6c306866a..4056bbe0f 100644 --- a/app/code/core/Mage/Tag/controllers/ProductController.php +++ b/app/code/core/Mage/Tag/controllers/ProductController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/etc/adminhtml.xml b/app/code/core/Mage/Tag/etc/adminhtml.xml index f366cc0fc..a52ac8eff 100644 --- a/app/code/core/Mage/Tag/etc/adminhtml.xml +++ b/app/code/core/Mage/Tag/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tag/etc/api.xml b/app/code/core/Mage/Tag/etc/api.xml index f637d17fb..72e6cea4c 100644 --- a/app/code/core/Mage/Tag/etc/api.xml +++ b/app/code/core/Mage/Tag/etc/api.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tag/etc/config.xml b/app/code/core/Mage/Tag/etc/config.xml index dcf661706..e4b4483b6 100644 --- a/app/code/core/Mage/Tag/etc/config.xml +++ b/app/code/core/Mage/Tag/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tag/sql/tag_setup/install-1.6.0.0.php b/app/code/core/Mage/Tag/sql/tag_setup/install-1.6.0.0.php index fc7c4310d..4884c70e1 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-install-0.7.0.php index 190d9d664..70756c188 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.0-0.7.1.php index 69f670942..3a4c05647 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.1-0.7.2.php index 975fa2174..a77e2f0d6 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.2-0.7.3.php index 886aa616f..c8bbee406 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.3-0.7.4.php index 8f3a2d288..4af0d8997 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.4-0.7.5.php index 248f0a116..723100a35 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.5-0.7.6.php index 42fb7f2a1..8f194c95d 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.6-0.7.7.php index 2303a4fe7..982ab811d 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 33bc86148..9e9b38d14 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tag - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php index d18ef766f..86d6b67af 100644 --- a/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php +++ b/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php b/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php index 49187743b..484c8c5df 100644 --- a/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php +++ b/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Block/Checkout/Discount.php b/app/code/core/Mage/Tax/Block/Checkout/Discount.php index 1a6343b15..a66f9ec6e 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Discount.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Discount.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Block/Checkout/Grandtotal.php b/app/code/core/Mage/Tax/Block/Checkout/Grandtotal.php index 578ee3a38..358bcce11 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Grandtotal.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Grandtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Block/Checkout/Shipping.php b/app/code/core/Mage/Tax/Block/Checkout/Shipping.php index 0a7293067..d7808977b 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Shipping.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php b/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php index bda9b2dbe..0b4b67e1e 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Block/Checkout/Tax.php b/app/code/core/Mage/Tax/Block/Checkout/Tax.php index ff6674c89..5867bbcd4 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Tax.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php index 1ff6928a0..f1197e0e7 100644 --- a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Exception.php b/app/code/core/Mage/Tax/Exception.php index 6007eb298..a21ed2036 100644 --- a/app/code/core/Mage/Tax/Exception.php +++ b/app/code/core/Mage/Tax/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Helper/Data.php b/app/code/core/Mage/Tax/Helper/Data.php index e159ee051..3d5cbd5ff 100644 --- a/app/code/core/Mage/Tax/Helper/Data.php +++ b/app/code/core/Mage/Tax/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -463,7 +463,7 @@ protected function _getAllRatesByProductClass($store = null) { $result = array(); $calc = Mage::getSingleton('tax/calculation'); - $rates = $calc->getRatesForAllProductTaxClasses($calc->getDefaultRateRequest($store)); + $rates = $calc->getRatesForAllProductTaxClasses($calc->getRateOriginRequest($store)); foreach ($rates as $class => $rate) { $result["value_{$class}"] = $rate; @@ -512,13 +512,9 @@ public function getPrice($product, $price, $includingTax = null, $shippingAddres } } if ($taxClassId && $priceIncludesTax) { - if ($this->isCrossBorderTradeEnabled($store)) { - $includingPercent = $percent; - } else { - $request = Mage::getSingleton('tax/calculation')->getRateOriginRequest($store); - $includingPercent = Mage::getSingleton('tax/calculation') - ->getRate($request->setProductClassId($taxClassId)); - } + $request = Mage::getSingleton('tax/calculation')->getRateRequest(false, false, false, $store); + $includingPercent = Mage::getSingleton('tax/calculation') + ->getRate($request->setProductClassId($taxClassId)); } if ($percent === false || is_null($percent)) { @@ -648,12 +644,11 @@ public function displayPriceExcludingTax() /** * Check if we have display in catalog prices including and excluding tax * - * @param int $store * @return bool */ - public function displayBothPrices($store = null) + public function displayBothPrices() { - return $this->getPriceDisplayType($store) == Mage_Tax_Model_Config::DISPLAY_TYPE_BOTH; + return $this->getPriceDisplayType() == Mage_Tax_Model_Config::DISPLAY_TYPE_BOTH; } /** @@ -817,7 +812,7 @@ public function getPriceTaxSql($priceField, $taxClassField) return ''; } - $request = Mage::getSingleton('tax/calculation')->getDefaultRateRequest(); + $request = Mage::getSingleton('tax/calculation')->getRateRequest(false, false, false); $defaultTaxes = Mage::getSingleton('tax/calculation')->getRatesForAllProductTaxClasses($request); $request = Mage::getSingleton('tax/calculation')->getRateRequest(); @@ -1193,15 +1188,4 @@ public function isConflictingFptTaxConfigurationSettingsIgnored() return (bool) $this->_app->getStore() ->getConfig(Mage_Tax_Model_Config::XML_PATH_TAX_NOTIFICATION_FPT_CONFIGURATION); } - - /** - * Return whether cross border trade is enabled or not - * - * @param null|int $store - * @return boolean - */ - public function isCrossBorderTradeEnabled($store = null) - { - return (bool)$this->_config->crossBorderTradeEnabled($store); - } } diff --git a/app/code/core/Mage/Tax/Model/Calculation.php b/app/code/core/Mage/Tax/Model/Calculation.php index d5a118328..38355c4c7 100644 --- a/app/code/core/Mage/Tax/Model/Calculation.php +++ b/app/code/core/Mage/Tax/Model/Calculation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -110,13 +110,6 @@ class Mage_Tax_Model_Calculation extends Mage_Core_Model_Abstract */ protected $_defaultCustomerTaxClass = null; - /** - * Tax helper - * - * @var Mage_Tax_Helper_Data - */ - protected $_taxHelper; - /** * Constructor */ @@ -125,17 +118,6 @@ protected function _construct() $this->_init('tax/calculation'); } - /** - * Initialize tax helper - * - * @param array $args - */ - public function __construct(array $args = array()) - { - parent::__construct(); - $this->_taxHelper = !empty($args['helper']) ? $args['helper'] : Mage::helper('tax'); - } - /** * Specify customer object which can be used for rate calculation * @@ -353,22 +335,6 @@ public function getRateOriginRequest($store = null) return $request; } - /** - * Return the default rate request. It can be either based on store address or customer address - * - * @param type $store - * @return \Varien_Object - */ - public function getDefaultRateRequest($store =null) - { - if ($this->_taxHelper->isCrossBorderTradeEnabled($store)) { - //If cross border trade is enabled, we will use customer tax rate as store tax rate - return $this->getRateRequest(null, null, null, $store); - } else { - return $this->getRateOriginRequest($store); - } - } - /** * Get request object with information necessary for getting tax rate * Request object contain: @@ -587,17 +553,6 @@ public function getAppliedRates($request) return $this->_rateCalculationProcess[$cacheKey]; } - /** - * Get rate ids applicable for some address - * - * @param Varien_Object $request - * @return array - */ - public function getApplicableRateIds($request) - { - return $this->_getResource()->getApplicableRateIds($request); - } - /** * Get the calculation process * diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Calculation/Rate.php index 4772b2ec5..8b4ecbfd5 100644 --- a/app/code/core/Mage/Tax/Model/Calculation/Rate.php +++ b/app/code/core/Mage/Tax/Model/Calculation/Rate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php index 579342df2..5c0069182 100644 --- a/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php +++ b/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rule.php b/app/code/core/Mage/Tax/Model/Calculation/Rule.php index 2a26acfbd..ce657f053 100644 --- a/app/code/core/Mage/Tax/Model/Calculation/Rule.php +++ b/app/code/core/Mage/Tax/Model/Calculation/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Class.php b/app/code/core/Mage/Tax/Model/Class.php index f0176caa6..85544591e 100644 --- a/app/code/core/Mage/Tax/Model/Class.php +++ b/app/code/core/Mage/Tax/Model/Class.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Class/Source/Customer.php b/app/code/core/Mage/Tax/Model/Class/Source/Customer.php index bb26cf9f7..f70164263 100644 --- a/app/code/core/Mage/Tax/Model/Class/Source/Customer.php +++ b/app/code/core/Mage/Tax/Model/Class/Source/Customer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Class/Source/Product.php b/app/code/core/Mage/Tax/Model/Class/Source/Product.php index 01aa694ba..02d65cc5a 100644 --- a/app/code/core/Mage/Tax/Model/Class/Source/Product.php +++ b/app/code/core/Mage/Tax/Model/Class/Source/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Config.php b/app/code/core/Mage/Tax/Model/Config.php index 4dee2a766..078ef45a9 100644 --- a/app/code/core/Mage/Tax/Model/Config.php +++ b/app/code/core/Mage/Tax/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,7 +57,6 @@ class Mage_Tax_Model_Config const CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT = 'tax/calculation/apply_after_discount'; const CONFIG_XML_PATH_DISCOUNT_TAX = 'tax/calculation/discount_tax'; const XML_PATH_ALGORITHM = 'tax/calculation/algorithm'; - const CONFIG_XML_PATH_CROSS_BORDER_TRADE_ENABLED = 'tax/calculation/cross_border_trade_enabled'; /**#@-*/ /**#@+ @@ -754,15 +753,4 @@ public function checkDiscountSettings($store = null) { return $this->applyTaxAfterDiscount($store); } - - /** - * Return the config value for self::CONFIG_XML_PATH_CROSS_BORDER_TRADE_ENABLED - * - * @param int|null $store - * @return int - */ - public function crossBorderTradeEnabled($store = null) - { - return $this->_getStoreConfig(self::CONFIG_XML_PATH_CROSS_BORDER_TRADE_ENABLED, $store); - } } diff --git a/app/code/core/Mage/Tax/Model/Config/Notification.php b/app/code/core/Mage/Tax/Model/Config/Notification.php index c215c622f..513f32ff3 100644 --- a/app/code/core/Mage/Tax/Model/Config/Notification.php +++ b/app/code/core/Mage/Tax/Model/Config/Notification.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Config/Price/Include.php b/app/code/core/Mage/Tax/Model/Config/Price/Include.php index f7b0b3df4..aa643fb25 100644 --- a/app/code/core/Mage/Tax/Model/Config/Price/Include.php +++ b/app/code/core/Mage/Tax/Model/Config/Price/Include.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Tax_Model_Config_Price_Include extends Mage_Core_Model_Config_Data diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php index 959cc9691..af34afa59 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php index c2560ee2e..8c9bb1970 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php index ac356a9a3..9b7685d42 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php index 3b76eea72..0d8f0586c 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php index 0c7afd4fb..26c880319 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php index 019007d51..69d61ff5b 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php index 22efef5e4..d5125b113 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php index e5f0cd0d8..bed17f9c9 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Class.php b/app/code/core/Mage/Tax/Model/Mysql4/Class.php index 6aef4b0a6..32bce5967 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Class.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Class.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php index c0c7665d1..86fdedc54 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php index faeda28c7..3d0f12357 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php index fcd6b09de..4e0e704e9 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php index d83589677..7a1e46a7f 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php index 7f6b6940e..54e3283e2 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php index a022e9e21..9c8f98fd8 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Setup.php b/app/code/core/Mage/Tax/Model/Mysql4/Setup.php index b8d0b5f1a..0760056dd 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Observer.php b/app/code/core/Mage/Tax/Model/Observer.php index df4b1f9ae..d3fa56607 100644 --- a/app/code/core/Mage/Tax/Model/Observer.php +++ b/app/code/core/Mage/Tax/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation.php b/app/code/core/Mage/Tax/Model/Resource/Calculation.php index 7745d41b7..bb4477255 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -227,7 +227,7 @@ protected function _createSearchPostCodeTemplates($postcode) $strlen = $len; } - $strArr = array((string)$postcode, $postcode . '*'); + $strArr = array($postcode, $postcode . '*'); if ($strlen > 1) { for ($i = 1; $i < $strlen; $i++) { $strArr[] = sprintf('%s*', substr($postcode, 0, - $i)); @@ -361,35 +361,6 @@ protected function _getRates($request) return $this->_ratesCache[$cacheKey]; } - /** - * Get rate ids applicable for some address - * - * @param Varien_Object $request - * @return array - */ - function getApplicableRateIds($request) - { - $countryId = $request->getCountryId(); - $regionId = $request->getRegionId(); - $postcode = $request->getPostcode(); - - $select = $this->_getReadAdapter()->select() - ->from(array('rate' => $this->getTable('tax/tax_calculation_rate')), array('tax_calculation_rate_id')) - ->where('rate.tax_country_id = ?', $countryId) - ->where("rate.tax_region_id IN(?)", array(0, (int)$regionId)); - - $expr = $this->_getWriteAdapter()->getCheckSql( - 'zip_is_range is NULL', - $this->_getWriteAdapter()->quoteInto( - "rate.tax_postcode IS NULL OR rate.tax_postcode IN('*', '', ?)", - $this->_createSearchPostCodeTemplates($postcode) - ), - $this->_getWriteAdapter()->quoteInto('? BETWEEN rate.zip_from AND rate.zip_to', $postcode) - ); - $select->where($expr); - return $this->_getReadAdapter()->fetchCol($select); - } - /** * Calculate rate * diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Collection.php index cd719638e..fac666fd4 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate.php index b2695cd89..af35d419f 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php index e58578078..e703e35e8 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php index 5f9cd4f7a..12ef4e007 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title/Collection.php index 72f3410f7..c17424cbc 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php index ae783019b..2eea5baa5 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule/Collection.php index 04795ee33..60034e162 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Class.php b/app/code/core/Mage/Tax/Model/Resource/Class.php index 52638a5f4..604e235d4 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Class.php +++ b/app/code/core/Mage/Tax/Model/Resource/Class.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Class/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Class/Collection.php index 3924b355d..ac8c5b6e5 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Class/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Class/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Report/Collection.php index 5235034ce..66c394445 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php b/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php index e66c4ef44..fe44732b1 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php index 7df8a040b..698c15bfb 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php index 1771912c8..5109efe2c 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Updatedat/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Report/Updatedat/Collection.php index abe532e01..9a38e6a8c 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Updatedat/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Updatedat/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax.php index fdd683732..1c47c374c 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Collection.php index 56aa3d43f..1e7399eb5 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item.php b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item.php index f37290d58..eb8276e93 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item.php +++ b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item/Collection.php index 1c92a3779..767018061 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Setup.php b/app/code/core/Mage/Tax/Model/Resource/Setup.php index b61cb8093..9946014a5 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Setup.php +++ b/app/code/core/Mage/Tax/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Order/Tax.php index ff82db1ca..fced82a39 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Order/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Sales/Order/Tax/Item.php b/app/code/core/Mage/Tax/Model/Sales/Order/Tax/Item.php index 1d84982b3..1d586d277 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Order/Tax/Item.php +++ b/app/code/core/Mage/Tax/Model/Sales/Order/Tax/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Sales/Pdf/Grandtotal.php b/app/code/core/Mage/Tax/Model/Sales/Pdf/Grandtotal.php index 12d13b100..2e76ee410 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Grandtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Grandtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.php b/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.php index 133af08c5..bce75b581 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.php index 8a85fe89f..d99265b4d 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.php index 5dd1fad76..182f9e26f 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php index c8595f2f6..f8214d5d3 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php index 712d07edd..d68784df6 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php index f340d6e91..1ee5e41f9 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php index 752a88ed1..f5d9b5f7b 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,13 +47,6 @@ class Mage_Tax_Model_Sales_Total_Quote_Shipping extends Mage_Sales_Model_Quote_A */ protected $_config = null; - /** - * Tax helper instance - * - * @var Mage_Tax_Helper_Data|null - */ - protected $_helper = null; - /** * Flag which is initialized when collect method is started and catalog prices include tax. * It is used for checking if store tax and customer tax requests are similar @@ -76,7 +69,6 @@ public function __construct() { $this->setCode('shipping'); $this->_calculator = Mage::getSingleton('tax/calculation'); - $this->_helper = Mage::helper('tax'); $this->_config = Mage::getSingleton('tax/config'); } @@ -105,12 +97,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address) $priceIncludesTax = $this->_config->shippingPriceIncludesTax($store); if ($priceIncludesTax) { - if ($this->_helper->isCrossBorderTradeEnabled($store)) { - $this->_areTaxRequestsSimilar = true; - } else { - $this->_areTaxRequestsSimilar = - $this->_calculator->compareRequests($storeTaxRequest, $addressTaxRequest); - } + $this->_areTaxRequestsSimilar = $calc->compareRequests($addressTaxRequest, $storeTaxRequest); } $shipping = $taxShipping = $address->getShippingAmount(); diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php index cd2995aa2..1b6bc2ad7 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -164,11 +164,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address) $classIds = array_unique($classIds); $storeRequest->setProductClassId($classIds); $addressRequest->setProductClassId($classIds); - if ($this->_helper->isCrossBorderTradeEnabled($this->_store)) { - $this->_areTaxRequestsSimilar = true; - } else { - $this->_areTaxRequestsSimilar = $this->_calculator->compareRequests($storeRequest, $addressRequest); - } + $this->_areTaxRequestsSimilar = $this->_calculator->compareRequests($storeRequest, $addressRequest); } foreach ($items as $item) { diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php index 5b4a7a12e..62b3eb2ec 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -185,14 +185,10 @@ public function collect(Mage_Sales_Model_Quote_Address $address) ); if ($this->_config->priceIncludesTax($this->_store)) { - if ($this->_helper->isCrossBorderTradeEnabled($this->_store)) { - $this->_areTaxRequestsSimilar = true; - } else { - $this->_areTaxRequestsSimilar = $this->_calculator->compareRequests( - $this->_calculator->getRateOriginRequest($this->_store), - $request - ); - } + $this->_areTaxRequestsSimilar = $this->_calculator->compareRequests( + $this->_calculator->getRateOriginRequest($this->_store), + $request + ); } switch ($this->_config->getAlgorithm($this->_store)) { @@ -554,7 +550,7 @@ protected function _calcUnitTaxAmount( $baseDiscountAmount = $item->getBaseDiscountAmount() / $qty; //We want to remove weee - if ($isWeeeEnabled && $this->_weeeHelper->includeInSubtotal()) { + if ($isWeeeEnabled) { $discountAmount = $discountAmount - $item->getWeeeDiscount() / $qty; $baseDiscountAmount = $baseDiscountAmount - $item->getBaseWeeeDiscount() / $qty; } @@ -798,7 +794,7 @@ protected function _calcRowTaxAmount( $discountAmount = $item->getDiscountAmount(); $baseDiscountAmount = $item->getBaseDiscountAmount(); - if ($isWeeeEnabled && $this->_weeeHelper->includeInSubtotal()) { + if ($isWeeeEnabled) { $discountAmount = $discountAmount - $item->getWeeeDiscount(); $baseDiscountAmount = $baseDiscountAmount - $item->getBaseWeeeDiscount(); } @@ -1088,7 +1084,7 @@ protected function _aggregateTaxPerRate( } //We remove weee discount from discount if weee is not taxed - if ($isWeeeEnabled && $this->_weeeHelper->includeInSubtotal()) { + if ($isWeeeEnabled) { $discount = $discount - $item->getWeeeDiscount(); $baseDiscount = $baseDiscount - $item->getBaseWeeeDiscount(); } @@ -1356,9 +1352,7 @@ private function _getWeeeTax($rate, $item, $discountAmount, $weeeAmountIncluding { $isWeeeTaxAlreadyIncluded = $this->_weeeHelper->isTaxIncluded($this->_store); - $sameRateAsStore = $this->_helper->isCrossBorderTradeEnabled($this->_store) || - ($rate == $this->_calculator->getStoreRateForItem($item)); - if ($sameRateAsStore && $isWeeeTaxAlreadyIncluded) { + if ($rate == $this->_calculator->getStoreRateForItem($item) && $isWeeeTaxAlreadyIncluded) { if (!$discountAmount || $discountAmount <= 0) { //We want to skip the re calculation and return the difference return max($weeeAmountIncludingTax - $weeeAmountExclTax, 0); diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Algorithm.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Algorithm.php index bca48d0d9..7617a78b5 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Algorithm.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Algorithm.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Apply.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Apply.php index 298582b5a..b1236ffc2 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Apply.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Apply.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/PriceType.php b/app/code/core/Mage/Tax/Model/System/Config/Source/PriceType.php index e6f7cb016..e61771eba 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/PriceType.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/PriceType.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Country.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Country.php index c5ba7adc9..35f3930c0 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Country.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php index fe4f545bb..1baefca78 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php index 5fb35337d..c3ea58b5b 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/data/tax_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Tax/data/tax_setup/data-install-1.6.0.0.php index 18c4274e3..6fb67ab20 100644 --- a/app/code/core/Mage/Tax/data/tax_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Tax/data/tax_setup/data-install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var $installer Mage_Tax_Model_Resource_Setup */ diff --git a/app/code/core/Mage/Tax/etc/adminhtml.xml b/app/code/core/Mage/Tax/etc/adminhtml.xml index 6d3db5df6..c03d614f6 100644 --- a/app/code/core/Mage/Tax/etc/adminhtml.xml +++ b/app/code/core/Mage/Tax/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml index bb01b0b1b..ab2369275 100644 --- a/app/code/core/Mage/Tax/etc/config.xml +++ b/app/code/core/Mage/Tax/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tax/etc/system.xml b/app/code/core/Mage/Tax/etc/system.xml index 716857399..2344ccbc2 100644 --- a/app/code/core/Mage/Tax/etc/system.xml +++ b/app/code/core/Mage/Tax/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -132,16 +132,6 @@ 1 0 - - - select - adminhtml/system_config_source_yesno - 70 - 1 - 1 - 0 - When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is. - diff --git a/app/code/core/Mage/Tax/sql/tax_setup/install-1.6.0.0.php b/app/code/core/Mage/Tax/sql/tax_setup/install-1.6.0.0.php index ead75afd0..ecf244289 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/install-1.6.0.0.php @@ -20,12 +20,11 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var $installer Mage_Tax_Model_Resource_Setup */ $installer = $this; -$installer->startSetup(); // /** * Create table 'tax/class' @@ -66,11 +65,8 @@ ->addColumn('position', Varien_Db_Ddl_Table::TYPE_INTEGER, null, array( 'nullable' => false, ), 'Position') - ->addIndex( - $installer->getIdxName('tax/tax_calculation_rule', - array('priority', 'position', 'tax_calculation_rule_id')), - array('priority', 'position', 'tax_calculation_rule_id') - ) + ->addIndex($installer->getIdxName('tax/tax_calculation_rule', array('priority', 'position', 'tax_calculation_rule_id')), + array('priority', 'position', 'tax_calculation_rule_id')) ->addIndex($installer->getIdxName('tax/tax_calculation_rule', array('code')), array('code')) ->setComment('Tax Calculation Rule'); @@ -108,18 +104,12 @@ ->addColumn('zip_to', Varien_Db_Ddl_Table::TYPE_INTEGER, null, array( 'unsigned' => true, ), 'Zip To') - ->addIndex( - $installer->getIdxName('tax/tax_calculation_rate', - array('tax_country_id', 'tax_region_id', 'tax_postcode')), - array('tax_country_id', 'tax_region_id', 'tax_postcode') - ) + ->addIndex($installer->getIdxName('tax/tax_calculation_rate', array('tax_country_id', 'tax_region_id', 'tax_postcode')), + array('tax_country_id', 'tax_region_id', 'tax_postcode')) ->addIndex($installer->getIdxName('tax/tax_calculation_rate', array('code')), array('code')) - ->addIndex( - $installer->getIdxName('tax/tax_calculation_rate', - array('tax_calculation_rate_id', 'tax_country_id', 'tax_region_id', 'zip_is_range', 'tax_postcode')), - array('tax_calculation_rate_id', 'tax_country_id', 'tax_region_id', 'zip_is_range', 'tax_postcode') - ) + ->addIndex($installer->getIdxName('tax/tax_calculation_rate', array('tax_calculation_rate_id', 'tax_country_id', 'tax_region_id', 'zip_is_range', 'tax_postcode')), + array('tax_calculation_rate_id', 'tax_country_id', 'tax_region_id', 'zip_is_range', 'tax_postcode')) ->setComment('Tax Calculation Rate'); $installer->getConnection()->createTable($table); @@ -153,8 +143,7 @@ array('customer_tax_class_id')) ->addIndex($installer->getIdxName('tax/tax_calculation', array('product_tax_class_id')), array('product_tax_class_id')) - ->addIndex($installer->getIdxName('tax/tax_calculation', - array('tax_calculation_rate_id', 'customer_tax_class_id', 'product_tax_class_id')), + ->addIndex($installer->getIdxName('tax/tax_calculation', array('tax_calculation_rate_id', 'customer_tax_class_id', 'product_tax_class_id')), array('tax_calculation_rate_id', 'customer_tax_class_id', 'product_tax_class_id')) ->addForeignKey($installer->getFkName('tax/tax_calculation', 'product_tax_class_id', 'tax/tax_class', 'class_id'), 'product_tax_class_id', $installer->getTable('tax/tax_class'), 'class_id', @@ -162,12 +151,10 @@ ->addForeignKey($installer->getFkName('tax/tax_calculation', 'customer_tax_class_id', 'tax/tax_class', 'class_id'), 'customer_tax_class_id', $installer->getTable('tax/tax_class'), 'class_id', Varien_Db_Ddl_Table::ACTION_CASCADE, Varien_Db_Ddl_Table::ACTION_CASCADE) - ->addForeignKey($installer->getFkName( - 'tax/tax_calculation', 'tax_calculation_rate_id', 'tax/tax_calculation_rate', 'tax_calculation_rate_id'), + ->addForeignKey($installer->getFkName('tax/tax_calculation', 'tax_calculation_rate_id', 'tax/tax_calculation_rate', 'tax_calculation_rate_id'), 'tax_calculation_rate_id', $installer->getTable('tax/tax_calculation_rate'), 'tax_calculation_rate_id', Varien_Db_Ddl_Table::ACTION_CASCADE, Varien_Db_Ddl_Table::ACTION_CASCADE) - ->addForeignKey($installer->getFkName( - 'tax/tax_calculation', 'tax_calculation_rule_id', 'tax/tax_calculation_rule', 'tax_calculation_rule_id'), + ->addForeignKey($installer->getFkName('tax/tax_calculation', 'tax_calculation_rule_id', 'tax/tax_calculation_rule', 'tax_calculation_rule_id'), 'tax_calculation_rule_id', $installer->getTable('tax/tax_calculation_rule'), 'tax_calculation_rule_id', Varien_Db_Ddl_Table::ACTION_CASCADE, Varien_Db_Ddl_Table::ACTION_CASCADE) ->setComment('Tax Calculation'); @@ -202,10 +189,7 @@ ->addForeignKey($installer->getFkName('tax/tax_calculation_rate_title', 'store_id', 'core/store', 'store_id'), 'store_id', $installer->getTable('core/store'), 'store_id', Varien_Db_Ddl_Table::ACTION_CASCADE, Varien_Db_Ddl_Table::ACTION_CASCADE) - ->addForeignKey($installer->getFkName( - 'tax/tax_calculation_rate_title', 'tax_calculation_rate_id', - 'tax/tax_calculation_rate', 'tax_calculation_rate_id' - ), + ->addForeignKey($installer->getFkName('tax/tax_calculation_rate_title', 'tax_calculation_rate_id', 'tax/tax_calculation_rate', 'tax_calculation_rate_id'), 'tax_calculation_rate_id', $installer->getTable('tax/tax_calculation_rate'), 'tax_calculation_rate_id', Varien_Db_Ddl_Table::ACTION_CASCADE, Varien_Db_Ddl_Table::ACTION_CASCADE) ->setComment('Tax Calculation Rate Title'); @@ -243,10 +227,7 @@ ), 'Orders Count') ->addColumn('tax_base_amount_sum', Varien_Db_Ddl_Table::TYPE_FLOAT, null, array( ), 'Tax Base Amount Sum') - ->addIndex($installer->getIdxName( - 'tax/tax_order_aggregated_created', - array('period', 'store_id', 'code', 'percent', 'order_status'), true - ), + ->addIndex($installer->getIdxName('tax/tax_order_aggregated_created', array('period', 'store_id', 'code', 'percent', 'order_status'), true), array('period', 'store_id', 'code', 'percent', 'order_status'), array('type' => 'unique')) ->addIndex($installer->getIdxName('tax/tax_order_aggregated_created', array('store_id')), array('store_id')) diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-0.7.0.php index 19c2ff318..a17ac27d3 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-1.4.0.0.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-1.4.0.0.php index 97144be9f..f6882a9c3 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-1.4.0.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-1.4.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.6.1-0.7.0.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.6.1-0.7.0.php index ca8831401..bb6bdc6ed 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.6.1-0.7.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.6.1-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.0-0.7.1.php index 81fa64bfd..e9c38a88f 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.1-0.7.2.php index 44e45f249..de89a693d 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.10-0.7.11.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.10-0.7.11.php index 8e2f8d7b6..5e91f1335 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.10-0.7.11.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.10-0.7.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.11-0.7.12.php index 223c47078..05a419489 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.11-0.7.12.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.11-0.7.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.12-0.7.13.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.12-0.7.13.php index 83da3c71e..c68d07f76 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.12-0.7.13.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.12-0.7.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.2-0.7.3.php index 566e0e790..032be20f5 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.3-0.7.4.php index b0e408d48..bb94d684a 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php index e98e9c803..aea591f56 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.5-0.7.6.php index 602780de1..32a1f3bc6 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php index fab865724..6f50a3d13 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php index 83198e443..b6fc4a072 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.8-0.7.9.php index 38c571cdb..8e47c5a80 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php index bdbde8cbc..226506d06 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.3.9-1.4.0.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.3.9-1.4.0.php index 71a265388..8294e1e5c 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.3.9-1.4.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.3.9-1.4.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php index 2e29e6265..0430ab472 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php index 2b1c4468f..16fd69112 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index c59078f2e..ba8fcabd3 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php index 3b25984cb..966304748 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php index 43d7d5519..5e967e9b2 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php index d0bd5379d..ec823f478 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php index 74fa18b63..2ca7af03a 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Tax - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php index b03c5b8e2..c161de8e8 100644 --- a/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Helper/Data.php b/app/code/core/Mage/Usa/Helper/Data.php index 6b95f3d16..bbc89e171 100644 --- a/app/code/core/Mage/Usa/Helper/Data.php +++ b/app/code/core/Mage/Usa/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php index 45ca87697..1345bb109 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Mode.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Mode.php index 35b1b20d1..d1c4dd8a7 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Mode.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Mode.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Requesttype.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Requesttype.php index 8eb9435db..a671a1226 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Requesttype.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Requesttype.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php index 78125d8ce..328810b0d 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Abstract.php index 511ab4659..76da3e9ea 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Abstract.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php index f26074285..a78376c48 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Contenttype.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Contenttype.php index 9af2efde7..4016573f1 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Contenttype.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Contenttype.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Abstract.php index 46f50dd32..bccbca030 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Abstract.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Doc.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Doc.php index 96eb7a922..831208696 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Doc.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Doc.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freedoc.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freedoc.php index ea579b79e..af7f9e904 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freedoc.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freedoc.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freenondoc.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freenondoc.php index 6ccd7ccd0..13d665ff6 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freenondoc.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freenondoc.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Nondoc.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Nondoc.php index 12d4d367b..12c25d834 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Nondoc.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Nondoc.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Size.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Size.php index 527fb2fc1..b24dd83bc 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Size.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Size.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Unitofmeasure.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Unitofmeasure.php index 5938a9aa8..c9a431e39 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Unitofmeasure.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php index e237d2b35..f44a47e3b 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php index 516fea732..e3e472dab 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php index 85ffdf505..0b288f0e2 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php index 2ff209bfa..0b4d4ecc9 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php index 6e3a77c17..5470d54cf 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Method.php index 1836eaec8..bb8110f01 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Method.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Rounding.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Rounding.php index 4731dc23a..d0d946577 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Rounding.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Rounding.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.php index 3e9761827..4cf9d40ea 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php index d537f9e7f..02bd96ac4 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php index 188bec6e7..935135722 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -133,8 +133,8 @@ protected function _createSoapClient($wsdl, $trace = false) { $client = new SoapClient($wsdl, array('trace' => $trace)); $client->__setLocation($this->getConfigFlag('sandbox_mode') - ? 'https://wsbeta.fedex.com/web-services' - : 'https://ws.fedex.com/web-services' + ? 'https://wsbeta.fedex.com/web-services/rate' + : 'https://ws.fedex.com/web-services/rate' ); return $client; diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php index cc7e8c819..0bfa32aab 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php index 82cf95947..8f602b626 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Method.php index 274dd6d97..ed3d4ef6b 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Method.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Packaging.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Packaging.php index ce442959a..47200304f 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Packaging.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Packaging.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php index 47588c8b9..9d3de9584 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php index 7676856ef..5084eb031 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Container.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Container.php index a9e87a86e..4084df7c2 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Container.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php index 066de7f5a..713d283dd 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php index 0516f34cc..0aa69eaf5 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php index 53e82811a..44a6ebf59 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Mode.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Mode.php index 1c86bf1d0..dcf75c058 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Mode.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Mode.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/OriginShipment.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/OriginShipment.php index 3120ac125..8146810ed 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/OriginShipment.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/OriginShipment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Pickup.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Pickup.php index 98039bbf6..ab3081c7e 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Pickup.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Pickup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php index 31c4781f9..0a971bdd2 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php index 716bf36cd..0f760aa6b 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php index cb562aea3..7368f985c 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Container.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Container.php index b8d6915c6..3ba3718c1 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Container.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php index 02d086804..f4bb662c1 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Machinable.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Machinable.php index 579213b54..f3eeb608f 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Machinable.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Machinable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php index ac9464a52..13c51cc00 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php index 4138a8f3c..ffe047ef6 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/etc/config.xml b/app/code/core/Mage/Usa/etc/config.xml index cb53c4db2..c167e1cd8 100644 --- a/app/code/core/Mage/Usa/etc/config.xml +++ b/app/code/core/Mage/Usa/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Usa/etc/dhl/international/countries.xml b/app/code/core/Mage/Usa/etc/dhl/international/countries.xml index 4a845d8eb..f577f5eb8 100644 --- a/app/code/core/Mage/Usa/etc/dhl/international/countries.xml +++ b/app/code/core/Mage/Usa/etc/dhl/international/countries.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Usa/etc/system.xml b/app/code/core/Mage/Usa/etc/system.xml index 0c53cd939..2f2f3020a 100644 --- a/app/code/core/Mage/Usa/etc/system.xml +++ b/app/code/core/Mage/Usa/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Usa/sql/usa_setup/install-1.6.0.0.php b/app/code/core/Mage/Usa/sql/usa_setup/install-1.6.0.0.php index d99e25aa7..1fbd98306 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/sql/usa_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Usa/sql/usa_setup/mysql4-upgrade-0.7.0-0.7.1.php index d9ff6c653..c1666e049 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php index e47acd64d..f313d0c0e 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php index fff077e2d..3d2248f34 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php index 52bf3e53a..61717d430 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Usa - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php b/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php index 8e17f88e7..f262381cd 100644 --- a/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php index b159d1dca..88d27361c 100644 --- a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Helper/Data.php b/app/code/core/Mage/Weee/Helper/Data.php index a58baf097..ef1090e95 100644 --- a/app/code/core/Mage/Weee/Helper/Data.php +++ b/app/code/core/Mage/Weee/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -630,48 +630,6 @@ public function getBaseTotalRowTaxAppliedForWeeeTax($item) return $totalTaxForWeeeTax; } - /** - * Calculate row weee amount for an order, invoice or credit memo item - * The returned value may contain discount if the discount is not included in - * the discount for subtotal - * - * @param mixed $item - * @return float - */ - public function getRowWeeeAmountAfterDiscount($item) - { - $weeeTaxAppliedAmounts = $this->getApplied($item); - $weeeAmountInclDiscount = 0; - foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { - $weeeAmountInclDiscount += $weeeTaxAppliedAmount['row_amount']; - if (!$this->includeInSubtotal()) { - $weeeAmountInclDiscount -= $weeeTaxAppliedAmount['weee_discount']; - } - } - return $weeeAmountInclDiscount; - } - - /** - * Calculate base row weee amount for an order, invoice or credit memo item - * The returned value may contain discount if the discount is not included in - * the discount for subtotal - * - * @param mixed $item - * @return float - */ - public function getBaseRowWeeeAmountAfterDiscount($item) - { - $weeeTaxAppliedAmounts = $this->getApplied($item); - $baseWeeeAmountInclDiscount = 0; - foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { - $baseWeeeAmountInclDiscount += $weeeTaxAppliedAmount['base_row_amount']; - if (!$this->includeInSubtotal()) { - $baseWeeeAmountInclDiscount -= $weeeTaxAppliedAmount['base_weee_discount']; - } - } - return $baseWeeeAmountInclDiscount; - } - /** * Get The Helper with the name provider * diff --git a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php index 1e79958fb..ad1f5ce11 100644 --- a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Model/Config/Source/Display.php b/app/code/core/Mage/Weee/Model/Config/Source/Display.php index 723975bac..297c83668 100644 --- a/app/code/core/Mage/Weee/Model/Config/Source/Display.php +++ b/app/code/core/Mage/Weee/Model/Config/Source/Display.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Weee_Model_Config_Source_Display diff --git a/app/code/core/Mage/Weee/Model/Config/Source/Fpt/Tax.php b/app/code/core/Mage/Weee/Model/Config/Source/Fpt/Tax.php index 411cfd007..60bcd5a27 100644 --- a/app/code/core/Mage/Weee/Model/Config/Source/Fpt/Tax.php +++ b/app/code/core/Mage/Weee/Model/Config/Source/Fpt/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Weee_Model_Config_Source_Fpt_Tax diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php index a8554f273..1dbeb9b96 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php b/app/code/core/Mage/Weee/Model/Mysql4/Setup.php index 7020fc97b..49cd0180d 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php b/app/code/core/Mage/Weee/Model/Mysql4/Tax.php index 6de951b41..d1ec64241 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Model/Observer.php b/app/code/core/Mage/Weee/Model/Observer.php index a61db3e6f..d0efa38e3 100644 --- a/app/code/core/Mage/Weee/Model/Observer.php +++ b/app/code/core/Mage/Weee/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php index 4e5a881f8..54637a1de 100644 --- a/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Model/Resource/Setup.php b/app/code/core/Mage/Weee/Model/Resource/Setup.php index 0be3ae7a6..401fda5f6 100644 --- a/app/code/core/Mage/Weee/Model/Resource/Setup.php +++ b/app/code/core/Mage/Weee/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Model/Resource/Tax.php b/app/code/core/Mage/Weee/Model/Resource/Tax.php index 980884b01..c64be0925 100644 --- a/app/code/core/Mage/Weee/Model/Resource/Tax.php +++ b/app/code/core/Mage/Weee/Model/Resource/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Model/Tax.php b/app/code/core/Mage/Weee/Model/Tax.php index 68fbd8542..7df1749b6 100644 --- a/app/code/core/Mage/Weee/Model/Tax.php +++ b/app/code/core/Mage/Weee/Model/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,13 +60,6 @@ class Mage_Weee_Model_Tax extends Mage_Core_Model_Abstract */ protected $_productDiscounts = array(); - /** - * Tax helper - * - * @var Mage_Tax_Helper_Data - */ - protected $_taxHelper; - /** * Initialize resource */ @@ -76,17 +69,6 @@ protected function _construct() } - /** - * Initialize tax helper - * - * @param array $args - */ - public function __construct(array $args = array()) - { - parent::__construct(); - $this->_taxHelper = !empty($args['helper']) ? $args['helper'] : Mage::helper('tax'); - } - /** * Calculate weee amount for a product * @@ -199,6 +181,7 @@ public function getProductWeeeAttributes( $rateRequest->setProductClassId($product->getTaxClassId())); } + $defaultRateRequest = $calculator->getRateRequest(false, false, false, $store); $discountPercent = 0; if (!$ignoreDiscount && Mage::helper('weee')->isDiscounted($store)) { @@ -230,21 +213,16 @@ public function getProductWeeeAttributes( $taxAmount = 0; $amount = $value; if ($calculateTax && Mage::helper('weee')->isTaxable($store)) { - if ($this->_taxHelper->isCrossBorderTradeEnabled($store)) { - $defaultPercent = $currentPercent; - } else { - $defaultRateRequest = $calculator->getDefaultRateRequest($store); - $defaultPercent = Mage::getModel('tax/calculation') - ->getRate($defaultRateRequest - ->setProductClassId($product->getTaxClassId())); - } + $defaultPercent = Mage::getModel('tax/calculation') + ->getRate($defaultRateRequest + ->setProductClassId($product->getTaxClassId())); if (Mage::helper('weee')->isTaxIncluded($store)) { $taxAmount = Mage::app()->getStore() ->roundPrice($value / (100 + $defaultPercent) * $currentPercent); $amount = $amount - $taxAmount; } else { - $appliedRates = Mage::getModel('tax/calculation')->getAppliedRates($rateRequest); + $appliedRates = Mage::getModel('tax/calculation')->getAppliedRates($defaultRateRequest); if (count($appliedRates) > 1) { $taxAmount = 0; foreach ($appliedRates as $appliedRate) { @@ -252,7 +230,7 @@ public function getProductWeeeAttributes( $taxAmount += Mage::app()->getStore()->roundPrice($value * $taxRate / 100); } } else { - $taxAmount = Mage::app()->getStore()->roundPrice($value * $currentPercent / 100); + $taxAmount = Mage::app()->getStore()->roundPrice($value * $defaultPercent / 100); } } } diff --git a/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php b/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php index 7180711c2..f283522e9 100644 --- a/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,30 +38,20 @@ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) $baseWeeeTaxAmount = 0; foreach ($creditmemo->getAllItems() as $item) { - $orderItem = $item->getOrderItem(); - if ($orderItem->isDummy()) { + if ($item->getOrderItem()->isDummy()) { continue; } - $orderItemQty = $orderItem->getQtyOrdered(); - - $weeeRowDiscountAmount = $orderItem->getDiscountAppliedForWeeeTax(); - $weeeDiscountAmount = $creditmemo->roundPrice( - $weeeRowDiscountAmount / $orderItemQty * $item->getQty(), - 'regular', true - ); - $baseWeeeRowDiscountAmount = $orderItem->getBaseDiscountAppliedForWeeeTax(); - $baseWeeeDiscountAmount = $creditmemo->roundPrice( - $baseWeeeRowDiscountAmount / $orderItemQty * $item->getQty(), - 'base', true - ); + $orderItemQty = $item->getOrderItem()->getQtyOrdered(); $weeeAmountExclTax = (Mage::helper('weee')->getWeeeTaxInclTax($item) - - Mage::helper('weee')->getTotalTaxAppliedForWeeeTax($item)) * $item->getQty(); - $totalTax += $weeeAmountExclTax - $weeeDiscountAmount; + - Mage::helper('weee')->getTotalTaxAppliedForWeeeTax($item) + - $item->getOrderItem()->getDiscountAppliedForWeeeTax()) * $item->getQty(); + $totalTax += $weeeAmountExclTax; $baseWeeeAmountExclTax = (Mage::helper('weee')->getBaseWeeeTaxInclTax($item) - - Mage::helper('weee')->getBaseTotalTaxAppliedForWeeeTax($item)) * $item->getQty(); - $baseTotalTax += $baseWeeeAmountExclTax - $baseWeeeDiscountAmount; + - Mage::helper('weee')->getBaseTotalTaxAppliedForWeeeTax($item) + - $item->getOrderItem()->getDiscountAppliedForWeeeTax()) * $item->getQty(); + $baseTotalTax += $baseWeeeAmountExclTax; $item->setWeeeTaxAppliedRowAmount($weeeAmountExclTax); $item->setBaseWeeeTaxAppliedRowAmount($baseWeeeAmountExclTax); @@ -77,9 +67,6 @@ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) $one['base_row_amount_incl_tax'] = $one['base_amount_incl_tax'] * $item->getQty(); $one['row_amount_incl_tax'] = $one['amount_incl_tax'] * $item->getQty(); - $one['weee_discount'] = $weeeDiscountAmount; - $one['base_weee_discount'] = $baseWeeeDiscountAmount; - $newApplied[] = $one; } Mage::helper('weee')->setApplied($item, $newApplied); diff --git a/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php b/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php index 53ba4b620..113f06017 100644 --- a/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,16 +50,6 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) continue; } - $weeeRowDiscountAmount = $orderItem->getDiscountAppliedForWeeeTax(); - $weeeDiscountAmount = $invoice->roundPrice( - $weeeRowDiscountAmount / $orderItemQty * $item->getQty(), - 'regular', true - ); - $baseWeeeRowDiscountAmount = $orderItem->getBaseDiscountAppliedForWeeeTax(); - $baseWeeeDiscountAmount = $invoice->roundPrice( - $baseWeeeRowDiscountAmount / $orderItemQty * $item->getQty(), - 'base', true - ); $weeeTaxAmount = $item->getWeeeTaxAppliedAmount() * $item->getQty(); $baseWeeeTaxAmount = $item->getBaseWeeeTaxAppliedAmount() * $item->getQty(); @@ -76,9 +66,6 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) $one['base_row_amount_incl_tax'] = $one['base_amount_incl_tax'] * $item->getQty(); $one['row_amount_incl_tax'] = $one['amount_incl_tax'] * $item->getQty(); - $one['weee_discount'] = $weeeDiscountAmount; - $one['base_weee_discount'] = $baseWeeeDiscountAmount; - $newApplied[] = $one; } Mage::helper('weee')->setApplied($item, $newApplied); @@ -86,8 +73,8 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) $item->setWeeeTaxRowDisposition($item->getWeeeTaxDisposition() * $item->getQty()); $item->setBaseWeeeTaxRowDisposition($item->getBaseWeeeTaxDisposition() * $item->getQty()); - $totalTax += $weeeTaxAmount - $weeeDiscountAmount; - $baseTotalTax += $baseWeeeTaxAmount - $baseWeeeDiscountAmount; + $totalTax += $weeeTaxAmount; + $baseTotalTax += $baseWeeeTaxAmount; $weeeInclTax += $weeeTaxAmountInclTax; $baseWeeeInclTax += $baseWeeeTaxAmountInclTax; diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php index d84619dc8..22f5c0adb 100644 --- a/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php index b4c1a81ab..24d57f13d 100644 --- a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -417,7 +417,7 @@ protected function _processItem(Mage_Sales_Model_Quote_Address $address, $item, $custTaxClassId, $store ); - $defaultRateRequest = $taxCalculationModel->getDefaultRateRequest($store); + $defaultRateRequest = $taxCalculationModel->getRateRequest(false, false, false, $store); $attributes = $this->_helper->getProductWeeeAttributes( $item->getProduct(), diff --git a/app/code/core/Mage/Weee/etc/config.xml b/app/code/core/Mage/Weee/etc/config.xml index 8cf8875e4..af9a5ff1b 100644 --- a/app/code/core/Mage/Weee/etc/config.xml +++ b/app/code/core/Mage/Weee/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Weee/etc/system.xml b/app/code/core/Mage/Weee/etc/system.xml index 652c49b8e..96e01d762 100644 --- a/app/code/core/Mage/Weee/etc/system.xml +++ b/app/code/core/Mage/Weee/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Weee/sql/weee_setup/install-1.6.0.0.php b/app/code/core/Mage/Weee/sql/weee_setup/install-1.6.0.0.php index 9a7a40bf2..7a249d0b6 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/install-1.6.0.0.php @@ -20,13 +20,12 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var $installer Mage_Weee_Model_Resource_Setup */ $installer = $this; -$installer->startSetup(); /** * Create table 'weee/tax' */ @@ -118,8 +117,7 @@ array('entity_id')) ->addIndex($installer->getIdxName('weee/discount', array('customer_group_id')), array('customer_group_id')) - ->addForeignKey( - $installer->getFkName('weee/discount', 'customer_group_id', 'customer/customer_group', 'customer_group_id'), + ->addForeignKey($installer->getFkName('weee/discount', 'customer_group_id', 'customer/customer_group', 'customer_group_id'), 'customer_group_id', $installer->getTable('customer/customer_group'), 'customer_group_id', Varien_Db_Ddl_Table::ACTION_CASCADE, Varien_Db_Ddl_Table::ACTION_CASCADE) ->addForeignKey($installer->getFkName('weee/discount', 'entity_id', 'catalog/product', 'entity_id'), diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php index 7ecc8d310..9ebc43956 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php index a3c48d8bc..f033e2434 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php index 80b824472..1387720d9 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php index 607b871d1..6be55cc1a 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php index cbcd1ae2c..0413eb53b 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php index 0bff992fe..c0161d1ae 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php index f9cce9c1c..26be1241e 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php index 6b764e703..613240c1b 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php index ff3d271d8..a626a899e 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php index 09c4e8f8f..70a02bc79 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php index c7eb724c9..b147577d4 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php index a78a5d99f..d713c7860 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php index d5db22dbe..393850b1c 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 2cba8f405..b94e352b5 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php index dc3697da6..0dbeb1f65 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php index ef7002b30..93942e86e 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Form.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Form.php index 64d5e531a..2fc31a642 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Form.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance.php index 4d989363f..6e0ed3418 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php index 4f1b98717..a03e5d8ab 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Block.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Block.php index 365fa00d4..aac94abfc 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Block.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Block.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php index 5689ec8f0..d3eb52ba2 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php index 1d663cd29..232edeb99 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php index 861dc0b17..5a4412edd 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php index c91fa127d..2e88fae50 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php index 7240c6a82..22bb2bfb6 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php index b80b8d53c..571766734 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php index 1777f3f8d..fc83feddd 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php index 41b1d028c..64e7f1b59 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php index fbad54e86..beb0f96f8 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php index dd29e1d59..20dec826d 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Interface.php b/app/code/core/Mage/Widget/Block/Interface.php index d94ca641e..360a8eb95 100644 --- a/app/code/core/Mage/Widget/Block/Interface.php +++ b/app/code/core/Mage/Widget/Block/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Helper/Data.php b/app/code/core/Mage/Widget/Helper/Data.php index b519c34c0..1ec7df19a 100644 --- a/app/code/core/Mage/Widget/Helper/Data.php +++ b/app/code/core/Mage/Widget/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Mysql4/Widget.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget.php index 71c5d4ca0..0250fffd1 100644 --- a/app/code/core/Mage/Widget/Model/Mysql4/Widget.php +++ b/app/code/core/Mage/Widget/Model/Mysql4/Widget.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php index 8385f4623..7fe0a6822 100644 --- a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php +++ b/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php index f4651ab90..6e92be20a 100644 --- a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php +++ b/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Observer.php b/app/code/core/Mage/Widget/Model/Observer.php index 7ec5158dc..78caac420 100644 --- a/app/code/core/Mage/Widget/Model/Observer.php +++ b/app/code/core/Mage/Widget/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget.php b/app/code/core/Mage/Widget/Model/Resource/Widget.php index f2d573dc6..b0fbf4fde 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php index e4ff985c1..625677052 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php index 343907cf8..580d23b1f 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Template/Filter.php b/app/code/core/Mage/Widget/Model/Template/Filter.php index 3e521ee39..7b4ce5894 100644 --- a/app/code/core/Mage/Widget/Model/Template/Filter.php +++ b/app/code/core/Mage/Widget/Model/Template/Filter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Widget.php b/app/code/core/Mage/Widget/Model/Widget.php index a72ca4040..f19d898c5 100644 --- a/app/code/core/Mage/Widget/Model/Widget.php +++ b/app/code/core/Mage/Widget/Model/Widget.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Widget/Config.php b/app/code/core/Mage/Widget/Model/Widget/Config.php index 8f9dfb4ef..6506c693a 100644 --- a/app/code/core/Mage/Widget/Model/Widget/Config.php +++ b/app/code/core/Mage/Widget/Model/Widget/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Widget/Instance.php index ad1acc192..f070c6d10 100644 --- a/app/code/core/Mage/Widget/Model/Widget/Instance.php +++ b/app/code/core/Mage/Widget/Model/Widget/Instance.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php index 97a40e623..27a91e027 100644 --- a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php +++ b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php index 5a300dfee..644364b22 100644 --- a/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php +++ b/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/etc/adminhtml.xml b/app/code/core/Mage/Widget/etc/adminhtml.xml index f2019ebbd..6c1da942d 100644 --- a/app/code/core/Mage/Widget/etc/adminhtml.xml +++ b/app/code/core/Mage/Widget/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Widget/etc/config.xml b/app/code/core/Mage/Widget/etc/config.xml index fd201b2bf..a610945c6 100644 --- a/app/code/core/Mage/Widget/etc/config.xml +++ b/app/code/core/Mage/Widget/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Widget/etc/jstranslator.xml b/app/code/core/Mage/Widget/etc/jstranslator.xml index 095625b56..56e008e55 100644 --- a/app/code/core/Mage/Widget/etc/jstranslator.xml +++ b/app/code/core/Mage/Widget/etc/jstranslator.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Widget/sql/widget_setup/install-1.6.0.0.php b/app/code/core/Mage/Widget/sql/widget_setup/install-1.6.0.0.php index 2542aea15..178a01f3c 100644 --- a/app/code/core/Mage/Widget/sql/widget_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Widget/sql/widget_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/sql/widget_setup/mysql4-install-1.4.0.0.0.php b/app/code/core/Mage/Widget/sql/widget_setup/mysql4-install-1.4.0.0.0.php index 44bb217cf..a93146a0e 100644 --- a/app/code/core/Mage/Widget/sql/widget_setup/mysql4-install-1.4.0.0.0.php +++ b/app/code/core/Mage/Widget/sql/widget_setup/mysql4-install-1.4.0.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/sql/widget_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Widget/sql/widget_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 9fa03eeb8..1b281c6a9 100644 --- a/app/code/core/Mage/Widget/sql/widget_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Widget/sql/widget_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Abstract.php b/app/code/core/Mage/Wishlist/Block/Abstract.php index 5a16f72d9..937614fc2 100644 --- a/app/code/core/Mage/Wishlist/Block/Abstract.php +++ b/app/code/core/Mage/Wishlist/Block/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php index f6f9a8f68..716c80265 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php index a78ca8b64..0db7ca03b 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php index 9b5c930bb..10d7b8474 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Button.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Button.php index 9890c1708..c2c7b695f 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Button.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Button.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php index d2441900f..0794b77c5 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php index d779676c9..a1805c8fa 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php index 5be6a4081..2cec084c4 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php index 2c4a3c300..f02ae2764 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php index 4faf99ef4..1e006ef14 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php index a633fce67..6ffcbb0d3 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Items.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Items.php index b76a84deb..db76998dd 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Items.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Item/Configure.php b/app/code/core/Mage/Wishlist/Block/Item/Configure.php index e05a26ff7..7a6daefc4 100644 --- a/app/code/core/Mage/Wishlist/Block/Item/Configure.php +++ b/app/code/core/Mage/Wishlist/Block/Item/Configure.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Links.php b/app/code/core/Mage/Wishlist/Block/Links.php index 15987d3a4..5ae642d15 100644 --- a/app/code/core/Mage/Wishlist/Block/Links.php +++ b/app/code/core/Mage/Wishlist/Block/Links.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Render/Item/Price.php b/app/code/core/Mage/Wishlist/Block/Render/Item/Price.php index dbed1eafc..b71134d20 100644 --- a/app/code/core/Mage/Wishlist/Block/Render/Item/Price.php +++ b/app/code/core/Mage/Wishlist/Block/Render/Item/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php b/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php index 0cd1233d3..12f58eba1 100644 --- a/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php +++ b/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php b/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php index 7333d844e..d9966ba0a 100644 --- a/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php +++ b/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php index b3c226535..c8138c8e1 100644 --- a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Controller/Abstract.php b/app/code/core/Mage/Wishlist/Controller/Abstract.php index 52c42582e..813ad8298 100644 --- a/app/code/core/Mage/Wishlist/Controller/Abstract.php +++ b/app/code/core/Mage/Wishlist/Controller/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Helper/Data.php b/app/code/core/Mage/Wishlist/Helper/Data.php index f480d4712..7b3087fe5 100644 --- a/app/code/core/Mage/Wishlist/Helper/Data.php +++ b/app/code/core/Mage/Wishlist/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Config.php b/app/code/core/Mage/Wishlist/Model/Config.php index eed87e2fb..ea8a12a73 100644 --- a/app/code/core/Mage/Wishlist/Model/Config.php +++ b/app/code/core/Mage/Wishlist/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php b/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php index 55ec905ee..272161bc2 100644 --- a/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php +++ b/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Wishlist_Model_Config_Source_Summary diff --git a/app/code/core/Mage/Wishlist/Model/Item.php b/app/code/core/Mage/Wishlist/Model/Item.php index e61843c8c..596bd1fb8 100644 --- a/app/code/core/Mage/Wishlist/Model/Item.php +++ b/app/code/core/Mage/Wishlist/Model/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Item/Option.php b/app/code/core/Mage/Wishlist/Model/Item/Option.php index 43c03c6b0..f6638c8a0 100644 --- a/app/code/core/Mage/Wishlist/Model/Item/Option.php +++ b/app/code/core/Mage/Wishlist/Model/Item/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php index ff855885d..a7ea5566d 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php index dbc6563a5..40d51d0e7 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php index ec0a70ce1..b37d518c6 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php index c33e18143..939f00432 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php index 98330ee5a..ac742eafd 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php index a4a4eedd3..331e038b5 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php index 080feca26..c79e7f9d7 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Observer.php b/app/code/core/Mage/Wishlist/Model/Observer.php index 39182bbec..cecddfcf1 100644 --- a/app/code/core/Mage/Wishlist/Model/Observer.php +++ b/app/code/core/Mage/Wishlist/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item.php b/app/code/core/Mage/Wishlist/Model/Resource/Item.php index 70df221eb..6d05abd6c 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php index a94b5ca86..5fbb573fb 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option.php index d29ebada9..af13b439b 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php index 0757fc66a..f13cc19da 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php index a9d18800b..8be55c1ca 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php index 78c373a8e..ceaf2a3a4 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php index 72b8baa17..4f3af936b 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Session.php b/app/code/core/Mage/Wishlist/Model/Session.php index 60613010e..909c97227 100644 --- a/app/code/core/Mage/Wishlist/Model/Session.php +++ b/app/code/core/Mage/Wishlist/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php index 6fd9d133c..faaaee56d 100644 --- a/app/code/core/Mage/Wishlist/Model/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Wishlist.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/controllers/IndexController.php b/app/code/core/Mage/Wishlist/controllers/IndexController.php index b18c7189f..d1d87c5f8 100644 --- a/app/code/core/Mage/Wishlist/controllers/IndexController.php +++ b/app/code/core/Mage/Wishlist/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/controllers/SharedController.php b/app/code/core/Mage/Wishlist/controllers/SharedController.php index a9648bcf4..218076c2a 100644 --- a/app/code/core/Mage/Wishlist/controllers/SharedController.php +++ b/app/code/core/Mage/Wishlist/controllers/SharedController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/etc/adminhtml.xml b/app/code/core/Mage/Wishlist/etc/adminhtml.xml index 7a0865a3a..9a9a004e0 100644 --- a/app/code/core/Mage/Wishlist/etc/adminhtml.xml +++ b/app/code/core/Mage/Wishlist/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Wishlist/etc/config.xml b/app/code/core/Mage/Wishlist/etc/config.xml index e73ea8272..28529528f 100644 --- a/app/code/core/Mage/Wishlist/etc/config.xml +++ b/app/code/core/Mage/Wishlist/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Wishlist/etc/system.xml b/app/code/core/Mage/Wishlist/etc/system.xml index 2ff5a8201..07194dbe4 100644 --- a/app/code/core/Mage/Wishlist/etc/system.xml +++ b/app/code/core/Mage/Wishlist/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/install-1.6.0.0.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/install-1.6.0.0.php index 1a0a2d64b..5931b6383 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php index c1cce245d..3443b0445 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php index 1ad784293..4e404a117 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php index 293d00e75..ab4b34d42 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php index 79d0587e8..e709f9188 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.4-0.7.5.php index 7823ba75f..da535ab5d 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.5-0.7.6.php index 3f080d721..5024ce9f4 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,6 +20,6 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.6-0.7.7.php index a70a0ab5c..441355918 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.7-0.7.8.php index fc4404e60..1965b2cec 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.8-0.7.9.php index 74eb72854..e70a3ec51 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 5abc96a4f..e5a9eb1ce 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Wishlist - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit.php index 41d914aa7..6ae4fbdbf 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Form.php index abdfec41f..954cf66d7 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Form.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tab/Settings.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tab/Settings.php index 7ff094e09..ee3de6be1 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tab/Settings.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tab/Settings.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tabs.php index bb3e2a92b..b899ca8d7 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tabs.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Config.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Config.php index 90b3264c4..d807ddad3 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Config.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard.php index 3df6a101f..b0d9fea25 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/BestSellers.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/BestSellers.php index 64356d36e..fca07b26f 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/BestSellers.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/BestSellers.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/Customers.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/Customers.php index 05c437850..4209893b6 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/Customers.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/Customers.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphAmountsData.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphAmountsData.php index fec8595ac..2e590fa5a 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphAmountsData.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphAmountsData.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphDataAbstract.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphDataAbstract.php index 10937b665..a6b43ca0c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphDataAbstract.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphDataAbstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphInfo.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphInfo.php index 431fc2b71..874284316 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphInfo.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphInfo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphOrderData.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphOrderData.php index 54e9fe546..e009895c5 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphOrderData.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphOrderData.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphTotalsData.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphTotalsData.php index 2bc732d82..2a74fcf8d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphTotalsData.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphTotalsData.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastOrders.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastOrders.php index 0d4d9df1e..65b5e744f 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastOrders.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastOrders.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastSearchTerms.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastSearchTerms.php index cd93b2a56..6ff937860 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastSearchTerms.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastSearchTerms.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/MostViewedProducts.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/MostViewedProducts.php index 469d8f67d..2d8d7f7ac 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/MostViewedProducts.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/MostViewedProducts.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/NewCustomers.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/NewCustomers.php index b57c22555..066f90e5b 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/NewCustomers.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/NewCustomers.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/SalesInfo.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/SalesInfo.php index 1ec35b657..2ff3eb031 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/SalesInfo.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/SalesInfo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/StoreSwitcher.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/StoreSwitcher.php index 1209ee378..a9a4732f7 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/StoreSwitcher.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/StoreSwitcher.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/TopSearchTerms.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/TopSearchTerms.php index c44f2d2cc..60b813b2e 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/TopSearchTerms.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/TopSearchTerms.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Loginform.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Loginform.php index d6a24f075..1c9057fa0 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Loginform.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Loginform.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/History.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/History.php index a5ad701b8..88b4e6f57 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/History.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/History/Grid.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/History/Grid.php index 702eba1a5..c53228fb8 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/History/Grid.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/History/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile.php index 04a310c2f..76136c1a8 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php index b7d39268f..79b55cf45 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Form.php index 4ff18957d..02f9cfe19 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Form.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Submission.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Submission.php index fba99c9fc..e0e120e1a 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Submission.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Submission.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Cache.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Cache.php index 3683dcb13..c1651fbf0 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Cache.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Cache.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php index 1063a0385..47268ca4d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design.php index c399282ba..cb9cce823 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion.php index 3cd61b7ea..c5c8d0cb0 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php index 9dffe1647..01ca84d39 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Tabs.php index ee65fab07..41b43921c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Tabs.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Themes.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Themes.php index c841dc176..cdfedeece 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Themes.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Themes.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Images.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Images.php index 457f621f0..48b53ade9 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Images.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Images.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php index e70e99560..733191c24 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Themes.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Themes.php index 93c4ca685..bdaa6d9a5 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Themes.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Themes.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Flurryanalytics.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Flurryanalytics.php index be46cb75c..e00e6909a 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Flurryanalytics.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Flurryanalytics.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php index 52788748e..145802240 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Notification.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Notification.php index 09b61193f..a3b681933 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Notification.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Notification.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/OfflineCatalog.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/OfflineCatalog.php index f6d8e4093..88228bd15 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/OfflineCatalog.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/OfflineCatalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php index 96d9115fb..5d6a9a690 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Settings.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Settings.php index 67a443d7e..7f5bb94f3 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Settings.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Settings.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php index 460cfcdc5..f9c17cb47 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php index 8e6293bf3..8e79e4149 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tabs.php index ed4af78ad..69a72543f 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tabs.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Addrow.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Addrow.php index 936fad10d..529ff6351 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Addrow.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Addrow.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Color.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Color.php index b4a4308e0..1829b212c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Color.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Color.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php index 407c62096..bfec60b5d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php index 2a09f0c79..388907d3c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Font.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Font.php index bd9fcfca4..7a9f8a3d4 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Font.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Font.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php index bd40795df..b8dd78ebe 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Page.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Page.php index 8813b3061..594e85880 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Page.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php index 9542d8aa3..6f9603872 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Theme.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Theme.php index 472392b92..758c00b96 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Theme.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Theme.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid.php index b67660fb8..10b3abd5f 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Bool.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Bool.php index a362caeab..c2b66333c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Bool.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Bool.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Type.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Type.php index bd8ce67bb..a792915d1 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Type.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Content.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Content.php index 6fa9541d9..172f6ecae 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Content.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Content.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Tabitems.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Tabitems.php index 70842bab9..f1d167917 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Tabitems.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Tabitems.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission.php index f7afe3640..03f777678 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Form.php index 70326fbca..8d14be927 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Form.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Androidmarket.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Androidmarket.php index 2ddeb7d38..6eb8067b7 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Androidmarket.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Androidmarket.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Istore.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Istore.php index 415341ab6..29a6822d4 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Istore.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Istore.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container.php index 1fe598117..bda7a8982 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php index f57eb0072..634dd9a25 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tabs.php index 6b226f883..c6bbc497f 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tabs.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Widget/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Widget/Form.php index 96717a877..54a264094 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Widget/Form.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Widget/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue.php index a652a7b26..8d9cd6cdc 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit.php index 03894d947..02e134cc1 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php index a138c832b..e5cb6da3c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid.php index 66874b0c1..e4a08dac1 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Action.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Action.php index 9124d2bc1..a20b63f2f 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Action.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Application.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Application.php index 091367173..85fe2c69e 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Application.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Application.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Id.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Id.php index 6795c9c8e..d2d0e7306 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Id.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Id.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Msgtitle.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Msgtitle.php index 7723df4d5..71d44fd81 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Msgtitle.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Msgtitle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Pushtitle.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Pushtitle.php index d3b63f4b7..848f0feaf 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Pushtitle.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Pushtitle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Status.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Status.php index f266754c3..3a9b78239 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Status.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Template.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Template.php index 5a9bda970..8febc2006 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Template.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template.php index 7e6434468..ffad9f22d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit.php index 9358586c8..ac8e5bb3b 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php index 77f1e8eb1..4b199746d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid.php index 31fc24f4e..3e11e6833 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Application.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Application.php index e972c7f5f..d97d9e39d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Application.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Application.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Name.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Name.php index 5f7635d1a..300e7dd87 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Name.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Name.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview.php index 5dfe1b57a..bacd9729b 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,7 +57,7 @@ protected function _toHtml() $storeId = (int)$this->getRequest()->getParam('store_id'); if (!$storeId) { - $storeId = Mage::app()->getAnyStoreView()->getId(); + $storeId = Mage::app()->getDefaultStoreView()->getId(); } $template->emulateDesign($storeId); diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview/Form.php index c067b2e06..1ce3072bc 100644 --- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview/Form.php +++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart.php b/app/code/core/Mage/XmlConnect/Block/Cart.php index 1481073b4..f5d078fce 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals.php index fe7d09775..e59d2420e 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Default.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Default.php index 95b641fa3..c5d89d10d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Default.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Grandtotal.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Grandtotal.php index 63e6aaa30..e01248eb1 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Grandtotal.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Grandtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Default.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Default.php index dcbbc6e73..ff29c0e9a 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Default.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Giftcardaccount.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Giftcardaccount.php index f5a60376e..df4d61bda 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Giftcardaccount.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Giftcardaccount.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Shipping.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Shipping.php index 6e0a9eed9..7184193c1 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Shipping.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Subtotal.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Subtotal.php index b28662ddb..82b8e3f88 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Subtotal.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Subtotal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Crosssell.php b/app/code/core/Mage/XmlConnect/Block/Cart/Crosssell.php index 9240a0831..1fcb786a9 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Crosssell.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Crosssell.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Info.php b/app/code/core/Mage/XmlConnect/Block/Cart/Info.php index 8809a75dc..a5cad071d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Info.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer.php b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer.php index 0917f8c08..7163aaeb7 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Configurable.php b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Configurable.php index b978c43c6..dbb2da4ef 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Configurable.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Grouped.php b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Grouped.php index 4acd8c83d..4345d89a9 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Grouped.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Items.php b/app/code/core/Mage/XmlConnect/Block/Cart/Items.php index c74cae2f7..1767edb46 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Items.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Details.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Details.php index 84c9d3a8c..bcf1a3284 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Details.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Details.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/OrderDetails.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/OrderDetails.php index d51a60952..9b6b405e8 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/OrderDetails.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/OrderDetails.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Review.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Review.php index 15973d2bf..4c07708cb 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Review.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Shippingmethods.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Shippingmethods.php index 03ffe96b5..6a95124d5 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Shippingmethods.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Shippingmethods.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php index 56a705407..c1dd9c610 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php b/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php index 235d004bc..7334fa122 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog.php b/app/code/core/Mage/XmlConnect/Block/Catalog.php index daac3294c..8d5fd0b4c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php index e7cf91a59..bc1db91ef 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Category/Info.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Category/Info.php index f6a8f21ec..9f1675c8a 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Category/Info.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Category/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Filters.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Filters.php index 568c27dd5..f6d8eb6cb 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Filters.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Filters.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php index db8f6532c..93ac891c6 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Attributes.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Attributes.php index fec048c46..6e1bf92a1 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Attributes.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Attributes.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php index 67258c66a..39923758c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice.php index b96875d60..57d68387d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Bundle.php index 477fc8feb..93ee83331 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Bundle.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Bundle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Default.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Default.php index 3fe4ccece..8b00982ff 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Default.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Giftcard.php index 4ee973fec..0b3414c4d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Giftcard.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Giftcard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/List.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/List.php index 7ae779827..605444829 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/List.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php index 52d9fbfe2..628209205 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php index 27e20640b..12dd15559 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php index d4c49d645..c2b868369 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Downloadable.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Downloadable.php index 879e122ca..58ff10df7 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Downloadable.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Downloadable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php index 803f336b0..c7ba07f3f 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php index 376e5f2a6..946c5735b 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Simple.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Simple.php index 2093ee423..16436364c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Simple.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Simple.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Virtual.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Virtual.php index 852cf3545..34623763d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Virtual.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Virtual.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price.php index 465760841..00dee02fe 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Bundle.php index 44cc42ac9..245e82f05 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Bundle.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Bundle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Default.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Default.php index 7d3ad4984..ea400e99f 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Default.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php index 276948252..78e6a4276 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Related.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Related.php index 758ca66ed..13bff74bd 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Related.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Related.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php index aa9918921..9cc23242e 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review/List.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review/List.php index 847c7ff0c..e9c1d2532 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review/List.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Search.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Search.php index 69ddda951..a47efd9d5 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Search.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Search.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Search/Suggest.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Search/Suggest.php index a82b1a7cd..f27905c8a 100644 --- a/app/code/core/Mage/XmlConnect/Block/Catalog/Search/Suggest.php +++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Search/Suggest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Billing.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Billing.php index df9490a6c..f7521b7ad 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Billing.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Billing.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php index ab0bc672e..6713fbb29 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Shipping.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Shipping.php index b6ee9600a..78cc06bd7 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Shipping.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Shipping.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php index 276440b89..d953b6e62 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer.php index 7f18d0ba9..29c6797be 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Bundle.php index 69bba64f1..8616bcfa4 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Bundle.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Bundle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Configurable.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Configurable.php index a9b36beff..364209eae 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Configurable.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Downloadable.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Downloadable.php index e6b2b8aa7..17647e451 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Downloadable.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Downloadable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Giftcard.php index 1faf2f1aa..f632a7cb5 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Giftcard.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Giftcard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Grouped.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Grouped.php index 456748bbc..d92ad5bc8 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Grouped.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address.php index 694d9a71f..ceaabbd6f 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/Form.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/Form.php index c2991fe7a..095a91113 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/Form.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/List.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/List.php index db8b0212b..c901282c6 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/List.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Review.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Review.php index 9b63ef11c..2a558fe06 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Review.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review.php index cfea5d016..4d0f010ad 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php index 5ce9600de..cd49b779c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Authorizenet.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Authorizenet.php index cfce3de7e..5390ff006 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Authorizenet.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Authorizenet.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php index 8c26ed155..3b8b00700 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Checkmo.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Checkmo.php index 7485c6f62..d651ce3ec 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Checkmo.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Checkmo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Authorizenet.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Authorizenet.php index aa52b15c5..7bdbcd5bc 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Authorizenet.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Authorizenet.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php index e8f47b963..dcc776cf4 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Checkmo.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Checkmo.php index 222b45ee5..451c7ffa4 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Checkmo.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Checkmo.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Free.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Free.php index 4efbbb6b3..df5c17a86 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Free.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Free.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php index 837db249d..63eae1c65 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Express.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Express.php index 726d9843b..c196fe0b6 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Express.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Express.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Mecl.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Mecl.php index 9848a7726..57ab057d6 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Mecl.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Mecl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Authorizenet.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Authorizenet.php index 0a67947f0..82f0eb0c6 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Authorizenet.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Authorizenet.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypal/Direct.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypal/Direct.php index 4baaedf09..3817b5d29 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypal/Direct.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypal/Direct.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypaluk/Direct.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypaluk/Direct.php index bc85280e4..495f882d8 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypaluk/Direct.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypaluk/Direct.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php index e33b7086e..3caf570af 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Purchaseorder.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Purchaseorder.php index e01c21a00..48bcc59ea 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Purchaseorder.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Purchaseorder.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php index 51576f062..d2d73ef5d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/ListApi23.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/ListApi23.php index 2cd9ee791..58260b603 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/ListApi23.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/ListApi23.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Direct.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Direct.php index b314a197b..e617f2eb8 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Direct.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Direct.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php index 07558590d..2c0f91a8d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Abstract.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Abstract.php index e7c9af7dc..e88f4dcfa 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Abstract.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Authorizenet.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Authorizenet.php index 1c969a3ee..48a722452 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Authorizenet.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Authorizenet.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypal.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypal.php index 08b9f9f69..5e67008f7 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypal.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypal.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypaluk.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypaluk.php index d8370820a..3563aa7ff 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypaluk.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypaluk.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Verisign.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Verisign.php index b204daa4a..49d9e9c1c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Verisign.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Verisign.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Purchaseorder.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Purchaseorder.php index b6ad20880..5295069e6 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Purchaseorder.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Purchaseorder.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php index b6a9055e1..bfebef515 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/Available.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/Available.php index f13649c58..d775d5eb7 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/Available.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/Available.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/AvailableList.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/AvailableList.php index 9f2af43dc..b9ff90859 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/AvailableList.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/AvailableList.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Cms/Page.php b/app/code/core/Mage/XmlConnect/Block/Cms/Page.php index 611bfa80b..a4dc3204f 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cms/Page.php +++ b/app/code/core/Mage/XmlConnect/Block/Cms/Page.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Configuration.php b/app/code/core/Mage/XmlConnect/Block/Configuration.php index 780f5148a..431ba4f78 100644 --- a/app/code/core/Mage/XmlConnect/Block/Configuration.php +++ b/app/code/core/Mage/XmlConnect/Block/Configuration.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php b/app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php index d18bc3ae5..d6e531760 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Address/List.php b/app/code/core/Mage/XmlConnect/Block/Customer/Address/List.php index 402751254..c53a1eaf9 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Address/List.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Address/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Downloads.php b/app/code/core/Mage/XmlConnect/Block/Customer/Downloads.php index 5c117961f..9c8e52599 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Downloads.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Downloads.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form.php index ff63dbc5f..8c27a8c21 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Form.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Boolean.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Boolean.php index b34b0262a..ba824fc8d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Boolean.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Boolean.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Date.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Date.php index 1f8024b39..e4dce91fd 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Date.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/File.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/File.php index 42fea369e..f64ecdad3 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/File.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Image.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Image.php index b1a636b79..6d591b8e5 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Image.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiline.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiline.php index ff5575667..98ff5246f 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiline.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiline.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiselect.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiselect.php index a622f9035..2e0c3b5a5 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiselect.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiselect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Select.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Select.php index 03dde6621..85d28350c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Select.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Text.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Text.php index 044a8ad55..f06c9c071 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Text.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Text.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Textarea.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Textarea.php index aa59a1a99..107bb4693 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Textarea.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Textarea.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/GiftcardCheck.php b/app/code/core/Mage/XmlConnect/Block/Customer/GiftcardCheck.php index b1d5427dd..06456d876 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/GiftcardCheck.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/GiftcardCheck.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php index 392887087..01057b3fb 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Bundle.php index 2a6710a5d..4fc5cf145 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Bundle.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Bundle.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Default.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Default.php index 36d4e0661..fd54f3050 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Default.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Downloadable.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Downloadable.php index 58837bb6e..19390e7d9 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Downloadable.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Downloadable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Giftcard.php index 65287b410..8ae352708 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Giftcard.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Giftcard.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Grouped.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Grouped.php index cd76aeeae..23d01c08d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Grouped.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Items.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Items.php index 7296911c9..ce6c20184 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Items.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Items.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/List.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/List.php index e0065b096..7bd3c389a 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/List.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals.php index 3506f3472..1e6c2423c 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance.php index abaf34891..93c5cbc86 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance/Refunded.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance/Refunded.php index 3684a6fb4..022037c98 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance/Refunded.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance/Refunded.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Giftcards.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Giftcards.php index 58099473f..07d7a2098 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Giftcards.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Giftcards.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Tax.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Tax.php index 5a81a45be..01a130b10 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Tax.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Tax.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Storecredit.php b/app/code/core/Mage/XmlConnect/Block/Customer/Storecredit.php index ea26e7dff..4380c067e 100644 --- a/app/code/core/Mage/XmlConnect/Block/Customer/Storecredit.php +++ b/app/code/core/Mage/XmlConnect/Block/Customer/Storecredit.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Home.php b/app/code/core/Mage/XmlConnect/Block/Home.php index 28cfc5aac..5f253152d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Home.php +++ b/app/code/core/Mage/XmlConnect/Block/Home.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Homebanners.php b/app/code/core/Mage/XmlConnect/Block/Homebanners.php index f1ec6c05f..e169d521d 100644 --- a/app/code/core/Mage/XmlConnect/Block/Homebanners.php +++ b/app/code/core/Mage/XmlConnect/Block/Homebanners.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Localization.php b/app/code/core/Mage/XmlConnect/Block/Localization.php index 92f5b3737..4df6a21a8 100644 --- a/app/code/core/Mage/XmlConnect/Block/Localization.php +++ b/app/code/core/Mage/XmlConnect/Block/Localization.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Review/Form.php b/app/code/core/Mage/XmlConnect/Block/Review/Form.php index fca9540b1..34103a853 100644 --- a/app/code/core/Mage/XmlConnect/Block/Review/Form.php +++ b/app/code/core/Mage/XmlConnect/Block/Review/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/ShoppingCart.php b/app/code/core/Mage/XmlConnect/Block/ShoppingCart.php index edad1cb82..91d9c979f 100644 --- a/app/code/core/Mage/XmlConnect/Block/ShoppingCart.php +++ b/app/code/core/Mage/XmlConnect/Block/ShoppingCart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Block/Wishlist.php b/app/code/core/Mage/XmlConnect/Block/Wishlist.php index be46c1996..7df3d2c44 100644 --- a/app/code/core/Mage/XmlConnect/Block/Wishlist.php +++ b/app/code/core/Mage/XmlConnect/Block/Wishlist.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Controller/Action.php b/app/code/core/Mage/XmlConnect/Controller/Action.php index c9ea5adce..a47d01b72 100644 --- a/app/code/core/Mage/XmlConnect/Controller/Action.php +++ b/app/code/core/Mage/XmlConnect/Controller/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Controller/AdminAction.php b/app/code/core/Mage/XmlConnect/Controller/AdminAction.php index f5c5ea9d2..e4b61fcf3 100644 --- a/app/code/core/Mage/XmlConnect/Controller/AdminAction.php +++ b/app/code/core/Mage/XmlConnect/Controller/AdminAction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/AdminApplication.php b/app/code/core/Mage/XmlConnect/Helper/AdminApplication.php index b2b2f78bd..dfd9a2a05 100644 --- a/app/code/core/Mage/XmlConnect/Helper/AdminApplication.php +++ b/app/code/core/Mage/XmlConnect/Helper/AdminApplication.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Adminhtml/Dashboard/Order.php b/app/code/core/Mage/XmlConnect/Helper/Adminhtml/Dashboard/Order.php index fbde18693..0c58557ab 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Adminhtml/Dashboard/Order.php +++ b/app/code/core/Mage/XmlConnect/Helper/Adminhtml/Dashboard/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Android.php b/app/code/core/Mage/XmlConnect/Helper/Android.php index bb2b55952..221445b21 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Android.php +++ b/app/code/core/Mage/XmlConnect/Helper/Android.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Catalog/Category/Image.php b/app/code/core/Mage/XmlConnect/Helper/Catalog/Category/Image.php index f84723333..5573e22e0 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Catalog/Category/Image.php +++ b/app/code/core/Mage/XmlConnect/Helper/Catalog/Category/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Catalog/Product/Image.php b/app/code/core/Mage/XmlConnect/Helper/Catalog/Product/Image.php index 511531096..8f1dcc465 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Catalog/Product/Image.php +++ b/app/code/core/Mage/XmlConnect/Helper/Catalog/Product/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Customer/Form/Renderer.php b/app/code/core/Mage/XmlConnect/Helper/Customer/Form/Renderer.php index d9c503266..0c47ead29 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Customer/Form/Renderer.php +++ b/app/code/core/Mage/XmlConnect/Helper/Customer/Form/Renderer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Customer/Order.php b/app/code/core/Mage/XmlConnect/Helper/Customer/Order.php index 418303d7b..b62c6ea20 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Customer/Order.php +++ b/app/code/core/Mage/XmlConnect/Helper/Customer/Order.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Data.php b/app/code/core/Mage/XmlConnect/Helper/Data.php index 58ea27b0a..3f324ddee 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Data.php +++ b/app/code/core/Mage/XmlConnect/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Device/Abstract.php b/app/code/core/Mage/XmlConnect/Helper/Device/Abstract.php index 6a629368d..2fd11abf8 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Device/Abstract.php +++ b/app/code/core/Mage/XmlConnect/Helper/Device/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/XmlConnect/Helper/Image.php b/app/code/core/Mage/XmlConnect/Helper/Image.php index 5a402c6dd..c3d1d9200 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Image.php +++ b/app/code/core/Mage/XmlConnect/Helper/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Ipad.php b/app/code/core/Mage/XmlConnect/Helper/Ipad.php index 66af46ed7..bc60c24b3 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Ipad.php +++ b/app/code/core/Mage/XmlConnect/Helper/Ipad.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Iphone.php b/app/code/core/Mage/XmlConnect/Helper/Iphone.php index 7cc98563d..cf2490af0 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Iphone.php +++ b/app/code/core/Mage/XmlConnect/Helper/Iphone.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/OfflineCatalog.php b/app/code/core/Mage/XmlConnect/Helper/OfflineCatalog.php index b72ee003d..2ceb68fd7 100644 --- a/app/code/core/Mage/XmlConnect/Helper/OfflineCatalog.php +++ b/app/code/core/Mage/XmlConnect/Helper/OfflineCatalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Payment.php b/app/code/core/Mage/XmlConnect/Helper/Payment.php index 8c0c5ca74..8d1ade553 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Payment.php +++ b/app/code/core/Mage/XmlConnect/Helper/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Theme.php b/app/code/core/Mage/XmlConnect/Helper/Theme.php index ed18bb041..32858e3e4 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Theme.php +++ b/app/code/core/Mage/XmlConnect/Helper/Theme.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Helper/Translate.php b/app/code/core/Mage/XmlConnect/Helper/Translate.php index 653fe6fe4..1889c2c18 100644 --- a/app/code/core/Mage/XmlConnect/Helper/Translate.php +++ b/app/code/core/Mage/XmlConnect/Helper/Translate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Catalog.php b/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Catalog.php index 637355c97..fc4e6c776 100644 --- a/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Catalog.php +++ b/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Catalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Category.php b/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Category.php index 0890a8c9c..c425c16cc 100644 --- a/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Category.php +++ b/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Baseurl.php b/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Baseurl.php index 0e732529c..319e4ccd9 100644 --- a/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Baseurl.php +++ b/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Baseurl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Currency/Default.php b/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Currency/Default.php index 49601d59a..d7d79ff07 100644 --- a/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Currency/Default.php +++ b/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Currency/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Application.php b/app/code/core/Mage/XmlConnect/Model/Application.php index 6f152fcf0..2d7d48142 100644 --- a/app/code/core/Mage/XmlConnect/Model/Application.php +++ b/app/code/core/Mage/XmlConnect/Model/Application.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Image.php b/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Image.php index ac749edc9..ddcab9962 100644 --- a/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Image.php +++ b/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Media/Config.php b/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Media/Config.php index e3d1a3dc2..ae7d2029c 100644 --- a/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Media/Config.php +++ b/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Media/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/ConfigData.php b/app/code/core/Mage/XmlConnect/Model/ConfigData.php index 856491c4e..1888dff6c 100644 --- a/app/code/core/Mage/XmlConnect/Model/ConfigData.php +++ b/app/code/core/Mage/XmlConnect/Model/ConfigData.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Configuration.php b/app/code/core/Mage/XmlConnect/Model/Configuration.php index c66a80fbf..0e1e236d2 100644 --- a/app/code/core/Mage/XmlConnect/Model/Configuration.php +++ b/app/code/core/Mage/XmlConnect/Model/Configuration.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Device/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Device/Abstract.php index 3aae3375e..d87c22527 100644 --- a/app/code/core/Mage/XmlConnect/Model/Device/Abstract.php +++ b/app/code/core/Mage/XmlConnect/Model/Device/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Device/Android.php b/app/code/core/Mage/XmlConnect/Model/Device/Android.php index fa01078c4..4c261487a 100644 --- a/app/code/core/Mage/XmlConnect/Model/Device/Android.php +++ b/app/code/core/Mage/XmlConnect/Model/Device/Android.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Device/Ipad.php b/app/code/core/Mage/XmlConnect/Model/Device/Ipad.php index 5c37c68bc..a72a3dd11 100644 --- a/app/code/core/Mage/XmlConnect/Model/Device/Ipad.php +++ b/app/code/core/Mage/XmlConnect/Model/Device/Ipad.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Device/Iphone.php b/app/code/core/Mage/XmlConnect/Model/Device/Iphone.php index 4a975a243..de653ed93 100644 --- a/app/code/core/Mage/XmlConnect/Model/Device/Iphone.php +++ b/app/code/core/Mage/XmlConnect/Model/Device/Iphone.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/History.php b/app/code/core/Mage/XmlConnect/Model/History.php index f5e7594dd..6cf644ac2 100644 --- a/app/code/core/Mage/XmlConnect/Model/History.php +++ b/app/code/core/Mage/XmlConnect/Model/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/ImageAction.php b/app/code/core/Mage/XmlConnect/Model/ImageAction.php index d99e02256..c29a068fb 100644 --- a/app/code/core/Mage/XmlConnect/Model/ImageAction.php +++ b/app/code/core/Mage/XmlConnect/Model/ImageAction.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/ImageLimits.php b/app/code/core/Mage/XmlConnect/Model/ImageLimits.php index 3d1c56d91..3e6577339 100644 --- a/app/code/core/Mage/XmlConnect/Model/ImageLimits.php +++ b/app/code/core/Mage/XmlConnect/Model/ImageLimits.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/ImageLimits/Abstract.php b/app/code/core/Mage/XmlConnect/Model/ImageLimits/Abstract.php index 7c05b363d..ffa96805e 100644 --- a/app/code/core/Mage/XmlConnect/Model/ImageLimits/Abstract.php +++ b/app/code/core/Mage/XmlConnect/Model/ImageLimits/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Images.php b/app/code/core/Mage/XmlConnect/Model/Images.php index 624e0440d..91a673c60 100644 --- a/app/code/core/Mage/XmlConnect/Model/Images.php +++ b/app/code/core/Mage/XmlConnect/Model/Images.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Application.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Application.php index f0eb04a46..e5986c646 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Application.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Application.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Application/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Application/Collection.php index ab38d7c21..4afb1ce33 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Application/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Application/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Cms/Page/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Cms/Page/Collection.php index 57d2538e6..1c93e8eec 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Cms/Page/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Cms/Page/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData.php index 5056b4170..4ad1add30 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData/Collection.php index 58458cea5..7a696e773 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Filter/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Filter/Collection.php index 8d6dd2e13..0b37a855b 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Filter/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Filter/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/History.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/History.php index f21480ce7..15e4bb3b8 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/History.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/History/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/History/Collection.php index d8627009b..0e0a52dcb 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/History/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/History/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue.php index ddb769cb5..b21204d43 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue/Collection.php index a0ee7f746..44ebc675e 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Setup.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Setup.php index 2c218c1a3..39577c1b8 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Template.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Template.php index a10c01e96..c371595c3 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Template.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Template/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Template/Collection.php index deecebdd7..b89cc87b6 100644 --- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Template/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Template/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Observer.php b/app/code/core/Mage/XmlConnect/Model/Observer.php index 9d5e8cc10..0e60fd88e 100644 --- a/app/code/core/Mage/XmlConnect/Model/Observer.php +++ b/app/code/core/Mage/XmlConnect/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog.php index 9d1b80c87..750aaa1ca 100644 --- a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog.php +++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Abstract.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Abstract.php index 7d57e24d5..12da23be8 100644 --- a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Abstract.php +++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category.php index 10f07ae72..b38a04f56 100644 --- a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category.php +++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/Category.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/Category.php index ef22633ae..647df43fc 100644 --- a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/Category.php +++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/IndexCategory.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/IndexCategory.php index 5027ef2e6..686bf47e2 100644 --- a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/IndexCategory.php +++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/IndexCategory.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Config.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Config.php index 6e3a8aeba..446dbf87a 100644 --- a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Config.php +++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Home.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Home.php index b359a5a3f..d2e5efaf1 100644 --- a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Home.php +++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Home.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Homebanners.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Homebanners.php index 468aaae60..18917484d 100644 --- a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Homebanners.php +++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Homebanners.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product.php index 5abba9708..f5d1a005e 100644 --- a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product.php +++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Gallery.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Gallery.php index de2d76d93..ba45bcfdb 100644 --- a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Gallery.php +++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Gallery.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Product.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Product.php index 5fbab0537..d63f642f9 100644 --- a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Product.php +++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Review.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Review.php index bce9d3196..6a3876994 100644 --- a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Review.php +++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Review.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Config.php b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Config.php index 983e8fb32..8362f991c 100644 --- a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Config.php +++ b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mecl.php b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mecl.php index 512ed0c96..8ffceb1c4 100644 --- a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mecl.php +++ b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mecl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mep.php b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mep.php index 8ad680ea2..aabd14b08 100644 --- a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mep.php +++ b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mep.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Pro.php b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Pro.php index 38eebfeed..895b365e6 100644 --- a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Pro.php +++ b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Pro.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Paypal/Mecl/Checkout.php b/app/code/core/Mage/XmlConnect/Model/Paypal/Mecl/Checkout.php index 285a53c30..f54738709 100644 --- a/app/code/core/Mage/XmlConnect/Model/Paypal/Mecl/Checkout.php +++ b/app/code/core/Mage/XmlConnect/Model/Paypal/Mecl/Checkout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Paypal/Mep/Checkout.php b/app/code/core/Mage/XmlConnect/Model/Paypal/Mep/Checkout.php index 36649daa8..6f02b7aea 100644 --- a/app/code/core/Mage/XmlConnect/Model/Paypal/Mep/Checkout.php +++ b/app/code/core/Mage/XmlConnect/Model/Paypal/Mep/Checkout.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php index 7ad5e4d59..43af4a98e 100644 --- a/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php +++ b/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Android.php b/app/code/core/Mage/XmlConnect/Model/Preview/Android.php index 2d83ae3d0..a8ed6daa4 100644 --- a/app/code/core/Mage/XmlConnect/Model/Preview/Android.php +++ b/app/code/core/Mage/XmlConnect/Model/Preview/Android.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php b/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php index 4d0d11271..8ad8b21e6 100644 --- a/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php +++ b/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php b/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php index a6902af49..9d0ef222e 100644 --- a/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php +++ b/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Queue.php b/app/code/core/Mage/XmlConnect/Model/Queue.php index da1656cec..5feb4f859 100644 --- a/app/code/core/Mage/XmlConnect/Model/Queue.php +++ b/app/code/core/Mage/XmlConnect/Model/Queue.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Application.php b/app/code/core/Mage/XmlConnect/Model/Resource/Application.php index 2af29ed07..20d673bab 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/Application.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/Application.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Application/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Application/Collection.php index c00b4a1f0..cd572ce87 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/Application/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/Application/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/CategorySearch/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/CategorySearch/Collection.php index e2b3d438b..a54c46895 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/CategorySearch/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/CategorySearch/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Cms/Page/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Cms/Page/Collection.php index d3a47853a..9a71a016f 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/Cms/Page/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/Cms/Page/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData.php b/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData.php index e4f50165f..cbafcb38c 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData/Collection.php index a51b82098..78a76e85e 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Filter/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Filter/Collection.php index ccd1035c5..3d3bfa22b 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/Filter/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/Filter/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/History.php b/app/code/core/Mage/XmlConnect/Model/Resource/History.php index 0d4ab6b58..6922320ae 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/History.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/History.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/History/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/History/Collection.php index 6de4bd341..e32c52487 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/History/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/History/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Images.php b/app/code/core/Mage/XmlConnect/Model/Resource/Images.php index 32af8b557..106f229c6 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/Images.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/Images.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Images/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Images/Collection.php index fd8b2de91..a7a9c5620 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/Images/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/Images/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Queue.php b/app/code/core/Mage/XmlConnect/Model/Resource/Queue.php index c95896d27..646845aa5 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/Queue.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/Queue.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Queue/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Queue/Collection.php index f7c12e944..8552b84f1 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/Queue/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/Queue/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Setup.php b/app/code/core/Mage/XmlConnect/Model/Resource/Setup.php index 92fd5994b..9275b4b39 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/Setup.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/Setup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Template.php b/app/code/core/Mage/XmlConnect/Model/Resource/Template.php index 14d58484a..5b64ce1d3 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/Template.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Template/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Template/Collection.php index 2b038d401..659ecf8a4 100644 --- a/app/code/core/Mage/XmlConnect/Model/Resource/Template/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Resource/Template/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php index a3383f9ec..2a43365b0 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form.php index 946d2cf9b..84679678b 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Abstract.php index fcc7ee6a4..eb5f7e84e 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Abstract.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Abstract.php index 3e76eb5cb..2f4d94026 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Abstract.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Checkbox.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Checkbox.php index 937aabbfb..5e84b95a2 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Checkbox.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Checkbox.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Collection.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Collection.php index a8cc8e482..dc10fa1ca 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Collection.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/CountryListSelect.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/CountryListSelect.php index afd7a23c4..ddf7e2b16 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/CountryListSelect.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/CountryListSelect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Custom.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Custom.php index 1d4710ed6..92d1d89fa 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Custom.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Custom.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Date.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Date.php index c25defe28..3d4287007 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Date.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Date.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Email.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Email.php index 829351eee..cd54605f2 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Email.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Email.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Fieldset.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Fieldset.php index af9d48b98..c82ac3053 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Fieldset.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Fieldset.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/File.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/File.php index 9356499ea..82e30bca2 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/File.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Image.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Image.php index 686973606..538002b49 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Image.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Image.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiline.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiline.php index ce5208559..f29205ec8 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiline.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiline.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiselect.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiselect.php index c51467450..14df46861 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiselect.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiselect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Password.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Password.php index ca72eaded..ca801b7af 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Password.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Password.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Renderer/Interface.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Renderer/Interface.php index cf28c7e7f..030df8536 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Renderer/Interface.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Renderer/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Select.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Select.php index f20365176..b66c74e7c 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Select.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Select.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Text.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Text.php index 0a4159de2..28b0ad11b 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Text.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Text.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Textarea.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Textarea.php index 343c2f87d..a442bc3d2 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Textarea.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Textarea.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator.php index 206150307..ddf4b40d4 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Abstract.php index e27210db5..57b1902c9 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Abstract.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Rule.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Rule.php index b85eac094..223322177 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Rule.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Rule.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Message.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message.php index f3fb79340..686de3f2c 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Message.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Abstract.php index cc8293719..abb04db96 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Abstract.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Error.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Error.php index 76012711f..afd443f0c 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Error.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Error.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Success.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Success.php index 198604ce0..209765412 100644 --- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Success.php +++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Success.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Tabs.php b/app/code/core/Mage/XmlConnect/Model/Tabs.php index 40cdfc1f0..03bf953b0 100644 --- a/app/code/core/Mage/XmlConnect/Model/Tabs.php +++ b/app/code/core/Mage/XmlConnect/Model/Tabs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Template.php b/app/code/core/Mage/XmlConnect/Model/Template.php index 9f9293f66..3114fe851 100644 --- a/app/code/core/Mage/XmlConnect/Model/Template.php +++ b/app/code/core/Mage/XmlConnect/Model/Template.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/Model/Theme.php b/app/code/core/Mage/XmlConnect/Model/Theme.php index 6b706ded2..f2e4f9e1d 100644 --- a/app/code/core/Mage/XmlConnect/Model/Theme.php +++ b/app/code/core/Mage/XmlConnect/Model/Theme.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Admin/ApplicationController.php b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Admin/ApplicationController.php index 3e59439f5..53fae7c9b 100644 --- a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Admin/ApplicationController.php +++ b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Admin/ApplicationController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/ConfigController.php b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/ConfigController.php index d27f6c17f..b602fa361 100644 --- a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/ConfigController.php +++ b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/ConfigController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/DashboardController.php b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/DashboardController.php index 66869f0c2..4790a8b6d 100644 --- a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/DashboardController.php +++ b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/DashboardController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/UserController.php b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/UserController.php index 2fa6513d2..5a708b6ab 100644 --- a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/UserController.php +++ b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/UserController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php index c047ef8bd..c458dd886 100644 --- a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php +++ b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/CartController.php b/app/code/core/Mage/XmlConnect/controllers/CartController.php index d197c4f52..307408695 100644 --- a/app/code/core/Mage/XmlConnect/controllers/CartController.php +++ b/app/code/core/Mage/XmlConnect/controllers/CartController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/CatalogController.php b/app/code/core/Mage/XmlConnect/controllers/CatalogController.php index 1d94c6d71..0c116dfd2 100644 --- a/app/code/core/Mage/XmlConnect/controllers/CatalogController.php +++ b/app/code/core/Mage/XmlConnect/controllers/CatalogController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php b/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php index 66ad5c07e..d37e9ba05 100644 --- a/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php +++ b/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/CmsController.php b/app/code/core/Mage/XmlConnect/controllers/CmsController.php index 38d40511e..15c1298b0 100644 --- a/app/code/core/Mage/XmlConnect/controllers/CmsController.php +++ b/app/code/core/Mage/XmlConnect/controllers/CmsController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php b/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php index 3a2233ba0..12674c116 100644 --- a/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php +++ b/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/CustomerController.php b/app/code/core/Mage/XmlConnect/controllers/CustomerController.php index 81b2a4fc0..6fa129a67 100644 --- a/app/code/core/Mage/XmlConnect/controllers/CustomerController.php +++ b/app/code/core/Mage/XmlConnect/controllers/CustomerController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/HomebannersController.php b/app/code/core/Mage/XmlConnect/controllers/HomebannersController.php index caa6cf876..0b43f20b5 100644 --- a/app/code/core/Mage/XmlConnect/controllers/HomebannersController.php +++ b/app/code/core/Mage/XmlConnect/controllers/HomebannersController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/IndexController.php b/app/code/core/Mage/XmlConnect/controllers/IndexController.php index b7e349b6c..7def6cc97 100644 --- a/app/code/core/Mage/XmlConnect/controllers/IndexController.php +++ b/app/code/core/Mage/XmlConnect/controllers/IndexController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/LocalizationController.php b/app/code/core/Mage/XmlConnect/controllers/LocalizationController.php index 0a95566cc..0b42d6781 100644 --- a/app/code/core/Mage/XmlConnect/controllers/LocalizationController.php +++ b/app/code/core/Mage/XmlConnect/controllers/LocalizationController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/OfflineCatalogController.php b/app/code/core/Mage/XmlConnect/controllers/OfflineCatalogController.php index 17db22700..8bcdf5299 100644 --- a/app/code/core/Mage/XmlConnect/controllers/OfflineCatalogController.php +++ b/app/code/core/Mage/XmlConnect/controllers/OfflineCatalogController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/Paypal/MeclController.php b/app/code/core/Mage/XmlConnect/controllers/Paypal/MeclController.php index ca860e1f0..31696ed25 100644 --- a/app/code/core/Mage/XmlConnect/controllers/Paypal/MeclController.php +++ b/app/code/core/Mage/XmlConnect/controllers/Paypal/MeclController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php b/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php index 6fc600af2..d07cbe99f 100644 --- a/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php +++ b/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/PbridgeController.php b/app/code/core/Mage/XmlConnect/controllers/PbridgeController.php index bc0ae2fef..c136a32b0 100644 --- a/app/code/core/Mage/XmlConnect/controllers/PbridgeController.php +++ b/app/code/core/Mage/XmlConnect/controllers/PbridgeController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/ReviewController.php b/app/code/core/Mage/XmlConnect/controllers/ReviewController.php index 4067996ee..ccea0ad03 100644 --- a/app/code/core/Mage/XmlConnect/controllers/ReviewController.php +++ b/app/code/core/Mage/XmlConnect/controllers/ReviewController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/controllers/WishlistController.php b/app/code/core/Mage/XmlConnect/controllers/WishlistController.php index e83d494d2..6f8035871 100644 --- a/app/code/core/Mage/XmlConnect/controllers/WishlistController.php +++ b/app/code/core/Mage/XmlConnect/controllers/WishlistController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/etc/adminhtml.xml b/app/code/core/Mage/XmlConnect/etc/adminhtml.xml index e93c3394a..d840f558a 100644 --- a/app/code/core/Mage/XmlConnect/etc/adminhtml.xml +++ b/app/code/core/Mage/XmlConnect/etc/adminhtml.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/XmlConnect/etc/config.xml b/app/code/core/Mage/XmlConnect/etc/config.xml index aa7f87080..16c5c18e5 100644 --- a/app/code/core/Mage/XmlConnect/etc/config.xml +++ b/app/code/core/Mage/XmlConnect/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/XmlConnect/etc/system.xml b/app/code/core/Mage/XmlConnect/etc/system.xml index d15d2cc3a..0550f312a 100644 --- a/app/code/core/Mage/XmlConnect/etc/system.xml +++ b/app/code/core/Mage/XmlConnect/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/XmlConnect/etc/themes/custom.xml b/app/code/core/Mage/XmlConnect/etc/themes/custom.xml index b66387db2..a17cb4462 100644 --- a/app/code/core/Mage/XmlConnect/etc/themes/custom.xml +++ b/app/code/core/Mage/XmlConnect/etc/themes/custom.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/XmlConnect/etc/themes/default.xml b/app/code/core/Mage/XmlConnect/etc/themes/default.xml index 4962e5e07..472a211d0 100644 --- a/app/code/core/Mage/XmlConnect/etc/themes/default.xml +++ b/app/code/core/Mage/XmlConnect/etc/themes/default.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/XmlConnect/etc/themes/funk_leaf.xml b/app/code/core/Mage/XmlConnect/etc/themes/funk_leaf.xml index e09a5a322..79ac18658 100644 --- a/app/code/core/Mage/XmlConnect/etc/themes/funk_leaf.xml +++ b/app/code/core/Mage/XmlConnect/etc/themes/funk_leaf.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/XmlConnect/etc/themes/hot_red.xml b/app/code/core/Mage/XmlConnect/etc/themes/hot_red.xml index ca210d67d..6b4571601 100644 --- a/app/code/core/Mage/XmlConnect/etc/themes/hot_red.xml +++ b/app/code/core/Mage/XmlConnect/etc/themes/hot_red.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/XmlConnect/etc/themes/sky_blue.xml b/app/code/core/Mage/XmlConnect/etc/themes/sky_blue.xml index 659bef0ee..583a73cfa 100644 --- a/app/code/core/Mage/XmlConnect/etc/themes/sky_blue.xml +++ b/app/code/core/Mage/XmlConnect/etc/themes/sky_blue.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/install-1.6.0.0.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/install-1.6.0.0.php index a2ce73143..0dbe8838b 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/install-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.4.0.13-1.4.0.14.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.4.0.13-1.4.0.14.php index 2b7f3dca3..956d6aacf 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.4.0.13-1.4.0.14.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.4.0.13-1.4.0.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.5.9.9-1.6.0.0.php index 46839dd97..f3eb30a90 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.6.0.0-1.6.0.0.1.php index eeb939d3e..b3fbb5e29 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.6.0.0-1.6.0.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-install-1.4.0.8.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-install-1.4.0.8.php index 93786f7ba..3cc6f9852 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-install-1.4.0.8.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-install-1.4.0.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.10-1.4.0.11.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.10-1.4.0.11.php index 63247771f..30bd74c94 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.10-1.4.0.11.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.10-1.4.0.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.11-1.4.0.12.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.11-1.4.0.12.php index 609ddffaf..9d2d1368c 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.11-1.4.0.12.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.11-1.4.0.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.12-1.4.0.13.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.12-1.4.0.13.php index a65f156e0..9677238a8 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.12-1.4.0.13.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.12-1.4.0.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.13-1.4.0.14.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.13-1.4.0.14.php index c85ce3d75..b40ab314c 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.13-1.4.0.14.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.13-1.4.0.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.8-1.4.0.9.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.8-1.4.0.9.php index ffc2ce418..1489f7e6d 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.8-1.4.0.9.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.8-1.4.0.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.9-1.4.0.10.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.9-1.4.0.10.php index 462877f08..8a52cb0b1 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.9-1.4.0.10.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.9-1.4.0.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index f23d0535c..9a0f16323 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/upgrade-1.6.0.0-1.6.0.0.1.php index a6fa84ea2..52fafee59 100644 --- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/upgrade-1.6.0.0-1.6.0.0.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/local/local_data_goes_here b/app/code/local/local_data_goes_here deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/design/adminhtml/default/default/etc/theme.xml b/app/design/adminhtml/default/default/etc/theme.xml deleted file mode 100644 index 396fe54f1..000000000 --- a/app/design/adminhtml/default/default/etc/theme.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - diff --git a/app/design/adminhtml/default/default/layout/admin.xml b/app/design/adminhtml/default/default/layout/admin.xml index a68a59632..ce32934e1 100644 --- a/app/design/adminhtml/default/default/layout/admin.xml +++ b/app/design/adminhtml/default/default/layout/admin.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/adminnotification.xml b/app/design/adminhtml/default/default/layout/adminnotification.xml index b59302c24..cf368a703 100644 --- a/app/design/adminhtml/default/default/layout/adminnotification.xml +++ b/app/design/adminhtml/default/default/layout/adminnotification.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/api2.xml b/app/design/adminhtml/default/default/layout/api2.xml index 0fed9f164..b98b50602 100644 --- a/app/design/adminhtml/default/default/layout/api2.xml +++ b/app/design/adminhtml/default/default/layout/api2.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/authorizenet.xml b/app/design/adminhtml/default/default/layout/authorizenet.xml index f393e15e6..7fb51bb42 100644 --- a/app/design/adminhtml/default/default/layout/authorizenet.xml +++ b/app/design/adminhtml/default/default/layout/authorizenet.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/layout/bundle.xml b/app/design/adminhtml/default/default/layout/bundle.xml index 60e620271..4f42fca06 100644 --- a/app/design/adminhtml/default/default/layout/bundle.xml +++ b/app/design/adminhtml/default/default/layout/bundle.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/captcha.xml b/app/design/adminhtml/default/default/layout/captcha.xml index 80e8356a3..193bfd594 100644 --- a/app/design/adminhtml/default/default/layout/captcha.xml +++ b/app/design/adminhtml/default/default/layout/captcha.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/layout/catalog.xml b/app/design/adminhtml/default/default/layout/catalog.xml index 1647b414d..c761dd96e 100644 --- a/app/design/adminhtml/default/default/layout/catalog.xml +++ b/app/design/adminhtml/default/default/layout/catalog.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/centinel.xml b/app/design/adminhtml/default/default/layout/centinel.xml index b409f233c..3adbd7073 100644 --- a/app/design/adminhtml/default/default/layout/centinel.xml +++ b/app/design/adminhtml/default/default/layout/centinel.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/layout/cms.xml b/app/design/adminhtml/default/default/layout/cms.xml index 6d3ad7967..9b7bb8e5b 100644 --- a/app/design/adminhtml/default/default/layout/cms.xml +++ b/app/design/adminhtml/default/default/layout/cms.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/compiler.xml b/app/design/adminhtml/default/default/layout/compiler.xml index f6f53c975..77155294b 100644 --- a/app/design/adminhtml/default/default/layout/compiler.xml +++ b/app/design/adminhtml/default/default/layout/compiler.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/connect.xml b/app/design/adminhtml/default/default/layout/connect.xml index c76b5be7a..ec6048695 100644 --- a/app/design/adminhtml/default/default/layout/connect.xml +++ b/app/design/adminhtml/default/default/layout/connect.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/currencysymbol.xml b/app/design/adminhtml/default/default/layout/currencysymbol.xml index 0f3eb84ba..02477b264 100644 --- a/app/design/adminhtml/default/default/layout/currencysymbol.xml +++ b/app/design/adminhtml/default/default/layout/currencysymbol.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/customer.xml b/app/design/adminhtml/default/default/layout/customer.xml index a54878c89..42f6a6b64 100644 --- a/app/design/adminhtml/default/default/layout/customer.xml +++ b/app/design/adminhtml/default/default/layout/customer.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/dataflow.xml b/app/design/adminhtml/default/default/layout/dataflow.xml index 75d328c56..a5d297b79 100644 --- a/app/design/adminhtml/default/default/layout/dataflow.xml +++ b/app/design/adminhtml/default/default/layout/dataflow.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/downloadable.xml b/app/design/adminhtml/default/default/layout/downloadable.xml index 4804c44a2..ad664e9e7 100644 --- a/app/design/adminhtml/default/default/layout/downloadable.xml +++ b/app/design/adminhtml/default/default/layout/downloadable.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/giftmessage.xml b/app/design/adminhtml/default/default/layout/giftmessage.xml index dffc90857..083cb496a 100644 --- a/app/design/adminhtml/default/default/layout/giftmessage.xml +++ b/app/design/adminhtml/default/default/layout/giftmessage.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/index.xml b/app/design/adminhtml/default/default/layout/index.xml index 42c6942cc..5261b196e 100644 --- a/app/design/adminhtml/default/default/layout/index.xml +++ b/app/design/adminhtml/default/default/layout/index.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/main.xml b/app/design/adminhtml/default/default/layout/main.xml index 5d0d9de3a..5b4f9f068 100644 --- a/app/design/adminhtml/default/default/layout/main.xml +++ b/app/design/adminhtml/default/default/layout/main.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -133,7 +133,6 @@ Default layout, loads most of the pages http://www.magentocommerce.com/bug-tracking - http://magento.com/resources/technical diff --git a/app/design/adminhtml/default/default/layout/moneybookers.xml b/app/design/adminhtml/default/default/layout/moneybookers.xml index e4b4733f0..a6bf56559 100644 --- a/app/design/adminhtml/default/default/layout/moneybookers.xml +++ b/app/design/adminhtml/default/default/layout/moneybookers.xml @@ -15,7 +15,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/newsletter.xml b/app/design/adminhtml/default/default/layout/newsletter.xml index 8b2409cca..48a6a6f2b 100644 --- a/app/design/adminhtml/default/default/layout/newsletter.xml +++ b/app/design/adminhtml/default/default/layout/newsletter.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/oauth.xml b/app/design/adminhtml/default/default/layout/oauth.xml index 815f9d58d..d6adb7093 100644 --- a/app/design/adminhtml/default/default/layout/oauth.xml +++ b/app/design/adminhtml/default/default/layout/oauth.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/pagecache.xml b/app/design/adminhtml/default/default/layout/pagecache.xml index 580cc6bd1..8f000a9cb 100644 --- a/app/design/adminhtml/default/default/layout/pagecache.xml +++ b/app/design/adminhtml/default/default/layout/pagecache.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/promo.xml b/app/design/adminhtml/default/default/layout/promo.xml index 956e8f3eb..1d99676cb 100644 --- a/app/design/adminhtml/default/default/layout/promo.xml +++ b/app/design/adminhtml/default/default/layout/promo.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/report.xml b/app/design/adminhtml/default/default/layout/report.xml index d5fc4f961..93e4666cb 100644 --- a/app/design/adminhtml/default/default/layout/report.xml +++ b/app/design/adminhtml/default/default/layout/report.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/rss.xml b/app/design/adminhtml/default/default/layout/rss.xml index b34989978..7bc356bef 100644 --- a/app/design/adminhtml/default/default/layout/rss.xml +++ b/app/design/adminhtml/default/default/layout/rss.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/sales.xml b/app/design/adminhtml/default/default/layout/sales.xml index f1b345d50..1bd778ea2 100644 --- a/app/design/adminhtml/default/default/layout/sales.xml +++ b/app/design/adminhtml/default/default/layout/sales.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/search.xml b/app/design/adminhtml/default/default/layout/search.xml index 3e0bf7985..823d2c521 100644 --- a/app/design/adminhtml/default/default/layout/search.xml +++ b/app/design/adminhtml/default/default/layout/search.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/tag.xml b/app/design/adminhtml/default/default/layout/tag.xml index 1095af243..cb8c0f9ac 100644 --- a/app/design/adminhtml/default/default/layout/tag.xml +++ b/app/design/adminhtml/default/default/layout/tag.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/tax.xml b/app/design/adminhtml/default/default/layout/tax.xml index 0d3214d1a..312c165e0 100644 --- a/app/design/adminhtml/default/default/layout/tax.xml +++ b/app/design/adminhtml/default/default/layout/tax.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/widget.xml b/app/design/adminhtml/default/default/layout/widget.xml index 6ebdcc928..49bd600dc 100644 --- a/app/design/adminhtml/default/default/layout/widget.xml +++ b/app/design/adminhtml/default/default/layout/widget.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/xmlconnect.xml b/app/design/adminhtml/default/default/layout/xmlconnect.xml index b73779377..2c7a5aafd 100644 --- a/app/design/adminhtml/default/default/layout/xmlconnect.xml +++ b/app/design/adminhtml/default/default/layout/xmlconnect.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/template/access_denied.phtml b/app/design/adminhtml/default/default/template/access_denied.phtml index 18fc6cd6a..c3ea5a05e 100644 --- a/app/design/adminhtml/default/default/template/access_denied.phtml +++ b/app/design/adminhtml/default/default/template/access_denied.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml b/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml index d5a6f0d7c..203f4dfe0 100644 --- a/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml +++ b/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api/roleinfo.phtml b/app/design/adminhtml/default/default/template/api/roleinfo.phtml index 9eac02406..11effb0be 100644 --- a/app/design/adminhtml/default/default/template/api/roleinfo.phtml +++ b/app/design/adminhtml/default/default/template/api/roleinfo.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var $this Mage_Adminhtml_Block_Api_Tab_Roleinfo */ diff --git a/app/design/adminhtml/default/default/template/api/roles.phtml b/app/design/adminhtml/default/default/template/api/roles.phtml index 5a190181f..8e7d0824e 100644 --- a/app/design/adminhtml/default/default/template/api/roles.phtml +++ b/app/design/adminhtml/default/default/template/api/roles.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api/rolesedit.phtml b/app/design/adminhtml/default/default/template/api/rolesedit.phtml index 99e9cf058..5940294dc 100644 --- a/app/design/adminhtml/default/default/template/api/rolesedit.phtml +++ b/app/design/adminhtml/default/default/template/api/rolesedit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api/rolesusers.phtml b/app/design/adminhtml/default/default/template/api/rolesusers.phtml index 0452ffe3b..a739f43c6 100644 --- a/app/design/adminhtml/default/default/template/api/rolesusers.phtml +++ b/app/design/adminhtml/default/default/template/api/rolesusers.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml b/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml index 88f1ddd9c..ac338cd93 100644 --- a/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml +++ b/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api/userinfo.phtml b/app/design/adminhtml/default/default/template/api/userinfo.phtml index 646847f05..0b813bd34 100644 --- a/app/design/adminhtml/default/default/template/api/userinfo.phtml +++ b/app/design/adminhtml/default/default/template/api/userinfo.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api/usernroles.phtml b/app/design/adminhtml/default/default/template/api/usernroles.phtml index c91747968..8ef5c299e 100644 --- a/app/design/adminhtml/default/default/template/api/usernroles.phtml +++ b/app/design/adminhtml/default/default/template/api/usernroles.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api/userroles.phtml b/app/design/adminhtml/default/default/template/api/userroles.phtml index 21e21acfd..5baae1be4 100644 --- a/app/design/adminhtml/default/default/template/api/userroles.phtml +++ b/app/design/adminhtml/default/default/template/api/userroles.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api/users.phtml b/app/design/adminhtml/default/default/template/api/users.phtml index 68a2bd1cb..14cae6e21 100644 --- a/app/design/adminhtml/default/default/template/api/users.phtml +++ b/app/design/adminhtml/default/default/template/api/users.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml b/app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml index 4e98053f0..1ded78e20 100644 --- a/app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml +++ b/app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var $this Mage_Api2_Block_Adminhtml_Attribute_Buttons */ diff --git a/app/design/adminhtml/default/default/template/api2/attribute/resource.phtml b/app/design/adminhtml/default/default/template/api2/attribute/resource.phtml index 1be6d4fda..6fa83dda2 100644 --- a/app/design/adminhtml/default/default/template/api2/attribute/resource.phtml +++ b/app/design/adminhtml/default/default/template/api2/attribute/resource.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml b/app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml index a89ed738b..f4d4936fc 100644 --- a/app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml +++ b/app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api2/role/buttons.phtml b/app/design/adminhtml/default/default/template/api2/role/buttons.phtml index 53c4d089b..277a5405a 100644 --- a/app/design/adminhtml/default/default/template/api2/role/buttons.phtml +++ b/app/design/adminhtml/default/default/template/api2/role/buttons.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml b/app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml index 517b8c4ef..c58b7104b 100644 --- a/app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml +++ b/app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml b/app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml index 7bc33fc4c..2e6bd3bc2 100644 --- a/app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml +++ b/app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml b/app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml index 13ea566ea..14cf4274f 100644 --- a/app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml +++ b/app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/backup/left.phtml b/app/design/adminhtml/default/default/template/backup/left.phtml index 884d66e1e..1a4f48942 100644 --- a/app/design/adminhtml/default/default/template/backup/left.phtml +++ b/app/design/adminhtml/default/default/template/backup/left.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/backup/list.phtml b/app/design/adminhtml/default/default/template/backup/list.phtml index e8f11c6e6..ca78789cd 100644 --- a/app/design/adminhtml/default/default/template/backup/list.phtml +++ b/app/design/adminhtml/default/default/template/backup/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml index 8fef592fb..ecf1bd706 100644 --- a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml +++ b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml index 2a62a5f40..604b9dc49 100644 --- a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml +++ b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml index c455711ab..122dd4308 100644 --- a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml +++ b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml index a9177e522..f2bb3321a 100644 --- a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml +++ b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml index 07387660d..f93a191ac 100644 --- a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml +++ b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml index 27314da27..54957ee1e 100644 --- a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml +++ b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml index a716db5a1..b60ddfbaa 100644 --- a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml +++ b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml index 8e02c6b24..1a059693b 100644 --- a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml +++ b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml index 2f789d06c..79906909c 100644 --- a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml +++ b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml index 94c38d8e7..d9315ea3f 100644 --- a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml +++ b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml index 583c59148..009a567fd 100644 --- a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml +++ b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml index d243fc939..0e8839083 100644 --- a/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml +++ b/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml index 9d4199b1f..a85eada5c 100644 --- a/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml +++ b/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml index f4f1eb0be..2d7761d34 100644 --- a/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml +++ b/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml index a0de9e79a..a0c26cf1d 100644 --- a/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml +++ b/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml index 0e3760464..a281165f0 100644 --- a/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml +++ b/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/captcha/zend.phtml b/app/design/adminhtml/default/default/template/captcha/zend.phtml index 7ebc1e7a7..3f2e4be41 100644 --- a/app/design/adminhtml/default/default/template/captcha/zend.phtml +++ b/app/design/adminhtml/default/default/template/captcha/zend.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml b/app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml index 5dbcc8c87..48e7471b3 100644 --- a/app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml +++ b/app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/category/edit.phtml b/app/design/adminhtml/default/default/template/catalog/category/edit.phtml index cd6edeb69..6ad5199fa 100644 --- a/app/design/adminhtml/default/default/template/catalog/category/edit.phtml +++ b/app/design/adminhtml/default/default/template/catalog/category/edit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml b/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml index 746d83ccf..db1e64034 100644 --- a/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml +++ b/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/category/tree.phtml b/app/design/adminhtml/default/default/template/catalog/category/tree.phtml index 1f0129a64..0c1d30ad8 100644 --- a/app/design/adminhtml/default/default/template/catalog/category/tree.phtml +++ b/app/design/adminhtml/default/default/template/catalog/category/tree.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml b/app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml index 15f0aed5f..9a6b04d15 100644 --- a/app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml +++ b/app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml b/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml index 3676cb58c..1d4a0ba6d 100644 --- a/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml +++ b/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product.phtml b/app/design/adminhtml/default/default/template/catalog/product.phtml index 9151255b8..8da5b1ffd 100644 --- a/app/design/adminhtml/default/default/template/catalog/product.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml index 68cbca48c..ab316c059 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml index d2720c690..0dc96db49 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml index e06b9e5ac..5293d1e23 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml index f8ea8c547..798f3901c 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml index 247a5dffb..b47fa7621 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml index c95b42635..e724df0d4 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml index 822c203e2..758f813f5 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml index ea702813b..2bb3bc9a1 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml index d49a4244a..6ee12d796 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml index c32241ba6..b2c5c56b3 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml index c050977ab..40a1bec1d 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml index f1ead45e0..c36aed79f 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml index a71da5512..62848e9bf 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml index fdb1feb33..8781e0175 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml index 24c2c1a84..f11269981 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml index f8a110128..17f08fa2d 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml index 7a2c598fb..d916c0b60 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml index 61536a716..2a06b7725 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml index c2bc44957..e96307516 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/created.phtml b/app/design/adminhtml/default/default/template/catalog/product/created.phtml index 9a713a0fe..69f0f01a1 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/created.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/created.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit.phtml index 38351e95b..b42611c44 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml index 728b77001..2de752e47 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml index 4ce271624..6c5ae8fe1 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml index 067c9fbd1..f2de08e1f 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml index eb77126e6..c93609835 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml index c669d64ce..1538c2c83 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml index 8bab3a9e8..b4c96bcd5 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml index 52685b208..a78ef763a 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml index f5e7afc46..3abb44448 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml index f581292e9..1d579f494 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml index 481ab1621..8a4b1d0c7 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml index 20e9a00e2..4e3240e45 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml index 465152fcf..88e23649e 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier */ diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml index b3d2862e1..31399e593 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml index 66532506d..385cb1452 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/websites.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/websites.phtml index 8da19ebbd..34c808470 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/websites.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/websites.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml b/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml index 47ff15751..b57c107e2 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/js.phtml b/app/design/adminhtml/default/default/template/catalog/product/js.phtml index 73331ac49..7c20d66c1 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/js.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/price.phtml b/app/design/adminhtml/default/default/template/catalog/product/price.phtml index 2edf3894a..3bd14a0ed 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/price.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/price.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml b/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml index ee69fe222..6285e0f08 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml b/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml index 7bc3a4cdb..19f5ccc65 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/widget/chooser/container.phtml b/app/design/adminhtml/default/default/template/catalog/product/widget/chooser/container.phtml index 7321d1e2e..7a4abab9e 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/widget/chooser/container.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/widget/chooser/container.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml b/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml index ce1fc64f6..4de493f83 100644 --- a/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml +++ b/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/centinel/authentication/complete.phtml b/app/design/adminhtml/default/default/template/centinel/authentication/complete.phtml index 5fc9eb4f7..615c32886 100644 --- a/app/design/adminhtml/default/default/template/centinel/authentication/complete.phtml +++ b/app/design/adminhtml/default/default/template/centinel/authentication/complete.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/centinel/authentication/start.phtml b/app/design/adminhtml/default/default/template/centinel/authentication/start.phtml index d2a89a731..9c64fc6f1 100644 --- a/app/design/adminhtml/default/default/template/centinel/authentication/start.phtml +++ b/app/design/adminhtml/default/default/template/centinel/authentication/start.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/centinel/validation/form.phtml b/app/design/adminhtml/default/default/template/centinel/validation/form.phtml index fe90e7d25..e874e161c 100644 --- a/app/design/adminhtml/default/default/template/centinel/validation/form.phtml +++ b/app/design/adminhtml/default/default/template/centinel/validation/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/cms/browser/content.phtml b/app/design/adminhtml/default/default/template/cms/browser/content.phtml index 68669ff47..5b87d45ad 100644 --- a/app/design/adminhtml/default/default/template/cms/browser/content.phtml +++ b/app/design/adminhtml/default/default/template/cms/browser/content.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/cms/browser/content/files.phtml b/app/design/adminhtml/default/default/template/cms/browser/content/files.phtml index 44f8b0aa9..6a0df762b 100644 --- a/app/design/adminhtml/default/default/template/cms/browser/content/files.phtml +++ b/app/design/adminhtml/default/default/template/cms/browser/content/files.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml b/app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml index eff1eeccb..f415fad84 100644 --- a/app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml +++ b/app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml b/app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml index 1cdaccc1b..ab705f792 100644 --- a/app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml +++ b/app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/cms/browser/js.phtml b/app/design/adminhtml/default/default/template/cms/browser/js.phtml index cf78d22eb..8eaa9fc37 100644 --- a/app/design/adminhtml/default/default/template/cms/browser/js.phtml +++ b/app/design/adminhtml/default/default/template/cms/browser/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/cms/browser/tree.phtml b/app/design/adminhtml/default/default/template/cms/browser/tree.phtml index c5cb4f011..58577d4d3 100644 --- a/app/design/adminhtml/default/default/template/cms/browser/tree.phtml +++ b/app/design/adminhtml/default/default/template/cms/browser/tree.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml b/app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml index 664a58153..599bd8513 100644 --- a/app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml +++ b/app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/coming.phtml b/app/design/adminhtml/default/default/template/coming.phtml index 7ffbed251..c20242749 100644 --- a/app/design/adminhtml/default/default/template/coming.phtml +++ b/app/design/adminhtml/default/default/template/coming.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/compiler/process.phtml b/app/design/adminhtml/default/default/template/compiler/process.phtml index fec59a6f9..1b68dd503 100644 --- a/app/design/adminhtml/default/default/template/compiler/process.phtml +++ b/app/design/adminhtml/default/default/template/compiler/process.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/connect/extension/custom/authors.phtml b/app/design/adminhtml/default/default/template/connect/extension/custom/authors.phtml index 6dec33a9f..251d17d36 100644 --- a/app/design/adminhtml/default/default/template/connect/extension/custom/authors.phtml +++ b/app/design/adminhtml/default/default/template/connect/extension/custom/authors.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/connect/extension/custom/contents.phtml b/app/design/adminhtml/default/default/template/connect/extension/custom/contents.phtml index 86c5c29f9..e63716b88 100644 --- a/app/design/adminhtml/default/default/template/connect/extension/custom/contents.phtml +++ b/app/design/adminhtml/default/default/template/connect/extension/custom/contents.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/connect/extension/custom/depends.phtml b/app/design/adminhtml/default/default/template/connect/extension/custom/depends.phtml index a348aa4a8..12a9bd78a 100644 --- a/app/design/adminhtml/default/default/template/connect/extension/custom/depends.phtml +++ b/app/design/adminhtml/default/default/template/connect/extension/custom/depends.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/connect/extension/custom/load.phtml b/app/design/adminhtml/default/default/template/connect/extension/custom/load.phtml index 30d5d666b..a73b7dee6 100644 --- a/app/design/adminhtml/default/default/template/connect/extension/custom/load.phtml +++ b/app/design/adminhtml/default/default/template/connect/extension/custom/load.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/connect/extension/custom/package.phtml b/app/design/adminhtml/default/default/template/connect/extension/custom/package.phtml index b9f82328a..dc8c5da7d 100644 --- a/app/design/adminhtml/default/default/template/connect/extension/custom/package.phtml +++ b/app/design/adminhtml/default/default/template/connect/extension/custom/package.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/connect/extension/custom/release.phtml b/app/design/adminhtml/default/default/template/connect/extension/custom/release.phtml index e1e18b9d9..603069df0 100644 --- a/app/design/adminhtml/default/default/template/connect/extension/custom/release.phtml +++ b/app/design/adminhtml/default/default/template/connect/extension/custom/release.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml b/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml index 8d36cb68e..530db3078 100644 --- a/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml +++ b/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/customer/edit/js.phtml b/app/design/adminhtml/default/default/template/customer/edit/js.phtml index e5434d754..00fe6a3cb 100644 --- a/app/design/adminhtml/default/default/template/customer/edit/js.phtml +++ b/app/design/adminhtml/default/default/template/customer/edit/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/customer/edit/tab/account/form/renderer/group.phtml b/app/design/adminhtml/default/default/template/customer/edit/tab/account/form/renderer/group.phtml index ae6396baa..0a7fbd016 100644 --- a/app/design/adminhtml/default/default/template/customer/edit/tab/account/form/renderer/group.phtml +++ b/app/design/adminhtml/default/default/template/customer/edit/tab/account/form/renderer/group.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml b/app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml index f9722d27a..cff4f71f5 100644 --- a/app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml +++ b/app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/customer/online.phtml b/app/design/adminhtml/default/default/template/customer/online.phtml index 90e885781..d433b8e0b 100644 --- a/app/design/adminhtml/default/default/template/customer/online.phtml +++ b/app/design/adminhtml/default/default/template/customer/online.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/customer/sales/order/create/address/form/renderer/vat.phtml b/app/design/adminhtml/default/default/template/customer/sales/order/create/address/form/renderer/vat.phtml index f32344dee..ff3bb5065 100644 --- a/app/design/adminhtml/default/default/template/customer/sales/order/create/address/form/renderer/vat.phtml +++ b/app/design/adminhtml/default/default/template/customer/sales/order/create/address/form/renderer/vat.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml b/app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml index 0df515bca..f1654e015 100644 --- a/app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml +++ b/app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml b/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml index 8c93f82ef..1978c6e0c 100644 --- a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml +++ b/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/customer/tab/cart.phtml b/app/design/adminhtml/default/default/template/customer/tab/cart.phtml index c0956e63b..fe0d69e5b 100644 --- a/app/design/adminhtml/default/default/template/customer/tab/cart.phtml +++ b/app/design/adminhtml/default/default/template/customer/tab/cart.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml b/app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml index e5591e663..2d3702b59 100644 --- a/app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml +++ b/app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/customer/tab/view.phtml b/app/design/adminhtml/default/default/template/customer/tab/view.phtml index 10d16dd12..16b5640df 100644 --- a/app/design/adminhtml/default/default/template/customer/tab/view.phtml +++ b/app/design/adminhtml/default/default/template/customer/tab/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml b/app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml index 4d4a9aabc..a65f5bff4 100644 --- a/app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml +++ b/app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml b/app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml index e012c1d0a..271b4eaa9 100644 --- a/app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml +++ b/app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/dashboard/graph.phtml b/app/design/adminhtml/default/default/template/dashboard/graph.phtml index 05bf5421f..cf0e8d2f6 100644 --- a/app/design/adminhtml/default/default/template/dashboard/graph.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/graph.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* diff --git a/app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml b/app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml index dbffb309d..9d6e04202 100644 --- a/app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/dashboard/grid.phtml b/app/design/adminhtml/default/default/template/dashboard/grid.phtml index 85377c625..a1bc9d749 100644 --- a/app/design/adminhtml/default/default/template/dashboard/grid.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/grid.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/dashboard/index.phtml b/app/design/adminhtml/default/default/template/dashboard/index.phtml index 521a6e2df..dbc8a5d31 100644 --- a/app/design/adminhtml/default/default/template/dashboard/index.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/index.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/dashboard/salebar.phtml b/app/design/adminhtml/default/default/template/dashboard/salebar.phtml index 9b4ce6ece..9972c5d2a 100644 --- a/app/design/adminhtml/default/default/template/dashboard/salebar.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/salebar.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/dashboard/searches.phtml b/app/design/adminhtml/default/default/template/dashboard/searches.phtml index 87cac58b0..6b7a034b3 100644 --- a/app/design/adminhtml/default/default/template/dashboard/searches.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/searches.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml b/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml index 0fea47141..ff60d8ad4 100644 --- a/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml b/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml index 88312443f..b085b9ec4 100644 --- a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml b/app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml index 1956f1bc0..482bb1336 100644 --- a/app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml +++ b/app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml index 9bca55730..962da7cf1 100644 --- a/app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml index b712537fe..0845a33cb 100644 --- a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml index 95fde732e..38263127c 100644 --- a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml index 7ce066b96..9142a2965 100644 --- a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml index 1ce699dc6..6d8ec6e83 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml index f8c9fcbda..ef5dacba0 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml index 90794b229..397e56e57 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml index f60d24d05..66a704010 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml index ac6b074c6..b97db6695 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml index 439c00fa2..895f00f3c 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml index 99f333dcb..8ff1cf3f8 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml index e9202aad2..4c665166f 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml b/app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml index 247a5dffb..b47fa7621 100644 --- a/app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml +++ b/app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/eav/attribute/options.phtml b/app/design/adminhtml/default/default/template/eav/attribute/options.phtml index 36dd7ce9e..65665c5fb 100644 --- a/app/design/adminhtml/default/default/template/eav/attribute/options.phtml +++ b/app/design/adminhtml/default/default/template/eav/attribute/options.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/email/order/items.phtml b/app/design/adminhtml/default/default/template/email/order/items.phtml index fce536878..9a42b9af4 100644 --- a/app/design/adminhtml/default/default/template/email/order/items.phtml +++ b/app/design/adminhtml/default/default/template/email/order/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/empty.phtml b/app/design/adminhtml/default/default/template/empty.phtml index 1caa035ac..b4be96e56 100644 --- a/app/design/adminhtml/default/default/template/empty.phtml +++ b/app/design/adminhtml/default/default/template/empty.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/example.phtml b/app/design/adminhtml/default/default/template/example.phtml index 0ebfee65e..ea102ed15 100644 --- a/app/design/adminhtml/default/default/template/example.phtml +++ b/app/design/adminhtml/default/default/template/example.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/forgotpassword.phtml b/app/design/adminhtml/default/default/template/forgotpassword.phtml index db69d91c3..1dd2c7c2f 100644 --- a/app/design/adminhtml/default/default/template/forgotpassword.phtml +++ b/app/design/adminhtml/default/default/template/forgotpassword.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/formkey.phtml b/app/design/adminhtml/default/default/template/formkey.phtml index 2a800cfaf..491e2f6a8 100644 --- a/app/design/adminhtml/default/default/template/formkey.phtml +++ b/app/design/adminhtml/default/default/template/formkey.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/giftmessage/form.phtml b/app/design/adminhtml/default/default/template/giftmessage/form.phtml index 418a9de74..1826001fb 100644 --- a/app/design/adminhtml/default/default/template/giftmessage/form.phtml +++ b/app/design/adminhtml/default/default/template/giftmessage/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml b/app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml index 421678622..074c21e7a 100644 --- a/app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml +++ b/app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/giftmessage/helper.phtml b/app/design/adminhtml/default/default/template/giftmessage/helper.phtml index 7e04e76cb..d611caae3 100644 --- a/app/design/adminhtml/default/default/template/giftmessage/helper.phtml +++ b/app/design/adminhtml/default/default/template/giftmessage/helper.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/giftmessage/popup.phtml b/app/design/adminhtml/default/default/template/giftmessage/popup.phtml index 82111e472..6414cf5ac 100644 --- a/app/design/adminhtml/default/default/template/giftmessage/popup.phtml +++ b/app/design/adminhtml/default/default/template/giftmessage/popup.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml b/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml index 63dcc8901..c8ef03bb2 100644 --- a/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml +++ b/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml b/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml index 6608e94b6..37f0441a5 100644 --- a/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml +++ b/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml b/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml index 51ff0bf7f..1e4bb7b61 100644 --- a/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml +++ b/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml b/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml index 2015458ea..89fb27319 100644 --- a/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml +++ b/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/googlebase/captcha.phtml b/app/design/adminhtml/default/default/template/googlebase/captcha.phtml index 98fbae5da..687a002a0 100644 --- a/app/design/adminhtml/default/default/template/googlebase/captcha.phtml +++ b/app/design/adminhtml/default/default/template/googlebase/captcha.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/googlebase/items.phtml b/app/design/adminhtml/default/default/template/googlebase/items.phtml index cb9618fd5..5a27cde37 100644 --- a/app/design/adminhtml/default/default/template/googlebase/items.phtml +++ b/app/design/adminhtml/default/default/template/googlebase/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml b/app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml index 32372c6c0..d4cd3af18 100644 --- a/app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml +++ b/app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/importexport/busy.phtml b/app/design/adminhtml/default/default/template/importexport/busy.phtml index 1cf62533d..878346d6d 100644 --- a/app/design/adminhtml/default/default/template/importexport/busy.phtml +++ b/app/design/adminhtml/default/default/template/importexport/busy.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/importexport/export/form/after.phtml b/app/design/adminhtml/default/default/template/importexport/export/form/after.phtml index acfea75be..a86eaae91 100644 --- a/app/design/adminhtml/default/default/template/importexport/export/form/after.phtml +++ b/app/design/adminhtml/default/default/template/importexport/export/form/after.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/importexport/export/form/before.phtml b/app/design/adminhtml/default/default/template/importexport/export/form/before.phtml index 26fe8f525..98f425575 100644 --- a/app/design/adminhtml/default/default/template/importexport/export/form/before.phtml +++ b/app/design/adminhtml/default/default/template/importexport/export/form/before.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/importexport/import/form/after.phtml b/app/design/adminhtml/default/default/template/importexport/import/form/after.phtml index 469b4c009..ae225631a 100644 --- a/app/design/adminhtml/default/default/template/importexport/import/form/after.phtml +++ b/app/design/adminhtml/default/default/template/importexport/import/form/after.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/importexport/import/form/before.phtml b/app/design/adminhtml/default/default/template/importexport/import/form/before.phtml index 964051aa9..ff271c8f6 100644 --- a/app/design/adminhtml/default/default/template/importexport/import/form/before.phtml +++ b/app/design/adminhtml/default/default/template/importexport/import/form/before.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml b/app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml index 009844093..ea283611f 100644 --- a/app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml +++ b/app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/index/notifications.phtml b/app/design/adminhtml/default/default/template/index/notifications.phtml index 44984f15c..31f0e8a38 100644 --- a/app/design/adminhtml/default/default/template/index/notifications.phtml +++ b/app/design/adminhtml/default/default/template/index/notifications.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/login.phtml b/app/design/adminhtml/default/default/template/login.phtml index 4fac88eaa..03e6ebb90 100644 --- a/app/design/adminhtml/default/default/template/login.phtml +++ b/app/design/adminhtml/default/default/template/login.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/media/editor.phtml b/app/design/adminhtml/default/default/template/media/editor.phtml index 4da2c59c3..b9c7b2d53 100644 --- a/app/design/adminhtml/default/default/template/media/editor.phtml +++ b/app/design/adminhtml/default/default/template/media/editor.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/media/uploader.phtml b/app/design/adminhtml/default/default/template/media/uploader.phtml index 074f6c772..fbd98b9ec 100644 --- a/app/design/adminhtml/default/default/template/media/uploader.phtml +++ b/app/design/adminhtml/default/default/template/media/uploader.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/moneybookers/info.phtml b/app/design/adminhtml/default/default/template/moneybookers/info.phtml index 59000d37e..eae427635 100644 --- a/app/design/adminhtml/default/default/template/moneybookers/info.phtml +++ b/app/design/adminhtml/default/default/template/moneybookers/info.phtml @@ -14,7 +14,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/moneybookers/jsinit.phtml b/app/design/adminhtml/default/default/template/moneybookers/jsinit.phtml index 3557ea02c..1a239fe45 100644 --- a/app/design/adminhtml/default/default/template/moneybookers/jsinit.phtml +++ b/app/design/adminhtml/default/default/template/moneybookers/jsinit.phtml @@ -14,7 +14,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/moneybookers/pdf/info.phtml b/app/design/adminhtml/default/default/template/moneybookers/pdf/info.phtml index 782642e53..13fa4c2ef 100644 --- a/app/design/adminhtml/default/default/template/moneybookers/pdf/info.phtml +++ b/app/design/adminhtml/default/default/template/moneybookers/pdf/info.phtml @@ -14,7 +14,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml b/app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml index 887e12426..51d0380ed 100644 --- a/app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/newsletter/preview/store.phtml b/app/design/adminhtml/default/default/template/newsletter/preview/store.phtml index 8d9abfe0d..00e4f19e5 100644 --- a/app/design/adminhtml/default/default/template/newsletter/preview/store.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/preview/store.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/newsletter/problem/list.phtml b/app/design/adminhtml/default/default/template/newsletter/problem/list.phtml index ab050126b..e25d75c63 100644 --- a/app/design/adminhtml/default/default/template/newsletter/problem/list.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/problem/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml b/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml index a9b3e796c..ce9ed84f9 100644 --- a/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Adminhtml_Block_Newsletter_Queue_Edit */ diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml b/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml index 69a81345a..312d68d83 100644 --- a/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml b/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml index 1ce0c2660..2ecfdd4de 100644 --- a/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml b/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml index d7b638564..8512c4d4a 100644 --- a/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml b/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml index e1b754db3..03f191023 100644 --- a/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Adminhtml_Block_Newsletter_Template_Edit */ diff --git a/app/design/adminhtml/default/default/template/newsletter/template/list.phtml b/app/design/adminhtml/default/default/template/newsletter/template/list.phtml index 042e9db09..d98bb531a 100644 --- a/app/design/adminhtml/default/default/template/newsletter/template/list.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/template/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml b/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml index 1ce0c2660..2ecfdd4de 100644 --- a/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/notification/baseurl.phtml b/app/design/adminhtml/default/default/template/notification/baseurl.phtml index 3f6173f71..6909ef857 100644 --- a/app/design/adminhtml/default/default/template/notification/baseurl.phtml +++ b/app/design/adminhtml/default/default/template/notification/baseurl.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/adminhtml/default/default/template/notification/security.phtml b/app/design/adminhtml/default/default/template/notification/security.phtml index b9cca3411..32f9ad071 100644 --- a/app/design/adminhtml/default/default/template/notification/security.phtml +++ b/app/design/adminhtml/default/default/template/notification/security.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/adminhtml/default/default/template/notification/survey.phtml b/app/design/adminhtml/default/default/template/notification/survey.phtml index e97fe9f9f..9a5e3b48e 100644 --- a/app/design/adminhtml/default/default/template/notification/survey.phtml +++ b/app/design/adminhtml/default/default/template/notification/survey.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/notification/toolbar.phtml b/app/design/adminhtml/default/default/template/notification/toolbar.phtml index 3189be1d2..c0b48ab2c 100644 --- a/app/design/adminhtml/default/default/template/notification/toolbar.phtml +++ b/app/design/adminhtml/default/default/template/notification/toolbar.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/notification/window.phtml b/app/design/adminhtml/default/default/template/notification/window.phtml index 546e4c4af..165b62f78 100644 --- a/app/design/adminhtml/default/default/template/notification/window.phtml +++ b/app/design/adminhtml/default/default/template/notification/window.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml index 980afdf9a..1142ad38c 100644 --- a/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml +++ b/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml index f2139956f..20b7b8646 100644 --- a/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml +++ b/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml index 71fd6833e..93c1c010e 100644 --- a/app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml +++ b/app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml index 70ea41c6a..460a43afd 100644 --- a/app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml +++ b/app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml index 398124940..58dcf8f0d 100644 --- a/app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml +++ b/app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml index ec47c41ad..85e3097f0 100644 --- a/app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml +++ b/app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml index d6bfdff6f..2d3d34c88 100644 --- a/app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml +++ b/app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml index 1ee5cd0be..154cb5609 100644 --- a/app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml +++ b/app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml index 65a7b76ce..de94a4b65 100644 --- a/app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml +++ b/app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/overlay_popup.phtml b/app/design/adminhtml/default/default/template/overlay_popup.phtml index 3a25b8742..693e4f5b8 100644 --- a/app/design/adminhtml/default/default/template/overlay_popup.phtml +++ b/app/design/adminhtml/default/default/template/overlay_popup.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/page.phtml b/app/design/adminhtml/default/default/template/page.phtml index 37d4fc422..e93ad3231 100644 --- a/app/design/adminhtml/default/default/template/page.phtml +++ b/app/design/adminhtml/default/default/template/page.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/page/footer.phtml b/app/design/adminhtml/default/default/template/page/footer.phtml index 98f3cf673..2d6877595 100644 --- a/app/design/adminhtml/default/default/template/page/footer.phtml +++ b/app/design/adminhtml/default/default/template/page/footer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -29,7 +29,7 @@ __('Interface Locale: %s', $this->getLanguageSelect()) ?>

- __('Connect with the Magento Community') ?>
+ __('Connect with the Magento Community') ?>
   __('Magento™ is a trademark of Magento Inc.
Copyright © %s Magento Inc.', date('Y')) ?>

diff --git a/app/design/adminhtml/default/default/template/page/header.phtml b/app/design/adminhtml/default/default/template/page/header.phtml index c514d5de2..eca66f432 100644 --- a/app/design/adminhtml/default/default/template/page/header.phtml +++ b/app/design/adminhtml/default/default/template/page/header.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/page/js/calendar.phtml b/app/design/adminhtml/default/default/template/page/js/calendar.phtml index 570b69d35..fd6c2f06e 100644 --- a/app/design/adminhtml/default/default/template/page/js/calendar.phtml +++ b/app/design/adminhtml/default/default/template/page/js/calendar.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ // no notice of license for now diff --git a/app/design/adminhtml/default/default/template/page/js/translate.phtml b/app/design/adminhtml/default/default/template/page/js/translate.phtml index cd20cb28b..5ac6935aa 100644 --- a/app/design/adminhtml/default/default/template/page/js/translate.phtml +++ b/app/design/adminhtml/default/default/template/page/js/translate.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/page/menu.phtml b/app/design/adminhtml/default/default/template/page/menu.phtml index 7233d59c5..206ebddc6 100644 --- a/app/design/adminhtml/default/default/template/page/menu.phtml +++ b/app/design/adminhtml/default/default/template/page/menu.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/page/notices.phtml b/app/design/adminhtml/default/default/template/page/notices.phtml index 3a8a2e6fd..542f45a6e 100644 --- a/app/design/adminhtml/default/default/template/page/notices.phtml +++ b/app/design/adminhtml/default/default/template/page/notices.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml b/app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml index 04e37269a..79328d6b6 100644 --- a/app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml +++ b/app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/paygate/form/cc.phtml b/app/design/adminhtml/default/default/template/paygate/form/cc.phtml index fadf6153f..5a6bd0cf3 100644 --- a/app/design/adminhtml/default/default/template/paygate/form/cc.phtml +++ b/app/design/adminhtml/default/default/template/paygate/form/cc.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/paygate/info/cc.phtml b/app/design/adminhtml/default/default/template/paygate/info/cc.phtml index 98a0592fa..a16f806cf 100644 --- a/app/design/adminhtml/default/default/template/paygate/info/cc.phtml +++ b/app/design/adminhtml/default/default/template/paygate/info/cc.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml b/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml index aade5f260..49c87399a 100644 --- a/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml +++ b/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml b/app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml index 7651a4732..0d0f48f0f 100644 --- a/app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml b/app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml index ac3f752e6..96998baef 100644 --- a/app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/payment/form/cc.phtml b/app/design/adminhtml/default/default/template/payment/form/cc.phtml index 8b274aee7..1a426373e 100644 --- a/app/design/adminhtml/default/default/template/payment/form/cc.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/cc.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml b/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml index efb004060..3e8b20072 100644 --- a/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml b/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml index 227c0494d..28214f2d8 100644 --- a/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml b/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml index d1b3352a3..898f7f22a 100644 --- a/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/banktransfer.phtml b/app/design/adminhtml/default/default/template/payment/info/banktransfer.phtml index 019dc6a0a..90e66d1f7 100644 --- a/app/design/adminhtml/default/default/template/payment/info/banktransfer.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/banktransfer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml b/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml index c70b888e8..cbb516c41 100644 --- a/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/default.phtml b/app/design/adminhtml/default/default/template/payment/info/default.phtml index 59e333d4f..d10a91a2f 100644 --- a/app/design/adminhtml/default/default/template/payment/info/default.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml index 138d3d832..e10f5ee23 100644 --- a/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml index 09908b2a7..4244d88ac 100644 --- a/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml index cd0088c46..d196f611b 100644 --- a/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml b/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml index ec554f9d0..37a235cf7 100644 --- a/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml b/app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml index 5a364a5ef..d42cb0c7c 100644 --- a/app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml +++ b/app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/bml_api_wizard.phtml b/app/design/adminhtml/default/default/template/paypal/system/config/bml_api_wizard.phtml deleted file mode 100644 index 5bb2194bb..000000000 --- a/app/design/adminhtml/default/default/template/paypal/system/config/bml_api_wizard.phtml +++ /dev/null @@ -1,36 +0,0 @@ - - -
- -
diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml b/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml index f47641f74..0b00fad8e 100644 --- a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml +++ b/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/hint.phtml b/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/hint.phtml index 4d5786f3e..65fdf387a 100644 --- a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/hint.phtml +++ b/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/hint.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/store.phtml b/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/store.phtml index e53332f1c..200833e3e 100644 --- a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/store.phtml +++ b/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/store.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/advanced.phtml b/app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/advanced.phtml index cd1bc0a3d..8df11fddc 100644 --- a/app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/advanced.phtml +++ b/app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/advanced.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/info.phtml b/app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/info.phtml index ce06e9d2e..702287d2d 100644 --- a/app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/info.phtml +++ b/app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml b/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml index 091c7ad21..1e6091e6a 100644 --- a/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml +++ b/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/permissions/roles.phtml b/app/design/adminhtml/default/default/template/permissions/roles.phtml index 5a190181f..8e7d0824e 100644 --- a/app/design/adminhtml/default/default/template/permissions/roles.phtml +++ b/app/design/adminhtml/default/default/template/permissions/roles.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml b/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml index 1537d8287..553e3f0e2 100644 --- a/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml +++ b/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml b/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml index 0452ffe3b..a739f43c6 100644 --- a/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml +++ b/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/permissions/userinfo.phtml b/app/design/adminhtml/default/default/template/permissions/userinfo.phtml index 646847f05..0b813bd34 100644 --- a/app/design/adminhtml/default/default/template/permissions/userinfo.phtml +++ b/app/design/adminhtml/default/default/template/permissions/userinfo.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/permissions/usernroles.phtml b/app/design/adminhtml/default/default/template/permissions/usernroles.phtml index c91747968..8ef5c299e 100644 --- a/app/design/adminhtml/default/default/template/permissions/usernroles.phtml +++ b/app/design/adminhtml/default/default/template/permissions/usernroles.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/permissions/userroles.phtml b/app/design/adminhtml/default/default/template/permissions/userroles.phtml index 21e21acfd..5baae1be4 100644 --- a/app/design/adminhtml/default/default/template/permissions/userroles.phtml +++ b/app/design/adminhtml/default/default/template/permissions/userroles.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/permissions/users.phtml b/app/design/adminhtml/default/default/template/permissions/users.phtml index 68a2bd1cb..14cae6e21 100644 --- a/app/design/adminhtml/default/default/template/permissions/users.phtml +++ b/app/design/adminhtml/default/default/template/permissions/users.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/poll/answers/list.phtml b/app/design/adminhtml/default/default/template/poll/answers/list.phtml index df0d38aa1..51f618776 100644 --- a/app/design/adminhtml/default/default/template/poll/answers/list.phtml +++ b/app/design/adminhtml/default/default/template/poll/answers/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/popup.phtml b/app/design/adminhtml/default/default/template/popup.phtml index d2de44344..d96147e2f 100644 --- a/app/design/adminhtml/default/default/template/popup.phtml +++ b/app/design/adminhtml/default/default/template/popup.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/promo/fieldset.phtml b/app/design/adminhtml/default/default/template/promo/fieldset.phtml index bb04ae84c..da4d76b26 100644 --- a/app/design/adminhtml/default/default/template/promo/fieldset.phtml +++ b/app/design/adminhtml/default/default/template/promo/fieldset.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/promo/form.phtml b/app/design/adminhtml/default/default/template/promo/form.phtml index 62e774281..bdb3c57e9 100644 --- a/app/design/adminhtml/default/default/template/promo/form.phtml +++ b/app/design/adminhtml/default/default/template/promo/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/promo/js.phtml b/app/design/adminhtml/default/default/template/promo/js.phtml index 01cb5d1bb..5371d6a65 100644 --- a/app/design/adminhtml/default/default/template/promo/js.phtml +++ b/app/design/adminhtml/default/default/template/promo/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/promo/salesrulejs.phtml b/app/design/adminhtml/default/default/template/promo/salesrulejs.phtml index 03efbfe09..69ad135ea 100644 --- a/app/design/adminhtml/default/default/template/promo/salesrulejs.phtml +++ b/app/design/adminhtml/default/default/template/promo/salesrulejs.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/rating/detailed.phtml b/app/design/adminhtml/default/default/template/rating/detailed.phtml index 915d034d9..eb27c6e86 100644 --- a/app/design/adminhtml/default/default/template/rating/detailed.phtml +++ b/app/design/adminhtml/default/default/template/rating/detailed.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/rating/options.phtml b/app/design/adminhtml/default/default/template/rating/options.phtml index ddbaae7e2..588a4d5b5 100644 --- a/app/design/adminhtml/default/default/template/rating/options.phtml +++ b/app/design/adminhtml/default/default/template/rating/options.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml b/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml index 6ef7dd9cc..c4f06937c 100644 --- a/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml +++ b/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/rating/stars/summary.phtml b/app/design/adminhtml/default/default/template/rating/stars/summary.phtml index 8140455f9..b11f96013 100644 --- a/app/design/adminhtml/default/default/template/rating/stars/summary.phtml +++ b/app/design/adminhtml/default/default/template/rating/stars/summary.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/report/grid.phtml b/app/design/adminhtml/default/default/template/report/grid.phtml index de7e30916..94f49cb49 100644 --- a/app/design/adminhtml/default/default/template/report/grid.phtml +++ b/app/design/adminhtml/default/default/template/report/grid.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/report/grid/container.phtml b/app/design/adminhtml/default/default/template/report/grid/container.phtml index 70f97a051..7ecb1c565 100644 --- a/app/design/adminhtml/default/default/template/report/grid/container.phtml +++ b/app/design/adminhtml/default/default/template/report/grid/container.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/report/refresh/statistics.phtml b/app/design/adminhtml/default/default/template/report/refresh/statistics.phtml index f56b7b1da..a8e035a03 100644 --- a/app/design/adminhtml/default/default/template/report/refresh/statistics.phtml +++ b/app/design/adminhtml/default/default/template/report/refresh/statistics.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/report/store/switcher.phtml b/app/design/adminhtml/default/default/template/report/store/switcher.phtml index c5b1f8804..d4e84c8e8 100644 --- a/app/design/adminhtml/default/default/template/report/store/switcher.phtml +++ b/app/design/adminhtml/default/default/template/report/store/switcher.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/report/store/switcher/enhanced.phtml b/app/design/adminhtml/default/default/template/report/store/switcher/enhanced.phtml index 316e9a25f..03f467340 100644 --- a/app/design/adminhtml/default/default/template/report/store/switcher/enhanced.phtml +++ b/app/design/adminhtml/default/default/template/report/store/switcher/enhanced.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/report/wishlist.phtml b/app/design/adminhtml/default/default/template/report/wishlist.phtml index 4653aab84..ba76a6ccf 100644 --- a/app/design/adminhtml/default/default/template/report/wishlist.phtml +++ b/app/design/adminhtml/default/default/template/report/wishlist.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml b/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml index b08b79f22..e3152b5e3 100644 --- a/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml +++ b/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/review/add.phtml b/app/design/adminhtml/default/default/template/review/add.phtml index 72eefc521..e71cc212b 100644 --- a/app/design/adminhtml/default/default/template/review/add.phtml +++ b/app/design/adminhtml/default/default/template/review/add.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml b/app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml index 0a9b95dbb..c783b622a 100644 --- a/app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/billing/agreement/view/form.phtml b/app/design/adminhtml/default/default/template/sales/billing/agreement/view/form.phtml index 1b423b184..c2ea414e3 100644 --- a/app/design/adminhtml/default/default/template/sales/billing/agreement/view/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/billing/agreement/view/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/billing/agreement/view/tab/info.phtml b/app/design/adminhtml/default/default/template/sales/billing/agreement/view/tab/info.phtml index 668bd0269..0780da473 100644 --- a/app/design/adminhtml/default/default/template/sales/billing/agreement/view/tab/info.phtml +++ b/app/design/adminhtml/default/default/template/sales/billing/agreement/view/tab/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/items/column/name.phtml b/app/design/adminhtml/default/default/template/sales/items/column/name.phtml index c65debf4b..47e076285 100644 --- a/app/design/adminhtml/default/default/template/sales/items/column/name.phtml +++ b/app/design/adminhtml/default/default/template/sales/items/column/name.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml b/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml index 43bde2384..5cfaa717e 100644 --- a/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml +++ b/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml index 2e8164cd3..fa173786d 100644 --- a/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/address/form.phtml b/app/design/adminhtml/default/default/template/sales/order/address/form.phtml index 4d67a7981..683a25364 100644 --- a/app/design/adminhtml/default/default/template/sales/order/address/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/address/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml b/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml index b7960212e..7fa17f1ac 100644 --- a/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml b/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml index e46bd1a75..f7606a0c6 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml index 0a69b5702..4e4c79803 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml b/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml index dd478e9dc..d0a5952a1 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml index 0f0a55446..e6277d3bd 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/data.phtml b/app/design/adminhtml/default/default/template/sales/order/create/data.phtml index 468ac9f87..43881948e 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/data.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/data.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/form.phtml index 3037f156c..6bf770694 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml b/app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml index 37ec26666..fa05579e3 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml b/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml index d5d8cf397..f4f1949b5 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ if($this->getIsShipping()): diff --git a/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml b/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml index f41152bd1..385e668d8 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items.phtml b/app/design/adminhtml/default/default/template/sales/order/create/items.phtml index d70ee4fbd..409bf520a 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml index 0d3f5ea02..ce0672590 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/js.phtml b/app/design/adminhtml/default/default/template/sales/order/create/js.phtml index f0b192f94..7ec88cc50 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/js.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml index afbb9d565..c0b56f751 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml index 8a797a689..53340701d 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml b/app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml index b3b236335..89dcfd8de 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml b/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml index 6eaf18bbe..d45a23cb1 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml b/app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml index f6a435ced..79b7d157a 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals.phtml b/app/design/adminhtml/default/default/template/sales/order/create/totals.phtml index 1708332b7..1209185d6 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/totals.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/totals.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml b/app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml index fe70aa9ba..b7bcbcd42 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/grandtotal.phtml b/app/design/adminhtml/default/default/template/sales/order/create/totals/grandtotal.phtml index 1f49ae8b6..f99f1cc4f 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/totals/grandtotal.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/totals/grandtotal.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml b/app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml index 0cfad61ba..44bcc700a 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/subtotal.phtml b/app/design/adminhtml/default/default/template/sales/order/create/totals/subtotal.phtml index eba7637e5..0532bc873 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/totals/subtotal.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/totals/subtotal.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml b/app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml index 1e6920d83..73841ace8 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml index 98f5fbace..d35528f51 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml index 2651460fe..0bd2765fa 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml index d5fd58ce2..3dce5984b 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml index c13b10714..d4b8cd9f8 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -238,8 +238,8 @@ displayPriceAttribute('discount_amount') ?> displayPrices( - $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + Mage::helper('weee')->getBaseRowWeeeAmountAfterDiscount($_item) - $_item->getBaseDiscountAmount(), - $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + Mage::helper('weee')->getRowWeeeAmountAfterDiscount($_item) - $_item->getDiscountAmount() + $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount() - $_item->getBaseDiscountAmount(), + $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() - $_item->getDiscountAmount() ) ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml index 297faad7d..2c0fa29ef 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml index cbdec5316..6cf31323c 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml index 8764892a0..7c2ef7b05 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml index 62e465c56..1b7613b58 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml index 2873cbc7c..ac269dab2 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -240,8 +240,8 @@ displayPriceAttribute('discount_amount') ?> displayPrices( - $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + Mage::helper('weee')->getBaseRowWeeeAmountAfterDiscount($_item) - $_item->getBaseDiscountAmount(), - $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + Mage::helper('weee')->getRowWeeeAmountAfterDiscount($_item) - $_item->getDiscountAmount() + $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount() - $_item->getBaseDiscountAmount(), + $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() - $_item->getDiscountAmount() ) ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/giftoptions.phtml b/app/design/adminhtml/default/default/template/sales/order/giftoptions.phtml index 705e91e40..e07efa95f 100644 --- a/app/design/adminhtml/default/default/template/sales/order/giftoptions.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/giftoptions.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml index 4aff5e0f5..94b5505ff 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml index d4b513f93..7ddce1713 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml index 929c991a4..b4e1039f2 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml index dbae41968..d090d6fec 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -233,8 +233,8 @@ displayPriceAttribute('discount_amount') ?> displayPrices( - $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + Mage::helper('weee')->getBaseRowWeeeAmountAfterDiscount($_item) - $_item->getBaseDiscountAmount(), - $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + Mage::helper('weee')->getRowWeeeAmountAfterDiscount($_item) - $_item->getDiscountAmount() + $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount() - $_item->getBaseDiscountAmount(), + $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() - $_item->getDiscountAmount() ) ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml index b7b1deb8d..c9c30d82a 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/form.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/view/form.phtml index 2bb1d8abc..5577f0a2b 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/view/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/view/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/view/items.phtml index ef9f28ed4..365ae4d44 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/view/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml index 4a8beffec..6a966770b 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml index ca8ec960a..2ceaa83ec 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -226,8 +226,8 @@ displayPriceAttribute('discount_amount') ?> displayPrices( - $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + Mage::helper('weee')->getBaseRowWeeeAmountAfterDiscount($_item) - $_item->getBaseDiscountAmount(), - $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + Mage::helper('weee')->getRowWeeeAmountAfterDiscount($_item) - $_item->getDiscountAmount() + $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount() - $_item->getBaseDiscountAmount(), + $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() - $_item->getDiscountAmount() ) ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/form.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/create/form.phtml index 6102280eb..938012048 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/create/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/create/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml index 6ac73c4cf..fc3374343 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml index 8964fe850..7487026aa 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml index fa916db59..bc6fc0e2b 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/tracking.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/create/tracking.phtml index e7d498462..40235f1c0 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/create/tracking.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/create/tracking.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml index 692fc37c2..9abf49419 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml index 15da77bbf..8dba6057f 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml index 5c3c670b5..31f9e264f 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml index 8f29b1f6a..57f756ee1 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml index e5f8e94e7..15845a70b 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml index e9dbeb7ad..901895a1d 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml index db08aef07..2b2bb85eb 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml index 8c3b69055..cc77f551b 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml index b96c7355a..0d3c52ce8 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml b/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml index 0a8d06482..fd74b8c2e 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals.phtml b/app/design/adminhtml/default/default/template/sales/order/totals.phtml index 5d6ce7a01..20acf437e 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml index 55a82eb6d..d86cf3183 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/due.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/due.phtml index e2d0cfc9f..41f8b7cf1 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/due.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/due.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml index d178da03e..0fca1063a 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml index fa2dead00..5b9f268d9 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml index 3ec999b97..2ccb7291c 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/main.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/main.phtml index 104816f9e..41baa714b 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/main.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/main.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml index d34cebc93..1eac3f097 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml index 5b208dd80..6c771eed8 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml index 1daca4e30..42e668bd3 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml index c1a5e2512..f855d0ca7 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml index df66016d2..0a300b688 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var $this Mage_Adminhtml_Block_Sales_Order_Totals_Tax */ diff --git a/app/design/adminhtml/default/default/template/sales/order/view/form.phtml b/app/design/adminhtml/default/default/template/sales/order/view/form.phtml index 9500d4a7d..1dc65c418 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml b/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml index a56bf585c..2f53c5fde 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/view/history.phtml b/app/design/adminhtml/default/default/template/sales/order/view/history.phtml index f434bc6d6..43e35f873 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/history.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/history.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml index f114fc380..e53af3dd5 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/view/items.phtml b/app/design/adminhtml/default/default/template/sales/order/view/items.phtml index 1edccd524..39fed9901 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml index 6d5340766..b7699094a 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -239,8 +239,8 @@ displayPriceAttribute('discount_amount') ?> displayPrices( - $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + Mage::helper('weee')->getBaseRowWeeeAmountAfterDiscount($_item) - $_item->getBaseDiscountAmount(), - $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + Mage::helper('weee')->getRowWeeeAmountAfterDiscount($_item) - $_item->getDiscountAmount() + $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount() - $_item->getBaseDiscountAmount(), + $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() - $_item->getDiscountAmount() ); ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml index 1f1c90185..86850c266 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml index 5d9392167..92df4cfa4 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml index 5caa5ccee..21183fb7a 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/payment/form/billing/agreement.phtml b/app/design/adminhtml/default/default/template/sales/payment/form/billing/agreement.phtml index 69725ee4a..ac27f41ee 100644 --- a/app/design/adminhtml/default/default/template/sales/payment/form/billing/agreement.phtml +++ b/app/design/adminhtml/default/default/template/sales/payment/form/billing/agreement.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/recurring/profile/view.phtml b/app/design/adminhtml/default/default/template/sales/recurring/profile/view.phtml index 0a166f937..5140dae25 100644 --- a/app/design/adminhtml/default/default/template/sales/recurring/profile/view.phtml +++ b/app/design/adminhtml/default/default/template/sales/recurring/profile/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/recurring/profile/view/info.phtml b/app/design/adminhtml/default/default/template/sales/recurring/profile/view/info.phtml index 30a82d59c..a5e656ec1 100644 --- a/app/design/adminhtml/default/default/template/sales/recurring/profile/view/info.phtml +++ b/app/design/adminhtml/default/default/template/sales/recurring/profile/view/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/transactions/detail.phtml b/app/design/adminhtml/default/default/template/sales/transactions/detail.phtml index 34145ba79..7fbf2b4a1 100644 --- a/app/design/adminhtml/default/default/template/sales/transactions/detail.phtml +++ b/app/design/adminhtml/default/default/template/sales/transactions/detail.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/store/switcher.phtml b/app/design/adminhtml/default/default/template/store/switcher.phtml index e4b2d2314..c6a8cb45c 100644 --- a/app/design/adminhtml/default/default/template/store/switcher.phtml +++ b/app/design/adminhtml/default/default/template/store/switcher.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml b/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml index 8e585dde2..4177f050e 100644 --- a/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml +++ b/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml b/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml index 658a2f0da..5747264a7 100644 --- a/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml +++ b/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml b/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml index db490b51c..40950a6c1 100644 --- a/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml +++ b/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/autocomplete.phtml b/app/design/adminhtml/default/default/template/system/autocomplete.phtml index 8ee363009..260c6c85c 100644 --- a/app/design/adminhtml/default/default/template/system/autocomplete.phtml +++ b/app/design/adminhtml/default/default/template/system/autocomplete.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/cache/additional.phtml b/app/design/adminhtml/default/default/template/system/cache/additional.phtml index f332be918..e054c257c 100644 --- a/app/design/adminhtml/default/default/template/system/cache/additional.phtml +++ b/app/design/adminhtml/default/default/template/system/cache/additional.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/cache/edit.phtml b/app/design/adminhtml/default/default/template/system/cache/edit.phtml index d26426d71..344c58f87 100644 --- a/app/design/adminhtml/default/default/template/system/cache/edit.phtml +++ b/app/design/adminhtml/default/default/template/system/cache/edit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/cache/notifications.phtml b/app/design/adminhtml/default/default/template/system/cache/notifications.phtml index 877e21167..85b1f987f 100644 --- a/app/design/adminhtml/default/default/template/system/cache/notifications.phtml +++ b/app/design/adminhtml/default/default/template/system/cache/notifications.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/config/edit.phtml b/app/design/adminhtml/default/default/template/system/config/edit.phtml index 553d52007..5b9fb8e28 100644 --- a/app/design/adminhtml/default/default/template/system/config/edit.phtml +++ b/app/design/adminhtml/default/default/template/system/config/edit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/config/form/field/array.phtml b/app/design/adminhtml/default/default/template/system/config/form/field/array.phtml index d53ece3f6..d19213528 100644 --- a/app/design/adminhtml/default/default/template/system/config/form/field/array.phtml +++ b/app/design/adminhtml/default/default/template/system/config/form/field/array.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/config/js.phtml b/app/design/adminhtml/default/default/template/system/config/js.phtml index 99874b9c5..7b6a94788 100644 --- a/app/design/adminhtml/default/default/template/system/config/js.phtml +++ b/app/design/adminhtml/default/default/template/system/config/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/config/switcher.phtml b/app/design/adminhtml/default/default/template/system/config/switcher.phtml index 6b23592bc..365d54349 100644 --- a/app/design/adminhtml/default/default/template/system/config/switcher.phtml +++ b/app/design/adminhtml/default/default/template/system/config/switcher.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Core_Block_Template */ ?> diff --git a/app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml b/app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml index 3e314ae5a..c8befd267 100644 --- a/app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml +++ b/app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/config/tabs.phtml b/app/design/adminhtml/default/default/template/system/config/tabs.phtml index bde953ea5..674ea2536 100644 --- a/app/design/adminhtml/default/default/template/system/config/tabs.phtml +++ b/app/design/adminhtml/default/default/template/system/config/tabs.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/process.phtml b/app/design/adminhtml/default/default/template/system/convert/profile/process.phtml index 471f8a81d..e3dd15f17 100644 --- a/app/design/adminhtml/default/default/template/system/convert/profile/process.phtml +++ b/app/design/adminhtml/default/default/template/system/convert/profile/process.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml b/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml index ae56ec627..ccd680399 100644 --- a/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml +++ b/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml b/app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml index eb240cd9b..57e7dfd20 100644 --- a/app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml +++ b/app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/currency/rate/services.phtml b/app/design/adminhtml/default/default/template/system/currency/rate/services.phtml index 70c4eebaa..df76a799d 100644 --- a/app/design/adminhtml/default/default/template/system/currency/rate/services.phtml +++ b/app/design/adminhtml/default/default/template/system/currency/rate/services.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/currency/rates.phtml b/app/design/adminhtml/default/default/template/system/currency/rates.phtml index 9842447f8..620b8b7ca 100644 --- a/app/design/adminhtml/default/default/template/system/currency/rates.phtml +++ b/app/design/adminhtml/default/default/template/system/currency/rates.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/design/edit.phtml b/app/design/adminhtml/default/default/template/system/design/edit.phtml index 99fc99c05..2f3a39f3f 100644 --- a/app/design/adminhtml/default/default/template/system/design/edit.phtml +++ b/app/design/adminhtml/default/default/template/system/design/edit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/design/index.phtml b/app/design/adminhtml/default/default/template/system/design/index.phtml index 9cde795cc..43c52b596 100644 --- a/app/design/adminhtml/default/default/template/system/design/index.phtml +++ b/app/design/adminhtml/default/default/template/system/design/index.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/email/template/edit.phtml b/app/design/adminhtml/default/default/template/system/email/template/edit.phtml index e34ceb914..7c042ac38 100644 --- a/app/design/adminhtml/default/default/template/system/email/template/edit.phtml +++ b/app/design/adminhtml/default/default/template/system/email/template/edit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/email/template/list.phtml b/app/design/adminhtml/default/default/template/system/email/template/list.phtml index 49449a17c..66d24e462 100644 --- a/app/design/adminhtml/default/default/template/system/email/template/list.phtml +++ b/app/design/adminhtml/default/default/template/system/email/template/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/email/template/preview.phtml b/app/design/adminhtml/default/default/template/system/email/template/preview.phtml index 75377934f..ac00f818a 100644 --- a/app/design/adminhtml/default/default/template/system/email/template/preview.phtml +++ b/app/design/adminhtml/default/default/template/system/email/template/preview.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/info.phtml b/app/design/adminhtml/default/default/template/system/info.phtml index 53d536bb1..7c760156c 100644 --- a/app/design/adminhtml/default/default/template/system/info.phtml +++ b/app/design/adminhtml/default/default/template/system/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml b/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml index 95e2911ef..c74c36a8a 100644 --- a/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml +++ b/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/shipping/ups.phtml b/app/design/adminhtml/default/default/template/system/shipping/ups.phtml index aab6a9011..4432060d6 100644 --- a/app/design/adminhtml/default/default/template/system/shipping/ups.phtml +++ b/app/design/adminhtml/default/default/template/system/shipping/ups.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/system/store/cell.phtml b/app/design/adminhtml/default/default/template/system/store/cell.phtml index d5272e453..ef8d88206 100644 --- a/app/design/adminhtml/default/default/template/system/store/cell.phtml +++ b/app/design/adminhtml/default/default/template/system/store/cell.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ $object = $this->getObject(); diff --git a/app/design/adminhtml/default/default/template/system/store/container.phtml b/app/design/adminhtml/default/default/template/system/store/container.phtml index a1cafe56f..6e560fa5a 100644 --- a/app/design/adminhtml/default/default/template/system/store/container.phtml +++ b/app/design/adminhtml/default/default/template/system/store/container.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/store/tree.phtml b/app/design/adminhtml/default/default/template/system/store/tree.phtml index be4e6e9bb..1ccdb3505 100644 --- a/app/design/adminhtml/default/default/template/system/store/tree.phtml +++ b/app/design/adminhtml/default/default/template/system/store/tree.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/variable/js.phtml b/app/design/adminhtml/default/default/template/system/variable/js.phtml index cefa6beff..614c47374 100644 --- a/app/design/adminhtml/default/default/template/system/variable/js.phtml +++ b/app/design/adminhtml/default/default/template/system/variable/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/tag/edit/container.phtml b/app/design/adminhtml/default/default/template/tag/edit/container.phtml index 6b72d366f..8851ce92b 100644 --- a/app/design/adminhtml/default/default/template/tag/edit/container.phtml +++ b/app/design/adminhtml/default/default/template/tag/edit/container.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/tag/index.phtml b/app/design/adminhtml/default/default/template/tag/index.phtml index 279dfb3f1..a26ce8981 100644 --- a/app/design/adminhtml/default/default/template/tag/index.phtml +++ b/app/design/adminhtml/default/default/template/tag/index.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/tax/class/page/edit.phtml b/app/design/adminhtml/default/default/template/tax/class/page/edit.phtml index cb40978d1..a54b4339b 100644 --- a/app/design/adminhtml/default/default/template/tax/class/page/edit.phtml +++ b/app/design/adminhtml/default/default/template/tax/class/page/edit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/tax/importExport.phtml b/app/design/adminhtml/default/default/template/tax/importExport.phtml index 0ea7380c8..693816538 100644 --- a/app/design/adminhtml/default/default/template/tax/importExport.phtml +++ b/app/design/adminhtml/default/default/template/tax/importExport.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/tax/notifications.phtml b/app/design/adminhtml/default/default/template/tax/notifications.phtml index 2c3c4605a..35df97ee7 100644 --- a/app/design/adminhtml/default/default/template/tax/notifications.phtml +++ b/app/design/adminhtml/default/default/template/tax/notifications.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Tax_Block_Adminhtml_Notifications */ diff --git a/app/design/adminhtml/default/default/template/tax/rate/form.phtml b/app/design/adminhtml/default/default/template/tax/rate/form.phtml index 6910ddb67..43a46ae46 100644 --- a/app/design/adminhtml/default/default/template/tax/rate/form.phtml +++ b/app/design/adminhtml/default/default/template/tax/rate/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/tax/rate/title.phtml b/app/design/adminhtml/default/default/template/tax/rate/title.phtml index 6aec51109..37ebeda64 100644 --- a/app/design/adminhtml/default/default/template/tax/rate/title.phtml +++ b/app/design/adminhtml/default/default/template/tax/rate/title.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml index 92ad69cff..f022d7238 100644 --- a/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml +++ b/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml index 3c2a3a225..46e9241d4 100644 --- a/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml +++ b/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml index b64004b72..26fa29810 100644 --- a/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml +++ b/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml index 9aca79e98..24efba096 100644 --- a/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml +++ b/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml index 329bb80ae..250ee4be5 100644 --- a/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml +++ b/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml index 20865ea8d..761899da1 100644 --- a/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml +++ b/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/urlrewrite/categories.phtml b/app/design/adminhtml/default/default/template/urlrewrite/categories.phtml index f829c4dfc..76595f533 100644 --- a/app/design/adminhtml/default/default/template/urlrewrite/categories.phtml +++ b/app/design/adminhtml/default/default/template/urlrewrite/categories.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/urlrewrite/edit.phtml b/app/design/adminhtml/default/default/template/urlrewrite/edit.phtml index df0153688..bc68d4535 100644 --- a/app/design/adminhtml/default/default/template/urlrewrite/edit.phtml +++ b/app/design/adminhtml/default/default/template/urlrewrite/edit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/urlrewrite/selector.phtml b/app/design/adminhtml/default/default/template/urlrewrite/selector.phtml index 5185f6607..fc0decafe 100644 --- a/app/design/adminhtml/default/default/template/urlrewrite/selector.phtml +++ b/app/design/adminhtml/default/default/template/urlrewrite/selector.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml b/app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml index d65d45545..b3690ea7c 100644 --- a/app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml +++ b/app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/weee/renderer/tax.phtml b/app/design/adminhtml/default/default/template/weee/renderer/tax.phtml index 239e75553..3c2971652 100644 --- a/app/design/adminhtml/default/default/template/weee/renderer/tax.phtml +++ b/app/design/adminhtml/default/default/template/weee/renderer/tax.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/accordion.phtml b/app/design/adminhtml/default/default/template/widget/accordion.phtml index 1729a3151..0d23fdf29 100644 --- a/app/design/adminhtml/default/default/template/widget/accordion.phtml +++ b/app/design/adminhtml/default/default/template/widget/accordion.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml b/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml index 11e7a4b90..fd9f724b3 100644 --- a/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml +++ b/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/form.phtml b/app/design/adminhtml/default/default/template/widget/form.phtml index e52f75403..17f4e0bbe 100644 --- a/app/design/adminhtml/default/default/template/widget/form.phtml +++ b/app/design/adminhtml/default/default/template/widget/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/form/container.phtml b/app/design/adminhtml/default/default/template/widget/form/container.phtml index f79c4ab21..7419b9e0e 100644 --- a/app/design/adminhtml/default/default/template/widget/form/container.phtml +++ b/app/design/adminhtml/default/default/template/widget/form/container.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/form/element.phtml b/app/design/adminhtml/default/default/template/widget/form/element.phtml index 886f9613f..3f749be41 100644 --- a/app/design/adminhtml/default/default/template/widget/form/element.phtml +++ b/app/design/adminhtml/default/default/template/widget/form/element.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml b/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml index a44248907..23623b638 100644 --- a/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml +++ b/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml b/app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml index 062e8c20b..ac6e50d3f 100644 --- a/app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml +++ b/app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml b/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml index 0efa3a57c..684285da2 100644 --- a/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml +++ b/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml b/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml index bd1af4a66..1e962d9d5 100644 --- a/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml +++ b/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/grid.phtml b/app/design/adminhtml/default/default/template/widget/grid.phtml index bcb485c5f..2653e50a9 100644 --- a/app/design/adminhtml/default/default/template/widget/grid.phtml +++ b/app/design/adminhtml/default/default/template/widget/grid.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/grid/container.phtml b/app/design/adminhtml/default/default/template/widget/grid/container.phtml index a1cafe56f..6e560fa5a 100644 --- a/app/design/adminhtml/default/default/template/widget/grid/container.phtml +++ b/app/design/adminhtml/default/default/template/widget/grid/container.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml b/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml index 7b047897d..f0e561f46 100644 --- a/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml +++ b/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/grid/serializer.phtml b/app/design/adminhtml/default/default/template/widget/grid/serializer.phtml index de8e81860..b67107e63 100644 --- a/app/design/adminhtml/default/default/template/widget/grid/serializer.phtml +++ b/app/design/adminhtml/default/default/template/widget/grid/serializer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml b/app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml index 298136843..640f3a2cc 100644 --- a/app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml +++ b/app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/instance/js.phtml b/app/design/adminhtml/default/default/template/widget/instance/js.phtml index 021c834d7..ea3453f72 100644 --- a/app/design/adminhtml/default/default/template/widget/instance/js.phtml +++ b/app/design/adminhtml/default/default/template/widget/instance/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/tabs.phtml b/app/design/adminhtml/default/default/template/widget/tabs.phtml index 0fa51c5e6..7afe96b94 100644 --- a/app/design/adminhtml/default/default/template/widget/tabs.phtml +++ b/app/design/adminhtml/default/default/template/widget/tabs.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml b/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml index a0a3e583b..845636560 100644 --- a/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml +++ b/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/tabsleft.phtml b/app/design/adminhtml/default/default/template/widget/tabsleft.phtml index 03698cbe7..5a0202947 100644 --- a/app/design/adminhtml/default/default/template/widget/tabsleft.phtml +++ b/app/design/adminhtml/default/default/template/widget/tabsleft.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/view/container.phtml b/app/design/adminhtml/default/default/template/widget/view/container.phtml index 8c6c4f5a5..834d0e86a 100644 --- a/app/design/adminhtml/default/default/template/widget/view/container.phtml +++ b/app/design/adminhtml/default/default/template/widget/view/container.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/content.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/content.phtml index 7f4ade6cd..3dc899ea0 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/content.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/content.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml index 980f6fe53..8c2e49ff8 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/autocomplete.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/autocomplete.phtml index 2c9386cc7..a38e96988 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/autocomplete.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/autocomplete.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/image_edit.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/image_edit.phtml index a92626755..c1dd49900 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/image_edit.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/image_edit.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_android.phtml index 8867c5103..09887516e 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_android.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_android.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_ipad.phtml index 9b3b51391..c0293b3c1 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_ipad.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_ipad.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_iphone.phtml index 6090cd6ed..7ac9d1ef5 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_iphone.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_iphone.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/banner_rotator.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/banner_rotator.phtml index 33ffe35db..f4634dc6c 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/banner_rotator.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/banner_rotator.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_android.phtml index f94c18558..b927050f0 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_android.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_android.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_hor_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_hor_ipad.phtml index 04c0630a9..cacd71d5e 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_hor_ipad.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_hor_ipad.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_ipad.phtml index d7a6557cd..f6afc2bdf 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_ipad.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_ipad.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_iphone.phtml index 71e69a35d..7058e8e37 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_iphone.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_iphone.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_android.phtml index 8613f803c..cb484141b 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_android.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_android.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_hor_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_hor_ipad.phtml index d4b7f79c9..0e4db8f82 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_hor_ipad.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_hor_ipad.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_ipad.phtml index 73fc6b410..3baf1aceb 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_ipad.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_ipad.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_iphone.phtml index 9628e346b..ff08a6afa 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_iphone.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_iphone.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/productinfo_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/productinfo_iphone.phtml index 66c5e7e06..965f6466e 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/productinfo_iphone.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/productinfo_iphone.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_android.phtml index 324fe3958..8a2a60fa4 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_android.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_android.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_ipad.phtml index 92cb02957..cf567376f 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_ipad.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_ipad.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_iphone.phtml index 2728b12ab..5f2a8e8e3 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_iphone.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_iphone.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_android.phtml index e7d81e74c..4a00aa5cf 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_android.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_android.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_ipad.phtml index f8779b6ae..3d600daf0 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_ipad.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_ipad.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_iphone.phtml index ec477b3d8..befdd7057 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_iphone.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_iphone.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/offlinecatalog.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/offlinecatalog.phtml index 2583b33a5..b5d2654cc 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/offlinecatalog.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/offlinecatalog.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/addrow.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/addrow.phtml index c78239d41..f381824ea 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/form/element/addrow.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/addrow.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_android.phtml index e09a8613f..27bd9f421 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_android.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_android.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_ipad.phtml index 373d86fc6..674173490 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_ipad.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_ipad.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_iphone.phtml index 28f23e0bd..8f720ea16 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_iphone.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_iphone.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/androidmarket.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/androidmarket.phtml index 9b53c03a8..2d65158a3 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/androidmarket.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/androidmarket.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/istore.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/istore.phtml index dcbff0fdf..b00377fef 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/istore.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/istore.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/themes.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/themes.phtml index aee5590d5..ca8097ed9 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/form/element/themes.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/themes.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/mobile/notification_helper.phtml b/app/design/adminhtml/default/default/template/xmlconnect/mobile/notification_helper.phtml index d18631759..b19e624af 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/mobile/notification_helper.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/mobile/notification_helper.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/submission/app_icons_preview.phtml b/app/design/adminhtml/default/default/template/xmlconnect/submission/app_icons_preview.phtml index 80a9f62d5..8ee589ba4 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/submission/app_icons_preview.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/submission/app_icons_preview.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/submission/container.phtml b/app/design/adminhtml/default/default/template/xmlconnect/submission/container.phtml index a007f6380..54e29a0a6 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/submission/container.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/submission/container.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/xmlconnect/template/preview.phtml b/app/design/adminhtml/default/default/template/xmlconnect/template/preview.phtml index 481ba174c..01da52ad0 100644 --- a/app/design/adminhtml/default/default/template/xmlconnect/template/preview.phtml +++ b/app/design/adminhtml/default/default/template/xmlconnect/template/preview.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/etc/theme.xml b/app/design/frontend/base/default/etc/theme.xml deleted file mode 100644 index 7182c9f14..000000000 --- a/app/design/frontend/base/default/etc/theme.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - diff --git a/app/design/frontend/base/default/etc/widget.xml b/app/design/frontend/base/default/etc/widget.xml index 1715e42ff..3e25a8284 100644 --- a/app/design/frontend/base/default/etc/widget.xml +++ b/app/design/frontend/base/default/etc/widget.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/base/default/layout/authorizenet.xml b/app/design/frontend/base/default/layout/authorizenet.xml index f179c1379..13559c898 100644 --- a/app/design/frontend/base/default/layout/authorizenet.xml +++ b/app/design/frontend/base/default/layout/authorizenet.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/bml.xml b/app/design/frontend/base/default/layout/bml.xml deleted file mode 100644 index f0405a0be..000000000 --- a/app/design/frontend/base/default/layout/bml.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - -
homepage
 - 0 - - - - -
homepage
 - 1 - - - - - - - -
homepage
 - 0 - - - - -
homepage
 - 1 - - - - - - - -
categorypage
 - 0 - - - - -
categorypage
 - 1 - - - - - - - -
categorypage
 - 0 - - - - -
categorypage
 - 1 - - - - - - - - -
productpage
 - 0 - - - - -
productpage
 - 1 - - - - - - - -
checkout
 - 0 - - - - -
checkout
 - 1 - - - - - - - -
checkout
 - 0 - - - - diff --git a/app/design/frontend/base/default/layout/bundle.xml b/app/design/frontend/base/default/layout/bundle.xml index 913b28879..857b40fb6 100644 --- a/app/design/frontend/base/default/layout/bundle.xml +++ b/app/design/frontend/base/default/layout/bundle.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/captcha.xml b/app/design/frontend/base/default/layout/captcha.xml index 585d53bc9..fbe89a468 100644 --- a/app/design/frontend/base/default/layout/captcha.xml +++ b/app/design/frontend/base/default/layout/captcha.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/catalog.xml b/app/design/frontend/base/default/layout/catalog.xml index fdf9eab39..10ef981f2 100644 --- a/app/design/frontend/base/default/layout/catalog.xml +++ b/app/design/frontend/base/default/layout/catalog.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/catalog_msrp.xml b/app/design/frontend/base/default/layout/catalog_msrp.xml index 63a6390cd..81c1a82fa 100644 --- a/app/design/frontend/base/default/layout/catalog_msrp.xml +++ b/app/design/frontend/base/default/layout/catalog_msrp.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/cataloginventory.xml b/app/design/frontend/base/default/layout/cataloginventory.xml index 5b5b141a7..29e04f600 100644 --- a/app/design/frontend/base/default/layout/cataloginventory.xml +++ b/app/design/frontend/base/default/layout/cataloginventory.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/catalogsearch.xml b/app/design/frontend/base/default/layout/catalogsearch.xml index cf618fda2..e583aa563 100644 --- a/app/design/frontend/base/default/layout/catalogsearch.xml +++ b/app/design/frontend/base/default/layout/catalogsearch.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/centinel.xml b/app/design/frontend/base/default/layout/centinel.xml index 2496e4148..c56a5f8d5 100644 --- a/app/design/frontend/base/default/layout/centinel.xml +++ b/app/design/frontend/base/default/layout/centinel.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/checkout.xml b/app/design/frontend/base/default/layout/checkout.xml index 81d033b60..484df35aa 100644 --- a/app/design/frontend/base/default/layout/checkout.xml +++ b/app/design/frontend/base/default/layout/checkout.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/cms.xml b/app/design/frontend/base/default/layout/cms.xml index 1d6d4f7ac..e3460e8b3 100644 --- a/app/design/frontend/base/default/layout/cms.xml +++ b/app/design/frontend/base/default/layout/cms.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/base/default/layout/contacts.xml b/app/design/frontend/base/default/layout/contacts.xml index 5cbf26358..e2a6014e2 100644 --- a/app/design/frontend/base/default/layout/contacts.xml +++ b/app/design/frontend/base/default/layout/contacts.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/base/default/layout/core.xml b/app/design/frontend/base/default/layout/core.xml index 602875d7b..cbcc9991c 100644 --- a/app/design/frontend/base/default/layout/core.xml +++ b/app/design/frontend/base/default/layout/core.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/customer.xml b/app/design/frontend/base/default/layout/customer.xml index 29f7cb735..fa64266f6 100644 --- a/app/design/frontend/base/default/layout/customer.xml +++ b/app/design/frontend/base/default/layout/customer.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/directory.xml b/app/design/frontend/base/default/layout/directory.xml index af58739c0..ed8fb3c0a 100644 --- a/app/design/frontend/base/default/layout/directory.xml +++ b/app/design/frontend/base/default/layout/directory.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/downloadable.xml b/app/design/frontend/base/default/layout/downloadable.xml index 7f2dd61dd..18e357bba 100644 --- a/app/design/frontend/base/default/layout/downloadable.xml +++ b/app/design/frontend/base/default/layout/downloadable.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/googleanalytics.xml b/app/design/frontend/base/default/layout/googleanalytics.xml index 62bd69305..275e4ab5d 100644 --- a/app/design/frontend/base/default/layout/googleanalytics.xml +++ b/app/design/frontend/base/default/layout/googleanalytics.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/moneybookers.xml b/app/design/frontend/base/default/layout/moneybookers.xml index 1cc51c894..c9a281e4c 100644 --- a/app/design/frontend/base/default/layout/moneybookers.xml +++ b/app/design/frontend/base/default/layout/moneybookers.xml @@ -15,7 +15,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/design/frontend/base/default/layout/newsletter.xml b/app/design/frontend/base/default/layout/newsletter.xml index deb3fe6cd..a3498b69e 100644 --- a/app/design/frontend/base/default/layout/newsletter.xml +++ b/app/design/frontend/base/default/layout/newsletter.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/oauth.xml b/app/design/frontend/base/default/layout/oauth.xml index da863bc02..ee94e2c25 100644 --- a/app/design/frontend/base/default/layout/oauth.xml +++ b/app/design/frontend/base/default/layout/oauth.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/base/default/layout/page.xml b/app/design/frontend/base/default/layout/page.xml index 4b86899b5..d5a7f1ce7 100644 --- a/app/design/frontend/base/default/layout/page.xml +++ b/app/design/frontend/base/default/layout/page.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/base/default/layout/pagecache.xml b/app/design/frontend/base/default/layout/pagecache.xml index 55adb7abd..19d6ae7ab 100644 --- a/app/design/frontend/base/default/layout/pagecache.xml +++ b/app/design/frontend/base/default/layout/pagecache.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/payment.xml b/app/design/frontend/base/default/layout/payment.xml index 48f8cf6ec..1dd23b165 100644 --- a/app/design/frontend/base/default/layout/payment.xml +++ b/app/design/frontend/base/default/layout/payment.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/paypal.xml b/app/design/frontend/base/default/layout/paypal.xml index 779be3eac..5b48be098 100644 --- a/app/design/frontend/base/default/layout/paypal.xml +++ b/app/design/frontend/base/default/layout/paypal.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -53,6 +53,8 @@ + + defaultcheckout/cart_item_renderer diff --git a/app/design/frontend/base/default/layout/paypaluk.xml b/app/design/frontend/base/default/layout/paypaluk.xml index e321bae1f..de4c9e660 100644 --- a/app/design/frontend/base/default/layout/paypaluk.xml +++ b/app/design/frontend/base/default/layout/paypaluk.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -51,9 +51,8 @@ - + paypaluk - defaultcheckout/cart_item_renderer groupedcheckout/cart_item_renderer_grouped diff --git a/app/design/frontend/base/default/layout/persistent.xml b/app/design/frontend/base/default/layout/persistent.xml index ae05f2384..3b94a978e 100644 --- a/app/design/frontend/base/default/layout/persistent.xml +++ b/app/design/frontend/base/default/layout/persistent.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/poll.xml b/app/design/frontend/base/default/layout/poll.xml index d78fa610c..0e3f2ed5e 100644 --- a/app/design/frontend/base/default/layout/poll.xml +++ b/app/design/frontend/base/default/layout/poll.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/productalert.xml b/app/design/frontend/base/default/layout/productalert.xml index d5199e7ee..d90e87311 100644 --- a/app/design/frontend/base/default/layout/productalert.xml +++ b/app/design/frontend/base/default/layout/productalert.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/base/default/layout/reports.xml b/app/design/frontend/base/default/layout/reports.xml index 5c23b30bb..de222f7b4 100644 --- a/app/design/frontend/base/default/layout/reports.xml +++ b/app/design/frontend/base/default/layout/reports.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/review.xml b/app/design/frontend/base/default/layout/review.xml index fbeed6c24..2f1fecb8c 100644 --- a/app/design/frontend/base/default/layout/review.xml +++ b/app/design/frontend/base/default/layout/review.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/rss.xml b/app/design/frontend/base/default/layout/rss.xml index 2ec5b0078..ff75811ba 100644 --- a/app/design/frontend/base/default/layout/rss.xml +++ b/app/design/frontend/base/default/layout/rss.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/base/default/layout/sales.xml b/app/design/frontend/base/default/layout/sales.xml index 9abc4966c..e2a04dc3d 100644 --- a/app/design/frontend/base/default/layout/sales.xml +++ b/app/design/frontend/base/default/layout/sales.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/sales/billing_agreement.xml b/app/design/frontend/base/default/layout/sales/billing_agreement.xml index daed9b0cb..498db8983 100644 --- a/app/design/frontend/base/default/layout/sales/billing_agreement.xml +++ b/app/design/frontend/base/default/layout/sales/billing_agreement.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/sales/recurring_profile.xml b/app/design/frontend/base/default/layout/sales/recurring_profile.xml index bb1e530ed..37a5d28a0 100644 --- a/app/design/frontend/base/default/layout/sales/recurring_profile.xml +++ b/app/design/frontend/base/default/layout/sales/recurring_profile.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/sendfriend.xml b/app/design/frontend/base/default/layout/sendfriend.xml index a8ba50604..3252de739 100644 --- a/app/design/frontend/base/default/layout/sendfriend.xml +++ b/app/design/frontend/base/default/layout/sendfriend.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/base/default/layout/shipping.xml b/app/design/frontend/base/default/layout/shipping.xml index 065079c36..8d1461cf0 100644 --- a/app/design/frontend/base/default/layout/shipping.xml +++ b/app/design/frontend/base/default/layout/shipping.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/tag.xml b/app/design/frontend/base/default/layout/tag.xml index 46d9b5328..1c2985e57 100644 --- a/app/design/frontend/base/default/layout/tag.xml +++ b/app/design/frontend/base/default/layout/tag.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/weee.xml b/app/design/frontend/base/default/layout/weee.xml index a2094b71f..93d848db8 100644 --- a/app/design/frontend/base/default/layout/weee.xml +++ b/app/design/frontend/base/default/layout/weee.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/wishlist.xml b/app/design/frontend/base/default/layout/wishlist.xml index 85bcf8de4..0b8d48b81 100644 --- a/app/design/frontend/base/default/layout/wishlist.xml +++ b/app/design/frontend/base/default/layout/wishlist.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/layout/xmlconnect.xml b/app/design/frontend/base/default/layout/xmlconnect.xml index 51e028bbf..853224e24 100644 --- a/app/design/frontend/base/default/layout/xmlconnect.xml +++ b/app/design/frontend/base/default/layout/xmlconnect.xml @@ -21,7 +21,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/base/default/template/authorizenet/directpost/form.phtml b/app/design/frontend/base/default/template/authorizenet/directpost/form.phtml index 81c6fac49..792ee9009 100644 --- a/app/design/frontend/base/default/template/authorizenet/directpost/form.phtml +++ b/app/design/frontend/base/default/template/authorizenet/directpost/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/authorizenet/directpost/iframe.phtml b/app/design/frontend/base/default/template/authorizenet/directpost/iframe.phtml index 594b4f452..e1c9d6b11 100644 --- a/app/design/frontend/base/default/template/authorizenet/directpost/iframe.phtml +++ b/app/design/frontend/base/default/template/authorizenet/directpost/iframe.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/authorizenet/directpost/info.phtml b/app/design/frontend/base/default/template/authorizenet/directpost/info.phtml index fb893fa02..e1b57e54b 100644 --- a/app/design/frontend/base/default/template/authorizenet/directpost/info.phtml +++ b/app/design/frontend/base/default/template/authorizenet/directpost/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml index f09f8aad7..9f1e4862f 100644 --- a/app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml +++ b/app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml index 1d253b6b8..847627c15 100644 --- a/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml +++ b/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/option_tierprices.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/option_tierprices.phtml index 9115979df..6e76495a1 100644 --- a/app/design/frontend/base/default/template/bundle/catalog/product/view/option_tierprices.phtml +++ b/app/design/frontend/base/default/template/bundle/catalog/product/view/option_tierprices.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -30,9 +30,7 @@ * @see Mage_Catalog_Block_Product_View */ $_product = $this->getProduct(); -if ($this->getParent()->getPriceType() != Mage_Bundle_Model_Product_Price::PRICE_TYPE_FIXED) { - $_tierPrices = $this->getTierPrices($_product, $this->getParent()); -} +$_tierPrices = $this->getTierPrices($_product, $this->getParent()); $_finalPriceInclTax = $this->helper('tax')->getPrice($_product, $_product->getFinalPrice(), true); /** @var $_catalogHelper Mage_Catalog_Helper_Data */ @@ -44,7 +42,7 @@ if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) { } ?> - 0): ?> + 0): ?>
    getInGrouped()): ?> getTierPrices($_product); ?> diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/options/notice.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/options/notice.phtml index 9dbd81fc9..7c0b2b576 100644 --- a/app/design/frontend/base/default/template/bundle/catalog/product/view/options/notice.phtml +++ b/app/design/frontend/base/default/template/bundle/catalog/product/view/options/notice.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/price.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/price.phtml index 3fcd86fa9..233e56e30 100644 --- a/app/design/frontend/base/default/template/bundle/catalog/product/view/price.phtml +++ b/app/design/frontend/base/default/template/bundle/catalog/product/view/price.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/tierprices.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/tierprices.phtml index eb48bdea7..2daa2d3c5 100644 --- a/app/design/frontend/base/default/template/bundle/catalog/product/view/tierprices.phtml +++ b/app/design/frontend/base/default/template/bundle/catalog/product/view/tierprices.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml index fc54cb039..a8049c904 100644 --- a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml +++ b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -30,7 +30,6 @@ isSaleable()): ?>

    « __('Back to Shopping Cart') ?>

    - +
    diff --git a/app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml b/app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml index 511a8d9c9..dc57675a0 100644 --- a/app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml +++ b/app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml b/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml index 771402dd1..1bca10d9b 100644 --- a/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml +++ b/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -89,7 +89,7 @@

    « __('Back to Shipping Information') ?>

    - +
    - diff --git a/app/design/frontend/base/default/template/paypal/express/review.phtml b/app/design/frontend/base/default/template/paypal/express/review.phtml index 644f49440..5ca02cb0e 100644 --- a/app/design/frontend/base/default/template/paypal/express/review.phtml +++ b/app/design/frontend/base/default/template/paypal/express/review.phtml @@ -20,111 +20,99 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var $this Mage_Paypal_Block_Express_Review */ + +$billingBlock = $this->getChild('billing')->setFieldNamePrefix('billing')->setHideEmailAddress(true); +$shippingAddress = $this->getShippingAddress(); ?>

    __('Review Order') ?>

    getMessagesBlock()->toHtml() ?> -getShippingAddress()): ?> + +

    + Please confirm your addresses +

    +
    +
    + isCustomerLoggedIn()): ?> +
    +

    __('Customer Information') ?>

    +
      +
    • +
      + +
      + +
      +
      +
      • +
    +
    +
    -

    __('Shipping Information') ?>

    -
    -
    -
    -

    __('Shipping Address') ?>getCanEditShippingAddress()):?> | __('Edit') ?>

    -
    -
    -
    renderAddress($this->getShippingAddress())?>
    -
    -
    +
    +

    __('Billing Address') ?>

    + + setShowAsShippingCheckbox(true)->toHtml(); ?> + + toHtml(); ?> + +
    + +
    +

    __('Shipping Address') ?>

    + getChild('shipping')->setFieldNamePrefix('shipping')->setHideEmailAddress(true)->toHtml(); ?>
    +
    + +
    -
    +

    __('Shipping Method') ?>

    - - getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?> - getShippingRateGroups()):?> - getCurrentShippingRate(); ?> -
    - -
    -

    - -

    - -

    __('Sorry, no quotes are available for this order at this time.') ?>

    - - -

    renderShippingRateOption($this->getCurrentShippingRate())?>

    - - + getChild('shipping_method')->toHtml(); ?>
    +
    - -
    -

    __('Billing Information') ?>

    -
    -
    -
    -

    __('Payment Method') ?> | - getEditUrl()):?>__('Edit Payment Information') ?> -

    -
    -
    - escapeHtml($this->getPaymentMethodTitle()) ?> -
    +
    +

    __('Items in Your Shopping Cart') ?> | __('Edit Shopping Cart') ?>

    +
    + getChildHtml('details') ?>
    + getChildHtml('agreements'); ?> +
    + + + + +
    +
    - -
    -

    __('Items in Your Shopping Cart') ?> | __('Edit Shopping Cart') ?>

    -
    - getChildHtml('details') ?> -
    -
    -
    - getChildHtml('agreements'); ?> -
    - - - -
    -
    diff --git a/app/design/frontend/rwd/default/template/paypal/express/review/address.phtml b/app/design/frontend/base/default/template/paypal/express/review/address.phtml similarity index 64% rename from app/design/frontend/rwd/default/template/paypal/express/review/address.phtml rename to app/design/frontend/base/default/template/paypal/express/review/address.phtml index 7514ff86d..119cd5554 100644 --- a/app/design/frontend/rwd/default/template/paypal/express/review/address.phtml +++ b/app/design/frontend/base/default/template/paypal/express/review/address.phtml @@ -19,16 +19,16 @@ * needs please refer to http://www.magentocommerce.com for more information. * * @category design - * @package rwd_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @package base_default + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getFieldNamePrefix();?> -
    +
    • -
      +
      • getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat($prefix . ':%s')->setFieldNameFormat($prefix . '[%s]')->toHtml() ?>
        • @@ -43,38 +43,31 @@
        - +
        helper('customer/address')->getAttributeValidationClass('street'); ?> -
      • -
        - -
        - -
        +
      • + +
        +
        • helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?> -
      • -
        - -
        - -
        +
      • +
        +
        • helper('customer/address')->isVatAttributeVisible()) : ?> -
      • -
        - -
        - -
        +
      • + +
        +
        • @@ -118,13 +111,13 @@
        - +
        - +
        @@ -140,52 +133,13 @@
      -
      +
- + -getShowAsShippingCheckbox()): ?> - - diff --git a/app/design/frontend/base/default/template/paypal/express/review/details.phtml b/app/design/frontend/base/default/template/paypal/express/review/details.phtml index 1ed30dd02..d45d56f66 100644 --- a/app/design/frontend/base/default/template/paypal/express/review/details.phtml +++ b/app/design/frontend/base/default/template/paypal/express/review/details.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/paypal/express/review/shipping/method.phtml b/app/design/frontend/base/default/template/paypal/express/review/shipping/method.phtml index 0f9717721..f92a6d003 100644 --- a/app/design/frontend/base/default/template/paypal/express/review/shipping/method.phtml +++ b/app/design/frontend/base/default/template/paypal/express/review/shipping/method.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var $this Mage_Paypal_Block_Express_Review */ diff --git a/app/design/frontend/base/default/template/paypal/express/shortcut.phtml b/app/design/frontend/base/default/template/paypal/express/shortcut.phtml index 9f0da9ab3..77f09f04c 100644 --- a/app/design/frontend/base/default/template/paypal/express/shortcut.phtml +++ b/app/design/frontend/base/default/template/paypal/express/shortcut.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -31,39 +31,20 @@ ?> -
  • - -
    • - -

    - +<?php echo Mage::helper('paypal')->__('Checkout with PayPal');?> isOrPositionAfter()): ?> -
  • - -
    • - + getConfirmationUrl() || $this->getIsInCatalogProduct()): ?> getIsInCatalogProduct()): ?> +

    diff --git a/app/design/frontend/base/default/template/paypal/hss/form.phtml b/app/design/frontend/base/default/template/paypal/hss/form.phtml index d6d097c6b..c19b9a0bc 100644 --- a/app/design/frontend/base/default/template/paypal/hss/form.phtml +++ b/app/design/frontend/base/default/template/paypal/hss/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/paypal/hss/iframe.phtml b/app/design/frontend/base/default/template/paypal/hss/iframe.phtml index d4e1a5f66..4957a575c 100644 --- a/app/design/frontend/base/default/template/paypal/hss/iframe.phtml +++ b/app/design/frontend/base/default/template/paypal/hss/iframe.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/paypal/hss/info.phtml b/app/design/frontend/base/default/template/paypal/hss/info.phtml index 50cb350d3..e5f0dec8e 100644 --- a/app/design/frontend/base/default/template/paypal/hss/info.phtml +++ b/app/design/frontend/base/default/template/paypal/hss/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/paypal/hss/js.phtml b/app/design/frontend/base/default/template/paypal/hss/js.phtml index 41e9c6a34..68983d8c2 100644 --- a/app/design/frontend/base/default/template/paypal/hss/js.phtml +++ b/app/design/frontend/base/default/template/paypal/hss/js.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/paypal/hss/redirect.phtml b/app/design/frontend/base/default/template/paypal/hss/redirect.phtml index 931caa90b..12345c9f1 100644 --- a/app/design/frontend/base/default/template/paypal/hss/redirect.phtml +++ b/app/design/frontend/base/default/template/paypal/hss/redirect.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/paypal/hss/review/button.phtml b/app/design/frontend/base/default/template/paypal/hss/review/button.phtml index a4099b461..fcad235d2 100644 --- a/app/design/frontend/base/default/template/paypal/hss/review/button.phtml +++ b/app/design/frontend/base/default/template/paypal/hss/review/button.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/paypal/partner/logo.phtml b/app/design/frontend/base/default/template/paypal/partner/logo.phtml index 3b34cf2b2..a24a03ebe 100644 --- a/app/design/frontend/base/default/template/paypal/partner/logo.phtml +++ b/app/design/frontend/base/default/template/paypal/partner/logo.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/paypal/payflowadvanced/form.phtml b/app/design/frontend/base/default/template/paypal/payflowadvanced/form.phtml index dfed6a2b4..db533a036 100644 --- a/app/design/frontend/base/default/template/paypal/payflowadvanced/form.phtml +++ b/app/design/frontend/base/default/template/paypal/payflowadvanced/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/paypal/payflowadvanced/iframe.phtml b/app/design/frontend/base/default/template/paypal/payflowadvanced/iframe.phtml index 5e070d988..524c39b92 100644 --- a/app/design/frontend/base/default/template/paypal/payflowadvanced/iframe.phtml +++ b/app/design/frontend/base/default/template/paypal/payflowadvanced/iframe.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var $this Mage_Paypal_Block_Payflow_Advanced_Form */ diff --git a/app/design/frontend/base/default/template/paypal/payflowadvanced/info.phtml b/app/design/frontend/base/default/template/paypal/payflowadvanced/info.phtml index d759028af..f29482065 100644 --- a/app/design/frontend/base/default/template/paypal/payflowadvanced/info.phtml +++ b/app/design/frontend/base/default/template/paypal/payflowadvanced/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml b/app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml index 2ee3260f8..d718b0530 100644 --- a/app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml +++ b/app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/paypal/payflowlink/form.phtml b/app/design/frontend/base/default/template/paypal/payflowlink/form.phtml index d6d097c6b..c19b9a0bc 100644 --- a/app/design/frontend/base/default/template/paypal/payflowlink/form.phtml +++ b/app/design/frontend/base/default/template/paypal/payflowlink/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/paypal/payflowlink/iframe.phtml b/app/design/frontend/base/default/template/paypal/payflowlink/iframe.phtml index 9d61984dc..1299d0477 100644 --- a/app/design/frontend/base/default/template/paypal/payflowlink/iframe.phtml +++ b/app/design/frontend/base/default/template/paypal/payflowlink/iframe.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var $this Mage_Paypal_Block_Payflow_Link_Form */ diff --git a/app/design/frontend/base/default/template/paypal/payflowlink/info.phtml b/app/design/frontend/base/default/template/paypal/payflowlink/info.phtml index 6676f5d91..2397bf23a 100644 --- a/app/design/frontend/base/default/template/paypal/payflowlink/info.phtml +++ b/app/design/frontend/base/default/template/paypal/payflowlink/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml b/app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml index 1c6ac828f..db3ea9d46 100644 --- a/app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml +++ b/app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/paypal/payment/mark.phtml b/app/design/frontend/base/default/template/paypal/payment/mark.phtml index 3bed8fb15..23ddfbf8c 100644 --- a/app/design/frontend/base/default/template/paypal/payment/mark.phtml +++ b/app/design/frontend/base/default/template/paypal/payment/mark.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -32,7 +32,5 @@ ?> <?php echo Mage::helper('paypal')->__('Acceptance Mark') ?>  - - getPaymentWhatIs()) {echo Mage::helper('paypal')->__($this->getPaymentWhatIs());} else {echo Mage::helper('paypal')->__('What is PayPal?');} ?> - +__('What is PayPal?') ?> diff --git a/app/design/frontend/base/default/template/paypal/payment/redirect.phtml b/app/design/frontend/base/default/template/paypal/payment/redirect.phtml index 6700f359b..3fcd151e2 100644 --- a/app/design/frontend/base/default/template/paypal/payment/redirect.phtml +++ b/app/design/frontend/base/default/template/paypal/payment/redirect.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/paypal/express/review.phtml b/app/design/frontend/base/default/template/paypaluk/express/review.phtml similarity index 53% rename from app/design/frontend/rwd/default/template/paypal/express/review.phtml rename to app/design/frontend/base/default/template/paypaluk/express/review.phtml index e12fa7a5c..0080d79ee 100644 --- a/app/design/frontend/rwd/default/template/paypal/express/review.phtml +++ b/app/design/frontend/base/default/template/paypaluk/express/review.phtml @@ -19,8 +19,8 @@ * needs please refer to http://www.magentocommerce.com for more information. * * @category design - * @package rwd_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @package base_default + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var $this Mage_Paypal_Block_Express_Review */ @@ -29,59 +29,60 @@

    __('Review Order') ?>

    getMessagesBlock()->toHtml() ?> + getShippingAddress()): ?> -
    -

    __('Shipping Information') ?>

    -
    -
    -
    -

    __('Shipping Address') ?>getCanEditShippingAddress()):?> | __('Edit') ?>

    -
    -
    -
    renderAddress($this->getShippingAddress())?>
    -
    +
    +

    __('Shipping Information') ?>

    +
    +
    +
    +

    __('Shipping Address') ?>getCanEditShippingAddress()):?> | __('Change Shipping Address') ?>

    +
    +
    +
    renderAddress($this->getShippingAddress())?>
    -
    -
    -
    -

    __('Shipping Method') ?>

    -
    -
    -
    - getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?> - getShippingRateGroups()):?> - getCurrentShippingRate(); ?> -
    - -
    -

    - -

    - -

    __('Sorry, no quotes are available for this order at this time.') ?>

    - - -

    renderShippingRateOption($this->getCurrentShippingRate())?>

    - -
    -
    +
    +
    +
    +
    +

    __('Shipping Method') ?>

    +
    +
    +
    + getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?> + getShippingRateGroups()):?> + getCurrentShippingRate(); ?> +
    + +
    +

    + +

    + +

    __('Sorry, no quotes are available for this order at this time.') ?>

    + + +

    renderShippingRateOption($this->getCurrentShippingRate())?>

    + +
    +
    @@ -90,7 +91,7 @@

    __('Payment Method') ?> | - getEditUrl()):?>__('Edit Payment Information') ?> + getEditUrl()):?>__('Change Payment Method') ?>

    @@ -98,6 +99,19 @@
    +
    +
    +
    +

    __('Billing Address') ?>

    +
    +
    +
    + renderAddress($this->getBillingAddress()) ?>
    + __('Payer Email: %s', $this->getBillingAddress()->getEmail()) ?> +
    +
    +
    +
    @@ -117,14 +131,14 @@
    diff --git a/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml b/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml index bdb0cb472..9ea1f0f07 100644 --- a/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml +++ b/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var Mage_Checkout_Block_Onepage_Billing $this */ diff --git a/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml b/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml index f4c3f6576..d59285867 100644 --- a/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml +++ b/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/persistent/customer/form/login.phtml b/app/design/frontend/base/default/template/persistent/customer/form/login.phtml index f46d9963e..57cff2a59 100644 --- a/app/design/frontend/base/default/template/persistent/customer/form/login.phtml +++ b/app/design/frontend/base/default/template/persistent/customer/form/login.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/persistent/customer/form/register.phtml b/app/design/frontend/base/default/template/persistent/customer/form/register.phtml index 4c4143556..f097e484b 100644 --- a/app/design/frontend/base/default/template/persistent/customer/form/register.phtml +++ b/app/design/frontend/base/default/template/persistent/customer/form/register.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/persistent/remember_me.phtml b/app/design/frontend/base/default/template/persistent/remember_me.phtml index 54229adf6..ed8711fdd 100644 --- a/app/design/frontend/base/default/template/persistent/remember_me.phtml +++ b/app/design/frontend/base/default/template/persistent/remember_me.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/persistent/remember_me_tooltip.phtml b/app/design/frontend/base/default/template/persistent/remember_me_tooltip.phtml index c9be3a384..57e992c71 100644 --- a/app/design/frontend/base/default/template/persistent/remember_me_tooltip.phtml +++ b/app/design/frontend/base/default/template/persistent/remember_me_tooltip.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/poll/active.phtml b/app/design/frontend/base/default/template/poll/active.phtml index da8b82b4d..242d6cd11 100644 --- a/app/design/frontend/base/default/template/poll/active.phtml +++ b/app/design/frontend/base/default/template/poll/active.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/poll/result.phtml b/app/design/frontend/base/default/template/poll/result.phtml index aeceecf47..dcbb600ee 100644 --- a/app/design/frontend/base/default/template/poll/result.phtml +++ b/app/design/frontend/base/default/template/poll/result.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/productalert/price.phtml b/app/design/frontend/base/default/template/productalert/price.phtml index e84b5ceae..d57a32b5a 100644 --- a/app/design/frontend/base/default/template/productalert/price.phtml +++ b/app/design/frontend/base/default/template/productalert/price.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/productalert/product/view.phtml b/app/design/frontend/base/default/template/productalert/product/view.phtml index 31bf62873..41d6175ad 100644 --- a/app/design/frontend/base/default/template/productalert/product/view.phtml +++ b/app/design/frontend/base/default/template/productalert/product/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/productalert/stock.phtml b/app/design/frontend/base/default/template/productalert/stock.phtml index e84b5ceae..d57a32b5a 100644 --- a/app/design/frontend/base/default/template/productalert/stock.phtml +++ b/app/design/frontend/base/default/template/productalert/stock.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/rating/detailed.phtml b/app/design/frontend/base/default/template/rating/detailed.phtml index 8035b224e..428f0452a 100644 --- a/app/design/frontend/base/default/template/rating/detailed.phtml +++ b/app/design/frontend/base/default/template/rating/detailed.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/rating/empty.phtml b/app/design/frontend/base/default/template/rating/empty.phtml index dc8100ca3..33e201936 100644 --- a/app/design/frontend/base/default/template/rating/empty.phtml +++ b/app/design/frontend/base/default/template/rating/empty.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/reports/home_product_compared.phtml b/app/design/frontend/base/default/template/reports/home_product_compared.phtml index 23bcf5cc2..edf629477 100644 --- a/app/design/frontend/base/default/template/reports/home_product_compared.phtml +++ b/app/design/frontend/base/default/template/reports/home_product_compared.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Reports_Block_Product_Compared */ diff --git a/app/design/frontend/base/default/template/reports/home_product_viewed.phtml b/app/design/frontend/base/default/template/reports/home_product_viewed.phtml index b1f59bd98..dfc8440be 100644 --- a/app/design/frontend/base/default/template/reports/home_product_viewed.phtml +++ b/app/design/frontend/base/default/template/reports/home_product_viewed.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Reports_Block_Product_Viewed */ diff --git a/app/design/frontend/base/default/template/reports/product_compared.phtml b/app/design/frontend/base/default/template/reports/product_compared.phtml index bc0a44523..4f786acb6 100644 --- a/app/design/frontend/base/default/template/reports/product_compared.phtml +++ b/app/design/frontend/base/default/template/reports/product_compared.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Reports_Block_Product_Compared */ diff --git a/app/design/frontend/base/default/template/reports/product_viewed.phtml b/app/design/frontend/base/default/template/reports/product_viewed.phtml index 8cd6bf464..55b879422 100644 --- a/app/design/frontend/base/default/template/reports/product_viewed.phtml +++ b/app/design/frontend/base/default/template/reports/product_viewed.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Reports_Block_Product_Viewed */ diff --git a/app/design/frontend/base/default/template/reports/widget/compared/column/compared_default_list.phtml b/app/design/frontend/base/default/template/reports/widget/compared/column/compared_default_list.phtml index e6258a6e8..fc8715355 100644 --- a/app/design/frontend/base/default/template/reports/widget/compared/column/compared_default_list.phtml +++ b/app/design/frontend/base/default/template/reports/widget/compared/column/compared_default_list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/reports/widget/compared/column/compared_images_list.phtml b/app/design/frontend/base/default/template/reports/widget/compared/column/compared_images_list.phtml index b3593649f..9420941e1 100644 --- a/app/design/frontend/base/default/template/reports/widget/compared/column/compared_images_list.phtml +++ b/app/design/frontend/base/default/template/reports/widget/compared/column/compared_images_list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/reports/widget/compared/column/compared_names_list.phtml b/app/design/frontend/base/default/template/reports/widget/compared/column/compared_names_list.phtml index b4054baa9..9c977de9c 100644 --- a/app/design/frontend/base/default/template/reports/widget/compared/column/compared_names_list.phtml +++ b/app/design/frontend/base/default/template/reports/widget/compared/column/compared_names_list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml b/app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml index d3719ae7e..19ed3c162 100644 --- a/app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml +++ b/app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml b/app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml index c9110b617..98fe953e7 100644 --- a/app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml +++ b/app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_default_list.phtml b/app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_default_list.phtml index 770ce3897..5d9cdf978 100644 --- a/app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_default_list.phtml +++ b/app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_default_list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_images_list.phtml b/app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_images_list.phtml index 732e275d0..a03ff94f3 100644 --- a/app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_images_list.phtml +++ b/app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_images_list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_names_list.phtml b/app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_names_list.phtml index b2d4e18b4..bb90329f6 100644 --- a/app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_names_list.phtml +++ b/app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_names_list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml b/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml index 51c9a2562..06847425f 100644 --- a/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml +++ b/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml b/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml index 8655d6207..eae867db9 100644 --- a/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml +++ b/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/review/customer/list.phtml b/app/design/frontend/base/default/template/review/customer/list.phtml index 118e18613..5e50e8940 100644 --- a/app/design/frontend/base/default/template/review/customer/list.phtml +++ b/app/design/frontend/base/default/template/review/customer/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/review/customer/recent.phtml b/app/design/frontend/base/default/template/review/customer/recent.phtml index d93ea95d7..e73ac4e1f 100644 --- a/app/design/frontend/base/default/template/review/customer/recent.phtml +++ b/app/design/frontend/base/default/template/review/customer/recent.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/review/customer/view.phtml b/app/design/frontend/base/default/template/review/customer/view.phtml index e9ca96cb5..b7d0b1913 100644 --- a/app/design/frontend/base/default/template/review/customer/view.phtml +++ b/app/design/frontend/base/default/template/review/customer/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/review/form.phtml b/app/design/frontend/base/default/template/review/form.phtml index ee0e6bd50..7d2338c27 100644 --- a/app/design/frontend/base/default/template/review/form.phtml +++ b/app/design/frontend/base/default/template/review/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/review/helper/summary.phtml b/app/design/frontend/base/default/template/review/helper/summary.phtml index 5352f1da3..71852f3cb 100644 --- a/app/design/frontend/base/default/template/review/helper/summary.phtml +++ b/app/design/frontend/base/default/template/review/helper/summary.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/review/helper/summary_short.phtml b/app/design/frontend/base/default/template/review/helper/summary_short.phtml index fea6b29f7..9cda830ac 100644 --- a/app/design/frontend/base/default/template/review/helper/summary_short.phtml +++ b/app/design/frontend/base/default/template/review/helper/summary_short.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/review/product/view/count.phtml b/app/design/frontend/base/default/template/review/product/view/count.phtml index 80ad62027..030852152 100644 --- a/app/design/frontend/base/default/template/review/product/view/count.phtml +++ b/app/design/frontend/base/default/template/review/product/view/count.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/review/product/view/list.phtml b/app/design/frontend/base/default/template/review/product/view/list.phtml index d6551cd4c..b7e52bb66 100644 --- a/app/design/frontend/base/default/template/review/product/view/list.phtml +++ b/app/design/frontend/base/default/template/review/product/view/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/review/product/view/other.phtml b/app/design/frontend/base/default/template/review/product/view/other.phtml index 1238c1f96..9e09c66c7 100644 --- a/app/design/frontend/base/default/template/review/product/view/other.phtml +++ b/app/design/frontend/base/default/template/review/product/view/other.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/review/view.phtml b/app/design/frontend/base/default/template/review/view.phtml index 0148f3218..65a5604dd 100644 --- a/app/design/frontend/base/default/template/review/view.phtml +++ b/app/design/frontend/base/default/template/review/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/rss/list.phtml b/app/design/frontend/base/default/template/rss/list.phtml index 2d2d815af..e97c94ef0 100644 --- a/app/design/frontend/base/default/template/rss/list.phtml +++ b/app/design/frontend/base/default/template/rss/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/rss/nofeed.phtml b/app/design/frontend/base/default/template/rss/nofeed.phtml index 664bd717d..7fc24396d 100644 --- a/app/design/frontend/base/default/template/rss/nofeed.phtml +++ b/app/design/frontend/base/default/template/rss/nofeed.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/rss/order/details.phtml b/app/design/frontend/base/default/template/rss/order/details.phtml index 1a3890165..0502b2e87 100644 --- a/app/design/frontend/base/default/template/rss/order/details.phtml +++ b/app/design/frontend/base/default/template/rss/order/details.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* diff --git a/app/design/frontend/base/default/template/sales/billing/agreement/view.phtml b/app/design/frontend/base/default/template/sales/billing/agreement/view.phtml index aa0bcae20..fec33160f 100644 --- a/app/design/frontend/base/default/template/sales/billing/agreement/view.phtml +++ b/app/design/frontend/base/default/template/sales/billing/agreement/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/billing/agreements.phtml b/app/design/frontend/base/default/template/sales/billing/agreements.phtml index 4f895d36d..c79068e2d 100644 --- a/app/design/frontend/base/default/template/sales/billing/agreements.phtml +++ b/app/design/frontend/base/default/template/sales/billing/agreements.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/comments.phtml b/app/design/frontend/base/default/template/sales/order/comments.phtml index db37b189b..c5569dcb9 100644 --- a/app/design/frontend/base/default/template/sales/order/comments.phtml +++ b/app/design/frontend/base/default/template/sales/order/comments.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/creditmemo.phtml b/app/design/frontend/base/default/template/sales/order/creditmemo.phtml index 23fd468ed..b93cdb805 100644 --- a/app/design/frontend/base/default/template/sales/order/creditmemo.phtml +++ b/app/design/frontend/base/default/template/sales/order/creditmemo.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/creditmemo/items.phtml b/app/design/frontend/base/default/template/sales/order/creditmemo/items.phtml index ad1e2a02e..6cbfd1998 100644 --- a/app/design/frontend/base/default/template/sales/order/creditmemo/items.phtml +++ b/app/design/frontend/base/default/template/sales/order/creditmemo/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml index 6c344c9a2..2dfca9be7 100644 --- a/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml +++ b/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/details.phtml b/app/design/frontend/base/default/template/sales/order/details.phtml index 7a20eb953..351da305c 100644 --- a/app/design/frontend/base/default/template/sales/order/details.phtml +++ b/app/design/frontend/base/default/template/sales/order/details.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/sales/order/history.phtml b/app/design/frontend/base/default/template/sales/order/history.phtml index ea2629514..59bd37db0 100644 --- a/app/design/frontend/base/default/template/sales/order/history.phtml +++ b/app/design/frontend/base/default/template/sales/order/history.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/info.phtml b/app/design/frontend/base/default/template/sales/order/info.phtml index 6861b072d..01b9f0015 100644 --- a/app/design/frontend/base/default/template/sales/order/info.phtml +++ b/app/design/frontend/base/default/template/sales/order/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/info/buttons.phtml b/app/design/frontend/base/default/template/sales/order/info/buttons.phtml index 53d7e90bc..f2b5658ab 100644 --- a/app/design/frontend/base/default/template/sales/order/info/buttons.phtml +++ b/app/design/frontend/base/default/template/sales/order/info/buttons.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/invoice.phtml b/app/design/frontend/base/default/template/sales/order/invoice.phtml index 6b29a814d..d65d49cfd 100644 --- a/app/design/frontend/base/default/template/sales/order/invoice.phtml +++ b/app/design/frontend/base/default/template/sales/order/invoice.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/invoice/items.phtml b/app/design/frontend/base/default/template/sales/order/invoice/items.phtml index 9297917b1..a2ba6e026 100644 --- a/app/design/frontend/base/default/template/sales/order/invoice/items.phtml +++ b/app/design/frontend/base/default/template/sales/order/invoice/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml index 1a1a9d980..93396637a 100644 --- a/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml +++ b/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/items.phtml b/app/design/frontend/base/default/template/sales/order/items.phtml index 38369cb53..ed654c499 100644 --- a/app/design/frontend/base/default/template/sales/order/items.phtml +++ b/app/design/frontend/base/default/template/sales/order/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml index 114dd0365..3da58e255 100644 --- a/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml +++ b/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/print.phtml b/app/design/frontend/base/default/template/sales/order/print.phtml index b8ecad81d..27fa5d473 100644 --- a/app/design/frontend/base/default/template/sales/order/print.phtml +++ b/app/design/frontend/base/default/template/sales/order/print.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/print/creditmemo.phtml b/app/design/frontend/base/default/template/sales/order/print/creditmemo.phtml index 153b04c62..4e1ce4ae4 100644 --- a/app/design/frontend/base/default/template/sales/order/print/creditmemo.phtml +++ b/app/design/frontend/base/default/template/sales/order/print/creditmemo.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/print/invoice.phtml b/app/design/frontend/base/default/template/sales/order/print/invoice.phtml index 345a1f08a..65621717d 100644 --- a/app/design/frontend/base/default/template/sales/order/print/invoice.phtml +++ b/app/design/frontend/base/default/template/sales/order/print/invoice.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/print/shipment.phtml b/app/design/frontend/base/default/template/sales/order/print/shipment.phtml index 22d11e9af..c3868b1ef 100644 --- a/app/design/frontend/base/default/template/sales/order/print/shipment.phtml +++ b/app/design/frontend/base/default/template/sales/order/print/shipment.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/recent.phtml b/app/design/frontend/base/default/template/sales/order/recent.phtml index d0df0d42b..edd6759a5 100644 --- a/app/design/frontend/base/default/template/sales/order/recent.phtml +++ b/app/design/frontend/base/default/template/sales/order/recent.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/shipment.phtml b/app/design/frontend/base/default/template/sales/order/shipment.phtml index 189b8bd3a..a4973410c 100644 --- a/app/design/frontend/base/default/template/sales/order/shipment.phtml +++ b/app/design/frontend/base/default/template/sales/order/shipment.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/shipment/items.phtml b/app/design/frontend/base/default/template/sales/order/shipment/items.phtml index 79bb99797..d101a8d0e 100644 --- a/app/design/frontend/base/default/template/sales/order/shipment/items.phtml +++ b/app/design/frontend/base/default/template/sales/order/shipment/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml index 425f3ecd9..144a14185 100644 --- a/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml +++ b/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/totals.phtml b/app/design/frontend/base/default/template/sales/order/totals.phtml index 9a32dda7f..c2960a56c 100644 --- a/app/design/frontend/base/default/template/sales/order/totals.phtml +++ b/app/design/frontend/base/default/template/sales/order/totals.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/base/default/template/sales/order/trackinginfo.phtml b/app/design/frontend/base/default/template/sales/order/trackinginfo.phtml index 51a61485e..54df1a494 100644 --- a/app/design/frontend/base/default/template/sales/order/trackinginfo.phtml +++ b/app/design/frontend/base/default/template/sales/order/trackinginfo.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/order/view.phtml b/app/design/frontend/base/default/template/sales/order/view.phtml index ab2758a6f..1d1cd7639 100644 --- a/app/design/frontend/base/default/template/sales/order/view.phtml +++ b/app/design/frontend/base/default/template/sales/order/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/payment/form/billing/agreement.phtml b/app/design/frontend/base/default/template/sales/payment/form/billing/agreement.phtml index e7dcffba6..d63109ac8 100644 --- a/app/design/frontend/base/default/template/sales/payment/form/billing/agreement.phtml +++ b/app/design/frontend/base/default/template/sales/payment/form/billing/agreement.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/recurring/grid.phtml b/app/design/frontend/base/default/template/sales/recurring/grid.phtml index 964a07c53..2432e7f3c 100644 --- a/app/design/frontend/base/default/template/sales/recurring/grid.phtml +++ b/app/design/frontend/base/default/template/sales/recurring/grid.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/recurring/profile/view.phtml b/app/design/frontend/base/default/template/sales/recurring/profile/view.phtml index b0c00c46b..a3cdd24aa 100644 --- a/app/design/frontend/base/default/template/sales/recurring/profile/view.phtml +++ b/app/design/frontend/base/default/template/sales/recurring/profile/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/recurring/profile/view/info.phtml b/app/design/frontend/base/default/template/sales/recurring/profile/view/info.phtml index 4d0161716..809762778 100644 --- a/app/design/frontend/base/default/template/sales/recurring/profile/view/info.phtml +++ b/app/design/frontend/base/default/template/sales/recurring/profile/view/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/recurring/profiles.phtml b/app/design/frontend/base/default/template/sales/recurring/profiles.phtml index b5da67929..170fecb41 100644 --- a/app/design/frontend/base/default/template/sales/recurring/profiles.phtml +++ b/app/design/frontend/base/default/template/sales/recurring/profiles.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/reorder/sidebar.phtml b/app/design/frontend/base/default/template/sales/reorder/sidebar.phtml index 56b410aeb..5d7dff931 100644 --- a/app/design/frontend/base/default/template/sales/reorder/sidebar.phtml +++ b/app/design/frontend/base/default/template/sales/reorder/sidebar.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/sales/widget/guest/form.phtml b/app/design/frontend/base/default/template/sales/widget/guest/form.phtml index e1c306c5f..fe1eeaeec 100644 --- a/app/design/frontend/base/default/template/sales/widget/guest/form.phtml +++ b/app/design/frontend/base/default/template/sales/widget/guest/form.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var $this Mage_Sales_Block_Widget_Guest_Form */ diff --git a/app/design/frontend/base/default/template/sendfriend/send.phtml b/app/design/frontend/base/default/template/sendfriend/send.phtml index 14432118d..3756b09e8 100644 --- a/app/design/frontend/base/default/template/sendfriend/send.phtml +++ b/app/design/frontend/base/default/template/sendfriend/send.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Sendfriend_Block_Send */ diff --git a/app/design/frontend/base/default/template/shipping/tracking/ajax.phtml b/app/design/frontend/base/default/template/shipping/tracking/ajax.phtml index 4554214aa..a90ed0666 100644 --- a/app/design/frontend/base/default/template/shipping/tracking/ajax.phtml +++ b/app/design/frontend/base/default/template/shipping/tracking/ajax.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/shipping/tracking/popup.phtml b/app/design/frontend/base/default/template/shipping/tracking/popup.phtml index d0fc2f6f7..4856fdd0a 100644 --- a/app/design/frontend/base/default/template/shipping/tracking/popup.phtml +++ b/app/design/frontend/base/default/template/shipping/tracking/popup.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/tag/cloud.phtml b/app/design/frontend/base/default/template/tag/cloud.phtml index fa9d49fa8..1a0f80d15 100644 --- a/app/design/frontend/base/default/template/tag/cloud.phtml +++ b/app/design/frontend/base/default/template/tag/cloud.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/tag/customer/recent.phtml b/app/design/frontend/base/default/template/tag/customer/recent.phtml index 15f03c8a2..1fd676aae 100644 --- a/app/design/frontend/base/default/template/tag/customer/recent.phtml +++ b/app/design/frontend/base/default/template/tag/customer/recent.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/tag/customer/tags.phtml b/app/design/frontend/base/default/template/tag/customer/tags.phtml index 8040656fe..d2c232056 100644 --- a/app/design/frontend/base/default/template/tag/customer/tags.phtml +++ b/app/design/frontend/base/default/template/tag/customer/tags.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/tag/customer/view.phtml b/app/design/frontend/base/default/template/tag/customer/view.phtml index 511fcd17b..c138007b5 100644 --- a/app/design/frontend/base/default/template/tag/customer/view.phtml +++ b/app/design/frontend/base/default/template/tag/customer/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/tag/list.phtml b/app/design/frontend/base/default/template/tag/list.phtml index de1398805..ec01565bb 100644 --- a/app/design/frontend/base/default/template/tag/list.phtml +++ b/app/design/frontend/base/default/template/tag/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/tag/popular.phtml b/app/design/frontend/base/default/template/tag/popular.phtml index e50abdd90..612fd0cb3 100644 --- a/app/design/frontend/base/default/template/tag/popular.phtml +++ b/app/design/frontend/base/default/template/tag/popular.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/tax/checkout/discount.phtml b/app/design/frontend/base/default/template/tax/checkout/discount.phtml index 4554b5ee2..d7cb6b1ed 100644 --- a/app/design/frontend/base/default/template/tax/checkout/discount.phtml +++ b/app/design/frontend/base/default/template/tax/checkout/discount.phtml @@ -20,6 +20,6 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/tax/checkout/grandtotal.phtml b/app/design/frontend/base/default/template/tax/checkout/grandtotal.phtml index de6d679e6..37b9161bd 100644 --- a/app/design/frontend/base/default/template/tax/checkout/grandtotal.phtml +++ b/app/design/frontend/base/default/template/tax/checkout/grandtotal.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/base/default/template/tax/checkout/shipping.phtml b/app/design/frontend/base/default/template/tax/checkout/shipping.phtml index 1a44e5bbc..0625e70a2 100644 --- a/app/design/frontend/base/default/template/tax/checkout/shipping.phtml +++ b/app/design/frontend/base/default/template/tax/checkout/shipping.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/base/default/template/tax/checkout/subtotal.phtml b/app/design/frontend/base/default/template/tax/checkout/subtotal.phtml index 3bb24cfcc..ef52288a0 100644 --- a/app/design/frontend/base/default/template/tax/checkout/subtotal.phtml +++ b/app/design/frontend/base/default/template/tax/checkout/subtotal.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/base/default/template/tax/checkout/tax.phtml b/app/design/frontend/base/default/template/tax/checkout/tax.phtml index cc92c6101..7df64381f 100644 --- a/app/design/frontend/base/default/template/tax/checkout/tax.phtml +++ b/app/design/frontend/base/default/template/tax/checkout/tax.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/base/default/template/tax/order/tax.phtml b/app/design/frontend/base/default/template/tax/order/tax.phtml index b0366ceb9..65b401a4f 100644 --- a/app/design/frontend/base/default/template/tax/order/tax.phtml +++ b/app/design/frontend/base/default/template/tax/order/tax.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/wishlist/button/share.phtml b/app/design/frontend/base/default/template/wishlist/button/share.phtml index d422fd75b..30d1514d8 100644 --- a/app/design/frontend/base/default/template/wishlist/button/share.phtml +++ b/app/design/frontend/base/default/template/wishlist/button/share.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/wishlist/button/tocart.phtml b/app/design/frontend/base/default/template/wishlist/button/tocart.phtml index f9c44a0db..5d6fde5a8 100644 --- a/app/design/frontend/base/default/template/wishlist/button/tocart.phtml +++ b/app/design/frontend/base/default/template/wishlist/button/tocart.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/wishlist/button/update.phtml b/app/design/frontend/base/default/template/wishlist/button/update.phtml index 7be602dde..0c216a38e 100644 --- a/app/design/frontend/base/default/template/wishlist/button/update.phtml +++ b/app/design/frontend/base/default/template/wishlist/button/update.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/wishlist/email/items.phtml b/app/design/frontend/base/default/template/wishlist/email/items.phtml index cd7f97096..c944472ad 100644 --- a/app/design/frontend/base/default/template/wishlist/email/items.phtml +++ b/app/design/frontend/base/default/template/wishlist/email/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Wishlist_Block_Share_Email_Items */ diff --git a/app/design/frontend/base/default/template/wishlist/email/rss.phtml b/app/design/frontend/base/default/template/wishlist/email/rss.phtml index 1a7945e65..c204083c5 100644 --- a/app/design/frontend/base/default/template/wishlist/email/rss.phtml +++ b/app/design/frontend/base/default/template/wishlist/email/rss.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/wishlist/item/column/cart.phtml b/app/design/frontend/base/default/template/wishlist/item/column/cart.phtml index 19b2d3ba8..87e7c44f2 100644 --- a/app/design/frontend/base/default/template/wishlist/item/column/cart.phtml +++ b/app/design/frontend/base/default/template/wishlist/item/column/cart.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/wishlist/item/column/image.phtml b/app/design/frontend/base/default/template/wishlist/item/column/image.phtml index 251a63bf6..c18b76841 100644 --- a/app/design/frontend/base/default/template/wishlist/item/column/image.phtml +++ b/app/design/frontend/base/default/template/wishlist/item/column/image.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/wishlist/item/column/info.phtml b/app/design/frontend/base/default/template/wishlist/item/column/info.phtml index 64931221a..78b77a692 100644 --- a/app/design/frontend/base/default/template/wishlist/item/column/info.phtml +++ b/app/design/frontend/base/default/template/wishlist/item/column/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/wishlist/item/column/remove.phtml b/app/design/frontend/base/default/template/wishlist/item/column/remove.phtml index c09a7cd13..cd590069e 100644 --- a/app/design/frontend/base/default/template/wishlist/item/column/remove.phtml +++ b/app/design/frontend/base/default/template/wishlist/item/column/remove.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml b/app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml index 5bb4baf33..dcb152f85 100644 --- a/app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml +++ b/app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/wishlist/item/list.phtml b/app/design/frontend/base/default/template/wishlist/item/list.phtml index e1c9bd139..7313de6e9 100644 --- a/app/design/frontend/base/default/template/wishlist/item/list.phtml +++ b/app/design/frontend/base/default/template/wishlist/item/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/wishlist/options_list.phtml b/app/design/frontend/base/default/template/wishlist/options_list.phtml index fe1f505eb..4d48d9e8d 100644 --- a/app/design/frontend/base/default/template/wishlist/options_list.phtml +++ b/app/design/frontend/base/default/template/wishlist/options_list.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Wishlist_Block_Customer_Wishlist_Item_Options */ diff --git a/app/design/frontend/base/default/template/wishlist/render/item/price.phtml b/app/design/frontend/base/default/template/wishlist/render/item/price.phtml index 156955f1c..fc54a005f 100644 --- a/app/design/frontend/base/default/template/wishlist/render/item/price.phtml +++ b/app/design/frontend/base/default/template/wishlist/render/item/price.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Wishlist_Block_Customer_Wishlist_Render_Item_Price */ diff --git a/app/design/frontend/base/default/template/wishlist/render/item/price_msrp_item.phtml b/app/design/frontend/base/default/template/wishlist/render/item/price_msrp_item.phtml index dff4561f0..756a9e000 100644 --- a/app/design/frontend/base/default/template/wishlist/render/item/price_msrp_item.phtml +++ b/app/design/frontend/base/default/template/wishlist/render/item/price_msrp_item.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/wishlist/render/item/price_msrp_rss.phtml b/app/design/frontend/base/default/template/wishlist/render/item/price_msrp_rss.phtml index 565dbe065..0228df229 100644 --- a/app/design/frontend/base/default/template/wishlist/render/item/price_msrp_rss.phtml +++ b/app/design/frontend/base/default/template/wishlist/render/item/price_msrp_rss.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/wishlist/shared.phtml b/app/design/frontend/base/default/template/wishlist/shared.phtml index 54bdbb524..06e9da172 100644 --- a/app/design/frontend/base/default/template/wishlist/shared.phtml +++ b/app/design/frontend/base/default/template/wishlist/shared.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Wishlist_Block_Share_Wishlist */ diff --git a/app/design/frontend/base/default/template/wishlist/sharing.phtml b/app/design/frontend/base/default/template/wishlist/sharing.phtml index 63c50914f..35db535ec 100644 --- a/app/design/frontend/base/default/template/wishlist/sharing.phtml +++ b/app/design/frontend/base/default/template/wishlist/sharing.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/wishlist/sidebar.phtml b/app/design/frontend/base/default/template/wishlist/sidebar.phtml index 04f0d19fb..ff6f824d4 100644 --- a/app/design/frontend/base/default/template/wishlist/sidebar.phtml +++ b/app/design/frontend/base/default/template/wishlist/sidebar.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Wishlist_Block_Customer_Sidebar */ diff --git a/app/design/frontend/base/default/template/wishlist/view.phtml b/app/design/frontend/base/default/template/wishlist/view.phtml index 73b9af52f..8520c155e 100644 --- a/app/design/frontend/base/default/template/wishlist/view.phtml +++ b/app/design/frontend/base/default/template/wishlist/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Wishlist_Block_Customer_Wishlist */ diff --git a/app/design/frontend/base/default/template/xmlconnect/centinel/authentication.phtml b/app/design/frontend/base/default/template/xmlconnect/centinel/authentication.phtml index 8272e1651..8863e52a7 100644 --- a/app/design/frontend/base/default/template/xmlconnect/centinel/authentication.phtml +++ b/app/design/frontend/base/default/template/xmlconnect/centinel/authentication.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/xmlconnect/pbridge/result.phtml b/app/design/frontend/base/default/template/xmlconnect/pbridge/result.phtml index 82524bbc6..ad547a72b 100644 --- a/app/design/frontend/base/default/template/xmlconnect/pbridge/result.phtml +++ b/app/design/frontend/base/default/template/xmlconnect/pbridge/result.phtml @@ -20,7 +20,7 @@ * * @category design * @package base_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/blank/etc/theme.xml b/app/design/frontend/default/blank/etc/theme.xml deleted file mode 100644 index 6b29275a3..000000000 --- a/app/design/frontend/default/blank/etc/theme.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - default/default - diff --git a/app/design/frontend/default/blank/etc/widget.xml b/app/design/frontend/default/blank/etc/widget.xml index 626336c8d..2e5ca5aa2 100644 --- a/app/design/frontend/default/blank/etc/widget.xml +++ b/app/design/frontend/default/blank/etc/widget.xml @@ -21,7 +21,7 @@ * * @category design * @package default_blank - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/default/etc/theme.xml b/app/design/frontend/default/default/etc/theme.xml deleted file mode 100644 index 6edcbbc07..000000000 --- a/app/design/frontend/default/default/etc/theme.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - diff --git a/app/design/frontend/default/default/etc/widget.xml b/app/design/frontend/default/default/etc/widget.xml index 1de8128eb..9a2655d97 100644 --- a/app/design/frontend/default/default/etc/widget.xml +++ b/app/design/frontend/default/default/etc/widget.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/iphone/etc/theme.xml b/app/design/frontend/default/iphone/etc/theme.xml deleted file mode 100644 index 17569848e..000000000 --- a/app/design/frontend/default/iphone/etc/theme.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - default/default - diff --git a/app/design/frontend/default/iphone/etc/widget.xml b/app/design/frontend/default/iphone/etc/widget.xml index c943fccdd..38e421001 100644 --- a/app/design/frontend/default/iphone/etc/widget.xml +++ b/app/design/frontend/default/iphone/etc/widget.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/iphone/layout/bundle.xml b/app/design/frontend/default/iphone/layout/bundle.xml index f654ca116..300707b89 100644 --- a/app/design/frontend/default/iphone/layout/bundle.xml +++ b/app/design/frontend/default/iphone/layout/bundle.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/layout/catalog.xml b/app/design/frontend/default/iphone/layout/catalog.xml index ac704ecc0..0003775cb 100644 --- a/app/design/frontend/default/iphone/layout/catalog.xml +++ b/app/design/frontend/default/iphone/layout/catalog.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/layout/catalogsearch.xml b/app/design/frontend/default/iphone/layout/catalogsearch.xml index 8f9decf6c..3c5d85338 100644 --- a/app/design/frontend/default/iphone/layout/catalogsearch.xml +++ b/app/design/frontend/default/iphone/layout/catalogsearch.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/layout/checkout.xml b/app/design/frontend/default/iphone/layout/checkout.xml index 537ae4eb6..2d2725a51 100644 --- a/app/design/frontend/default/iphone/layout/checkout.xml +++ b/app/design/frontend/default/iphone/layout/checkout.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/layout/cms.xml b/app/design/frontend/default/iphone/layout/cms.xml index 0ee1acc6f..dd362ab03 100644 --- a/app/design/frontend/default/iphone/layout/cms.xml +++ b/app/design/frontend/default/iphone/layout/cms.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/iphone/layout/contacts.xml b/app/design/frontend/default/iphone/layout/contacts.xml index 2393b1d65..dc2d583f9 100644 --- a/app/design/frontend/default/iphone/layout/contacts.xml +++ b/app/design/frontend/default/iphone/layout/contacts.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/iphone/layout/customer.xml b/app/design/frontend/default/iphone/layout/customer.xml index 1633e89d2..445de11c9 100644 --- a/app/design/frontend/default/iphone/layout/customer.xml +++ b/app/design/frontend/default/iphone/layout/customer.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/layout/newsletter.xml b/app/design/frontend/default/iphone/layout/newsletter.xml index ad748384e..19c26d713 100644 --- a/app/design/frontend/default/iphone/layout/newsletter.xml +++ b/app/design/frontend/default/iphone/layout/newsletter.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/layout/page.xml b/app/design/frontend/default/iphone/layout/page.xml index 453d07f52..f8bef1bf6 100644 --- a/app/design/frontend/default/iphone/layout/page.xml +++ b/app/design/frontend/default/iphone/layout/page.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/iphone/layout/review.xml b/app/design/frontend/default/iphone/layout/review.xml index 60c9cef1e..96cebf1e3 100644 --- a/app/design/frontend/default/iphone/layout/review.xml +++ b/app/design/frontend/default/iphone/layout/review.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/layout/rss.xml b/app/design/frontend/default/iphone/layout/rss.xml index bca904d34..e2b764943 100644 --- a/app/design/frontend/default/iphone/layout/rss.xml +++ b/app/design/frontend/default/iphone/layout/rss.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/iphone/layout/sales.xml b/app/design/frontend/default/iphone/layout/sales.xml index 8349b4e29..3d00115ff 100644 --- a/app/design/frontend/default/iphone/layout/sales.xml +++ b/app/design/frontend/default/iphone/layout/sales.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/layout/sales/billing_agreement.xml b/app/design/frontend/default/iphone/layout/sales/billing_agreement.xml index a89dc2082..673d2f664 100644 --- a/app/design/frontend/default/iphone/layout/sales/billing_agreement.xml +++ b/app/design/frontend/default/iphone/layout/sales/billing_agreement.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/layout/sales/recurring_profile.xml b/app/design/frontend/default/iphone/layout/sales/recurring_profile.xml index f0a76fdee..0cc174d37 100644 --- a/app/design/frontend/default/iphone/layout/sales/recurring_profile.xml +++ b/app/design/frontend/default/iphone/layout/sales/recurring_profile.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/layout/sendfriend.xml b/app/design/frontend/default/iphone/layout/sendfriend.xml index 65e354a1a..20fbd4adc 100644 --- a/app/design/frontend/default/iphone/layout/sendfriend.xml +++ b/app/design/frontend/default/iphone/layout/sendfriend.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/iphone/layout/tag.xml b/app/design/frontend/default/iphone/layout/tag.xml index a46796069..34daacfd3 100644 --- a/app/design/frontend/default/iphone/layout/tag.xml +++ b/app/design/frontend/default/iphone/layout/tag.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/layout/wishlist.xml b/app/design/frontend/default/iphone/layout/wishlist.xml index 90e907f6e..97a889839 100644 --- a/app/design/frontend/default/iphone/layout/wishlist.xml +++ b/app/design/frontend/default/iphone/layout/wishlist.xml @@ -21,7 +21,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/template/bundle/catalog/product/view/type/bundle.phtml b/app/design/frontend/default/iphone/template/bundle/catalog/product/view/type/bundle.phtml index ebd6058ee..c8130d1f8 100644 --- a/app/design/frontend/default/iphone/template/bundle/catalog/product/view/type/bundle.phtml +++ b/app/design/frontend/default/iphone/template/bundle/catalog/product/view/type/bundle.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/template/bundle/sales/order/items/renderer.phtml b/app/design/frontend/default/iphone/template/bundle/sales/order/items/renderer.phtml index b9f8901d5..df255c01c 100644 --- a/app/design/frontend/default/iphone/template/bundle/sales/order/items/renderer.phtml +++ b/app/design/frontend/default/iphone/template/bundle/sales/order/items/renderer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalog/category/view.phtml b/app/design/frontend/default/iphone/template/catalog/category/view.phtml index 962db2fcb..d2d609c84 100644 --- a/app/design/frontend/default/iphone/template/catalog/category/view.phtml +++ b/app/design/frontend/default/iphone/template/catalog/category/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalog/layer/view.phtml b/app/design/frontend/default/iphone/template/catalog/layer/view.phtml index 3bd8778ce..f4bebb78c 100644 --- a/app/design/frontend/default/iphone/template/catalog/layer/view.phtml +++ b/app/design/frontend/default/iphone/template/catalog/layer/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalog/navigation/top.phtml b/app/design/frontend/default/iphone/template/catalog/navigation/top.phtml index 44f79b487..9eee8da4b 100644 --- a/app/design/frontend/default/iphone/template/catalog/navigation/top.phtml +++ b/app/design/frontend/default/iphone/template/catalog/navigation/top.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalog/product/gallery.phtml b/app/design/frontend/default/iphone/template/catalog/product/gallery.phtml index 6fdc35cfe..f71853d44 100644 --- a/app/design/frontend/default/iphone/template/catalog/product/gallery.phtml +++ b/app/design/frontend/default/iphone/template/catalog/product/gallery.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalog/product/list.phtml b/app/design/frontend/default/iphone/template/catalog/product/list.phtml index f0a4fffe3..5098e5029 100644 --- a/app/design/frontend/default/iphone/template/catalog/product/list.phtml +++ b/app/design/frontend/default/iphone/template/catalog/product/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalog/product/list/toolbar.phtml b/app/design/frontend/default/iphone/template/catalog/product/list/toolbar.phtml index 105191c67..6a764be20 100644 --- a/app/design/frontend/default/iphone/template/catalog/product/list/toolbar.phtml +++ b/app/design/frontend/default/iphone/template/catalog/product/list/toolbar.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalog/product/list/upsell.phtml b/app/design/frontend/default/iphone/template/catalog/product/list/upsell.phtml index e16e31063..19ab1114b 100644 --- a/app/design/frontend/default/iphone/template/catalog/product/list/upsell.phtml +++ b/app/design/frontend/default/iphone/template/catalog/product/list/upsell.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalog/product/price.phtml b/app/design/frontend/default/iphone/template/catalog/product/price.phtml index 88bab46f8..ba181e546 100644 --- a/app/design/frontend/default/iphone/template/catalog/product/price.phtml +++ b/app/design/frontend/default/iphone/template/catalog/product/price.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalog/product/price_msrp.phtml b/app/design/frontend/default/iphone/template/catalog/product/price_msrp.phtml index b0e64e084..921c38030 100644 --- a/app/design/frontend/default/iphone/template/catalog/product/price_msrp.phtml +++ b/app/design/frontend/default/iphone/template/catalog/product/price_msrp.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalog/product/price_msrp_noform.phtml b/app/design/frontend/default/iphone/template/catalog/product/price_msrp_noform.phtml index b0e64e084..921c38030 100644 --- a/app/design/frontend/default/iphone/template/catalog/product/price_msrp_noform.phtml +++ b/app/design/frontend/default/iphone/template/catalog/product/price_msrp_noform.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalog/product/view.phtml b/app/design/frontend/default/iphone/template/catalog/product/view.phtml index 32ea1ab07..c23432aff 100644 --- a/app/design/frontend/default/iphone/template/catalog/product/view.phtml +++ b/app/design/frontend/default/iphone/template/catalog/product/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/template/catalog/product/view/addto.phtml b/app/design/frontend/default/iphone/template/catalog/product/view/addto.phtml index 5692c7121..bc849e58e 100644 --- a/app/design/frontend/default/iphone/template/catalog/product/view/addto.phtml +++ b/app/design/frontend/default/iphone/template/catalog/product/view/addto.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalog/product/view/media.phtml b/app/design/frontend/default/iphone/template/catalog/product/view/media.phtml index 8acde9c13..ef2bf8322 100644 --- a/app/design/frontend/default/iphone/template/catalog/product/view/media.phtml +++ b/app/design/frontend/default/iphone/template/catalog/product/view/media.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/template/catalog/product/view/options/wrapper.phtml b/app/design/frontend/default/iphone/template/catalog/product/view/options/wrapper.phtml index 3a1401705..6e019b413 100644 --- a/app/design/frontend/default/iphone/template/catalog/product/view/options/wrapper.phtml +++ b/app/design/frontend/default/iphone/template/catalog/product/view/options/wrapper.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/catalogsearch/form.mini.phtml b/app/design/frontend/default/iphone/template/catalogsearch/form.mini.phtml index 3364e8f10..4c48e7d53 100644 --- a/app/design/frontend/default/iphone/template/catalogsearch/form.mini.phtml +++ b/app/design/frontend/default/iphone/template/catalogsearch/form.mini.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Core_Block_Template */ diff --git a/app/design/frontend/default/iphone/template/catalogsearch/result.phtml b/app/design/frontend/default/iphone/template/catalogsearch/result.phtml index 846e0b8e2..1102887f5 100644 --- a/app/design/frontend/default/iphone/template/catalogsearch/result.phtml +++ b/app/design/frontend/default/iphone/template/catalogsearch/result.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/checkout/cart.phtml b/app/design/frontend/default/iphone/template/checkout/cart.phtml index b3db1d239..9e7edd7fc 100644 --- a/app/design/frontend/default/iphone/template/checkout/cart.phtml +++ b/app/design/frontend/default/iphone/template/checkout/cart.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml b/app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml index 49c1d6221..188bafa24 100644 --- a/app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml +++ b/app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/checkout/onepage/review/info.phtml b/app/design/frontend/default/iphone/template/checkout/onepage/review/info.phtml index bc17711ff..9ab05f008 100644 --- a/app/design/frontend/default/iphone/template/checkout/onepage/review/info.phtml +++ b/app/design/frontend/default/iphone/template/checkout/onepage/review/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/checkout/onepage/review/item.phtml b/app/design/frontend/default/iphone/template/checkout/onepage/review/item.phtml index 201fe1f53..483824a93 100644 --- a/app/design/frontend/default/iphone/template/checkout/onepage/review/item.phtml +++ b/app/design/frontend/default/iphone/template/checkout/onepage/review/item.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/checkout/onepage/review/totals.phtml b/app/design/frontend/default/iphone/template/checkout/onepage/review/totals.phtml index 24b371f96..65c396462 100644 --- a/app/design/frontend/default/iphone/template/checkout/onepage/review/totals.phtml +++ b/app/design/frontend/default/iphone/template/checkout/onepage/review/totals.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/template/checkout/success.phtml b/app/design/frontend/default/iphone/template/checkout/success.phtml index 71a6797f5..b243f4da7 100644 --- a/app/design/frontend/default/iphone/template/checkout/success.phtml +++ b/app/design/frontend/default/iphone/template/checkout/success.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/customer/account/dashboard/address.phtml b/app/design/frontend/default/iphone/template/customer/account/dashboard/address.phtml index cfd469657..270caa8a2 100644 --- a/app/design/frontend/default/iphone/template/customer/account/dashboard/address.phtml +++ b/app/design/frontend/default/iphone/template/customer/account/dashboard/address.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/customer/account/navigation.phtml b/app/design/frontend/default/iphone/template/customer/account/navigation.phtml index eb02b3d9f..e8b96b803 100644 --- a/app/design/frontend/default/iphone/template/customer/account/navigation.phtml +++ b/app/design/frontend/default/iphone/template/customer/account/navigation.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/customer/address/book.phtml b/app/design/frontend/default/iphone/template/customer/address/book.phtml index a7e2b7d9e..238d09b30 100644 --- a/app/design/frontend/default/iphone/template/customer/address/book.phtml +++ b/app/design/frontend/default/iphone/template/customer/address/book.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/customer/form/login.phtml b/app/design/frontend/default/iphone/template/customer/form/login.phtml index efa7a6b04..2c297f4c6 100644 --- a/app/design/frontend/default/iphone/template/customer/form/login.phtml +++ b/app/design/frontend/default/iphone/template/customer/form/login.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/downloadable/checkout/cart/item/default.phtml b/app/design/frontend/default/iphone/template/downloadable/checkout/cart/item/default.phtml index a3580ec7b..30822d00e 100644 --- a/app/design/frontend/default/iphone/template/downloadable/checkout/cart/item/default.phtml +++ b/app/design/frontend/default/iphone/template/downloadable/checkout/cart/item/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/downloadable/checkout/onepage/review/item.phtml b/app/design/frontend/default/iphone/template/downloadable/checkout/onepage/review/item.phtml index 1d641f802..193f94151 100644 --- a/app/design/frontend/default/iphone/template/downloadable/checkout/onepage/review/item.phtml +++ b/app/design/frontend/default/iphone/template/downloadable/checkout/onepage/review/item.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/downloadable/customer/products/list.phtml b/app/design/frontend/default/iphone/template/downloadable/customer/products/list.phtml index dc84dce40..3fb737201 100644 --- a/app/design/frontend/default/iphone/template/downloadable/customer/products/list.phtml +++ b/app/design/frontend/default/iphone/template/downloadable/customer/products/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/design/frontend/default/iphone/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml index 96bed6846..2b723d5ad 100644 --- a/app/design/frontend/default/iphone/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +++ b/app/design/frontend/default/iphone/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml b/app/design/frontend/default/iphone/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml index d421b3b34..4207dda63 100644 --- a/app/design/frontend/default/iphone/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +++ b/app/design/frontend/default/iphone/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/downloadable/sales/order/items/renderer/downloadable.phtml b/app/design/frontend/default/iphone/template/downloadable/sales/order/items/renderer/downloadable.phtml index f529c68c8..526d65a25 100644 --- a/app/design/frontend/default/iphone/template/downloadable/sales/order/items/renderer/downloadable.phtml +++ b/app/design/frontend/default/iphone/template/downloadable/sales/order/items/renderer/downloadable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/newsletter/subscribe.phtml b/app/design/frontend/default/iphone/template/newsletter/subscribe.phtml index 391af403d..6f927bc35 100644 --- a/app/design/frontend/default/iphone/template/newsletter/subscribe.phtml +++ b/app/design/frontend/default/iphone/template/newsletter/subscribe.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/page/1column.phtml b/app/design/frontend/default/iphone/template/page/1column.phtml index 9fe381000..9dea4e0c9 100644 --- a/app/design/frontend/default/iphone/template/page/1column.phtml +++ b/app/design/frontend/default/iphone/template/page/1column.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/page/html/footer.phtml b/app/design/frontend/default/iphone/template/page/html/footer.phtml index a58db9aa4..c3ba5f585 100644 --- a/app/design/frontend/default/iphone/template/page/html/footer.phtml +++ b/app/design/frontend/default/iphone/template/page/html/footer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/page/html/head.phtml b/app/design/frontend/default/iphone/template/page/html/head.phtml index b5e4c9a2e..3c12c4efa 100644 --- a/app/design/frontend/default/iphone/template/page/html/head.phtml +++ b/app/design/frontend/default/iphone/template/page/html/head.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/page/html/header.phtml b/app/design/frontend/default/iphone/template/page/html/header.phtml index 0d4fe605e..c1f00a1ec 100644 --- a/app/design/frontend/default/iphone/template/page/html/header.phtml +++ b/app/design/frontend/default/iphone/template/page/html/header.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/default/iphone/template/page/html/pager.phtml b/app/design/frontend/default/iphone/template/page/html/pager.phtml index 83260c9be..1c0c8f86f 100644 --- a/app/design/frontend/default/iphone/template/page/html/pager.phtml +++ b/app/design/frontend/default/iphone/template/page/html/pager.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/page/switch/languages.phtml b/app/design/frontend/default/iphone/template/page/switch/languages.phtml index f75eb8a6d..60b9134e8 100644 --- a/app/design/frontend/default/iphone/template/page/switch/languages.phtml +++ b/app/design/frontend/default/iphone/template/page/switch/languages.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/page/switch/stores.phtml b/app/design/frontend/default/iphone/template/page/switch/stores.phtml index 337b1a179..d5b0abe04 100644 --- a/app/design/frontend/default/iphone/template/page/switch/stores.phtml +++ b/app/design/frontend/default/iphone/template/page/switch/stores.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/page/template/links.phtml b/app/design/frontend/default/iphone/template/page/template/links.phtml index 80115bbd7..f9ac7f632 100644 --- a/app/design/frontend/default/iphone/template/page/template/links.phtml +++ b/app/design/frontend/default/iphone/template/page/template/links.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/paypal/express/review.phtml b/app/design/frontend/default/iphone/template/paypal/express/review.phtml index 09685118a..b724300cc 100644 --- a/app/design/frontend/default/iphone/template/paypal/express/review.phtml +++ b/app/design/frontend/default/iphone/template/paypal/express/review.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var $this Mage_Paypal_Block_Express_Review */ diff --git a/app/design/frontend/default/iphone/template/paypal/express/review/details.phtml b/app/design/frontend/default/iphone/template/paypal/express/review/details.phtml index e0f6bd2eb..ec80fdbd5 100644 --- a/app/design/frontend/default/iphone/template/paypal/express/review/details.phtml +++ b/app/design/frontend/default/iphone/template/paypal/express/review/details.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/template/persistent/checkout/onepage/login.phtml b/app/design/frontend/default/iphone/template/persistent/checkout/onepage/login.phtml index 23d1f3e25..2efe0566a 100644 --- a/app/design/frontend/default/iphone/template/persistent/checkout/onepage/login.phtml +++ b/app/design/frontend/default/iphone/template/persistent/checkout/onepage/login.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml b/app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml index 5df3a2bc1..418c23449 100644 --- a/app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml +++ b/app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/persistent/remember_me_tooltip.phtml b/app/design/frontend/default/iphone/template/persistent/remember_me_tooltip.phtml index 7efdb863a..6ab1375e9 100644 --- a/app/design/frontend/default/iphone/template/persistent/remember_me_tooltip.phtml +++ b/app/design/frontend/default/iphone/template/persistent/remember_me_tooltip.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/review/customer/list.phtml b/app/design/frontend/default/iphone/template/review/customer/list.phtml index f078bc68a..dd6de470e 100644 --- a/app/design/frontend/default/iphone/template/review/customer/list.phtml +++ b/app/design/frontend/default/iphone/template/review/customer/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/sales/billing/agreement/view.phtml b/app/design/frontend/default/iphone/template/sales/billing/agreement/view.phtml index 2943f95b5..d91b05f1c 100644 --- a/app/design/frontend/default/iphone/template/sales/billing/agreement/view.phtml +++ b/app/design/frontend/default/iphone/template/sales/billing/agreement/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/sales/billing/agreements.phtml b/app/design/frontend/default/iphone/template/sales/billing/agreements.phtml index 05f77a9b4..c0e985bea 100644 --- a/app/design/frontend/default/iphone/template/sales/billing/agreements.phtml +++ b/app/design/frontend/default/iphone/template/sales/billing/agreements.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/sales/order/creditmemo/items.phtml b/app/design/frontend/default/iphone/template/sales/order/creditmemo/items.phtml index 14ea8b07c..895cba1e8 100644 --- a/app/design/frontend/default/iphone/template/sales/order/creditmemo/items.phtml +++ b/app/design/frontend/default/iphone/template/sales/order/creditmemo/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/default/iphone/template/sales/order/creditmemo/items/renderer/default.phtml index c252e0713..7b1a84fca 100644 --- a/app/design/frontend/default/iphone/template/sales/order/creditmemo/items/renderer/default.phtml +++ b/app/design/frontend/default/iphone/template/sales/order/creditmemo/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/sales/order/history.phtml b/app/design/frontend/default/iphone/template/sales/order/history.phtml index 8c5a807a5..1ff02ba6a 100644 --- a/app/design/frontend/default/iphone/template/sales/order/history.phtml +++ b/app/design/frontend/default/iphone/template/sales/order/history.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/sales/order/invoice/items.phtml b/app/design/frontend/default/iphone/template/sales/order/invoice/items.phtml index f09324507..aaf5d15f3 100644 --- a/app/design/frontend/default/iphone/template/sales/order/invoice/items.phtml +++ b/app/design/frontend/default/iphone/template/sales/order/invoice/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/default/iphone/template/sales/order/invoice/items/renderer/default.phtml index e1e0e0bbb..003ec5ff4 100644 --- a/app/design/frontend/default/iphone/template/sales/order/invoice/items/renderer/default.phtml +++ b/app/design/frontend/default/iphone/template/sales/order/invoice/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/sales/order/items.phtml b/app/design/frontend/default/iphone/template/sales/order/items.phtml index 48cd98623..2ff2383f6 100644 --- a/app/design/frontend/default/iphone/template/sales/order/items.phtml +++ b/app/design/frontend/default/iphone/template/sales/order/items.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/sales/order/items/renderer/default.phtml b/app/design/frontend/default/iphone/template/sales/order/items/renderer/default.phtml index e78b56ea3..c353d4719 100644 --- a/app/design/frontend/default/iphone/template/sales/order/items/renderer/default.phtml +++ b/app/design/frontend/default/iphone/template/sales/order/items/renderer/default.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/sales/order/recent.phtml b/app/design/frontend/default/iphone/template/sales/order/recent.phtml index 5b8d27744..fe1bbac25 100644 --- a/app/design/frontend/default/iphone/template/sales/order/recent.phtml +++ b/app/design/frontend/default/iphone/template/sales/order/recent.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/sales/order/totals.phtml b/app/design/frontend/default/iphone/template/sales/order/totals.phtml index fa5df1e52..d80e95a7a 100644 --- a/app/design/frontend/default/iphone/template/sales/order/totals.phtml +++ b/app/design/frontend/default/iphone/template/sales/order/totals.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml b/app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml index dab1eb46b..f22be64b0 100644 --- a/app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml +++ b/app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/tag/list.phtml b/app/design/frontend/default/iphone/template/tag/list.phtml index 3d38262d7..1c34fe1af 100644 --- a/app/design/frontend/default/iphone/template/tag/list.phtml +++ b/app/design/frontend/default/iphone/template/tag/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/tax/order/tax.phtml b/app/design/frontend/default/iphone/template/tax/order/tax.phtml index d791727e8..41437a537 100644 --- a/app/design/frontend/default/iphone/template/tax/order/tax.phtml +++ b/app/design/frontend/default/iphone/template/tax/order/tax.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/wishlist/item/column/cart.phtml b/app/design/frontend/default/iphone/template/wishlist/item/column/cart.phtml index 5ca2a29c0..660be7763 100644 --- a/app/design/frontend/default/iphone/template/wishlist/item/column/cart.phtml +++ b/app/design/frontend/default/iphone/template/wishlist/item/column/cart.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/template/wishlist/item/column/image.phtml b/app/design/frontend/default/iphone/template/wishlist/item/column/image.phtml index 73873b8ea..55aa7350c 100644 --- a/app/design/frontend/default/iphone/template/wishlist/item/column/image.phtml +++ b/app/design/frontend/default/iphone/template/wishlist/item/column/image.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/template/wishlist/item/column/info.phtml b/app/design/frontend/default/iphone/template/wishlist/item/column/info.phtml index b7c61932a..772e50aa6 100644 --- a/app/design/frontend/default/iphone/template/wishlist/item/column/info.phtml +++ b/app/design/frontend/default/iphone/template/wishlist/item/column/info.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/iphone/template/wishlist/item/configure/addto.phtml b/app/design/frontend/default/iphone/template/wishlist/item/configure/addto.phtml index 071008e45..cbc774a25 100644 --- a/app/design/frontend/default/iphone/template/wishlist/item/configure/addto.phtml +++ b/app/design/frontend/default/iphone/template/wishlist/item/configure/addto.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/wishlist/item/list.phtml b/app/design/frontend/default/iphone/template/wishlist/item/list.phtml index 426932419..2a9f1d24e 100644 --- a/app/design/frontend/default/iphone/template/wishlist/item/list.phtml +++ b/app/design/frontend/default/iphone/template/wishlist/item/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/iphone/template/wishlist/shared.phtml b/app/design/frontend/default/iphone/template/wishlist/shared.phtml index 6091487cb..5a0178f49 100644 --- a/app/design/frontend/default/iphone/template/wishlist/shared.phtml +++ b/app/design/frontend/default/iphone/template/wishlist/shared.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Wishlist_Block_Share_Wishlist */ diff --git a/app/design/frontend/default/iphone/template/wishlist/view.phtml b/app/design/frontend/default/iphone/template/wishlist/view.phtml index d8b0d9a07..69e51f030 100644 --- a/app/design/frontend/default/iphone/template/wishlist/view.phtml +++ b/app/design/frontend/default/iphone/template/wishlist/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_iphone - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Wishlist_Block_Customer_Wishlist */ diff --git a/app/design/frontend/default/modern/etc/theme.xml b/app/design/frontend/default/modern/etc/theme.xml deleted file mode 100644 index c5d6b9fa0..000000000 --- a/app/design/frontend/default/modern/etc/theme.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - default/default - diff --git a/app/design/frontend/default/modern/etc/widget.xml b/app/design/frontend/default/modern/etc/widget.xml index 951668160..8015f9642 100644 --- a/app/design/frontend/default/modern/etc/widget.xml +++ b/app/design/frontend/default/modern/etc/widget.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/modern/layout/catalog.xml b/app/design/frontend/default/modern/layout/catalog.xml index 998104f85..0dc075350 100644 --- a/app/design/frontend/default/modern/layout/catalog.xml +++ b/app/design/frontend/default/modern/layout/catalog.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/layout/catalogsearch.xml b/app/design/frontend/default/modern/layout/catalogsearch.xml index 6c53aaa07..23b0bc55f 100644 --- a/app/design/frontend/default/modern/layout/catalogsearch.xml +++ b/app/design/frontend/default/modern/layout/catalogsearch.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/layout/checkout.xml b/app/design/frontend/default/modern/layout/checkout.xml index 918648ee7..042df09f6 100644 --- a/app/design/frontend/default/modern/layout/checkout.xml +++ b/app/design/frontend/default/modern/layout/checkout.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/layout/contacts.xml b/app/design/frontend/default/modern/layout/contacts.xml index 956544bcc..97f47246e 100644 --- a/app/design/frontend/default/modern/layout/contacts.xml +++ b/app/design/frontend/default/modern/layout/contacts.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/modern/layout/customer.xml b/app/design/frontend/default/modern/layout/customer.xml index f1fd04faa..e99b0b496 100644 --- a/app/design/frontend/default/modern/layout/customer.xml +++ b/app/design/frontend/default/modern/layout/customer.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/layout/newsletter.xml b/app/design/frontend/default/modern/layout/newsletter.xml index 5da96da00..df585ffb6 100644 --- a/app/design/frontend/default/modern/layout/newsletter.xml +++ b/app/design/frontend/default/modern/layout/newsletter.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/layout/page.xml b/app/design/frontend/default/modern/layout/page.xml index 49cebb30b..b3a615fcd 100644 --- a/app/design/frontend/default/modern/layout/page.xml +++ b/app/design/frontend/default/modern/layout/page.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/modern/layout/payment.xml b/app/design/frontend/default/modern/layout/payment.xml index 71a27a8e4..94fe78a04 100644 --- a/app/design/frontend/default/modern/layout/payment.xml +++ b/app/design/frontend/default/modern/layout/payment.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/layout/persistent.xml b/app/design/frontend/default/modern/layout/persistent.xml index 501b65823..3652f8b6f 100644 --- a/app/design/frontend/default/modern/layout/persistent.xml +++ b/app/design/frontend/default/modern/layout/persistent.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/modern/layout/review.xml b/app/design/frontend/default/modern/layout/review.xml index 7670ecd0c..75ebd94c1 100644 --- a/app/design/frontend/default/modern/layout/review.xml +++ b/app/design/frontend/default/modern/layout/review.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/layout/rss.xml b/app/design/frontend/default/modern/layout/rss.xml index 877ed1492..cab5b1aa4 100644 --- a/app/design/frontend/default/modern/layout/rss.xml +++ b/app/design/frontend/default/modern/layout/rss.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/modern/layout/sales.xml b/app/design/frontend/default/modern/layout/sales.xml index 5f882aa67..24583705a 100644 --- a/app/design/frontend/default/modern/layout/sales.xml +++ b/app/design/frontend/default/modern/layout/sales.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/layout/sendfriend.xml b/app/design/frontend/default/modern/layout/sendfriend.xml index 11f0656d5..337d1d456 100644 --- a/app/design/frontend/default/modern/layout/sendfriend.xml +++ b/app/design/frontend/default/modern/layout/sendfriend.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/modern/layout/tag.xml b/app/design/frontend/default/modern/layout/tag.xml index afa724360..d8beb24b2 100644 --- a/app/design/frontend/default/modern/layout/tag.xml +++ b/app/design/frontend/default/modern/layout/tag.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/layout/wishlist.xml b/app/design/frontend/default/modern/layout/wishlist.xml index a1a26a1e0..f7038b854 100644 --- a/app/design/frontend/default/modern/layout/wishlist.xml +++ b/app/design/frontend/default/modern/layout/wishlist.xml @@ -21,7 +21,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/template/catalog/product/list.phtml b/app/design/frontend/default/modern/template/catalog/product/list.phtml index 35a224da5..cc05e4225 100644 --- a/app/design/frontend/default/modern/template/catalog/product/list.phtml +++ b/app/design/frontend/default/modern/template/catalog/product/list.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/modern/template/catalog/product/list/upsell.phtml b/app/design/frontend/default/modern/template/catalog/product/list/upsell.phtml index b878a5044..f5a7cc6d0 100644 --- a/app/design/frontend/default/modern/template/catalog/product/list/upsell.phtml +++ b/app/design/frontend/default/modern/template/catalog/product/list/upsell.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/modern/template/catalog/product/view.phtml b/app/design/frontend/default/modern/template/catalog/product/view.phtml index 966465c38..bb411ec1d 100644 --- a/app/design/frontend/default/modern/template/catalog/product/view.phtml +++ b/app/design/frontend/default/modern/template/catalog/product/view.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/template/catalog/product/view/media.phtml b/app/design/frontend/default/modern/template/catalog/product/view/media.phtml index d9cae39a4..8163ef830 100644 --- a/app/design/frontend/default/modern/template/catalog/product/view/media.phtml +++ b/app/design/frontend/default/modern/template/catalog/product/view/media.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/template/catalog/product/view/tabs.phtml b/app/design/frontend/default/modern/template/catalog/product/view/tabs.phtml index a03379e8d..ababedad8 100644 --- a/app/design/frontend/default/modern/template/catalog/product/view/tabs.phtml +++ b/app/design/frontend/default/modern/template/catalog/product/view/tabs.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/modern/template/catalogsearch/form.mini.phtml b/app/design/frontend/default/modern/template/catalogsearch/form.mini.phtml index aed99d167..40978fbd0 100644 --- a/app/design/frontend/default/modern/template/catalogsearch/form.mini.phtml +++ b/app/design/frontend/default/modern/template/catalogsearch/form.mini.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Core_Block_Template */ diff --git a/app/design/frontend/default/modern/template/checkout/cart.phtml b/app/design/frontend/default/modern/template/checkout/cart.phtml index 9efad7a5c..49416b358 100644 --- a/app/design/frontend/default/modern/template/checkout/cart.phtml +++ b/app/design/frontend/default/modern/template/checkout/cart.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/modern/template/newsletter/subscribe.phtml b/app/design/frontend/default/modern/template/newsletter/subscribe.phtml index 3515fa4f9..8d4c07ed2 100644 --- a/app/design/frontend/default/modern/template/newsletter/subscribe.phtml +++ b/app/design/frontend/default/modern/template/newsletter/subscribe.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/modern/template/page/3columns.phtml b/app/design/frontend/default/modern/template/page/3columns.phtml index aa18642a7..940d4aa30 100644 --- a/app/design/frontend/default/modern/template/page/3columns.phtml +++ b/app/design/frontend/default/modern/template/page/3columns.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/modern/template/page/html/footer.phtml b/app/design/frontend/default/modern/template/page/html/footer.phtml index 707f7e30c..5394883ad 100644 --- a/app/design/frontend/default/modern/template/page/html/footer.phtml +++ b/app/design/frontend/default/modern/template/page/html/footer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/modern/template/page/html/header.phtml b/app/design/frontend/default/modern/template/page/html/header.phtml index edc2b4e68..54da525a7 100644 --- a/app/design/frontend/default/modern/template/page/html/header.phtml +++ b/app/design/frontend/default/modern/template/page/html/header.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/default/modern/template/sample/home.phtml b/app/design/frontend/default/modern/template/sample/home.phtml index 69d61d5ca..ee53cb573 100644 --- a/app/design/frontend/default/modern/template/sample/home.phtml +++ b/app/design/frontend/default/modern/template/sample/home.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_modern - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/etc/theme.xml b/app/design/frontend/rwd/default/etc/theme.xml deleted file mode 100644 index 2067f2a17..000000000 --- a/app/design/frontend/rwd/default/etc/theme.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - diff --git a/app/design/frontend/rwd/default/etc/widget.xml b/app/design/frontend/rwd/default/etc/widget.xml deleted file mode 100644 index 4a1c3d4ce..000000000 --- a/app/design/frontend/rwd/default/etc/widget.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - left - - - - content - - - - right - - - - - - - - - - - - left - - - - content - - - - right - - - - - - - - - - - - left - - - - content - - - - right - - - - - diff --git a/app/design/frontend/rwd/default/layout/bundle.xml b/app/design/frontend/rwd/default/layout/bundle.xml deleted file mode 100644 index e8a239107..000000000 --- a/app/design/frontend/rwd/default/layout/bundle.xml +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - - - - bundlebundle/catalog_product_price - - - - - - bundlebundle/catalog_product_price - - - - - - bundlebundle/catalog_product_price - - - - - - bundlebundle/catalog_product_price - - - - - - bundlebundle/catalog_product_price - - - - - - bundlebundle/catalog_product_price - - - - - - bundlebundle/catalog_product_price - - - - - - bundlebundle/catalog_product_price - - - - - - bundlebundle/checkout_cart_item_renderer - - - bundlebundle/checkout_cart_item_renderer - - - bundlebundle/catalog_product_price - - - bundlebundle/catalog_product_price - - - - - - bundlebundle/catalog_product_price - - - - - - - - - bundlebundle/catalog_product_price - bundle4 - - - - - - - - bundlebundle/checkout_cart_item_renderer - - - - - - - - bundlebundle/checkout_cart_item_renderer - - - bundlebundle/catalog_product_price - - - - - - - - bundlebundle/checkout_cart_item_renderer - - - - - - bundlebundle/checkout_cart_item_renderer - - - - - - bundlebundle/checkout_cart_item_renderer - - - bundlebundle/checkout_cart_item_renderer - - - - - - bundlebundle/checkout_cart_item_renderer - - - - - - bundlebundle/checkout_cart_item_renderer - - - - - bundlebundle/checkout_cart_item_renderer - - - - - - bundlebundle/checkout_cart_item_renderer - - - - - bundlebundle/checkout_cart_item_renderer - - - - - - - - - skin_jsjs/bundle.js - - - bundlebundle/catalog_product_price - - catalog/product/price_msrp_item.phtml - - - - - - - selectbundle/catalog_product_view_type_bundle_option_select - multibundle/catalog_product_view_type_bundle_option_multi - radiobundle/catalog_product_view_type_bundle_option_radio - checkboxbundle/catalog_product_view_type_bundle_option_checkbox - - product.info.bundle.options - - - - - - - - bundlebundle/catalog_product_price - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - - bundlebundle/sales_order_items_renderer - - - - - - bundlebundle/sales_order_items_renderer - - - - - - - bundlebundle/catalog_product_price - - - - - bundlebundle/catalog_product_price - - - - - bundlebundle/catalog_product_price - - - diff --git a/app/design/frontend/rwd/default/layout/captcha.xml b/app/design/frontend/rwd/default/layout/captcha.xml deleted file mode 100644 index 8651c604e..000000000 --- a/app/design/frontend/rwd/default/layout/captcha.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/design/frontend/rwd/default/layout/catalog.xml b/app/design/frontend/rwd/default/layout/catalog.xml deleted file mode 100644 index 99e54f517..000000000 --- a/app/design/frontend/rwd/default/layout/catalog.xml +++ /dev/null @@ -1,447 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - Site Map - - - - - - - - - - - - - - - - - - - - - - - - - empty6 - one_column5 - two_columns_left4 - two_columns_right4 - three_columns3 - product_list_toolbar - - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - empty6 - one_column5 - two_columns_left4 - two_columns_right4 - three_columns3 - product_list_toolbar - - 4 - - - - - - - - - - - - - - - - - head.viewport - - - - - - - - - catalog.compare.sidebar - - - - - - - - - - - - - - - skin_js - - js_csscalendar/calendar-win2k-1.css - jscalendar/calendar.js - jscalendar/calendar-setup.js - - - - - - - - - - - - - - - 6 - upsell6 - - - - - detailed_info - Description - - - detailed_info - Additional Information - - - - - - - - - - - - - - - - textcatalog/product_view_options_type_text - filecatalog/product_view_options_type_file - selectcatalog/product_view_options_type_select - datecatalog/product_view_options_type_date - - - - - - product.tierprices - - product.info.addtocart - product.info.addto - product.info.sharing - - - - alias_in_layoutcontainer1 - options_containerproduct - product.info.options.wrapper - product.info.options.wrapper.bottom - - - alias_in_layoutcontainer2 - options_containerproduct - product.info.options.wrapper - product.info.options.wrapper.bottom - - container1ifEquals0alias_in_layoutoptions_container - container2ifEquals0alias_in_layoutoptions_container - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Site Map - - - - Categories - - seo.sitemap.pager.top - seo.sitemap.pager.bottom - categories - - - - Products Sitemap - - - - - - - - - - - - - seo.sitemap.tree.pager.top - seo.sitemap.tree.pager.bottom - - - - - - - - Site Map - - - - Products - - seo.sitemap.pager.top - seo.sitemap.pager.bottom - products - - - - Categories Sitemap - - - diff --git a/app/design/frontend/rwd/default/layout/catalog_msrp.xml b/app/design/frontend/rwd/default/layout/catalog_msrp.xml deleted file mode 100644 index 51ed05077..000000000 --- a/app/design/frontend/rwd/default/layout/catalog_msrp.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - skin_jsjs/msrp.js - skin_jsjs/msrp_rwd.js - - - - - - - - msrpcatalog/product_price - - - msrpcatalog/product_price - - - - - msrpcatalog/product_price - - - - - msrpcatalog/product_price - msrp_itemcatalog/product_price - msrp_noformcatalog/product_price - - - diff --git a/app/design/frontend/rwd/default/layout/catalogsearch.xml b/app/design/frontend/rwd/default/layout/catalogsearch.xml deleted file mode 100644 index 4a9fdedd1..000000000 --- a/app/design/frontend/rwd/default/layout/catalogsearch.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - Search Terms - - - - - Advanced Search - - - - - - - - - - - - - - - - - - - - - - - empty6 - one_column5 - two_columns_left4 - two_columns_right4 - three_columns3 - product_list_toolbar - - - - - - - - - - - - - - - - Advanced Search - js_csscalendar/calendar-win2k-1.css - jscalendar/calendar.js - jscalendar/calendar-setup.js - - - - - - - - - - - - - - - - - - - - - - - - - empty6 - one_column5 - two_columns_left4 - two_columns_right4 - three_columns3 - product_list_toolbar - - - - - - - - - - - - - - - Search Terms - - - - - - - - - - diff --git a/app/design/frontend/rwd/default/layout/checkout.xml b/app/design/frontend/rwd/default/layout/checkout.xml deleted file mode 100644 index 67b7078aa..000000000 --- a/app/design/frontend/rwd/default/layout/checkout.xml +++ /dev/null @@ -1,542 +0,0 @@ - - - - - - - - - - - - - - - - - - - - defaultcheckout/cart_item_renderer - simplecheckout/cart_item_renderer - groupedcheckout/cart_item_renderer_grouped - configurablecheckout/cart_item_renderer_configurable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - checkout/cart.phtml - checkout/cart/noItems.phtml - - simplecheckout/cart_item_renderer - groupedcheckout/cart_item_renderer_grouped - configurablecheckout/cart_item_renderer_configurable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - defaultcheckout/cart_item_renderer - groupedcheckout/cart_item_renderer_grouped - configurablecheckout/cart_item_renderer_configurable - - - - - - - - - - - - - - - - defaultcheckout/cart_item_renderer - groupedcheckout/cart_item_renderer_grouped - configurablecheckout/cart_item_renderer_configurable - - - defaultcheckout/cart_item_renderer - groupedcheckout/cart_item_renderer_grouped - configurablecheckout/cart_item_renderer_configurable - - - - - - - - - - - - - - - - - purchaseorder - - - - - - - - - - - - - - - - - - - - - - defaultcheckout/cart_item_renderer - groupedcheckout/cart_item_renderer_grouped - configurablecheckout/cart_item_renderer_configurable - groupedcheckout/cart_item_renderer_grouped - configurablecheckout/cart_item_renderer_configurable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - checkout-progress-wrapper - - - - - - - - - - - - - - 1 - - - - - - - - - - - purchaseorder - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - purchaseorder - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - defaultcheckout/cart_item_renderer - groupedcheckout/cart_item_renderer_grouped - configurablecheckout/cart_item_renderer_configurable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/design/frontend/rwd/default/layout/cms.xml b/app/design/frontend/rwd/default/layout/cms.xml deleted file mode 100644 index fc0b855e0..000000000 --- a/app/design/frontend/rwd/default/layout/cms.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - footer_links_company - - - - footer_links_sm - - - - - - - - cms_menu - - - - - - - - - - - - - - - std - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/design/frontend/rwd/default/layout/contacts.xml b/app/design/frontend/rwd/default/layout/contacts.xml deleted file mode 100644 index 3425fe5b8..000000000 --- a/app/design/frontend/rwd/default/layout/contacts.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - Contact Us - - - - Contact Us - - - - - - - diff --git a/app/design/frontend/rwd/default/layout/customer.xml b/app/design/frontend/rwd/default/layout/customer.xml deleted file mode 100644 index 2fa3cf5d6..000000000 --- a/app/design/frontend/rwd/default/layout/customer.xml +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - - - My Account10 - Register100
  • - - - My Account - - - - - - - - - Log Out100 - - - - - - - - - Log In100 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Forgot Your Password - - - - Password forgotten - - - - - - - - - - - - - - - Reset a Password - - - - - - - - Reset a Password - - - - - - - - - - - - - - Send confirmation link - - - - - - - - - - - Edit Account Info - - - - - - - left.permanent.callout - - - - - - - - - - - - customer-account - - - - - - my-account - - - - - - accountcustomer/account/ - account_editcustomer/account/edit/ - address_bookcustomer/address/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/design/frontend/rwd/default/layout/directory.xml b/app/design/frontend/rwd/default/layout/directory.xml deleted file mode 100644 index 0d3001055..000000000 --- a/app/design/frontend/rwd/default/layout/directory.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/design/frontend/rwd/default/layout/downloadable.xml b/app/design/frontend/rwd/default/layout/downloadable.xml deleted file mode 100644 index 228c0abc8..000000000 --- a/app/design/frontend/rwd/default/layout/downloadable.xml +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - downloadable_productsdownloadable/customer/products - - - - - - - - - - - My Downloadable Products - - - - - - downloadabledownloadable/checkout_cart_item_renderer - - - - - - downloadabledownloadable/checkout_cart_item_renderer - - - - - - - - - - - - downloadabledownloadable/checkout_cart_item_renderer - - - - - - downloadabledownloadable/checkout_cart_item_renderer - - - - - - downloadabledownloadable/checkout_cart_item_renderer - - - - - - - - - - - - downloadabledownloadable/checkout_cart_item_renderer - - - - - downloadabledownloadable/checkout_cart_item_renderer - - - - - - downloadabledownloadable/checkout_cart_item_renderer - - - - - downloadabledownloadable/checkout_cart_item_renderer - - - - - - downloadabledownloadable/sales_order_item_renderer_downloadable - - - - - - downloadabledownloadable/sales_order_item_renderer_downloadable - - - - - - downloadabledownloadable/sales_order_item_renderer_downloadable - - - - - - - - downloadabledownloadable/sales_order_item_renderer_downloadable - - - - - - downloadabledownloadable/sales_order_item_renderer_downloadable - - - - - - downloadabledownloadable/sales_order_item_renderer_downloadable - - - - - - - - - downloadabledownloadable/sales_order_item_renderer_downloadable - - - - - - downloadabledownloadable/sales_order_item_renderer_downloadable - - - - - - downloadabledownloadable/sales_order_item_renderer_downloadable - - - - - - downloadabledownloadable/sales_order_item_renderer_downloadable - - - - - - downloadabledownloadable/sales_order_item_renderer_downloadable - - - - - - downloadabledownloadable/sales_order_item_renderer_downloadable - - - - - - - - downloadabledownloadable/sales_order_email_items_order_downloadable - - - - - - downloadabledownloadable/sales_order_email_items_downloadable - - - - - - downloadabledownloadable/sales_order_email_items_downloadable - - - - - - - - - - - - - - - product.info.downloadable.options - - - - diff --git a/app/design/frontend/rwd/default/layout/newsletter.xml b/app/design/frontend/rwd/default/layout/newsletter.xml deleted file mode 100644 index 681461244..000000000 --- a/app/design/frontend/rwd/default/layout/newsletter.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - newsletternewsletter/manage/ - - - - - - - - - - - - - - - - - diff --git a/app/design/frontend/rwd/default/layout/oauth.xml b/app/design/frontend/rwd/default/layout/oauth.xml deleted file mode 100644 index 512f09881..000000000 --- a/app/design/frontend/rwd/default/layout/oauth.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - jslib/ccard.js - jsscriptaculous/controls.js - jsscriptaculous/builder.js - jsscriptaculous/dragdrop.js - jsscriptaculous/controls.js - jsscriptaculous/slider.js - jsvarien/js.js - jsvarien/menu.js - - - - - - - - - - - - css/oauth-simple.css - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OAuth Customer Tokens - oauth/customer_token - - - - - - - - - - - - - - diff --git a/app/design/frontend/rwd/default/layout/page.xml b/app/design/frontend/rwd/default/layout/page.xml deleted file mode 100644 index 966dfe69a..000000000 --- a/app/design/frontend/rwd/default/layout/page.xml +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - skin_jsjs/ie6.js - - - skin_jsjs/lib/jquery-1.10.2.min.js - skin_jsjs/lib/modernizr.custom.min.js - skin_jsjs/lib/selectivizr.js - skin_jsjs/lib/matchMedia.js - skin_jsjs/lib/matchMedia.addListener.js - skin_jsjs/lib/enquire.js - skin_jsjs/app.js - skin_jsjs/lib/jquery.cycle2.min.js - skin_jsjs/lib/jquery.cycle2.swipe.min.js - skin_jsjs/slideshow.js - skin_jsjs/lib/imagesloaded.js - stylesheet//fonts.googleapis.com/css?family=Raleway:300,400,500,700,600 - skin_jsjs/minicart.js - - - skin_csscss/styles-ie8.css - skin_csscss/madisonisland-ie8.css - - - skin_csscss/styles.css]]> - skin_csscss/madisonisland.css]]> - - - - ]]> - - - - - - - - - - - - - - - - - - - - - top-container - - - - - - - - - - - - - - - - - - - - - - - - - - - - footer-before-container - - - - - - bottom-container - - - - Quick Links - - - Account - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - css/styles.css - skin_csscss/styles-ie.csslt IE 8 - css/widgets.css - css/print.cssmedia="print" - - jslib/ds-sleight.jslt IE 7 - - - - - - - - - - - - - - - - - 1 - empty - - - - - - - - - 1 - one_column - - - - - - - - - 1 - two_columns_left - - - - - - - - - 1 - two_columns_right - - - - - - - - - 1 - three_columns - - - diff --git a/app/design/frontend/rwd/default/layout/paypal.xml b/app/design/frontend/rwd/default/layout/paypal.xml deleted file mode 100644 index de0b63489..000000000 --- a/app/design/frontend/rwd/default/layout/paypal.xml +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - 1 - after - - - - - - 1 - after - - - - - - - - - - - - - - - - - - - defaultcheckout/cart_item_renderer - groupedcheckout/cart_item_renderer_grouped - configurablecheckout/cart_item_renderer_configurable - - - - - - - skin_jsjs/checkout/review.js - - - - - - - defaultcheckout/cart_item_renderer - groupedcheckout/cart_item_renderer_grouped - configurablecheckout/cart_item_renderer_configurable - - - - - - - - - true - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - after - - - - - diff --git a/app/design/frontend/rwd/default/layout/persistent.xml b/app/design/frontend/rwd/default/layout/persistent.xml deleted file mode 100644 index de5b59374..000000000 --- a/app/design/frontend/rwd/default/layout/persistent.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/design/frontend/rwd/default/layout/poll.xml b/app/design/frontend/rwd/default/layout/poll.xml deleted file mode 100644 index 57892d0ec..000000000 --- a/app/design/frontend/rwd/default/layout/poll.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/design/frontend/rwd/default/layout/review.xml b/app/design/frontend/rwd/default/layout/review.xml deleted file mode 100644 index 8a78c5a07..000000000 --- a/app/design/frontend/rwd/default/layout/review.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - reviewsreview/customer - - - - - - - - - - - - - - - - - - - - - detailed_info - Reviews - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/design/frontend/rwd/default/layout/rss.xml b/app/design/frontend/rwd/default/layout/rss.xml deleted file mode 100644 index e4c307a8e..000000000 --- a/app/design/frontend/rwd/default/layout/rss.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - msrp_rsscatalog/product_price - - - - - - msrp_rsscatalog/product_price - - - - - - - - - - - - - - msrp_rsscatalog/product_price - - - - - - - - - - - - - - msrp_rsscatalog/product_price - - - - - - - - - - diff --git a/app/design/frontend/rwd/default/layout/sales.xml b/app/design/frontend/rwd/default/layout/sales.xml deleted file mode 100644 index a212e8c6d..000000000 --- a/app/design/frontend/rwd/default/layout/sales.xml +++ /dev/null @@ -1,526 +0,0 @@ - - - - - - - - - - - - - - - - - - reorder - - - - - - - orderssales/order/history/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - defaultsales/order_item_renderer_default - groupedsales/order_item_renderer_grouped - - colspan="4" class="a-right" - class="last a-right" - - - - - - - view - invoice*/*/invoice - shipment*/*/shipment - creditmemo*/*/creditmemo - - - - - - - - - - - - - - - - defaultsales/order_item_renderer_default - groupedsales/order_item_renderer_grouped - - colspan="4" class="a-right" - class="last a-right" - - - - - - - - view*/*/view - invoice - shipment*/*/shipment - creditmemo*/*/creditmemo - - - - - - - - - - - - - - defaultsales/order_item_renderer_default - - - - - - view*/*/view - invoice*/*/invoice - shipment - creditmemo*/*/creditmemo - - - - - - - - - - - - - - defaultsales/order_item_renderer_default - groupedsales/order_item_renderer_grouped - - colspan="6" class="a-right" - class="a-right" - - - - - - - - view*/*/view - invoice*/*/invoice - shipment*/*/shipment - creditmemo - - - - - - - - - - - - - - - - defaultsales/order_item_renderer_default - groupedsales/order_item_renderer_grouped - - colspan="4" class="a-right" - class="last a-right" - - 1 - - - - - - - - - - - - defaultsales/order_item_renderer_default - groupedsales/order_item_renderer_grouped - - colspan="4" class="a-right" - class="last a-right" - - 1 - - - - - - - - - - - - defaultsales/order_item_renderer_default - - - - - - - - - defaultsales/order_item_renderer_default - groupedsales/order_item_renderer_grouped - - colspan="6" class="a-right" - class="a-right" - - 1 - - - - - - - - - - - defaultsales/order_email_items_order_default - groupedsales/order_email_items_order_grouped - - colspan="3" align="right" style="padding:3px 9px" - align="right" style="padding:3px 9px" - - 1 - - - - - - - - - defaultsales/order_email_items_default - groupedsales/order_email_items_order_grouped - - colspan="3" align="right" style="padding:3px 9px" - align="right" style="padding:3px 9px" - - 1 - - - - - - - - - defaultsales/order_email_items_default - - - - - - - defaultsales/order_email_items_default - groupedsales/order_email_items_order_grouped - - colspan="3" align="right" style="padding:3px 9px" - align="right" style="padding:3px 9px" - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - defaultsales/order_item_renderer_default - groupedsales/order_item_renderer_grouped - - colspan="4" class="a-right" - class="last a-right" - - - - - - - view - invoice*/*/invoice - shipment*/*/shipment - creditmemo*/*/creditmemo - - - - - - - - - - - - - - - defaultsales/order_item_renderer_default - groupedsales/order_item_renderer_grouped - - colspan="4" class="a-right" - class="last a-right" - - - - - - - - view*/*/view - invoice - shipment*/*/shipment - creditmemo*/*/creditmemo - - - - - - - - - - - - - - - defaultsales/order_item_renderer_default - - - - - - view*/*/view - invoice*/*/invoice - shipment - creditmemo*/*/creditmemo - - - - - - - - - - - - - - - defaultsales/order_item_renderer_default - groupedsales/order_item_renderer_grouped - - colspan="6" class="a-right" - class="a-right" - - - - - - - - view*/*/view - invoice*/*/invoice - shipment*/*/shipment - creditmemo - - - - - - - - - - - - - - - - - defaultsales/order_item_renderer_default - groupedsales/order_item_renderer_grouped - - colspan="4" class="a-right" - class="last a-right" - - 1 - - - - - - - - - - - defaultsales/order_item_renderer_default - groupedsales/order_item_renderer_grouped - - colspan="4" class="a-right" - class="last a-right" - - 1 - - - - - - - - - - - defaultsales/order_item_renderer_default - - - - - - - - defaultsales/order_item_renderer_default - groupedsales/order_item_renderer_grouped - - colspan="6" class="a-right" - class="a-right" - - 1 - - - - - - - - - - return_link - - - diff --git a/app/design/frontend/rwd/default/layout/tag.xml b/app/design/frontend/rwd/default/layout/tag.xml deleted file mode 100644 index a30d84878..000000000 --- a/app/design/frontend/rwd/default/layout/tag.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/design/frontend/rwd/default/layout/wishlist.xml b/app/design/frontend/rwd/default/layout/wishlist.xml deleted file mode 100644 index 3e2edbc22..000000000 --- a/app/design/frontend/rwd/default/layout/wishlist.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - wishlist_link - - - - - - - - - - - - - - wishlistwishlist/ - - - - - - - - wishlist - - - - - - - - - - - - - My Wishlist - - - - - - - - - Quantity - - - - - - Price - - - - - - - - - - - - - - - - - wishlist_customer_sidebar - - - - - - - - - - - - wishlist_customer_sidebar - - - - - - - - - - - product.info.addto - product.info.addto - - - - - - - - - - - diff --git a/app/design/frontend/rwd/default/locale/en_US/translate.csv b/app/design/frontend/rwd/default/locale/en_US/translate.csv deleted file mode 100644 index 783c518ee..000000000 --- a/app/design/frontend/rwd/default/locale/en_US/translate.csv +++ /dev/null @@ -1,20 +0,0 @@ -"###","- - - - - - - - - - - - - - - - - - - - -" -"###","Custom phrases that exist only in this theme." -"###","- - - - - - - - - - - - - - - - - - - - -" -"###","Page Module" -"Results per page","Results per page" -"%s-%s of %s","%s-%s of %s" -"###","Catalog Module" -"Filter","Filter" -"View Details","View Details" -"Share on Facebook","Share on Facebook" -"Share on Twitter","Share on Twitter" -"###","Checkout Module" -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","Are you sure you want to leave this page? You will need to go through the checkout steps again." -"Zip/Postal Code","Zip" -"Discount Codes?","Discount Codes?" -"###","Customer Module" -"Registration is free and easy!","Registration is free and easy!" -"Faster checkout","Faster checkout" -"Save multiple shipping addresses","Save multiple shipping addresses" -"View and track orders and more","View and track orders and more" \ No newline at end of file diff --git a/app/design/frontend/rwd/default/template/authorizenet/directpost/form.phtml b/app/design/frontend/rwd/default/template/authorizenet/directpost/form.phtml deleted file mode 100644 index e02ed0616..000000000 --- a/app/design/frontend/rwd/default/template/authorizenet/directpost/form.phtml +++ /dev/null @@ -1,135 +0,0 @@ - -getMethodCode(); -$_method = $_form->getMethod(); -$_controller = $this->helper('authorizenet')->getControllerName(); -$_orderUrl = $this->helper('authorizenet')->getPlaceOrderFrontUrl(); -?> -
    - - - -
    -
    -
    -
    __('Credit Card Information') ?>
    -
    - -
    -
    -
    - -
    - - diff --git a/app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle.phtml b/app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle.phtml deleted file mode 100644 index 75d6efd17..000000000 --- a/app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle.phtml +++ /dev/null @@ -1,41 +0,0 @@ - -getProduct() ?> - -isSaleable()): ?> - - diff --git a/app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/availability.phtml b/app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/availability.phtml deleted file mode 100644 index 518efbf28..000000000 --- a/app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/availability.phtml +++ /dev/null @@ -1,39 +0,0 @@ -getProduct() ?> -displayProductStockStatus()): ?> - isAvailable()): ?> -

    - helper('catalog')->__('Availability:') ?> - helper('catalog')->__('In stock') ?> -

    - -

    - helper('catalog')->__('Availability:') ?> - helper('catalog')->__('Out of stock') ?> -

    - - diff --git a/app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml b/app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml deleted file mode 100644 index 868af8742..000000000 --- a/app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml +++ /dev/null @@ -1,64 +0,0 @@ - - - -getOption(); ?> -getSelections(); ?> -getDefaultSelection(); ?> -_getDefaultValues(); ?> - - -
    - getRequired()) echo ' class="required"' ?>>escapeHtml($_option->getTitle()) ?>getRequired()) echo '*' ?> -
    -decoratedIsLast){?> class="last"> -
    - - _showSingle()): ?> - getSelectionTitlePrice($_selections[0]); ?> - getSelectionCanChangeQty()): ?> - getTierPriceHtml($_selections[0]); ?> - - - - - -
    - - - id="bundle-option-getId() ?>-qty-input" class="input-text qty" type="text" pattern="\d*" name="bundle_option_qty[getId() ?>]" value=""/> - - diff --git a/app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml b/app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml deleted file mode 100644 index b1ec5eb04..000000000 --- a/app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml +++ /dev/null @@ -1,380 +0,0 @@ - -getItem() ?> -getChildrenItems()); ?> - - - - - - - -getItemOptions() || $parentItem->getDescription() || $this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?> - - - - - -getParentItem()): ?> - getSelectionAttributes($_item) ?> - - -
    -   -   -   -   - - - - - - - getParentItem()): ?> -

    escapeHtml($_item->getName()) ?>

    - -
    getValueHtml($_item)?>
    - - escapeHtml(Mage::helper('core/string')->splitInjection($_item->getSku())) ?> - - getParentItem()): ?> - helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?> - - helper('tax')->displaySalesBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Excl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?> - - getOrder()->formatPrice($this->getItem()->getPrice()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total'); ?>:
    getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>     -     - - -     -
    - - helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?> - - helper('tax')->displaySalesBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Incl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - helper('checkout')->getPriceInclTax($this->getItem()); ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?> - - getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total incl. tax'); ?>:
    getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>     -     - - -     - - -   - - - getParentItem() && $this->isChildCalculated()); - $noParentNoCalcChild = (!$_item->getParentItem() && !$this->isChildCalculated()); - $parentShipmentSeparately = $_item->getQtyShipped() > 0 && $_item->getParentItem() && $this->isShipmentSeparately(); - $contentPresent = ($parentWithCalcChild || $noParentNoCalcChild || $parentShipmentSeparately); - ?> - - - - getQtyOrdered() > 0): ?> - __('Ordered'); ?>: getQtyOrdered()*1 ?>
    - - getQtyShipped() > 0 && !$this->isShipmentSeparately()): ?> - __('Shipped'); ?>: getQtyShipped()*1 ?>
    - - getQtyCanceled() > 0): ?> - __('Canceled'); ?>: getQtyCanceled()*1 ?>
    - - getQtyRefunded() > 0): ?> - __('Refunded'); ?>: getQtyRefunded()*1 ?> - -     - - __('Shipped'); ?>: getQtyShipped()*1 ?> - -   - - - - getParentItem()): ?> - helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?> - - helper('tax')->displaySalesBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Excl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?> - - getOrder()->formatPrice($this->getItem()->getRowTotal()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total'); ?>:
    getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>     -     - - -     -
    - - helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?> - - helper('tax')->displaySalesBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Incl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - helper('checkout')->getSubtotalInclTax($this->getItem()); ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?> - - getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total Incl. Tax'); ?>:
    getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>     -     - - - - - -     - - -   - - - - - - - - - - getItemOptions()): ?> -
    - -
    escapeHtml($_option['label']) ?>
    - getPrintStatus()): ?> - getFormatedOptionValue($_option) ?> - class="truncated"> - - -
    -
    -
    escapeHtml($_option['label']) ?>
    -
    -
    -
    - - - -
    escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?>
    - - -
    - - escapeHtml($_item->getDescription()) ?> - helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?> - __('Gift Message') ?> - - -   -   -   -   - - diff --git a/app/design/frontend/rwd/default/template/catalog/layer/filter.phtml b/app/design/frontend/rwd/default/template/catalog/layer/filter.phtml deleted file mode 100644 index 86a52db21..000000000 --- a/app/design/frontend/rwd/default/template/catalog/layer/filter.phtml +++ /dev/null @@ -1,55 +0,0 @@ - - - -
      -getItems() as $_item): ?> -
    1. - getCount() > 0): ?> - - getLabel() ?> - shouldDisplayProductCount()): ?> - (getCount() ?>) - - - - - getLabel(); ?> - shouldDisplayProductCount()): ?> - (getCount() ?>) - - - -
      2. - -
    diff --git a/app/design/frontend/rwd/default/template/catalog/layer/state.phtml b/app/design/frontend/rwd/default/template/catalog/layer/state.phtml deleted file mode 100644 index abd0b3589..000000000 --- a/app/design/frontend/rwd/default/template/catalog/layer/state.phtml +++ /dev/null @@ -1,73 +0,0 @@ - - -getActiveFilters(); -$_renderers = $this->getParentBlock()->getChild('state_renderers')->getSortedChildren(); -?> - -
    -

    __('Currently Shopping by:') ?>

    -
      - - getParentBlock()->getChild('state_renderers')->getChild($_rendererName); - if (method_exists($_renderer, 'shouldRender') && $_renderer->shouldRender($_filter)): - $_renderer->setFilter($_filter); - echo $_renderer->toHtml(); - $_rendered = true; - break; - endif; - endforeach; - - if (!$_rendered): - ?> -
    1. - getClearLinkUrl(); - if ($clearLinkUrl): - ?> - __('Previous') ?> - escapeHtml($_filter->getFilter()->getClearLinkText()) ?> - - __('Remove This Item') ?> - - __($_filter->getName()) ?>: stripTags($_filter->getLabel()) ?> -
      2. - - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/catalog/layer/view.phtml b/app/design/frontend/rwd/default/template/catalog/layer/view.phtml deleted file mode 100644 index f32b23521..000000000 --- a/app/design/frontend/rwd/default/template/catalog/layer/view.phtml +++ /dev/null @@ -1,59 +0,0 @@ - - -canShowBlock()): ?> -
    -
    - __('Shop By') ?> -
    -
    - getStateHtml() ?> - getLayer()->getState()->getFilters()): ?> -
    __('Clear All') ?>
    - - canShowOptions()): ?> -

    __('Filter') ?>

    -
    - getFilters() ?> - - getItemsCount()): ?> -
    __($_filter->getName()) ?>
    -
    getHtml() ?>
    - - -
    - - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml b/app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml deleted file mode 100644 index 2e9f1a11e..000000000 --- a/app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml +++ /dev/null @@ -1,64 +0,0 @@ - - -isMsrpEnabled()): ?> - - diff --git a/app/design/frontend/rwd/default/template/catalog/navigation/left.phtml b/app/design/frontend/rwd/default/template/catalog/navigation/left.phtml deleted file mode 100644 index 105f67e34..000000000 --- a/app/design/frontend/rwd/default/template/catalog/navigation/left.phtml +++ /dev/null @@ -1,63 +0,0 @@ - - -getCurrentChildCategories() ?> -count(); ?> - -
    -
    - __('Browse By') ?> -
    -
    -

    __('Filter') ?>

    -
    -
    __('Category') ?>
    -
    -
      - - getIsActive()): ?> -
    1. - isCategoryActive($_category)): ?> class="current"> - escapeHtml($_category->getName()) ?> - (getProductCount() ?>) - -
      2. - - -
    -
    -
    - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml b/app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml deleted file mode 100644 index 057dd0f3e..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml +++ /dev/null @@ -1,172 +0,0 @@ - -
    -

    __('Compare Products') ?>

    - __('Print This Page') ?> -
    -getItems()->count() ?> - - - - getItems() as $_item): ?> - - - - - - 2): ?> - - - - getItems() as $_item): ?> - - - - - - - - - - - - getItems() as $_item): ?> - - - - - - - - - getItems() as $_item): ?> - - - - - - - - - getAttributes() as $_attribute): ?> - - - getItems() as $_item): ?> - - - - - - - - - - - - getItems() as $_item): ?> - - - - - - - -
     __('Remove This Item') ?>
      - <?php echo $this->stripTags($_item->getName(), null, true) ?> -

    helper('catalog/output')->productAttribute($_item, $_item->getName(), 'name') ?>

    - getReviewsSummaryHtml($_item, 'short') ?> - getPriceHtml($_item, true, '-compare-list-top') ?> -
      - isSaleable()): ?> -

    - -

    __('Out of stock') ?>

    - - helper('wishlist')->isAllow()) : ?> - - -
    getStoreLabel() ?> - getAttributeCode()) { - case "price": ?> - getPriceHtml($_item, true, '-compare-list-' . $_attribute->getCode()) ?> - - <?php echo $this->escapeHtml($_item->getName()) ?> - getProductAttributeValue($_item, $_attribute),0,10); - break; - default: ?> -
    - helper('catalog/output')->productAttribute($_item, $this->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?> -
    - -
      - getPriceHtml($_item, true, '-compare-list-bottom') ?> - isSaleable()): ?> -

    - -

    __('Out of stock') ?>

    - - helper('wishlist')->isAllow()) : ?> - - -
    -
    - - -
    - - - - diff --git a/app/design/frontend/rwd/default/template/catalog/product/compare/sidebar.phtml b/app/design/frontend/rwd/default/template/catalog/product/compare/sidebar.phtml deleted file mode 100644 index cd758006a..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/compare/sidebar.phtml +++ /dev/null @@ -1,60 +0,0 @@ - -helper('catalog/product_compare'); -$_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null; -?> -
    -
    - __('Compare Products') ?> - getItemCount() > 0): ?> - __('(%d)', $_helper->getItemCount()) ?> - - -
    -
    - getItemCount() > 0): ?> -
      - $_item): ?> -
    1. - - __('Remove This Item') ?> -

      helper('catalog/output')->productAttribute($_item, $_item->getName(), 'name') ?>

      -
      2. - -
    - -
    - - __('Clear All') ?> -
    - -

    __('You have no items to compare.') ?>

    - -
    -
    diff --git a/app/design/frontend/rwd/default/template/catalog/product/list.phtml b/app/design/frontend/rwd/default/template/catalog/product/list.phtml deleted file mode 100644 index 2e33d7cd3..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/list.phtml +++ /dev/null @@ -1,186 +0,0 @@ - - -getLoadedProductCollection(); - $_helper = $this->helper('catalog/output'); -?> -count()): ?> -

    __('There are no products matching the selection.') ?>

    - -
    - getToolbarHtml() ?> - - getMode()!='grid'): ?> - -
      - -
    1. - - - - - <?php echo $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true) ?> - - -
      -
      -
      - stripTags($_product->getName(), null, true); ?> -

      productAttribute($_product, $_product->getName() , 'name'); ?>

      - getRatingSummary()): ?> - getReviewsSummaryHtml($_product) ?> - - - getChild('name.after')->getSortedChildren(); - foreach($_nameAfterChildren as $_nameAfterChildName): - $_nameAfterChild = $this->getChild('name.after')->getChild($_nameAfterChildName); - $_nameAfterChild->setProduct($_product); - ?> - toHtml(); ?> - -
      -
      - getPriceHtml($_product, true) ?> -
      -
      - isSaleable() && !$_product->canConfigure()): ?> -

      - isSaleable()): ?> -

      __('View Details') ?>

      - -

      __('Out of stock') ?>

      - - -
      -
      - productAttribute($_product, $_product->getShortDescription(), 'short_description') ?> - __('Learn More') ?> -
      -
      -
      -
      2. - -
    - - - - - - - count() ?> - getColumnCount(); ?> -
      - - - -
    • - - - <?php echo $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true) ?> - -
      -

      productAttribute($_product, $_product->getName(), 'name') ?>

      - - getChild('name.after')->getSortedChildren(); - foreach($_nameAfterChildren as $_nameAfterChildName): - $_nameAfterChild = $this->getChild('name.after')->getChild($_nameAfterChildName); - $_nameAfterChild->setProduct($_product); - ?> - toHtml(); ?> - - - getPriceHtml($_product, true) ?> - getRatingSummary()): ?> - getReviewsSummaryHtml($_product, 'short') ?> - -
      - isSaleable() && !$_product->canConfigure()): ?> - - isSaleable()): ?> - __('View Details') ?> - -

      __('Out of stock') ?>

      - - -
      -
      -
      • - - - -
    - - - -
    - getToolbarHtml() ?> -
    -
    - - -getChild('after')->getSortedChildren(); - foreach($_afterChildren as $_afterChildName): - $_afterChild = $this->getChild('after')->getChild($_afterChildName); - $_afterChild->setProductCollection($_productCollection); - ?> - toHtml(); ?> - diff --git a/app/design/frontend/rwd/default/template/catalog/product/list/related.phtml b/app/design/frontend/rwd/default/template/catalog/product/list/related.phtml deleted file mode 100644 index 2c9952265..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/list/related.phtml +++ /dev/null @@ -1,94 +0,0 @@ - -getItems()->getSize()): ?> -
    -
    -

    __('Related Products') ?>

    -
    -
    -

    __('Check items to add to the cart or') ?> __('select all') ?>

    - - -
    - -
    - diff --git a/app/design/frontend/rwd/default/template/catalog/product/list/toolbar.phtml b/app/design/frontend/rwd/default/template/catalog/product/list/toolbar.phtml deleted file mode 100644 index b6da5039f..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/list/toolbar.phtml +++ /dev/null @@ -1,99 +0,0 @@ - - -getCollection()->getSize()): ?> -
    - isExpanded() ): ?> -
    - isEnabledViewSwitcher() ): ?> -

    - getModes(); ?> - 1): ?> - - getModes() as $_code=>$_label): ?> - isModeActive($_code)): ?> - - - - - - -

    - - -
    - - - getCurrentDirection() == 'desc'): ?> - __('Set Ascending Direction') ?> - - __('Set Descending Direction') ?> - -
    -
    - -
    -
    - getLastPageNum()>1): ?> -

    - __('%s-%s of %s', $this->getFirstNum(), $this->getLastNum(), $this->getTotalNum()) ?> -

    - -

    - __('%s Item(s)', $this->getTotalNum()) ?> -

    - - -
    - - -
    -
    - - getPagerHtml() ?> - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/catalog/product/list/upsell.phtml b/app/design/frontend/rwd/default/template/catalog/product/list/upsell.phtml deleted file mode 100644 index fe7199ec7..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/list/upsell.phtml +++ /dev/null @@ -1,59 +0,0 @@ - -getItemCollection()->getItems())): ?> -getColumnCount(); ?> -
    -

    __('You may also be interested in the following product(s)') ?>

    -
      - setColumnCount(5); // uncomment this line if you want to have another number of columns. also can be changed in layout ?> - resetItemsIterator() ?> - getItemCollection()->getItems() as $_link): ?> - getRowCount();$_i++): ?> - - getColumnCount();$_j++): ?> - getIterableItem()): */ ?> -
    • - - <?php echo $this->escapeHtml($_link->getName()) ?> - -

      escapeHtml($_link->getName()) ?>

      - getPriceHtml($_link, true, '-upsell') ?> - getReviewsSummaryHtml($_link) ?> -
      • - -   - - - - - -
    - decorateGeneric($$('#upsell-product-table'), ['odd','even','first','last']) - */ ?> -
    - diff --git a/app/design/frontend/rwd/default/template/catalog/product/new.phtml b/app/design/frontend/rwd/default/template/catalog/product/new.phtml deleted file mode 100644 index 9be6eeeb5..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/new.phtml +++ /dev/null @@ -1,64 +0,0 @@ - -getProductCollection()) && $_products->getSize()): ?> -

    __('New Products') ?>

    -getColumnCount(); ?> - - diff --git a/app/design/frontend/rwd/default/template/catalog/product/view.phtml b/app/design/frontend/rwd/default/template/catalog/product/view.phtml deleted file mode 100644 index 5f60c181f..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/view.phtml +++ /dev/null @@ -1,191 +0,0 @@ - -helper('catalog/output'); ?> -getProduct(); ?> - -
    getMessagesBlock()->getGroupedHtml() ?>
    -
    -
    -
    getOptions()): ?> enctype="multipart/form-data"> - getBlockHtml('formkey') ?> -
    - - -
    - -
    -
    -

    productAttribute($_product, $_product->getName(), 'name') ?>

    -
    - getChildHtml('media') ?> -
    - -
    -
    - productAttribute($_product, $_product->getName(), 'name') ?> -
    - -
    - getPriceHtml($_product); ?> - getChildHtml('bundle_prices') ?> - getTierPriceHtml() ?> -
    - -
    - getReviewsSummaryHtml($_product, 'default', false)?> - getChildHtml('product_type_availability'); ?> -
    - - getChildHtml('alert_urls') ?> - - getShortDescription()):?> -
    -
    productAttribute($_product, nl2br($_product->getShortDescription()), 'short_description') ?>
    -
    - - - - - - getChildHtml('other');?> - - isSaleable() && $this->hasOptions()):?> - getChildChildHtml('container1', '', true, true) ?> - - -
    - -
    - getChildHtml('product_type_data') ?> - getChildHtml('extrahint') ?> - - hasOptions()):?> -
    - isSaleable()): ?> - getChildHtml('addtocart') ?> - helper('wishlist')->isAllow() || $_compareUrl=$this->helper('catalog/product_compare')->getAddUrl($_product)): ?> - __('OR') ?> - - - getChildHtml('addto') ?> - getChildHtml('sharing') ?> -
    - getChildHtml('extra_buttons') ?> - isSaleable()): ?> -
    - getChildHtml('addto') ?> - getChildHtml('sharing') ?> -
    - -
    - - getChildHtml('related_products') ?> - -
    - isSaleable() && $this->hasOptions()):?> - getChildChildHtml('container2', '', true, true) ?> - -
    - -
    - -
    - getChildGroup('detailed_info', 'getChildHtml')):?> -
    - $html):?> -
    escapeHtml($this->getChildData($alias, 'title')) ?>
    -
    -
    -
    - -
    - -
    - - getChildHtml('upsell_products') ?> - getChildHtml('product_additional_data') ?> - -
    diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml deleted file mode 100644 index 0b397c289..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml +++ /dev/null @@ -1,43 +0,0 @@ - - -getProduct(); ?> -helper('wishlist')->getAddUrl($_product); ?> - - - diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml deleted file mode 100644 index 3768b50dd..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml +++ /dev/null @@ -1,42 +0,0 @@ - -getProduct(); ?> -__('Add to Cart'); ?> -isSaleable()): ?> -
    - isGrouped()): ?> -
    - - -
    - -
    - - getChildHtml('', true, true) ?> -
    -
    - diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/media.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/media.phtml deleted file mode 100644 index 08adc68d7..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/view/media.phtml +++ /dev/null @@ -1,88 +0,0 @@ - -getProduct(); - $_helper = $this->helper('catalog/output'); -?> -
    -
    - <?php echo $this->escapeHtml($this->getImageLabel()) ?> - - getGalleryImages() as $_image): - $_imageUrl = $this->helper('catalog/image') - ->init($_product, 'image', $_image->getFile()) - ->keepFrame(false) - ->constrainOnly(true) - ->resize(1200); - ?> - - -
    -
    - -getGalleryImages()) > 0): ?> -
    -

    __('More Views') ?>

    -
      - getGalleryImages() as $_image): ?> - getGalleryFilterHelper()) && ($filterMethod = $this->getGalleryFilterMethod()) && !Mage::helper($filterClass)->$filterMethod($_product, $_image)): - continue; - endif; - ?> -
    • - - <?php echo $this->escapeHtml($_image->getLabel()) ?> - -
      • - -
    -
    - - -getChildHtml('after'); ?> diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml deleted file mode 100644 index 3290b814d..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml +++ /dev/null @@ -1,50 +0,0 @@ - - -getProduct(); ?> -helper('wishlist')->getAddUrl($_product); ?> - - - diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/type/availability/default.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/type/availability/default.phtml deleted file mode 100644 index 2a08399d7..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/view/type/availability/default.phtml +++ /dev/null @@ -1,39 +0,0 @@ -getProduct(); ?> -displayProductStockStatus()): ?> - isAvailable()): ?> -

    - helper('catalog')->__('Availability:') ?> - helper('catalog')->__('In stock') ?> -

    - -

    - helper('catalog')->__('Availability:') ?> - helper('catalog')->__('Out of stock') ?> -

    - - diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/type/availability/grouped.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/type/availability/grouped.phtml deleted file mode 100644 index 26c3d558d..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/view/type/availability/grouped.phtml +++ /dev/null @@ -1,41 +0,0 @@ -getProduct(); ?> -getAssociatedProducts(); ?> - 0; ?> -displayProductStockStatus()): ?> - isAvailable() && $_hasAssociatedProducts): ?> -

    - helper('catalog')->__('Availability:') ?> - helper('catalog')->__('In stock') ?> -

    - -

    - helper('catalog')->__('Availability:') ?> - helper('catalog')->__('Out of stock') ?> -

    - - diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/type/default.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/type/default.phtml deleted file mode 100644 index 774afa059..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/view/type/default.phtml +++ /dev/null @@ -1,30 +0,0 @@ - - -getProduct() ?> - -getChildHtml('product_type_data_extra') ?> diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/type/grouped.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/type/grouped.phtml deleted file mode 100644 index 3325577c7..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/view/type/grouped.phtml +++ /dev/null @@ -1,90 +0,0 @@ - -setPreconfiguredValue(); ?> -getProduct(); ?> -getAssociatedProducts(); ?> - 0; ?> -getChildHtml('product_type_data_extra') ?> -
    - - - - - - - - helper('tax')->getPrice($_item, $_item->getFinalPrice(), true) ?> - - - - getCanShowProductPrice($_product)): ?> - - - - - - - - - - -
    - <?php echo $this->escapeHtml($this->getImageLabel()) ?> - -

    - escapeHtml($_item->getName()) ?> -

    - isSaleable()): ?> -
    - isSaleable()) : ?> - - - -

    __('Out of stock') ?>

    - -
    - -     		- getCanShowProductPrice($_item)): ?> - getPriceHtml($_item, true) ?> - getTierPriceHtml($_item) ?> - -
    __('No options of this product are available.') ?>
    -
    - diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/type/options/configurable.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/type/options/configurable.phtml deleted file mode 100644 index 0d2d3e502..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/view/type/options/configurable.phtml +++ /dev/null @@ -1,67 +0,0 @@ - - -getProduct(); -$_attributes = Mage::helper('core')->decorateArray($this->getAllowAttributes()); -$_jsonConfig = $this->getJsonConfig(); -$_renderers = $this->getChild('attr_renderers')->getSortedChildren(); -?> -isSaleable() && count($_attributes)):?> -
    - - getChild('attr_renderers')->getChild($_rendererName); - if (method_exists($_renderer, 'shouldRender') && $_renderer->shouldRender($_product, $_attribute, $_jsonConfig)): - $_renderer->setProduct($_product); - $_renderer->setAttributeObj($_attribute); - echo $_renderer->toHtml(); - $_rendered = true; - break; - endif; - endforeach; - - if (!$_rendered): - ?> -
    - decoratedIsLast){?> class="last"> -
    - -
    - - - -
    - - getChildHtml('after') ?> - diff --git a/app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_default_list.phtml b/app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_default_list.phtml deleted file mode 100644 index 656314005..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_default_list.phtml +++ /dev/null @@ -1,58 +0,0 @@ - -getProductCollection()) && $_products->getSize()): ?> -
    -
    -
    - __('New Products') ?> -
    -
    - getPagerHtml() ?> - getNameInLayout(); ?> -
      - getItems() as $_product): ?> -
    1. - <?php echo $this->stripTags($_product->getName(), null, true) ?> -
      -

      helper('catalog/output')->productAttribute($_product, $_product->getName() , 'name') ?>

      - getPriceHtml($_product, true, '-widget-new-'.$suffix) ?> - getIsSalable()): ?> - __('Add to Cart') ?> - -

      __('Out of stock') ?>

      - - */ ?> -
      -
      2. - -
    - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_images_list.phtml b/app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_images_list.phtml deleted file mode 100644 index 71953a960..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_images_list.phtml +++ /dev/null @@ -1,48 +0,0 @@ - -getProductCollection()) && $_products->getSize()): ?> -
    -
    -
    - __('New Products') ?> -
    -
    - getPagerHtml() ?> - getNameInLayout(); ?> -
      - getItems() as $_product): ?> -
    1. - - <?php echo $this->stripTags($_product->getName(), null, true) ?> -
      2. - -
    - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_names_list.phtml b/app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_names_list.phtml deleted file mode 100644 index 7e8a77430..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_names_list.phtml +++ /dev/null @@ -1,47 +0,0 @@ - -getProductCollection()) && $_products->getSize()): ?> -
    -
    -
    - __('New Products') ?> -
    -
    - getPagerHtml() ?> - getNameInLayout(); ?> -
      - getItems() as $_product): ?> -
    1. -

      helper('catalog/output')->productAttribute($_product, $_product->getName() , 'name') ?>

      -
      2. - -
    - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml b/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml deleted file mode 100644 index de700b656..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml +++ /dev/null @@ -1,68 +0,0 @@ - -getProductCollection()) && $_products->getSize()): ?> -
    -
    -

    __('New Products') ?>

    -
    -
    - getPagerHtml() ?> - getColumnCount(); ?> - - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml b/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml deleted file mode 100644 index ef18a44fe..000000000 --- a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml +++ /dev/null @@ -1,65 +0,0 @@ - -getProductCollection()) && $_products->getSize()): ?> -
    -
    -

    __('New Products') ?>

    -
    -
    - getPagerHtml() ?> -
      - getItems() as $_product): ?> -
    1. - <?php echo $this->stripTags($_product->getName(), null, true) ?> -
      -
      -

      helper('catalog/output')->productAttribute($_product, $_product->getName() , 'name') ?>

      - getReviewsSummaryHtml($_product, 'short') ?> - getPriceHtml($_product, true, '-widget-new-list') ?> - isSaleable()): ?> - - -

      __('Out of stock') ?>

      - - - */ ?> -
      -
      -
      2. - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/cataloginventory/stockqty/composite.phtml b/app/design/frontend/rwd/default/template/cataloginventory/stockqty/composite.phtml deleted file mode 100644 index 240cb5662..000000000 --- a/app/design/frontend/rwd/default/template/cataloginventory/stockqty/composite.phtml +++ /dev/null @@ -1,66 +0,0 @@ - -isMsgVisible()): ?> -

    - __('Only %s left', "{$this->getStockQty()}") ?> -

    - - - - - - - - - - - getChildProducts() as $childProduct) : ?> - getProductStockQty($childProduct); ?> - 0) : ?> - - - - - - - -
    __('Product Name') ?>__('Qty') ?>
    getName() ?>
    - - diff --git a/app/design/frontend/rwd/default/template/catalogsearch/advanced/form.phtml b/app/design/frontend/rwd/default/template/catalogsearch/advanced/form.phtml deleted file mode 100644 index c01a15a2b..000000000 --- a/app/design/frontend/rwd/default/template/catalogsearch/advanced/form.phtml +++ /dev/null @@ -1,96 +0,0 @@ - - -helper('catalogsearch')->getMaxQueryLength();?> -
    -

    __('Catalog Advanced Search') ?>

    -
    -getMessagesBlock()->getGroupedHtml() ?> -
    -
    -

    __('Search Settings') ?>

    -
      - getSearchableAttributes() as $_attribute): ?> - getAttributeCode() ?> -
    • - - getAttributeInputType($_attribute)): - case 'number': ?> -
      - - - - -
      - -
      - - - - - (getCurrency($_attribute); ?>) -
      - -
      - getAttributeSelectElement($_attribute) ?> -
      - - getAttributeYesNoElement($_attribute) ?> - -
      - getDateInput($_attribute, 'from') ?> - - - getDateInput($_attribute, 'to') ?> -
      - -
      - -
      - -
      • - -
    - -
    -
    - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml b/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml deleted file mode 100644 index f5a5486b2..000000000 --- a/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml +++ /dev/null @@ -1,45 +0,0 @@ -helper('catalogsearch'); -?> - -
    -
    - - - -
    - -
    - -
    diff --git a/app/design/frontend/rwd/default/template/catalogsearch/result.phtml b/app/design/frontend/rwd/default/template/catalogsearch/result.phtml deleted file mode 100644 index 62260b0be..000000000 --- a/app/design/frontend/rwd/default/template/catalogsearch/result.phtml +++ /dev/null @@ -1,56 +0,0 @@ - -getResultCount()): ?> -getMessagesBlock()->getGroupedHtml() ?> -
    - helper('rss/catalog')->getTagFeedUrl()): ?> - __('Subscribe to Feed') ?> - -

    getHeaderText() || $this->getHeaderText() === false) ? $this->getHeaderText() : $this->__("Search results for '%s'", $this->helper('catalogsearch')->getEscapedQueryText()) ?>

    -
    - getNoteMessages()):?> -

    - -
    - -

    - - getProductListHtml() ?> - -
    -

    getHeaderText() || $this->getHeaderText() === false) ? $this->getHeaderText() : $this->__("Search results for '%s'", $this->helper('catalogsearch')->getEscapedQueryText()) ?>

    -
    -

    - getNoResultText()) ? $this->getNoResultText() : $this->__('Your search returns no results.') ?> - getAdditionalHtml() ?> - getNoteMessages()):?> - -
    - - -

    - diff --git a/app/design/frontend/rwd/default/template/centinel/authentication/start.phtml b/app/design/frontend/rwd/default/template/centinel/authentication/start.phtml deleted file mode 100644 index f9fab8fb0..000000000 --- a/app/design/frontend/rwd/default/template/centinel/authentication/start.phtml +++ /dev/null @@ -1,40 +0,0 @@ - -
    -
    - - - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/checkout/cart.phtml b/app/design/frontend/rwd/default/template/checkout/cart.phtml deleted file mode 100644 index 8aad72196..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart.phtml +++ /dev/null @@ -1,177 +0,0 @@ - - -helper('tax')->displayCartBothPrices()) ? 'display-both-prices' : 'display-single-price'; ?> -
    -
    -

    __('Shopping Cart') ?>

    - hasError()): ?> -
      - getMethods('top_methods') as $method): ?> - getMethodHtml($method)): ?> -
      • - - -
    - -
    - getMessagesBlock()->getGroupedHtml() ?> - getChildHtml('form_before') ?> -
    - getBlockHtml('formkey'); ?> - - - - - - - - helper('tax')->displayCartBothPrices()): ?> - - - - - helper('tax')->displayCartBothPrices() ? 2 : 1); ?> - - - - - - - - - - - - - - - - helper('tax')->displayCartBothPrices()): ?> - - - - - - - - - - - - - - - getItems() as $_item): ?> - getItemHtml($_item) ?> - - -
    __('Product') ?>  - - __('Price') ?> - - - __('Qty') ?> - - helper('wishlist')->isAllowInCart()) : ?> - __('Move to Wishlist') ?> - - - - - __('Subtotal') ?> - -  
    helper('tax')->getIncExcTaxLabel(false) ?>helper('tax')->getIncExcTaxLabel(true) ?>helper('tax')->getIncExcTaxLabel(false) ?>helper('tax')->getIncExcTaxLabel(true) ?>
    - - - - - - - - - -or- - - getContinueShoppingUrl()): ?> - - - -
    - -
    - - getChildHtml('shopping.cart.table.after'); ?> -
    - - getChildHtml('checkout_cart_widget') ?> - getChildHtml('coupon') ?> - getChildHtml('checkout.cart.extra') ?> - getIsVirtual()): echo $this->getChildHtml('shipping'); endif; ?> -
    -
    -
    - getChildHtml('totals'); ?> - hasError()): ?> -
      - getMethods('methods') as $method): ?> - getMethodHtml($method)): ?> -
    • ">
      • - - -
    - -
    -
    - getChildHtml('crosssell') ?> -
    diff --git a/app/design/frontend/rwd/default/template/checkout/cart/coupon.phtml b/app/design/frontend/rwd/default/template/checkout/cart/coupon.phtml deleted file mode 100644 index b770c3e5b..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart/coupon.phtml +++ /dev/null @@ -1,60 +0,0 @@ - -
    -
    -

    __('Discount Codes') ?>

    -
    - - -
    - -
    - - getCouponCode())): ?> - - -
    -
    -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml b/app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml deleted file mode 100644 index b3ffe44fc..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml +++ /dev/null @@ -1,61 +0,0 @@ - - -getItemCount()): ?> -
    -

    __('Based on your selection, you may be interested in the following items:') ?>

    - - decorateList('crosssell-products-list', 'none-recursive') ?> -
    - diff --git a/app/design/frontend/rwd/default/template/checkout/cart/item/configure/updatecart.phtml b/app/design/frontend/rwd/default/template/checkout/cart/item/configure/updatecart.phtml deleted file mode 100644 index 1ae3cf10b..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart/item/configure/updatecart.phtml +++ /dev/null @@ -1,43 +0,0 @@ - - -getProduct(); ?> -__('Update Cart'); ?> -isSaleable()): ?> -
    - isGrouped()): ?> -
    - - -
    - -
    - - getChildHtml('', true, true) ?> -
    -
    - diff --git a/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml deleted file mode 100644 index a799b447b..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml +++ /dev/null @@ -1,330 +0,0 @@ - -getItem(); -$isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility(); -$canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM); -?> - - - hasProductUrl()):?> - - - <?php echo $this->escapeHtml($this->getProductName()) ?> - hasProductUrl()):?> - - - - - - - - - __('Remove Item') ?> - -

    - hasProductUrl()):?> - escapeHtml($this->getProductName()) ?> - - escapeHtml($this->getProductName()) ?> - -

    - -
    - __('SKU'); ?>: escapeHtml($_item->getSku()); ?> -
    - - getOptionList()):?> -
    - - getFormatedOptionValue($_option) ?> -
    escapeHtml($_option['label']) ?>
    - class="truncated"> - -
    -
    -
    escapeHtml($_option['label']) ?>
    -
    -
    -
    - - - -
    - - - getMessages()): ?> - -

    - * escapeHtml($message['text']) ?> -

    - - - - getProductAdditionalInformationBlock(); ?> - - setItem($_item)->toHtml() ?> - - - - - - helper('tax')->displayCartBothPrices()): ?> colspan="2"> - - __('See price before order confirmation.'); ?> - getId(); ?> - __("What's this?"); ?> - - - - - - - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - - - - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?> - - helper('checkout')->formatPrice($_item->getCalculationPrice()) ?> - - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total'); ?>: helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?> -
    - - - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->getPriceInclTax($_item); ?> - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?> - - helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?> - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total incl. tax'); ?>: helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?> -
    - - - - - - - - - - - - - - - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?> - - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - - - - - - - -- - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?> - - helper('checkout')->formatPrice($_item->getRowTotal()) ?> - - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total'); ?>: helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?> -
    - - - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?> - - helper('checkout')->getSubtotalInclTax($_item); ?> - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - - - - - - - -- - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?> - - helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?> - - - - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total incl. tax'); ?>: helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?> -
    - - - - - - __('Remove Item') ?> - - - - diff --git a/app/design/frontend/rwd/default/template/checkout/cart/minicart.phtml b/app/design/frontend/rwd/default/template/checkout/cart/minicart.phtml deleted file mode 100644 index 7530a7545..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart/minicart.phtml +++ /dev/null @@ -1,50 +0,0 @@ - - -getSummaryCount(); - if(empty($_cartQty)) { - $_cartQty = 0; - } -?> - - - -
    - getChildHtml('minicart_content');?> -
    diff --git a/app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml deleted file mode 100644 index 5ff5b1056..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml +++ /dev/null @@ -1,189 +0,0 @@ - -getItem(); - $isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility(); - $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM); -?> -
  • - hasProductUrl()): ?> - <?php echo $this->escapeHtml($this->getProductName()) ?> - - <?php echo $this->escapeHtml($this->getProductName()) ?> - -
    -

    hasProductUrl()): ?>escapeHtml($this->getProductName()) ?>hasProductUrl()): ?>

    - - - - - - - - - - - - -
    __('Price'); ?> - - - __('See price before order confirmation.'); ?> - - - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('tax')->displayCartBothPrices()): ?> - __('Excl. Tax'); ?>: - - typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?> - helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?> - - helper('checkout')->formatPrice($_item->getCalculationPrice()) ?> - - getApplied($_item)): ?> -
    - typeOfDisplay($_item, 1, 'sales')): ?> - - getApplied($_item) as $tax): ?> - : formatPrice($tax['amount'],true,true); ?>
    - -     - typeOfDisplay($_item, 2, 'sales')): ?> - getApplied($_item) as $tax): ?> - : formatPrice($tax['amount_incl_tax'],true,true); ?>
    - - typeOfDisplay($_item, 4, 'sales')): ?> - - getApplied($_item) as $tax): ?> - : formatPrice($tax['amount_incl_tax'],true,true); ?>
    - -     - - typeOfDisplay($_item, 2, 'sales')): ?> - __('Total'); ?>:
    helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>     - - - - - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('checkout')->getPriceInclTax($_item); ?> - helper('tax')->displayCartBothPrices()): ?> -
    __('Incl. Tax'); ?>: - - typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?> - helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?> - - helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?> - - getApplied($_item)): ?> -
    - typeOfDisplay($_item, 1, 'sales')): ?> - - getApplied($_item) as $tax): ?> - : formatPrice($tax['amount'],true,true); ?>
    - -     - typeOfDisplay($_item, 2, 'sales')): ?> - getApplied($_item) as $tax): ?> - : formatPrice($tax['amount_incl_tax'],true,true); ?>
    - - typeOfDisplay($_item, 4, 'sales')): ?> - - getApplied($_item) as $tax): ?> - : formatPrice($tax['amount_incl_tax'],true,true); ?>
    - -     - - typeOfDisplay($_item, 2, 'sales')): ?> - __('Total incl. tax'); ?>:
    helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>     - - - - - -
    __('Qty'); ?> - isOnCheckoutPage()) echo 'disabled'; ?> - /> - - -
    - - - - __('Edit item')?> - - | - isOnCheckoutPage()): ?> - - __('Remove Item') ?> - - - __('Remove Item') ?> - - - - - - getOptionList()):?> -
    -
    -
    - -
    escapeHtml($_option['label']) ?>
    -
    - - - - - -
    - -
    -
    - __('Details') ?> -
    - - -
    -
    • diff --git a/app/design/frontend/rwd/default/template/checkout/cart/minicart/items.phtml b/app/design/frontend/rwd/default/template/checkout/cart/minicart/items.phtml deleted file mode 100644 index b28872ed5..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart/minicart/items.phtml +++ /dev/null @@ -1,108 +0,0 @@ - - -getSummaryCount(); -if(empty($_cartQty)) { - $_cartQty = 0; -} -?> -
    -
    - -
    - -

    - __('Recently added item(s)') ?> - × -

    - - getRecentItems() ?> - - -
    -
      - - getItemHtml($_item) ?> - -
    -
    - - -
    - getChildHtml('cart_promotion') ?> -
    -
    -

    - canApplyMsrp()): ?> - __('ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER'); ?> - - __('Cart Subtotal:') ?> formatPrice($this->getSubtotal()) ?> - getSubtotalInclTax()): ?> -
    (formatPrice($_subtotalInclTax) ?> getIncExcText(true) ?>) - - -

    -
    - - - isPossibleOnepageCheckout()): ?> -
    - - __('View Shopping Cart'); ?> - - -
    - - - -

    __('You have no items in your shopping cart.') ?>

    - - -
    diff --git a/app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml deleted file mode 100644 index e797b8a63..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml +++ /dev/null @@ -1,70 +0,0 @@ - -getItem() ?> - - __('Remove Item')?> - <?php echo $this->escapeHtml($this->getItemName($_item)) ?> - -

    getItemName($_item) ?>

    - getItemDescription($_item) ?> - getMessage()): ?> -

    * getMessage() ?>

    - - - helper('wishlist')->isAllowInCart()) : ?> - - __('Move'); ?> - - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->formatPrice($_item->getCalculationPrice()) ?> - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?> - - - - - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->formatPrice($_item->getRowTotal()) ?> - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?> - - - diff --git a/app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml b/app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml deleted file mode 100644 index a1b4be6ba..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml +++ /dev/null @@ -1,70 +0,0 @@ - -getItem() ?> - - __('Remove Item')?> - <?php echo $this->escapeHtml($this->getItemName($_item)) ?> - -

    getItemName($_item) ?>

    - getItemDescription($_item) ?> - getMessage()): ?> -

    * getMessage() ?>

    - - - helper('wishlist')->isAllowInCart()) : ?> - - __('Move'); ?> - - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->formatPrice($_item->getCalculationPrice()) ?> - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?> - - - - - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->formatPrice($_item->getRowTotal()) ?> - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?> - - - diff --git a/app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml b/app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml deleted file mode 100644 index 9c1ac06c4..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml +++ /dev/null @@ -1,150 +0,0 @@ - - -
    -

    __('Estimate Shipping and Tax') ?>

    -
    -
    -

    __('Enter your destination to get a shipping estimate.') ?>

    -
      -
    • - -
      - getCountryHtmlSelect($this->getEstimateCountryId()) ?> -
      -
      • - getStateActive()): ?> -
    • - isStateProvinceRequired()) echo ' class="required"' ?>>isStateProvinceRequired()) echo '*' ?>__('State/Province') ?> - */ ?> - -
      - - - -
      -
      • - - getCityActive()): ?> -
    • - -
      - -
      -
      • - -
    • - isZipCodeRequired()) echo ' class="required"' ?>>isZipCodeRequired()) echo '*' ?>__('Zip/Postal Code') ?> - */ ?> - -
      - -
      -
      • -
    -
    - -
    -
    - - - getEstimateRates())): ?> -
    -
    - $_rates): ?> -
    escapeHtml($this->getCarrierName($code)) ?>
    -
    -
      - - getErrorMessage()) echo ' class="error-msg"';?>> - getErrorMessage()): ?> - escapeHtml($_rate->getErrorMessage()) ?> - - getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio" /> - - - - -
    -
    - -
    -
    - -
    -
    - - -
    -
    diff --git a/app/design/frontend/rwd/default/template/checkout/cart/sidebar.phtml b/app/design/frontend/rwd/default/template/checkout/cart/sidebar.phtml deleted file mode 100644 index 19d54f411..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart/sidebar.phtml +++ /dev/null @@ -1,80 +0,0 @@ - -getIsNeedToDisplaySideBar()):?> -
    - getSummaryCount() ?> -
    - __('My Cart') ?> -
    -
    - 0): ?> -
    - -

    __('There is 1 item in your cart.', $this->getUrl('checkout/cart')) ?>

    - -

    __('There are %s items in your cart.', $this->getUrl('checkout/cart'), $_cartQty) ?>

    - -

    - canApplyMsrp()): ?> - __('ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER'); ?> - - __('Cart Subtotal:') ?> formatPrice($this->getSubtotal()) ?> - getSubtotalInclTax()): ?> -
    (formatPrice($_subtotalInclTax) ?> getIncExcText(true) ?>) - - -

    -
    - - getRecentItems() ?> - -

    __('Recently added item(s)') ?>

    -
      - - getItemHtml($_item) ?> - -
    - - -

    __('You have no items in your shopping cart.') ?>

    - - isPossibleOnepageCheckout()): ?> -
    - getChildHtml('extra_actions') ?> - -
    - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/checkout/cart/sidebar/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/sidebar/default.phtml deleted file mode 100644 index 5e8b5e1ee..000000000 --- a/app/design/frontend/rwd/default/template/checkout/cart/sidebar/default.phtml +++ /dev/null @@ -1,145 +0,0 @@ - -getItem(); - $isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility(); - $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM); -?> -
  • - hasProductUrl()): ?> - <?php echo $this->escapeHtml($this->getProductName()) ?> - - <?php echo $this->escapeHtml($this->getProductName()) ?> - -
    - __('Remove This Item') ?> -

    hasProductUrl()): ?>escapeHtml($this->getProductName()) ?>hasProductUrl()): ?>

    - - __('Edit item')?> - - getQty() ?> x - - - - __('See price before order confirmation.'); ?> - - - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('tax')->displayCartBothPrices()): ?> - __('Excl. Tax'); ?>: - - typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?> - helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?> - - helper('checkout')->formatPrice($_item->getCalculationPrice()) ?> - - getApplied($_item)): ?> -
    - typeOfDisplay($_item, 1, 'sales')): ?> - - getApplied($_item) as $tax): ?> - : formatPrice($tax['amount'],true,true); ?>
    - -     - typeOfDisplay($_item, 2, 'sales')): ?> - getApplied($_item) as $tax): ?> - : formatPrice($tax['amount_incl_tax'],true,true); ?>
    - - typeOfDisplay($_item, 4, 'sales')): ?> - - getApplied($_item) as $tax): ?> - : formatPrice($tax['amount_incl_tax'],true,true); ?>
    - -     - - typeOfDisplay($_item, 2, 'sales')): ?> - __('Total'); ?>:
    helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>     - - - - - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('checkout')->getPriceInclTax($_item); ?> - helper('tax')->displayCartBothPrices()): ?> -
    __('Incl. Tax'); ?>: - - typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?> - helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?> - - helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?> - - getApplied($_item)): ?> -
    - typeOfDisplay($_item, 1, 'sales')): ?> - - getApplied($_item) as $tax): ?> - : formatPrice($tax['amount'],true,true); ?>
    - -     - typeOfDisplay($_item, 2, 'sales')): ?> - getApplied($_item) as $tax): ?> - : formatPrice($tax['amount_incl_tax'],true,true); ?>
    - - typeOfDisplay($_item, 4, 'sales')): ?> - - getApplied($_item) as $tax): ?> - : formatPrice($tax['amount_incl_tax'],true,true); ?>
    - -     - - typeOfDisplay($_item, 2, 'sales')): ?> - __('Total incl. tax'); ?>:
    helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>     - - - - - - - getOptionList()):?> -
    -
    -
    - -
    escapeHtml($_option['label']) ?>
    -
    - - - - - -
    - -
    -
    - __('Details') ?> -
    - -
    -
    • diff --git a/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml b/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml deleted file mode 100644 index b6e4297dd..000000000 --- a/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml +++ /dev/null @@ -1,118 +0,0 @@ - - -
    -
    -

    __('Billing Information') ?>

    -
    - getMessagesBlock()->getGroupedHtml() ?> - -
    -
    -
    -
    -
    -

    __('Billing Address') ?> | __('Change') ?>

    -
    -
    - getAddress() ?> -
    format('html') ?>
    -
    -
    -
    -
    -
    -
    -

    __('Payment Method') ?>

    -
    -
    - - getChildHtml('payment_methods_before') ?> - -
    - getMethods(); - $_methodsCount = count($_methods); - ?> - getCode() ?> -
    - 1): ?> - getSelectedMethodCode()==$_code): ?> checked="checked" class="radio" /> - - - - -
    - getChildHtml('payment.method.'.$_code)) : ?> -
    - -
    - - -
    - getChildHtml('payment_methods_after') ?> - getChildHtml('checkout_billing_items') ?> -
    -
    -
    -
    -
    -

    « __('Back to Shipping Information') ?>

    - -
    -
    - -
    diff --git a/app/design/frontend/rwd/default/template/checkout/multishipping/item/default.phtml b/app/design/frontend/rwd/default/template/checkout/multishipping/item/default.phtml deleted file mode 100644 index 2ebfd63aa..000000000 --- a/app/design/frontend/rwd/default/template/checkout/multishipping/item/default.phtml +++ /dev/null @@ -1,48 +0,0 @@ - -

    escapeHtml($this->getProductName()) ?>

    -getOptionList()):?> -
    - - getFormatedOptionValue($_option) ?> -
    escapeHtml($_option['label']) ?>
    - class="truncated"> - -
    -
    -
    escapeHtml($_option['label']) ?>
    -
    -
    -
    - - - -
    - -getProductAdditionalInformationBlock()):?> - setItem($this->getItem())->toHtml() ?> - diff --git a/app/design/frontend/rwd/default/template/checkout/onepage.phtml b/app/design/frontend/rwd/default/template/checkout/onepage.phtml deleted file mode 100644 index 270db312e..000000000 --- a/app/design/frontend/rwd/default/template/checkout/onepage.phtml +++ /dev/null @@ -1,61 +0,0 @@ - -
    -

    __('Checkout') ?>

    -
    - - - -
      -getSteps() as $_stepId => $_stepInfo): ?> -getChild($_stepId) || !$this->getChild($_stepId)->isShow()): continue; endif; $i++ ?> -
    1. -
      - -

      - __('Edit') ?> -
      - -
      2. - -
    - diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml deleted file mode 100644 index b2c15146e..000000000 --- a/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml +++ /dev/null @@ -1,76 +0,0 @@ - - -
    -
    - getChildChildHtml('methods_additional', '', true, true) ?> - getChildHtml('methods') ?> -
    -
    - -getChildChildHtml('additional') ?> -
    - - __('* Required Fields') ?>

    */ ?> -

    « __('Back') ?>

    - - -
    - - diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/progress.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/progress.phtml deleted file mode 100644 index 3671624a9..000000000 --- a/app/design/frontend/rwd/default/template/checkout/onepage/progress.phtml +++ /dev/null @@ -1,59 +0,0 @@ - -
    -
    - __('Your Checkout Progress') ?> -
    -
    -
    - getCheckout()->getStepData('billing', 'is_show')): ?> -
    - getChildHtml('billing.progress') ?> -
    - - - getCheckout()->getStepData('shipping', 'is_show')): ?> -
    - getChildHtml('shipping.progress') ?> -
    - - - getCheckout()->getStepData('shipping_method', 'is_show')): ?> -
    - getChildHtml('shippingmethod.progress') ?> -
    - - - getCheckout()->getStepData('payment', 'is_show')): ?> -
    - getChildHtml('payment.progress') ?> -
    - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/review/info.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/review/info.phtml deleted file mode 100644 index fc4cfaaed..000000000 --- a/app/design/frontend/rwd/default/template/checkout/onepage/review/info.phtml +++ /dev/null @@ -1,84 +0,0 @@ - -getChildHtml('items_before'); ?> -
    - - helper('tax')->displayCartBothPrices()): $colspan = $rowspan = 2; else: $colspan = $rowspan = 1; endif; ?> - - - - - helper('tax')->displayCartBothPrices()): ?> - - - - - - - - - - - helper('tax')->displayCartBothPrices()): ?> - - - - - - - - - getChildHtml('totals'); ?> - - getItems() as $_item): ?> - getItemHtml($_item)?> - - -
    __('Product') ?>__('Price') ?>__('Qty') ?>__('Subtotal') ?>
    helper('tax')->getIncExcTaxLabel(false) ?>helper('tax')->getIncExcTaxLabel(true) ?>helper('tax')->getIncExcTaxLabel(false) ?>helper('tax')->getIncExcTaxLabel(true) ?>
    -
    -getChildHtml('items_after'); ?> - -
    - getChildHtml('agreements') ?> -
    - getChildHtml('button') ?> - -

    __('Forgot an Item?') ?> __('Edit Your Cart') ?>

    -
    - -
    diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml deleted file mode 100644 index eeff3efb5..000000000 --- a/app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml +++ /dev/null @@ -1,240 +0,0 @@ - -getItem()?> - -

    escapeHtml($this->getProductName()) ?>

    - getOptionList()):?> -
    - - getFormatedOptionValue($_option) ?> -
    escapeHtml($_option['label']) ?>
    - class="truncated"> - -
    -
    -
    escapeHtml($_option['label']) ?>
    -
    -
    -
    - - - -
    - - getProductAdditionalInformationBlock()):?> - setItem($_item)->toHtml() ?> - - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?> - - helper('checkout')->formatPrice($_item->getCalculationPrice()) ?> - - - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total'); ?>:
    helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>     -
    - - - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->getPriceInclTax($_item); ?> - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?> - - helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?> - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total incl. tax'); ?>:
    helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>     -
    - - - - - getQty() ?> - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?> - - helper('checkout')->formatPrice($_item->getRowTotal()) ?> - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total'); ?>:
    helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>     -
    - - - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->getSubtotalInclTax($_item); ?> - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?> - - helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?> - - - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total incl. tax'); ?>:
    helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>     -
    - - - - - diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml deleted file mode 100644 index 1341ab5e4..000000000 --- a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml +++ /dev/null @@ -1,157 +0,0 @@ - -
    -
      - customerHasAddresses()): ?> -
    • - -
      - getAddressesHtmlSelect('shipping') ?> -
      -
      • - -
    • customerHasAddresses()): ?> style="display:none;" class="scaffold-form"> -
      -

      __('* Required Fields') ?>

      - -
        -
      • getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress())->setFieldIdFormat('shipping:%s')->setFieldNameFormat('shipping[%s]')->setFieldParams('onchange="shipping.setSameAsBilling(false)"')->toHtml() ?>
        • -
      • -
        - -
        - -
        -
        -
        • - helper('customer/address')->getAttributeValidationClass('street'); ?> -
      • - -
        - -
        -
        • - - helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?> -
      • - -
        - -
        -
        • - - helper('customer/address')->isVatAttributeVisible()) : ?> -
      • - -
        - -
        -
        • - -
      • -
        - -
        - -
        -
        -
        - -
        - - - -
        -
        -
        • -
      • -
        - -
        - -
        -
        -
        - -
        - getCountryHtmlSelect('shipping') ?> -
        -
        -
        • -
      • -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        • - isCustomerLoggedIn() && $this->customerHasAddresses()):?> -
      • - getAddress()->getSaveInAddressBook()):?> checked="checked" class="checkbox" />
        • - -
        • - -
      -
      -
      • -
    • - getAddress()->getSameAsBilling()): ?> checked="checked" title="__('Use Billing Address') ?>" onclick="shipping.setSameAsBilling(this.checked)" class="checkbox" /> -
      • -
    -
    -

    « __('Back') ?>

    - - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/contacts/form.phtml b/app/design/frontend/rwd/default/template/contacts/form.phtml deleted file mode 100644 index 34663e70c..000000000 --- a/app/design/frontend/rwd/default/template/contacts/form.phtml +++ /dev/null @@ -1,73 +0,0 @@ - -
    getMessagesBlock()->getGroupedHtml() ?>
    -
    -

    __('Contact Us') ?>

    -
    -
    -
    -

    __('Contact Information') ?>

    -

    __('* Required Fields') ?>

    -
      -
    • -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      • -
    • - -
      - -
      -
      • -
    • - -
      - -
      -
      • -
    -
    -
    - - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/customer/account/dashboard.phtml b/app/design/frontend/rwd/default/template/customer/account/dashboard.phtml deleted file mode 100644 index 0632267c4..000000000 --- a/app/design/frontend/rwd/default/template/customer/account/dashboard.phtml +++ /dev/null @@ -1,45 +0,0 @@ - -
    -
    -

    __('My Dashboard') ?>

    -
    - getMessagesBlock()->getGroupedHtml() ?> - getChildHtml('hello') ?> - getChildHtml('top') ?> - - getChildHtml('address') ?> - getChildHtml('info1') ?> - getChildHtml('info2') ?> -
    diff --git a/app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml b/app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml deleted file mode 100644 index 1d3f0790f..000000000 --- a/app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml +++ /dev/null @@ -1,56 +0,0 @@ - - diff --git a/app/design/frontend/rwd/default/template/customer/account/navigation.phtml b/app/design/frontend/rwd/default/template/customer/account/navigation.phtml deleted file mode 100644 index da2dd587e..000000000 --- a/app/design/frontend/rwd/default/template/customer/account/navigation.phtml +++ /dev/null @@ -1,46 +0,0 @@ - - diff --git a/app/design/frontend/rwd/default/template/customer/address/edit.phtml b/app/design/frontend/rwd/default/template/customer/address/edit.phtml deleted file mode 100644 index b562c6619..000000000 --- a/app/design/frontend/rwd/default/template/customer/address/edit.phtml +++ /dev/null @@ -1,166 +0,0 @@ - - -getTitle()): ?> -
    -

    getTitle() ?>

    -
    - -getMessagesBlock()->getGroupedHtml() ?> -
    -
    - getBlockHtml('formkey')?> - - -

    __('Contact Information') ?>

    -

    __('* Required Fields') ?>

    -
      -
    • - getNameBlockHtml() ?> -
      • -
    • - -
      - -
      -
      • -
    • -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      • -
    -
    -
    -

    __('Address') ?>

    -
      - helper('customer/address')->getAttributeValidationClass('street'); ?> -
    • - -
      - -
      -
      • - - helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?> -
    • - -
      - -
      -
      • - - helper('customer/address')->isVatAttributeVisible()) : ?> -
    • - -
      - -
      -
      • - -
    • -
      - -
      - -
      -
      -
      - -
      - - - -
      -
      -
      • -
    • -
      - -
      - -
      -
      -
      - -
      - getCountryHtmlSelect() ?> -
      -
      -
      • - canSetAsDefaultBilling()) echo ' class="control"' ?>> - isDefaultBilling()): ?> - __('Default Billing Address') ?> - canSetAsDefaultBilling()): ?> - - - - - - canSetAsDefaultShipping()) echo ' class="control"' ?>> - isDefaultShipping()): ?> - __('Default Shipping Address') ?> - canSetAsDefaultShipping()): ?> - - - - - -
    -
    -
    -

    « __('Back') ?>

    - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/customer/form/address.phtml b/app/design/frontend/rwd/default/template/customer/form/address.phtml deleted file mode 100644 index 6b16bb508..000000000 --- a/app/design/frontend/rwd/default/template/customer/form/address.phtml +++ /dev/null @@ -1,144 +0,0 @@ - - - -
    -

    getAddressId()): ?>__('Edit Address Entry') ?>__('New Address Entry') ?>

    -
    -getMessagesBlock()->getGroupedHtml() ?> -
    -
    - - -

    __('Personal Information') ?>

    -

    __('* Required Fields') ?>

    -
      -
    • - getLayout()->createBlock('customer/widget_name')->setObject($data)->toHtml() ?> -
      • -
    • - -
      - -
      -
      • -
    -
    -
    -

    __('Address') ?>

    -
      - helper('customer/address')->getAttributeValidationClass('street'); ?> -
    • - -
      - -
      -
      • - - helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?> -
    • - -
      - -
      -
      • - -
    • -
      - -
      - -
      -
      -
      - -
      - - - -
      -
      -
      • -
    • -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      • -
    • -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      • - $type): ?> - isPrimary($type['address_type_id'])) echo ' class="control"' ?>> - isPrimary($type['address_type_id'])): ?> - __("This is My Default %s Address", ucfirst($type['name'])) ?> - - - - - -
    -
    -
    -

    « __('Back') ?>

    - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/customer/form/changepassword.phtml b/app/design/frontend/rwd/default/template/customer/form/changepassword.phtml deleted file mode 100644 index e68137deb..000000000 --- a/app/design/frontend/rwd/default/template/customer/form/changepassword.phtml +++ /dev/null @@ -1,67 +0,0 @@ - -
    -

    __('Change Account Password') ?>

    -
    -getMessagesBlock()->getGroupedHtml() ?> -
    -
    -

    __('Change Account Password') ?>

    -

    __('* Required Fields') ?>

    -
      -
    • - -
      - -
      -
      • -
    • -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      • -
    -
    -
    -

    « __('Back') ?>

    - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/customer/form/confirmation.phtml b/app/design/frontend/rwd/default/template/customer/form/confirmation.phtml deleted file mode 100644 index 9f287a646..000000000 --- a/app/design/frontend/rwd/default/template/customer/form/confirmation.phtml +++ /dev/null @@ -1,54 +0,0 @@ - -
    -

    __('Send confirmation link') ?>

    -
    -getMessagesBlock()->getGroupedHtml() ?> -
    -
    -

    __('Retrieve your confirmation link here') ?>

    -

    __('Please enter your email below and we\'ll send you confirmation link for it.') ?>

    -
      -
    • - -
      - -
      -
      • -
    -
    -
    -

    __('* Required Fields') ?>

    -

    « __('Back to Login') ?>

    - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/customer/form/edit.phtml b/app/design/frontend/rwd/default/template/customer/form/edit.phtml deleted file mode 100644 index aca293a90..000000000 --- a/app/design/frontend/rwd/default/template/customer/form/edit.phtml +++ /dev/null @@ -1,117 +0,0 @@ - -
    -

    __('Edit Account Information') ?>

    -
    -getMessagesBlock()->getGroupedHtml() ?> -
    -
    - getBlockHtml('formkey')?> -

    __('Account Information') ?>

    -

    __('* Required Fields') ?>

    -
      -
    • - getLayout()->createBlock('customer/widget_name')->setObject($this->getCustomer())->toHtml() ?> -
      • -
    • - -
      - -
      -
      • - getLayout()->createBlock('customer/widget_dob') ?> - isEnabled()): ?> -
    • setDate($this->getCustomer()->getDob())->toHtml() ?>
      • - - getLayout()->createBlock('customer/widget_taxvat') ?> - isEnabled()): ?> -
    • setTaxvat($this->getCustomer()->getTaxvat())->toHtml() ?>
      • - - getLayout()->createBlock('customer/widget_gender') ?> - isEnabled()): ?> -
    • setGender($this->getCustomer()->getGender())->toHtml() ?>
      • - -
    • - getCustomer()->getChangePassword()==1): ?> checked="checked" class="checkbox" /> -
      • -
    -
    - -
    -

    « __('Back') ?>

    - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml b/app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml deleted file mode 100644 index 6aba5a05e..000000000 --- a/app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml +++ /dev/null @@ -1,55 +0,0 @@ - -
    -

    __('Forgot Your Password?') ?>

    -
    -getMessagesBlock()->getGroupedHtml() ?> -
    -
    -

    __('Retrieve your password here') ?>

    -

    __('Please enter your email address below. You will receive a link to reset your password.') ?>

    -

    __('* Required Fields') ?>

    -
      -
    • - -
      - -
      -
      • - getChildHtml('form.additional.info'); ?> -
    -
    -
    -

    « __('Back to Login') ?>

    - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/customer/form/mini.login.phtml b/app/design/frontend/rwd/default/template/customer/form/mini.login.phtml deleted file mode 100644 index 15fcb0c3c..000000000 --- a/app/design/frontend/rwd/default/template/customer/form/mini.login.phtml +++ /dev/null @@ -1,40 +0,0 @@ - - diff --git a/app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml b/app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml deleted file mode 100644 index abdaae8e2..000000000 --- a/app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml +++ /dev/null @@ -1,59 +0,0 @@ - -
    -

    __('Reset a Password'); ?>

    -
    -getMessagesBlock()->getGroupedHtml(); ?> -
    -
    -

    __('* Required Fields'); ?>

    -
      -
    • -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      • -
    -
    -
    - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/directory/currency.phtml b/app/design/frontend/rwd/default/template/directory/currency.phtml deleted file mode 100644 index 0a521f980..000000000 --- a/app/design/frontend/rwd/default/template/directory/currency.phtml +++ /dev/null @@ -1,45 +0,0 @@ - - -getCurrencyCount()>1): ?> -
    - - -
    - diff --git a/app/design/frontend/rwd/default/template/downloadable/catalog/product/type.phtml b/app/design/frontend/rwd/default/template/downloadable/catalog/product/type.phtml deleted file mode 100644 index 81aefe701..000000000 --- a/app/design/frontend/rwd/default/template/downloadable/catalog/product/type.phtml +++ /dev/null @@ -1,48 +0,0 @@ - -getProduct() ?> - -isSaleable()): ?> -

    - helper('catalog')->__('Availability:') ?> - helper('catalog')->__('In stock') ?> -

    - -

    - helper('catalog')->__('Availability:') ?> - helper('catalog')->__('Out of stock') ?> -

    - -getChildHtml('product_type_data_extra') ?> -getPriceHtml($_product) ?> -getChildHtml('samples') ?> diff --git a/app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml b/app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml deleted file mode 100644 index 74d72d1ed..000000000 --- a/app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml +++ /dev/null @@ -1,344 +0,0 @@ - -getItem(); -$isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility(); -$canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM); -?> - -<?php echo $this->escapeHtml($this->getProductName()) ?> - - - - - __('Remove Item') ?> -

    escapeHtml($this->getProductName()) ?> -

    - -
    - __('SKU'); ?>: escapeHtml($_item->getSku()); ?> -
    - - getOptionList()): ?> -
    - - getFormatedOptionValue($_option) ?> -
    escapeHtml($_option['label']) ?>
    - class="truncated"> - -
    -
    -
    escapeHtml($_option['label']) ?>
    -
    -
    -
    - - - -
    - - - getLinks()): ?> -
    -
    getLinksTitle() ?>
    - -
    escapeHtml($link->getTitle()); ?>
    - -
    - - - - getMessages()): ?> - -
    - * escapeHtml($message['text']) ?> -
    - - - - - helper('tax')->displayCartBothPrices()): ?> colspan="2"> - - __('See price before order confirmation.'); ?> - getId(); ?> - __("What's this?"); ?> - - - - - - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - - - - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_item->getCalculationPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()); ?> - - helper('checkout')->formatPrice($_item->getCalculationPrice()) ?> - - - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total'); ?> - : helper('checkout')->formatPrice($_item->getCalculationPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()); ?> -
    - - - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->getPriceInclTax($_item); ?> - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - - - - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?> - - helper('checkout')->formatPrice($_incl - $_item->getWeeeTaxDisposition()) ?> - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total incl. tax'); ?> - : helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?> -
    - - - - - - - - - - - - - -helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?> - - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - -
    - - - - -- - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()); ?> - - helper('checkout')->formatPrice($_item->getRowTotal()) ?> - - - -
    - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total'); ?> - : helper('checkout')->formatPrice($_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()); ?> -
    - - - - -helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?> - - helper('checkout')->getSubtotalInclTax($_item); ?> - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - -
    - - - - -- - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?> - - helper('checkout')->formatPrice($_incl - $_item->getWeeeTaxRowDisposition()) ?> - - - -
    - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total incl. tax'); ?> - : helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?> -
    - - - - -__('Remove Item') ?> - diff --git a/app/design/frontend/rwd/default/template/downloadable/checkout/onepage/review/item.phtml b/app/design/frontend/rwd/default/template/downloadable/checkout/onepage/review/item.phtml deleted file mode 100644 index 965f5803a..000000000 --- a/app/design/frontend/rwd/default/template/downloadable/checkout/onepage/review/item.phtml +++ /dev/null @@ -1,246 +0,0 @@ - -getItem()?> - -

    escapeHtml($this->getProductName()) ?>

    - - getOptionList()):?> -
    - - getFormatedOptionValue($_option) ?> -
    escapeHtml($_option['label']) ?>
    - class="truncated"> - -
    -
    -
    escapeHtml($_option['label']) ?>
    -
    -
    -
    - - - -
    - - getLinks()): ?> -
    -
    getLinksTitle() ?>
    - -
    escapeHtml($link->getTitle()); ?>
    - -
    - - - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?> - - helper('checkout')->formatPrice($_item->getCalculationPrice()) ?> - - - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total'); ?>:
    helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>     -
    - - - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->getPriceInclTax($_item); ?> - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?> - - helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?> - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total incl. tax'); ?>:
    helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>     -
    - - - - - getQty() ?> - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?> - - helper('checkout')->formatPrice($_item->getRowTotal()) ?> - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total'); ?>:
    helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>     -
    - - - - - helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - - helper('checkout')->getSubtotalInclTax($_item); ?> - typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> - helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?> - - helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?> - - - - - - getApplied($_item)): ?> - - - - typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?> -
    - __('Total incl. tax'); ?>:
    helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>     -
    - - - - - diff --git a/app/design/frontend/rwd/default/template/downloadable/customer/products/list.phtml b/app/design/frontend/rwd/default/template/downloadable/customer/products/list.phtml deleted file mode 100644 index 55c143a67..000000000 --- a/app/design/frontend/rwd/default/template/downloadable/customer/products/list.phtml +++ /dev/null @@ -1,74 +0,0 @@ - - -getItems(); ?> -
    -

    __('My Downloadable Products') ?>

    -
    -getMessagesBlock()->getGroupedHtml() ?> -getChildHtml('pager'); ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    __('Order #') ?>__('Date') ?>__('Title') ?>__('Status') ?>__('Remaining Downloads') ?>
    getPurchased()->getOrderIncrementId() ?>formatDate($_item->getPurchased()->getCreatedAt()) ?>escapeHtml($_item->getPurchased()->getProductName()) ?> - getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>>escapeHtml($_item->getLinkTitle()); ?>__(ucfirst($_item->getStatus())) ?>getRemainingDownloads($_item) ?>
    - - -

    __('You have not purchased any downloadable products yet.'); ?>

    - -getChildHtml('pager'); ?> -
    -

    « __('Back') ?>

    -
    diff --git a/app/design/frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml b/app/design/frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml deleted file mode 100644 index fb83f733f..000000000 --- a/app/design/frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml +++ /dev/null @@ -1,360 +0,0 @@ - -getItem() ?> - -

    escapeHtml($_item->getName()) ?>

    - getItemOptions()): ?> -
    - -
    escapeHtml($_option['label']) ?>
    - getPrintStatus()): ?> - getFormatedOptionValue($_option) ?> - class="truncated"> - - -
    -
    -
    escapeHtml($_option['label']) ?>
    -
    -
    -
    - - - -
    escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?>
    - - -
    - - - - getLinks()): ?> -
    -
    getLinksTitle() ?>
    - getPurchasedItems() as $link): ?> -
    escapeHtml($link->getLinkTitle()); ?>
    - -
    - - - - escapeHtml($_item->getDescription()) ?> - helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?> -
    __('Gift Message') ?> - - -escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?> - - - helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?> - - helper('tax')->displayCartBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Excl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?> - - getOrder()->formatPrice($this->getItem()->getPrice()) ?> - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total'); ?> - :
    getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>     -     - - -     -
    - - helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?> - - helper('tax')->displayCartBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Incl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - helper('checkout')->getPriceInclTax($this->getItem()); ?> - - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?> - - getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?> - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total incl. tax'); ?> - :
    getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>     -     - - -     - - - - - - getItem()->getQtyOrdered() > 0): ?> - __('Ordered'); ?>: - getItem()->getQtyOrdered() * 1 ?>
    - - getItem()->getQtyShipped() > 0): ?> - __('Shipped'); ?>: - getItem()->getQtyShipped() * 1 ?>
    - - getItem()->getQtyCanceled() > 0): ?> - __('Canceled'); ?>: - getItem()->getQtyCanceled() * 1 ?>
    - - getItem()->getQtyRefunded() > 0): ?> - __('Refunded'); ?>: - getItem()->getQtyRefunded() * 1 ?>
    - -     - - - helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?> - - helper('tax')->displayCartBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Excl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?> - - getOrder()->formatPrice($this->getItem()->getRowTotal()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total'); ?> - :
    getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>     -     - - -     -
    - - helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?> - - helper('tax')->displayCartBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Incl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - helper('checkout')->getSubtotalInclTax($this->getItem()); ?> - - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?> - - getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?> - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total incl. tax'); ?> - :
    getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>     -     - - -     - - - - diff --git a/app/design/frontend/rwd/default/template/newsletter/subscribe.phtml b/app/design/frontend/rwd/default/template/newsletter/subscribe.phtml deleted file mode 100644 index 88a251f76..000000000 --- a/app/design/frontend/rwd/default/template/newsletter/subscribe.phtml +++ /dev/null @@ -1,49 +0,0 @@ - -
    -
    - __('Newsletter') ?> -
    -
    -
    - -
    - -
    -
    - -
    -
    -
    - -
    diff --git a/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml b/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml deleted file mode 100644 index ad31e1f30..000000000 --- a/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml +++ /dev/null @@ -1,75 +0,0 @@ - -
    - -
    diff --git a/app/design/frontend/rwd/default/template/page/1column.phtml b/app/design/frontend/rwd/default/template/page/1column.phtml deleted file mode 100644 index 87723111f..000000000 --- a/app/design/frontend/rwd/default/template/page/1column.phtml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - -getChildHtml('head') ?> - -getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?>> -getChildHtml('after_body_start') ?> -
    - getChildHtml('global_notices') ?> -
    - getChildHtml('header') ?> -
    -
    - getChildHtml('breadcrumbs') ?> -
    - getChildHtml('global_messages') ?> - getChildHtml('content') ?> -
    -
    -
    - getChildHtml('footer_before') ?> - getChildHtml('footer') ?> - getChildHtml('global_cookie_notice') ?> - getChildHtml('before_body_end') ?> -
    -
    -getAbsoluteFooter() ?> - - - diff --git a/app/design/frontend/rwd/default/template/page/2columns-left.phtml b/app/design/frontend/rwd/default/template/page/2columns-left.phtml deleted file mode 100644 index 61c408ba2..000000000 --- a/app/design/frontend/rwd/default/template/page/2columns-left.phtml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - -getChildHtml('head') ?> - -getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?>> -getChildHtml('after_body_start') ?> -
    - getChildHtml('global_notices') ?> -
    - getChildHtml('header') ?> -
    -
    - getChildHtml('breadcrumbs') ?> - - getChildHtml('left_first')): ?> -
    - -
    - getChildHtml('global_messages') ?> - getChildHtml('content') ?> -
    -
    getChildHtml('left') ?>
    -
    -
    - getChildHtml('footer_before') ?> - getChildHtml('footer') ?> - getChildHtml('global_cookie_notice') ?> - getChildHtml('before_body_end') ?> -
    -
    -getAbsoluteFooter() ?> - - diff --git a/app/design/frontend/rwd/default/template/page/2columns-right.phtml b/app/design/frontend/rwd/default/template/page/2columns-right.phtml deleted file mode 100644 index 067cd0e5e..000000000 --- a/app/design/frontend/rwd/default/template/page/2columns-right.phtml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - -getChildHtml('head') ?> - -getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?>> -getChildHtml('after_body_start') ?> -
    - getChildHtml('global_notices') ?> -
    - getChildHtml('header') ?> -
    -
    - getChildHtml('breadcrumbs') ?> -
    - getChildHtml('global_messages') ?> - getChildHtml('content') ?> -
    -
    getChildHtml('right') ?>
    -
    -
    - getChildHtml('footer_before') ?> - getChildHtml('footer') ?> - getChildHtml('global_cookie_notice') ?> - getChildHtml('before_body_end') ?> -
    -
    -getAbsoluteFooter() ?> - - diff --git a/app/design/frontend/rwd/default/template/page/3columns.phtml b/app/design/frontend/rwd/default/template/page/3columns.phtml deleted file mode 100644 index 09220eb8b..000000000 --- a/app/design/frontend/rwd/default/template/page/3columns.phtml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - -getChildHtml('head') ?> - -getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?>> -getChildHtml('after_body_start') ?> -
    - getChildHtml('global_notices') ?> -
    - getChildHtml('header') ?> -
    -
    - getChildHtml('breadcrumbs') ?> -
    - - getChildHtml('left_first')): ?> -
    - -
    - getChildHtml('global_messages') ?> - getChildHtml('content') ?> -
    -
    getChildHtml('left') ?>
    -
    -
    getChildHtml('right') ?>
    -
    -
    - getChildHtml('footer_before') ?> - getChildHtml('footer') ?> - getChildHtml('global_cookie_notice') ?> - getChildHtml('before_body_end') ?> -
    -
    -getAbsoluteFooter() ?> - - diff --git a/app/design/frontend/rwd/default/template/page/empty.phtml b/app/design/frontend/rwd/default/template/page/empty.phtml deleted file mode 100644 index b9384a13d..000000000 --- a/app/design/frontend/rwd/default/template/page/empty.phtml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - getChildHtml('head') ?> - - -
    - getChildHtml('after_body_start') ?> - getChildHtml('global_messages') ?> - getChildHtml('content') ?> - getChildHtml('before_body_end') ?> - getAbsoluteFooter() ?> -
    - - diff --git a/app/design/frontend/rwd/default/template/page/html/footer.phtml b/app/design/frontend/rwd/default/template/page/html/footer.phtml deleted file mode 100644 index d5080be11..000000000 --- a/app/design/frontend/rwd/default/template/page/html/footer.phtml +++ /dev/null @@ -1,32 +0,0 @@ - -
    -
    - getChildHtml() ?> -
    getCopyright() ?>
    -
    -
    diff --git a/app/design/frontend/rwd/default/template/page/html/header.phtml b/app/design/frontend/rwd/default/template/page/html/header.phtml deleted file mode 100644 index 097731c7f..000000000 --- a/app/design/frontend/rwd/default/template/page/html/header.phtml +++ /dev/null @@ -1,114 +0,0 @@ - - -
    -
    -
    - getChildHtml('store_language') ?> -
    - - getChildHtml('currency_switcher') ?> - -

    getChildHtml('welcome') ?> getAdditionalHtml() ?>

    -
    -
    - -
    -
    - - - -
    - - - -
    - - - - - - - - -
    - getChildHtml('minicart_head'); ?> -
    - - -
    - - - -
    - getChildHtml('topMenu') ?> -
    - - - -
    - getChildHtml('topSearch') ?> -
    - - - -
    - getChildHtml('topLinks') ?> -
    - - - - -
    -
    - - -getChildHtml('topContainer'); ?> diff --git a/app/design/frontend/rwd/default/template/page/html/pager.phtml b/app/design/frontend/rwd/default/template/page/html/pager.phtml deleted file mode 100644 index 8dbce439d..000000000 --- a/app/design/frontend/rwd/default/template/page/html/pager.phtml +++ /dev/null @@ -1,130 +0,0 @@ - - -getCollection()->getSize()): ?> - - getUseContainer()): ?> -
    - - - getShowAmounts() || $this->getShowPerPage()): ?> -
    - getShowAmounts()): ?> - getLastPageNum()>1): ?> -

    - __('%s-%s of %s', $this->getFirstNum(), $this->getLastNum(), $this->getTotalNum()) ?> -

    - -

    - __('%s Item(s)', $this->getTotalNum()) ?> -

    - - - - getShowPerPage()): ?> -
    - - -
    - -
    - - - getLastPageNum()>1): ?> -
    - __('Page:') ?> -
      - isFirstPage()): ?> -
    1. - - getAnchorTextForPrevious()): ?> - __('Previous') ?> - - getAnchorTextForPrevious() ?> - - -
      2. - - - canShowFirst()): ?> -
    2. 1
      3. - - - canShowPreviousJump()): ?> -
    3. ...
      4. - - - getFramePages() as $_page): ?> - isPageCurrent($_page)): ?> -
      5. - -
      6. - - - - - canShowNextJump()): ?> -
    6. ...
      7. - - - canShowLast()): ?> -
    7. getLastPageNum() ?>
      8. - - - isLastPage()): ?> -
    8. - - getAnchorTextForNext()): ?> - __('Next') ?> - - getAnchorTextForNext() ?> - - -
      9. - -
    - -
    - - - getUseContainer()): ?> -
    - - - diff --git a/app/design/frontend/rwd/default/template/page/html/topmenu.phtml b/app/design/frontend/rwd/default/template/page/html/topmenu.phtml deleted file mode 100644 index 1e0e25035..000000000 --- a/app/design/frontend/rwd/default/template/page/html/topmenu.phtml +++ /dev/null @@ -1,42 +0,0 @@ - - -getHtml('level-top') ?> - - - - diff --git a/app/design/frontend/rwd/default/template/page/html/topmenu/renderer.phtml b/app/design/frontend/rwd/default/template/page/html/topmenu/renderer.phtml deleted file mode 100644 index cbb89e040..000000000 --- a/app/design/frontend/rwd/default/template/page/html/topmenu/renderer.phtml +++ /dev/null @@ -1,82 +0,0 @@ -getChildren(); -$parentLevel = $menuTree->getLevel(); -$childLevel = is_null($parentLevel) ? 0 : $parentLevel + 1; - -$counter = 1; -$childrenCount = $children->count(); - -$parentPositionClass = $menuTree->getPositionClass(); -$itemPositionClassPrefix = $parentPositionClass ? $parentPositionClass . '-' : 'nav-'; - -foreach ($children as $child) { - $child->setLevel($childLevel); - $child->setIsFirst($counter == 1); - $child->setIsLast($counter == $childrenCount); - $child->setPositionClass($itemPositionClassPrefix . $counter); - - $outermostClassCode = 'level'. $childLevel; - $_hasChildren = ($child->hasChildren()) ? 'has-children' : ''; - - $html .= '
  • _getRenderedMenuItemAttributes($child) .'>'; - - $html .= ''. $this->escapeHtml($this->__($child->getName())) .''; - - if (!empty($childrenWrapClass)) { - $html .= '
    '; - } - - $nextChildLevel = $childLevel + 1; - - if (!empty($_hasChildren)) { - $html .= ''; - } - - if (!empty($childrenWrapClass)) { - $html .= '
    '; - } - - $html .= '
    • '; - - $counter++; -} - -return $html; diff --git a/app/design/frontend/rwd/default/template/page/popup.phtml b/app/design/frontend/rwd/default/template/page/popup.phtml deleted file mode 100644 index b14b99b3f..000000000 --- a/app/design/frontend/rwd/default/template/page/popup.phtml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - -getChildHtml('head') ?> - - -
    - getChildHtml('after_body_start') ?> - getChildHtml('content') ?> - getChildHtml('before_body_end') ?> -
    -getAbsoluteFooter() ?> - - diff --git a/app/design/frontend/rwd/default/template/page/print.phtml b/app/design/frontend/rwd/default/template/page/print.phtml deleted file mode 100644 index c7b644e53..000000000 --- a/app/design/frontend/rwd/default/template/page/print.phtml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - -getChildHtml('head') ?> - - -
    -
    - - getPrintLogoText()):?> -
    escapeHtml($this->getPrintLogoText())) ?>
    - -
    - getChildHtml('content') ?> -
    - -
    - getAbsoluteFooter() ?> -
    - - diff --git a/app/design/frontend/rwd/default/template/page/template/links.phtml b/app/design/frontend/rwd/default/template/page/template/links.phtml deleted file mode 100644 index fc01ef93e..000000000 --- a/app/design/frontend/rwd/default/template/page/template/links.phtml +++ /dev/null @@ -1,48 +0,0 @@ - - -getLinks(); ?> -0): ?> -
    - getTitle()): ?> -
    __($this->getTitle()); ?>
    - - getName()): ?> id="getName() ?>"> - - - toHtml() ?> - - getIsFirst()||$_link->getIsLast()): ?> class="getIsFirst()): ?>firstgetIsLast()): ?> last" getLiParams() ?>>getBeforeText() ?>getAParams() ?>>getLabel() ?>getAfterText() ?> - - - -
    - diff --git a/app/design/frontend/rwd/default/template/payment/form/cc.phtml b/app/design/frontend/rwd/default/template/payment/form/cc.phtml deleted file mode 100644 index 600ef6601..000000000 --- a/app/design/frontend/rwd/default/template/payment/form/cc.phtml +++ /dev/null @@ -1,139 +0,0 @@ - -getMethodCode() ?> - diff --git a/app/design/frontend/rwd/default/template/payment/form/ccsave.phtml b/app/design/frontend/rwd/default/template/payment/form/ccsave.phtml deleted file mode 100644 index 851078083..000000000 --- a/app/design/frontend/rwd/default/template/payment/form/ccsave.phtml +++ /dev/null @@ -1,136 +0,0 @@ - -getMethodCode() ?> - diff --git a/app/design/frontend/rwd/default/template/payment/info/default.phtml b/app/design/frontend/rwd/default/template/payment/info/default.phtml deleted file mode 100644 index adf021c56..000000000 --- a/app/design/frontend/rwd/default/template/payment/info/default.phtml +++ /dev/null @@ -1,43 +0,0 @@ - - -

    escapeHtml($this->getMethod()->getTitle()) ?>

    - -getSpecificInformation()):?> -
    - $_value):?> -
    escapeHtml($_label)?>
    -
    getValueAsArray($_value, true), "\n"))?>
    - -
    - - -getChildHtml()?> diff --git a/app/design/frontend/rwd/default/template/paypal/bml.phtml b/app/design/frontend/rwd/default/template/paypal/bml.phtml deleted file mode 100644 index 73f255091..000000000 --- a/app/design/frontend/rwd/default/template/paypal/bml.phtml +++ /dev/null @@ -1,49 +0,0 @@ - - -
    - -
    -
    - -
    diff --git a/app/design/frontend/rwd/default/template/paypal/express/minicart/shortcut.phtml b/app/design/frontend/rwd/default/template/paypal/express/minicart/shortcut.phtml deleted file mode 100644 index 32c7b475e..000000000 --- a/app/design/frontend/rwd/default/template/paypal/express/minicart/shortcut.phtml +++ /dev/null @@ -1,73 +0,0 @@ - - -
  • - -
    • -getIsBmlEnabled()): ?> -
  • - -
    • - - -getConfirmationUrl() || $this->getIsInCatalogProduct()): ?> - getIsInCatalogProduct()): ?> - - - - diff --git a/app/design/frontend/rwd/default/template/paypal/express/product/shortcut.phtml b/app/design/frontend/rwd/default/template/paypal/express/product/shortcut.phtml deleted file mode 100644 index 19b6e09aa..000000000 --- a/app/design/frontend/rwd/default/template/paypal/express/product/shortcut.phtml +++ /dev/null @@ -1,69 +0,0 @@ - - -

    - __('-OR-');?> - - getShortcutHtmlId() ?> - getBmlShortcutHtmlId() ?> - <?php echo Mage::helper('paypal')->__('Checkout with PayPal');?> -

    -getIsBmlEnabled()): ?> - - - -getConfirmationUrl() || $this->getIsInCatalogProduct()): ?> - getIsInCatalogProduct()): ?> - - - - diff --git a/app/design/frontend/rwd/default/template/paypal/express/review/details.phtml b/app/design/frontend/rwd/default/template/paypal/express/review/details.phtml deleted file mode 100644 index d96bfe21d..000000000 --- a/app/design/frontend/rwd/default/template/paypal/express/review/details.phtml +++ /dev/null @@ -1,64 +0,0 @@ - - - helper('tax')->displayCartBothPrices()): $colspan = $rowspan = 2; else: $colspan = $rowspan = 1; endif; ?> - - - - - helper('tax')->displayCartBothPrices()): ?> - - - - - - - - - - - helper('tax')->displayCartBothPrices()): ?> - - - - - - - - -getChildHtml('totals'); ?> - - getItems() as $_item): ?> - getItemHtml($_item) ?> - - -
    __('Product') ?>__('Price') ?>__('Qty') ?>__('Subtotal') ?>
    helper('tax')->getIncExcTaxLabel(false) ?>helper('tax')->getIncExcTaxLabel(true) ?>helper('tax')->getIncExcTaxLabel(false) ?>helper('tax')->getIncExcTaxLabel(true) ?>
    - diff --git a/app/design/frontend/rwd/default/template/paypal/express/review/shipping/method.phtml b/app/design/frontend/rwd/default/template/paypal/express/review/shipping/method.phtml deleted file mode 100644 index de0df6eab..000000000 --- a/app/design/frontend/rwd/default/template/paypal/express/review/shipping/method.phtml +++ /dev/null @@ -1,53 +0,0 @@ - -
    -getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?> - getShippingRateGroups()):?> - getCurrentShippingRate(); ?> - - -

    __('Sorry, no quotes are available for this order at this time.') ?>

    - - -

    renderShippingRateOption($this->getCurrentShippingRate())?>

    - -
    - diff --git a/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml b/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml deleted file mode 100644 index 3ec4237e4..000000000 --- a/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml +++ /dev/null @@ -1,228 +0,0 @@ - -
    -
    -

    __('* Required Fields') ?>

    -
      - customerHasAddresses()): ?> -
    • - -
      - getAddressesHtmlSelect('billing') ?> -
      -
      • - -
    • customerHasAddresses()): ?> style="display:none;" class="scaffold-form"> -
      - -
        -
      • getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
        • -
      • -
        - -
        - -
        -
        - isCustomerLoggedIn()): ?> -
        - -
        - -
        -
        - -
        • - helper('customer/address')->getAttributeValidationClass('street'); ?> -
      • - -
        - -
        -
        • - - helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?> -
      • - -
        - -
        -
        • - - helper('customer/address')->isVatAttributeVisible()) : ?> -
      • - -
        - -
        -
        • - -
      • -
        - -
        - -
        -
        -
        - -
        - - - -
        -
        -
        • -
      • -
        - -
        - -
        -
        -
        - -
        - getCountryHtmlSelect('billing') ?> -
        -
        -
        • -
      • -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        • - - isCustomerLoggedIn()): ?> - - getLayout()->createBlock('customer/widget_dob') ?> - getLayout()->createBlock('customer/widget_gender') ?> - isEnabled() || $_gender->isEnabled()): ?> -
      • - isEnabled()): ?> -
        - setDate($this->getQuote()->getCustomerDob())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?> -
        - - isEnabled()): ?> -
        - setGender($this->getQuote()->getCustomerGender())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?> -
        - -
        • - - - isTaxvatEnabled()):?> -
      • getTaxvatHtml() ?>
        • - - -
      • -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        • - getChildHtml('persistent.remember.me'); ?> - - isCustomerLoggedIn() && $this->customerHasAddresses()):?> -
      • - getAddress()->getSaveInAddressBook()):?> checked="checked" class="checkbox" /> -
        • - -
        • - - getChildHtml('form.additional.info'); ?> -
      - getChildHtml('persistent.remember.me.tooltip'); ?> -
      -
      • - canShip()): ?> -
    • - isUseBillingAddressForShipping()) {?> checked="checked" title="__('Ship to this address') ?>" onclick="$('shipping:same_as_billing').checked = true;" class="radio" />
      • -
    • - isUseBillingAddressForShipping()) {?> checked="checked" title="__('Ship to different address') ?>" onclick="$('shipping:same_as_billing').checked = false;" class="radio" /> -
      • - -
    - canShip()): ?> - - -
    - - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/persistent/checkout/onepage/login.phtml b/app/design/frontend/rwd/default/template/persistent/checkout/onepage/login.phtml deleted file mode 100644 index 0b7eaae00..000000000 --- a/app/design/frontend/rwd/default/template/persistent/checkout/onepage/login.phtml +++ /dev/null @@ -1,157 +0,0 @@ - - -getChildHtml('login_before') ?> -
    helper('customer')->isRegistrationAllowed() && !$this->getQuote()->isAllowedGuestCheckout()) echo ' login-only' ?>"> -
    -

    - getQuote()->isAllowedGuestCheckout() && $this->helper('customer')->isRegistrationAllowed() ): ?> - __('Checkout as a Guest or Register') ?> - getQuote()->isAllowedGuestCheckout() && !$this->helper('customer')->isRegistrationAllowed() ): ?> - __('Checkout as a Guest') ?> - - __('Register to Create an Account') ?> - -

    - getQuote()->isAllowedGuestCheckout() && $this->helper('customer')->isRegistrationAllowed() ): ?> -

    __('Register and save time!') ?>
    - __('Register with us for future convenience:') ?>

    -
      -
    • __('Fast and easy check out') ?>
      • -
    • __('Easy access to your order history and status') ?>
      • -
    - getQuote()->isAllowedGuestCheckout() && $this->helper('customer')->isRegistrationAllowed() ): ?> -

    __('Register with us for future convenience:') ?>

    - - getQuote()->isAllowedGuestCheckout() ): ?> -
      - getQuote()->isAllowedGuestCheckout() ): ?> -
    • - getQuote()->getCheckoutMethod()!=Mage_Checkout_Model_Type_Onepage::METHOD_REGISTER): ?> checked="checked" class="radio" /> -
      • - - helper('customer')->isRegistrationAllowed() ): ?> -
    • - getQuote()->getCheckoutMethod()==Mage_Checkout_Model_Type_Onepage::METHOD_REGISTER || !$this->getQuote()->isAllowedGuestCheckout()): ?> checked="checked" class="radio" /> - -
      • - -
    - - - -
    -

     

    - getQuote()->isAllowedGuestCheckout()): ?> - - helper('checkout')->isCustomerMustBeLogged()): ?> - - -
    - -
    - -
    -
    -
    -

    __('Returning Customers') ?>

    - getMessagesBlock()->getGroupedHtml() ?> -
    -
    - getBlockHtml('formkey'); ?> -

    __('Sign in to speed up your checkout process') ?>

    -

    __('* Required Fields') ?>

    -
      -
    • - -
      - -
      -
      • -
    • - -
      - -
      -
      • -
    • - __('Forgot your password?') ?> -
      • - getChildHtml('form.additional.info'); ?> - getChildHtml('persistent.remember.me'); ?> -
    - getChildHtml('persistent.remember.me.tooltip'); ?> - -
    -
    -
    - -
    -
    -
    - - -getRequest()->getParam('register'); - if ($registerParam || $registerParam === ''): -?> - - diff --git a/app/design/frontend/rwd/default/template/persistent/customer/form/login.phtml b/app/design/frontend/rwd/default/template/persistent/customer/form/login.phtml deleted file mode 100644 index 2686bbb82..000000000 --- a/app/design/frontend/rwd/default/template/persistent/customer/form/login.phtml +++ /dev/null @@ -1,104 +0,0 @@ - - - diff --git a/app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml b/app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml deleted file mode 100644 index f947b4522..000000000 --- a/app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml +++ /dev/null @@ -1,188 +0,0 @@ - - - diff --git a/app/design/frontend/rwd/default/template/persistent/remember_me.phtml b/app/design/frontend/rwd/default/template/persistent/remember_me.phtml deleted file mode 100644 index ea5e57a2c..000000000 --- a/app/design/frontend/rwd/default/template/persistent/remember_me.phtml +++ /dev/null @@ -1,41 +0,0 @@ - - -
  • - getRandomString(10); ?> -
    - isRememberMeChecked()): ?> checked="checked" title="__('Remember Me') ?>" /> -
    - - __('What\'s this?') ?> -
    • diff --git a/app/design/frontend/rwd/default/template/persistent/remember_me_tooltip.phtml b/app/design/frontend/rwd/default/template/persistent/remember_me_tooltip.phtml deleted file mode 100644 index be5bb137e..000000000 --- a/app/design/frontend/rwd/default/template/persistent/remember_me_tooltip.phtml +++ /dev/null @@ -1,62 +0,0 @@ - - -
    -
    -

    What's this?

    - __('Close') ?> -
    -
    -

    Checking "Remember Me" will let you access your shopping cart on this computer when you are logged out

    -
    - __('Close') ?> -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/reports/product_viewed.phtml b/app/design/frontend/rwd/default/template/reports/product_viewed.phtml deleted file mode 100644 index 95109778e..000000000 --- a/app/design/frontend/rwd/default/template/reports/product_viewed.phtml +++ /dev/null @@ -1,53 +0,0 @@ - -getRecentlyViewedProducts()): ?> -
    -
    - __('Recently Viewed Products') ?> -
    -
    -
      - -
    1. - - <?php echo $this->escapeHtml($this->getProductName()) ?> - -
      -

      - - helper('catalog/output')->productAttribute($_item, $_item->getName() , 'name') ?> - -

      -
      -
      2. - -
    - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_default_list.phtml b/app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_default_list.phtml deleted file mode 100644 index 6328a314f..000000000 --- a/app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_default_list.phtml +++ /dev/null @@ -1,57 +0,0 @@ - -getRecentlyComparedProducts()): ?> -
    -
    -
    - __('Recently Compared') ?> -
    -
    - getNameInLayout(); ?> -
      - -
    1. - <?php echo $this->stripTags($_product->getName(), null, true) ?> -
      -

      helper('catalog/output')->productAttribute($_product, $_product->getName() , 'name') ?>

      - getPriceHtml($_product, true, '-widget-compared-'.$suffix) ?> - isSaleable()): ?> - __('Add to Cart') ?> - -

      __('Out of stock') ?>

      - - */ ?> -
      -
      2. - -
    - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_images_list.phtml b/app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_images_list.phtml deleted file mode 100644 index d3a89310b..000000000 --- a/app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_images_list.phtml +++ /dev/null @@ -1,47 +0,0 @@ - -getRecentlyComparedProducts()): ?> -
    -
    -
    - __('Recently Compared') ?> -
    -
    - getNameInLayout(); ?> -
      - -
    1. - - <?php echo $this->stripTags($_product->getName(), null, true) ?> -
      2. - -
    - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_names_list.phtml b/app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_names_list.phtml deleted file mode 100644 index b6c9b8690..000000000 --- a/app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_names_list.phtml +++ /dev/null @@ -1,46 +0,0 @@ - -getRecentlyComparedProducts()): ?> -
    -
    -
    - __('Recently Compared') ?> -
    -
    - getNameInLayout(); ?> -
      - -
    1. -

      helper('catalog/output')->productAttribute($_product, $_product->getName() , 'name') ?>

      -
      2. - -
    - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml b/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml deleted file mode 100644 index 4eedf158c..000000000 --- a/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml +++ /dev/null @@ -1,67 +0,0 @@ - -getRecentlyComparedProducts()): ?> -
    -
    -

    __('Recently Compared') ?>

    -
    -
    - getColumnCount(); ?> - - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml b/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml deleted file mode 100644 index eaf558f61..000000000 --- a/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml +++ /dev/null @@ -1,64 +0,0 @@ - -getRecentlyComparedProducts()): ?> -
    -
    -

    __('Recently Compared') ?>

    -
    -
    -
      - -
    1. - <?php echo $this->stripTags($_product->getName(), null, true) ?> -
      -
      -

      helper('catalog/output')->productAttribute($_product, $_product->getName() , 'name') ?>

      - getPriceHtml($_product, true, '-widget-compared-list') ?> - getReviewsSummaryHtml($_product, 'short') ?> - isSaleable()): ?> - - -

      __('Out of stock') ?>

      - - - */ ?> -
      -
      -
      2. - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_default_list.phtml b/app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_default_list.phtml deleted file mode 100644 index baa40432a..000000000 --- a/app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_default_list.phtml +++ /dev/null @@ -1,62 +0,0 @@ - - -getRecentlyViewedProducts()): ?> -
    -
    -
    - __('Recently Viewed') ?> -
    -
    - getNameInLayout(); ?> -
      - -
    1. - <?php echo $this->stripTags($_product->getName(), null, true) ?> -
      -

      helper('catalog/output')->productAttribute($_product, $_product->getName() , 'name') ?>

      - getPriceHtml($_product, true, '-widget-viewed-'.$suffix) ?> - isSaleable()): ?> - __('Add to Cart') ?> - -

      __('Out of stock') ?>

      - - */ ?> -
      -
      2. - -
    - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_images_list.phtml b/app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_images_list.phtml deleted file mode 100644 index fe8f724dd..000000000 --- a/app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_images_list.phtml +++ /dev/null @@ -1,52 +0,0 @@ - - -getRecentlyViewedProducts()): ?> -
    -
    -
    - __('Recently Viewed') ?> -
    -
    - getNameInLayout(); ?> -
      - -
    1. - - <?php echo $this->stripTags($_product->getName(), null, true) ?> -
      2. - -
    - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_names_list.phtml b/app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_names_list.phtml deleted file mode 100644 index f5b7082db..000000000 --- a/app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_names_list.phtml +++ /dev/null @@ -1,51 +0,0 @@ - - -getRecentlyViewedProducts()): ?> -
    -
    -
    - __('Recently Viewed') ?> -
    -
    - getNameInLayout(); ?> -
      - -
    1. -

      helper('catalog/output')->productAttribute($_product, $_product->getName() , 'name') ?>

      -
      2. - -
    - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml b/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml deleted file mode 100644 index cfbea46bb..000000000 --- a/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml +++ /dev/null @@ -1,70 +0,0 @@ - - -getRecentlyViewedProducts()): ?> -
    -
    -

    __('Recently Viewed') ?>

    -
    -
    - getColumnCount(); ?> -
    -
    - diff --git a/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml b/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml deleted file mode 100644 index 24d9513b6..000000000 --- a/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml +++ /dev/null @@ -1,69 +0,0 @@ - - -getRecentlyViewedProducts()): ?> -
    -
    -

    __('Recently Viewed') ?>

    -
    -
    -
      - -
    1. - <?php echo $this->stripTags($_product->getName(), null, true) ?> -
      -
      -

      helper('catalog/output')->productAttribute($_product, $_product->getName() , 'name') ?>

      - getReviewsSummaryHtml($_product, 'short') ?> - getPriceHtml($_product, true, '-widget-viewed-list') ?> - isSaleable()): ?> - - -

      __('Out of stock') ?>

      - - - */ ?> -
      -
      -
      2. - -
    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/review/customer/view.phtml b/app/design/frontend/rwd/default/template/review/customer/view.phtml deleted file mode 100644 index 8e64ecddc..000000000 --- a/app/design/frontend/rwd/default/template/review/customer/view.phtml +++ /dev/null @@ -1,75 +0,0 @@ - -getProductData()->getId()): ?> -
    -
    -

    __('Review Details') ?>

    -
    -
    - <?php echo $this->escapeHtml($this->getProductData()->getName()) ?> - getRating() && $this->getRating()->getSize()): ?> -

    __('Average Customer Rating:') ?>

    - getReviewsSummaryHtml($this->getProductData()) ?> - -
    -
    -

    escapeHtml($this->getProductData()->getName()) ?>

    - getRating() && $this->getRating()->getSize()): ?> -

    isReviewOwner()) ? $this->__('Your Rating:') : $this->__('Rating:'); ?>

    - - getRating() as $_rating): ?> - getPercent()): ?> - - - - - - -
    escapeHtml($_rating->getRatingCode()) ?> -
    -
    -
    -
    - -
    -
    - isReviewOwner()): ?> - __('Your Review (submitted on %s):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?> - - __('Review (submitted on %s):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?> - -
    -
    - escapeHtml($this->getReviewData()->getDetail())) ?> -
    -
    -
    -
    -

    « __('Back to My Reviews') ?>

    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/review/form.phtml b/app/design/frontend/rwd/default/template/review/form.phtml deleted file mode 100644 index 9a266efde..000000000 --- a/app/design/frontend/rwd/default/template/review/form.phtml +++ /dev/null @@ -1,165 +0,0 @@ - -
    -

    __('Write Your Own Review') ?>

    - getAllowWriteReviewFlag()): ?> -
    - getBlockHtml('formkey'); ?> - getChildHtml('form_fields_before')?> -

    __("You're reviewing:"); ?> - escapeHtml($this->getProductInfo()->getName()) ?> -

    - -
    - getRatings() && $this->getRatings()->getSize()): ?> -

    __('How do you rate this product?') ?> *

    - - - - - - - - - - - - - - - - - - - - getRatings() as $_rating): ?> - - - getOptions() as $_option): ?> - - - - - -
      -
    - 1 - __('1 star') ?> -
    -     		-
    - 2 - __('2 star') ?> -
    -     		-
    - 3 - __('3 star') ?> -
    -     		-
    - 4 - __('4 star') ?> -
    -     		-
    - 5 - __('5 star') ?> -
    -
    escapeHtml($_rating->getRatingCode()) ?>
    - - - - -
      -
    • - -
      - -
      -
      • - -
    • - -
      - -
      -
      • - -
    • - -
      - -
      -
      • - -
    -
    -
    - -
    -
    - - -

    - __('Only registered users can write reviews. Please, log in or register', $this->getLoginLink(), Mage::helper('customer')->getRegisterUrl()) ?> -

    - -
    diff --git a/app/design/frontend/rwd/default/template/review/product/view/list.phtml b/app/design/frontend/rwd/default/template/review/product/view/list.phtml deleted file mode 100644 index f72438a59..000000000 --- a/app/design/frontend/rwd/default/template/review/product/view/list.phtml +++ /dev/null @@ -1,85 +0,0 @@ - - -getReviewsCollection()->getItems();?> -
    - -
    -

    - __('Customer Reviews') ?> - item(s) -

    - getChildHtml('toolbar') ?> -
    -
    - -
    - - escapeHtml($_review->getTitle()) ?> - -
    -
    - getRatingVotes(); ?> - - escapeHtml($_review->getDetail())) ?> - - - - - - - - - - - - - - -
    escapeHtml($_vote->getRatingCode()) ?> -
    -
    -
    -
    - - - - - __('Review by %s', $this->escapeHtml($_review->getNickname())) ?> - / - __('(Posted on %s)', $this->formatDate($_review->getCreatedAt()), 'long') ?> - -
    - -
    - - getChildHtml('toolbar') ?> - getParentBlock()): ?> - getParentBlock()->getReviewsSummaryHtml($this->getProduct(), 'short', true)?> - - getChildHtml('review_form') ?> -
    diff --git a/app/design/frontend/rwd/default/template/review/view.phtml b/app/design/frontend/rwd/default/template/review/view.phtml deleted file mode 100644 index 3404b60b6..000000000 --- a/app/design/frontend/rwd/default/template/review/view.phtml +++ /dev/null @@ -1,76 +0,0 @@ - -getProductData()->getId()): ?> -
    -
    -

    __('Review Details') ?>

    -
    -
    - - <?php echo $this->escapeHtml($this->getProductData()->getName()) ?> - - getRating() && $this->getRating()->getSize()): ?> -

    __('Average Customer Rating') ?>:

    - getReviewsSummaryHtml($this->getProductData()) ?> - -
    -
    -

    escapeHtml($this->getProductData()->getName()) ?>

    - getRating() && $this->getRating()->getSize()): ?> -

    __('Product Rating:') ?>

    - - getRating() as $_rating): ?> - getPercent()): ?> - - - - - - -
    __($this->escapeHtml($_rating->getRatingCode())) ?> -
    -
    -
    -
    - - -
    -
    - __('Product Review (submitted on %s):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?> -
    -
    - escapeHtml($this->getReviewData()->getDetail())) ?> -
    -
    -
    -
    -

    « __('Back to Product Reviews') ?>

    -
    -
    - diff --git a/app/design/frontend/rwd/default/template/sales/order/creditmemo/items.phtml b/app/design/frontend/rwd/default/template/sales/order/creditmemo/items.phtml deleted file mode 100644 index f30f36df6..000000000 --- a/app/design/frontend/rwd/default/template/sales/order/creditmemo/items.phtml +++ /dev/null @@ -1,65 +0,0 @@ - -getOrder() ?> -

    __('Print All Refunds') ?>

    -getCreditmemosCollection() as $_creditmemo): ?> -

    __('Refund #') ?>getIncrementId(); ?> | __('Print Refund') ?>

    -

    __('Items Refunded') ?>

    - - - - - - - - - - - - - - - - - - - - - getTotalsHtml($_creditmemo);?> - - getAllItems(); ?> - - - getOrderItem()->getParentItem()) continue; ?> - - getItemHtml($_item) ?> - - -
    __('Product Name') ?>__('SKU') ?>__('Price') ?>__('Qty') ?>__('Subtotal') ?>__('Discount Amount') ?>__('Row Total') ?>
    - -getCommentsHtml($_creditmemo)?> - diff --git a/app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml deleted file mode 100644 index 0a9b4306b..000000000 --- a/app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml +++ /dev/null @@ -1,331 +0,0 @@ - -getItem() ?> -getItem()->getOrderItem()->getOrder() ?> - -

    escapeHtml($_item->getName()) ?>

    - getItemOptions()): ?> -
    - -
    escapeHtml($_option['label']) ?>
    - getPrintStatus()): ?> - getFormatedOptionValue($_option) ?> - class="truncated"> - -
    -
    -
    escapeHtml($_option['label']) ?>
    -
    -
    -
    - - - -
    escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?>
    - - -
    - - getProductAdditionalInformationBlock(); ?> - - setItem($_item->getOrderItem())->toHtml(); ?> - - escapeHtml($_item->getDescription()) ?> - helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?> - __('Gift Message') ?> - - -escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?> - - helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?> - - helper('tax')->displaySalesBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Excl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?> - - getOrder()->formatPrice($this->getItem()->getPrice()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total'); ?> - :
    getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>     -     - - -     -
    - - helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?> - - helper('tax')->displaySalesBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Incl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - helper('checkout')->getPriceInclTax($this->getItem()); ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?> - - getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total incl. tax'); ?> - :
    getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>     -     - - -     - - -getQty() * 1 ?> - - helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?> - - helper('tax')->displaySalesBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Excl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?> - - getOrder()->formatPrice($this->getItem()->getRowTotal()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total'); ?> - :
    getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>     -     - - -     -
    - - helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?> - - helper('tax')->displaySalesBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Incl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - helper('checkout')->getSubtotalInclTax($this->getItem()); ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?> - - getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total incl. tax'); ?> - :
    getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>     -     - - - - - -     - - -formatPrice(-$_item->getDiscountAmount()) ?> - - formatPrice($_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()) ?> - - diff --git a/app/design/frontend/rwd/default/template/sales/order/history.phtml b/app/design/frontend/rwd/default/template/sales/order/history.phtml deleted file mode 100644 index ccb99d577..000000000 --- a/app/design/frontend/rwd/default/template/sales/order/history.phtml +++ /dev/null @@ -1,77 +0,0 @@ - -getMessagesBlock()->getGroupedHtml() ?> -getOrders(); ?> -
    -

    __('My Orders') ?>

    -
    -getChildHtml('info');?> -getPagerHtml(); ?> -getSize()): ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    __('Order #') ?>__('Date') ?>__('Ship To') ?>__('Order Total') ?>__('Order Status') ?> 
    getRealOrderId() ?>formatDate($_order->getCreatedAtStoreDate()) ?>getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : ' ' ?>formatPrice($_order->getGrandTotal()) ?>getStatusLabel() ?> - __('View Order') ?> - |__('Track Order') ?> */ ?> - helper('sales/reorder')->canReorder($_order)) : ?> - | __('Reorder') ?> - - -
    - -getPagerHtml(); ?> - -

    __('You have placed no orders.'); ?>

    - diff --git a/app/design/frontend/rwd/default/template/sales/order/items.phtml b/app/design/frontend/rwd/default/template/sales/order/items.phtml deleted file mode 100644 index 1e1315005..000000000 --- a/app/design/frontend/rwd/default/template/sales/order/items.phtml +++ /dev/null @@ -1,69 +0,0 @@ - -getOrder() ?> - - - - - - - - - - - - - - - - - getChildHtml('order_totals') ?> - - getItemsCollection(); ?> - - count(); ?> - - getParentItem()) continue; ?> - - getItemHtml($_item) ?> - helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?> - - helper('giftmessage/message')->getGiftMessageForEntity($_item); ?> - - - - - -
    __('Product') ?>__('SKU') ?>__('Price') ?>__('Qty') ?>__('Subtotal') ?>
    - diff --git a/app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml b/app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml deleted file mode 100644 index 1e787df1e..000000000 --- a/app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml +++ /dev/null @@ -1,323 +0,0 @@ - -getItem() ?> - -

    escapeHtml($_item->getName()) ?>

    - getItemOptions()): ?> -
    - -
    escapeHtml($_option['label']) ?>
    - getPrintStatus()): ?> - getFormatedOptionValue($_option) ?> - class="truncated"> - - -
    -
    -
    escapeHtml($_option['label']) ?>
    -
    -
    -
    - - - -
    - escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?> -
    - - -
    - - getProductAdditionalInformationBlock(); ?> - - setItem($_item)->toHtml(); ?> - - escapeHtml($_item->getDescription()) ?> - helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?> - __('Gift Message') ?> - - - escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?> - - helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?> - - helper('tax')->displaySalesBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Excl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?> - - getOrder()->formatPrice($this->getItem()->getPrice()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total'); ?>:
    getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>     -     - - -     -
    - - helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?> - - helper('tax')->displaySalesBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Incl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - helper('checkout')->getPriceInclTax($this->getItem()); ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?> - - getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total incl. tax'); ?>:
    getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>     -     - - -     - - - - - getItem()->getQtyOrdered() > 0): ?> - __('Ordered'); ?>: getItem()->getQtyOrdered()*1 ?>
    - - getItem()->getQtyShipped() > 0): ?> - __('Shipped'); ?>: getItem()->getQtyShipped()*1 ?>
    - - getItem()->getQtyCanceled() > 0): ?> - __('Canceled'); ?>: getItem()->getQtyCanceled()*1 ?>
    - - getItem()->getQtyRefunded() > 0): ?> - __('Refunded'); ?>: getItem()->getQtyRefunded()*1 ?>
    - -     - - - helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?> - - helper('tax')->displaySalesBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Excl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?> - - getOrder()->formatPrice($this->getItem()->getRowTotal()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total'); ?>:
    getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>     -     - - -     -
    - - helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?> - - helper('tax')->displaySalesBothPrices()): ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - __('Incl. Tax'); ?>: - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - helper('checkout')->getSubtotalInclTax($this->getItem()); ?> - typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?> - - getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?> - - - - - - getApplied($this->getItem())): ?> - - - - typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - __('Total incl. tax'); ?>:
    getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>     -     - - - - - -     - - - - diff --git a/app/design/frontend/rwd/default/template/sales/order/recent.phtml b/app/design/frontend/rwd/default/template/sales/order/recent.phtml deleted file mode 100644 index cf04fa0a6..000000000 --- a/app/design/frontend/rwd/default/template/sales/order/recent.phtml +++ /dev/null @@ -1,75 +0,0 @@ - - diff --git a/app/design/frontend/rwd/default/template/sales/order/shipment/items.phtml b/app/design/frontend/rwd/default/template/sales/order/shipment/items.phtml deleted file mode 100644 index 68856802f..000000000 --- a/app/design/frontend/rwd/default/template/sales/order/shipment/items.phtml +++ /dev/null @@ -1,89 +0,0 @@ - -getOrder() ?> -

    - getTracksCollection()->count()) : ?> - __('Track all shipments') ?> | - - __('Print All Shipments') ?> -

    -getShipmentsCollection() as $_shipment): ?> -

    __('Shipment #') ?>getIncrementId(); ?> | __('Print Shipment') ?>

    -getTracksCollection(); ?> -count()): ?> - - - - - - - - - - -
    - __('Track this shipment') ?> -
    __('Tracking Number(s):') ?>  - count(); - foreach($tracks as $track): ?> - isCustom()): ?> - escapeHtml($track->getNumber()) ?> - - escapeHtml($track->getNumber()) ?> - - , - -
    - - -

    __('Items Shipped') ?>

    - - - - - - - - - - - - getAllItems(); ?> - - - getOrderItem()->getParentItem()) continue; ?> - - getItemHtml($_item) ?> - - -
    __('Product Name') ?>__('SKU') ?>__('Qty Shipped') ?>
    - -getCommentsHtml($_shipment)?> - diff --git a/app/design/frontend/rwd/default/template/sales/widget/guest/form.phtml b/app/design/frontend/rwd/default/template/sales/widget/guest/form.phtml deleted file mode 100644 index d4708bbdb..000000000 --- a/app/design/frontend/rwd/default/template/sales/widget/guest/form.phtml +++ /dev/null @@ -1,105 +0,0 @@ - -isEnable()): ?> -
    -
    -
    - - __('Orders and Returns') ?> - -
    -
    -
    -
      -
    • - -
      - -
      -
      • -
    • - -
      - -
      -
      • -
    • - -
      - -
      -
      • -
    • - -
      - -
      -
      • - -
    -
    - -
    -
    -
    -
    -
    - - diff --git a/app/design/frontend/rwd/default/template/sendfriend/send.phtml b/app/design/frontend/rwd/default/template/sendfriend/send.phtml deleted file mode 100644 index ce6ae561f..000000000 --- a/app/design/frontend/rwd/default/template/sendfriend/send.phtml +++ /dev/null @@ -1,143 +0,0 @@ - - - -
    - getMessagesBlock()->getGroupedHtml() ?> -
    -

    __('Email to a Friend') ?>

    -
    -
    -
    - getBlockHtml('formkey')?> -

    __('Sender:') ?>

    -
      -
    • -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      • -
    • - -
      - -
      -
      • -
    -
    -
    -

    __('Recipient:') ?>

    -
      -
    • -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      • -
    -
    -
    -

    « __('Back') ?>

    - - - getMaxRecipients()): ?> -

    - -

    - -
    -
    - -
    diff --git a/app/design/frontend/rwd/default/template/wishlist/button/update.phtml b/app/design/frontend/rwd/default/template/wishlist/button/update.phtml deleted file mode 100644 index ad6401fc9..000000000 --- a/app/design/frontend/rwd/default/template/wishlist/button/update.phtml +++ /dev/null @@ -1,30 +0,0 @@ - - -getWishlist()->getItemsCount()): ?> - - diff --git a/app/design/frontend/rwd/default/template/wishlist/item/column/cart.phtml b/app/design/frontend/rwd/default/template/wishlist/item/column/cart.phtml deleted file mode 100644 index 419c7f0cb..000000000 --- a/app/design/frontend/rwd/default/template/wishlist/item/column/cart.phtml +++ /dev/null @@ -1,58 +0,0 @@ -getItem(); -$product = $item->getProduct(); -$options = $this->getChild('customer.wishlist.item.options') - ->setItem($item) - ->getConfiguredOptions(); -?> -
    -isSaleable()): ?> - - - getIsSalable()): ?> -

    - helper('catalog')->__('Availability:') ?> - helper('catalog')->__('In stock') ?> -

    - -

    - helper('catalog')->__('Availability:') ?> - helper('catalog')->__('Out of stock') ?> -

    - - -
    -isVisibleInSiteVisibility()): ?> -

    __('Edit') ?>

    - -getSortedChildren() as $childName):?> - getChildHtml($childName, false);?> - -
    diff --git a/app/design/frontend/rwd/default/template/wishlist/item/column/info.phtml b/app/design/frontend/rwd/default/template/wishlist/item/column/info.phtml deleted file mode 100644 index 50635d2be..000000000 --- a/app/design/frontend/rwd/default/template/wishlist/item/column/info.phtml +++ /dev/null @@ -1,53 +0,0 @@ -getItem(); -$product = $item->getProduct(); -?> -

    - escapeHtml($product->getName()) ?> -

    - -
    - SKU escapeHtml($product->getSku()) ?> -
    - - - escapeHtml($this->stripTags($product->getShortDescription()));?> - - - - -getSortedChildren()): ?> -
    - getSortedChildren() as $childName):?> - getChildHtml($childName, false);?> - -
    - diff --git a/app/design/frontend/rwd/default/template/wishlist/item/column/price.phtml b/app/design/frontend/rwd/default/template/wishlist/item/column/price.phtml deleted file mode 100644 index 568bd1794..000000000 --- a/app/design/frontend/rwd/default/template/wishlist/item/column/price.phtml +++ /dev/null @@ -1,37 +0,0 @@ -getItem(); -$product = $item->getProduct(); -$options = $this->getChild('customer.wishlist.item.options') - ->setItem($item) - ->getConfiguredOptions(); -?> -
    - getPriceHtml($product, empty($options));?> -
    diff --git a/app/design/frontend/rwd/default/template/wishlist/item/column/quantity.phtml b/app/design/frontend/rwd/default/template/wishlist/item/column/quantity.phtml deleted file mode 100644 index 5df9271aa..000000000 --- a/app/design/frontend/rwd/default/template/wishlist/item/column/quantity.phtml +++ /dev/null @@ -1,41 +0,0 @@ -getItem(); -$product = $item->getProduct(); -$options = $this->getChild('customer.wishlist.item.options') - ->setItem($item) - ->getConfiguredOptions(); -?> -
    -
    - canHaveQty() && $item->getProduct()->isVisibleInSiteVisibility()): ?> - - -
    -
    diff --git a/app/design/frontend/rwd/default/template/wishlist/item/list.phtml b/app/design/frontend/rwd/default/template/wishlist/item/list.phtml deleted file mode 100644 index b2d9a596d..000000000 --- a/app/design/frontend/rwd/default/template/wishlist/item/list.phtml +++ /dev/null @@ -1,69 +0,0 @@ - -getColumns(); -?> - - - - getNameInLayout())); - ?> - - - - - - getItems())): ?> - getItems() as $item): ?> - - $column): - $_blockName = str_replace('.','-',strtolower($column->getNameInLayout())); - $_rwdLabel = ($column->getTitle()) ? $column->getTitle() : false; - ?> - - - - - - - - -
    getTitle();?>
    data-rwd-label="">setItem($item); echo $column->toHtml($item);?>
    __('This Wishlist has no Items');?>
    - - getAdditionalHtml();?> - - diff --git a/app/design/frontend/rwd/default/template/wishlist/shared.phtml b/app/design/frontend/rwd/default/template/wishlist/shared.phtml deleted file mode 100644 index 83ba783e8..000000000 --- a/app/design/frontend/rwd/default/template/wishlist/shared.phtml +++ /dev/null @@ -1,85 +0,0 @@ - -
    -
    -

    escapeHtml($this->getHeader()) ?>

    -
    - getMessagesBlock()->getGroupedHtml() ?> - hasWishlistItems()): ?> -
    -
    - - - - - - - - - - - - - getWishlistItems() as $item): ?> - getProduct(); - $isVisibleProduct = $product->isVisibleInSiteVisibility(); - ?> - - - - - - - -
    __('Product') ?>__('Comment') ?> 
    - <?php echo $this->escapeHtml($product->getName()) ?> -

    escapeHtml($product->getName()) ?>

    - getPriceHtml($product) ?> - getDetailsHtml($item) ?> -     		getEscapedDescription($item) ?> - isSaleable()): ?> - - - - -

    __('Add to Wishlist') ?>

    -
    - -
    -
    -

    « __('Back') ?>

    - isSaleable()):?> - - -
    -
    - -

    __('Wishlist is empty now.') ?>

    - -
    diff --git a/app/design/frontend/rwd/default/template/wishlist/sidebar.phtml b/app/design/frontend/rwd/default/template/wishlist/sidebar.phtml deleted file mode 100644 index 60a8fa0fc..000000000 --- a/app/design/frontend/rwd/default/template/wishlist/sidebar.phtml +++ /dev/null @@ -1,61 +0,0 @@ - -helper('wishlist')->isAllow()) : ?> -
    -
    - getTitle(); ?> -
    -
    -

    __('Last Added Items') ?>

    - hasWishlistItems()): ?> -
      - getWishlistItems() as $_item): ?> - getProduct(); ?> -
    1. - <?php echo $this->escapeHtml($product->getName()) ?> -
      - __('Remove This Item') ?> -

      escapeHtml($product->getName()) ?>

      - isSaleable() && $product->isVisibleInSiteVisibility()): ?> - __('Add to Cart') ?> - - getPriceHtml($product, false, '-wishlist') ?> -
      -
      2. - -
    - -
    - __('Go to Wishlist') ?> -
    - -

    __('You have no items in your wishlist.') ?>

    - -
    -
    - diff --git a/app/design/frontend/rwd/default/template/wishlist/view.phtml b/app/design/frontend/rwd/default/template/wishlist/view.phtml deleted file mode 100644 index cc1d53504..000000000 --- a/app/design/frontend/rwd/default/template/wishlist/view.phtml +++ /dev/null @@ -1,92 +0,0 @@ - -helper('wishlist')->isAllow()) : ?> -
    -
    - helper('wishlist')->isRssAllow() && $this->hasWishlistItems()): ?> - __('RSS Feed') ?> - -

    getTitle(); ?>

    -
    - getMessagesBlock()->getGroupedHtml() ?> - -
    - getChildHtml('top'); ?> -
    - hasWishlistItems()): ?> - getBlockHtml('formkey');?> - getChild('items')->setItems($this->getWishlistItems()); ?> - getChildHtml('items');?> - - -

    __('You have no items in your wishlist.') ?>

    - -
    - getChildHtml('control_buttons');?> -
    -
    -
    - -
    - getBlockHtml('formkey') ?> -
    - - -
    -
    - - -
    - getChildHtml('bottom'); ?> -
    -

    « __('Back') ?>

    -
    - diff --git a/app/design/install/default/default/etc/theme.xml b/app/design/install/default/default/etc/theme.xml deleted file mode 100644 index 396fe54f1..000000000 --- a/app/design/install/default/default/etc/theme.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - diff --git a/app/design/install/default/default/layout/main.xml b/app/design/install/default/default/layout/main.xml index c267bb1f7..4638ccc7b 100644 --- a/app/design/install/default/default/layout/main.xml +++ b/app/design/install/default/default/layout/main.xml @@ -21,7 +21,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/install/default/default/template/install/begin.phtml b/app/design/install/default/default/template/install/begin.phtml index 645d208ad..e2cacf150 100644 --- a/app/design/install/default/default/template/install/begin.phtml +++ b/app/design/install/default/default/template/install/begin.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/install/default/default/template/install/config.phtml b/app/design/install/default/default/template/install/config.phtml index 8e7adbf5d..ff612bde9 100644 --- a/app/design/install/default/default/template/install/config.phtml +++ b/app/design/install/default/default/template/install/config.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/install/default/default/template/install/create_admin.phtml b/app/design/install/default/default/template/install/create_admin.phtml index a41a4e28b..efa1656fe 100644 --- a/app/design/install/default/default/template/install/create_admin.phtml +++ b/app/design/install/default/default/template/install/create_admin.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/install/default/default/template/install/db/main.phtml b/app/design/install/default/default/template/install/db/main.phtml index ff1e0908a..901ce13ba 100644 --- a/app/design/install/default/default/template/install/db/main.phtml +++ b/app/design/install/default/default/template/install/db/main.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/install/default/default/template/install/db/mysql4.phtml b/app/design/install/default/default/template/install/db/mysql4.phtml index 5f7cfade5..0262c4159 100644 --- a/app/design/install/default/default/template/install/db/mysql4.phtml +++ b/app/design/install/default/default/template/install/db/mysql4.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/install/default/default/template/install/download.phtml b/app/design/install/default/default/template/install/download.phtml index c5b3298d6..61f39997c 100644 --- a/app/design/install/default/default/template/install/download.phtml +++ b/app/design/install/default/default/template/install/download.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/install/default/default/template/install/end.phtml b/app/design/install/default/default/template/install/end.phtml index f82e9b07f..53a883c8a 100644 --- a/app/design/install/default/default/template/install/end.phtml +++ b/app/design/install/default/default/template/install/end.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/install/default/default/template/install/locale.phtml b/app/design/install/default/default/template/install/locale.phtml index bda6d3bce..579ea342a 100644 --- a/app/design/install/default/default/template/install/locale.phtml +++ b/app/design/install/default/default/template/install/locale.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/install/default/default/template/install/state.phtml b/app/design/install/default/default/template/install/state.phtml index 55e164f98..959b65ed2 100644 --- a/app/design/install/default/default/template/install/state.phtml +++ b/app/design/install/default/default/template/install/state.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -40,7 +40,7 @@

    __('Having trouble installing Magento?') ?> - __('Check out our') ?> __('Installation Guide') ?> + __('Check out our') ?> __('Installation Guide') ?> diff --git a/app/design/install/default/default/template/page.phtml b/app/design/install/default/default/template/page.phtml index f0f9f45b8..f2440c0db 100644 --- a/app/design/install/default/default/template/page.phtml +++ b/app/design/install/default/default/template/page.phtml @@ -20,7 +20,7 @@ * * @category design * @package default_default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/etc/config.xml b/app/etc/config.xml index ec17f6c5b..eceb6e913 100644 --- a/app/etc/config.xml +++ b/app/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/local.xml.additional b/app/etc/local.xml.additional index 23e003951..60eb828d6 100644 --- a/app/etc/local.xml.additional +++ b/app/etc/local.xml.additional @@ -58,7 +58,7 @@ to app/etc/local.xml manually. - + @@ -70,7 +70,7 @@ to app/etc/local.xml manually. 1 - 0777 + 0777 fpc diff --git a/app/etc/modules/Mage_All.xml b/app/etc/modules/Mage_All.xml index b3e1ef731..8549bd4cf 100644 --- a/app/etc/modules/Mage_All.xml +++ b/app/etc/modules/Mage_All.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Api.xml b/app/etc/modules/Mage_Api.xml index 8534134cc..928570704 100644 --- a/app/etc/modules/Mage_Api.xml +++ b/app/etc/modules/Mage_Api.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Api2.xml b/app/etc/modules/Mage_Api2.xml index 57d895849..b9d8285ba 100644 --- a/app/etc/modules/Mage_Api2.xml +++ b/app/etc/modules/Mage_Api2.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Api2 - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Authorizenet.xml b/app/etc/modules/Mage_Authorizenet.xml index 774bac2a4..9e4a27d59 100644 --- a/app/etc/modules/Mage_Authorizenet.xml +++ b/app/etc/modules/Mage_Authorizenet.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Authorizenet - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Bundle.xml b/app/etc/modules/Mage_Bundle.xml index 3d46b3ad0..64268e43e 100644 --- a/app/etc/modules/Mage_Bundle.xml +++ b/app/etc/modules/Mage_Bundle.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Bundle - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Captcha.xml b/app/etc/modules/Mage_Captcha.xml index dd9c6facc..db5fe3d8e 100644 --- a/app/etc/modules/Mage_Captcha.xml +++ b/app/etc/modules/Mage_Captcha.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Captcha - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Centinel.xml b/app/etc/modules/Mage_Centinel.xml index cb25f428c..a254f7210 100644 --- a/app/etc/modules/Mage_Centinel.xml +++ b/app/etc/modules/Mage_Centinel.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Centinel - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Compiler.xml b/app/etc/modules/Mage_Compiler.xml index 11cf1c24d..2c4b43a4a 100644 --- a/app/etc/modules/Mage_Compiler.xml +++ b/app/etc/modules/Mage_Compiler.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Compiler - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Connect.xml b/app/etc/modules/Mage_Connect.xml index 3c8b2e3be..e5f6bb4e2 100644 --- a/app/etc/modules/Mage_Connect.xml +++ b/app/etc/modules/Mage_Connect.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_CurrencySymbol.xml b/app/etc/modules/Mage_CurrencySymbol.xml index efe4ca657..2ac74d10d 100644 --- a/app/etc/modules/Mage_CurrencySymbol.xml +++ b/app/etc/modules/Mage_CurrencySymbol.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_CurrencySymbol - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Downloadable.xml b/app/etc/modules/Mage_Downloadable.xml index 8b74086e3..7e9e908d6 100644 --- a/app/etc/modules/Mage_Downloadable.xml +++ b/app/etc/modules/Mage_Downloadable.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_ImportExport.xml b/app/etc/modules/Mage_ImportExport.xml index ae99c3df1..bf8f726bb 100644 --- a/app/etc/modules/Mage_ImportExport.xml +++ b/app/etc/modules/Mage_ImportExport.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_ImportExport - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Oauth.xml b/app/etc/modules/Mage_Oauth.xml index a76dfb21a..3e490265a 100644 --- a/app/etc/modules/Mage_Oauth.xml +++ b/app/etc/modules/Mage_Oauth.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Oauth - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_PageCache.xml b/app/etc/modules/Mage_PageCache.xml index 6d27db8f8..86d7e4900 100644 --- a/app/etc/modules/Mage_PageCache.xml +++ b/app/etc/modules/Mage_PageCache.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_PageCache - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Persistent.xml b/app/etc/modules/Mage_Persistent.xml index 9cf53d70f..25593df14 100644 --- a/app/etc/modules/Mage_Persistent.xml +++ b/app/etc/modules/Mage_Persistent.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Persistent - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Weee.xml b/app/etc/modules/Mage_Weee.xml index 1d0c3b77a..37de5550c 100644 --- a/app/etc/modules/Mage_Weee.xml +++ b/app/etc/modules/Mage_Weee.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Weee - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Widget.xml b/app/etc/modules/Mage_Widget.xml index 85419a075..5bd305986 100644 --- a/app/etc/modules/Mage_Widget.xml +++ b/app/etc/modules/Mage_Widget.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Widget - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_XmlConnect.xml b/app/etc/modules/Mage_XmlConnect.xml index 434a42598..2a871f307 100644 --- a/app/etc/modules/Mage_XmlConnect.xml +++ b/app/etc/modules/Mage_XmlConnect.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_XmlConnect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Phoenix_Moneybookers.xml b/app/etc/modules/Phoenix_Moneybookers.xml index 433b6800c..7319adc7d 100644 --- a/app/etc/modules/Phoenix_Moneybookers.xml +++ b/app/etc/modules/Phoenix_Moneybookers.xml @@ -15,7 +15,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ --> diff --git a/app/locale/de_DE/Mage_AdminNotification.csv b/app/locale/de_DE/Mage_AdminNotification.csv deleted file mode 100644 index 48cc3e5e7..000000000 --- a/app/locale/de_DE/Mage_AdminNotification.csv +++ /dev/null @@ -1,31 +0,0 @@ -"Actions","Aktionen" -"An error occurred while marking notification as read.","Fehler beim Markieren des Hinweises als 'gelesen'." -"An error occurred while marking the messages as read.","Fehler beim Markieren der Nachrichten als 'gelesen'." -"An error occurred while removing messages.","Fehler beim Entfernen der Nachrichten." -"An error occurred while removing the message.","Fehler beim Entfernen der Nachricht." -"Are you sure?","Sind Sie sicher?" -"Date Added","Hinzugefügt am" -"Last Update","Letzte Aktualisierung" -"Mark as Read","Als 'gelesen' markieren" -"Mark as read","Als gelesen markieren" -"Message","Nachricht" -"Messages Inbox","Posteingang" -"Notifications","Hinweise" -"Please select messages.","Bitte Nachrichten auswählen." -"Read Details","Details anzeigen" -"Remove","Entfernen" -"Severity","Wichtigkeit" -"Show List","Liste anzeigen" -"Show Toolbar","Werkzeugleiste anzeigen" -"The message has been marked as read.","Die Nachricht wurde als 'gelesen' markiert." -"The message has been removed.","Die Nachricht wurde entfernt." -"Total of %d record(s) have been marked as read.","Insgesamt %d Einträge wurden als 'gelesen' markiert." -"Total of %d record(s) have been removed.","Insgesamt %d Einträge wurden gelöscht." -"Unable to proceed. Please, try again.","Vorgang konnte nicht ausgeführt werden. Bitte versuchen Sie es später noch einmal." -"Update Frequency","Aktualisierungshäufigkeit" -"Use HTTPS to Get Feed","Benutzen Sie HTTPS um Nachrichten abzurufen" -"Wrong message type","Falscher Mitteilungstyp" -"critical","kritisch" -"major","wichtig" -"minor","unwichtig" -"notice","Hinweis" diff --git a/app/locale/de_DE/Mage_Adminhtml.csv b/app/locale/de_DE/Mage_Adminhtml.csv deleted file mode 100644 index 707f5e4d3..000000000 --- a/app/locale/de_DE/Mage_Adminhtml.csv +++ /dev/null @@ -1,1215 +0,0 @@ -" The customer does not exist in the system anymore.","Der Kunde ist im System nicht mehr vorhanden." -" [deleted]"," [gelöscht]" -" and "," und " -"%s (Default Template from Locale)","%s (Standardvorlage von Gebietsschema)" -"%s cache type(s) disabled.","%s Cachetyp(en) deaktiviert." -"%s cache type(s) enabled.","%s Cachetyp(en) aktiviert." -"%s cache type(s) refreshed.","%s Cachetyp(en) aktualisiert." -"(For Type ""Local Server"" need to use relative path to Magento install var/export or var/import, e.g. var/export, var/import, var/export/some/dir, var/import/some/dir)","(yp ""Lokaler Server"" muss die relative Pfadangabe zu Magento install var/export oder var/import nutzen, z.B. var/export, var/import, var/export/some/dir, var/import/some/dir)" -"(For US 2-letter state names)","(Für USA Bundesstaatabkürzungen aus 2 Buchstaben)" -"(If left empty will be auto-generated)","(Wert wird automatisch generiert, wenn leer)" -"(Leave empty for first spreadsheet)","(Frei lassen bei erstem Tabellenkalkulationsblatt)" -"(Products will be added/updated to this store if 'store' column is blank or missing in the import file.)","(Produkte werden zu diesem Laden hinzugefügt/aktualisiert, wenn die Spalte 'Laden' leer ist oder in der Importdatei fehlt.)" -"(Shift-)Click or drag to change value","Zum Ändern des Wertes (Umschalt-)klicken oder ziehen." -"(Starting with)","(Beginnt mit)" -"(When 'No', only mapped fields will be imported. When mapping, use 'column1', 'column2', etc.)","(Bei ""Nein"" werden nur die gemappten Felder importiert. Benutzen sie beim Übernehmen der Felder 'spalte1', 'spalte2', etc.)" -"(You have to increase php memory_limit before changing this value)","(Sie müssen das php-Speicherlimit erhöhen, bevor Sie diesen Wert ändern können.)" -"(\\t for tab)","(\t für Tab)" -"* - If indexing is in progress, it will be killed and new indexing process will start.","* - Wenn die Indexerstellung in Bearbeitung ist, wird sie abgebrochen und ein neuer Indexerstellungsprozess wird gestartet." -"* Required Fields","* Pflichtfelder" -"- Click on any of the time parts to increase it","- Klicken Sie auf einen Zeitanteil, um ihn zu erhöhen." -"- Hold mouse button on any of the above buttons for faster selection.","- Halten Sie die Maustaste auf eine der obigen Schaltflächen, um die Auswahl zu beschleunigen." -"- Use the %s buttons to select month","- Wählen Sie den Monat mit den %s-Schaltflächen aus." -"- Use the %s, %s buttons to select year","- Wählen Sie das Jahr mit den %s-Schaltflächen aus." -"- or Shift-click to decrease it","- oder Umschalt-Klicken Sie, um den Wert zu verringern" -"- or click and drag for faster selection.","- oder Klicken und Ziehen Sie, um die Auswahl schneller zu treffen." -"-- Not Selected --","-- Nicht gewählt --" -"-- Please Select --","-- Bitte auswählen --" -"-- Please Select Billing Agreement--","-- Bitte Rechnungsvereinbarung auswählen --" -"-- Please Select a Category --","-- Bitte eine Kategorie auswählen --" -"-- Please select --","-- Bitte auswählen --" -"--Please Select--","-- Bitte auswählen --" -"1 Hour","1 Stunde" -"12 Hours","12 Stunden" -"12h AM/PM","12h AM/PM" -"2 Hours","2 Stunden" -"24 Hours","24 Stunden" -"24h","24h" -"2YTD","2 Jahr bis Datum" -"6 Hours","6 Stunden" -"

    404 Error

    Page not found.

    ","

    404 Fehler

    Seite nicht gefunden.

    " -"%s requests access to your account","%s erfordert Zugriff auf Ihr Konto" -"Attention: Captcha is case sensitive.","Achtung: Beim Captcha Groß- und Kleinschreibung beachten." -"A user with the same user name or email aleady exists.","Ein Benutzer mit demselben Benutzernamen oder derselben E-Mail-Adresse ist bereits vorhanden." -"API Key","API-Schlüssel" -"API Key Confirmation","Bestätigung API-Schlüssel" -"ASCII","ASCII" -"Abandoned Carts","Aufgegebene Einkaufswagen" -"About the calendar","Über den Kalender" -"Access Denied","Zugriff verweigert" -"Access denied","Zugriff verweigert" -"Access denied.","Zugriff verweigert." -"Account Created in:","Konto erstellt in:" -"Account Created on (%s):","Konto erstellt am (%s):" -"Account Created on:","Konto erstellt am:" -"Account Information","Kontoinformationen" -"Account Status","Kontostatus" -"Account status","Kontostatus" -"Action","Aktion" -"Actions","Aktionen" -"Actions XML","Aktionen XML" -"Active","Aktiv" -"Add","Hinzufügen" -"Add Exception","Ausnahme hinzufügen" -"Add Field Mapping","Feldzuordnung hinzufügen" -"Add Field with URL:","Feld mit folgender URL hinzufügen:" -"Add New","Neues hinzufügen" -"Add New Image","Neues Bild hinzufügen" -"Add New Profile","Neues Profil hinzufügen" -"Add New Role","Neue Rolle hinzufügen" -"Add New Template","Neue Vorlage hinzufügen" -"Add New URL Rewrite","Neues URL-Rewrite hinzufügen" -"Add New User","Neuen Benutzer hinzufügen" -"Add New Variable","Neue Variable hinzufügen" -"Add Products","Produkte hinzufügen" -"Add URL Rewrite","URL-Rewrite hinzufügen" -"Add URL Rewrite for a Category","URL-Rewrite für eine Kategorie hinzufügen" -"Add URL Rewrite for a Product","URL-Rewrite für ein Produkt hinzufügen" -"Add after","Hinzufügen nach" -"Additional Cache Management","Verwaltung von zusätzlichem Cache" -"Address Type:","Adressentyp:" -"Admin","Admin" -"Advanced Admin Section","Erweiterter Admin-Bereich" -"Advanced Profiles","Erweiterte Profile" -"Advanced Section","Erweiterter Bereich" -"After authorization application will have access to you account.","Nach der Autorisierungsanwendung haben Sie Zugriff auf Ihr Konto." -"All","Alle" -"All Allowed Countries","Alle erlaubten Länder" -"All Cache","Alle Caches" -"All Files","Alle Dateien" -"All Reviews","Alle Beurteilungen" -"All Store Views","Alle Ladenansichten" -"All Tags","Alle Tags" -"All Websites","Alle Websites" -"All countries","Alle Länder" -"All fields","Alle Felder" -"All possible rates were fetched, please click on ""Save"" to apply","Alle verfügbaren Preise wurden geladen, bitte klicken sie auf ""Speichern"" um diese zu übernehmen." -"All rates were fetched, please click on ""Save"" to apply","Alle Preise wurden geladen, bitte klicken sie auf ""Speichern"" um diese zu übernehmen." -"All valid rates have been saved.","Alle gültigen Tarife wurden gespeichert." -"Always (during development)","Immer (während der Entwicklung)" -"Amounts","Beträge" -"An error has occured while syncronizing media storages.","Während der Synchronisation der Speichermedien ist ein Fehler aufgetreten." -"An error occurred while clearing the JavaScript/CSS cache.","Beim Leeren des JavaScript/CSS-Caches ist ein Fehler aufgetreten." -"An error occurred while clearing the image cache.","Beim Leeren des Bild-Caches ist ein Fehler aufgetreten." -"An error occurred while deleting URL Rewrite.","Beim Löschen des URL-Rewrites ist ein Fehler aufgetreten." -"An error occurred while deleting email template data. Please review log and try again.","Beim Löschen der E-Mail-Vorlagendaten ist ein Fehler aufgetreten. Überprüfen Sie das Protokoll und versuchen Sie es erneut." -"An error occurred while deleting record(s).","Ein Fehler ist bei der Eintragungslöschung aufgetreten." -"An error occurred while deleting this role.","Beim Löschen dieser Rolle ist ein Fehler aufgetreten." -"An error occurred while deleting this set.","Beim Löschen dieser Menge ist ein Fehler aufgetreten." -"An error occurred while deleting this template.","Beim Löschen dieser Vorlage ist ein Fehler aufgetreten." -"An error occurred while finishing process. Please refresh the cache","Beim Fertigstellen des Vorgangs ist ein Fehler aufgetreten. Aktualisieren Sie den Cache." -"An error occurred while rebuilding the CatalogInventory Stock Status.","Beim erneuten Aufbau des CatalogInventory-Bestandsstatus ist ein Fehler aufgetreten." -"An error occurred while rebuilding the catalog index.","Beim erneuten Aufbau des Katalogindexes ist ein Fehler aufgetreten." -"An error occurred while rebuilding the flat catalog category.","Beim erneuten Aufbau der Flat Catalog-Kategorie ist ein Fehler aufgetreten." -"An error occurred while rebuilding the flat product catalog.","Beim erneuten Aufbau des Flat Product Catalog ist ein Fehler aufgetreten." -"An error occurred while rebuilding the search index.","Beim erneuten Aufbau des Suchindexes ist ein Fehler aufgetreten." -"An error occurred while refreshing the Catalog Rewrites.","Beim Aktualisieren der Katalog-Rewrites ist ein Fehler aufgetreten." -"An error occurred while refreshing the Layered Navigation indices.","Beim Aktualisieren der Layered Navigation-Indizes ist ein Fehler aufgetreten." -"An error occurred while refreshing the catalog rewrites.","Während des Neuladens der umgeschriebenen Kataloge ist ein Fehler aufgetreten." -"An error occurred while refreshing the layered navigation indices.","Während des Neuladens der Layered Navigation ist ein Fehler aufgetreten." -"An error occurred while saving URL Rewrite.","Beim Speichern des URL-Rewrites ist ein Fehler aufgetreten." -"An error occurred while saving account.","Beim Speichern des Kontos ist ein Fehler aufgetreten." -"An error occurred while saving review.","Beim Speichern der Bewertung ist ein Fehler aufgetreten." -"An error occurred while saving the customer.","Beim Speichern des Kunden ist ein Fehler aufgetreten." -"An error occurred while saving this configuration:","Beim Speichern der Konfiguration ist ein Fehler aufgetreten." -"An error occurred while saving this role.","Beim Speichern dieser Rolle ist ein Fehler aufgetreten." -"An error occurred while saving this template.","Beim Speichern dieser Vorlage ist ein Fehler aufgetreten." -"An error occurred while updating the selected review(s).","Beim Aktualisieren der ausgewählten Beurteilung(en) ist ein Fehler aufgetreten." -"Any","Beliebig" -"Any Attribute Set","Attributmenge beliebig" -"Any Group","Gruppe beliebig" -"Any Status","Status beliebig" -"Any Store","Laden beliebig" -"Any Type","Typ beliebig" -"Any Visibility","Sichtbarkeit beliebig" -"Any data created since the backup was made will be lost including admin users, customers and orders.","Sämtliche seit dem Backup erstellten Daten gehen verloren, einschließlich der Administratoren, Kunden und Bestellungen." -"Archive file name:","Dateinamen archivieren:" -"Are you sure that you want to delete this template?","Diese Vorlage wirklich löschen?" -"Are you sure that you want to strip tags?","Tags wirklich entfernen?" -"Are you sure you want to do this?","Diesen Vorgang wirklich ausführen?" -"Are you sure you want to proceed?","Sind Sie sicher, dass Sie fortfahren möchten?" -"Area","Bereich" -"As low as:","Unterster Wert:" -"Assigned","Zugewiesen" -"Associated Tags","Verknüpfte Tags" -"Attribute Set Name:","Name der Attributmenge:" -"Attributes","Attribute" -"Authorization confirmed","Autorisierung bestätigt" -"Authorize","Autorisieren" -"Authorize application","Anwendung autorisieren" -"Authorized OAuth Tokens","Autorisierte OAuth-Zeichen" -"Automatic (equalize price ranges)","Automatisch (Wertangleichung Preisklassen)" -"Automatic (equalize product counts)","Automatisch (Wertangleichung Produktzählung)" -"Average Order Amount","Durchschnittlicher Bestellungsbetrag" -"Average Orders","Bestellungen durchschnittlich" -"BINARY","BINÄR" -"Back","Zurück" -"Back to Login","Zurück zur Anmeldung" -"Backup","Sichern" -"Backup Name","Backup-Name" -"Backup options","Backup-Optionen" -"Backups","Sicherungskopien" -"Base currency","Basiswährung" -"Bcc","Bcc" -"Bestsellers","Am meisten verkauft" -"Billing Address","Rechnungsanschrift" -"Billing Address: ","Rechnungsanschrift:" -"Billing Agreement","Rechnungsvereinbarung" -"Billing Agreements","Rechnungsvereinbarungen" -"Block Information","Information sperren" -"Both (without and with tax)","Beides (mit und ohne Steuern)" -"Both IPN and PDT","Sowohl IPN als auch PDT" -"Browse Files...","Dateien durchsuchen ..." -"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","Bündelung mit dynamischer Preisgebung darf keine benutzerdefinierten Optionen enthalten. Optionen werden nicht gespeichert." -"CMS","CMS" -"CRITICAL","kritisch" -"CSV","CSV" -"CSV / Tab separated","CSV / Tab-getrennt" -"Cache Control","Cache-Steuerung" -"Cache Control (beta)","Cache-Steuerung (beta)" -"Cache Management","Cache-Verwaltung" -"Cache Type","Cache-Typ" -"Cancel","Abbrechen" -"Cannot add new comment.","Neuer Kommentar kann nicht hinzugefügt werden." -"Cannot add tracking number.","Trackingnummer kann nicht hinzugefügt werden." -"Cannot create an invoice without products.","Rechnung kann nicht ohne Produkte erstellt werden." -"Cannot create credit memo for the order.","Gutschrift für die Bestellung kann nicht erstellt werden." -"Cannot delete the design change.","Designänderung kann nicht gelöscht werden." -"Cannot delete tracking number.","Trackingnummer kann nicht gelöscht werden." -"Cannot do shipment for the order separately from invoice.","Lieferung für die Bestellung kann nicht von der Rechnung getrennt erfolgen." -"Cannot do shipment for the order.","Lieferung für die Bestellung kann nicht ausgeführt werden." -"Cannot initialize shipment for adding tracking number.","Lieferung kann nicht initialisiert werden - Trackingnummer hinzugefügt." -"Cannot initialize shipment for delete tracking number.","Lieferung kann nicht initialisiert werden - Trackingnummer gelöscht." -"Cannot load track with retrieving identifier.","Track kann nicht mit Abrufkennzeichen geladen werden." -"Cannot retrieve tracking number detail.","Trackingnummerdetail kann nicht abgerufen werden." -"Cannot save shipment.","Lieferung kann nicht gespeichert werden." -"Cannot save the credit memo.","Die Gutschrift kann nicht gespeichert werden." -"Cannot send shipment information.","Die Lieferdaten können nicht gesendet werden." -"Cannot update item quantity.","Artikelmenge kann nicht aktualisiert werden." -"Cannot update the item\'s quantity.","Artikelmenge kann nicht aktualisiert werden." -"Card Verification Number","Kreditkartenprüfnummer" -"Catalog","Katalog" -"Catalog Price Rules","Katalogpreisregeln" -"Catalog Rewrites","Katalog-Rewrites" -"Categories","Kategorien" -"Category","Kategorie" -"Category:","Kategorie:" -"Chart is disabled. If you want to enable chart, click here.","Chart ist deaktiviert. Wenn Sie den Chart aktivieren wollen, klicken Sie hier ." -"Checkbox","Kontrollkästchen" -"Child Transactions","Kindertransaktionen" -"Choose Store View:","Shopansicht auswählen:" -"Choose an attribute","Ein Attribut auswählen" -"Chosen category does not associated with any website, so url rewrite is not possible.","Gewählte Kategorie ist mit keiner Webseite verbunden, ein Überschreiben der URL ist nicht möglich." -"Chosen product does not associated with any website, so url rewrite is not possible.","Gewähltes Produkt ist mit keiner Webseite verbunden, ein Überschreiben der URL ist nicht möglich." -"Clear","Auswahl aufheben" -"Close","Schließen" -"Code","Code" -"Comment text field cannot be empty.","Das Textfeld für Kommentare darf nicht leer sein." -"Complete","Abgeschlossen" -"Config form fieldset clone model required to be able to clone fields","Config Felder-Formular als Klon-Modell erforderlich, um Felder klonen zu können" -"Configuration","Konfiguration" -"Confirm New Password","Neues Passwort bestätigen" -"Confirm token authorization Pop Up for admin","Bestätigen Sie das gewählte Autorisierungs-Popup für Admin" -"Confirm token authorization for admin","Bestätigen Sie die gewählte Autorisierung für Admin" -"Confirmation Of Authorization","Bestätigung der Autorisierung" -"Confirmed email:","Bestätigte E-Mail-Adresse:" -"Connect with the Magento Community","Mit der Magento-Community verbinden" -"Continue","Weiter" -"Convert to Plain Text","In unformatierten Text konvertieren" -"Cookie (unsafe)","Cookie (unsicher)" -"Country","Land" -"Country:","Land:" -"Coupons","Coupons" -"Create","Erstellen" -"Create DB Backup","DB-Sicherungskopie erstellen" -"Create New Attribute","Neues Attribut erstellen" -"Create URL Rewrite:","URL-Rewrite erstellen:" -"Created At","Erstellt um" -"Credit Card %s","Kreditkarten" -"Credit Card Number","Kreditkartennummer" -"Credit Card Number: xxxx-%s","Kreditkartennummer: xxxx-%s" -"Credit Card Type","Kreditkartentyp" -"Credit Card Type: %s","Kreditkartentyp: %s" -"Credit Memo History","Gutschriftverlauf" -"Credit Memo Totals","Gutschriftensummen" -"Credit Memos","Gutschriften" -"Credit memo #%s comment added","Gutschrift #%s Kommentar hinzugefügt" -"Credit memo #%s created","Gutschrift #%s erstellt" -"Credit memo\'s total must be positive.","Die Summe aller Gutschriften muss positiv sein." -"Currency","Währung" -"Currency ""%s"" is used as %s in %s.","Währung ""%s"" wird verwendet als %s in %s." -"Currency Information","Währungsdaten" -"Currency Setup Section","Bereich für Währungseinstellung" -"Current Configuration Scope:","Aktueller Konfigurationsumfang:" -"Current Month","Aktueller Monat" -"Custom","Benutzerdefiniert" -"Custom Variable ""%s""","Benutzerdefinierte Variable ""% s""" -"Custom Variables","Benutzerdefinierte Variablen" -"Customer","Kunde" -"Customer Group:","Kundengruppe:" -"Customer Groups","Kundengruppen" -"Customer Name","Kundenname" -"Customer Reviews","Kundenbeurteilungen" -"Customer Shopping Carts","Einkaufswagen von Kunden" -"Customer Since:","Kunde seit:" -"Customer Tax Classes","Kundensteuerklassen" -"Customer with the same email already exists.","Ein Kunde mit derselben E-Mail-Adresse ist bereits vorhanden." -"Customers","Kunden" -"Customers by Number of Orders","Kunden nach Anzahl der Bestellungen" -"Customers by Orders Total","Kunden nach Summe der Bestellungen" -"DHTML Date/Time Selector","DHTML Datums-/Uhrzeitauswahltool" -"Dashboard","Dashboard" -"Data Format","Datenformat" -"Data transfer:","Datenübertragung:" -"Database","Datenbank" -"Dataflow - Advanced Profiles","Datenübertragung - Erweiterte Profile" -"Dataflow - Profiles","Datenübertragung - Profile" -"Date","Datum" -"Date & Time","Datum & Uhrzeit" -"Date Added","Hinzugefügt am (Datum)" -"Date Updated","Aktualisiert am (Datum)" -"Date selection:","Datumsauswahl:" -"Date selector","Datumsauswahltool" -"Day","Tag" -"Decimal separator:","Dezimaltrennzeichen:" -"Default (Admin) Values","Standardwerte (Admin)" -"Default Billing Address","Standardrechnungsadresse" -"Default Config","Standardkonfig." -"Default Template from Locale","Standardvorlage von Gebietsschema" -"Default Values","Standardwerte" -"Default display currency ""%s"" is not available in allowed currencies.","Im Display angezeigte Währung ""% s"" ist nicht in zugelassenen Währungen verfügbar." -"Default scope","Standardumfang" -"Delete","Löschen" -"Delete %s","%s löschen" -"Delete %s '%s'","%s '%s' löschen" -"Delete File","Datei löschen" -"Delete Image","Bild löschen" -"Delete Profile","Profil löschen" -"Delete Role","Rolle löschen" -"Delete Store","Laden löschen" -"Delete Store View","Ladenansicht löschen" -"Delete Template","Vorlage löschen" -"Delete User","Benutzer löschen" -"Delete Website","Website löschen" -"Description","Beschreibung" -"Design","Design" -"Design Section","Design-Bereich" -"Details","Details" -"Developer Section","Entwicklerbereich" -"Direction:","Richtung:" -"Disable","Deaktivieren" -"Disabled","Deaktiviert" -"Display %s first","%s zuerst anzeigen" -"Display default currency","Standardwährung anzeigen" -"Distributed under GNU LGPL. See %s for details.","Vertrieb unter GNU LGPL. Zu Details siehe %s." -"Do you really want to KILL parallel process and start new indexing process?","Parallelprozess wirklich BEENDEN und neuen Indexerstellungsprozess starten?" -"Do you really want to proceed?","Möchten Sie wirklich fortfahren?" -"Download","Download" -"Downloads","Downloads" -"Drag to move","Zum Verschieben ziehen" -"Drop-down","Dropdown" -"Edit","Bearbeiten" -"Edit Design Change","Designänderung bearbeiten" -"Edit Email Template","E-Mail-Vorlage bearbeiten" -"Edit Order","Ordner bearbeiten" -"Edit Poll","Umfrage aufbereiten" -"Edit Queue","Warteschlange bearbeiten" -"Edit Review","Bewertung aufbereiten" -"Edit Role","Rolle bearbeiten" -"Edit Store View","Ladenansicht bearbeiten" -"Edit System Template","Systemvorlage bearbeiten" -"Edit Template","Vorlage bearbeiten" -"Edit URL Rewrite","URL-Rewrite bearbeiten" -"Edit User","Nutzer aufbereiten" -"Edit User '%s'","Benutzer '%s' bearbeiten" -"Edit Website","Website bearbeiten" -"Email","E-Mail" -"Email Address:","Email-Adresse:" -"Email Preview","E-Mail-Vorschau" -"Email to a Friend","E-Mail an einen Freund" -"Email:","E-Mail:" -"Enable","Aktivieren" -"Enabled","Aktiviert" -"Enclose Values In:","Werte einschließen in:" -"Entity Attributes","Entitätenattribute" -"Entity Type","Entitätstyp" -"Entity type:","Art der Organisation:" -"Error","Fehler" -"Excel XML","Excel-XML" -"Excl. Tax","Ausschl. Steuer" -"Exclude media folder from backup","Medienordner vom Backup ausnehmen" -"Expiration Date","Ablaufdatum" -"Expiration Date: %s/%s","Ablaufdatum: %s/%s" -"Export","Export" -"Export CSV","CSV exportieren" -"Export Filters","Filter exportieren" -"Export to:","Exportieren an:" -"Export:","Export:" -"FTP Host","FTP-Host" -"FTP Host[:Port]","FTP Host[:Port]" -"FTP Login","FTP Login" -"FTP Password","FTP Passwort" -"FTP credentials","FTP-Berechtigungen" -"Failed","Fehlgeschlagen" -"Failed to add a product to cart by id ""%s"".","Kein Produkt in den Warenkorb von ID ""% s"" gelegt." -"Failed to cancel the billing agreement.","Stornierung der Zahlungsvereinbarung fehlgeschlagen." -"Failed to clear the JavaScript/CSS cache.","Leeren des JavaScript/CSS-Caches fehlgeschlagen." -"Failed to delete the billing agreement.","Aufheben der Zahlungsvereinbarung fehlgeschlagen." -"Failed to update the profile.","Aktualisierung des Profils fehlgeschlagen." -"Field","Feld" -"Field Mapping","Feldzuordnung" -"File","Datei" -"File Information","Dateiinformation" -"File System","Dateisystem" -"File mode","Dateimodus" -"File name:","Dateiname:" -"File size should be more than 0 bytes","Dateigröße sollte mehr als 0 Byte betragen." -"Finished profile execution.","Profilausführung fertig." -"First Invoice Created Date","Erstellungsdatum der ersten Rechnung" -"First Name","Vorname" -"First Name is required field.","Vorname ist ein Pflichtfeld." -"First Name:","Vorname:" -"Fixed","Feststehend" -"Flush Catalog Images Cache","Katalogbildercache leeren" -"Flush JavaScript/CSS Cache","JavaScript/CSS-Cache leeren" -"For category","Für Kategorie" -"For latest version visit: %s","Neueste Version siehe: %s" -"For product","Für Produkt" -"Forgot Admin Password","Admin-Passwort vergessen" -"Forgot your password?","Passwort vergessen?" -"Forgot your user name or password?","Haben Sie Ihren Benutzernamen oder Ihr Passwort vergessen?" -"From","von" -"GLOBAL","ALLGEMEIN" -"Gb","GB" -"General Information","Allgemeine Angaben" -"General Section","Allgemeiner Bereich" -"Get Image Base64","Get Image Base64" -"Get help for this page","Hilfe zu dieser Seite einholen" -"Give the verifier code to application administrator","Geben Sie den Prüfer-Code zum Anwendungsadministrator an" -"Global Attribute","Allgemeines Attribut" -"Global Record Search","Globale Eintragssuche" -"Global Search","Allgemeine Suche" -"Go Today","Heute aktiv werden" -"Go to messages inbox","Zum Posteingang" -"Go to notifications","Zu den Benachrichtigungen" -"Google Base","Google Base" -"Google Content","Google Inhalte" -"Google Sitemaps","Google Sitemaps" -"Grand Total","Rechnungsbetrag" -"Grid (default) / List","Tabelle (Standard)/Liste" -"Grid Only","Grid Only" -"Group:","Gruppe:" -"Guest","Gast" -"HTTP (unsecure)","HTTP (unsicher)" -"HTTPS (SSL)","HTTPS (SSL)" -"Help Us Keep Magento Healthy - Report All Bugs","Helfen Sie uns, Magento sauber zu halten - Melden Sie alle Fehler" -"Helper attributes should not be used in custom layout updates.","Helfereigenschaften sollten nicht in den benutzerdefinierten Layoutaktualisierungen verwendet werden." -"Helper for options rendering doesn't implement required interface.","Hilfsfunktion für Wiedergabemöglichkeiten richtet erforderliche Schnittstelle nicht ein." -"Home","Startseite" -"ID","ID" -"ID Path","ID-Pfad" -"IP Address","IP-Adresse" -"IPN (Instant Payment Notification) Only","Nur IPN (Sofortzahlungsbenachrichtigung)" -"Id","Id" -"If there is an account associated with %s you will receive an email with a link to reset your password.","Wenn ein Konto mit %s verknüpft ist, erhalten Sie eine E-Mail mit einem Link für das Resetten Ihres Passworts." -"If this message persists, please contact the store owner.","Wenn diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an den Ladeneigentümer." -"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Wenn Sie keinen Optionswert für eine bestimmte Store-Ansicht angeben, wird der Standardwert (Admin) verwendet." -"Images (.gif, .jpg, .png)","Bilder (.gif, .jpg, .png)" -"Images Cache","Bildercache" -"Import","Importieren" -"Import Service","Importdienst" -"Import and Export","Importieren und exportieren" -"Import and Export Tax Rates","Steuersätze importieren und exportieren" -"Import/Export","Importieren/Exportieren" -"Import/Export Advanced","Import/Export Erweitert" -"Import/Export Profile","Profil importieren/exportieren" -"Important: ","Wichtig:" -"Imported %s records","Importierte %s Datensätze" -"In","In" -"In Database:","In Datenbank:" -"In File:","In Datei:" -"Inactive","Inaktiv" -"Incl. Tax","Einschl. Steuern" -"Incoming Message","Eingehende Nachricht" -"Insert Variable...","Variable einfügen..." -"Interactive","Interaktiv" -"Interface Locale: %s","Interface Locale: %s" -"Invalid Form Key. Please refresh the page.","Ungültiger Formularschlüssel. Aktualisieren Sie die Seite." -"Invalid Import Service Specified","Ungültiger Importdienst angegeben" -"Invalid POST data (please check post_max_size and upload_max_filesize settings in your php.ini file).","Ungültige POST-Daten (prüfen Sie die Einstellungen für post_max_size und upload_max_filesize in Ihrer php.ini-Datei)." -"Invalid Secret Key. Please refresh the page.","Ungültiger Geheimschlüssel. Aktualisieren Sie die Seite." -"Invalid User Name or Password.","Benutzername oder Passwort ungültig." -"Invalid directory: %s","Ungültiges Verzeichnis: %s" -"Invalid email address ""%s"".","Ungültige E-Mail-Adresse ""%s""." -"Invalid email address.","Ungültige E-Mail-Adresse." -"Invalid file: %s","Ungültige Datei: %s" -"Invalid input data for %s => %s rate","Ungültige Eingabedaten für %s => %s Rate" -"Invalid parent block for this block","Ungültiger Elternblock für diesen Block" -"Invalid parent block for this block.","Ungültiger übergeordneter Block für diesen Block." -"Invalid password reset token.","Ungültiger Token für das Resetten des Passworts." -"Invalid sender name ""%s"". Please use only visible characters and spaces.","Ungültiger Absendername ""%s"". Bitte verwenden Sie nur lesbare Zeichen und Leerzeichen." -"Invalid timezone","Ungültige Zeitzone" -"Invalidated","Ungültig gemacht" -"Inventory Stock Status","Vorratsbestand Status" -"Invoice #%s comment added","Rechnung #%s - Kommentar hinzugefügt" -"Invoice #%s created","Rechnung #%s erstellt" -"Invoice History","Rechnungsverlauf" -"Invoice Totals","Rechnungssummen" -"Invoice canceling error.","Fehler beim Stornieren der Rechnung." -"Invoice capturing error.","Fehler beim Erfassen der Rechnung." -"Invoice voiding error.","Fehler beim Ungültigmachen der Rechnung." -"Invoices","Rechnungen" -"Is Closed","Ist geschlossen" -"Is Default","Ist Standard" -"Issue Number","Ausstellnummer" -"Items","Elemente" -"JavaScript seems to be disabled in your browser.","JavaScript scheint in Ihrem Browser deaktiviert zu sein." -"JavaScript/CSS","JavaScript/CSS" -"JavaScript/CSS Cache","JavaScript/CSS-Cache" -"Kb","KB" -"Last 24 Hours","Letzte 24 Stunden" -"Last 5 Orders","Letzte 5 Bestellungen" -"Last 5 Search Terms","Letzte 5 Suchbegriffe" -"Last 7 Days","Letzte 7 Tage" -"Last Credit Memo Created Date","Datum der letzten Gutschrifterstellung" -"Last Invoice Created Date","Datum der letzten Rechnungserstellung" -"Last Logged In (%s):","Zuletzt angemeldet (%s):" -"Last Logged In:","Letzte Anmeldung:" -"Last Name","Nachname" -"Last Name is required field.","Das Feld 'Nachname' muss ausgefüllt werden." -"Last Name:","Nachname:" -"Last updated: %s. To refresh last day\'s statistics, click here.","Zuletzt aktualisiert: %s. Um die Statistiken von gestern zu aktualisieren, klicken Sie hier." -"Latest Message:","Neueste Meldung:" -"Layered Navigation Indices","Layered Navigation-Indizes" -"Layered Navigation Indices were refreshed.","Layered Navigation Indices wurden aktualisiert." -"Leave empty to use tax identifier","Frei lassen, um Steuernummer einzusetzen" -"Lifetime Sales","Gesamtumsatz" -"Lifetime statistics have been updated.","Lebenslange Statistik wurde aktualisiert." -"Links","Links" -"Links with associated products will retain only after saving current product.","Links mit verknüpften Produkten werden nur beibehalten, nachdem das aktuelle Produkt gespeichert wurde." -"List (default) / Grid","Liste (Standard)/Tabelle" -"List Only","Nur Liste" -"Load Template","Vorlage laden" -"Load default template","Standardvorlage laden" -"Loading...","Laden ..." -"Local Server","Lokaler Server" -"Local/Remote Server","Lokaler Server/Remote-Server" -"Locale","Gebietsschema" -"Log In","Login" -"Log Out","Abmelden" -"Log in to Admin Panel","Beim Admin-Panel anmelden" -"Log in to use %s","Loggen Sie sich ein, um %s zu verwenden" -"Log into Magento Admin Page","Bei der Magento Admin-Seite anmeldne" -"Logged in as %s","Angemeldet als %s" -"Login","Login" -"Low Stock","Vorratsbestand niedrig" -"MAJOR","größer" -"MINOR","KLEINER" -"MS Excel XML","MS Excel XML" -"Magento Admin","Magento Admin" -"Magento Commerce - Administrative Panel","Magento Commerce - Verwaltungspanel" -"Magento Connect","Magento Connect" -"Magento Connect Manager","Magento Connect-Manager" -"Magento Logo","Magento-Logo" -"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento ist ein Warenzeichen von Magento Inc. Copyright © %s Magento Inc." -"Magento root directory","Magento-Rootverzeichnis" -"Magento ver. %s","Magento Version %s" -"Magento™ is a trademark of Magento Inc.
    Copyright © %s Magento Inc.","Magento™ ist ein Warenzeichen von Magento Inc.
    Copyright © %s Magento Inc." -"Make sure that data encoding in the file is consistent and saved in one of supported encodings (UTF-8 or ANSI).","Achten Sie darauf, dass die Datenkodierung in der Datei konsistent ist und in einem unterstützten Kodierungsformat gespeichert wird (UTF-8 oder ANSI)." -"Manage Attribute Sets","Attributmengen verwalten" -"Manage Attributes","Attribute verwalten" -"Manage Categories","Kategorien verwalten" -"Manage Content","Inhalt verwalten" -"Manage Currency Rates","Wechselkurse verwalten" -"Manage Currency Symbols","Währungssymbole verwalten" -"Manage Customers","Kunden verwalten" -"Manage Options (values of your attribute)","Optionen verwalten (Werte Ihres Attributs)" -"Manage Ratings","Bewertungen verwalten" -"Manage Stores","Läden verwalten" -"Manage Tax Rules","Steuerregeln verwalten" -"Manage Tax Zones and Rates","Steuergebiete und -sätze verwalten" -"Manage Titles (Size, Color, etc.)","Kopfzeilen verwalten (Größe, Farbe, etc.)" -"Manual","Manuell" -"Matched Expression","Übereinstimmender Ausdruck" -"Maximum sender name length is 255. Please correct your settings.","Maximale Absender-Länge beträgt 255 Zeichen. Bitte korrigieren Sie Ihre Einstellungen." -"Mb","MB" -"Media (.avi, .flv, .swf)","Medien (.avi, .flv, .swf)" -"Media storages synchronization has completed!","Synchronisation des Medienspeichers fertiggestellt!" -"Messages Inbox","Eingehende Nachrichten" -"Month","Monat" -"Most Viewed","Am häufigsten angezeigt" -"Most Viewed Products","Meistgesehene Produkte" -"Multiple Select","Mehrfachauswahl" -"My Account","Mein Konto" -"My Applications","Meine Applikationen" -"N/A","N.Z." -"NOTICE","Hinweis" -"Name","Name" -"Name on Card","Name des Inhabers" -"Name on the Card: %s","Name des Inhabers: %s" -"Name:","Name:" -"Never (production)","Nie (Produktion)" -"New ","Neu" -"New API Key","Neuer API-Schlüssel" -"New Accounts","Neue Konten" -"New Attribute","Neues Attribut" -"New Block","Neuer Block" -"New Category","Neue Kategorie" -"New Class","Neue Klasse" -"New Condition","Neue Bedingung" -"New Custom Variable","Neue Kundenvariable" -"New Customer","Neuer Kunde" -"New Customers","Neue Kunden" -"New Design Change","Neue Designänderung" -"New Email Template","Neue Email-Vorlage" -"New Group","Neue Gruppe" -"New Invoice","Neue Rechnung" -"New Item Type","Neuer Elementtyp" -"New Memo","Neues Memo" -"New Memo for #%s","Neues Memo für #%s" -"New Page","Neue Seite" -"New Password","Neues Passwort" -"New Poll","Neue Umfrage" -"New Profile","Neues Profil" -"New Rate","Neue Rate" -"New Rating","Neue Bewertung" -"New Review","Neue Beurteilung" -"New Role","Neue Rolle" -"New Rule","Neue Regel" -"New Search","Neue Suche" -"New Set","Neuer Satz" -"New Shipment","Neue Lieferung" -"New Sitemap","Neue Sitemap" -"New Store View","Neue Ladenansicht" -"New System Template","Neue Systemvorlage" -"New Tag","Neues Tag" -"New Template","Neue Vorlage" -"New User","Neuer Benutzer" -"New Variable","Neue Variable" -"New Website","Neue Website" -"New attribute set mapping","Neues Set Mapping Attribut" -"New password field cannot be empty.","Das Feld für das neue Passwort kann nicht leer sein." -"Newsletter","Newsletter" -"Newsletter Problems","Newsletter-Probleme" -"Newsletter Queue","Newsletter-Warteschlange" -"Newsletter Subscribers","Newsletter-Abonnenten" -"Newsletter Templates","Newsletter-Vorlagen" -"Next month (hold for menu)","Folgemonat (für Menü gedrückt halten)" -"Next year (hold for menu)","Nächstes Jahr (halten für Menü)" -"No","Nein" -"No (price without tax)","Nein (Preis vor Steuern)" -"No Data","Keine Daten" -"No Data Found","Keine Daten gefunden" -"No Templates Found","Keine Vorlagen gefunden" -"No change","Keine Änderung" -"No customer id defined.","Keine Kunden-ID definiert." -"No information available.","Keine Informationen verfügbar." -"No profile loaded...","Kein Profil geladen..." -"No records found for this period.","Keine Datensätze gefunden für diesen Zeitraum." -"No records found.","Keine Datensätze gefunden." -"No report code specified.","Kein Berichtcode angegeben." -"No search keywords.","Keine Suchstichwörter." -"No search modules were registered","Keine registrierten Suchmodule" -"No wishlist item id defined.","Keine Wunschlisten-ID definiert." -"None","Keins" -"Note:","Hinweis:" -"Notes","Hinweise" -"Notifications","Benachrichtigungen:" -"Number of Orders","Zahl der Bestellungen" -"Number of Uses","Zahl der Verwendungen" -"Number of Views","Anzahl der Ansichten" -"Number of records:","Zahl der Datensätze:" -"OAuth Consumers","OAuth Verbraucher" -"OAuth authorization for admin","OAuth Autorisierung für Admin" -"OAuth authorization simple for admin","OAuth Autorisierung einfach für Admin" -"OK","OK" -"Old rate:","Alter Satz:" -"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Nachdem Sie in Ihr erweitertes PayPal-Konto eingeloggt sind, navigieren Sie zum Menü Service-Einstellungen - gehostete Checkout-Seiten - Set Up-Menü und legen Sie die unten beschriebenen Optionen an" -"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Nachdem Sie in Ihr Konto PayPal Payflow Link eingeloggt sind, navigieren Sie zum Menü Service-Einstellungen - gehostete Checkout-Seiten - Set Up-Menü und legen Sie die unten beschriebenen Optionen an" -"One or more media files failed to be synchronized during the media storages syncronization process. Refer to the log file for details.","Eine oder mehrere Mediendateien konnten nicht synchronisiert werden während der Synchronisation des Medienspeichers. Sie finden mehr Details in den Logdateien." -"One or more of the Cache Types are invalidated:","Mindestens ein Cache-Typ wurde für ungültig befunden:" -"Online Customers","Online-Kunden" -"Only Once (version upgrade)","Nur einmal (Upgrade der Version)" -"Only attributes with scope ""Global"", input type ""Dropdown"" and Use To Create Configurable Product ""Yes"" are available.","Nur Einstellungen im Anwendungsbereich ""Global"", der Eingabetyp ""Dropdown"" und Verwenden, um ein konfigurierbares Produkt zu erstellen ""Ja"" sind verfügbar." -"Only mapped fields","Nur zugeordnete Felder" -"Optional","Optional" -"Options","Optionen" -"Options is required","Optionen ist obligatorisch" -"Order","Bestellung" -"Order #%s","Bestellnr. %s" -"Order #%s (%s)","Auftrag #%s (%s)" -"Order Created Date","Datum der Auftragserstellung" -"Order ID","Auftrags-ID" -"Order Totals","Bestellsummen" -"Order Updated Date","Datum der Auftragsaktualisierung" -"Order Updated Date report is real-time, does not need statistics refreshing.","Der Bericht über das Datum der Auftragsaktualisierung wird in Echtzeit erstellt; die Statistik braucht nicht aktualisiert zu werden." -"Orders","Bestellungen" -"Original Magento attribute names in first row:","Ursprüngliche Magento-Attributnamen in erster Zeile:" -"Out of stock","Ausverkauft" -"PDT (Payment Data Transfer) Only","Nur PDT (Zahlungsdatenübertragung)" -"Package Extensions","Paketerweiterungen" -"Pages","Seiten" -"Parent Product Thumbnail","Miniaturbild für Elternprodukt" -"Parent Transaction ID","Transaktions-ID für Eltern" -"Passive mode","Passiver Modus" -"Password","Passwort" -"Password Confirmation","Passwortbestätigung" -"Password confirmation must be same as password.","Kennwort-Bestätigung stimmt nicht mit Kennwort überein." -"Password must be at least of %d characters.","Das Passwort muss mindestens %d Zeichen lang sein." -"Password must include both numeric and alphabetic characters.","Das Passwort muss sowohl numerische als auch alphabetische Zeichen enthalten." -"Password:","Kennwort:" -"Path:","Pfad:" -"Payment method instance is not available.","Zahlungsforminstanz ist nicht verfügbar." -"Payment method is not available.","Zahlungsform ist nicht verfügbar." -"Payment method must be specified.","Angabe der Zahlungsmethode erforderlich." -"Pending Reviews","Ausstehende Beurteilungen" -"Pending Tags","Ausstehende Tags" -"Per Item","Je Element" -"Per Order","Je Bestellung" -"Percent","Prozent" -"Performed At","Ausgeführt Um" -"Period","Zeitraum" -"Permanent (301)","Ständig (301)" -"Permissions","Rechte" -"Personal Information","Persönliche Angaben" -"Phone:","Telefon:" -"Please Select","Bitte auswählen" -"Please confirm site switching. All data that hasn\'t been saved will be lost.","Bestätigen Sie den Website-Wechsel. Alle nicht gespeicherten Daten gehen verloren." -"Please enter 6 or more characters.","Geben Sie mindestens 6 Zeichen ein." -"Please enter a number greater than 0 in this field.","Geben Sie in dieses Feld eine Zahl ein, die größer als 0 ist." -"Please enter a valid $ amount. For example $100.00.","Geben Sie einen gültigen Betrag in $ ein. Beispiel: $100,00." -"Please enter a valid URL. For example http://www.example.com or www.example.com","Geben Sie eine gültige URL ein. Beispiel: http://www.beispiel.com oder www.beispiel.com." -"Please enter a valid URL. http:// is required","Geben Sie eine gültige URL ein. Sie müssen http:// angeben." -"Please enter a valid credit card number.","Geben Sie bitte eine gültige Kreditkartennummer ein." -"Please enter a valid date.","Geben Sie ein gültiges Datum ein." -"Please enter a valid email address. For example johndoe@domain.com.","Geben Sie eine gültige E-Mail-Adresse ein. Beispiel: johndoe@domain.com." -"Please enter a valid email.","Geben Sie bitte ein gültige Email-Adresse an." -"Please enter a valid number in this field.","Geben Sie eine gültige Zahl in dieses Feld ein." -"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Geben Sie eine gültige Telefonnummer ein. Beispiel: (123) 456-7890 oder 123-456-7890." -"Please enter a valid social security number. For example 123-45-6789.","Geben Sie eine gültige Steuernummer ein. Beispiel: 012-34-5678-90." -"Please enter a valid value from list","Geben Sie einen gültigen Wert aus der Liste ein." -"Please enter a valid value, ex: 10,20,30","Geben Sie einen gültigen Wert ein, Beispiel: 10,20,30" -"Please enter a valid zip code.","Geben Sie eine gültige PLZ ein." -"Please enter a valid zip code. For example 90602 or 90602-1234.","Geben Sie eine gültige Postleitzahl ein. Beispiel: 90602." -"Please enter another credit card number to complete your purchase.","Bitte geben Sie eine andere Kreditkarten-Nummer ein, um Ihren Kauf abzuschließen." -"Please enter password","Bitte Passwort eingeben" -"Please enter password to confirm rollback.","Zum Bestätigen des Zurücksetzens bitte Passwort eingeben" -"Please enter valid password.","Geben Sie ein gültiges Passwort ein." -"Please make sure that all global admin search modules are installed and activated.","Stellen Sie sicher, dass alle allgemeinen Admin-Suchmodule installiert und aktiviert sind." -"Please make sure that your changes were saved before running the profile.","Vergewissern Sie sich, dass vor Ausführung des Profils Ihre Änderungen gespeichert wurden." -"Please make sure your passwords match.","Achten Sie darauf, dass Ihre Passwörter übereinstimmen." -"Please select State/Province.","Wählen Sie bitte Staat/Bundesland aus." -"Please select a customer.","Wählen Sie einen Kunden aus." -"Please select a store.","Wählen Sie einen Laden aus." -"Please select an option.","Bitte wählen Sie eine Option." -"Please select catalog searches.","Wählen Sie Katalogsuchen aus." -"Please select customer(s).","Wählen Sie (einen) Kunden aus." -"Please select message(s).","Bitte Nachricht(en) auswählen." -"Please select one of the above options.","Wählen Sie bitte eine der obigen Optionen aus." -"Please select one of the options.","Wählen Sie eine der Optionen aus." -"Please select review(s).","Wählen Sie (eine) Beurteilung aus." -"Please select tag(s).","Wählen Sie bitte einen oder mehrere Tags aus." -"Please specify backup creation options","Bitte die Optionen für die Ausführung des Backups bestimmen" -"Please specify the admin custom URL.","Geben Sie bitte die Admin-URL des Kunden ein." -"Please try to logout and sign in again.","Melden Sie sich ab und melden Sie sich dann erneut an." -"Please type the letters from the image:","Bitte geben Sie die Buchstaben auf diesem Bild ein:" -"Please use in this field only ""a-z,0-9,_"".","Bitte verwenden Sie in diesem Feld nur ""a-z,0-9._""." -"Please use letters only (a-z) in this field.","Benutzen Sie in diesem Feld bitte nur Buchstaben (a-z)." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Bitte verwenden Sie in diesem Feld nur Zahlen. Vermeiden Sie bitte Leerzeichen und andere Zeichen, wie Punkt oder Komma." -"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","Geben Sie in dieses Feld bitte nur Buchstaben (a-z or A-Z), Ziffern (0-9) oder Leerzeichen ein." -"Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Benutzen Sie in diesem Feld bitte nur Buchstaben (a-z) oder Ziffern (0-9). Erlaubt sind weder Leer- noch andere Zeichen." -"Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.","Geben Sie nur Buchstaben (a-z) oder Zahlen (0-9) oder Leerzeichen und das Rautenzeichen (#) in dieses Feld ein." -"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Verwenden Sie dieses Datumsformat: tt.mm.jjjj. Beispiel: 17.03.2006 für den 17. März 2006." -"Please wait while the indexes are being refreshed.","Die Indizes werden aktualisiert. Bitte haben Sie einen Moment Geduld." -"Please wait, loading...","Daten werden geladen, bitte warten ..." -"Please wait...","Bitte warten..." -"Please, add some answers to this poll first.","Geben Sie zuerst einige Antworten auf diese Umfrage ein." -"Please, select ""Visible in Stores"" for this poll first.","Bitte erst ""In Shops sichtbar"" für diese Umfrage wählen." -"Poll Manager","Umfagemanager" -"Polls","Umfragen" -"Popular","Beliebt" -"Position","Position" -"Position of Watermark for %s","Position des Wasserzeichens für %s" -"Pregenerated product images files.","Vorgenerierte Produktbilddateien." -"Prev. month (hold for menu)","Vormonat (für Menü gedrückt halten)" -"Prev. year (hold for menu)","Vorheriges Jahr (halten für Menü)" -"Preview","Vorschau" -"Preview Template","Vorlagenvorschau" -"Price","Preis" -"Price alert subscription was saved.","Preiswarnungsabo wurde gespeichert." -"Price:","Preis:" -"Processed %s%% %s/%d records","Verarbeitete %s%% %s/%d Datensätze" -"Product","Produkt" -"Product Name","Produktbezeichnung" -"Product Reviews","Produktbeurteilungen" -"Product Tax Classes","Produktsteuerklassen" -"Product Thumbnail Itself","Produktvorschau selbst" -"Product is not loaded.","Produkt wurde nicht geladen." -"Product:","Produkt:" -"Products","Produkte" -"Products Bestsellers Report","Bericht meistverkaufte Produkte" -"Products Most Viewed Report","Bericht zu den meistgesehenen Produkten" -"Products Ordered","Bestellte Produkte" -"Products in Carts","Produkte im Einkaufswagen" -"Profile Action","Profilaktion" -"Profile Actions XML","Profilaktionen XML" -"Profile Direction","Profilrichtung" -"Profile History","Profilverlauf" -"Profile Information","Profilinformationen" -"Profile Name","Profilname" -"Profile Payments","Profilzahlungen" -"Profile Schedule","Profile-Termine" -"Profile Wizard","Profil-Assistent" -"Profiles","Profile" -"Promo","Werbeaktion" -"Promotions","Werbeaktionen" -"Purchased Item","Gekaufter Artikel" -"Put store on the maintenance mode while backup creation","Versetzen Sie vor einer Sicherung den Speicher in den Wartungsmodus" -"Put store on the maintenance mode while rollback processing","Während der Durchführung der Wiederherstellung auf den Wartungsmodus verlassen" -"Quantity","Stückzahl" -"Queue Refresh","Warteschlange aktualisieren" -"Queued... Cancel","In Warteschlange ... Abbrechen" -"REST Roles","REST-Rollen" -"Radio Buttons","Optionsschaltflächen" -"Rates","Kurse" -"Read details","Details lesen" -"Rebuild","Erneut aufbauen" -"Rebuild Catalog Index","Katalogindex erneut aufbauen" -"Rebuild Flat Catalog Category","Flat Catalog-Kategorie erneut aufbauen" -"Rebuild Flat Catalog Product","Flat Catalog-Produkt erneut aufbauen" -"Recent Orders","Letzte Bestellungen" -"Recent statistics have been updated.","Neueste Statistiken sind aktualisiert worden." -"Recurring Profile View","Wiederkehrende Profilansicht" -"Recursive Dir","Rekursives Verz." -"Redirect","Umleiten" -"Reference","Verweis" -"Reference ID","Verweis-ID" -"Refresh","Aktualisieren" -"Refresh Now*","Jetzt aktualisieren*" -"Refresh Statistics","Statistiken aktualisieren" -"Region/State","Region/Staat" -"Regular Price:","Normalpreis:" -"Reject","Verwerfen" -"Reject token authorization Pop Up for admin","Ablehnen des gewählten Popups der Autorisierung für Admin" -"Reject token authorization for admin","Ablehnen der gewählten Autorisierung für Admin" -"Rejection Of Authorization","Ablehnung der Autorisierung" -"Release","Freigeben" -"Release Stability","Stabilität freigeben" -"Release Version","Version freigeben" -"Reload captcha","Captcha neu laden" -"Remote FTP","Remote-FTP" -"Remove","Entfernen" -"Reports","Berichte" -"Request Path","Anforderungspfad" -"Required","Erforderlich" -"Reset","Zurücksetzen" -"Reset Filter","Filter zurücksetzen" -"Reset Password","Passwort zurücksetzen" -"Reset a Password","Passwort zurücksetzen" -"Resize","Größe ändern" -"Resource Access","Zugriff auf Ressource" -"Resources","Mittel" -"Results","Ergebenisse" -"Retrieve Password","Passwort abrufen" -"Return Html Version","HTML-Version ausgeben" -"Revenue","Umsatz" -"Reviews","Beurteilungen" -"Reviews and Ratings","Beurteilungen und Bewertungen" -"Rewrite Rules","Rewrite-Regeln" -"Role ID","Rollen-ID" -"Role Info","Rollen-Info" -"Role Information","Rollen-Informationen" -"Role Name","Rollenname" -"Role Resources","Rollen-Ressourcen" -"Role Users","Rollenbenutzer" -"Roles","Rollen" -"Roles Resources","Rollen-Ressourcen" -"Root Category","Root Category" -"Rotate CCW","Gegen den Uhrzeigersinn drehen" -"Rotate CW","Im Uhrzeigersinn drehen" -"Run","Ausführen" -"Run Profile","Profil ausführen" -"Run Profile Inside This Window","Profil in diesem Fenster ausführen" -"Run Profile in Popup","Profil in Popup ausführen" -"Running... Kill","Wird ausgeführt ... Beenden" -"SKU","Artikelposition" -"SKU:","SKU:" -"SSL Error: Invalid or self-signed certificate","SSL-Fehler: Ungültiges oder selbstsigniertes Zertifikat" -"Sales","Verkäufe" -"Sales Report","Umsatzbericht" -"Samples","Proben" -"Save","Speichern" -"Save & Generate","Sichern & Generieren" -"Save Account","Konto speichern" -"Save Cache Settings","Cache-Einstellungen speichern" -"Save Config","Konfig. speichern" -"Save Currency Rates","Wechselkurse speichern" -"Save Profile","Profil speichern" -"Save Role","Rolle speichern" -"Save Template","Vorlage speichern" -"Save User","Benutzer speichern" -"Save and Continue Edit","Speichern und Bearbeiten fortsetzen" -"Search","Suche" -"Search Index","Suchindex" -"Search Term","Suchbegriff" -"Search Terms","Suchbegriffe" -"Select","Auswählen" -"Select All","Alle auswählen" -"Select Category","Kategorie auswählen" -"Select Date","Datum selektieren" -"Select Range","Bereich auswählen" -"Select date","Datum wählen" -"Selected allowed currency ""%s"" is not available in installed currencies.","Die gewählte erlaubte Währung ""%s"" ist nicht in den installierten Währungen verfügbar." -"Selected base currency is not available in installed currencies.","Ausgewählte Basiswährung fehlt unter den installierten Währungen." -"Selected default display currency is not available in allowed currencies.","Die gewählte angezeigte Standardwährung ist nicht in den zulässigen Währungen verfügbar." -"Selected default display currency is not available in installed currencies.","Ausgewählte Standard-Anzeigewährung fehlt unter den installierten Währungen." -"Self-assigned roles cannot be deleted.","Selbst zugeordnete Rollen können nicht gelöscht werden." -"Sender","Absender" -"Separate Email","Separate E-Mail" -"Shipment #%s comment added","Lieferun Nr. %s - Kommentar hinzugefügt" -"Shipment #%s created","Sendung #%s erstellt" -"Shipment Comments","Lieferungskommentare" -"Shipment History","Lieferungsverlauf" -"Shipments","Lieferungen" -"Shipping","Lieferung" -"Shipping Address","Lieferadresse" -"Shipping Address: ","Versandadresse:" -"Shipping Origin","Herkunft der Lieferung" -"Shipping Price","Versandkosten" -"Shipping address selection is not applicable","Ausgewählte Lieferadresse ist nicht zutreffend" -"Shipping method must be specified.","Die Angabe der Versandart ist erforderlich." -"Shipping method selection is not applicable","Auswahl der Versandmethode ist nicht anwendbar" -"Shopping Cart","Einkaufswagen" -"Shopping Cart Price Rules","Preisvorschriften für den Einkaufswagen" -"Shopping Cart from %s","Einkaufswagen von %s" -"Show By","Einkaufen nach" -"Show Report For:","Bericht anzeigen für:" -"Show Reviews","Kurze Beurteilungen" -"Sitemap Information","Sitempa-Informationen" -"Size for %s","Größe für %s" -"Skip Category Selection","Kategorieauswahl überspringen" -"Some items in this order have different invoice and shipment types. You can create shipment only after the invoice is created.","Einige Artikel in dieser Bestellung haben unterschiedliche Rechnungs- und Liefertypen. Sie können eine Lieferung erst erstellen, nachdem eine Rechnung erstellt wurde." -"Some of the ordered items do not exist in the catalog anymore and will be removed if you try to edit the order.","Einige der bestellten Artikel werden nicht mehr im Katalog angeboten und werden entfernt, falls Sie versuchen, den Auftrag zu bearbeiten." -"Sorry, this feature is coming soon...","Leider ist dieses Angebot erst in Kürze erhältlich ..." -"Special Price:","Sezialpreis:" -"Specific Countries","Spezifische Länder" -"Specified","Angegeben" -"Specified profile does not exist.","Angegebenes Profil nicht vorhanden." -"Spreadsheet Name:","Name des Tabellenkalkulationsblattes:" -"Start Date","Startdatum" -"Starting profile execution, please wait...","Profilausführung wird gestartet, bitte warten ..." -"State/Province:","Bundesstaat/Provinz:" -"Static Blocks","Statische Blöcke" -"Status","Status" -"Status:","Status:" -"Stock Quantity:","Vorratsmenge:" -"Stock notification was saved.","Bestandsmeldung gesichert." -"Store","Laden" -"Store Email Addresses Section","Email-Adressdaten speichern" -"Store View","Ladenansicht" -"Store:","Speicher:" -"Stores","Läden" -"Subject","Betreff" -"Submit","Absenden" -"Subpackage cannot be conflicting.","Teilpaket darf nicht im Konflikt stehen." -"Subtotal","Zwischensumme" -"Switch/Solo card issue number: %s","Switch/Solo-Kartennummer: %s" -"Switch/Solo card start Date: %s/%s","Switch/Solo-Karte Startdatum: %s/%s" -"Switch/Solo/Maestro Only","Nur Switch/Solo/Maestro" -"Switch/Solo/Maestro(UK Domestic) Only","Nur Switch/Solo/Maestro(UK Inland)" -"Switch/Solo/Maestro(UK Domestic) card issue number: %s","Switch/Solo/Maestro(UK Inland) Kartennummer: %s" -"Switch/Solo/Maestro(UK Domestic) card start Date: %s/%s","Switch/Solo/Maestro(UK Inland) Kartenstartdatum: %s/%s" -"Symbol","Symbol" -"Synchronization is required.","Synchronisation ist erforderlich." -"Synchronization of media storages has been successfully completed.","Synchronisation von Medien-Speichern wurde erfolgreich abgeschlossen." -"Synchronize","Synchronisieren" -"Synchronizing %s to %s","Synchronisierung von %s bis %s" -"Synchronizing...","Synchronisierung..." -"System","System" -"System Section","Systembereich" -"System busy","System belegt" -"Tags","Tags" -"Target Path","Zielpfad" -"Tax","Steuern" -"Tb","TB" -"Template","Vorlage" -"Template Content","Vorlageninhalt" -"Template Information","Vorlageninformation" -"Template Name","Vorlagenname" -"Template Styles","Vorlagenstile" -"Template Subject","Vorlagenthema" -"Template Type","Vorlagentyp" -"Temporary (302)","Temporary (302)" -"Terms and Conditions","AGB" -"Text","Text" -"The Catalog Rewrites were refreshed.","Die Katalog-Rewrites wurden aktualisiert." -"The CatalogInventory Stock Status has been rebuilt.","Der Status des Katalogbestandes ist aktualisiert worden." -"The Comment Text field cannot be empty.","Das Kommentarfeld ist auszufüllen." -"The Flat Catalog Product was rebuilt","Das Flat Catalog-Produkt wurde neu aufgebaut." -"The JavaScript/CSS cache has been cleaned.","Der JavaScript/CSS-Cache wurde bereinigt." -"The JavaScript/CSS cache has been cleared.","Der JavaScript/CSS-Cache ist bereinigt worden." -"The Layered Navigation indexing has been queued.","Die Layered Navigation-Indexerstellung wurde in die Warteschlange gestellt." -"The Layered Navigation indexing queue has been canceled.","Die Warteschlange für die Layered Navigation-Indexerstellung wurde storniert." -"The Layered Navigation indices were refreshed.","Die Layered Navigation-Indizes wurden aktualisiert." -"The Layered Navigation process has been queued to be killed.","Der Layered Navigation-Vorgang wurde zum Beenden in die Warteschlange gestellt." -"The Magento cache storage has been flushed.","Der Magento-Cachespeicher ist geleert worden." -"The URL Rewrite has been deleted.","Das URL-Rewrite wurde gelöscht." -"The URL Rewrite has been saved.","Das URL-Rewrite wurde gespeichert." -"The account has been saved.","Das Konto wurde gespeichert." -"The archive can be uncompressed with %s on Windows systems","Das Archiv kann mit % s auf Windows-Systemen dekomprimiert werden." -"The attribute set has been removed.","Die Attributmenge wurde entfernt." -"The backup's creation process will take time.","Das Erstellen der Sicherungskopie dauert einige Zeit." -"The billing agreement has been canceled.","Die Rechnungsvereinbarung wurde storniert." -"The billing agreement has been deleted.","Die Rechnungsvereinbarung wurde gelöscht." -"The cache storage has been flushed.","Der Cache-Speicher wurde geleert." -"The carrier needs to be specified.","Der Spediteur muss spezifiziert werden." -"The catalog index has been rebuilt.","Der Katalogindex wurde neu aufgebaut." -"The catalog rewrites have been refreshed.","Die Katalog-Rewrites wurden aktualisiert." -"The configuration has been saved.","Die Konfiguration wurde gespeichert." -"The credit memo has been canceled.","Die Gutschrift wurde storniert." -"The credit memo has been created.","Die Gutschrift wurde erstellt." -"The credit memo has been voided.","Die Gutschrift ist nicht länger gültig." -"The custom variable has been deleted.","Die benutzerdefinierte Variable wurde gelöscht." -"The custom variable has been saved.","Die Kundenvariable ist gespeichert worden." -"The customer has been deleted.","Der Kunde wurde gelöscht." -"The customer has been saved.","Der Kunde ist gespeichert worden." -"The design change has been deleted.","Die Designänderung wurde gelöscht." -"The design change has been saved.","Die Designänderung wurde gespeichert." -"The email address is empty.","Die E-Mail-Adresse ist leer." -"The email template has been deleted.","Die Emailvorlage ist gelöscht worden." -"The email template has been saved.","Die E-Mail-Vorlage wurde gespeichert." -"The flat catalog category has been rebuilt.","Die Flat Catalog Category ist neu erstellt worden." -"The group node name must be specified with field node name.","Der Gruppen-Node-Name muss mit dem Feld-Node-Namen angegeben werden." -"The image cache was cleaned.","Der Bild-Cache wurde bereinigt." -"The image cache was cleared.","Der Bild-Cache wurde geleert." -"The invoice and shipment have been created.","Die Rechnung und die Lieferung wurden erstellt." -"The invoice and the shipment have been created. The shipping label cannot be created at the moment.","Rechnung und Versand wurden erstellt. Das Versandetikett kann derzeit nicht erstellt werden." -"The invoice has been canceled.","Die Rechnung wurde storniert." -"The invoice has been captured.","Die Rechnung wurde erfasst." -"The invoice has been created.","Die Rechnung wurde erstellt." -"The invoice has been voided.","Die Rechnung ist für nichtig erklärt worden." -"The invoice no longer exists.","Die Rechnung ist nicht mehr vorhanden." -"The item %s (SKU %s) does not exist in the catalog anymore.","Der Artikel %s (SKU %s) ist nicht mehr im Katalog vorhanden." -"The order does not allow creating an invoice.","Der Auftrag erlaubt keine Rechnungserstellung." -"The order no longer exists.","Der Auftrag besteht nicht mehr." -"The poll has been deleted.","Die Umfrage wurde gelöscht." -"The poll has been saved.","Die Umfrage ist gesichert worden." -"The profile has been deleted.","Das Profil wurde gelöscht." -"The profile has been saved.","Das Profil ist gespeichert worden." -"The profile has been updated.","Das Profil wurde aktualisiert." -"The profile has no changes.","Das Profil hat keine Änderungen." -"The profile you are trying to save no longer exists","Das Profil, das Sie speichern wollen, ist nicht mehr vorhanden" -"The rating has been deleted.","Die Bewertung ist gelöscht worden." -"The rating has been saved.","Die Bewertung wurde gespeichert." -"The role has been deleted.","Die Rolle wurde gelöscht." -"The role has been saved.","Die Rolle wurde gespeichert." -"The role has been successfully saved.","Die Rolle wurde erfolgreich gespeichert." -"The search index has been rebuilt.","Der Suchindex wurde neu aufgebaut." -"The shipment has been created.","Die Lieferung wurde erstellt." -"The shipment has been sent.","Die Sendung ist ausgeliefert worden." -"The shipping label has been created.","Das Versandlabel wurde erstellt." -"The tag has been deleted.","Das Tag wurde gelöscht." -"The tag has been saved.","Der Tag (dt. Etikett, Marke) ist gesichert worden." -"The transaction details have been updated.","Die Transaktionsdetails sind aktualisiert worden." -"The user has been deleted.","Der Benutzer wurde gelöscht." -"The user has been saved.","Der Benutzer ist gespeichert worden." -"Themes JavaScript and CSS files combined to one file.","Themes JavaScript- und CSS-Dateien in eine Datei kombiniert." -"There is an error in one of the option rows.","In einer der Optionszeilen ist ein Fehler." -"This Account is","Dieses Konto ist" -"This Email template no longer exists.","Diese E-Mail-Vorlage existiert nicht mehr." -"This Role no longer exists","Diese Rolle gibt es nicht mehr." -"This Role no longer exists.","Diese Rolle existiert nicht mehr." -"This account is","Dieses Konto ist" -"This account is inactive.","Dieses Konto ist inaktiv." -"This action cannot be undone.","Diese Aktion kann nicht rückgängig gemacht werden." -"This attribute set does not have attributes which we can use for configurable product","Diese Attributmenge enthält keine Attribute, die wir für konfigurierbare Produkte verwenden können." -"This attribute shares the same value in all the stores","Dieses Attribut hat denselben Wert in allen Läden." -"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Dies ist ein Demo-Handel. In diesem Geschäft aufgegebene Bestellungen werden weder akzeptiert noch ausgeführt." -"This is a required field.","Dies ist ein Pflichtfeld." -"This product is currently disabled.","Dieses Produkt ist zur Zeit deaktiviert." -"This report depends on timezone configuration. Once timezone is changed, the lifetime statistics need to be refreshed.","Dieser Bericht hängt von der Zeitzonenkonfiguration ab. Nachdem die Zeitzone geändert wurde, müssen die Lebenszeitstatistiken aktualisiert werden." -"This section is not allowed.","Kein Zugang zu diesem Bereich." -"This user no longer exists.","Dieser Benutzer existiert nicht mehr." -"Time","Zeit" -"Time selection:","Gewählte Zeit:" -"Time:","Zeit:" -"Timeout limit for response from synchronize process was reached.","Zeitlimit für die Antwort auf den Synchronisierungsvorgang wurde überschritten." -"To","Nach" -"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","Zum Abbrechen anhängiger Genehmigungen und zur Freigabe von Beträge, die bereits während dieser Zahlung bearbeitet wurden, klicken Sie auf Abbrechen." -"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","Wenn Sie den PayPal Payflow-Link verwenden möchten, müssen Sie Ihr Konto PayPal Payflow Link auf der PayPal-Website konfigurieren." -"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","Um erweiterte PayPal-Zahlungen zu verwenden, müssen Sie Ihr Konto erweiterte PayPal-Zahlungen auf der PayPal-Website konfigurieren." -"Toggle Editor","Zum Editor wechseln" -"Tools","Werkzeuge" -"Top 5 Search Terms","Oberste 5 Suchbegriffe" -"Total","Gesamt" -"Total Invoiced","Rechnungssumme" -"Total Order Amount","Auftrags-Gesamtbetrag" -"Total Refunded","Erstattete Summe" -"Total of %d record(s) have been deleted.","Insgesamt %d Datensatz/Datensätze wurde(n) gelöscht." -"Total of %d record(s) have been updated.","Insgeamt %d Datensätze wurden aktualisiert." -"Total of %d record(s) were canceled.","Insgesamt %d Eintragung(en) wurden gelöscht." -"Total of %d record(s) were deleted","Insgesamt wurde(n) %d Aufzeichnung(en) gelöscht" -"Total of %d record(s) were deleted.","Ingesamt wurde(n) %d Aufzeichnung(en) gelöscht" -"Total of %d record(s) were updated","Insgeamt wurde(n) %d Aufzeichnung(en) aktualisiert" -"Total of %d record(s) were updated.","Insgeamt wurde(n) %d Aufzeichnung(en) aktualisiert" -"Track Order","Bestellung verfolgen" -"Track this shipment","Diese Lieferung verfolgen" -"Tracking number %s for %s assigned","Auftragsverfolgungsnummer %s für %s zugeordnet" -"Tracking number cannot be empty.","Nummer zum Verlaufsstatus kann nicht leer sein." -"Transaction Data","Transaktionsdaten" -"Transaction Details","Transaktionsdetails" -"Transaction ID","Transaktions-ID" -"Transaction Type","Transaktionstyp" -"Transactional Emails","E-Mails zur Transaktion" -"Transactions","Transaktionen" -"Try Magento Go for Free","Testen Sie Magento Go kostenlos" -"Type","Typ" -"Type:","Typ:" -"URL Rewrite","URL-Rewrite" -"URL Rewrite Information","URL-Rewrite-Information" -"URL Rewrite Management","URL-Rewrite-Verwaltung" -"Unable to cancel the credit memo.","Gutschrift kann nicht storniert werden." -"Unable to find a Email Template to delete.","Keine E-Mail-Vorlage zum Löschen gefunden." -"Unable to find a poll to delete.","Keine Umfrage zum Löschen gefunden." -"Unable to find a tag to delete.","Kein Tag zum Löschen gefunden." -"Unable to find a user to delete.","Kein zu löschender Benutzer auffindbar." -"Unable to initialize import model","Importmodell kann nicht initialisiert werden." -"Unable to refresh lifetime statistics.","Lebenszeitstatistik kann nicht aktualisiert werden." -"Unable to refresh recent statistics.","Letzte Statistik kann nicht aktualisiert werden." -"Unable to save Cron expression","Chron. Ausdruck kann nicht gespeichert werden." -"Unable to save the cron expression.","Chron. Ausdruck kann nicht gespeichert werden." -"Unable to save the invoice.","Rechnung kann nicht gespeichert werden." -"Unable to send the invoice email.","E-Mail mit Rechnung kann nicht gesendet werden." -"Unable to send the shipment email.","Versand-Email kann nicht gesendet werden." -"Unable to update transaction details.","Die Angaben zu Ihrer Transaktion konnten nicht aktualisiert werden." -"Unable to void the credit memo.","Gutschrift kann nicht ungültig gemacht werden." -"Unknown","Unbekannt" -"Unlimited","Unbegrenzt" -"Update","Aktualisieren" -"Updated At","Aktualisiert um" -"Upload File","Datei hochladen" -"Upload Files","Dateien hochladen" -"Upload HTTP Error","HTTP-Fehler hochladen" -"Upload I/O Error","Ein-/Ausgabefehler beim Hochladen" -"Upload Security Error","Security-Fehler hochladen" -"Upload import file","Importdatei hochladen" -"Uploaded file is larger than %.2f kilobytes allowed by server","Hochgeladene Datei ist %.2f Kilobytes größer als der Server ermöglicht." -"Use All Available Attributes","Alle verfügbaren Attribute verwenden" -"Use Config Settings","Konfig.-Einstellungen verwenden" -"Use Default","Standard verwenden" -"Use Default Value","Standardwert verwenden" -"Use Default Variable Values","Standardvariablenwerte verwenden" -"Use FTP Connection","FTP-Verbindung verwenden" -"Use Website","Website verwenden" -"Used Currently For","Zurzeit verwendet für" -"Used as Default For","Als Standard Genutzt Für" -"User Email","Benutzer-Email" -"User ID","Benutzer-ID" -"User Info","Benutzerinfo" -"User Information","Benutzer-Information" -"User Name","Benutzername" -"User Name is required field.","Das Feld 'Benutzername' muss ausgefüllt werden." -"User Name:","Benutzername:" -"User Password","Benutzerpasswort" -"User Role","Benutzerrolle" -"User Roles","Benutzerrollen" -"User Roles Information","Informationen zu Benutzerrollen" -"User Type Resources","Ressourcen Benutzer-Typ" -"User name","Benutzername" -"Users","Benutzer" -"VAT Number is Invalid","Umsatzsteuer-Identifikationsnummer ist Ungültig" -"VAT Number is Valid","Umsatzsteuer-Identifikationsnummer ist Gültig" -"Validation Results","Prüfergebnisse" -"Value","Wert" -"Value Delimiter:","Wertbegrenzer:" -"Variable","Variable" -"Variable Code","Variabler Code" -"Variable HTML Value","Variabler HTML-Wert" -"Variable ID","Variablen-ID" -"Variable Name","Name der Variablen" -"Variable Plain Value","Einfacher Variablenwert" -"Verifier code: %s","Prüfer-Code: %s" -"View Actions XML","XML mit Aktionen anzeigen" -"View Full Size","Gesamtgröße ansehen" -"View Memo","Memo anzeigen" -"View Memo for #%s","Siehe Memo für #%s" -"View Shipment","Lieferung anzeigen" -"View Statistics For:","Statistiken einsehen für:" -"Visibility:","Sichtbarkeit:" -"Warning","Warnung" -"Warning! Empty value can cause problems with CSV format.","Warnhinweis! Ein leerer Wert kann Probleme beim CSV-Format verursachen." -"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Warnmeldung!\r\nDurch diese Aktion wird dieser Benutzer von einer bereits zugewiesenen Rolle entfernt.\r\nAktion dennoch ausführen?" -"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Warnung!\r\nSie sind dabei, diese Anwender von bereits zugeordneten Rollen zu entfernen\r\nSind Sie sicher?" -"Warning: Please do not close the window during importing/exporting data","Warnhinweis: Schließen Sie das Fenster nicht, während Daten importiert/exportiert werden." -"Watermark File for %s","Wasserzeichendatei für %s" -"We appreciate our merchants\' feedback, please take our survey to provide insight on the features you would like included in Magento. Remove this notification","Das Feedback unserer\' Händler ist uns wichtig, bitte Nehmen Sie an unserer Umfrage teil, um uns einen Einblick in die Funktionen zu vermitteln, die Sie sich in Magento wünschen. Diese Mitteilung entfernen" -"We\'re in our typing table, coding away more features for Magento. Thank you for your patience.","Wir arbeiten zurzeit an der Entwicklung neuer Angebote für Magento. Vielen Dank für Ihre Geduld." -"Web Section","Webbereich" -"Web Services","Webdienste" -"Web services","Web Services" -"Website","Website" -"What is this?","Was ist das?" -"Wishlist Report","Wunschlistenbericht" -"Wishlist item is not loaded.","Der Artikel auf der Wunschliste wird nicht geladen." -"Wrong account specified.","Falsches Konto angegeben." -"Wrong billing agreement ID specified.","Falsche Zahlungsvereinbarungs-ID angegeben." -"Wrong column format.","Falsches Spaltenformat." -"Wrong newsletter template.","Falsche Newsletter-Vorlage." -"Wrong quote item.","Falsches Inhaltselement." -"Wrong tab configuration.","Fehlerhafte Konfiguration der Registerkarte." -"Wrong tag was specified.","Falsches Tag angegeben." -"Wrong transaction ID specified.","Falsche Transaktions-ID angegeben." -"XML","XML" -"XML data is invalid.","XML-Daten sind ungültig." -"XML object is not instance of ""Varien_Simplexml_Element"".","XML-Objekt ist kein ""Varien_Simplexml_Element""." -"YTD","Jahr bis Datum" -"Year","Jahr" -"Yes","Ja" -"Yes (301 Moved Permanently)","Ja (301 dauerhaft entfernt)" -"Yes (302 Found)","Ja (302 gefunden)" -"Yes (only price with tax)","Ja (nur Preis mit Steuer)" -"You cannot delete your own account.","Sie können Ihren eigenen Account nicht löschen." -"You have %s unread message(s).","Sie haben %s ungelesene Nachricht(en)." -"You have %s unread message(s). Go to messages inbox.","Sie haben %s ungelesene Nachricht(en). Gehen Sie zum Posteingang." -"You have %s, %s and %s unread messages. Go to messages inbox.","Sie haben %s, %s und %s ungelesene Nachrichten. Gehen Sie zum Posteingang." -"You have logged out.","Sie haben sich abgemeldet." -"You have not enough permissions to use this functionality.","Sie haben keine ausreichenden Berechtigungen für die Verwendung dieser Funktion." -"You must have JavaScript enabled in your browser to utilize the functionality of this website.","Sie müssen JavaScript in Ihrem Browser aktiviert haben, damit die Funktionen der Webseite ordnungsgemäß genutzt werden können." -"You need to specify order items.","Sie müssen Bestellartikel angeben." -"You will need to wait when the action ends.","Sie werden das Ende der Aktion abwarten müssen." -"Your answers contain duplicates.","Ihre Antworten enthalten Duplikate." -"Your password has been updated.","Ihr Passwort wurde geändert." -"Your password reset link has expired.","Der Link für das Resetten Ihres Passworts ist abgelaufen." -"Your server PHP settings allow you to upload files not more than %s at a time. Please modify post_max_size (currently is %s) and upload_max_filesize (currently is %s) values in php.ini if you want to upload larger files.","Die PHP-Einstellungen Ihres Servers ermöglichen Ihnen das Hochladen von Dateien mit maximal %s gleichzeitig. Bitte ändern Sie die Werte für post_max_size (aktueller Wert: %s) und upload_max_filesize (aktueller Wert: %s) in der php.ini-Datei, wenn Sie größere Dateien hochladen möchten." -"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Ihr Webserver ist falsch konfiguriert. Als Ergebnis sind Konfigurationsdateien mit sensiblen Informationen von außen zugänglich. Bitte kontaktieren Sie Ihren Hosting-Anbieter." -"Zip/Postal Code","Postleitzahl" -"Zip/Postal Code:","Postleitzahl:" -"[ deleted ]","[gelöscht]" -"[GLOBAL]","[GLOBAL]" -"[STORE VIEW]","[LADENANSICHT]" -"[WEBSITE]","[WEBSEITE]" -"b","b" -"close","schließen" -"critical","kritisch" -"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","Beispiel: ""Sitemap/"" oder ""/"" für den Basis-Pfad (Pfad muss beschreibbar sein)" -"example: sitemap.xml","example: sitemap.xml" -"failed","fehlgeschlagen" -"from","von" -"major","größer" -"minor","kleiner" -"notice","Bemerkung" -"store(%s) scope","Laden(%s)-Umfang" -"successful","erfolgreich" -"to","bis" -"website(%s) scope","Website(%s)-Umfang" -"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento configuration.","{{base_url}} wird nicht empfohlen, in einer Produktionsumgebung zu verwenden, um die Base als Unsichere URL / Base Sicher URL zu erklären. Es wird dringend empfohlen, diesen Wert in Ihrer Magento-Konfiguration zu ändern." diff --git a/app/locale/de_DE/Mage_AmazonPayments.csv b/app/locale/de_DE/Mage_AmazonPayments.csv deleted file mode 100644 index 0723c3dd3..000000000 --- a/app/locale/de_DE/Mage_AmazonPayments.csv +++ /dev/null @@ -1,101 +0,0 @@ -" Select Shipping Method","Wählen Sie die Versandart" -"
    Trace confirmation request:
    %s","
    Bestätigungsanfrage verfolgen:
    %s" -"Access Key","Zugriffsschlüssel" -"Access Key ID","Zugriffsschlüssel-ID" -"Amazon Simple Pay","Amazon Simple Pay" -"Amazon Simple Pay notification error","Amazon Simple Pay Benachrichtigungsfehler" -"Amazon Simple Pay service capture confirmation error: confirmation request amount is not equal to the amount of order.","Amazon Simple Pay Service Fehler bei der Bestätigung der Erfassung: Betrag der Bestätigungsanfrage entspricht nicht der Summe der Bestellung." -"Amazon Simple Pay service capture confirmation error: the amount in the existing invoice does not match the amount in the confirmation request.","Amazon Simple Pay Service Fehler bei der Bestätigung der Erfassung: der Betrag der bestehenden Rechnung entspricht nicht dem Betrag in der Bestätigungsanfrage." -"Amazon Simple Pay service capture confirmation error: the existing transaction ID does not match the transaction ID in the confirmation request.","Amazon Simple Pay Service Fehler bei der Bestätigung der Erfassung: die bestehenden Transaktions-ID entspricht nicht der Transaktions-ID in der Bestätigungsanfrage." -"Amazon Simple Pay service capture confirmation. The invoice was captured automatically.","Amazon Simple Pay Service Erfassungsbestätigung: Die Rechnung wurde automatisch erfasst." -"Amazon Simple Pay service confirmation error: order states sequence violation.","Amazon Simple Pay Service Fehler bei der Bestätigung: Bestellung meldet Sequenzverletzung." -"Amazon Simple Pay service confirmation error: the order currency does not match the currency of the IPN request.","Amazon Simple Pay Service Fehler bei der Bestätigung: die Bestellungswährung entspricht nicht der Währung der IPN-Anfrage." -"Amazon Simple Pay service confirmation error: the order specified in the IPN request cannot be found.","Amazon Simple Pay Service Fehler bei der Bestätigung: die in der IPN-Anforderung angegebene Bestellung kann nicht gefunden werden." -"Amazon Simple Pay service confirmation error: the payment method in the order is not Amazon Simple Pay.","Amazon Simple Pay Service Fehler bei der Bestätigung: die Zahlungsart der Bestellung ist nicht Amazon Simple Pay." -"Amazon Simple Pay service confirmed capture for invoice %s.","Amazon Simple Pay Service bestätigt die Erfassung von Rechnung %s." -"Amazon Simple Pay service confirmed refund for credit memo %s.","Amazon Simple Pay Service hat die Erstattung für Gutschrift %s bestätigt." -"Amazon Simple Pay service has confirmed amount authorization.","Amazon Simple Pay Service hat Mengen-Autorisierung bestätigt." -"Amazon Simple Pay service has confirmed cancelation.","Amazon Simple Pay Service hat die Kündigung bestätigt." -"Amazon Simple Pay service has confirmed capture for invoice %s. The invoice was automatically captured.","Amazon Simple Pay Service hat die Erfassung der Rechnung %s bestätigt. Die Rechnung wurde automatisch erfasst." -"Amazon Simple Pay service has confirmed capture initiation.","Amazon Simple Pay Service hat die Einleitung der Erfassung bestätigt." -"Amazon Simple Pay service has confirmed capture.","Amazon Simple Pay Service hat die Erfassung bestätigt." -"Amazon Simple Pay service has confirmed payment capture. Invoice %s was automatically created after confirmation.","Amazon Simple Pay Service hat die Erfassung der Zahlung bestätigt. Rechnung %s wurde nach Bestätigung automatisch erstellt." -"Amazon Simple Pay service has confirmed payment capture. Invoice was created automatically.","Amazon Simple Pay Service hat die Erfassung der Zahlung bestätigt. Rechnung wurde automatisch erstellt." -"Amazon Simple Pay service has confirmed payment refund. Credit memo %s was automatically created after confirmation.","Amazon Simple Pay Service hat die Erstattung der Zahlung bestätigt. Gutschrift %s wurde nach Bestätigung automatisch erstellt." -"Amazon Simple Pay service has confirmed payment refund. Credit memo was created automatically.","Amazon Simple Pay Service hat die Erstattung der Zahlung bestätigt. Gutschrift wurde automatisch erstellt." -"Amazon Simple Pay service has confirmed payment refund. The credit memo was created automatically.","Amazon Simple Pay Service hat die Erstattung der Zahlung bestätigt. Die Gutschrift wurde automatisch erstellt." -"Amazon Simple Pay service has confirmed refund.","Amazon Simple Pay Service hat die Erstattung bestätigt." -"Amazon Simple Pay service has confirmed refund. The credit memo was processed automatically.","Amazon Simple Pay Service hat die Erstattung bestätigt. Die Gutschrift wurde automatisch erstellt." -"Amazon Simple Pay service has confirmed refunded credit memo %s. The credit memo was processed automatically.","Amazon Simple Pay Service hat die Erstattung der Gutschrift %s bestätigt. Die Gutschrift wurde automatisch verarbeitet." -"Amazon Simple Pay service is not available. Payment was not processed.","Amazon Simple Pay Service ist nicht verfügbar. Zahlung wurde nicht bearbeitet." -"Amazon Simple Pay service payment confirmation has failed.","Amazon Simple Pay Service Zahlungsbestätigung ist fehlgeschlagen." -"Amazon Simple Pay service refund confirmation error: the amount in the existing creditmemo does not match the amount in the confirmation request.","Amazon Simple Pay Service Fehler bei der Erstattungsbestätigung: der Betrag in der vorhandenen Gutschrift entspricht nicht dem Betrag in der Bestätigungsanfrage." -"Amazon Simple Pay service refund confirmation error: the confirmation request amount does not match the order amount.","Amazon Simple Pay Service Fehler bei der Erstattungsbestätigung: der Betrag der Bestätigungsanfrage entspricht nicht dem Bestellbetrag." -"Amazon Simple Pay service refund confirmation error: the transaction ID in the existing creditmemo does not match the transaction ID in the confirmation request.","Amazon Simple Pay Service Fehler bei der Erstattungsbestätigung: die Transaktions-ID in der vorhandenen Gutschrift entspricht nicht der Transaktions-ID in der Bestätigungsanfrage." -"Authorize Only","Nur genehmigen" -"Authorize and Capture","Genehmigen und erfassen" -"Cancel Description","Beschreibung abbrechen" -"Cancel Order Notification received from Checkout by Amazon service.","Löschen Sie die eingegangene Bestellbestätigung der Amazon Service-Kasse." -"Checkout by Amazon","Kasse von Amazon" -"Continue Shopping","Einkauf fortfahren" -"Customer was redirected to Amazon Simple Pay site","Kunde wurde auf die Amazon Simple Pay-Seite umgeleitet." -"Debug","Debug" -"Debug Log","Debug-Protokoll" -"Email Sender","E-Mail-Absender" -"Enable","Aktivieren" -"Error Log","Fehlerprotokoll" -"FPS Sandbox Service URI","FPS Sandbox Service URI" -"FPS Service URI","FPS Service URI" -"Immediate Return","Sofortige Rückgabe" -"Invalid action code.","Ungültiger Aktionscode." -"Invalid request.","Ungültige Anforderung." -"Invoice was created with Checkout by Amazon.","Rechnung wurde über die Kasse von Amazon erstellt." -"Merchant ID","Händler-ID" -"Merchant Login","Händler-Login" -"Merchant Name","Händlername" -"Merchant Password","Händler-Passwort" -"Merchant Token","Händler-Zeichen" -"Method Choice Checkout Message","Methodenwahl Checkout-Nachricht" -"New Order Notification received from Checkout by Amazon service.","Neue Bestellbenachrichtigung von der Amazon Service-Kasse." -"New Order Status","Neuer Bestellstatus" -"Notification Error Transactional Email","E-Mail-Benachrichtigung Transaktionsfehler" -"Order Ready To Ship Notification received form Checkout by Amazon service.","Benachrichtigung von der Amazon Service-Kasse empfangen, dass Bestellung zum Versand bereit ist." -"Order was canceled with Checkout by Amazon.","Bestellung wurde von Amazon an der Kasse abgebrochen." -"Payment Action","Zahlungsaktion" -"Payment Description","Zahlungsbeschreibung" -"Payment Sandbox Service URI","Sandbox Zahlungsservice URI" -"Payment Service URI","Zahlungsservice URI" -"Payment authorization canceled with Amazon Simple Pay service.","Zahlungsermächtigung mit Amazon Simple Pay Service abgebrochen." -"Pending Amazon Simple Pay","Amazon Simple Pay ausstehend" -"Redirect Message","Umleitungsnachricht" -"Refund Description","Rückerstattungsbeschreibung" -"Refund was created with Checkout by Amazon.","Erstattung wurde mit der Kasse von Amazon erstellt." -"Report Email","E-Mail-Bericht" -"Report Error to Email","Fehler an E-Mail berichten" -"Response body is not a valid FPS response.","Antworttext ist keine gültige FPS-Antwort." -"SUCCESS","ERFOLG" -"Sandbox","Sandkasten" -"Secret Key","Geheimer Schlüssel" -"Secret Key ID","Geheime Schlüssel-ID" -"Shipment was created with Checkout by Amazon.","Sendung wurde über die Kasse von Amazon erstellt." -"Thank you for your purchase!","Vielen Dank für Ihren Einkauf!" -"The customer has canceled payment and successfully returned from Amazon Simple Pay site","Der Kunde hat die Zahlung abgebrochen und wurde von der Amazon Simple Pay-Seite erfolgreich zurückgeleitet." -"The customer has successfully returned from Amazon Simple Pay site","Der Kunde wurde erfolgreich von der Amazon Simple Pay-Seite zurückgeleitet." -"The invoice was created (online capture). Waiting for capture confirmation from Amazon Simple Pay service.","Die Rechnung wurde erstellt (Online-Erfassung). Warten auf Bestätigung der Erfassung von Amazon Simple Pay Service." -"The invoice was not refunded. Amazon Simple Pay service error: [%s] %s","Die Rechnung wurde nicht erstattet. Amazon Simple Pay Service-Fehler: [%s] %s" -"The item specified in callback request XML was not found in quote.","Das in der Rückrufbitte XML angegebene Element wurde nicht gefunden." -"The order was not canceled. Amazon Simple Pay service error: [%s] %s","Die Bestellung wurde nicht abgebrochen. Amazon Simple Pay Service-Fehler: [%s] %s" -"The order was not captured online. Authorization confirmation is required.","Die Bestellung wurde nicht online erfasst. Autorisierungsbestätigung ist erforderlich." -"The order was not captured. Amazon Simple Pay service error: [%s] %s","Die Bestellung wurde nicht erfasst. Amazon Simple Pay Service-Fehler: [%s] %s" -"The payment was captured online with Amazon Simple Pay service. The invoice was created. Waiting for capture confirmation from the payment service.","Die Zahlung wurde mit Amazon Simple Pay Service online erfasst. Die Rechnung wurde erstellt. Warten auf Bestätigung der Erfassung vom Zahlungsdienstleister." -"The payment was refunded online with Amazon Simple Pay service. The credit memo was created. Waiting for refund confirmation from Amazon Simple Pay service.","Die Zahlung wurde mit Amazon Simple Pay Service online erstattet. Die Gutschrift wurde erstellt. Warten auf Bestätigung der Rückerstattung von Amazon Simple Pay Service." -"The payment was refunded online. Waiting for refund confirmation from Amazon Simple Pay service.","Die Zahlung wurde online erstattet. Warten auf Bestätigung der Rückerstattung von Amazon Simple Pay Service." -"The request is not a valid IPN request.","Der Antrag ist keine gültige IPN-Anforderung." -"The request was signed incorrectly or the signature is missing.","Die Anforderung wurde nicht ordnungsgemäß unterzeichnet oder die Signatur fehlt." -"Title","Titel" -"Use Callback API","Nutzen Sie die Rückruf-API" -"You will be redirected to Checkout by Amazon in a few seconds.","Sie werden in wenigen Sekunden zur Kasse von Amazon weitergeleitet." -"You will receive an order confirmation email with details of your order and a link to track its progress.","Sie erhalten eine Bestellbestätigungs-E-Mail mit den Details zu Ihrer Bestellung und einem Link, um den Verlauf zu verfolgen." -"You will receive an order confirmation email with details of your order and a link to track its progress.
    ","Sie erhalten eine Bestätigung der Bestellung per e-Mail mit Informationen zu Ihrer Bestellung und einem Link, um den Fortschritt zu verfolgen.
    " -"Your billing address will be ignored and you will be redirected to Checkout by Amazon website.","Ihre Rechnungsadresse wird ignoriert und Sie werden zur Kasse der Amazon-Website weitergeleitet." -"Your order has been received.","Ihre Bestellung wurde erhalten." diff --git a/app/locale/de_DE/Mage_Api.csv b/app/locale/de_DE/Mage_Api.csv deleted file mode 100644 index a58bb0840..000000000 --- a/app/locale/de_DE/Mage_Api.csv +++ /dev/null @@ -1,18 +0,0 @@ -"Access denied.","Zugang verweigert." -"Can not find webservice adapter.","Webservice-Adapter ist nicht auffindbar." -"Client Session Timeout (sec.)","Kunde Session-Timeout (in Sekunden)" -"Default Response Charset","Standard-Schriftsatz für Antwort" -"Email","E-Mail" -"Enable WSDL Cache","WSDL-Zwischenspeicher aktivieren" -"General Settings","Allgemeine Einstellungen" -"Invalid webservice adapter specified.","Ungültiger Webservice Adapter angegeben." -"Invalid webservice handler specified.","Ungültiger Webservice Handler angegeben." -"Magento Core API","Magento Core API" -"Magento Core API Section","Magento Core API Sektion" -"SOAP/XML-RPC - Roles","SOAP/XML-RPC - Rollen" -"SOAP/XML-RPC - Users","SOAP/XML-RPC - Benutzer" -"Unable to login.","Einloggen nicht möglich." -"User Name","Benutzername" -"WS-I Compliance","WS-I Übereinstimmung" -"Web Services","Webdienste" -"Your account has been deactivated.","Ihr Benutzerkonto wurde deaktiviert." diff --git a/app/locale/de_DE/Mage_Api2.csv b/app/locale/de_DE/Mage_Api2.csv deleted file mode 100644 index 1cf1b38fc..000000000 --- a/app/locale/de_DE/Mage_Api2.csv +++ /dev/null @@ -1,238 +0,0 @@ -"%s","%s" -"%s role is a special one and can\'t be changed.","Die %s-Rolle ist eine spezielle Rolle und kann nicht geändert werden." -"%s role is a special one and can\'t be deleted.","Die %s-Rolle ist eine spezielle Rolle und kann nicht gelöscht werden." -"%s role is protected.","Die %s-Rolle ist geschützt." -"ACL Attribute Rules","ACL Attributregeln" -"ACL Attributes Information","Information ACL Attribute" -"Add","Hinzufügen" -"Add Admin Role","Admin-Rolle hinzufügen" -"Add New Role","Neue Rolle hinzufügen" -"Address Type","Adressentyp" -"Admin","Admin" -"Allow","Erlauben" -"An error occurred while deleting the role.","Beim Löschen der Rolle ist ein Fehler aufgetreten." -"An error occurred while saving attribute rules.","Beim Speichern der Attributregeln ist ein Fehler aufgetreten." -"An error occurred while saving role.","Beim Speichern der Rolle ist ein Fehler aufgetreten." -"Api Rules Information","Information Api-Regeln" -"Assigned","Zugewiesen" -"Associate to Website","Mit der Webseite verbinden" -"Attribute Rules Information","Information Attributregeln" -"Attribute Set","Attributset" -"Attributes","Attribute" -"Automatically Return Credit Memo Item to Stock","Gutschriftartikel automatisch zum Lager retournieren" -"Back","Zurück" -"Backorders","Lieferückstand" -"Base Currency","Basiswährung" -"Base Customer Balance","Basis Kundensaldo" -"Base Discount","Basis Rabatt" -"Base Discount Amount","Basis Rabattbetrag" -"Base Item Subtotal","Basis Zwischensumme Artikel" -"Base Item Subtotal Including Tax","Basis Zwischensumme Artikel inkl. Steuern" -"Base Original Price","Basis Ausgangspreis" -"Base Price","Grundpreis" -"Base Price Including Tax","Basis Preis inkl. Steuern" -"Base Shipping","Basis Versand" -"Base Shipping Discount","Basis Versandrabatt" -"Base Shipping Tax","Basis Versandsteuer" -"Base Subtotal","Basis Zwischensumme" -"Base Subtotal Including Tax","Basis Zwischensumme inkl. Steuern" -"Base Tax Amount","Basis Steuerbetrag" -"Base Total Due","Basis fälliger Gesamtbetrag" -"Base Total Paid","Basis bezahlter Gesamtbetrag" -"Base Total Refunded","Basis rückerstatteter Gesamtbetrag" -"Buy Now URL","Jetzt kaufen-URL" -"Can Be Divided into Multiple Boxes for Shipping","Kann zum Versand auf mehrere Kartons aufgeteilt werden" -"Canceled Qty","Stornierte Anzahl" -"Catalog","Katalog" -"Catalog Product","Katalogprodukt" -"CatalogInventory","Kataloginventar" -"Category ID","Kategorie Ident.-Nr." -"City","Stadt" -"Company","Unternehmen" -"Country","Land" -"Coupon Code","Gutscheincode" -"Create","Erstellen" -"Create Permanent Redirect for old URL","Andauernde Umleitung für alte URL erstellen" -"Created From","Erstellt aus" -"Customer","Kunde" -"Customer Address","Kundenadresse" -"Customer Address ID","Kundenadresse ID" -"Customer Balance","Kundenguthaben" -"Customer First Name","Kunden-Vorname" -"Customer ID","Kundenidentifikationsbezeichnung" -"Customer Last Name","Nachname des Kunden" -"Customer Middle Name","Mittlerer Kundenname" -"Customer Prefix","Kundenpräfix" -"Customer Suffix","Kundensuffix" -"Default Image","Standardbild" -"Delete","Löschen" -"Deny","Verweigern" -"Disable automatic group change based on VAT ID","Automatischen Gruppenwechsel auf UID-Basis deaktivieren" -"Discount","Rabatt" -"Discount Amount","Rabattbetrag" -"Discount Description","Rabatt Beschreibung" -"Edit","Bearbeiten" -"Edit %s ACL attribute rules","%s ACL Attributregeln bearbeiten" -"Edit Role","Rolle bearbeiten" -"Edit attribute rules for %s Role","Attributregeln für %s-Rolle bearbeiten" -"Email","E-Mail" -"Enable Qty Increments","Anzahlzunahme aktivieren" -"Exclude","Auschließen" -"File Content","Dateiinhalt" -"File MIME Type","Datei MIME-Typ" -"File Name","Dateiname" -"Final Price With Tax","Endpreis inkl. Steuern" -"Final Price Without Tax","Endpreis exkl. Steuern" -"First Name","Vorname" -"Gift Message","Grußnachricht" -"Grand Total","Gesamtbetrag" -"Grand Total to Be Charged","Zu verrechnende Gesamtsumme" -"Group","Gruppe" -"Guest","Gast" -"Has Custom Options","hat individuelle Optionen" -"ID","ID" -"Inventory Data","Inventardaten" -"Invoiced Qty","Verrechnete Anzahl" -"Is Confirmed","ist bestätigt" -"Is Default Billing Address","ist die Standard-Rechnungsadresse" -"Is Default Shipping Address","ist die Standard-Lieferadresse" -"Item ID","Artikel-ID" -"Item Subtotal","Zwischensumme Artikel" -"Item Subtotal Including Tax","Zwischensumme Artikel inkl. Steuern" -"Label","Label" -"Last Logged In","Zuletzt eingeloggt" -"Last Name","Letzter Name" -"Low Stock Date","Datum niedriger Bestand" -"Manage Stock","Lagerbestand verwalten" -"Maximum Qty Allowed in Shopping Cart","Maximal im Warenkorb erlaubte Anzahl" -"Minimum Qty Allowed in Shopping Cart","Im Warenkorb erlaubte Mindestanzahl" -"New Role","Neue Rolle" -"Notify for Quantity Below","Bei unterer Anzahl benachrichtigen." -"OAuth","OAuth" -"Order","Bestellung" -"Order Addresses","Bestellungs-Adressen" -"Order Comments","Kommentare zur Bestellung" -"Order Currency","Auftragswährung" -"Order Date","Bestelldatum" -"Order ID","Bestellungsidentifizierung" -"Order ID (internal)","Bestellungs-ID (intern)" -"Order Item ID","Bestellartikel-ID" -"Order Items","Bestellartikel" -"Order Status","Status des Auftrags" -"Ordered Qty","Bestellte Anzahl" -"Orders","Aufträge" -"Original Price","Originalpreis" -"Parent Order Item ID","Übergeordnete Bestellartikel-ID" -"Payment Method","Zahlungsart" -"Phone Number","Telefonnummer" -"Placed from IP","Bestellt von IP Nummer" -"Please enter a valid number in ""max_sale_qty"" field","Bitte geben Sie in dem Feld ""max_sale_qty"" eine gültige Zahl ein" -"Please enter a valid number in ""min_qty"" field","Bitte geben Sie in dem Feld ""min_qty"" eine gültige Zahl ein" -"Please enter a valid number in ""min_sale_qty"" field","Bitte geben Sie in dem Feld ""min_sale_qty"" eine gültige Zahl ein" -"Please enter a valid number in ""notify_stock_qty"" field","Bitte geben Sie in dem Feld ""notify_stock_qty"" eine gültige Zahl ein" -"Please use numbers only in ""category_id"" field.","Bitte verwenden Sie Zahlen nur in dem Feld ""category_id""." -"Please use numbers only in ""qty_increments"" field. Please avoid spaces or other characters such as dots or commas.","Bitte verwenden Sie Zahlen nur in dem Feld ""qty_increments"". Bitte vermeiden Sie Leerzeichen und andere Sonderzeichen wie Punkte oder Kommas." -"Position","Position" -"Price","Preis" -"Price Including Tax","Preis inkl. Steuern" -"Product","Produkt" -"Product Category","Produktkategorie" -"Product ID","Produkt-ID" -"Product Image","Produktbild" -"Product Type","Produkttyp" -"Product URL","Produkt-URL" -"Product Website","Produkt-Website" -"Product and Custom Options Name","Name Produkt und individuelle Optionen" -"Qty","Anzahl" -"Qty Increments","Mengenzunahme" -"Qty Uses Decimals","Stückzahl kann dezimal sein" -"Qty for Item's Status to Become Out of Stock","Menge für Artikel Status Ausverkauft" -"REST - Attributes","REST - Attribute" -"REST - Roles","REST - Rollen" -"REST ACL Attributes","REST ACL Attribute" -"REST Attributes","REST Attribute" -"REST Role","REST Rolle" -"REST Roles","REST-Rollen" -"REST Roles Information","REST Rollen Information" -"Read","Lesen" -"Refunded Qty","Rückerstattete Anzahl" -"Regular Price With Tax","Regulärer Preis inkl. Steuern" -"Regular Price Without Tax","Regulärer Preis exkl. Steuern" -"Rest Roles","Rest Rollen" -"Retrieve","Abrufen" -"Role ""%s"" no longer exists","Rolle ""%s"" existiert nicht mehr" -"Role ""%s"" not found.","Rolle ""%s"" nicht gefunden." -"Role API Resources","Rolle API-Ressourcen" -"Role Info","Rollen-Info" -"Role Information","Rollen-Informationen" -"Role Name","Rollenname" -"Role Users","Rollenbenutzer" -"Role has been deleted.","Rolle wurde gelöscht." -"Roles","Rollen" -"SKU","SKU" -"Salability Status","Verkäuflichkeitsstatus" -"Sales","Verkäufe" -"Save","Speichern" -"Shipped Qty","Versandte Anzahl" -"Shipping Amount","Lieferungsbetrag" -"Shipping Discount","Versandrabatt" -"Shipping Including Tax","Versand inklusive Steuern" -"Shipping Method","Liefermethode" -"Shipping Tax","Versandsteuer" -"State","Staat" -"Stock Availability","Lagerbestand" -"Stock ID","Lagerbestands-ID" -"Stock Item","Lagerartikel" -"Stock Status","Lagerstatus" -"Store Currency to Order Currency Rate","Währung für Wechselkurs der Bestellung speichern" -"Store Name","Store Name" -"Street","Straße" -"Subtotal","Zwischensumme" -"Subtotal Including Tax","Zwischensumme inklusive Steuern" -"System","System" -"Tax Amount","Steuerbetrag" -"Tax Name","Steuername" -"Tax Percent","Steuer Prozent" -"Tax Rate","Steuersatz" -"The ""enable_qty_increments"" field must be set to 0 or 1.","Das Feld ""enable_qty_increments"" muss auf 0 oder 1 gesetzt werden." -"The ""is_decimal_divided"" field must be set to 0 or 1.","Das Feld ""is_decimal_divided"" muss auf 0 oder 1 gesetzt werden." -"The ""is_in_stock"" field must be set to 0 or 1.","Das Feld ""is_in_stock"" muss auf 0 oder 1 gesetzt werden." -"The ""is_qty_decimal"" field must be set to 0 or 1.","Das Feld ""is_qty_decimal"" muss auf 0 oder 1 gesetzt werden." -"The ""is_qty_decimal"" field must be set to 0, 1, or 2.","Das Feld ""is_qty_decimal"" muss auf 0, 1 oder 2 gesetzt werden." -"The ""manage_stock"" field must be set to 0 or 1.","Das Feld ""manage_stock"" muss auf 0 oder 1 gesetzt werden." -"The ""stock_status_changed_auto"" field must be set to 0 or 1.","Das Feld ""stock_status_changed_auto"" muss auf 0 oder 1 gesetzt werden." -"The ""use_config_backorders"" field must be set to 0 or 1.","Das Feld ""use_config_backorders"" muss auf 0 oder 1 gesetzt werden." -"The ""use_config_enable_qty_inc"" field must be set to 0 or 1.","Das Feld ""use_config_enable_qty_inc"" muss auf 0 oder 1 gesetzt werden." -"The ""use_config_manage_stock"" field must be set to 0 or 1.","Das Feld ""use_config_manage_stock"" muss auf 0 oder 1 gesetzt werden." -"The ""use_config_max_sale_qty"" field must be set to 0 or 1.","Das Feld ""use_config_max_sale_qty"" muss auf 0 oder 1 gesetzt werden." -"The ""use_config_min_qty"" field must be set to 0 or 1.","Das Feld ""use_config_min_qty"" muss auf 0 oder 1 gesetzt werden." -"The ""use_config_min_sale_qty"" field must be set to 0 or 1.","Das Feld ""use_config_min_sale_qty"" muss auf 0 oder 1 gesetzt werden." -"The ""use_config_notify_stock_qty"" field must be set to 0 or 1.","Das Feld ""use_config_notify_stock_qty"" muss auf 0 oder 1 gesetzt werden." -"The ""use_config_qty_increments"" field must be set to 0 or 1.","Das Feld ""use_config_qty_increments"" muss auf 0 oder 1 gesetzt werden." -"The attribute rules were saved.","Die Attributregeln wurden gespeichert." -"The role has been saved.","Die Rolle wurde gespeichert." -"The role is a special one and not for assigning it to admin users.","Dabei handelt es sich um eine spezielle Rolle, die nicht für die Zuweisung an Admin-Benutzer vorgesehen ist." -"Total Due","Gesamtsumme fällig" -"Total Paid","Gesamtsumme bezahlt" -"Total Refunded","Gesamtsumme rückerstattet" -"Total Reviews Count","Gesamtzahl Bewertungen" -"Type","Typ" -"URL","URL" -"Update","Aktualisieren" -"Use Config Settings for Allow Gift Message","Verwenden Sie die Konfigurationseinstellungen zum Zulassen von Geschenksnachrichten" -"Use Config Settings for Allow Gift Wrapping","Verwenden Sie die Konfigurationseinstellungen zum Zulassen von Geschenksverpackung" -"Use Config Settings for Backorders","Verwenden Sie die Konfigurationseinstellungen für Rückstände" -"Use Config Settings for Enable Qty Increments","Verwenden Sie die Konfigurationseinstellungen für das Zulassen von Erhöhungen der Anzahl" -"Use Config Settings for Manage Stock","Verwenden Sie die Konfigurationseinstellungen für das Verwalten der Lagerbestände" -"Use Config Settings for Maximum Qty Allowed in Shopping Cart","Verwenden Sie die Konfigurationseinstellungen für die zulässige Höchstanzahl im Einkaufswagen" -"Use Config Settings for Minimum Qty Allowed in Shopping Cart","Verwenden Sie die Konfigurationseinstellungen für die zulässige Mindestanzahl im Einkaufswagen" -"Use Config Settings for Notify for Quantity Below","Verwenden Sie die Konfigurationseinstellungen für eine Benachrichtigung bei nachstehender Anzahl" -"Use Config Settings for Qty Increments","Verwenden Sie die Konfigurationseinstellungen für eine Erhöhung der Anzahl" -"Use Config Settings for Qty for Item's Status to Become Out of Stock","Verwenden Sie die Konfigurationseinstellungen für die Anzahl, ab der der Artikelstatus auf Nicht lagernd gesetzt wird" -"User Type","Benutzertyp" -"User type ""%s"" no longer exists","Benutzertyp ""%s"" existiert nicht mehr" -"User type ""%s"" not found.","Benutzertyp ""%s"" nicht gefunden." -"Web Services","Webdienste" -"Web services","Web Services" -"Write","Schreiben" -"ZIP/Postal Code","Postleitzahl" diff --git a/app/locale/de_DE/Mage_Authorizenet.csv b/app/locale/de_DE/Mage_Authorizenet.csv deleted file mode 100644 index 7d8490f6a..000000000 --- a/app/locale/de_DE/Mage_Authorizenet.csv +++ /dev/null @@ -1,41 +0,0 @@ -"--Please Select--","--Bitte wählen--" -"API Login ID","API Login ID" -"Accepted Currency","Akzeptierte Währung" -"Amount of %s approved by payment gateway. Transaction ID: ""%s"".","Menge der durch das Zahlungs-Gateway bestätigten %s. Transaktions-Id: „%s“." -"Authorize.net Direct Post","Authorize.net Direktpost" -"Card Verification Number","Kreditkartenprüfnummer" -"Card Verification Number Visual Reference","Kartenprüfnummer Sichtmerkmale" -"Close","Schließen" -"Credit Card Information","Kreditkarteninformationen" -"Credit Card Number","Kreditkartennummer" -"Credit Card Type","Kreditkartentyp" -"Credit Card Types","Kreditkartentypen" -"Credit Card Verification","Kreditkarten-Verifizierung" -"Debug","Fehlerbeseitigung" -"Email Customer","Kunden-Email" -"Enabled","Aktiviert" -"Expiration Date","Ablaufdatum" -"Gateway URL","Gateway URL" -"Maximum Order Total","Maximale Bestellung Total" -"Merchant MD5","Händler MD5" -"Merchant's Email","Händler-Email" -"Minimum Order Total","Minimale Bestellung Total" -"New Order Status","Neuer Bestellstatus" -"Order saving error: %s","Fehler beim Speichern der Order:" -"Payment Action","Zahlungsaktion" -"Payment authorization error.","Fehler bei der Zahlungsermächtigung." -"Payment authorization error. Transacion id is empty.","Fehler bei der Zahlungsbestätigung. Transaktions-ID ist leer." -"Payment error. Order was not found.","Zahlungsfehler. Bestellung konnte nicht gefunden werden." -"Payment error. Paid amount doesn\'t match the order amount.","Zahlungsfehler. Gezahlter Betrag entspricht nicht dem Rechnungsbetrag." -"Payment from Applicable Countries","Zahlung aus geeigneten Ländern" -"Payment from Specific Countries","Zahlung aus spezifischen Ländern" -"Please, choose payment method","Bitte wählen Sie die Zahlungsmethode" -"Response hash validation failed. Transaction declined.","Überprüfung der Zahlungsfähigkeit fehlgeschlagen. Transaktion abgelehnt." -"Sort Order","Sortierfolge" -"Test Mode","Testmodus" -"The order has been created.","Die Bestellung wurde aufgenommen." -"There was an error processing your order. Please contact us or try again later.","Bei der Bearbeitung Ihrer Bestellung ist ein Fehler aufgetreten. Bitte kontaktieren Sie uns oder versuchen Sie es später noch einmal." -"Title","Titel" -"Transaction Key","Transaktionsschlüssel" -"What is this?","Was ist das?" -"You will be required to enter your payment details before you place an order.","Bevor Sie eine Bestellung aufgeben können, müssen Sie Ihre Zahlungsdetails angeben." diff --git a/app/locale/de_DE/Mage_Backup.csv b/app/locale/de_DE/Mage_Backup.csv deleted file mode 100644 index 87fbea602..000000000 --- a/app/locale/de_DE/Mage_Backup.csv +++ /dev/null @@ -1,55 +0,0 @@ -"Action","Aktion" -"An error occurred while creating the backup.","Beim Anlegen der Sicherungskopie ist ein Fehler aufgetreten." -"An error occurred while writing to the backup file ""%s"".","Während des Speichervorgangs auf der Sicherungsdatei ""%s"". trat ein Fehler auf." -"Are you sure you want to delete the selected backup(s)?","Sind Sie sicher, dass Sie die ausgewählten Sicherungskopie(n) löschen wollen?" -"Backup Type","Typ der Sicherungskopie" -"Backup file ""%s"" cannot be read from or written to.","Sicherungsdatei ""%s"" lässt sich weder beschreiben noch auslesen." -"Backup file ""%s"" does not exist.","Sicherungsdatei ""%s"" existiert nicht." -"Backup file does not exist.","Sicherungsdatei existiert nicht." -"Backup file handler was unspecified.","Anwender der Sicherungsdatei nicht spezifiziert." -"Backup file not found","Sicherungskopie nicht gefunden" -"Backup file path was not specified.","Pfad der Sicherungsdatei nicht spezifiziert." -"Backups","Sicherungsdateien" -"Cannot read backup file.","Sicherungsdatei kann nicht gelesen werden." -"Create Backup","Sicherungsdatei anlegen" -"Database","Datenbank" -"Database Backup","Sicherungskopie der Datenbank" -"Database and Media","Datenbank und Medien" -"Database and Media Backup","Sicherungskopie von Datenbank und Medien" -"Database was successfuly backed up.","Datenbank erfolgreich gesichert." -"Download","Download" -"Enable Scheduled Backup","Planmäßige Datensicherung aktivieren" -"Failed to connect to FTP","Verbindung mit FTP fehlgeschlagen" -"Failed to delete one or several backups.","Löschen einer oder mehrerer Sicherungskopien fehlgeschlagen" -"Failed to rollback","Rollback fehlgeschlagen" -"Failed to validate FTP","FTP-Validierung fehlgeschlagen" -"Frequency","Frequenz" -"Invalid Password.","Ungültiges Passwort" -"Maintenance Mode","Wartungsmodus" -"Name","Name" -"Not enough free space to create backup.","Nicht genug freier Speicher zum Anlegen der Sicherungskopie" -"Not enough permissions to create backup.","Keine ausreichende Berechtigung zum Anlegen der Sicherungskopie" -"Not enough permissions to perform rollback","Keine ausreichende Berechtigung zur Durchführung des Rollback" -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup.""","Bitte deaktivieren Sie entweder das Kästchen ""Store auf Wartungsmodus setzen"" oder aktualisieren Sie Ihre Berechtigungen, um mit der Sicherung fortzufahren." -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback.""","Bitte deaktivieren Sie entweder das Kästchen ""Store auf Wartungsmodus setzen"" oder aktualisieren Sie Ihre Berechtigungen, um mit dem Zurücksetzen fortzufahren.""" -"Put store on the maintenance mode while backup's creation","Setzen Sie den Shop während des Anlegens der Sicherungskopie in den Wartungsmodus." -"Rollback","Rollback" -"Scheduled Backup Settings","Einstellungen für die planmäßige Datensicherung" -"Size, Bytes","Größe, Bytes" -"Start Time","Startzeit" -"System","System" -"System (excluding Media)","System (exkl. Medien)" -"System Backup","Systemsicherung" -"System couldn't put store on the maintenance mode","Das System konnte den Shop nicht in den Wartungsmodus setzen." -"The database and media backup has been created.","Die Sicherungskopie von Datenbank und Medien wurde angelegt." -"The database backup has been created.","Die Sicherungskopie der Datenbank wurde angelegt." -"The file was compressed with Zlib, but this extension is not installed on server.","Die Datei wurde mit Zlib komprimiert, diese Erweiterung ist jedoch auf dem Server nicht installiert." -"The selected backup(s) has been deleted.","Die ausgewählte(n) Datenkopie(n) wurde(n) gelöscht." -"The system (excluding Media) backup has been created.","Die System-Sicherung (exkl. Medien) wurde erstellt." -"The system backup has been created.","Die Sicherungskopie des Systems wurde angelegt." -"Time","Zeit" -"Type","Typ" -"Unable to create backup. Please, try again later.","Sicherungskopie konnte nicht erstellt werden. Bitte versuchen Sie es später noch einmal." -"Unable to save the cron expression.","Der Cron-Ausdruck kann nicht gespeichert werden." -"Wrong order of creation for new backup.","Falscher Befehl zum Erstellen einer neuen Sicherungskopie." -"You do not have sufficient permissions to enable Maintenance Mode during this operation.","Sie haben nicht die erforderlichen Berechtigungen, um den Wartungsmodus während dieses Vorgangs zu aktivieren." diff --git a/app/locale/de_DE/Mage_Bundle.csv b/app/locale/de_DE/Mage_Bundle.csv deleted file mode 100644 index 25035b883..000000000 --- a/app/locale/de_DE/Mage_Bundle.csv +++ /dev/null @@ -1,71 +0,0 @@ -"%1$s incl tax.","%1$s incl tax." -"* Required Fields","* Pflichtfelder" -"-- Select --","-- Auswählen --" -"Add New Option","Neue Option hinzufügen" -"Add Selection","Auswahl hinzufügen" -"As Low as","So niedrig wie" -"As low as","So niedrig wie" -"Bundle Items","Bundleartikel" -"Bundle Product","Bundleprodukt" -"Bundle Product View Summary","Ansicht Produktpakete Zusammenfassung" -"Buy %1$s","Buy %1$s" -"Buy %1$s for","Buy %1$s for" -"Buy %1$s for %2$s","Buy %1$s for %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Buy %1$s for %2$s (%3$s incl. tax) each" -"Buy %1$s for %2$s each","Buy %1$s for %2$s each" -"Buy %1$s with %2$s discount each","Kaufen Sie %1$s mit je %2$s Rabatt" -"Catalog Product View (Bundle)","Katalog Produkt Ansicht (Bundle)" -"Checkbox","Checkbox" -"Choose a selection...","Wählen Sie eine Auswahl..." -"Click for price","Click for price" -"Close","Schließen" -"Default","Standard" -"Default Qty","Standardanzahl" -"Default Title","Standardtitel" -"Drop-down","Drop-down" -"Dynamic","Dynamisch" -"Excl. Tax","Steuer weglassen" -"Excl. Tax:","Excl. Tax:" -"Fixed","Fix" -"From","Von" -"From:","Von:" -"Gift Message","Geschenkmitteilung" -"Incl. Tax","Steuer inkludieren" -"Incl. Tax:","Incl. Tax:" -"Input Type","Eingabetyp" -"Is Required","Ist erforderlich" -"Message:","Nachricht:" -"Multiple Select","Mehrfache Auswahl" -"N/A","Nicht verfügbar" -"No options of this product are available.","Es sind keine Optionen dieses Produkts verfügbar." -"None","Keine" -"Percent","Prozent" -"Percent Discount","Prozent Rabatt" -"Please Select Products to Add","Bitte wählen Sie hinzuzufügende Produkte" -"Please enter a number greater 0 in this field.","Bitte geben Sie eine Zahl größer als 0 in dieses Feld ein." -"Please enter search conditions to view products.","Bitte geben Sie Suchbedingungen ein, um Produkte zu sehen." -"Please select options for product.","Bitte wählen Sie Optionen für das Produkt." -"Please specify product option(s).","Bitte spezifizieren Sie Produktoption(en)." -"Position","Position" -"Price Range","Preisklasse" -"Price Type","Preistyp" -"Price as configured","Preis wie konfiguriert" -"Qty:","Anzahl:" -"Radio Buttons","Radiobutton" -"Required options are not selected.","Pflichtoptionen sind nicht ausgewählt." -"Selected required options are not available.","Ausgewählte Pflichtoptionen sind nicht verfügbar." -"Separately","Separat" -"Ship Bundle Items","Bundleartikel versenden" -"Shipment","Versand" -"Store View Title","Shopansicht Titel" -"There is no defined renderer for ""%s"" option type.","Es gibt keine bestimmten Angaben für den ""%s"" Option-Typ." -"This product is also part of bundle(s)","Dieses Produkt ist Teil eines Bundles." -"To","An" -"To:","An:" -"Together","Zusammen" -"Total incl. Tax: %1$s","Total incl. Tax: %1$s" -"Use Default Value","Standardwert verwenden" -"User Defined Qty","Benutzerdefinierte Anzahl" -"and","and" -"each","each" -"save","save" diff --git a/app/locale/de_DE/Mage_Captcha.csv b/app/locale/de_DE/Mage_Captcha.csv deleted file mode 100644 index 443f94436..000000000 --- a/app/locale/de_DE/Mage_Captcha.csv +++ /dev/null @@ -1,23 +0,0 @@ -"Attention: Captcha is case sensitive.","Achtung: Beim Captcha Groß- und Kleinschreibung beachten." -"After number of attempts to login","Nach Anzahl von Anmeldungsversuchen" -"Always","Immer" -"CAPTCHA","CAPTCHA" -"CAPTCHA Timeout (minutes)","CAPTCHA Timeout (Minuten)" -"CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen","CAPTCHA für ""Benutzer erstellen"" und ""Passwort vergessen"" Formen ist immer aktiviert wenn ausgewählt" -"Case Sensitive","Groß-und Kleinschreibung beachten" -"Displaying Mode","Anzeige Modus" -"Enable CAPTCHA in Admin","CAPTCHA in Admin aktivieren" -"Enable CAPTCHA on Frontend","CAPTCHA im Frontend aktivieren" -"Font","Schriftart" -"Forms","Formen" -"If 0 is specified, CAPTCHA on the Login form will be always available.","Wenn 0 angegeben ist, ist CAPTCHA auf dem Login-Formular immer verfügbar." -"Incorrect CAPTCHA.","Falsches CAPTCHA." -"Number of Symbols","Symbolanzahl" -"Number of Unsuccessful Attempts to Login","Anzahl der fehlgeschlagenen Anmeldungsversuche" -"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Bitte geben Sie höchstens 8 Symbole an. Zulässiger Bereich (z.B. 3-5)" -"Please type the letters below","Bitte geben Sie die untenstehenden Buchstaben ein" -"Please type the letters from the image:","Bitte geben Sie die Buchstaben auf diesem Bild ein:" -"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.
    Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Bitte verwenden Sie nur Buchstaben (a-z oder A-Z) oder Zahlen (0-9) in diesem Feld. Keine Leerzeichen oder andere Zeichen sind erlaubt. -
    Ähnliche Zeichen (z.B. ""i"", ""I', ""1"") verringern die Chance der richtigen Erkennung durch den Kunden." -"Reload captcha","Captcha neu laden" -"Symbols Used in CAPTCHA","Symbole, die im CAPTCHA verwendet werden" diff --git a/app/locale/de_DE/Mage_Catalog.csv b/app/locale/de_DE/Mage_Catalog.csv deleted file mode 100644 index 5568c7f09..000000000 --- a/app/locale/de_DE/Mage_Catalog.csv +++ /dev/null @@ -1,848 +0,0 @@ -"# of Use","Anzahl der Verwendungen" -"%1$s incl tax.","%1$s inkl. Steuern" -"%s - %s","%s - %s" -"%s Item(s)","%s Artikel" -"%s and above","%s und darüber" -"%s-%s of %s","%s-%s von %s" -"(%d)","(%d)" -"(Copy data from: %s)","(Kopiere Daten von: %s)" -"* Required Fields","* Notwendige Felder" -"-- Please Select --","-- Bitte auswählen --" -"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","Standardwert 86400 wenn nicht eingetragen. Zum sofortigen Aktualisieren die Blocks HTML Ausgabe Cache leeren." -"Warning! Applying MAP by default will hide all product prices on the frontend.","Warnung! Wenn Sie MAP als Standard anwenden, werden alle Produktpreise im Frontend versteckt." -"A group with the same name already exists.","Gruppe mit dem gleichen Namen existiert bereits." -"A name is required","Ein Name wird benötigt" -"A product type is not defined for the indexer.","Produkttyp ist für den Indexer nicht definiert." -"ALL GROUPS","ALLE GRUPPEN" -"AM","AM" -"Action","Aktion" -"Actual Price","Tatsächlicher Preis" -"Add","Hinzufügen" -"Add Attribute","Eigenschaft hinzufügen" -"Add Design Change","Designänderung hinzufügen" -"Add Group","Gruppe hinzufügen" -"Add Group Price","Gruppenpreis hinzufügen" -"Add New","Neu hinzufügen" -"Add New Attribute","Neues Attribut hinzufügen" -"Add New Attribute Set","Neuer Eigenschaftensatz hinzufügen" -"Add New Group","Neue Gruppe hinzufügen" -"Add New Images","Neue Bilder hinzufügen" -"Add New Option","Neue Option hinzufügen" -"Add New Row","Neue Zeile hinzufügen" -"Add New Search Term","Neuen Suchbegriff hinzufügen" -"Add New Set","Neuen Satz hinzufügen" -"Add Product","Produkt hinzufügen" -"Add Product To Websites","Produkt zu Webseiten hinzufügen" -"Add Root Category","Stammkategorie hinzufügen" -"Add Subcategory","Unterkategorie hinzufügen" -"Add Tax","Steuer hinzufügen" -"Add Tier","Ebene hinzufügen" -"Add attribute into attribute set","Attribut zum Attribute-Set hinzufügen" -"Add group into attribute set","Gruppe zum Attribute-Set hinzufügen" -"Add new custom option into product","Spezifische Option zum Produkt hinzufügen" -"Add new values into custom option","Neue Werte zur benutzerdefinierten Option hinzufügen" -"Add option","Option hinzufügen" -"Add to Cart","Zum Warenkobrn hinzufügen" -"Add to Compare","Hinzufügen um zu vergleichen" -"Add to Wishlist","Zum Wunschzettel hinzufügen" -"Additional Information","Zusätzliche Information" -"Alert Urls","Warn-Urls" -"All","Alle" -"All Product Types","Alle Produkttypen" -"All Websites","Alle Webseiten" -"All products","Alle Produkte" -"All products - recently added products, New products - products marked as new","Alle Artikel - Kürzlich hinzugefügte, neue - als neu gekennzeichnete" -"All products of this set will be deleted! Are you sure you want to delete this attribute set?","Alle Produkte dieses Satzes werden gelöscht! Sind Sie sicher, dass Sie diesen Eigenschaftensatz löschen möchten?" -"Allow All Products per Page","Alle Produkte pro Seite zulassen" -"Allow Dynamic Media URLs in Products and Categories","Dynamische Medien-URLs in Produkten und Kategorien zu lassen" -"Allow HTML Tags on Frontend","HTML-Tags am Frontend zulassen" -"Allowed File Extensions","Erlaubte Dateierweiterungen" -"Allowed file extensions to upload","Erlaubte Dateierweiterungen zum Hochladen" -"Amount","Summe" -"An error occurred while adding products to websites.","Ein Fehler ist aufgetreten, während Produkte zu Webseiten hinzugefügt wurden." -"An error occurred while clearing comparison list.","Beim Löschen der Vergleichsliste ist ein Fehler aufgetreten." -"An error occurred while deleting this review.","Beim Löschen dieser Rezension ist ein Fehler aufgetreten." -"An error occurred while removing products from websites.","Ein Fehler ist aufgetreten, während Produkte von Webseiten entfernt wurden." -"An error occurred while saving the URL rewrite","Ein Fehler ist beim Speichern der URL-Umschreibung aufgetreten." -"An error occurred while saving the attribute set.","Beim Speichern des Eigenschaftensatzes ist ein Fehler aufgetreten." -"An error occurred while saving the collection, aborting. Error message: %s","Beim Speichern der Sammlung ist ein Fehler aufgetreten. Abbruch erfolgt. Fehlermeldung: %s" -"An error occurred while saving the product. ","Beim Speichern des Produktes ist ein Fehler aufgetreten." -"An error occurred while saving the search query.","Beim Speichern der Suchanfrage ist ein Fehler aufgetreten." -"An error occurred while saving this group.","Beim Speichern dieser Gruppe ist ein Fehler aufgetreten." -"An error occurred while saving this review.","Beim Speichern der Rezension ist ein Fehler aufgetreten." -"An error occurred while trying to delete the category.","Beim Versuch die Kategorie zu löschen ist ein Fehler aufgetreten." -"An error occurred while updating the product(s) attributes.","Beim Aktualisieren der Eigenschaften der/des Produkte(s) ist ein Fehler aufgetreten." -"An error occurred while updating the product(s) status.","Bei der Aktualisierung des Status der/des Produkte(s) ist ein Fehler aufgetreten." -"An invalid group ID is specified, skipping the record.","Ungültige Gruppen-ID, Datensatz wird übersprungen." -"An invalid option ID is specified for %s (%s), skipping the record.","Eine ungültige Options-ID wurde für %s angegeben (%s). Eintrag wird übersprungen." -"An invalid store was specified.","Es wurde ein ungültiges Geschäft angegeben." -"Anchor Custom Text","Anchor eigener Text" -"Anchor Custom Title","Anchor eigener Titel" -"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","Nur auf Katalogprodukte und Kategorien anwendbar. Jeder Medieninhalt wird in den Editor als ein statischer URL eingefügt. Er wird nicht aktualisiert, wenn der Systemkonfigurations-Basis-URL sich ändert." -"Apply MAP (Default Value)","MAP anwenden (Standardwert)" -"Apply To","Anwenden auf" -"Approved","Bestätigt" -"Are you sure you want to delete this category?","Möchten Sie diese Kategorie wirklich löschen?" -"Are you sure you would like to remove all products from your comparison?","Sind Sie sicher, dass Sie alle Produkte von Ihrem Vergleich entfernen möchten?" -"Are you sure you would like to remove this item from the compare products?","Sind Sie sicher, dass Sie diese Position vom Produktvergleich entfernen möchten?" -"Are you sure?","Sind Sie sicher?" -"As low as:","So niedrig wie:" -"Assign","Zuordnen" -"Assign product link","Produktlink zuordnen" -"Assign product to category","Produkt zu Kategorie zuordnen" -"Assigned Products","Zugeordnete Produkte" -"Associated Products","Zugehörige Produkte" -"Attrib. Set Name","Name des Eigenschaftensatzes" -"Attribute ""%s"" is invalid.","Attribut ""%s"" ist ungültig." -"Attribute ""%s"" is required.","Attribut ""%s"" erforderlich." -"Attribute Information","Eigenschafteninformation" -"Attribute Model","Eigenschaftenmodell" -"Attribute Name:","Eigenschaftenname:" -"Attribute Set","Attributset" -"Attribute Sets","Attribute-Sets" -"Attribute add","Attribut hinzufügen" -"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Eingabecode ist ungültig. Bitte benutzen Sie nur Buchstaben (a-z), Zahlen (0-9) oder Unterstreichungen (_) in diesem Feld, das erste Zeichen sollte ein Buchstabe sein." -"Attribute group with the \"/name/\" name already exists","Attributgruppe mit dem \"/name/\"-Namen existiert bereits" -"Attribute group with the \/name/\ name already exists","Es besteht schone eine Gruppe von Attributen mit dem \/name/\ Namen." -"Attribute remove","Attribut löschen" -"Attribute with the same code already exists","Die Eigenschaft ist mit dem gleichen Code bereits vorhanden" -"Attributes","Attribute" -"Attrribute names can be specified per store.","Eigenschaftennamen können pro Geschäft angegeben werden." -"Autogenerate","Automatisch generieren" -"Availability:","Verfügbarkeit:" -"Back","Zurück" -"Backend Model","Backend-Modell" -"Backend Table","Backend-Tabelle" -"Backend Table Title","Backend-Tabellentitel" -"Backorders","Lieferückstand" -"Based On","Basierend auf" -"Before Order Confirmation","Vor der Bestellungsbestätigung" -"Best Value","Bester Wert" -"Block after Info Column","Nach Infospalte sperren" -"Bottom Block Options Wrapper","Unterseite Sperroptionendeckblatt" -"Bottom/Left","Unten/Links" -"Bottom/Right","Unten/Rechts" -"Browse By","Durchsuchen nach" -"Bundle Items","Gebündelte Artikel" -"Buy %1$s","Kaufen Sie %1$s" -"Buy %1$s for","Kaufen Sie %1$s für" -"Buy %1$s for %2$s","Kaufen Sie %1$s für %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Kaufen Sie %1$s für je %2$s (%3$s inkl. Steuer)" -"Buy %1$s for %2$s each","Kaufen Sie %1$s für je %2$s" -"Cache Lifetime (Seconds)","Cache-Lebensdauer (Sekunden)" -"Cache refresh needed.","Cache-Auffrischung erforderlich." -"Can be Divided into Multiple Boxes for Shipping","Kann für den Versand in mehrere Pakete unterteilt werden" -"Can be used only with catalog input type Dropdown","Kann nur mit Katalogeingabeart Dropdown verwendet werden" -"Can be used only with catalog input type Dropdown, Multiple Select and Price","Kann nur mit Katalogeingabeart Dropdown, Mehrfachauswahl und Preis verwendet werden." -"Can\'t create image.","Kann kein Bild erzeugen." -"Cancel","Abbrechen" -"Cannot create image.","Kann kein Bild erzeugen." -"Cannot create writeable directory '%s'.","Kann keine schreibbares Verzeichnis erstellen.'%s'." -"Cart Item Attribute","Merkmal eines Einkaufswagen-Artikels" -"Catalog","Katalog" -"Catalog Category (Anchor)","Katalogkategorie (Fixpunkt)" -"Catalog Category (Non-Anchor)","Katalogkategorie (kein Fixpunkt)" -"Catalog Category (Without Subcategories)","Katalogkategorie (ohne Unterkategorien)" -"Catalog Category Link","Katalogkategorie-Link" -"Catalog New Products List","Neue Produktliste des Katalogs" -"Catalog Price Scope","Preisspanne im Katalog" -"Catalog Product Compare List","Katalogprodukte-Vergleichsliste" -"Catalog Product Email to a Friend","Produkt aus dem Katalog per E-Mail an einen Freund senden" -"Catalog Product Image Gallery Popup","Katalog-Popup der Produktbildergallerie" -"Catalog Product Link","Link zu den Produkten im Katalog" -"Catalog Product View (Any)","Produktansicht des Katalogs (beliebig)" -"Catalog Product View (Configurable)","Produktansicht des Katalogs (konfigurierbar)" -"Catalog Product View (Grouped)","Produktansicht des Katalogs (in Gruppen)" -"Catalog Product View (Simple)","Produktansicht des Katalogs (vereinfacht)" -"Catalog Product View (Virtual)","Produktansicht des Katalogs (virtuell)" -"Catalog Section","Katalogabschnitt" -"Catalog Seo Sitemap (Category List)","Suchmaschinenoptimierungsindex des Katalogs (Kategorienliste)" -"Catalog Seo Sitemap (Category Tree)","Suchmaschinenoptimierungsindex des Katalogs (Kategoriebaum)" -"Catalog Seo Sitemap (Common)","Suchmaschinenoptimierungsindex des Katalogs (allgemein)" -"Catalog Seo Sitemap (Product List)","Suchmaschinenoptimierungsindex des Katalogs (Produktliste)" -"Catalog URL Rewrites","Umschreibung der Katalog-URL" -"Catalog product custom option values API","API für benutzerdefinierte Optionswerte für Katalogprodukte" -"Catalog product custom options API","API für benutzerdefinierte Katalogprodukt-Optionen" -"Catalog, Search","Katalog, Suche" -"Categories","Kategorien" -"Categories Sitemap","Kategorienindex" -"Category","Kategorie" -"Category API","Kategorien-Programmierschnittstelle" -"Category Data","Kategoriedaten" -"Category Flat Data","Flache Kategoriedaten" -"Category Link Block Template","Kategorielink, Blockschablone" -"Category Link Inline Template","Kategorielink, eingebettet in Schablone" -"Category Products","Kategorieprodukte" -"Category Top Navigation","Obere Kategorien-Navigationsleiste" -"Category URL Suffix","Kategorie, URL-Suffix" -"Category attributes API","Kategorie-Merkmale, Programmierschnittstelle" -"Category move error","Kategorie-Bewegungsfehler" -"Category move error %s","Kategorieverschiebungsfehler %s" -"Category move operation is not possible: parent category is equal to child category.","Verschieben der Kategorie ist nicht möglich: Der übergeordnete Ordner gleicht dem untergeordneten." -"Category move operation is not possible: the current category was not found.","Verschieben der Kategorie ist nicht möglich: Die aktuelle Kategorie wurde nicht gefunden." -"Category move operation is not possible: the new parent category was not found.","Kategorie-Verschiebevorgang nicht möglich: die neue Position in der Baumstruktur konnte nicht gefunden werden." -"Category must be an instance of Mage_Catalog_Model_Category.","Kategorie muss eine Instanz von Mage_Catalog_Model_Category sein." -"Center","Mitte" -"Change","Ändern" -"Change or Retrieve attribute store view","Ändern und Wiederfinden der Speicheransicht der Eigenschaften" -"Change status","Status ändern" -"Check items to add to the cart or","Artikel überprüfen, um sie dem Einkaufswagen zuzufügen oder" -"Choose an Option...","Eine Option auswählen..." -"Clear All","Alle löschen" -"Clear Price","Preis löschen" -"Click for price","Klicken für den Preis" -"Close Window","Fenster Schließen" -"Collapse All","Alle einklappen" -"Comma-separated.","Durch Komma getrennt." -"Comparable","Vergleichbar" -"Comparable on Front-end","Vergleichbar am Frontend" -"Comparable on the Frontend","Vergleichbar am Frontend" -"Compare","Vergleichen" -"Compare Products","Produkte vergleichen" -"Conditions Combination","Bedingungenkombination" -"Configurable Product","Konfigurierbare Produkte" -"Configurable Product Settings","Konfigurierbare Produkteinstellungen" -"Configure Product","Produkt konfigurieren" -"Continue","Fortsetzen" -"Copy From Configurable","Aus konfigurierbaren Produkteinstellungen kopieren" -"Country/State","Land/Staat" -"Create","Erstellen" -"Create (Upload)","Erstellen (hochladen)" -"Create Empty","Leere Datei erstellen" -"Create Permanent Redirect for URLs if URL Key Changed","Permanente Weiterleitung für URLs erstellen, wenn der URL-Schlüssel geändert wird" -"Create Permanent Redirect for old URL","Andauernde Umleitung für alte URL erstellen" -"Create Product Settings","Produkteinstellungen erstellen" -"Create Simple Associated Product","Erstellen eines einfachen dazugehörigen Produkts" -"Create attribute set based on another set","Attribute-Set aus einem anderen Set erstellen" -"Create new attribute","Neues Attribut erstellen" -"Create new category","Neue Kategorie erstellen" -"Create new product","Neues Produkt erstellen" -"Cross-sells","Querverkäufe" -"Currently Shopping by:","Derzeit einkaufend bei:" -"Custom Design","Eigene Gestaltung" -"Custom Options","Kundenoptionen" -"Custom options","Benutzerdefinierte Optionen" -"Customer Group","Kundengruppe" -"Customers Reviews","Berichte der Kunden" -"Customers Tagged Product","Produkt vom Kunden markiert" -"Data Type for Saving in Database","Datentyp für das Speichern in Datenbank" -"Date & Time Custom Options","Benutzerdefinierten Optionen bezüglich Datum und Uhrzeit" -"Date Fields Order","Feldbefehl Datum" -"Date Subscribed","Anmeldedatum" -"Datetime","Datetime" -"Decimal","Dezimal" -"Declare attribute value saving scope","Definiere Attribut ""Wertsparender Spielraum""" -"Default ""What's This"" Text Message","""Was ist das""-Standard-Textmitteilung" -"Default Popup Text Message","Standard-Popup-Textmitteilung" -"Default Price","Vorgegebener Preis" -"Default Price Navigation Step","Navigationsschritt vorgegebener Preis" -"Default Qty","Standardanzahl" -"Default Values","Standardwerte" -"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","Definiert den Umfang der Basiswährung (""Einstellen der Währung"" > ""Währungsoptionen"" > ""Basiswährung"")." -"Delete","Löschen" -"Delete Attribute","Attribute löschen" -"Delete Attribute Set","Attributreihe löschen" -"Delete Category","Kategorie löschen" -"Delete Group Price","Gruppenpreis löschen" -"Delete Option","Option löschen" -"Delete Row","Reihe löschen" -"Delete Search","Suche löschen" -"Delete Selected Group","Ausgewählte Gruppe löschen" -"Delete Tier","Ebene löschen" -"Delete attribute","Attribut löschen" -"Delete category","Kategorie entfernen" -"Delete product","Produkt löschen" -"Depends on design theme","abhängig vom Design Thema" -"Design","Gestaltung" -"Details","Details" -"Disabled","Deaktiviert" -"Disallowed file type.","Nicht erlaubter Dateityp" -"Display Actual Price","Tatsächlichen Preis anzeigen" -"Display Page Control","Seitensteuerung anzeigen" -"Display Price Interval as One Price","Preisintervall als einen Preis anzeigen" -"Display Product Count","Produktanzahl anzeigen" -"Display Type","Typ anzeigen" -"Display in Suggested Terms","Anzeige laut vorgeschlagener Nutzungsbedingungen" -"Double click on a group to rename it","Doppel-Klick auf eine Gruppe um sie umzubennenen" -"Double click on above image to view full picture","Doppel-Klick auf das obige Image um Vollbild anzuzeigen" -"Downloadable Information","Informationen zum Herunterladen" -"Duplicate","duplizieren" -"Duplicate amount found.","Dupliziere die gefundene Menge (Summe)." -"Duplicate website group price customer group.","Webseite Gruppenpreis Kundengruppe duplizieren." -"Duplicate website tier price customer group and quantity.","Preisstruktur, Kundengruppe und Menge duplizieren." -"Duplicate website, country and state tax found.","Dupliziere die gefundene Website, Land und Gebühr." -"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","Zum Beispiel: {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamische Richtlinien-Analyse wirkt sich auf die Katalogleistung aus." -"Edit","Bearbeiten" -"Edit Attribute Set '%s'","Eigenschaftensatz '%s' bearbeiten" -"Edit Product Attribute","Produkteigenschaften bearbeiten" -"Edit Product Attribute ""%s""","Produkteigenschaft ""%s"" bearbeiten" -"Edit Search","Suche bearbeiten" -"Edit Search '%s'","Suche '%s' bearbeiten" -"Edit Set Name","Name bearbeiten einstellen" -"Email","E-Mail" -"Email to a Friend","E-Mail an einen Freund" -"Empty","Leer" -"Enable MAP","MAP aktivieren" -"Enable Qty Increments","Anzahlzunahme aktivieren" -"Enable WYSIWYG","WYSIWYG aktivieren" -"Enable for reindexing a big number of SKUs.","Aktivieren Sie eine große Anzahl von SKUs für die Neuindizierung." -"Enabled","Aktiviert" -"Error during retrieval of option value: %s","Fehler bei Abfragen von Optionswert: %s" -"Exclude","Auschließen" -"Expand All","Alle erweitern" -"Failed","Fehlgeschlagen" -"Failed to copy file %s. Please, delete media with non-existing images and try again.","Datei %s ließ sich nicht kopieren. Bitte löschen sie die Medien mit fehlenden Bildern und versuchen sie es erneut." -"Failed to move file: %s","Datei konnte nicht verschoben werden: %s" -"Feature Products","Produkte bieten" -"Field is not complete","Feld ist nicht vollständig" -"File options format is not valid.","Dateioptionsformat ist nicht gültig." -"File upload failed","Dateiupload fehlgeschlagen" -"Filter","Filter" -"Filter model name must be declared.","Filtermodulname muss angegeben werden." -"Filter must be an object. Please set correct filter.","Filter muss ein Objekt sein. Stellen Sie bitte den korrekten Filter ein." -"Filterable (no results)","Filterbar (keine Ergebnisse)" -"Filterable (with results)","Filterbar (mit Ergebnissen)" -"First Name","Vorname" -"Fixed","Fix" -"For internal use.","Für interne Verwendung" -"For the last time placed.","Letzte Bestellung aufgegeben am" -"Frontend","Oberfläche" -"Frontend Model","Oberflächenmodell" -"Frontend Properties","Frontend-Eigenschaften" -"Gallery","Gallerie" -"General Information","Allgemeine Information" -"Get full information about attribute with list of options","Vollständige Angaben zum Attribut mit Liste möglicher Optionen einblenden" -"Get full information about custom option in product","Vollständige Informationen über die benutzerdefinierten Produktoptionen abrufen" -"Get list of available custom option types","Liste der verfügbaren benutzerdefinierten Optionstypen abrufen" -"Get list of non-default attributes by product type and attributes set","Liste nicht-standardmäßiger Attribute nach Art und Attributsatz einblenden" -"Get list of possible attribute types","Liste möglicher Attributtypen abrufen" -"Get special price","Angebote" -"Global","Global" -"Globally Editable","Global bearbeitbar" -"Go to Home Page","Zur Startseite gehen" -"Grid","Raster" -"Group add","Gruppe hinzufügen" -"Group remove","Gruppe entfernen" -"Grouped Product","Gruppiertes Produkt" -"Groups","Gruppen" -"Home","Startseite" -"ID","ID" -"ID: %s","ID: %s" -"If empty, the Category Name will be used","Falls leer, wird der Kategoriename verwendet" -"If empty, the Product Name will be used","Wenn nicht ausgefüllt, wird der Produktname genutzt" -"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Wenn Sie keinen Optionswert für eine spezifische Shopansicht festlegen wird der Standard (Admin) Wert verwendet." -"Image","Bild" -"Image content is not valid base64 data.","Bildinhalt ist keine gültige base64 Datei." -"Image does not exist.","Bild existiert nicht" -"Image file was not found.","Bilddatei wurde nicht gefunden." -"Image type and information need to be specified for each store view.","Bildtyp und Informationen müssen für jede Shopansicht festgelegt werden." -"In Cart","Im Einkaufswagen" -"In Stock","Auf Lager" -"In stock","Auf Lager" -"Incl. Tax","Mit Mwst." -"Index product and categories URL rewrites","Index Produkt und Kategorien URL Neuschreibungen" -"Index product attributes for layered navigation building","Produktattribute für einen mehrstufigen Navigationsaufbau indizieren" -"Index product prices","Index Produktpreise" -"Indexed category/products association","Indizierte Kategorie/Produkassoziierung" -"Info","Informationen" -"Info Column Options Wrapper","Deckblatt Optionen für Infospalte" -"Input Type","Eingabetyp" -"Integer","Integer" -"Interval Division Limit","Internes Teilungslimit" -"Invalid Tier Prices","Üngültige Stufenpreise" -"Invalid attribute %s","Ungültiges Attribut %s" -"Invalid attribute option specified for attribute %s (%s), skipping the record.","Ungültige Option für Attribut %s definiert (%s), Eintrag wird übersprungen." -"Invalid attribute set specified, skipping the record.","Ungültige Merkmale angegeben, Aufzeichnung wird übersprungen." -"Invalid block: %s.","Ungültiger Block: %s." -"Invalid category IDs.","Ungültige KategorieIDs." -"Invalid category.","Ungültige Kategorie" -"Invalid image file type.","Ungültiger Bilddateityp." -"Invalid image type.","Ungültige Bildart." -"Invalid option ID specified for %s (%s), skipping the record.","Ungültige OptionsID für %s (%s) festgelegt, wird übersprungen." -"Invalid product type specified, skipping the record.","Ungültiger Produkttyp ausgewählt, Aufzeichnung wird übersprungen." -"Invalid store specified","Ungültiger Store definiert" -"Invalid store specified, skipping the record.","Ungültiger Store definiert, Eintrag wird übersprungen." -"Invalid tier prices. The product is not associated to the requested website.","Ungültige Preisebene. Das Produkt ist nicht mit der angeforderten Webseite verbunden." -"Inventory","Inventar" -"Is Default","Als Standard" -"Is Required","Ist erforderlich" -"Items %s to %s of %s total","Artikel %s auf %s von %s gesamt" -"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Gegenstände die im Katalog oder den Suchergebnissen nicht erscheinen sollen, sollten den Status ""Deaktiviert"" im gewünschten Shop haben." -"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Artikel, die nicht in den Suchergebnissen oder im Katalog angezeigt werden sollen, sollten den Status 'Deaktiviert' im gewünschten Shop haben." -"Keep your eyes open for our special Back to School items and save A LOT!","Halten Sie die Augen offen für unsere speziellen Angebote zum Schulanfang und sparen Sie VIEL GELD!" -"Label","Label" -"Last Name","Letzter Name" -"Last Notification","Letzte Benachrichtigung" -"Layered Navigation","Mehstufige Navigation" -"Learn More","mehr dazu" -"Line %d, Email: %s","Zeile %d, Email: %s" -"Line %d, SKU: %s","Zeile %d, SKU: %s" -"Link (Related, Up sell, Cross sell)","Link (Verwandt, Angebot, Mehrfachangebot)" -"Link product does not exist.","Verknüpftes Produkt existiert nicht." -"Link to a Specified Category","Link zu einer bestimmten Kategorie" -"Link to a Specified Product","Link zum angegebenen Produkt" -"List","Liste" -"List Mode","Listenmodus" -"List of Products that are set as New","Liste von Produkten, die als neu klassifiziert sind" -"List of types","Artenliste" -"Manage Attribute Sets","Attributsets verwalten" -"Manage Attributes","Attribute verwalten" -"Manage Catalog Categories","Katalogkategorien verwalten" -"Manage Categories","Kategorien verwalten" -"Manage Label / Options","Bezeichnungen/Optionen verwalten" -"Manage Options (values of your attribute)","Optionen (Werte Ihrer Attribute) verwalten" -"Manage Product Attributes","Produktattribute verwalten" -"Manage Product Sets","Produktsets verwalten" -"Manage Products","Produkte verwalten" -"Manage Stock","Lagerbestand verwalten" -"Manage Titles (Size, Color, etc.)","Titel verwalten (Größe, Farbe, etc.)" -"Max Characters","Maximale Anzahl Zeichen" -"Maximal Depth","Maximale Tiefe" -"Maximum Image Size","Maximale Bildgröße" -"Maximum Number of Price Intervals","Maximale Anzahl an Preisintervallen" -"Maximum Qty Allowed in Shopping Cart","Maximal im Warenkorb erlaubte Anzahl" -"Maximum allowed image size for '%s' is %sx%s px.","Maximal erlaubte Bildgröße für '%s' ist %sx%s px." -"Maximum image height","Maximale Bildhöhe" -"Maximum image width","Maximale Bildbreite" -"Maximum number of characters:","Maximale Anzahl Zeichen:" -"Maximum number of price intervals is 100","Die maximale Anzahl an Preisintervallen ist 100." -"Media Image","Bild" -"Minimum Advertised Price","Beworbener Mindestpreis" -"Minimum Lines per Page","Minimale Zeilenanzahl pro Seite" -"Minimum Qty Allowed in Shopping Cart","Minimal im Warenkorb zulässige Menge" -"Minimum Qty for Item\'s Status to be Out of Stock","Minimale Stückzahl für Nicht auf Lager-Status" -"Missing SKU, skipping the record.","Artikelnummer fehlt, Eintrag übersprungen." -"More Views","Mehr Ansichten" -"Move","Verschieben" -"Move category in tree","Kategorie in Verzeichnis verschieben" -"Multi update product","Produkt mit Mehrfach-Aktualisierung" -"Must be in the allowed values list.","Muss ein Wert aus der Liste gültiger Werte sein." -"My Account","Mein Konto" -"N/A","Nicht zutreffend" -"Name","Name" -"Name in %s","Name in %s" -"New Product","Neues Produkt" -"New Product Attribute","Neues Produktattribut" -"New Products","Neue Produkte" -"New Products Grid Template","Neue Produkt Rastervorlage" -"New Products List Template","Neue Produkt Listenvorlage" -"New Root Category","Neue Root Kategorie" -"New Search","Neue Suchabfrage" -"New Set Name","Neuer Setname" -"New Subcategory","Neue Unterkategorie" -"New products","Neue Produkte" -"Next","Weiter" -"No","Nein" -"No image","Kein Bild" -"No layout updates","Keine Aktualisierungen des Layouts" -"No options of this product are available.","Es sind keine Optionen dieses Produkts verfügbar." -"No product collections found.","Keine Produktsammlungen gefunden." -"None","Keine" -"Not Visible Individually","Nicht individuell sichtbar" -"Notify Low Stock RSS","Lagerbestand RSS" -"Notify for Quantity Below","Bei unterer Anzahl benachrichtigen." -"Number of Products per Page","Anzahl der Produkte pro Seite" -"Number of Products to Display","Anzahl angezeigter Produkte" -"Number of Uses","Anzahl der Verwendungen" -"Number of results","Anzahl der Ergebnisse" -"Number of results (For the last time placed)","Anzahl der Ergebnisse (für die letzte platzierte Zeit)" -"OK","OK" -"OR","ODER" -"Old Price:","Alter Preis:" -"On Gesture","Gestik An" -"Option validation failed to add product to cart.","Überprüfung von Produkt-Optionen beim Hinzufügen zum Warenkorb fehlgeschlagen." -"Option values","Optionswerte" -"Option:","Option:" -"Options","Optionen" -"Options Control","Optionenkontrolle" -"Options is required","Optionen ist obligatorisch" -"Our customer service is available 24/7. Call us at (555) 555-0123.","Unser Kunden-Service ist 24/7 erreichbar. Kontaktieren Sie uns unter (555)555-0123." -"Out of Stock","Nicht vorrätig" -"Out of stock","Ausverkauft" -"PM","Nachmittags" -"Page Title Separator","Trennzeichen im Seitentitel" -"Parent Category","Überkategorie" -"Pending","Ausstehend" -"Pending Reviews RSS","Ausstehende Kundenmeinungen RSS" -"Percentage","Prozentsatz" -"Please add rows to option.","Bitte Zeilen zur Option hinzufügen." -"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","ACHTUNG: Bei einem Klick auf die Zeile werden die Paketdaten geladen und überschreiben alle ungespeicherten Formulardaten." -"Please click on the Close Window button if it is not closed automatically.","Klicken Sie bitte auf die Schaltfläche Fenster Schließen, wenn dies nicht automatisch erfolgt." -"Please enter a new group name","Bitte geben Sie einen neuen Gruppennamen ein" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Bitte aktualisieren Sie ""Neufassungen der Katalog-URLs"" und ""Produktattribute"" in der -> Indexverwaltung des Systems" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Bitte aktualisieren sie ""Katalog URL Versionen"" und ""Produkteigenschaften"" in System -> Index Management" -"Please refresh ""Product Attributes"" in System -> Index Management","Bitte aktualisieren Sie ""Produktattribute"" in der -> Indexverwaltung des Systems" -"Please select a static block ...","Wählen Sie bitte einen statischen Block..." -"Please select items.","Bitte wählen Sie Artikel." -"Please select one or more attributes.","Bitte wählen Sie ein oder mehrere Attribut(e)." -"Please select product(s).","Wählen Sie bitte ein Produkt(e)." -"Please select products for attributes update","Wählen Sie bitte Produkte für die Aktualisierung der Merkmale" -"Please set up merge date/time","Bitte Datum/Zeit-Verbindung einrichten" -"Please set up merge date/time later then present date","Zusammenfassung von Datum/Uhrzeit einstellen und dann das Datum anzeigen" -"Please specify date required option(s).","Bitte die benötigten Datum-Optionen angeben." -"Please specify the number of products, that will not be divided into subintervals.","Geben sie bitte die Anzahl an Artikeln an, die nicht in Teilintervalle geteilt werden." -"Please specify the product required option(s)","Bitte die obligatorischen Produktoption(en) angeben" -"Please specify the product required option(s).","Geben Sie bitte die obligatorischen Produktoption(en) an." -"Please specify the product\'s option(s).","Bitte die Produkt-Optionen angeben." -"Please specify the product\'s required option(s).","Geben Sie bitte die obligatorischen Option(en) für das Produkt an." -"Please specify the quantity of product(s).","Geben Sie bitte die Anzahl an Produkten an." -"Please specify time required option(s).","Bitte die benötigten Zeit-Optionen angeben." -"Please wait...","Bitte warten..." -"Position","Position" -"Position in Layered Navigation","Position in Filter-Navigation" -"Position of attribute in layered navigation block","Position des Attributs in Filter-Navigation" -"Prev","Vorschau" -"Previous","Vorige" -"Price","Preis" -"Price Navigation Step Calculation","Preis-Navigation Schritt Berechnung" -"Price Type","Preistyp" -"Price is not available","Preis ist nicht verfügbar" -"Price values for options should be specified in system base currency.","Preisangaben für Optionen sollten in der im Shop eingestellten Basiswährung eingegeben werden." -"Price:","Preis:" -"Price: %s","Preis: %s" -"Print This Page","Diese Seite drucken" -"Product","Produkt" -"Product API","Produkt-API" -"Product Alerts","Produktmeldungen" -"Product Attribute","Produktattribut" -"Product Attributes","Produkt Attribute" -"Product Categories","Produktkategorien" -"Product Description","Produktbeschreibung" -"Product Extra Info","Zusatzinfo Produkt" -"Product Flat Data","Produkt Flat Daten" -"Product ID","ProduktId" -"Product Image Placeholders","Produktbild Platzhalter" -"Product Image Watermarks","Produktbild Wasserzeichen" -"Product Images","Produktbilder" -"Product Images API","Produktbilder-API" -"Product In Websites","Produkt auf Webseiten" -"Product Info Column","Produktinformationsspalte" -"Product Information","Produktinformation" -"Product Link Block Template","Produkt-Link Block Vorlage" -"Product Link Inline Template","Produkt-Link Inline Vorlage" -"Product Listing Sort by","Verfügbare Produktauflistung sortiert nach" -"Product Name","Produktbezeichnung" -"Product Prices","Produktpreise" -"Product Reviews","Produktreviews" -"Product Tags","Produkttags" -"Product Tier Price API","Produktstaffelpreis API" -"Product Type","Produkttyp" -"Product URL Suffix","URL-Suffix des Produkts" -"Product View Extra Hint","Produktansicht extra Hint" -"Product attribute sets API","Produkt-Attributset API" -"Product attributes API","Produktmerkmale API" -"Product collection expected.","Produktsammlung erwartet." -"Product is not loaded","Produkt wurde nicht geladen" -"Product links API (related, cross sells, up sells)","Produktlink-API (Ähnliches, Cross-Selling, Up-Selling)" -"Product types API","API Produkttypen" -"Product with this combination of attributes already associated to configurable.","Produktkombination mit diesen Attributen existiert bereits im konfigurierbaren Produkt." -"Products","Produkte" -"Products Comparison List","Produkt Vergleichsliste" -"Products Information","Produktinformationen" -"Products Reviews","Artikelbewertungen" -"Products Sitemap","Sitemap Produkte" -"Products only","Nur Produkte" -"Products per Page on Grid Allowed Values","Produkte pro Seite (erlaubte Werte für Gitter)" -"Products per Page on Grid Default Value","Produkte pro Seite (Standardwert für Gitter)" -"Products per Page on List Allowed Values","Produkte pro Seite (erlaubte Werte für Liste)" -"Products per Page on List Default Value","Produkte pro Seite (Standardwert für Liste)" -"Properties","Eigenschaften" -"Qty","Anzahl" -"Qty Increments","Menge Zuwachsrate" -"Qty Uses Decimals","Stückzahl kann dezimal sein" -"Qty for Item\'s Status to Become Out of Stock","Menge, bei der der Produktstatus zu ""Nicht vorrätig"" wechselt" -"Qty:","Anzahl:" -"Quantity","Menge" -"Quick Create","Schnellanlegen" -"Quick Overview","Schnellübersicht" -"Quick simple product creation","Schnelle und einfache Produkterstellung" -"Records for ""%s"" store found.","Datensätze für ""%s""-Shop gefunden." -"Redirect","Umleiten" -"Redirect URL","Weiterleitungs-URL" -"Regular Price:","Regulärer Preis:" -"Related Products","Zubehör" -"Remove","Löschen" -"Remove Product From Websites","Produkt von Websites entfernen" -"Remove This Item","Diesen Gegenstand entfernen" -"Remove attribute from attribute set","Attribut aus dem Attributsatz entfernen" -"Remove attribute set","Attributsatz entfernen" -"Remove custom option","Benutzerdefinierte Option entfernen" -"Remove group from attribute set","Gruppe aus dem Attributsatz entfernen" -"Remove option","Option löschen" -"Remove product assignment","Produktzuweisungen entfernen" -"Remove product image","Produktbild entfernen" -"Remove product link","Produktlink entfernen" -"Remove value from custom option","Wert aus benutzerdefinierter Option löschen" -"Rename existing group","Existierende Gruppe umbenennen" -"Rename group","Gruppe umbenennen" -"Reorganize EAV category structure to flat structure","EAV Kategorie-Struktur in Flat-Struktur umwandeln" -"Reorganize EAV product structure to flat structure","EAV Produkt-Struktur in Flat-Struktur umwandeln" -"Reset","Zurücksetzen" -"Results","Ergebnisse" -"Results per page","Ergebnisse pro Seite" -"Retrieve attribute data","Merkmalsdaten abfragen" -"Retrieve attribute list","Attributliste abrufen" -"Retrieve attribute options","Optionen für Attribute abrufen" -"Retrieve categories tree","Kategorien abfragen" -"Retrieve category attributes","Kategorieattribute abrufen" -"Retrieve category data","Kategoriedaten abrufen" -"Retrieve hierarchical tree","Hierarchischen Baum abrufen" -"Retrieve linked products","Verknüpfte Produkte abrufen" -"Retrieve list of assigned products","Liste mit zugewiesenen Produkten abrufen" -"Retrieve list of option values","Liste mit Optionswerten abrufen" -"Retrieve list of product custom options","Liste der benutzerdefinierten Produktoptionen abrufen" -"Retrieve one level of categories by website/store view/parent category","Eine Ebene von Kategorien pro Website/StoreView/Überkategorie abrufen" -"Retrieve option value info","Optionswert-Informationen abrufen" -"Retrieve product","Produkt abrufen" -"Retrieve product attribute sets","Produktmerkmale abfragen" -"Retrieve product image","Produktbild abrufen" -"Retrieve product image list","Liste der Produktbilder abfragen" -"Retrieve product image types","Produktbildtypen abrufen" -"Retrieve product link type attributes","Attribute des Produktlinktyps abrufen" -"Retrieve product link types","Produktlinktypen abrufen" -"Retrieve product tier prices","Produktstaffelpreise abrufen" -"Retrieve product types","Produkttypen abrufen" -"Retrieve products data","Produktdaten abfragen" -"Retrieve products list by filters","Produktliste gemäß Filter abrufen" -"Reviews","Bewertungen" -"Roll Over for preview","Darüber scrollen für eine Vorschau" -"Root","Root" -"SKU","Artikelposition" -"SKU length should be %s characters maximum.","Die SKU-Länge sollte maximal %s Zeichen betragen" -"Save","speichern" -"Save Attribute","Eigenschaft speichern" -"Save Attribute Set","Merkmale speichern" -"Save Category","Kategorie speichern" -"Save Search","Suche speichern" -"Save and Continue Edit","Speichern und Bearbeitung fortsetzen" -"Saved %d record(s)","%d gespeicherte(r) Eintrag/Einträge" -"Scope","Umfang" -"Scope must not be changed, because the attribute is used in configurable products.","Der Umfang darf nicht geändert werden, da dieses Attribut bei konfigurierbaren Produkten verwendet wird." -"Search","Suche" -"Search Engine Optimizations","Suchmaschinen Optimierung" -"Search Information","Suchinformationen" -"Search Query","Suchanfrage" -"Search Term with such search query already exists.","Suchbegriff mit dieser Suchanfrage existiert bereits." -"Search Weight","Gewicht durchsuchen" -"Searchable","Suchbar" -"See price before order confirmation.","Preis vor Bestellbestätigung ansehen." -"Select Category...","Kategorie auswählen…" -"Select Configurable Attributes ","Konfigurierbare Merkmale auswählen" -"Select Product...","Produkt aussuchen…" -"Select type of option","Optionsart auswählen" -"Select type options required values rows.","Typenoptionen für benötigte Wertezeilen auswählen." -"Selected Product Types","Ausgewählte Produkttypen" -"Send Count","Zählerstand senden" -"Set Ascending Direction","Aufsteigende Sortierung einstellen" -"Set Descending Direction","In absteigender Reihenfolge" -"Set Name","Name einstellen" -"Set Root Category for Store","Rootkategorie für Store festlegen" -"Set root category for this store in the configuration","Stellen Sie eine Stammkategorie für diesen Shop in der Konfiguration ein." -"Set special price","Sonderpreis festlegen" -"Set/Get current store view","Aktuelle Shopansicht auswählen/anfordern" -"Settings","Einstellungen" -"Share Facebook","Facebook teilen" -"Share on Facebook","Auf Facebook teilen" -"Share on Twitter","Auf Twitter teilen" -"Shop By","Shop nach" -"Shopping Options","Einkaufsoptionen" -"Show","Anzeigen" -"Show Details","Details anzeigen" -"Show Tags","Schlagworte anzeigen" -"Simple Product","Einfaches Produkt" -"Site Map","Sitemap" -"Sitemap","Sitemap" -"Skip import row, is not valid value ""%s"" for field ""%s""","Import-Zeile überspringen, kein gültiger Wert ""%s"" für Feld ""%s""" -"Skip import row, required field ""%s"" for the new customer is not defined.","Import der Reihe übersprungen. Das benötigte Feld ""%s"" für den neuen Kunden ist nicht definiert." -"Skip import row, the value ""%s"" is invalid for field ""%s""","Import-Zeile überspringen, der Wert ""%s"" ist für Feld ""%s"" nicht gültig" -"Skipping import row, required field ""%s"" for new products is not defined.","Importzeile übersprungen, das benötigte Feld ""%s"" für neue Produkte ist nicht definiert" -"Skipping import row, required field ""%s"" is not defined.","Import der Reihe wird jetzt übersprungen. Das benötigte Feld ""%s"" ist nicht definiert." -"Skipping import row, store ""%s"" field does not exist.","Import-Zeile wird übersprungen, ""%s"" Feld als nicht vorhanden speichern" -"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Import der Reihe übersprungen. Der Wert ""%s"" ist nicht gültig für das Feld ""%s""." -"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Für einige der verarbeiteten Produkte wurde kein SKU-Wert angegeben. Bitte geben Sie diese an, bevor Sie diese Produkte weiter bearbeiten." -"Some of the selected item options are not currently available.","Einige ausgewählte Elementoptionen sind zurzeit nicht verfügbar." -"Sort By","Sortieren nach" -"Sort Order","Sortierfolge" -"Source Model","Source-Modell" -"Special Expires On: %s","Angebot läuft ab am: %s" -"Special Price:","Sonderpreis:" -"Special Price: %s","Sonderpreis: %s" -"Starting at:","Ab:" -"Static","Statisch" -"Static block and products","Statischer Block und Produkte" -"Static block only","Nur statischer Block" -"Status","Status" -"Stock Availability","Lagerbestand" -"Store","Shop" -"Store View","Store-Ansicht" -"Stretch","Dehnen" -"Subscribe to RSS Feed","Für RSS Feed anmelden" -"Super product attributes configuration","Überprodukt Attributkonfiguration" -"Synonym For","Synonym für" -"System Properties","Systemeinstellungen" -"Tag Name","Tagname" -"Tax","Steuer" -"Template","Vorlage" -"Text","Text" -"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","Der Wohnungskatalog lässt sich nur nach %2\$d Eigenschaften durchsuchen oder sortieren. Im Moment sind aber %1\$d angegeben. Für die Verwendung dieses Moduls verringern sie bitte die Anzahl der Filter-/Sortiereigenschaften." -"The From Date value should be less than or equal to the To Date value.","Der ""von Datum""-Wert sollte kleiner oder gleich dem ""bis Datum""-Wert sein." -"The attribute code \'%s\' is reserved by system. Please try another attribute code","Der Attributcode \'%s\' wurde vom System reserviert. Bitte probieren Sie einen anderen Attributcode aus." -"The attribute model is not defined","Das Attributmuster ist nicht definiert" -"The attribute set has been saved.","Die Merkmale wurden gespeichert" -"The base directory to upload file is not specified.","Das Basisverzeichnis, in das die Datei hochgeladen werden soll, wurde nicht angegeben." -"The category has been deleted.","Die Kategorie wurde gelöscht." -"The category has been saved.","Die Kategorie wurde gespeichert." -"The comparison list was cleared.","Die Vergleichsliste wurde geleert." -"The file '%s' for '%s' has an invalid extension","Die Datei '%s' für '%s' hat eine unerlaubte Dateiendung" -"The file '%s' you uploaded is larger than %s Megabytes allowed by server","Die von Ihnen hochgeladene Datei '%s' ist größer als die vom Server erlaubten %s Megabyte" -"The file you uploaded is larger than %s Megabytes allowed by server","Die Datei, die Sie hochladen möchten, ist größer als die vom Server erlaubten %s Megabytes." -"The filters must be an array.","Die Filter müssen als Array vorliegen." -"The image contents is not valid base64 data.","Die Bildinhalte sind keine gültigen Base64-Daten." -"The image is not specified.","Das Bild ist nicht angegeben." -"The model collection resource name is not defined.","Der Ressourcenname der Modellsammlung ist nicht definiert." -"The product %s has been added to comparison list.","Das Produkt %s wurde zur Vergleichsliste hinzugefügt." -"The product %s has been removed from comparison list.","Das Produkt %s wurde von Vergleichsliste entfernt." -"The product attribute has been deleted.","Das Produktattribut wurde gelöscht." -"The product attribute has been saved.","Das Produktattribut wurde gespeichert." -"The product has been created.","Das Produkt wurde angelegt." -"The product has been deleted.","Das Produkt wurde gelöscht." -"The product has been duplicated.","Das Produkt wurde dupliziert." -"The product has been saved.","Das Produkt wurde gespeichert." -"The product has required options","Das Produkt hat Pflichtangaben" -"The review has been deleted","Diese Bewertung wurde gelöscht" -"The review has been saved.","Diese Bewertung wrude gespeichert." -"The review was removed by another user or does not exist.","Diese Bewertung wurde von einem anderen Benutzer entfernt oder existiert nicht." -"The search was deleted.","Diese Suche wurde gelöscht." -"The text is too long","Der Text ist zu lang" -"There are no %s available.","Es sind keine %s verfügbar." -"There are no customers for this alert","Es gibt keine Kunden für diesen Wanhinweis" -"There are no customers for this alert.","Es gibt keine Kunden für diesen Wanhinweis." -"There are no products matching the selection.","Es gibt keine Produkte, die dieser Auswahl entsprechen." -"There was an error while request processing.","Bei der Bearbeitung der Anfrage ist ein Fehler aufgetreten." -"This Attribute no longer exists","Dieses Merkmal existiert nicht mehr" -"This attribute cannot be deleted.","Diese Eigenschaft kann nicht gelöscht werden." -"This attribute cannot be edited.","Dieses Merkmal kann nicht bearbeitet werden." -"This attribute cannot be updated.","Diese Eigenschaft kann nicht aktualisiert werden." -"This attribute is used in configurable products.","Das Attribut wurde in konfigurierbaren Produkten verwendet." -"This attribute is used in configurable products. You cannot remove it from the attribute set.","Diese Eigenschaft wird für konfigurierbare Produkte benötigt. Sie können sie nicht aus dem Eigenschaftenset entfernen." -"This attribute no longer exists","Dieses Attribut existiert nicht mehr." -"This attribute set no longer exists.","Dieses Eigenschaftenset existiert nicht mehr." -"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","Diese Gruppe enthält Eigenschaften, die für konfigurierbare Produkte benutzt werden. Bitte verschieben Sie diese Eigenschaften in eine andere Gruppe und versuchen Sie es noch einmal." -"This group contains system attributes. Please move system attributes to another group and try again.","Diese Gruppe enthält System Eigenschaften. Bitte verschieben Sie System Eigenschaften in eine andere Gruppe und versuchen Sie es noch einmal." -"This is a required option","Dies ist eine obligatorische Option" -"This product no longer exists.","Dieses Produkt existiert nicht mehr." -"This search no longer exists.","Diese Suche existiert nicht mehr." -"This setting will be applied when all prices in the specific price interval are equal.","Diese Einstellung wird angewandt, wenn alle Preise in dem spezifischen Preisintervall gleich sind." -"Tier Pricing","Preisebene" -"Tile","Kachel" -"Time Format","Zeitformat" -"Title","Titel" -"To reindex the enabled product(s), the store or product must be specified","Um die aktivierten Produkte neu zu indexieren, muss der Shop oder das Produkt angegeben werden." -"To see product price, add this item to your cart. You can always remove it later.","Um den Produktpreis sehen zu können, müssen Sie das Produkt in Ihren Einkaufswagen legen. Sie können es später wieder löschen." -"Top/Left","Oben links" -"Top/Right","Oben/Rechts" -"Total Qty Base Items","Gesamtanzahl der Produkte bei Google Base" -"Total Qty Content Items","Gesamtmenge der Content-Artikel" -"Total incl. Tax: %1$s","Gesamtsumme inkl. Steuern: %1$s" -"Total of %d record(s) have been deleted.","Insgesamt %d Einträge wurden gelöscht." -"Total of %d record(s) have been updated.","Insgesamt %d Einträge wurden aktualisiert." -"Total of %d record(s) were updated","Insgeamt wurde(n) %d Aufzeichnung(en) aktualisiert" -"Type","Typ" -"URL Rewrite Management","URL Umformulierungsverwaltung" -"Unable to complete this request.","Anfrage konnte nicht ausgeführt werden." -"Unable to find a search term to delete.","Es wurde kein Suchbegriff zum Löschen gefunden." -"Unable to find an attribute to delete.","Es wurde kein Attribut zum Löschen gefunden." -"Unable to get the product ID.","Produktnummer konnte nicht ermittelt werden." -"Unassigned Attributes","Nicht zugewiesene Attribute" -"Unknown EAV indexer type ""%s"".","Unbekannter EAV Indizierungstyp ""%s""." -"Unknown attribute: %s.","Unbekanntes Attribut: %s." -"Unsupported product type ""%s"".","Nicht unterstützter Produkttyp ""%s""." -"Up-sells","Up-Selling" -"Update","Aktualisieren" -"Update Attributes","Merkmale aktualisieren" -"Update Tier Price","Staffelpreise aktualisieren" -"Update assigned product","Zugewiesenes Produkt aktualisieren" -"Update attribute","Attribut aktualisieren" -"Update attributes","Attribute aktualisiert" -"Update category","Kategorie aktualisieren" -"Update custom option of product","Benutzerdefinierte Option des Produkts überspringen" -"Update product","Produkt aktualisieren" -"Update product image","Produktbild aktualisieren" -"Update product link","Produktlink aktualisieren" -"Update product tier prices","Produktstaffelpreise aktualisieren" -"Update value of custom option","Wert der benutzerdefinierten Option aktualisieren" -"Upload new product image ","Neues Produktbild hochladen" -"Use Canonical Link Meta Tag For Categories","Canonical Link Element für Kategorien verwenden" -"Use Canonical Link Meta Tag For Products","Canonical Link Meta Tag für Produkte nutzen" -"Use Categories Path for Product URLs","Kategoriepfad für Produkt-URLs verwenden" -"Use Config Settings","Konfigurations-Einstellungen verwenden" -"Use Default Value","Standardwert verwenden" -"Use Flat Catalog Category","Flat Catalog Category verwenden" -"Use Flat Catalog Product","Flat Catalog Product verwenden" -"Use In Layered Navigation","Filternavigation auf Suchergebnisseiten verwenden" -"Use In Search Results Layered Navigation","Navigation in Suchergebnissen nutzen" -"Use JavaScript Calendar","JavaScript Kalender verwenden" -"Use Static URLs for Media Content in WYSIWYG for Catalog","Statische URLs für Medieninhalt in WYSIWYG für Katalog nutzen" -"Use To Create Configurable Product","Verwenden um konfigurierbares Produkt zu erstellen" -"Use Tree Like Category Sitemap","Kategorie-Sitemap in Baumansicht verwenden" -"Use config","config verwenden" -"Use default","Standard verwenden" -"Use for Promo Rule Conditions","Für Promo Regelbedingungen verwenden" -"Use four-digit year format.","Das 4-stellige Jahresformat verwenden." -"Use in Advanced Search","In erweiterter Suche verwenden" -"Use in Layered Navigation","In mehrschichtiger Navigation verwenden" -"Use in Layered Navigation
    (Can be used only with catalog input type 'Dropdown')","In Filter-Navigation verwenden
    (Kann nur mit 'Dropdown' verwendet werden)" -"Use in Quick Search","Bei Schnellsuche nutzen" -"Used for Sorting in Product Listing","Für Sortierung im Produkt-Listing verwendet" -"Used in Product Listing","Im Produkt-Listing verwendet" -"Value for ""%s"" is invalid.","Wert für ""%s"" ist ungültig." -"Value for ""%s"" is invalid: %s","Wert für ""%s"" ist ungültig: %s" -"Varchar","Varchar" -"View Details","Details anzeigen" -"View as","Darstellung als" -"Virtual Product","Virtuelles Produkt" -"Visibility","Sichtbarkeit" -"Visible","Sichtbar" -"Visible on Catalog Pages on Front-end","Sichtbar auf Katalogseiten im Frontend" -"Visible on Product View Page on Front-end","Sichtbar auf Produkt-Infoseite im Frontend" -"WYSIWYG Editor","WYSIWYG Editor" -"Watermark","Wasserzeichen" -"Watermark Default Size","Wasserzeichen Standardgröße" -"Watermark Opacity, Percent","Wasserzeichen Opazität, Prozent" -"Watermark Position","Wasserzeichen Position" -"We Also Recommend","Wir empfehlen auch" -"Website","Website" -"Website Item Must be checked","Website Artikel muss geprüft sein" -"Website Store Must be checked","Shop der Webseite muss geprüft werden" -"Websites","Webseiten" -"What's this?","Was ist das?" -"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Ob die ""Alle""-Option in dem ""Zeige X pro Seite""-Dropdown-Menü angezeigt werden soll." -"Will make search for the query above return results for this search.","Werde für die obenstehende Frage eine Suche starten und die Suchergebnisse mitteilen." -"Wrong BuyRequest instance in options group.","Falsche Kauf-Anfrage der Instanz in der Options-Gruppe." -"Wrong configuration item instance in options group.","Falsches Konfigurationselement Beispiel in Gruppe Optionen." -"Wrong configuration item option instance in options group.","Falsches Konfigurationselement Optionsbeispiel in Gruppe Optionen." -"Wrong option instance type in options group.","Falscher Optionsinstanz-Typ in der Options-Gruppe." -"Wrong option type to get group instance.","Falscher Options-Typ um die Gruppen-Instanz zu erhalten." -"Wrong product instance type in options group.","Falsches Produktbeispiel in Optionengruppe." -"Wrong product type filter specified","Falscher Produkttyp Filter festgelegt" -"Wrong product type to extract configurable options.","Falscher Produkt-Typ, um konfigurierbare Optionen zu extrahieren." -"Year Range","Jahres-Zeitraum" -"Yes","Ja" -"You cannot remove system attribute from this set.","Dieses Systemattribut kann aus dieser Gruppe nicht entfernt werden." -"You have no items to compare.","Sie haben keine Gegenstände zum Vergleich." -"You may also be interested in the following product(s)","Sie könnten auch an folgenden Produkten interessiert sein" -"Zoom In","Vergrößern" -"Zoom Out","Verkleinern" -"and","und" -"and above","und oben" -"categories","Kategorien" -"each","jede" -"ex. http://domain.com","z.B. http://domain.com" -"leave blank if its not an image","Leer lassen falls es kein Bild ist" -"per page","pro Seite" -"products","Produkte" -"px.","px." -"save","Speichern" -"select all","Alles auswählen" -"unselect all","Alles abwählen" -"x","x" diff --git a/app/locale/de_DE/Mage_CatalogInventory.csv b/app/locale/de_DE/Mage_CatalogInventory.csv deleted file mode 100644 index ec63afbde..000000000 --- a/app/locale/de_DE/Mage_CatalogInventory.csv +++ /dev/null @@ -1,62 +0,0 @@ -"""%s"" is not available in the requested quantity. %s of the items will be backordered.","""%s"" ist nicht in der gewünschten Menge verfügbar. %s der Artikel werden nachbestellt." -"%s is available for purchase in increments of %s only.","%s ist nur in Schritten von%s erhältlich." -"%s is not a correct comparsion method.","%s ist keine korrekte Vergleichsmethode." -"Note that these settings are applicable to cart line items, not the whole cart.","Beachten Sie, dass diese Einstellungen für Warenkorbartikel gelten und nicht für den gesamten Warenkorb." -"Add Minimum Qty","Mindestanzahl hinzufügen" -"Allow Qty Below 0","Anzahl unter 0 erlauben" -"Allow Qty Below 0 and Notify Customer","Anzahl unter 0 erlauben und Kunden benachrichtigen" -"Automatically Return Credit Memo Item to Stock","Gutschriftartikel automatisch zum Lager retournieren" -"Backorders","Lieferückstand" -"By Fixed value","Nach festen Wert" -"By Percentage","Nach Prozent" -"Cannot specify product identifier for the order item.","Produktidentifier für den Artikel kann nicht spezifiziert werden." -"Catalog Inventory","Kataloginventar" -"Decrease Stock When Order is Placed","Lagerbestand verringern wenn Bestellung erfolgt ist" -"Display Out of Stock Products","Ausverkaufte Produkte anzeigen" -"Display products availability in stock in the frontend","Lagerbestand des Produktes im Front-End anzeigen" -"Enable Qty Increments","Anzahlzunahme aktivieren" -"In Stock","Auf Lager" -"Index Product Stock Status","Index Produkt Lagerstatus" -"Inventory","Inventar" -"Inventory API","Inventar API" -"Inventory Section","Invetarbereich" -"Manage Stock","Lagerbestand verwalten" -"Maximum Qty Allowed in Shopping Cart","Maximal im Warenkorb erlaubte Anzahl" -"Minimum Qty","Mindestanzahl" -"Minimum Qty Allowed in Shopping Cart","Im Warenkorb erlaubte Mindestanzahl" -"Multi update product stock data","Multiple Aktualisierung der Produktbestand-Daten" -"No Backorders","Kein Lieferrückstand" -"Not all products are available in the requested quantity","Nicht alle Produkte sind in der gewünschten Menge verfügbar" -"Notify for Quantity Below","Bei unterer Anzahl benachrichtigen." -"Only %s left","Nur %s verbleibend" -"Only X left Threshold","Nur X übrig Schwellenwert" -"Out of Stock","Nicht auf Lager" -"Product Name","Produktname" -"Product Stock Options","Produktlageroptionen" -"Products will still be shown by direct product URLs.","Die Produkte werden immer noch über direkte Produkt-URLs gezeigt." -"Qty","Anz" -"Qty Increments","Mengenzunahme" -"Qty for Item's Status to Become Out of Stock","Menge für Artikel Status Ausverkauft" -"Retrieve stock data","Lagerdaten abfragen." -"Retrieve stock data by product ids","Lagerdaten nach ProduktID abfragen" -"Rule price","Regeilpreis" -"Set Items' Status to be In Stock When Order is Cancelled","Artikelstatus auf Lagernd Wenn Bestellung Storniert Wird setzen" -"Some of the products are currently out of stock.","Einige der Produkte sind momentan nicht vorrätig." -"Some of the products cannot be ordered in requested quantity.","Einige Produkte können nicht in der gewünschten Menge bestellt werden." -"Some of the products cannot be ordered in the requested quantity.","Einige der Produkte können nicht in der erwünschten Menge bestellt werden." -"Stock Options","Lageroptionen" -"Stock Status","Lagerstatus" -"The maximum quantity allowed for purchase is %s.","Die Höchstmenge zum Kauf beträgt %s." -"The minimum quantity allowed for purchase is %s.","Die Mindestmenge für den Kauf beträgt %s." -"The requested quantity for ""%s"" is not available.","Die gewünschte Menge für ""%s"" ist nicht verfügbar." -"The stock item for Product in option is not valid.","Der Lagerartikel für das Produkt in Option ist nicht gültig." -"The stock item for Product is not valid.","Der Lagerartikel für das Produkt ist nicht gültig." -"This product is available for purchase in increments of %s only.","Dieses Produkt ist nur in Erhöhungen von %s verfügbar." -"This product is currently out of stock.","Dieses Produkt ist derzeit ausverkauft." -"This product is not available in the requested quantity. %s of the items will be backordered.","Dieses Produkt ist nicht in der gewünschten Menge verfügbar. %s der Artikel werden nachbestellt." -"To Fixed Value","Zu festen Wert" -"To Percentage","Zu Prozent" -"Undefined product type.","Undefinierter Produkttyp." -"Update","Aktualisieren" -"Update product stock data","Produkt Lagerdaten aktualisieren" -"Update the Product","Produkt aktualisieren" diff --git a/app/locale/de_DE/Mage_CatalogRule.csv b/app/locale/de_DE/Mage_CatalogRule.csv deleted file mode 100644 index 06973cdd5..000000000 --- a/app/locale/de_DE/Mage_CatalogRule.csv +++ /dev/null @@ -1,64 +0,0 @@ -"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","Auf Attribut ""%s"" basierende %d-Katalogpreisregeln wurden deaktiviert." -"Actions","Aktionen" -"Active","Aktiv" -"Add New Rule","Neue Regel hinzufügen" -"An error occurred while deleting the rule. Please review the log and try again.","Beim Löschen der Regel trat ein Fehler auf. Bitte überprüfen Sie das Log und versuchen Sie es erneut." -"An error occurred while saving the rule data. Please review the log and try again.","Beim Speichern der Regeldaten trat ein Fehler auf. Bitte überprüfen Sie das Log und versuchen Sie es erneut." -"Apply","Anwenden" -"Apply Rules","Regeln anwenden" -"Attribute Set","Attributset" -"By Fixed Amount","Durch festen Betrag" -"By Percentage of the Original Price","Durch Prozentsatz des Orginalpreises" -"Catalog","Katalog" -"Catalog Price Rule","Katalogpreis Regel" -"Catalog Price Rules","Katalogpreis Regeln" -"Category","Kategorie" -"Conditions","Bedingungen" -"Conditions (leave blank for all products)","Bedingungen (leer lassen für Alle Produkte)" -"Conditions Combination","Bedingungenkombination" -"Customer Groups","Kundengruppen" -"Date Expire","Verfalldatum" -"Date From","Datum ab" -"Date Start","Startdatum" -"Date To","Datum bis" -"Description","Beschreibung" -"Discount Amount","Rabattsumme" -"Edit Rule","Regel ändern" -"Edit Rule '%s'","Regel '%s' ändern" -"Enable Discount to Subproducts","Rabatt für Unterprodukte aktivieren" -"Expiration Date","Ablaufdatum" -"From Date","Von Datum" -"General Information","Allgemeine Information" -"ID","ID" -"Inactive","Nicht aktiv" -"New Rule","Neue Regel" -"No","Nein" -"Options","Optionen" -"Priority","Priorität" -"Product Attribute","Produktattribut" -"Promotions","Promotionen" -"Rule Information","Regelinformation" -"Rule Name","Regelname" -"Save and Apply","Speichern und anwenden" -"Save and Continue Edit","Speichern und Bearbeitung fortsetzen" -"Start Date","Startdatum" -"Status","Status" -"Stop Further Rules Processing","Weitere Regelbearbeitung abbrechen" -"The rule has been deleted.","Die Regel wurde gelöscht." -"The rule has been saved.","Die Regel wurde gespeichert." -"The rules have been applied.","Die Regeln wurden angewendet." -"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","Dies sind Regeln, welche geändert aber noch nicht eingesetzt wurden. Nur Benutzer mit exklusiven Zugang können diese Regeln anwenden." -"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Einige Regeln wurden geändert, aber nicht angewendet. Bitte klicken Sie „Regeln anwenden“ um sofortige Anwendung im Katalog zu erhalten." -"This rule no longer exists.","Diese Regel existiert nicht mehr." -"To Date","Bis Datum" -"To Fixed Amount","Zu festem Betrag" -"To Percentage of the Original Price","Zu Prozentsatz des Originalpreises" -"Type","Typ" -"Unable to apply rules.","Regeln können nicht angewendet werden." -"Unable to find a rule to delete.","Keine Regel zum Löschen gefunden." -"Update Prices Using the Following Information","Preise mit folgenden Informationen aktualisieren" -"Update product's %s %s: %s","%s %s: %s von Produkt aktualisieren" -"Website","Webseite" -"Websites","Webseiten" -"Wrong rule specified.","Falsche Regel angegeben." -"Yes","Ja" diff --git a/app/locale/de_DE/Mage_CatalogSearch.csv b/app/locale/de_DE/Mage_CatalogSearch.csv deleted file mode 100644 index 09279b9bf..000000000 --- a/app/locale/de_DE/Mage_CatalogSearch.csv +++ /dev/null @@ -1,49 +0,0 @@ -"%s and greater","%s und darüber" -"%d item(s) were found using the following search criteria","%d Artikel wurden unter Verwendung der folgenden Suchkriterien gefunden" -"Advanced Search","Erweiterte Suche" -"Advanced Search Form","Formular Erweiterte Suche" -"Advanced Search Result","Erweiterte Suche Ergebnisse" -"All","Alle" -"Applies for ""Like"" search type only.","Gilt nur für ""Like""-Suchtyp." -"Apply Layered Navigation if Search Results are Less Than","Geschichtete Navigation verwenden falls weniger Suchergebnisse als" -"Attribute setting change related with Search Index. Please run Rebuild Search Index process.","Attribut-Einstellungsänderung mit Bezug auf Suchindex. Bitte Rebuild-Suchindex-Prozess starten." -"Autogenerated Site Map","Automatisch generierte Site Map" -"Catalog Advanced Search","Katalog Erweiterte Suche" -"Catalog Search","Katalog Suche" -"Catalog Search Index","Katalog Suchindex" -"Don't see what you're looking for?","Nicht gefunden, was Sie suchen?" -"Enter ""0"" to enable layered navigation for any number of results.","Um Ebenennavigation für eine beliebige Anzahl von Ergebnissen zu aktivieren bitte ""0"" eingeben." -"Go","Los" -"Go to Home Page","Zur Startseite gehen" -"Grid","Raster" -"Home","Startseite" -"List","Liste" -"Maximum Query Length","Maximale Abfragenlänge" -"Maximum Query Words Count","Maximale Wortanzahl für Abfragen" -"Maximum Search query length is %s. Your query was cut.","Maximale Suchanfragenlänge ist %s. Ihre Anfrage wurde gekürzt." -"Maximum words count is %1$s. In your search query was cut next part: %2$s.","Die maximale Zahl an Wörtern beträgt %1$s. Ihre Suchanfrage wurde bei %2$s abgeschnitten." -"Minimal Query Length","Mindestlänge für Abfragen" -"Minimum Search query length is %s","Mindestlänge für Suchabfrage ist %s." -"Modify your search","Verändern Sie Ihre Suche" -"No","Nein" -"No items were found using the following search criteria.","Es wurden keine Artikel mit den folgenden Suchkriterien gefunden." -"Please specify at least one search term.","Bitte geben Sie zumindest einen Suchbegriff ein." -"Popular Search Terms","Beliebte Suchbegriffe" -"Quick Search Form","Formular Schnellsuche" -"Rebuild Catalog product fulltext search index","Katalog Produktvolltext Suchindex neu generieren." -"Relevance","Relevanz" -"Results","Ergebnisse" -"Search","Suche" -"Search Settings","Sucheinstellungen" -"Search Terms","Suchbegriffe" -"Search Type","Suchtyp" -"Search entire store here...","Den gesamten Shop durchsuchen..." -"Search results for '%s'","Suchergebnisse für '%s'" -"Search results for: '%s'","Suchergebnisse für: '%s'" -"Search:","Suche:" -"Specified date is invalid.","Angegebene Daten sind ungültig." -"Subscribe to Feed","Feed abonnieren" -"There are no search terms available.","Es sind keine Suchbegriffe verfügbar." -"Yes","Ja" -"Your search returns no results.","Ihre Suche ergab keine Ergebnisse." -"up to %s","bis zu %s." diff --git a/app/locale/de_DE/Mage_Centinel.csv b/app/locale/de_DE/Mage_Centinel.csv deleted file mode 100644 index 853c2dabf..000000000 --- a/app/locale/de_DE/Mage_Centinel.csv +++ /dev/null @@ -1,33 +0,0 @@ -"3D Secure CAVV","3D Secure CAVV" -"3D Secure Card Validation","3D Secure Kartenvalidierung" -"3D Secure Cardholder Validation","3D Secure Karteninhabervalidierung" -"3D Secure Electronic Commerce Indicator","3D Secure Electronic Commerce Indicator" -"3D Secure Verification Result","3D Secure Verifizierungsergebnis" -"3D Secure XID","3D Secure XD" -"Card Issuer Liability","Haftung für Kartenausteller" -"Card Verification","Kartenverifizierung" -"Enrolled","Eingeschrieben" -"Enrolled but Authentication Unavailable","Eingeschrieben, aber Authentifizierung nicht verfügbar" -"Failed","Fehlgeschlagen" -"MasterCard SecureCode","MasterCard SecureCode" -"Merchant Liability","Haftung für Händler" -"Not Enrolled","Nicht eingeschrieben" -"Order cannot be placed.","Bestellung kann nicht durchgeführt werden." -"Payment information error. Please start over.","Fehler bei Zahlungsinformation. Bitte versuchen Sie es erneut." -"Please continue with placing order.","Bitte fahren Sie mit der Bestellung fort." -"Please verify the card with the issuer bank before placing the order.","Bitte verifizieren Sie die Karte mit der Ausstellerbank bevor Sie die Bestellung durchführen." -"Please verify the card with the issuer bank:","Bitte verifizieren Sie die Karte mit der Ausstellerbank:" -"Start/Reset Validation...","Validierung starten/zurücksetzen..." -"Successful","Erfolgreich" -"Successful attempt","Erfolgreicher Versuch" -"The card has failed verification with the issuer bank.","Die Karte konnte nicht mit der Ausstellerbank verifiziert werden." -"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Es wurden falsche Zahlungsinformationen abgeschickt, oder das Zeitlimit ist abgelaufen. Bitte versuchen Sie es erneut." -"There has been wrong payment information submitted or time limit has expired. Please, try again.","Es wurden falsche Zahlungsinformationen abgeschickt, oder Zeitlimit ist abgelaufen. Bitte versuchen Sie es erneut." -"This card has failed validation and cannot be used.","Diese Karte konnte nicht validiert werden und kann nicht benützt werden." -"To ensure the security of your transactions","Um die Sicherheit ihrer Transaktionen zu gewährleisten" -"Unable to complete","Fertigstellung nicht möglich" -"Validation failed.","Validierung ist fehlgeschlagen." -"Verification Failed","Verifizierung fehlgeschlagen" -"Verification Successful","Verifizierung erfolgreich" -"Verification cannot be processed","Verifizierung kann nicht verarbeitet werden" -"Verified by Visa","Verified by Visa" diff --git a/app/locale/de_DE/Mage_Checkout.csv b/app/locale/de_DE/Mage_Checkout.csv deleted file mode 100644 index 448b1e1f7..000000000 --- a/app/locale/de_DE/Mage_Checkout.csv +++ /dev/null @@ -1,360 +0,0 @@ -"%s was added to your shopping cart.","%s wurde zu Ihrem Warenkorb hinzugefügt." -"%s was updated in your shopping cart.","%s wurde in ihren Einkaufswagen gelegt" -"* Required Fields","* Notwendige Felder" -"Add New Address","Neue Adresse hinzufügen" -"Add New Condition","Neue Kondition hinzufügen" -"Add coupon code for shopping cart","Gutscheincode für Einkaufswagen eingeben" -"Add gift messages to shopping cart","Grußmitteilungen für Einkaufswagen eingeben" -"Add product to shopping cart","Weiteren Artikel in den Einkaufswagen legen" -"Add product(s) to shopping cart","Weitere Artikel in den Einkaufswagen legen" -"Add to Cart","Zum Warenkobrn hinzufügen" -"Add to Compare","Hinzufügen um zu vergleichen" -"Add to Wishlist","Zum Wunschzettel hinzufügen" -"Additional Product Info","Zusätzliche Angaben zum Produkt" -"Address","Adresse" -"Address %s of %s","Adresse %s von %s" -"After Adding a Product Redirect to Shopping Cart","Nach Hinzufügen eines Produktes zum Warenkorb weiterleiten" -"Allow Guest Checkout","Gast Checkout erlauben" -"Already registered?","Schon registriert?" -"An error occurred in the process of payment","Beim Prozessieren der Zahlung ist ein Fehler aufgetreten." -"An error occurred while deleting this condition.","Beim Löschen dieser Kondition ist ein Fehler aufgetreten." -"An error occurred while saving this condition.","Beim Speichern dieser Kondition ist ein Fehler aufgetreten." -"Apply","Anwenden" -"Apply Coupon","Coupon anwenden" -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","Sind Sie sicher, dass Sie diese Seite verlassen wollen? Sie müssen wieder die Checkout-Schritte durchlaufen." -"Are you sure you would like to remove this item from the shopping cart?","Sind Sie sicher, dass sie diesen Artikel aus Ihrem Warenkorb entfernen wollen?" -"Back","Zurück" -"Back to Billing Information","Zurück zur Rechnungsinformation" -"Back to Select Addresses","Zurück zur Adressenauswahl" -"Back to Shipping Information","Zurück zur Versandinformation" -"Back to Shopping Cart","Zurück zum Warenkorb" -"Based on your selection, you may be interested in the following items:","Ihrer Auswahl zufolge könnten Sie möglicherweise an folgenden Artikeln interessiert sein:" -"Billing Address","Rechnungsadresse" -"Billing Information","Rechnungsinformation" -"Billing Information - %s","Rechnungsinformation - %s" -"Can not remove the item.","Das Element kann nicht entfernt werden." -"Can not save item.","Element kann nicht gespeichert werden." -"Cancel","Abbrechen" -"Cancel Coupon","Coupon abbrechen" -"Cannot add item to the shopping cart.","Artikel kann nicht zum Warenkorb hinzugefügt werden." -"Cannot add the item to shopping cart","Artikel kann nicht zu Warenkorb hinzugefügt werden" -"Cannot add the item to shopping cart.","Kann das Objekt nicht zum Warenkorb hinzufügen." -"Cannot apply the coupon code.","Coupon Code kann nicht angewendet werden." -"Cannot configure product.","Produkt kann nicht konfiguriert werden." -"Cannot open the overview page","Überblickseite kann nicht geöffnet werden." -"Cannot process the item.","Artikel kann nicht verarbeitet werden." -"Cannot remove the item.","Artikel kann nicht entfernt werden." -"Cannot update shopping cart.","Warenkorb kann nicht aktualisiert werden." -"Cannot update the item.","Artikel kann nicht aktualisiert werden." -"Card Verification Number Visual Reference","Kartenprüfnummer Visueller Hinweis" -"Cart","Warenkorb" -"Cart Product API","Einkaufswagen Produkt-API" -"Cart Subtotal:","Warenkorb Zwischensumme:" -"Change","Ändern" -"Change Billing Address","Rechnungsadresse ändern" -"Checkbox Text","Checkbox Text" -"Checkout","Checkout" -"Checkout Conditions","Checkout Konditionen" -"Checkout Forms Extra","Kassenformen Extra" -"Checkout Method","Checkout Methode" -"Checkout Options","Checkout Optionen" -"Checkout Progress Wrapper","Kasse Fortschrittsanzeige" -"Checkout Section","Checkout Bereich" -"Checkout Terms and Conditions","Checkout allgemeine Geschäftsbedingungen" -"Checkout as Guest","Checkout als Gast" -"Checkout as a Guest or Register","Checkout als Gast oder registrieren" -"Checkout with Multiple Addresses","Checkout mit mutiplen Adressen" -"City","Stadt" -"Clear Shopping Cart","Einkaufswagen leeren" -"Click here to print a copy of your order confirmation.","Klicken sie hier um ihre Bestellbestätigung auszudrucken ." -"Click here to continue shopping.","Hier klicken, um das Einkaufen fortzusetzen." -"Close","Schließen" -"Company","Firma" -"Condition Name","Konditionsname" -"Configurable Product Image","Konfigurierbares Produktbild" -"Configure Cart Item","Artikel im Korb konfigurieren" -"Confirm Password","Passwort bestätigen" -"Content","Inhalt" -"Content Height","Inhalthöhe" -"Content Height (css)","Inhalthöhe (css)" -"Continue","Fortsetzen" -"Continue Shopping","Einkauf fortfahren" -"Continue to Billing Information","Weiter zur Rechnungsinformation" -"Continue to Review Your Order","Weiter zur Bestellungsüberprüfung" -"Continue to Shipping Information","Weiter zur Versandinformation" -"Country","Land" -"Coupon code ""%s"" is not valid.","Der Gutscheincode ""%s"" ist nicht mehr gültig." -"Coupon code ""%s"" was applied.","Der Gutscheincode ""%s"" wurde eingelöst." -"Coupon code was canceled.","Coupon Code """"%s"""" wurde abgebrochen." -"Create Billing Address","Rechnungsadresse erstellen" -"Create Shipping Address","Versandadresse erstellen" -"Create an order from shopping cart","Geben sie eine Bestellung aus ihrem Einkaufswagen auf." -"Create shopping cart","Ihr Einkaufswagen" -"Customer Address is not valid.","Die Kundenadresse ist nicht gültig." -"Customer Information","Kundeninformation" -"Customer's information","Kundeninformation" -"Data saving problem","Problem beim Speichern der Daten" -"Default Billing","Standard Rechnung" -"Default Shipping","Standard Versand" -"Delete Condition","Kondition löschen" -"Details","Details" -"Disabled","Deaktiviert" -"Discount Codes","Rabattcodes" -"Display Cart Summary","Warenkorb Zusammenfassung anzeigen" -"Display Shopping Cart Sidebar","Warenkorb Sidebar anzeigen" -"Display item quantities","Artikelmengen anzeigen" -"Display number of items in cart","Anzahl der Artikel im Warenkorb anzeigen" -"Display number of items in wishlist","Zeige die Menge der Artikel auf der Wunschliste an." -"Easy access to your order history and status","Schneller Zugriff auf Ihre Bestellungshistorie und Status" -"Edit","Bearbeiten" -"Edit Address","Adresse bearbeiten" -"Edit Billing Address","Rechnungsadresse bearbeiten" -"Edit Condition","Konditionen bearbeiten" -"Edit Items","Artikel bearbeiten" -"Edit Shipping Address","Versandadresse bearbeiten" -"Edit Terms and Conditions","Allgemeine Geschäftsbedingungen bearbeiten" -"Edit Your Cart","Ihren Warenkorb bearbeiten" -"Edit item","Artikel ändern" -"Edit item parameters","Artikelangaben ändern" -"Email Address","E-Mail-Adresse" -"Empty Cart","Warenkorb leeren" -"Empty Shopping Cart Content Before","Zuvor Warenkorbinhalt leeren" -"Enable Onepage Checkout","Onepage Checkout aktivieren" -"Enable Terms and Conditions","Allgemeine Geschäftsbedingungen aktivieren" -"Enabled","Aktiviert" -"Enter a New Address","Neue Adresse eingeben" -"Enter your coupon code if you have one.","Geben Sie Ihren Coupon Code ein, falls Sie einen haben." -"Enter your destination to get a shipping estimate.","Geben Sie Ihren Standort an, um die geschätzten Versandkosten/dauer zu ermitteln." -"Estimate","Schätzung" -"Estimate Shipping and Tax","Geschätzte Versandkosten und Steuern" -"Excl. Tax","Steuer weglassen" -"Fast and easy check out","Schnell und einfaches Checkout" -"Fax","Fax" -"Forgot an Item?","Sie haben einen Artikel vergessen?" -"Forgot your password?","Sie haben Ihr Passwort vergessen?" -"Get a Quote","Eine Preisangabe bekommen" -"Get list of available payment methods","Liste der verfügbaren Zahlungsarten" -"Get list of available shipping methods","Liste der verfügbaren Versandarten" -"Get list of products in shopping cart","Liste der Produkte im Warenkorb anzeigen" -"Get terms and conditions","Allgemeine Geschäftsbedingungen anzeigen" -"Get total prices for shopping cart","Gesamtpreis für Warenkorb anzeigen" -"Gift Message","Grußnachricht" -"Grand Total:","Gesamtbetrag:" -"Grouped Product Image","Gruppiertes Produktbild" -"HTML","HTML" -"ID","ID" -"Incl. Tax","Steuer inkludieren" -"Invalid checkout type.","Ungültiger Kassenbereich-Typ" -"Invalid data.","Ungültige Daten." -"Invalid email address ""%s""","Ungültige E-Mail-Adresse ""%s""" -"Invalid method: %s","Ungültige Methode: %s" -"Invalid shipping method.","Ungültige Versandart." -"Item not found or already ordered","Artikel nicht gefunden oder schon bestellt" -"Item was removed successfully.","Element wurde erfolgreich entfernt." -"Item was updated successfully.","Element wurde erfolgreich aktualisiert." -"Items","Artikel" -"Items After","Artikel danach" -"Items Before","Artikel davor" -"Load customer quote error","Fehler bei Kundenpreisangabe laden" -"Loading next step...","Nächster Schritt wird geladen ..." -"Login","Einloggen" -"Login/Registration Before","Anmeldung/ Registrierung davor" -"Manage Terms and Conditions","Allgemeine Geschäftsbedingungen verwalten" -"Maximum Display Recently Added Item(s)","Maximalanzeige kürzlich hinzugefügter Artikel" -"Maximum qty allowed for Shipping to multiple addresses is %s","Maximale Menge für Lieferung an mehrfache Adressen ist %s" -"Mini-cart promotion block","Promotionblock Mini-Warenkorb" -"Minimum order amount is %s","Mindestbestellwert ist %s" -"Move","Verschieben" -"Move to Wishlist","Auf Wunschzettel schreiben" -"Move to wishlist","Auf den Wunschzettel verschieben" -"Multishipping Checkout","Mehrfachlieferung Kasse" -"Multishipping Checkout Address (Any) Form","Mehrfachlieferung Kasse Adresse (Beliebiges) Formular" -"Multishipping Checkout Billing Address Creation","Mehrfachlieferung Kasse Rechnungsadresse Erstellung" -"Multishipping Checkout Billing Address Edit Form","Mehrfachlieferung Kasse Rechnungsadresse Formular bearbeiten" -"Multishipping Checkout Billing Address Selection","Mehrfachlieferung Kasse Rechnungsadresse Auswahl" -"Multishipping Checkout Billing Information Step","Mehrfachlieferung Kasse Rechnungsinformation Schritt" -"Multishipping Checkout Customer Address Edit Form","Mehrfachlieferung Kasse Kundenadresse Formular bearbeiten" -"Multishipping Checkout Overview","Mehrfachlieferung Kasse Übesicht" -"Multishipping Checkout Shipping Address Creation","Mehrfachlieferung Kasse Rechnungsadresse Erstellung" -"Multishipping Checkout Shipping Address Edit Form","Mehrfachlieferung Kasse Lieferadresse Formular bearbeiten" -"Multishipping Checkout Shipping Address Selection","Mehrfachlieferung Kasse Lieferadresse Auswahl" -"Multishipping Checkout Shipping Information Step","Mehrfachlieferung Kasse Lieferinformation Schritt" -"Multishipping Checkout Success","Mehrfachlieferung Kasse Erfolg" -"My Cart","Mein Einkaufswagen" -"My Cart (%s item)","Mein Einkaufswagen (%s Artikel)" -"My Cart (%s items)","Mein Einkaufswagen (%s Artikel)" -"My Cart Extra Actions","Mein Einkaufskorb Extra-Aktionen" -"My Cart Link","Link zu meinem Einkaufswagen" -"New Address","Neue Adresse" -"New Condition","Neuer Bedingung" -"New Terms and Conditions","Neue allgemeine Geschäftsbedingungen" -"No Payment Methods","Keine Zahlungsmethoden" -"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","GESAMTSUMME WIRD VOR ABSENDEN DER BESTELLUNG ANGEZEIGT" -"One Page Checkout","Eine Seite Kasse" -"One Page Checkout Failure","Eine Seite Fehler bei Kassenausgang" -"One Page Checkout Overview","Checkout-Übersicht auf einer Seite" -"One Page Checkout Success","Eine Seite Erfolg bei Kassenausgang" -"One item of products do not have identifier or sku","Ein Artikel Ihrer Produkte hat keine Kennung oder keine SKU-Nummer" -"One item of products is not belong any of quote item","Ein Artikel Ihrer Produkte gehört nicht zu den angebotenen Artikeln" -"Order #","Bestellung #" -"Order Review","Bestellungsübersicht" -"Order Success","Bestellung mit Erfolg" -"Order place error.","Falscher Bestellungsort." -"Other Items in Your Order","Andere Artikel in Ihrer Bestellung" -"Overview Items After","Überblick Artikel danach" -"Password","Passwort" -"Payment Failed Email Reciever","E-Mail-Adresse für fehlgeschlagene Bezahlung" -"Payment Failed Email Sender","Zahlung fehlgeschlagen E-Mail-Sender" -"Payment Failed Emails","Zahlung fehlgeschlagen E-Mails" -"Payment Failed Template","Zahlung fehlgeschlagen Vorlage" -"Payment Information","Information zur Zahlung" -"Payment Method","Zahlungsart" -"Payment Methods After","Zahlungsarten nach" -"Payment Methods After Checkout Button","Zahlungsmethoden nach Schaltfläche Kasse" -"Payment Methods Before","Zahlungsarten vor" -"Payment Methods Before Checkout Button","Zahlungsarten vor Schalter Kasse" -"Payment method information","Informationen zur Zahlungsmethode" -"Payment method is not defined","Zahlungsmethode ist nicht definiert" -"Payment methods in shopping cart","Zahlungsmethoden im Warenkorb" -"Payment profile # %s: ""%s"".","Zahlungsprofil # %s: ""%s""." -"Place Order","Bestellung aufgeben" -"Please agree to all Terms and Conditions before placing the order.","Bitte stimmen Sie allen Geschäftsbedingungen vor der Auftragserteilung zu." -"Please agree to all Terms and Conditions before placing the orders.","Bitte stimmen Sie allen Geschäftsbedingungen vor Erteilung der Aufträge zu." -"Please agree to all the terms and conditions before placing the order.","Bitte Stimmen Sie allen Geschäftsbedingungen vor Auftragserteilung zu." -"Please check billing address information.","Bitte prüfen Sie die Informationen zur Rechnungsadresse." -"Please check shipping address information.","Bitte prüfen Sie die Informationen zur Lieferadresse." -"Please check shipping addresses information.","Bitte prüfen Sie die Informationen zur Lieferadresse." -"Please choose to register or to checkout as a guest","Bitte registrieren Sie sich oder gehen Sie als Gast zum Checkout" -"Please log in below:","Bitte loggen Sie sich unten ein:" -"Please select region, state or province","Bitte Region, Staat oder Provinz auswählen" -"Please select shipping address for applicable items","Bitte wählen Sie die Versandadresse für zutreffende Positionen aus" -"Please select shipping methods for all addresses","Bitte wählen Sie die Versandmethoden für alle Adressen" -"Please select valid payment method.","Wählen Sie bitte eine gültige Zahlungsmethode aus." -"Please specify payment method.","Bitte geben Sie die Zahlungsmethode an." -"Please specify shipping method.","Bitte die Versandmethode spezifizieren." -"Please specify shipping methods for all addresses.","Bitte spezifizieren Sie die Versandmethoden für alle Adressen." -"Price","Preis" -"Proceed to Checkout","Bestellung aufgeben" -"Product","Produkt" -"Product Name","Produktbezeichnung" -"Products","Produkte" -"Qty","Menge" -"Qty:","Menge:" -"Quantity was recalculated from %d to %d","Menge wurde von %d auf %d neu berechnet" -"Quote Lifetime (days)","Lebensdauer angeben (Tage)" -"Quote item does not exist.","Der angegebene Artikel existiert nicht." -"Quote item is not found.","Der angegebene Artikel wurde nicht gefunden." -"Recently added item(s)","Kürzlich hinzugefügte Position(en)" -"Register","Registrieren" -"Register and save time!","Melden Sie sich an und sparen Sie Zeit!" -"Register to Create an Account","Registrieren, um ein Konto zu erstellen" -"Register with us for future convenience:","Melden Sie sich bei uns an für zukünftigen Komfort:" -"Remove Item","Objekt entfernen" -"Remove This Item","Dieses Objekt entfernen" -"Remove coupon code from shopping cart","Couponcode aus Warenkorb entfernen" -"Remove item","Artikel löschen" -"Remove product from shopping cart","Produkt aus Warenkorb entfernen" -"Remove product(s) from shopping cart","Produkt(e) aus Warenkorb entfernen" -"Require Customer To Be Logged In To Checkout","Kunde muss angemeldet sein, um zur Kasse gehen zu können" -"Retrieve information about shopping cart","Informationen zum Warenkorb abrufen" -"Review Order","Auftrag überprüfen" -"Review Order - %s","Auftrag überprüfen - %s" -"SKU","SKU" -"Sales","Verkäufe" -"Save Condition","Bedingung speichern" -"Save in address book","Speichern im Adressbuch" -"See price before order confirmation.","Preis vor Bestellbestätigung ansehen." -"Select Address","Adresse auswählen" -"Select Addresses","Adressen auswählen" -"Select Shipping Method","Versandmethode auswählen" -"Select State/Province...","Land/Provinz auswählen" -"Select a billing address from your address book or enter a new address.","Wählen Sie eine Rechnungsadresse aus ihrem Adressbuch oder geben Sie eine neue Adresse ein." -"Select a shipping address from your address book or enter a new address.","Wählen Sie eine Versandadresse aus ihrem Adressbuch oder geben sie eine neue Adresse ein." -"Send Payment Failed Email Copy Method","Zahlung-fehlgeschlagen-E-Mail-Kopie-Methode" -"Send Payment Failed Email Copy To","Zahlung-fehlgeschlagen-E-Mail-Kopie senden an" -"Send To","Senden an" -"Separate by "","".","Getrennt nach "", ""." -"Set customer for shopping cart","Kunden für Warenkorb festlegen" -"Set customer's addresses in shopping cart","Kundenadressen im Einkaufswagen einstellen" -"Set payment method","Bezahlungsmethode festlegen" -"Set shipping method","Versandart festlegen" -"Ship to Multiple Addresses","An mehrere Adressen senden" -"Ship to different address","Versand an andere Adresse" -"Ship to this address","Versand an diese Adresse" -"Shipping Address","Lieferungsadresse" -"Shipping Information","Lieferungsinformation" -"Shipping Method","Lieferungsart" -"Shipping Methods","Versandarten" -"Shipping To","Versendet an" -"Shipping information","Versandinformation" -"Shipping method has not been selected yet","Versandart wurde noch nicht ausgewählt" -"Shipping methods in shopping cart","Versandarten im Einkaufswagen" -"Shipping selection is not applicable.","Versandauswahl ist nicht anwendbar" -"Shopping Cart","Einkaufswagen" -"Shopping Cart Form Before","Einkaufswagen Formular vor" -"Shopping Cart Items After","Artikel im Warenkorb nach" -"Shopping Cart Items Before","Artikel im Warenkorb vor" -"Shopping Cart Sidebar","Einkaufswagen Seitenleiste" -"Shopping Cart Sidebar Extra Actions","Zusätzliche Aktionen in der Einkaufswagen-Sidebar" -"Shopping Cart is Empty","Einkaufswagen ist leer" -"Shopping cart ability to set coupon code","Möglichkeit, im Einkaufwagen einen Couponcode einzustellen" -"Show Content as","Inhalt anzeigen als" -"Some of the requested products are not available in the desired quantity.","Einige der angefragten Produkte sind nicht in der gewünschten Anzahl verfügbar." -"Some of the requested products are unavailable.","Einige der gewünschten Produkte sind nicht verfügbar." -"Some products quantities were recalculated because of quantity increment mismatch","Einige Produktmengen wurden neu berechnet aufgrund einer Zuwachsdifferenz." -"Sorry, guest checkout is not enabled. Please try again or contact store owner.","Entschuldigung, Gäste-Checkout ist nicht aktiviert. Versuchen Sie es erneut oder kontaktieren Sie den Shopbesitzer." -"Sorry, no quotes are available for this order at this time.","Es tut uns Leid, es gibt derzeit keine Preisangabe für diese Bestellung." -"State/Province","Staat/Provinz" -"Status","Status" -"Store View","Store-Ansicht" -"Street Address","Adresse" -"Street Address %s","Hausanschrift %s" -"Submitting order information...","Bestellung wird versandt..." -"Subtotal","Zwischensumme" -"Subtotal must exceed minimum order amount","Zwischensumme muss den Mindestbestellwert überschreiten" -"Telephone","Telefon" -"Terms and Conditions","Allgemeine Geschäftsbedingungen" -"Terms and Conditions Information","Informatiuon zu den Allgemeine Geschäftsbedingungen" -"Terms and conditions","Allgemeine Geschäftsbedingungen" -"Text","Text" -"Thank you for your purchase!","Danke für Ihren Einkauf!" -"The condition has been deleted","Die Kondition wurde gelöscht" -"The condition has been saved.","Die Kondition wurde gespeichert." -"The onepage checkout is disabled.","Der Bezahlvorgang mit nur einer Seite ist deaktiviert." -"The product could not be found.","Das Produkt konnte nicht gefunden werden." -"The product does not exist.","Das Produkt existiert nicht." -"There are %s items in your cart.","%s Artikel sind derzeit in Ihrem Einkaufswagen." -"There is 1 item in your cart.","1 Artikel ist derzeit in Ihrem Einkaufswagen." -"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","Es ist bereits ein Kunde mit dieser E-Mail-Adresse registriert. Bitte loggen Sie sich mit dieser E-Mail-Adresse ein oder geben Sie eine andere E-Mail-Adresse ein, um ein Konto zu eröffnen." -"There was an error processing your order. Please contact us or try again later.","Bei der Bearbeitung Ihrer Bestellung ist ein Fehler aufgetreten. Bitte kontaktieren Sie und oder versuchen Sie es später noch einmal." -"This condition no longer exists.","Diese Kondition existiert nicht mehr," -"Total","Gesamtbetrag" -"Total for this address","Gesamtsumme für diese Adresse" -"Unable to set Payment Method.","Zahlungsart kann nicht eingestellt werden." -"Unit Price","Einheitspreis" -"Update","Aktualisieren" -"Update Cart","Einkaufswagen aktualisieren" -"Update Qty & Addresses","Anzahl & Adressen aktualisieren" -"Update Shopping Cart","Einkaufswagen aktualisieren" -"Update Total","Gesamtsumme aktualisieren" -"Update product quantities in shopping cart","Produktanzahl im Einkaufswagen aktualisieren" -"Update product(s) quantities in shopping cart","Produktanzahl im Einkaufswagen aktualisieren" -"Use Billing Address","Rechnungsadresse verwenden" -"VAT Number","MwSt.-Nummer" -"View Shopping Cart","Einkaufswagen anzeigen" -"Visible items in minicart","Sichtbare Elemente im Mini-Warenkorb" -"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","Wir bearbeiten Ihre Bestellung und Sie werden in Kürze eine eMail mit den Details der Bestellung erhalten. Sobald die Bestellung versendet wurde, erhalten Sie eine weitere eMail mit einem Link, um deren Verlauf verfolgen zu können." -"What's this?","Was ist das?" -"What's this?","Was ist das?" -"You have no items in your shopping cart.","Sie haben keine Artikel in Ihrem Einkaufswagen." -"You will receive an order confirmation email with details of your order and a link to track its progress.","Sie erhalten eine eMail mit der Bestätigung Ihrer Bestellung und einem Link, um deren Verlauf verfolgen zu können." -"Your Checkout Progress","Ihr Abmeldeverlauf" -"Your billing agreement # is: %s.","Die Nummer Ihrer Zustimmung zur Abrechnung lautet: %s." -"Your order # is: %s.","Die Nummer Ihrer Bestellung lautet: %s." -"Your order cannot be completed at this time as there is no payment methods available for it.","Ihre Bestellung kann momentan nicht abgeschlossen werden, da keine Zahlungsmethode zur Verfügung steht." -"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Ihre Bestellung kann derzeit nicht abgeschlossen werden, da keine Versandart hierfür verfügbar ist. Bitte führen Sie die notwendigen Veränderungen bei Ihrer Lieferadresse durch." -"Your order has been received.","Ihre Bestellung wurde erhalten." -"Your order number is ","Ihre Bestellnummer ist" -"Your recurring payment profiles:","Ihre Profile für wiederkehrende Zahlungen:" -"Zip/Postal Code","Postleitzahl" -"ok","Okay" diff --git a/app/locale/de_DE/Mage_Cms.csv b/app/locale/de_DE/Mage_Cms.csv deleted file mode 100644 index e2d7b7efc..000000000 --- a/app/locale/de_DE/Mage_Cms.csv +++ /dev/null @@ -1,127 +0,0 @@ -"A block identifier with the same properties already exists in the selected store.","Ein Block Bezeichner mit denselben Eigenschaften existiert bereits in dem ausgewählten Store." -"A directory with the same name already exists. Please try another folder name.","Ein Verzeichnis mit dem gleichen Namen existiert bereits. Bitte versuchen Sie einen anderen Ordnernamen." -"A page URL key for specified store already exists.","Ein Seiten URL Key für den angegebenen Store existiert bereits." -"Action","Aktion" -"Add New Block","Neuen Block hinzufügen" -"Add New Page","Neue Seite hinzufügen" -"All Countries","Alle Länder" -"An error occurred while saving the page.","Fehler beim Speichern der Seite." -"Anchor Custom Text","Anchor eigener Text" -"Anchor Custom Title","Anchor eigener Titel" -"Are you sure you want to delete current folder?","Soll der aktuelle Ordner wirklich gelöscht werden?" -"Are you sure you want to delete the selected file?","Soll die ausgewählte Datei wirklich gelöscht werden?" -"Block","Block" -"Block Information","Blockinformation" -"Block Title","Blocktitel" -"CMS","CMS" -"CMS Content Wrapper","CMS Content Wrapper" -"CMS Home Page","CMS Startseite" -"CMS No Cookies Page","CMS keine Cookies Seite" -"CMS No Route Page","CMS keine Route Seite" -"CMS No-Route Page","CMS Keine-Route Seite" -"CMS Page","CMS Seite" -"CMS Page Link","CMS Seitenlink" -"CMS Page Link Block Template","CMS Seitenlink Blockvorlage" -"CMS Page Link Inline Template","CMS Seitenlink Inlinevorlage" -"CMS Pages (All)","CMS Seiten (Alle)" -"CMS Static Block","CMS statischer Block" -"CMS Static Block Default Template","CMS statischer Block Standardvorlage" -"Cannot create new directory.","Neues Verzeichnis kann nicht erstellt werden." -"Cannot delete directory %s.","Verzeichnis %s kann nicht gelöscht werden." -"Cannot delete root directory %s.","Rootverzeichnis %s kann nicht gelöscht werden." -"Cannot upload file.","Datei kann nicht hochgeladen werden." -"Collapse All","Alle einklappen" -"Content","Inhalt" -"Content Heading","Contentheading" -"Content Management","Content Management" -"Contents of a Static Block","Inhalte eines statischen Blocks" -"Create Folder...","Ordner anlegen…" -"Custom Design","Eigene Gestaltung" -"Custom Design From","Eigene Gestaltung von" -"Custom Design To","Eigene Gestaltung bis" -"Custom Layout","Eigenes Layout" -"Custom Layout Update XML","Eigenes Layout Update XML" -"Custom Theme","Eigenes Theme" -"Customer Tax Class Information","Kunden Steuerklasse Information" -"Date Created","Angelegt am" -"Delete Block","Block löschen" -"Delete File","Datei löschen" -"Delete Folder","Ordner löschen" -"Delete Page","Seite löschen" -"Description","Beschreibung" -"Design","Gestaltung" -"Disabled","Deaktiviert" -"Disabled Completely","Komplett deaktiviert" -"Disabled by Default","Standard-Deaktivierung" -"Edit Block","Block bearbeiten" -"Edit Block '%s'","Block '%s' bearbeiten" -"Edit Page","Seite bearbeiten" -"Edit Page '%s'","Seite '%s' bearbeiten" -"Enable WYSIWYG Editor","WYSIWYG-Editor aktivieren" -"Enabled","Aktiviert" -"Enabled by Default","Standard-Aktivierung" -"Expand All","Alle ausklappen" -"General Information","Allgemeine Information" -"Go to Home Page","Zur Startseite gehen" -"Home","Startseite" -"ID","ID" -"Identifier","Bezeichner" -"If empty, the Page Title will be used","Falls leer, wird der Seitentitel verwendet" -"Images (%s)","Bilder (%s)" -"Insert File","Datei einfügen" -"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","Ungültiger Ordnername. Bitte verwenden Sie alphanumerische Zeichen, Unterstriche und Bindestriche." -"Keywords","Schlüsselwörter" -"Last Modified","Zuletzt geändert" -"Layout","Layout" -"Layout Update XML","Layout Update XML" -"Link to a CMS Page","Link zu einer CMS Seite" -"Manage Pages","Seiten verwalten" -"Media Gallery","Mediengalerie" -"Media Storage","Medienspeicher" -"Meta Data","Metadaten" -"Meta Description","Metabeschreibung" -"Meta Keywords","Metaschlüsselwörter" -"New Block","Neuer Block" -"New Folder Name:","Neuer Ordner Name:" -"New Page","Neue Seite" -"No files found","Keine Dateien gefunden" -"Page Information","Seiteninformation" -"Page Layout","Seitenlayout" -"Page Status","Seitenstatus" -"Page Title","Seitentitel" -"Pages","Seiten" -"Product Tax Class Information","Produktsteuerklasse Information" -"Redirect to CMS-page if Cookies are Disabled","Zu CMS-Seite weiterleiten wenn Cookies deaktiviert sind." -"Relative to Website Base URL","Relativ zu Website Base URL" -"Save Block","Block speichern" -"Save Page","Seite speichern" -"Save Process","Prozess speichern" -"Select Block...","Block wählen..." -"Select Page...","Seite wählen..." -"Show Breadcrumbs for CMS Pages","Breadcrumbs für CMS Seiten anzeigen" -"Show Notice if JavaScript is Disabled","Hinweis zeigen wenn JavaScript deaktiviert ist" -"Static Blocks","Statische Blöcke" -"Status","Status" -"Storage Root","Speicher Root" -"Store View","Store-Ansicht" -"Template","Vorlage" -"The block has been deleted.","Der Block wurde gelöscht." -"The block has been saved.","Der Block wurde gespeichert." -"The directory %s is not writable by server.","Das Verzeichnis %s ist nicht vom Server beschreibbar." -"The page URL key cannot consist only of numbers.","Der Seiten URL Schlüssel kann nicht nur aus Ziffern bestehen." -"The page URL key contains capital letters or disallowed symbols.","Die URL dieser Seite enthält Großbuchstaben oder unerlaubte Symbole." -"The page has been deleted.","Die Seite wurde gelöscht." -"The page has been saved.","Die Seite wurde gespeichert." -"The static block content cannot contain directive with its self.","Der statische Block selbst darf keine Anweisungen enthalten. - - - -" -"This block no longer exists.","Dieser Block existiert nicht mehr." -"This page no longer exists.","Diese Seite existiert nicht mehr." -"Title","Titel" -"URL Key","URL Schlüssel" -"Unable to find a block to delete.","Es kann kein Block zum Löschen gefunden werden." -"Unable to find a page to delete.","Es kann keine Seite zum Löschen gefunden werden." -"WYSIWYG Options","WYSIWYG Optionen" -"px.","px." diff --git a/app/locale/de_DE/Mage_Compiler.csv b/app/locale/de_DE/Mage_Compiler.csv deleted file mode 100644 index d628edd53..000000000 --- a/app/locale/de_DE/Mage_Compiler.csv +++ /dev/null @@ -1,21 +0,0 @@ -"Collected Files Count","Anzahl Gesammelte Dateien" -"Compilation","Kompilierung" -"Compilation State","Kompilierungsstatus" -"Compilation error","Kompilierungsfehler" -"Compiled","Kompiliert" -"Compiled Scopes Count","Compiled Scopes Count" -"Compiler Status","Compilerstatus" -"Compiler include path is disabled.","Compiler Includepfad ist deaktiviert." -"Compiler include path is enabled.","Compiler Includepfad ist aktiviert." -"Directory ""%s"" must be writeable","Verzeichnis ""%s"" muss beschreibbar sein" -"Disable","Deaktivieren" -"Disabled","Deaktiviert" -"Enable","Aktivieren" -"Enabled","Aktiviert" -"File ""%s"" must be writeable","Datei ""%s"" muss beschreibbar sein" -"Not Compiled","Nicht Kompiliert" -"Run Compilation Process","Kompilierungsprozess starten" -"Scopes Compilation Settings","Scopes Compilation Einstellungen" -"System","System" -"The compilation has completed.","Der Kompilierungsprozess ist abgeschlossen." -"Tools","Werkzeuge" diff --git a/app/locale/de_DE/Mage_Connect.csv b/app/locale/de_DE/Mage_Connect.csv deleted file mode 100644 index d923864ca..000000000 --- a/app/locale/de_DE/Mage_Connect.csv +++ /dev/null @@ -1,58 +0,0 @@ -"1.5.0.0 & later","1.5.0.0 & neuer" -"Action","Aktion" -"Add Author","Verfasser hinzufügen" -"Add Contents Path","Inhalte hinzufügen Pfad" -"Add PHP Extension dependency","PHP Erweiterung Abhängigkeit hinzufügen" -"Add Package dependency","Paket Abhängigkeit hinzufügen" -"Add files","Dateien hinzufügen" -"Authors","Verfasser" -"Channel","Kanal" -"Contents","Inhalte" -"Create Extension Package","Erweiterungs-Paket erstellen" -"Dependencies","Abhängigkeiten" -"Description","Beschreibung" -"Edit Extension","Erweiterung bearbeiten" -"Email","E-Mail" -"Extension","Erweiterung" -"Extensions","Erweiterungen" -"Failed to create the package.","Paket konnte nicht erstellt werden." -"Failed to load the package data.","Paketdaten konnten nicht geladen werden." -"Failed to save the package.","Paket konnte nicht gespeichert werden." -"Files","Dateien" -"Folder","Ordner" -"Ignore","Ignorieren" -"Include","Inkludieren" -"License","Lizenz" -"License URI","Lizenz URI" -"Load Local Package","Lokales Paket laden" -"Load local Package","Lokales Paket laden" -"Magento Connect","Magento Connect" -"Magento Connect Manager","Magento Connect Manager" -"Max","Max" -"Maximum","Maximum" -"Min","Min" -"Minimum","Minimum" -"Name","Name" -"New Extension","Neue Erweiterung" -"PHP Version","PHP Version" -"Package","Verpackung" -"Package Extensions","Paket-Erweiterungen" -"Package File Name","Paket Datei-Name" -"Package Info","Paket Info" -"Packages","Pakete" -"Path","Pfad" -"Pre-1.5.0.0","früher als 1.5.0.0" -"Release Info","Informationen zur Veröffentlichung" -"Remove","Entfernen" -"Save As...","Speichern als..." -"Save Data and Create Package","Daten speichern und Paket erstellen" -"Save package with custom package file name","Paket speichern mit individueller Bezeichnung der Paketdatei" -"Summary","Zusammenfassung" -"Supported releases","Unterstützte Versionen" -"System","System" -"Target","Ziel" -"The package %s data has been loaded.","Die Paket %s Daten wurden geladen." -"The package data has been saved.","Die Paketdaten wurden gespeichert." -"There was a problem saving package data","Beim Speichern der Paketdaten ist ein Fehler aufgetreten." -"Type","Typ" -"User","Benutzer" diff --git a/app/locale/de_DE/Mage_Contacts.csv b/app/locale/de_DE/Mage_Contacts.csv deleted file mode 100644 index 9b6779462..000000000 --- a/app/locale/de_DE/Mage_Contacts.csv +++ /dev/null @@ -1,19 +0,0 @@ -"* Required Fields","* Notwendige Felder" -"Comment","Kommentar" -"Contact Form","Kontaktformular" -"Contact Information","Kontaktinformation" -"Contact Us","Kontakt" -"Contact Us Form","Kontaktformular" -"Contacts","Kontakte" -"Contacts Section","Kontaktbuch" -"Email","E-Mail" -"Email Options","E-Mail-Optionen" -"Email Sender","E-Mail-Absender" -"Email Template","E-Mail-Vorlage" -"Enable Contact Us","Kontaktfunktion aktivieren" -"Name","Name" -"Send Emails To","E-Mails senden an" -"Submit","Senden" -"Telephone","Telefon" -"Unable to submit your request. Please, try again later","Ihre Anfrage konnte nicht verarbeitet werden. Bitte versuchen Sie es später erneut" -"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","Ihre Anfrage wurde übermittelt und wir werden so bald wie möglich darauf antworten. Vielen Dank, dass Sie sich mit uns in Kontakt setzen." diff --git a/app/locale/de_DE/Mage_Core.csv b/app/locale/de_DE/Mage_Core.csv deleted file mode 100644 index 4945b560d..000000000 --- a/app/locale/de_DE/Mage_Core.csv +++ /dev/null @@ -1,394 +0,0 @@ -"%s","%s" -"%s already exist.","%s existieren bereits." -"%s already exists.","%s existiert bereits." -"-- Please Select --","-- Bitte auswählen --" -"Warning! When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","Vorsicht! Wenn Sie CDN verwenden, kann es in einigen Fällen vorkommen, dass JavaScript nicht korrekt läuft, wenn CDN nicht in Ihrer Subdomain enthalten ist." -"Warning! When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).","Warnung! Wenn Sie den Store-Code in URLs benutzen, arbeitet das System in einigen Fällen nicht korrekt, falls die URLs ohne Store-Codes in den Diensten von Dritten spezifiziert sind (z. B. PayPal etc.)." -"A category object is required for determining the product request path.","Es wird ein Kategorieobjekt benötigt um den Produktanfragepfad herauszufinden." -"Add Block Names to Hints","Blocknamen zu Hinweisen hinzufügen" -"Add Secret Key to URLs","Geheimschlüssel zu URLs hinzufügen" -"Add Store Code to Urls","Storecode zu URLs hinzufügen" -"Admin","Admin" -"Admin Base URL","Admin Basis-URL" -"Admin User Emails","Admin Benutzeremails" -"Advanced","Fortgeschritten" -"After selecting a new media storage location, press the Synchronize button - to transfer all media to that location. Media will not be available in the new - location until the synchronization process is complete.","Nachdem Sie einen neuen Medienspeicherort gewählt haben, drücken Sie den ""Synchronisieren""-Knopf, um alle Medien an diesen Ort zu übertragen. Medien sind an diesem neuen Ort erst verfügbar, wenn der Synchronisierungsprozess abgeschlossen ist." -"Allow Countries","Länder zulassen" -"Allow Magento Backend to run in frame","Magento Backend die Ausführung im Frame erlauben" -"Allow Magento Frontend to run in frame","Magento Frontend die Ausführung im Frame erlauben" -"Allow Symlinks","Symlinks erlauben" -"Allowed IPs (comma separated)","Zugelassene IPs (durch Kommata getrennt)" -"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Erlaubte Dateitypen: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Nicht alle Browser unterstützen alle dieser Formate!" -"Allows customers to stay logged in when switching between different stores.","Erlaubt Kunden eingeloggt zu bleiben nachdem zu einem anderen Store gewechselt wurde." -"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Alternativtext für den Weiter-Link in der Seitenübersicht. Sollte diese Angabe leer sein, wird das Standard-Pfeilsymbol verwendet." -"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Alternativtext für den Zurück-Link in der Seitenübersicht. Sollte diese Angabe leer sein, wird das Standard-Pfeilsymbol verwendet." -"An error occurred while saving. Please review the error log.","Beim Speichern trat ein Fehler auf. Bitte sehen Sie im Fehlerverlauf nach." -"Anchor Text for Next","Link-Text für Weiter" -"Anchor Text for Previous","Link-Text für Zurück" -"Anchor symbol (#) is not supported in request path","Das Doppelkreuz (#) wird im Anforderungspfad nicht unterstützt" -"Anchor symbol (#) is not supported in url rewrite suffix","Das Doppelkreuz (#) wird beim URL-Überschreiben-Suffix nicht unterstützt" -"Are you sure?","Sind Sie sicher?" -"Auto-redirect to Base URL","Automatische Weiterleitung zur Basis-URL" -"Back","Zurück" -"Backup Options","Sicherungsoptionen" -"Base JavaScript URL","Basis-URL Javascript" -"Base Link URL","Basis-URL Links" -"Base Media URL","Baiss-URL Medien" -"Base Secure URL","Aufbau sichere URL" -"Base Skin URL","Bais-URL Skins" -"Base URL","Base URL" -"Base Unsecure URL","Aufbau unsichere URL" -"Before modifying the store view code please make sure that it is not used in index.php.","Bevor Sie den Store-View-Quelltext bearbeiten, sehen Sie bitte nach, dass es nicht in index.php verwendet wird." -"Before modifying the website code please make sure that it is not used in index.php.","Bevor Sie den Webseitenquelltext bearbeiten, sehen Sie bitte nach, dass er nicht in index.php verwendet wird." -"Block with name ""%s"" already exists","Ein Block mit dem Namen ""%s"" existiert bereits" -"Browser Capabilities Detection","Browserunterstützungstest" -"CSS Settings","CSS-Einstellungen" -"Cache Storage Management","Zwischenspeicherverwaltung (Caching)" -"Cache storage may contain additional data. Are you sure that you want flush it?","Der Cachespeicher könnte weitere Daten enthalten. Sind Sie sicher, dass Sie diese löschen möchten?" -"Can not create invoice. Order was not found.","Rechnung konnte nicht erstellt werden. Es wurde keine Bestellung gefunden." -"Can't retrieve request object","Objekt kann nicht abgefragt werden" -"Can\'t retrieve entity config: %s","Kann Entität config: %s nicht auffinden" -"Cancel","Abbrechen" -"Cannot complete this operation from non-admin area.","Diese Aktion kann nicht außerhalb des Admin-Bereichs fertiggestellt werden." -"Card type does not match credit card number.","Kartentyp entspricht nicht der Kreditkartennummer." -"Code","Code" -"Controller file was loaded but class does not exist","Controller-Datei wurde geladen, Klasse existiert jedoch nicht" -"Cookie Domain","Cookie-Domain" -"Cookie Lifetime","Cookie-Lebensdauer" -"Cookie Path","Cookie-Pfad" -"Cookie Restriction Mode","Modus zur Beschränkung von Cookies" -"Copyright","Copyright" -"Core","Kern" -"Countries Options","Länderoptionen" -"Country","Land" -"Create Store","Erstelle Store" -"Create Store View","Erstelle Store-View" -"Create Website","Erstelle Website" -"Credit card number does not match credit card type.","Kreditkartennummer entspricht nicht dem Kreditkartentyp." -"Current Package Name","Aktueller Paketname" -"Custom Admin Path","Benutzerdefinierter Administratorpfad" -"Custom Admin URL","Individuelle Admin URL" -"Custom Design","Eigene Gestaltung" -"Custom Email 1","Angepasste Email 1" -"Custom Email 2","Angepasste Email 2" -"Custom Variables","Angepasste Variablen" -"Custom1 Contact Email","Kunde1 Kontakt-E-Mail" -"Custom1 Contact Name","Kunde1 Kontaktname" -"Custom2 Contact Email","Kunde2 Kontakt-E-Mail" -"Custom2 Contact Name","Kunde2 Kontaktname" -"Customer Support","Kundensupport" -"Dashboard","Dashboard" -"Date From","Datum ab" -"Date To","Datum bis" -"Date/time format ""%s"" is not supported.","Datum/Zeit-Format ""%s"" wird nicht unterstützt." -"Debug","Debug" -"Default","Standard" -"Default Country","Standard Land" -"Default Description","Standard-Beschreibung" -"Default Keywords","Standard-Schlüsselwörter" -"Default No-route URL","Standard-No-Route-URL" -"Default Pages","Standardseiten" -"Default Robots","Standard-Robots" -"Default Store","Standard-Store" -"Default Store View","Standard-Store-View" -"Default Title","Standardtitel" -"Default Web URL","Standard-Web-URL" -"Delete","Löschen" -"Delete Store","Shop löschen" -"Delete Store View","Shopansicht löschen" -"Delete Website","Webseite löschen" -"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","Das Löschen von %1$s löscht nicht die Informationen die mit %1$s verbunden sind (z.B. Kategorien, Produkte, etc.), die %1$s können aber nicht mehr wiederhergestellt werden. Es ist empfohlen ein Datenbank Backup vor dem Löschen von %1$s zu machen." -"Design","Gestaltung" -"Design Change","Designänderung" -"Developer","Developer" -"Developer Client Restrictions","Developer Client Restrictions" -"Disable Email Communications","E-Mail Kommunikation deaktivieren" -"Disable Modules Output","Modul Output deaktivieren" -"Display Demo Store Notice","Demo Shop Nachricht anzeigen" -"Duplicate Of Template Name","Duplikat von Templatename" -"Edit Design Change","Designänderung bearbeiten" -"Edit Store","Shop bearbeiten" -"Edit Store View","Shopansicht bearbeiten" -"Edit Website","Webseite bearbeiten" -"Empty identifier field name","Leerer Bezeichnerfeldname" -"Empty main table name","Leerer Haupttabllenname" -"Enable Charts","Tabellen aktivieren" -"Enabled","Aktiviert" -"Enabled for Admin","Für Admin aktivieren" -"Enabled for Frontend","Für Frontend aktivieren" -"Environment Update Time","Umgebungs-Update-Zeit" -"Error in file: ""%s"" - %s","Fehler in Datei: ""%s"" - %s" -"European Union Countries","Länder der Europäischen Union" -"Exceptions Log File Name","Exceptions Logfile Name" -"Favicon Icon","Favicon Icon" -"File %s does not exist","Datei %s existiert nicht" -"File %s is not readable","Datei %s kann nicht gelesen werden" -"File not found","Datei nicht gefunden" -"File system","Dateisystem" -"File with an extension ""%value%"" is protected and cannot be uploaded","Dateien mit der Endung ""%value%"" sind geschützt und können nicht hochgeladen werden" -"First Day of Week","Erster Wochentag" -"Flush Cache Storage","Cache Storage entleeren" -"Flush Magento Cache","Magento-Cache leeren" -"Footer","Fußzeile" -"Forgot Password Email Sender","E-Mail-Absender für vergessenes Passwort" -"Forgot Password Email Template","Passwort vergessen E-Mail Template" -"General","Allgemein" -"General Contact","Allgemeiner Kontakt" -"General Contact Email","Allgemeine Kontakt-E-Mail" -"General Contact Name","Allgemeiner Kontaktname" -"General Settings","Allgemeine Einstellungen" -"Get info about current Magento installation","Info über die Magento-Installation erhalten" -"Global","Weltweit" -"HTML Head","HTML Kopf" -"HTML tags are not allowed","HTML-Tags nicht zulässig" -"Header","Kopfzeile" -"Host","Host" -"How many links to display at once.","Wie viele Links sind auf einmal anzuzeigen." -"ID Path for Specified Store","ID Pfad für spezifizierten Shop" -"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","Falls die aktuelle Frame Position nicht die äußerste Seite abdeckt, wird der Link zur aktuellen Position plus/minus diesen Wert gerendert." -"Incorrect credit card expiration date.","Falsches Verfallsdatum der Kreditkarte" -"Input type ""%value%"" not found in the input types list.","Eingabetyp ""%value%"" wurde nicht in der Liste der Eingabetypen gefunden." -"Invalid URL '%value%'.","Ungültige URL '%value%'." -"Invalid base url type","Ungültiger Base URL Typ" -"Invalid block name to set child %s: %s","Ungültiger Blockname zum Child gesetzt: %s: %s" -"Invalid block type: %s","Ungültiger Blocktyp: %s" -"Invalid block: %s","Ungültiger Block: %s" -"Invalid connection","Ungültige Verknüpfung" -"Invalid date","Invalid date" -"Invalid layout update handle","Ungültiger Layout Update Identifikator" -"Invalid messages storage ""%s"" for layout messages initialization","Ungültiger Nachrichtenspeicher ""%s"" für die Initialisierung der Layout-Nachrichten" -"Invalid query","Ungültige Anfrage" -"Invalid transactional email code: %s","Ungültiger Transaktions-E-Mail-Code: %s" -"Invalid website\'s configuration path: %s","Ungültiger Webseitenkonfigurationspfad: %s" -"JavaScript Settings","JavaScript Einstellungen" -"Layout","Layout" -"Leave empty for access from any location.","Leer lassen für den Zugriff von jedem Standort aus." -"List of stores","Liste der Speicherorte" -"Locale","Sprachumgebung" -"Locale Options","locale Einstellungen" -"Log Settings","Log-Einstellungen" -"Logging from Mage::log(). File is located in {{base_dir}}/var/log","Logging von Mage::log() befindet sich in {{base_dir}}/var/log" -"Logging from Mage::logException(). File is located in {{base_dir}}/var/log","Logging von Mage:: logException (). Die Datei befinden sich in {{base_dir}}/var/log" -"Login is Case Sensitive","Login ist Case Sensitive" -"Logo Image","Logobild" -"Logo Image Alt","Logo Alt" -"Logo Image Src","Bildquelle für Logo" -"Magento info","Magento-Info" -"Magento info API","Magento-Info API" -"Mail Sending Settings","Sendeeinstellungen in Mail" -"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Stellen Sie sicher, dass Basis-URL endet mit '/' (Slash), z. B. http://yourdomain/magento" -"Manage Stores","Stores verwalten" -"Match expressions in the same order as displayed in the configuration.","Passende Ausdrücke in der gleichen Reihenfolge wie in der Konfiguration angezeigt." -"Media Storage","Medienspeicher" -"Merge CSS Files","CSS-Dateien zusammenlegen" -"Merge JavaScript Files","Merge JavaScript-Dateien" -"Miscellaneous HTML","Diverses HTML" -"Miscellaneous Scripts","Verschiedene Scripts" -"Model collection resource name is not defined.","Modell-Erfassung Quelle-Name ist nicht definiert." -"Module ""%1$s"" cannot depend on ""%2$s"".","Modul ""%1$s"" kann nicht von ""%2$s"" abhängig sein." -"Module ""%1$s"" requires module ""%2$s"".","Modul ""%1$s"" benötigt das Modul ""%2$s""." -"Name","Name" -"New Design Change","Neue Designänderung" -"New Store","Neuer Shop" -"New Store View","Neue Filiale Ansicht" -"New Website","Neue Webpräsenz" -"No","Nein" -"Offloader header","Offloader Titelzeile" -"PHP SOAP extension is required.","PHP SOAP-Erweiterung erforderlich." -"Package","Paket" -"Pagination","Seiteneinteilung" -"Pagination Frame","Seitennummerierungs-Frame" -"Pagination Frame Skip","Seitennummerierung Frame Weiter" -"Parent directory does not exist: %s","Übergeordnetes Verzeichnis existiert nicht: %s" -"Path ""%value%"" is not available and cannot be used.","Der Pfad ""%value%"" ist nicht verfügbar und kann nicht verwendet werden." -"Path ""%value%"" is protected and cannot be used.","Der Pfad ""%value%"" ist geschützt und kann nicht verwendet werden." -"Path ""%value%"" may not include parent directory traversal (""../"", ""..\\).""","Der Pfad ""%value%"" darf keinen Verweis auf das übergeordnete Verzeichnis enthalten (""../"", ""..\)." -"Please define flag code.","Bitte definieren Sie Flag-Code." -"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Bitte geben Sie 6 oder mehr Zeichen ein. Leerzeichen am Anfang oder Ende werden ignoriert." -"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Bitte geben Sie 7 oder mehr Zeichen ein. Ihr Passwort sollte sowohl Zahlen als auch Buchstaben enthalten." -"Please enter a number 0 or greater in this field.","Bitte geben Sie eine Zahl in das Feld ein, die 0 oder größer ist." -"Please enter a number 1 or greater in this field.","Bitte geben sie hier eine Zahl ein, die mindestens 1 beträgt." -"Please enter a number greater than 0 in this field.","Bitte geben Sie in diesem Feld eine Zahl ein, die größer als 0 ist." -"Please enter a number lower than 100.","Bitte geben Sie eine Zahl unter 100 ein." -"Please enter a valid $ amount. For example $100.00.","Bitte geben Sie einen gültigen Betrag in US-Dollar ein. Zum Beispiel 100,00 US-Dollar." -"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Bitte geben Sie einen gültigen URL-Schlüssel an. Zum Beispiel ""beispiel-seite"", ""beispiel-seite.html"" oder ""andereebene/beispiel-seite""." -"Please enter a valid URL. For example http://www.example.com or www.example.com","Bitte geben Sie eine gültige URL ein, z.B. http://www.beispiel.com oder www.beispiel.com" -"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Bitte geben Sie eine gültige URL mit dem dazugehörigen Protokoll (http://, https:// oder ftp://) an." -"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Bitte geben Sie einen gültigen XML-Identifier an. Zum Beispiel irgendwas_1, block5, id-4." -"Please enter a valid credit card number.","Bitte geben Sie eine gültige Kreditkartennummer ein." -"Please enter a valid credit card verification number.","Bitte geben Sie eine gültige Kreditkarten-Überprüfungsnummer ein." -"Please enter a valid date between %s and %s","Bitte geben Sie ein gültiges Datum zwischen %s und %s an." -"Please enter a valid date equal to or greater than %s","Bitte geben Sie ein gültiges Datum gleich oder größer als %s an." -"Please enter a valid date less than or equal to %s","Bitte geben Sie ein gültiges Datum kleiner oder gleich %s an." -"Please enter a valid date.","Bitte geben Sie ein gültiges Datum ein." -"Please enter a valid day (1-%d).","Bitte geben Sie einen gültigen Tag ein (1-%d)." -"Please enter a valid email address. For example johndoe@domain.com.","Bitte geben Sie eine gültige E-Mail Adresse ein. Zum Beispiel johndoe@domain.com" -"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Bitte geben Sie eine gültige Faxnummer an. Zum Beispiel (123) 456-7890 oder 123-456-7890." -"Please enter a valid full date","Bitte geben Sie ein vollständiges, gültiges Datum an." -"Please enter a valid month (1-12).","Bitte geben Sie einen gültigen Monat an (1-12)." -"Please enter a valid number in this field.","Bitte geben Sie in dieses Feld eine gültige Nummer ein." -"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Bitte geben Sie eine gültige Telefonnummer ein. Zum Beispiel (123)456-7890 oder 123-456-7890." -"Please enter a valid social security number. For example 123-45-6789.","Bitte geben Sie eine gültige Sozialversicherungsnummer ein. Zum Beispiel 123-45-6789." -"Please enter a valid year (1900-%d).","Bitte geben Sie ein gültiges Jahr an (1900-%d)." -"Please enter a valid zip code.","Bitte geben Sie eine gültige Postleitzahl ein." -"Please enter a valid zip code. For example 90602 or 90602-1234.","Bitte geben Sie eine gültige Postleitzahl ein. Zum Beispiel 90602 oder 90602-1234." -"Please enter issue number or start date for switch/solo card type.","Bitte geben Sie Ihre Ausgabenummer oder das Erstellungsdatum Ihrer EC-/Debitkarte an." -"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Bitte geben Sie eine gültige CSS-Länge an. Zum Beispiel 100px oder 77pt oder 20em oder .5ex oder 50%." -"Please make sure your passwords match.","Bitte stellen Sie sicher, dass Ihre Passwörter übereinstimmen." -"Please select State/Province.","Wählen Sie bitte Staat/Bundesland aus." -"Please select a file","Wählen Sie bitte eine Datei aus" -"Please select an option.","Bitte wählen Sie eine Option." -"Please select one of the above options.","Wählen Sie bitte eine der obigen Optionen aus." -"Please select one of the options.","Bitte wählen Sie eine Option." -"Please set available and/or protected paths list(s) before validation.","Bitte stellen Sie vor der Bestätigung die Liste(n) der verfügbaren und/oder geschützten Pfade ein." -"Please specify either a category or a product, or both.","Bitte geben Sie eine Kategorie oder ein Produkt oder beides an." -"Please use letters only (a-z or A-Z) in this field.","Bitte verwenden Sie ausschließlich Buchstaben (a-z oder A-Z) in diesem Feld." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Bitte verwenden Sie in diesem Feld nur Zahlen. Vermeiden Sie bitte Leerzeichen und andere Zeichen, wie Punkt oder Komma." -"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Bitte verwenden Sie nur Buchstaben (a-z oder A-Z) oder Zahlen (0-9) in diesem Feld. Leerzeichen oder andere Zeichen sind nicht erlaubt." -"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Bitte verwenden Sie nur Buchstaben (a-z oder A-Z) oder Zahlen (0-9) oder Leerzeichen und Rauten (#) in diesem Feld." -"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Geben Sie in dieses Feld bitte nur Buchstaben (a-z oder A-Z), Ziffern (0-9) oder Unterstreichungszeichen(_) ein; als erstes Zeichen ist nur ein Buchstabe erlaubt." -"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Bitte geben Sie in dieses Feld nur Buchstaben (a-z), Ziffern (0-9) oder Unterstriche (_) ein, das erste Zeichen sollte ein Buchstabe sein." -"Please use only visible characters and spaces.","Bitte verwenden Sie nur lesbare Zeichen und Leerzeichen." -"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Bitte verwenden Sie nur dieses Datumsformat: tt/mm/jjjj. Zum Beispiel 17/03/2006 für den 17. März 2006." -"Please wait, loading...","Bitte warten, lädt..." -"Polls","Umfragen" -"Port (25)","Port (25)" -"Profiler","Profiler" -"Recovery Link Expiration Period (days)","Verbleibende Gültigkeitsdauer des Wiederherstellungslinks (Tage)" -"Request Path for Specified Store","Aufrufpfad für angegebenen Shop" -"Request path length exceeds allowed %s symbols.","Gewünschte Pfadlänge überschreitet die zugelassenen %s Symbole." -"Requested file may not include parent directory traversal (""../"", ""..\\ notation)""","Die angefragte Datei darf keinen Verweis auf ein übergeordnetes Verzeichnis enthalten (""../"", ""..\notation"")" -"Requested invalid store ""%s""","Ungültiger Speicher ""%s"" angefragt" -"Resource is not set.","Ressource ist nicht gesetzt." -"Retrieve info about current Magento installation","Info über gegenwärtige Magento-Installation einholen" -"Retrieve store data","Gespeicherte Daten zurückholen" -"Retrieve store list","Liste der Speicherorte abrufen" -"Return-Path Email","Antwortpfad E-Mail" -"Root Category","Hauptkategorie" -"Sales Representative","Verkaufsmitarbeiter" -"Sales Representative Contact Email","Verkaufsvertreter Kontakt-E-Mail" -"Sales Representative Contact Name","Verkaufsvertreter Kontaktname" -"Save","Speichern" -"Save Store","Shop speichern" -"Save Store View","Shopansicht speichern" -"Save Website","Website speichern" -"Search Engines Optimization","Suchmaschinenoptimierung" -"Secure","Sicher" -"Security","Sicherheit" -"Select Date","Datum selektieren" -"Select Media Database","Wählen Sie die Media Datenbank" -"Sender Email","Absender E-Mail" -"Sender Name","Name des Absenders" -"Services","Services" -"Session Cookie Management","Session-Cookie-Management" -"Session Lifetime (seconds)","Session-Lebenszeit (Sekunden)" -"Session Validation Settings","Einstellungen für die Gültigkeit der Session" -"Set Return-Path","Antwortpfad setzen" -"Set as Default","Als Standard festlegen" -"Skin (Images / CSS)","Skin (Bilder / CSS)" -"Small Logo Image Src","Kleines Logo Image Src" -"Sort Order","Sortierfolge" -"Specified date/time ""%1$s"" do not match format ""%2$s"".","Angegebes Datum/Uhrzeit ""%1$s"" entspricht nicht dem Format ""%2$s""." -"Start date cannot be greater than end date.","Das Anfangsdatum darf nicht nach dem Enddatum liegen." -"Startup Page","Startseite" -"Status","Status" -"Storage Configuration for Media","Speicherkonfiguration für Media" -"Store","Shop" -"Store API","Speicher-API" -"Store Contact Address","Store Kontaktadresse" -"Store Contact Information","Store Kontaktdaten" -"Store Contact Telephone","Store Telefon" -"Store Email Addresses","Store E-Mail-Adressen" -"Store Information","Store Information" -"Store Name","Store Name" -"Store View","Store-Ansicht" -"Store View Information","StoreView Information" -"Store View Name","Name der Shop-View" -"Store view doesn't exist","StoreView existiert nicht" -"Store with the same code","Store mit identischem Identifikationscode" -"System","System" -"System Log File Name","Name der Systemprotokolldatei" -"Template Path Hints","Anleitungen für den Vorlagenpfad" -"Template Settings","Template-Einstellungen" -"Template Variables","Vorlagenvariablen" -"Templates","Vorlagen" -"Text length does not satisfy specified text range.","Textlänge entspricht nicht dem angegebenen Textbereich." -"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","Das von Ihnen angegebene %s ist ungültig. Bitte stellen Sie sicher, dass Ihre Eingabe dem ""http://domain.com/""-Format entspricht." -"The From Date value should be less than or equal to the To Date value.","Der ""von Datum""-Wert sollte kleiner oder gleich dem ""bis Datum""-Wert sein." -"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Der Store-Code darf nur Buchstaben (a-z), Ziffern (0-9) oder Unterstriche(_) umfassen, das erste Zeichen muss ein Buchstabe sein" -"The store does not exist","Der Shop existiert nicht." -"The store has been deleted.","Der Store wurde gelöscht." -"The store has been saved.","Der Shop wurde gespeichert." -"The store view has been deleted.","Die Store-Ansicht wurde gelöscht." -"The store view has been saved","Die Store-Ansicht wurde gespeichert" -"The template Name must not be empty.","Der Vorlagenname darf nicht leer bleiben." -"The value is not within the specified range.","Der Wert liegt nicht im angegebenen Bereich." -"The website does not exist.","Die Website ist nicht vorhanden." -"The website has been deleted.","Die Website wurde gelöscht." -"The website has been saved.","Die Website wurde gespeichert." -"Themes","Themes" -"This category and all its child elements","Diese Kategorie und alle Kindelemente" -"This category and its child categories only","Diese Kategorie und nur ihre Unterkategorien" -"This category and its products only","Nur diese Kategorie und ihre Produkte" -"This category only","Nur diese Kategorie" -"This date is a required value.","Dieses Datum ist ein benötigter Wert." -"This is a required field.","Dies ist ein Pflichtfeld." -"This store cannot be deleted.","Dieser Store kann nicht gelöscht werden." -"This store view cannot be deleted.","Diese StoreView kann nicht gelöscht werden." -"This website cannot be deleted.","Diese Website kann nicht gelöscht werden." -"This will be displayed just before body closing tag.","Dies wird vor dem schließenden Body-Tag ausgegeben." -"This will be included before head closing tag in page HTML.","Dieses wird vor dem schließenden Head-Tag im HTML der Seite eingefügt." -"Timezone","Zeitzone" -"Title Prefix","Titel Prefix" -"Title Suffix","Endung für den Titel" -"Transactional Emails","Transaktions-E-Mails" -"Translate Inline","Inline übersetzen" -"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Übersetzen, Blöcke und andere Ausgangs-Caches sollten sowohl für Frontend und Admin-Inline-Übersetzungen deaktiviert werden." -"Translations","Übersetzungen" -"Two and more slashes together are not permitted in request path","Zwei und mehr zusammenhängende Schrägstriche sind in diesem Pfad nicht zulässig" -"Two and more slashes together are not permitted in url rewrite suffix","Zwei und mehr zusammenhängende Schrägstriche sind im URL-Rewrite-Suffix nicht zulässig" -"Unable to create directory: %s","Verzeichnis kann nicht angelegt werden: %s" -"Unable to delete store view. Please, try again later.","Dieser StoreView kann nicht gelöscht werden. Versuchen Sie es später noch einmal." -"Unable to delete store. Please, try again later.","Shop kann nicht gelöscht werden. Bitte versuchen Sie es später noch einmal." -"Unable to delete website. Please, try again later.","Webseite konnte nicht gelöscht werden. Bitte versuchen Sie es später noch einmal." -"Unable to proceed. Please, try again","Funktion kann nicht ausgeführt werden. Bitte versuchen Sie es noch einmal." -"Unable to proceed. Please, try again.","Vorgang konnte nicht ausgeführt werden. Bitte versuchen Sie es später noch einmal." -"Unable to save file ""%s"" at ""%s""","Datei ""%s"" kann nicht unter ""%s"" gespeichert werden." -"Unable to save file: %s","Datei kann nicht gespeichert werden: %s" -"Unknown old style column type definition: {$definition}.","Unbekannte Definition des Spaltentyps im alten Stil: {definition}." -"Unknown scope ""%s"".","Unbekannter Anwendungsbereich ""%s""." -"Unsecure","Ungesichert" -"Url Options","URL Optionen" -"Use Custom Admin Path","Verwenden Sie den angepassten Admin-Pfad" -"Use Custom Admin URL","Individuelle Admin URL nutzen" -"Use HTTP Only","Verwende nur HTTP" -"Use SID on Frontend","Verwende Session-ID (SID) im Shopbereich" -"Use Secure URLs in Admin","Verwende sichere URL im Administrationsbereich" -"Use Secure URLs in Frontend","Verwende sichere URL im Shopbereich" -"Use Web Server Rewrites","Webserver Rewrites verwenden" -"VAT Number","MwSt.-Nummer" -"Validate HTTP_USER_AGENT","Überprüfe HTTP_USER_AGENT" -"Validate HTTP_VIA","Überprüfe HTTP_VIA" -"Validate HTTP_X_FORWARDED_FOR","Überprüfe HTTP_X_FORWARDED_FOR" -"Validate REMOTE_ADDR","REMOTE_ADDR validieren" -"Validation has failed.","Prüfung fehlgeschlagen." -"Values less than 60 are ignored. Note that changes will apply after logout.","Werte kleiner als 60 werden ignoriert. Beachten Sie, dass die Änderungen nach dem Abmelden wirksam werden." -"Variable Code must be unique.","Variabler Code muß eindeutig sein." -"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warnung! Die Aktivierung dieser Funktion ist im Arbeitsbereich nicht empfohlen, da sie ein potenzielles Sicherheitsrisiko darstellt." -"Web","Web" -"Website","Website" -"Website Information","Webseiten-Information" -"Website Name","Webseiten-Name" -"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Der Website-Code darf nur Buchstaben (a-z), Zahlen (0-9) oder Unterstrich (_) enthalten, das erste Zeichen muss ein Buchstabe sein." -"Website with the same code","Webseite mit identischem Identifikationscode" -"Weekend Days","Wochenende" -"Welcome Text","Willkommenstext" -"Wrong file info format","Falsches Format Dateiinfo" -"Wrong number of arguments for %s","Falsche Anzahl von Argumenten für %s" -"Wrong old style column type definition: {$definition}.","Falsche Spaltenartdefinition alter Art: {$definition}." -"Yes","Ja" -"You will have to log in after you save your custom admin path.","Nachdem Sie Ihren angepassten Admin-Pfad gespeichert haben, müssen Sie einloggen." -"Your design change for the specified store intersects with another one, please specify another date range.","Ihre Design-Änderung für den ausgewählten Store überschneidet sich mit einer anderen, bitte wählen Sie einen anderen Zeitraum." -"database ""%s""","Datenbank ""%s""" diff --git a/app/locale/de_DE/Mage_Cron.csv b/app/locale/de_DE/Mage_Cron.csv deleted file mode 100644 index b9700cac0..000000000 --- a/app/locale/de_DE/Mage_Cron.csv +++ /dev/null @@ -1,24 +0,0 @@ -"10 minutes","10 Minuten" -"15 minutes","15 Minuten" -"20 minutes","20 Minuten" -"30 minutes","30 Minuten" -"5 minutes","5 Minuten" -"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Zeitgesteuerte Aufgaben) - alle Zeitangaben in Minuten" -"Daily","Täglich" -"Failure History Lifetime","Aufbewahrung des Fehlerverlaufs" -"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","Um sicher zu stellen, dass URLs, die durch Cron generiert werden, korrekt sind, achten Sie bitte darauf dass die Web > Secure and Unsecure Base URLs explizit konfiguriert sind." -"Generate Schedules Every","Generiere Abläufe alle" -"History Cleanup Every","Verwerfen des Verlaufs alle" -"Hourly","Stündlich" -"Invalid callback: %s::%s does not exist","Invalider Callback: %s::%s existiert nicht" -"Invalid model/method definition, expecting ""model/class::method"".","Ungültige model/method-Definition, erwarte ""model/class::method""." -"Minute Intervals","Minutenintervalle" -"Missed if Not Run Within","Ausgelassen wenn nicht ausgeführt innerhalb von" -"Monthly","Monatlich" -"No callbacks found","Keine Callbacks gefunden" -"Schedule Ahead for","Plane im Voraus für" -"Success History Lifetime","Aufbewahrung des Verlaufs geglückter Ausführungen" -"Too late for the schedule.","Zu spät für diese Ausführung." -"Unable to delete the cron task.","Cron-Job kann nicht gelöscht werden." -"Unable to save the cron expression.","Cron-Ausdruck konnte nicht gespeichert werden." -"Weekly","Wöchentlich" diff --git a/app/locale/de_DE/Mage_CurrencySymbol.csv b/app/locale/de_DE/Mage_CurrencySymbol.csv deleted file mode 100644 index 4486c4066..000000000 --- a/app/locale/de_DE/Mage_CurrencySymbol.csv +++ /dev/null @@ -1,10 +0,0 @@ -"Currency","Währung" -"Custom currency symbols were applied successfully.","Benutzerdefinierte Währungssymbole wurden erfolgreich angewandt." -"Manage Currency","Währung verwalten" -"Manage Currency Rates","Währungskurse verwalten" -"Rates","Kurse" -"Save Currency Symbols","Währungssymbole speichern" -"Symbol","Symbol" -"Symbols","Symbole" -"System","System" -"Use Standard","Standard verwenden" diff --git a/app/locale/de_DE/Mage_Customer.csv b/app/locale/de_DE/Mage_Customer.csv deleted file mode 100644 index 1f2873050..000000000 --- a/app/locale/de_DE/Mage_Customer.csv +++ /dev/null @@ -1,470 +0,0 @@ -" or ","oder" -"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' ist offenbar ein DNS-Hostname, aber die Hauptdomäne (TLD) lässt sich nicht extrahieren." -"'%value%' appears to be a DNS hostname but cannot match TLD against known list","%value%' ist offenbar ein DNS-Hostname, aber die Hauptdomäne (TLD) lässt sich nicht unter den bekannten Einträgen finden." -"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","%value%' ist offenbar ein DNS-Hostname, aber die Hauptdomäne (TLD) entspricht keinem Hostnamen -Schema für TLD '%tld%'." -"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","%value%' ist offenbar ein DNS-Hostname mit einem Strich an einer ungültigen Stelle." -"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' scheint ein DNS-Hostname zu sein, aber die angegebene Punycode-Notation konnte nicht entschlüsselt werden." -"'%value%' appears to be a local network name but local network names are not allowed","'%value%' scheint der Name eines lokalen Netzwerks zu sein. Namen lokaler Netzwerke sind allerdings nicht erlaubt." -"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' scheint eine IP-Adresse zu sein. IP-Adressen sind allerdings nicht erlaubt." -"'%value%' does not appear to be a valid local network name","'%value%' scheint kein gültiger Name für ein lokales Netzwerk zu sein." -"* Required Fields","* Notwendige Felder" -"ALL GROUPS","ALLE GRUPPEN" -"Account Dashboard","Konto Dashboard" -"Account Information","Kontoinformationen" -"Account Sharing Options","Optionen zum Kontozugriff" -"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please click here.","Sie müssen Ihr Konto zunächst bestätigen. Bitte überprüfen Sie Ihr Postfach, ob Sie den Bestätigungslink erhalten haben. Falls die Bestätigungsmail noch einmal gesendet werden soll, klicken Sie bitte hier." -"Action","Aktion" -"Add New Address","Neue Adresse hinzufügen" -"Add New Customer","Neuen Kunden hinzufügen" -"Add New Customer Group","Neue Kundengruppe hinzufügen" -"Added From","Hinzugefügt von" -"Additional Address Entries","Zusätzliche Einträge von Adressen" -"Address","Adresse" -"Address Book","Adressbuch" -"Address Books","Adressbücher" -"Address Information","Adressinformation" -"Address Templates","Adressvorlagen (Templates)" -"Addresses","Adressen" -"Admin","Admin" -"All","Alle" -"All Store Views","Alle Ansichten des Geschäfts" -"All countries","Alle Länder" -"Always optional.","Immer fakultativ" -"Amount","Summe" -"An error occurred while deleting the address.","Beim Löschen der Adresse ist ein Fehler aufgetreten." -"An error occurred while retrieving the option value: %s.","Ein Fehler ist aufgetreten beim Auslesen des Einstellungswerts: %s." -"An error occurred while saving the collection, aborting. Error: %s","Ein Fehler ist beim Speichern der Sammlung aufgetreten. Abbrechen. Fehler: %s" -"An invalid option ID is specified for %s (%s), skipping the record.","Eine ungültige Options-ID wurde für %s angegeben (%s). Eintrag wird übersprungen." -"Approved","Bestätigt" -"Are you sure that you want to remove this item?","Sind Sie sicher, dass Sie den Eintrag überspringen wollen?" -"Are you sure you want to cancel adding of this address?","Sind Sie sicher, dass Sie das Hinzufügen dieser Adresse abbrechen wollen?" -"Are you sure you want to delete this address?","Sind Sie sicher, dass Sie diese Adresse löschen wollen?" -"Are you sure?","Sind Sie sicher?" -"Array of Entity collections is expected.","Ein Array von Entitätssammlungen wurde erwartet." -"Assign a Customer Group","Kundengruppe zuordnen." -"Average Sale","Durchschnittsverkauf" -"Back","Zurück" -"Back - link to the previously viewed page","Zurück - Link zur vorher angeschauten Seite" -"Back to Login","Zurück zur Anmeldung" -"Bad request.","Fehlerhafter Aufruf." -"Based on the VAT ID, the customer would belong to the Customer Group %s.","Anhand der Umsatzsteuer-Identifikationsnummer gehört der Kunde in Kundengruppe %s." -"Bill to Name","Rechnung auf Namen" -"Bought From","Gekauft von" -"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Wenn Sie sich anmelden, können Sie den Bezahlprozess schneller durchlaufen, mehrere Lieferadressen speichern, Ihre Bestellungen in Ihrem Konto anschauen und verfolgen und vieles mehr." -"CSV","CSV" -"Cancel","Abbrechen" -"Cannot save a new password.","Neues Passwort konnte nicht gespeichert werden." -"Cannot save address.","Adresse speichern nicht möglich." -"Cannot save the customer.","Speichern des Kunden nicht möglich." -"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Das Kundenkonto kann nicht global geteilt werden, da Kundenkonten mit den gleichen E-Mails bereits auf verschiedenen Websites existieren und nicht zusammengeführt werden können." -"Change Account Password","Kontopasswort ändern." -"Change Billing Address","Rechnungsadresse ändern" -"Change Password","Passwort ändern" -"Change Shipping Address","Versandadresse ändern" -"City","Stadt" -"Company","Firma" -"Config","Konfig." -"Configure","Konfigurieren" -"Confirm New Password","Neues Passwort bestätigen" -"Confirm Password","Passwort bestätigen" -"Confirmation Link Email","Bestätigungslink-E-Mail" -"Confirmed","Bestätigt" -"Contact Information","Kontaktinformation" -"Continue Shopping","Einkauf fortfahren" -"Country","Land" -"Create","Erstellen" -"Create New Account Options","Neue Kontoptionen erstellen" -"Create New Customer Account","Neues Kundenkonto erstellen" -"Create Order","Bestellung anlegen" -"Create an Account","Konto erstellen" -"Create customer","Kunden erstellen" -"Create customer address","Kundenadresse erstellen" -"Current Password","Aktuelles Passwort" -"Customer","Kunde" -"Customer API","Kunden-API" -"Customer Account Edit Form","Kundenkonto-Editierformular" -"Customer Account Login Form","Kundenkonto-Anmeldeformular" -"Customer Account Logout Success","Kundenkonto erfolgreich abgemeldet" -"Customer Account Registration Form","Kundenkonto-Registrierungsformular" -"Customer Addresses","Kundenadressen" -"Customer Configuration","Kundenkonfiguration" -"Customer Forgot Password Form","Kunde-Hat-Passwort-Vergessen-Formular" -"Customer Group","Kundengruppe" -"Customer Groups","Kundengruppen" -"Customer Information","Konteninformation" -"Customer Login","Kundenanmeldung" -"Customer My Account (All Pages)","Mein Kundenkonto (alle Seiten)" -"Customer My Account Address Book","Mein Kundenkonto Adressbuch" -"Customer My Account Address Edit Form","Mein Kundenkonto Adresseneditierformular" -"Customer My Account Dashboard","Mein Kundenkonto Dashboard" -"Customer Since","Kunde Seit" -"Customer View","Kundenansicht" -"Customer collection expected.","Kundensammlung erwartet" -"Customer email is required","Kunden-E-Mail-Adresse ist erforderlich" -"Customer website ID must be specified when using the website scope","Kunden-Webseiten-Identifikation muss bei Nutzung der Seite angegeben werden" -"Customer will stay on the current page if ""No"" is selected.","Kunden werden auf der derzeitigen Seite bleiben, wenn ""Nein"" ausgewählt ist." -"Customers","Kunden" -"Customers Only","Nur für Kunden" -"Customers Section","Kundenbereich" -"DD","DD" -"Date","Datum" -"Date Added","Hinzugefügt am" -"Date of Birth","Geburtstag" -"Day","Tag" -"Days in Wishlist","Tage in der Wunschliste" -"Default Addresses","Standardadressen" -"Default Billing Address","Standard-Rechnungsadresse" -"Default Email Domain","Standard-E-Mail-Domäne" -"Default Group","Standardgruppe" -"Default Shipping Address","Standard-Lieferadresse" -"Default Value for Disable Automatic Group Changes Based on VAT ID","Standardwert für Automatische Gruppenänderungen anhand der Umsatzsteuer-Identifikationsnummer deaktivieren" -"Default Welcome Email","Standard-Begrüßungs-E-Mail" -"Delete","Löschen" -"Delete Address","Adresse löschen" -"Delete Customer","Kunden löschen" -"Delete Customer Group","Kundengruppe löschen" -"Delete customer","Kunde löschen" -"Delete customer address","Kundenadresse löschen" -"Deleted Stores","Stores löschen" -"Details","Details" -"Disabled","Deaktiviert" -"Edit","Bearbeiten" -"Edit Account Info","Kontodaten bearbeiten" -"Edit Account Information","Kontodaten bearbeiten" -"Edit Address","Adresse bearbeiten" -"Edit Address Entry","Adresseintrag bearbeiten" -"Edit Customer Group ""%s""","Kundengruppe ""%s"" bearbeiten" -"Edit Customer Groups","Kundengruppen bearbeiten" -"Edit Customer's Address","Kundenadresse bearbeiten" -"Edit Group","Gruppe bearbeiten" -"Edit Newsletters","Newsletters bearbeiten" -"Email","E-Mail" -"Email Address","E-Mail-Adresse" -"Email Sender","E-Mail-Absender" -"Email:","E-Mail:" -"Enable Automatic Assignment to Customer Group","Automatische Zuordnung zur Kundengruppe aktivieren" -"Entity collection is expected.","Sammlung der Entität wird erwartet." -"Excel XML","Excel-XML" -"Failed to confirm customer account.","Bestätigung des Kundenkontos fehlgeschlagen." -"Fax","Fax" -"First Name","Vorname" -"Forgot Email Template","E-mail Template vergessen" -"Forgot Password","Passwort vergessen" -"Forgot Your Password","Passwort vergessen" -"Forgot Your Password?","Passwort vergessen?" -"Forgot and Remind Email Sender","Erinnerungs-E-Mail Absender" -"Form Fields Before","Vorheriges Dokumentfeld" -"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","Von Meinem Konto Dashboard aus, können Sie einen Schnappschuss Ihrer aktuellen Kontoaktivität sehen und Ihre Kontoinformationen aktualisieren. Wählen Sie den nachfolgenden Link um Informationen zu sehen oder zu aktualisieren." -"Gender","Geschlecht" -"Gender is required.","Das Geschlecht muss angegeben werden." -"General Subscription","Allgemeines Abonnement" -"Generate Human-Friendly Customer ID","Menschenfreundliche Kunden-ID entwickeln" -"Global","Global" -"Group","Gruppe" -"Group Information","Guppeninformation" -"Group Name","Guppenname" -"Group for Invalid VAT ID","Gruppe für ungültige Umsatzsteuer-Identifikationsnummer" -"Group for Valid VAT ID - Domestic","Gruppe für gültige Umsatzsteuer-Identifikationsnummer - Inland" -"Group for Valid VAT ID - Intra-Union","Gruppe für gültige Umsatzsteuer-Identifikationsnummer - innerhalb der EU" -"Guest","Gast" -"HTML","HTML" -"Hello, %s!","Hallo %s!" -"ID","ID" -"IP Address","IP Adresse" -"If you believe this is an error, please contact us at %s","Sollte ihrer Meinung nach ein Fehler vorliegen, wenden sie sich bitte an uns unter %s" -"If you have an account with us, please log in.","Wenn Sie bei uns ein Benutzerkonto besitzen, melden Sie sich bitte an." -"Invalid attribute option specified for attribute %s (%s), skipping the record.","Ungültige Option für Attribut %s definiert (%s), Eintrag wird übersprungen." -"Invalid attribute set specified, skipping the record.","Ungültiges Attributset definiert, Eintrag wird übersprungen." -"Invalid billing address for (%s)","Ungültige Rechnungsanschrift für (%s)" -"Invalid current password","Das aktuelle Passwort ist ungültig" -"Invalid customer data","Ungültige Kundendaten" -"Invalid email address ""%s"".","Ungültige E-Mail-Adresse ""%s""." -"Invalid email address.","Ungültige Email-Adresse." -"Invalid login or password.","Anmeldername oder Passwort ungültig." -"Invalid password reset token.","Ungültiger Token für das Resetten des Passworts." -"Invalid shipping address for (%s)","Ungültige Lieferanschrift für (%s)" -"Invalid store specified, skipping the record.","Ungültiger Store definiert, Eintrag wird übersprungen." -"Invalid website, skipping the record, line: %s","Ungültige Webseite, Datensatz überspringen, Zeile: %s" -"Last Activity","Letzte Aktivität" -"Last Date Subscribed","Zuletzt abonniert" -"Last Date Unsubscribed","Zuletzt gekündigt" -"Last Name","Nachname" -"Last URL","Letzte URL" -"Leave empty for default (15 minutes).","Für Standard (15 Minuten) leer lassen." -"Leave empty for default (2). Valid range: 1-4","Für Standard (2) leer lassen. Gültige Werte: 1-4" -"Lifetime Sales","Gesamteinnahmen" -"Log In","Anmelden" -"Log Out","Abmelden" -"Login","Einloggen" -"Login Information","Login Informationen" -"Login Options","Login Optionen" -"Login and password are required.","Login und Passwort werden benötigt." -"Login or Create an Account","Anmelden oder Benutzerkonto erstellen" -"MM","MM" -"Manage Addresses","Adressen verwalten" -"Manage Customers","Kunden verwalten" -"Maximum length must be less then %s symbols","Die Länge darf nicht mehr als %s Zeichen betragen" -"Missing email, skipping the record, line: %s","E-Mail fehlt, Datensatz überspringen, Zeile: %s" -"Missing email, skipping the record.","E-Mail fehlt, überspringe Eintrag." -"Missing first name, skipping the record, line: %s","Firmenanschrift fehlt, Datensatz überspringen, Zeile: %s" -"Missing firstname, skipping the record.","Vorname fehlt, überspringe Eintrag." -"Missing last name, skipping the record, line: %s","Nachname fehlt, Datensatz überspringen, Zeile: %s" -"Missing lastname, skipping the record.","Nachname fehlt, überspringe Eintrag." -"Missing website, skipping the record, line: %s","Webseite fehlt, Datensatz überspringen, Zeile: %s" -"Month","Monat" -"My Account","Mein Konto" -"My Account Wrapper","Meine Account-Verpackung" -"My Dashboard","Meine Startseite" -"My Orders","Meine Bestellungen" -"Name","Name" -"Name and Address Options","Namen- und Adressoptionen" -"Never","Niemals" -"New Address","Neue Adresse" -"New Address Entry","Neuer Adresseintrag" -"New Customer","Neuer Kunde" -"New Customer Address","Neue Kundenadresse" -"New Customer Group","Neue Kundengruppe" -"New Customer Groups","Neue Kundengruppen" -"New Customers","Neue Kunden" -"New Group","Neue Gruppe" -"New Password","Neues Passwort" -"New account","Neues Konto" -"New account confirmation key","Neuer Kontobestätigungscode" -"New account confirmed","Neues Konto bestätigt" -"New password field cannot be empty.","Das Feld für das neue Passwort kann nicht leer sein." -"Newsletter","Newsletter" -"Newsletter Finish","Newsletter Ende" -"Newsletter Information","Newsletter Information" -"Newsletter Received","Newsletter empfangen" -"Newsletter Start","Newsletter Start" -"Newsletter Subscription","Newsletter abonnieren" -"Newsletters","Newsletter" -"No Items Found","Keine Objekte gefunden" -"No Newsletter Found","Kein Newsletter gefunden" -"No customer collections found","Keine Kundensammlungen gefunden" -"No item specified.","Kein Objekt angegeben." -"Not Sent","Nicht gesendet" -"Not confirmed, can login","Nicht bestätigt, kann sich anmelden" -"Not confirmed, cannot login","Nicht bestätigt, kann sich nicht anmelden" -"Number of Lines in a Street Address ","Zeilenzahl in einer Postadresse" -"Offline","Offline" -"Online","Online" -"Online Customers","Online-Kunden" -"Online Customers Options","Online-Kunden-Optionen" -"Online Minutes Interval","Online-Minuten-Intervall" -"Order #","Bestellung #" -"Order Total","Gesamtsumme Bestellung" -"Orders","Aufträge" -"PDF","PDF" -"Password","Passwort" -"Password Management","Passwortverwaltung" -"Password Options","Passwortoptionen" -"Password forgotten","Passwort vergessen" -"Password:","Passwort:" -"Paused","Pausiert" -"Pending","Ausstehend" -"Per Website","Pro Webseite" -"Personal Information","Persönliche Informationen" -"Please enter a number 1 or greater in this field.","Bitte geben sie hier eine Zahl ein, die mindestens 1 beträgt." -"Please enter a valid date between %s and %s at %s.","Bitte geben sie ein gültiges Datum zwischen %s und %s zu %s ein." -"Please enter a valid date equal to or greater than %s at %s.","Bitte geben sie ein gültiges Datum gleich oder größer als %s zu %s ein." -"Please enter a valid date less than or equal to %s at %s.","Bitte geben sie ein gültiges Datum gleich oder kleiner als %s zu %s ein." -"Please enter the city.","Bitte geben Sie die Stadt ein." -"Please enter the country.","Bitte geben Sie das Land ein." -"Please enter the first name.","Bitte geben Sie den Vornamen ein." -"Please enter the last name.","Bitte geben Sie den Nachnamen ein." -"Please enter the state/province.","Bitte geben Sie das Bundesland an." -"Please enter the street.","Bitte geben Sie die Straße ein." -"Please enter the telephone number.","Bitte geben Sie die Telefonnummer ein." -"Please enter the zip/postal code.","Bitte geben Sie die Postleitzahl an." -"Please enter your email address below. You will receive a link to reset your password.","Bitte geben Sie Ihre Email-Adresse ein. Sie erhalten dann einen Link mit dem Sie Ihr Passwort zurücksetzen können." -"Please enter your email below and we\'ll send you confirmation link for it.","Bitte geben Sie unten Ihre E-Mail-Adresse ein, und wir senden Ihnen einen Bestätigungslink." -"Please enter your email.","Bitte geben Sie Ihre E-Mail-Adresse ein." -"Please make sure your passwords match.","Bitte stellen Sie sicher, dass die Passwörter übereinstimmen." -"Please select a website which contains store view","Bitte wählen sie eine Webseite mit Store-Ansicht aus" -"Please select region, state or province","Bitte Region, Staat oder Provinz auswählen" -"Please, check your email for confirmation key.","Bitte überprüfen Sie Ihre E-Mails auf den Bestätigungscode." -"Prefix Dropdown Options","Vorwahl-Auswahlboxoptionen" -"Price","Preis" -"Product","Produkt" -"Product ID","Produkt-ID" -"Product Name","Produktname" -"Product Reviews","Produktreviews" -"Product Tags","Produkttags" -"Purchase On","Gekauft am" -"Purchased On","Gekauft am" -"Qty","Anzahl" -"Recent Orders","Letzte Bestellungen" -"Records for %s store found.","Einträge für %s Laden gefunden." -"Recovery Link Expiration Period (days)","Verbleibende Gültigkeitsdauer des Wiederherstellungslinks (Tage)" -"Redirect Customer to Account Dashboard after Logging in","Kunden nach Login zur Kontostartseite umleiten" -"Refunded","Rückerstattet" -"Register","Registrieren" -"Registered Customers","Registrierte Kunden" -"Remind Email Template","Vorlage Erinnerungsmail" -"Remind Password","An Passwort erinnern" -"Remove","Entfernen" -"Require Emails Confirmation","E-Mail-Bestätigung nötig" -"Reset a Password","Passwort zurücksetzen" -"Retrieve address data","Adressdaten abfragen" -"Retrieve address info","Adressinfo abfragen" -"Retrieve customer addresses","Kundenadressen abfragen" -"Retrieve customer data","Kundendaten abfragen" -"Retrieve customer groups","Kundengruppen abfragen" -"Retrieve customer info","Kundeninfo abfragen" -"Retrieve customers","Kunden abfragen" -"Retrieve your confirmation link here","Bestätigungslink hier anfordern" -"Retrieve your password here","Passwort hier anfordern" -"SKU","SKU" -"Sales Statistics","Verkaufsstatistiken" -"Save","Speichern" -"Save Address","Adresse speichern" -"Save Customer","Kunden speichern" -"Save Customer Group","Kundengruppe speichern" -"Save Password","Passwort speichern" -"Save and Continue Edit","Speichern und Bearbeitung fortsetzen" -"Saved %d record(s)","%d gespeicherte(r) Eintrag/Einträge" -"Semicolon (;) separated values.
    Put semicolon in the beginning for empty first option.
    Leave empty for open text field.","Semikolon (;) getrennte Werte.
    Setzen Sie ein Semikolon an den Anfang für eine leere erste Option.
    Leer lassen für ein offenes Textfeld." -"Send Auto-Generated Password","Automatisch generiertes Passwort zusenden" -"Send From","Senden von" -"Send Welcome Email","Willkommen eMail senden" -"Send Welcome Email after Confirmation","Willkommen eMail nach Bestätigung senden" -"Send confirmation link","Bestätigungslink senden" -"Sending","Wird gesendet" -"Sent","Gesendet" -"Session Start Time","Startzeit der Session" -"Set as Default Billing Address","Rechnungsadresse als Vorgabe einstellen" -"Set as Default Shipping Address","Versandadresse als Vorgabe einstellen" -"Share Customer Accounts","Kundenkonten gemeinsam nutzen" -"Shipped to First Name","Versendet an Vorname" -"Shipped to Last Name","Versendet an Nachname" -"Shipped to Name","Versendet an Name" -"Shopping Cart","Warenkorb" -"Shopping Cart - %d item(s)","Einkaufswagen - %d Artikel" -"Shopping Cart of %1$s - %2$d item(s)","Einkaufswagen von %1$s - %2$d Artikel" -"Show Date of Birth","Geburtsdatum anzeigen" -"Show Gender","Geschlecht anzeigen" -"Show Middle Name (initial)","Zweiten Vornamen anzeigen (Initialen)" -"Show Prefix","Präfix anzeigen" -"Show Suffix","Suffix anzeigen" -"Show Tax/VAT Number","Steuer/MwSt. Nummer anzeigen" -"Show VAT Number on Frontend","Umsatzsteuer-Identifikationsnummer am Frontende anzeigen" -"Sign Up for Newsletter","Für Newsletter eintragen" -"Skipping import row, required field ""%s"" is not defined.","Import der Reihe wird jetzt übersprungen. Das benötigte Feld ""%s"" ist nicht definiert." -"Skipping import row, website ""%s"" field does not exist.","Import-Zeile übersprungen, Feld für Webseite ""%s"" existiert nicht." -"State/Province","Staat/Provinz" -"Status","Status" -"Store","Shop" -"Store View","Store-Ansicht" -"Street Address","Adresse Strasse" -"Street Address %s","Adresse Strasse %s" -"Subject","Betreff" -"Submit","Senden" -"Subscribe to Newsletter","Newsletter abonnieren" -"Subscribed to Newsletter?","Newletter abonniert?" -"Suffix Dropdown Options","Optionen für Suffix-Aufklappmenü" -"Tag Name","Tagname" -"Tax Calculation Based On","Steuerberechnung anhand von" -"Tax Class","Steuerklasse" -"Tax/VAT number","USt.ID" -"Telephone","Telefon" -"Text","Text" -"Text One Line","Text einzeilig" -"Thank you for registering with %s.","Vielen Dank für Ihre Registrierung bei %s." -"The Date of Birth is required.","Das Geburtsdatum muss angegeben werden." -"The TAX/VAT number is required.","Die USt-IdNr. muss angegeben werden." -"The VAT ID entered (%s) is not a valid VAT ID.","Die angegebene Umsatzsteuer-Identifikationsnummer (%s) ist nicht gültig." -"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","Die angegebene Umsatzsteuer-Identifikationsnummer (%s) ist nicht gültig. Der Kunde würde in Kundengruppe %s gehören." -"The VAT ID is valid. The current Customer Group will be used.","Umsatzsteuer-Identifikationsnummer (%s) ist nicht gültig. Aktuelle Kundengruppe wird angewandt -." -"The account information has been saved.","Benutzerkonto Information wurde gespeichert." -"The address does not belong to this customer.","Diese Adresse gehört nicht zu diesem Kunden." -"The address has been deleted.","Die Adresse wurde gelöscht." -"The address has been saved.","Die Adresse wurde gespeichert." -"The customer ID and email did not match, skipping the record, line: %s","Kunden-ID und E-Mail stimmen nicht überein, Datensatz überspringen, Zeile: %s" -"The customer does not have default billing address.","Der Kunde hat keine Standard-Rechnungsadresse." -"The customer email (%s) already exists, skipping the record, line: %s","Kunden - E-Mail existiert bereits, Datensatz überspringen, Zeile: %s" -"The customer group has been deleted.","Die Kundengruppe wurde gelöscht." -"The customer group has been saved.","Die Kundengruppe wurde gespeichert." -"The customer is currently assigned to Customer Group %s.","Der Kunde ist derzeit Kundengruppe %s zugeordnet." -"The first name cannot be empty.","Der Vorname darf nicht leer sein." -"The group ""%s"" cannot be deleted","Die Gruppe ""%s"" kann nicht gelöscht werden" -"The last name cannot be empty.","Der Nachname darf nicht leer sein." -"The minimum password length is %s","Die minimale Passwortlänge beträgt %s." -"The password cannot be empty.","Das Passwort darf nicht leer sein." -"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","Ihr Passwort muß aus mindest 6 Zeichen bestehen. Leerzeichen am Anfang oder Ende werden abgeschnitten." -"The suffix that goes after name (Jr., Sr., etc.)","Das Suffix nach dem Namen (Jr., Sr., usw.)" -"The title that goes before name (Mr., Mrs., etc.)","Die Anrede vor dem Namen (Hr., Fr., usw.)" -"There are no items in customer's wishlist at the moment","Momentan gibt es keine Artikel auf dem Wunschzettel des Kunden" -"There are no items in customer\'s shopping cart at the moment","Es gibt momentan keine Artikel im Kundenwarenkorb" -"There is already an account with this email address. If you are sure that it is your email address, click here to get your password and access your account.","Es existiert schon ein Account mit dieser E-Mail-Adresse. Falls Sie sicher sein sollten, dass es Ihre E-Mail-Adresse ist, klicken Sie hier, um Ihr Passwort und Zugang zum Account zu erhalten." -"There was an error validating the VAT ID.","Bei der Überprüfung der Umsatzsteuer-Identifikationsnummer ist ein Fehler aufgetreten." -"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","Bei der Überprüfung der Umsatzsteuer-Identifikationsnummer trat ein Fehler auf. Der Kunde würde zu Kundengruppe %s gehören." -"This account is not confirmed.","Dieses Benutzerkonto wurde nicht bestätigt." -"This customer email already exists","Diese Kunden-Mailadresse existiert bereits" -"This customer has no saved addresses.","Dieser Kunde besitzt keine gespeicherten Adressen." -"This email does not require confirmation.","Diese E-Mail erfordert keine Bestätigung." -"This email will be sent instead of default welcome email, after account confirmation.","Diese E-Mail wird statt der Standard Willkommensnachricht nach dem Anlegen eines Benutzerkontos verschickt." -"This is My Default %s Address","Dies ist meine Standard %s Adresse" -"To Cart","Zum Warenkorb" -"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","Um die Umsatzsteuer-Identifikationsnummer am Frontende anzuzeigen, stellen Sie Umsatzsteuer-Identifikationsnummer anzeigen in der Frontende-Option auf Ja." -"Total","Gesamtbetrag" -"Type","Typ" -"Unable to save the customer.","Speichern von Kunde nicht möglich." -"Unknown","Unbekannt" -"Unsubscribe from Newsletter","Vom Newsletter abmelden" -"Update","Aktualisieren" -"Update customer address data","Kundenadressdaten aktualisieren" -"Update customer data","Kundendaten aktualisieren" -"Use as My Default %s Address","Als meine Standard %s Adresse verwenden" -"Use as My Default Billing Address","Als meine Standard-Rechnungsadresse verwenden" -"Use as My Default Shipping Address","Als meine Standard-Versandadresse verwenden" -"Use as my default billing address","Als meine Standard-Rechnungsadresse verwenden" -"Use as my default shipping address","Als meine Standardlieferadresse verwenden" -"VAT Number","MwSt.-Nummer" -"VAT Request Date","Anfordungsdatum der Umsatzsteuer" -"VAT Request Identifier","Anfragekennung für Umsatzsteuer" -"Validate VAT Number","Umsatzsteuer-Identifikationsnummer wird überprüft" -"Validate on Each Transaction","Bei jeder Transaktion überprüfen" -"Validation Error Group","Überprüfungsfehler Gruppe" -"View","Anzeigen" -"View Order","Bestellung ansehen" -"Visitor","Besucher" -"Visitors Only","Nur Besucher" -"Website","Website" -"Welcome Email","Willkommensnachricht" -"Wishlist","Wunschzettel" -"Wishlist - %d item(s)","Wunschzettel - %d Artikel" -"Would you like to change the Customer Group for this order?","Möchten sie die Kundengruppe für diese Bestellung ändern?" -"Wrong confirmation key.","Falscher Bestätigungsschlüssel." -"Wrong customer account specified.","Falsches Benutzerkonto angegeben." -"Wrong email.","Falsche E-Mail." -"Wrong transactional account email type","Falsche Girokonto E-Mail" -"YYYY","JJJJ" -"Year","Jahr" -"You are currently not subscribed to any newsletter.","Sie sind momentan für keinen Newsletter angemeldet." -"You are currently not subscribed to our newsletter.","Sie sind momentan nicht für unseren Newsletter angemeldet." -"You are currently subscribed to 'General Subscription'.","Sie sind momentan für das Abo 'Allgemeines' angemeldet." -"You are currently subscribed to our newsletter.","Sie sind momentan für unseren Newsletter angemeldet." -"You are now logged out","Sie sind jetzt abgemeldet" -"You have logged out and will be redirected to our homepage in 5 seconds.","Sie haben sich abgemeldet und werden innerhalb von 5 Sekunden zu unserer Startseite weitergeleitet." -"You have no additional address entries in your address book.","Sie haben keine zusätzlichen Adresseinträge in Ihrem Adressbuch." -"You have no additional entries in your address book.","Sie besitzen keine zusätzlichen Einträge in Ihrem Adressbuch." -"You have no default billing address in your address book.","Sie haben in Ihrem Adressbuch keine Standard-Rechnungsadresse." -"You have no default entries in your address book.","In Ihrem Adressbuch befinden sich keine Standard-Einträge." -"You have no default shipping address in your address book.","Sie haben in Ihrem Adressbuch keine Standard-Versandadresse." -"You have not set a default billing address.","Sie haben keine Standard-Rechnungsadresse angegeben." -"You have not set a default shipping address.","Sie haben keine Standard-Versandadresse angegeben." -"You have placed no orders yet.","Sie haben noch keine Bestellung aufgegeben." -"You have placed no products yet.","Sie haben noch keine Artikel ausgewählt." -"You will be charged tax.","Sie sind steuerpflichtig." -"You will not be charged tax.","Sie sind nicht steuerpflichtig." -"Your Tax ID cannot be validated.","Ihre Umsatzsteuer-Identifikationsnummer konnte nicht überprüft werden." -"Your VAT ID was successfully validated.","Ihre Umsatzsteuer-Identifikationsnummer wurde erfolgreich überprüft." -"Your account balance is: %s","Ihr Kontostand beträgt: %s" -"ZIP","Postleitzahl" -"ZIP/Post Code","Postleitzahl" -"Zip/Postal Code","Postleitzahl" -"n/a","Keine Angabe" -"or","oder" -"register","Registrieren" diff --git a/app/locale/de_DE/Mage_Dataflow.csv b/app/locale/de_DE/Mage_Dataflow.csv deleted file mode 100644 index dcdbf1703..000000000 --- a/app/locale/de_DE/Mage_Dataflow.csv +++ /dev/null @@ -1,32 +0,0 @@ -"Link","Link" -"Actions XML is not valid.","Aktionen XML nicht gültig." -"An error occurred while opening file: ""%s"".","Beim Öffnen der Datei ist ein Fehler aufgetreten: ""%s""." -"Could not load file: ""%s"".","Datei konnte nicht geladen werden: ""%s""." -"Could not save file: %s.","Datei """"%s"""" konnte nicht gespeichert werden." -"Declared adapter %s was not found.","Deklarierer Adapter %s wurde nicht gefunden." -"Destination folder ""%s"" is not a directory.","Zielordner ""%s"" ist kein Verzeichnis." -"Destination folder ""%s"" is not writable.","Zielordner ""%s"" ist nicht beschreibbar." -"Done","Fertig" -"Dry run set, stopping execution.","Probelauf gesetzt, Ausführung wird gestoppt." -"ETA: %s","ETA: %s" -"Error in field mapping: field list for mapping is not defined.","Fehler beim Feldmapping: Feldliste für Mapping ist nicht definiert." -"File ""%s"" does not exist.","Datei ""%s"" existiert nicht." -"Found %d rows.","%d Zeilen gefunden." -"Less than a minute","Weniger als eine Minute" -"Loaded successfully: ""%s"".","Erfolgreich geladen: ""%s""." -"Memory Used: %s","Benützter Speicher: %s" -"Method ""%s"" not defined in adapter %s.","Methode ""%s"" im Adapter %s nicht definiert." -"Method ""%s"" was not defined in adapter %s.","Methode ""%s"" wurde im Adapter %s nicht definiert." -"Please declare ""adapter"" and ""method"" nodes first.","Bitte zuerst die Schnittstellen ""adapter"" und ""method"" deklarieren." -"Processed records: %s","Verarbeitete Einträge: %s" -"Profile with the same name already exists.","Profil mit gleichem Namen existiert bereits." -"Saved successfully: ""%s"" [%d byte(s)].","Erfolgreich gespeichert: ""%s"" [%d Byte]." -"Sheet 1","Blatt 1" -"Skip undefined row.","Undefinierte Zeile auslassen." -"Starting %s :: %s","%s :: %s wird gestartet." -"The destination folder ""%s"" does not exist or there is no access to create it.","Der Zielordner ""%s"" existiert entweder nicht, oder gibt es keinen Zugang, um ihn zu erstellen." -"Total records: %s","Gesamtanzahl Einträge: %s" -"hour","Stunde" -"hours","Stunden" -"minute","Minute" -"minutes","Minuten" diff --git a/app/locale/de_DE/Mage_Directory.csv b/app/locale/de_DE/Mage_Directory.csv deleted file mode 100644 index 1a79ea32b..000000000 --- a/app/locale/de_DE/Mage_Directory.csv +++ /dev/null @@ -1,49 +0,0 @@ -"-- Please select --","-Bitte wählen -" -"Allowed Currencies","Zulässige Währungen" -"Base Currency","Basiswährung" -"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","Die Basiswährung wird für alle Online-Transaktionen verwendet. Der Spielraum richtet sich nach dem Spielraum des Katalogpreises (""Katalog"" > ""Preis"" > ""Spielraum Katalogpreis"")." -"Can\'t convert rate from ""%s-%s"".","Rate kann nicht von ""%s-%s"" konvertiert werden." -"Cannot retrieve rate from %s.","Kurs von %s kann nicht abgefragt werden." -"Connection Timeout in Seconds","Verbindungstimeout in Sekunden" -"Continue »","» fortsetzen;" -"Country","Land" -"Country API","Land API" -"Country and Format Type combination should be unique","Die Kombination aus Land und Formattyp sollte unverwechselbar sein" -"Currency","Währung" -"Currency Options","Währung Optionen" -"Currency Setup","Währung Setup" -"Currency Update Warnings","Währung Aktualisierung Warnungen" -"Default Display Currency","Angezeigte Standardwährung" -"Directory","Verzeichnis" -"Display not required State","Anzeige nicht erforderlich Status" -"Enabled","Aktiviert" -"Error Email Recipient","Fehler E-Mail Empfänger" -"Error Email Sender","Fehler E-Mail Absender" -"Error Email Template","Fehler E-Mail Vorlage" -"FATAL ERROR:","SCHWERWIEGENER FEHLER:" -"Frequency","Frequenz" -"Installed Currencies","Installierte Währungen" -"Invalid Import Service specified.","Ungültiger Importservice gewählt." -"Invalid country code: %s","Ungültiger Länder-Code: %s" -"Invalid rates received","Ungültige Kurse erhalten" -"Invalid target currency.","Ungültige Zielwährung." -"List of countries","Länderverzeichnis" -"List of regions in specified country","Liste der Regionen in einem gewählten Land" -"Postal Code is Optional for the following countries","Für folgende Länder ist die Postleitzahl optional" -"Region","Region" -"Region API","Region API" -"Scheduled Import Settings","Geplanter Import Einstellungen" -"Select Your Currency","Wählen Sie Ihr Land aus" -"Service","Service" -"Start Time","Startzeit" -"State is required for","Status ist erforderlich für" -"State/Province","Bundesstaat/ Provinz" -"States Options","Status-Optionen" -"Strikeiron Email Update Warnings","Strikeiron E-Mail-Aktualisierungswarnungen" -"Unable to initialize the import model.","Import-Model konnte nicht initialisiert werden." -"Undefined rate from ""%s-%s"".","Nicht definierter Satz von ""%s-%s""." -"WARNING:","WARNUNG:" -"Webservicex","Webservicex" -"Your Currency","Ihre Währung" -"Your Currency:","Ihre Währung:" -"Your current currency is: %s","Ihre aktuelle Währung ist: %s" diff --git a/app/locale/de_DE/Mage_Downloadable.csv b/app/locale/de_DE/Mage_Downloadable.csv deleted file mode 100644 index 1344f4e5c..000000000 --- a/app/locale/de_DE/Mage_Downloadable.csv +++ /dev/null @@ -1,95 +0,0 @@ -"Add","Hinzufügen" -"Add New Row","Neue Zeile hinzufügen" -"Add links and samples to downloadable product","Links und Beispiele zum herunterladbaren Produkt hinzufügen" -"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.","Alphanumerische Zeichen, Bindestriche und Unterstriche werden für Dateinamen empfohlen. Unangemessene Zeichen werden durch '_' ersetzt." -"An error occurred while getting the requested content.","Beim Laden des angeforderten Inhalts ist ein Fehler aufgetreten." -"An error occurred while getting the requested content. Please contact the store owner.","Beim Laden des angeforderten Inhalts ist ein Fehler aufgetreten. Bitte kontaktieren Sie den Shopbesitzer." -"An error occurred while saving the file(s).","Beim Speichern der Datei(en) ist ein Fehler aufgetreten." -"Availability:","Verfügbarkeit:" -"Back","Zurück" -"Canceled","Storniert" -"Cannot connect to remote host, error: %s.","Verbindung zu Remote Host kann nicht aufgebaut werden, Fehler: %s." -"Catalog Product View (Downloadable)","Katalog Produktansicht (Herunterladbar)" -"Category API","Kategorie API" -"Customer My Account Downloadable Items","Kunde Mein Konto Herunterladbare Artikel" -"Date","Datum" -"Default Link Title","Standard Linktitel" -"Default Maximum Number of Downloads","Standard Maximumanzahl von Downloads" -"Default Sample Title","Standard Beispietitel" -"Delete","Löschen" -"Disable Guest Checkout if Cart Contains Downloadable Items","Gastcheckout deaktivieren wenn Warenkorb Herunterladbare Artikel enthält" -"Downloadable Information","Herunterladbare Informationen" -"Downloadable Product","Herunterladbares Produkt" -"Downloadable Product Options","Herunterladbare Produktoptionen" -"Downloadable Product Section","Herunterladbarer Produktbereich" -"Edit","Bearbeiten" -"Edit item parameters","Artikelangaben ändern" -"Excl. Tax","Steuer weglassen" -"File","Datei" -"From:","Von:" -"Gift Message","Geschenkmitteilung" -"Go to My Downloadable Products","Gehen Sie zu Meine Download Produke" -"Guest checkout will only work with shareable.","Gastcheckout funktioniert nur wenn mitbenutzbar." -"In stock","Auf Lager" -"Incl. Tax","Steuer inkludieren" -"Invalid download URL host.","Ungültiger Download URL Host." -"Invalid download URL scheme.","Ungültiges Download URL Schema." -"Invalid download link type.","Ungültiger Downloadlinktyp." -"Invoiced","In Rechnung gestellt." -"Links can be purchased separately","Links können separat gekauft werden." -"List","Liste" -"Max. Downloads","Max. Downloads" -"Message:","Nachricht:" -"Move","Verschieben" -"Move to wishlist","Auf den Wunschzettel verschieben" -"My Downloadable Products","Meine herunterladbaren Produkte" -"Open Links in New Window","Links in neuem Fenster öffnen" -"Order #","Bestellung #" -"Order Item Status to Enable Downloads","Bestellungsartikelstatus zu Downloads aktivieren" -"Order id cannot be null","Order-ID kann nicht Null sein" -"Order item id cannot be null","Order-Artikel-ID kann nicht Null sein" -"Ordered","Bestellt" -"Out of stock","Nicht lieferbar" -"Pending","Ausstehend" -"Please log in to download your product or purchase %s.","Bitte melden Sie sich an um Ihr Produkt herunterzuladen oder zu kaufen %s." -"Please log in to download your product.","Bitte melden Sie sich an um das Produkt herunterzuladen." -"Please set resource file and link type.","Bitte setzten Sie Ressourcendatei und Linktyp." -"Please specify product link(s).","Bitte spezifizieren Sie Produktlink(s)." -"Price","Preis" -"Product downloadable links","Produkt-Download Links" -"Qty","Anzahl" -"Refunded","Rückerstattet" -"Remaining Downloads","Übrige Downloads" -"Remove","Löschen" -"Remove Item","Artikel entfernen" -"Remove links and samples from downloadable product","Links und Beispiele vom herunterladbaren Produkt entfernen" -"Requested link does not exist.","Angeforderter Link existiert nicht." -"Retrieve links and samples list from downloadable product","Links und Beispielliste vom herunterladbaren Produkt abrufen" -"SKU","SKU" -"Sample","Beispiel" -"See price before order confirmation.","Preis vor Bestellbestätigung ansehen." -"Shareable","Mitbenutzbar" -"Shipped","Versandt" -"Sorry, there was an error getting requested content. Please contact the store owner.","Leider trat beim Einholen des gewünschten Inhalts ein Fehler auf. Bitte kontaktieren Sie den Shopinhaber." -"Sort Order","Sortierreihenfolge" -"Start Download","Download starten" -"Status","Status" -"Subtotal","Zwischensumme" -"The file does not exist.","Die Datei existiert nicht." -"The link has expired.","Der Link ist abgelaufen." -"The link is not available.","Der Link ist nicht verfügbar." -"There are files that were selected but not uploaded yet. Please upload or remove them first","Einige Dateien wurden ausgewählt aber noch nicht hochgeladen. Bitte laden Sie sie erst hoch oder entfernen Sie sie." -"Title","Titel" -"To:","An:" -"U","U" -"Unlimited","Unbegrenzt" -"Update","Aktualisieren" -"Use Content-Disposition","Verwenden Sie Content-Disposition" -"Use Default Value","Standardwert verwenden" -"View Order","Bestellung ansehen" -"What's this?","Was ist das?" -"You have not purchased any downloadable products yet.","Sie haben noch keine herunterladbaren Produkte gekauft." -"attachment","Anhang" -"download","Download" -"inline","Inline" -"sample","Probe" diff --git a/app/locale/de_DE/Mage_Eav.csv b/app/locale/de_DE/Mage_Eav.csv deleted file mode 100644 index f8203d57c..000000000 --- a/app/locale/de_DE/Mage_Eav.csv +++ /dev/null @@ -1,124 +0,0 @@ -"""%s"" contains not only digit characters.","""%s"" besteht nicht nur aus Ziffern." -"""%s"" does not fit the entered date format.","""%s"" stimmt nicht mit dem eingegebenen Datumsformat überein." -"""%s"" exceeds the allowed file size.","""%s"" überschreitet die vorgeschriebene Dateigröße." -"""%s"" exceeds the allowed length.","""%s"" überschreitet die vorgeschriebene Länge." -"""%s"" has not only alphabetic and digit characters.","""%s"" besteht nicht nur aus Buchstaben und Ziffern." -"""%s"" has not only alphabetic characters.","""%s"" besteht nicht nur aus Buchstaben." -"""%s"" height exceeds allowed value of %s px.","Die Größe von ""%s"" überschreitet den möglichen Wert von %s px" -"""%s"" invalid type entered.","Ungültiger ""%s""-Typ eingegeben." -"""%s"" is a required value.","""%s"" ist ein Zwangsfeld." -"""%s"" is an empty string.","""%s"" ist ein leerer String." -"""%s"" is not a valid URL.","""%s"" ist eine ungültige URL." -"""%s"" is not a valid date.","""%s"" ist ein ungültiges Datum." -"""%s"" is not a valid email address.","""%s"" ist eine ungültige E-Mail-Adresse." -"""%s"" is not a valid file","""%s"" ist eine ungültige Datei." -"""%s"" is not a valid file extension.","""%s"" ist eine ungültige Dateierweiterung." -"""%s"" is not a valid file.","""%s"" ist eine ungültige Datei." -"""%s"" is not a valid hostname.","""%s"" ist eine ungültiger Hostname." -"""%s"" is not a valid image format","""%s"" ist ein ungültiges Bildformat." -"""%s"" length must be equal or greater than %s characters.","""%s"" muss %s oder mehr Zeichen haben." -"""%s"" length must be equal or less than %s characters.","""%s"" muss %s oder weniger Zeichen haben." -"""%s"" width exceeds allowed value of %s px.","Die Breite von ""%s"" überschreitet den vorgeschriebenen Wert von %s Pixeln." -"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' ist offenbar ein DNS-Hostname, aber die Hauptdomäne (TLD) lässt sich nicht extrahieren." -"'%value%' appears to be a DNS hostname but cannot match TLD against known list","%value%' ist offenbar ein DNS-Hostname, aber die Hauptdomäne (TLD) lässt sich nicht unter den bekannten Einträgen finden." -"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","%value%' ist offenbar ein DNS-Hostname, aber die Hauptdomäne (TLD) entspricht keinem Hostnamen -Schema für TLD '%tld%'." -"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","%value%' ist offenbar ein DNS-Hostname mit einem Strich an einer ungültigen Stelle." -"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' scheint ein DNS-Hostname zu sein, aber die angegebene Punycode-Notation konnte nicht entschlüsselt werden." -"'%value%' appears to be a local network name but local network names are not allowed","'%value%' scheint der Name eines lokalen Netzwerks zu sein. Namen lokaler Netzwerke sind allerdings nicht erlaubt." -"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' scheint eine IP-Adresse zu sein. IP-Adressen sind allerdings nicht erlaubt." -"'%value%' does not appear to be a valid URI hostname","'%value%' scheint kein gültiger URI-Hostname zu sein" -"'%value%' does not appear to be a valid local network name","'%value%' scheint kein gültiger Name für ein lokales Netzwerk zu sein." -"'%value%' does not match the expected structure for a DNS hostname","'%value%' entspricht nicht der erwarteten Struktur eines DNS-Hostnames." -"A joint field with this alias (%s) is already declared","Ein gemeinsames Feld mit diesem Alias (%s) ist bereits deklariert" -"Add Option","Option hinzufügen" -"An error occurred while loading a record, aborting. Error: %s","Fehler beim Laden eines Eintrags, Abbruch. Fehler: %s" -"An error occurred while loading the collection, aborting. Error: %s","Fehler beim Laden der Zusammenstellung, Abbruch. Fehler: %s" -"An error occurred while saving a record, aborting. Error: ","Fehler beim Speichern eines Eintrags, Abbruch. Fehler:" -"Attempt to add an invalid object","Versuch, ein ungültiges Objekt hinzuzufügen" -"Attribute '%s' used in configurable products","Attribut '%s' wird für konfigurierbare Produkte verwendet" -"Attribute Code","Attributcode" -"Attribute Label","Attributlabel" -"Attribute Properties","Attributeigenschaften" -"Attribute object is undefined","Attributobjekt ist undefiniert" -"Attribute set with the ""%s"" name already exists.","Attributset mit dem Namen ""%s"" besteht bereits." -"Attribute with the same code","Attribut mit dem gleichen Code" -"Can\'t create table: %s","Kann keine Tabelle erstellen: %s" -"Catalog Input Type for Store Owner","Katalog Eingabetyp für Shopbesitzer" -"Current module EAV entity is undefined","Aktuelles Modul EAV-Einheit ist nicht definiert" -"Current module pathname is undefined","Der derzeitige Modulpfad ist undefiniert" -"Data integrity: No header row found for attribute","Datenrichtigkeit: Keine Kopfzeile für dieses Attribut" -"Date","Datum" -"Decimal Number","Dezimalzahl" -"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","Standard-Produktauflistung, sortiert nach, existiert nicht in Verfügbare Produktauflistung, sortiert nach. " -"Default Value","Vorgegebener Wert" -"Default option value is not defined","Standard-Optionswert ist nicht definiert" -"Delete","Löschen" -"Dropdown","DropDown" -"Email","E-Mail" -"Entity collection expected.","Datensatz Zusammenstellung erwartet." -"Entity collections expected.","Datensatz Zusammenstellungen erwartet." -"Entity instance is not defined","Entity-Instanz ist nicht definiert" -"Entity is not initialized","Entity ist nicht initialisiert" -"Entity object is undefined","Entity-Objekt ist undefiniert" -"Failed to load node %s from config","Fehler beim Laden des Knotens %s von der Konfiguration" -"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","Zum internen Gebrauch. Muss einzigartig sein und darf keine Leerzeichen enthalten. Die maximale Länge des Attribut-Codes muss weniger als %s Zeichen betragen" -"Form Element with the same attribute","Formular-Element mit gleichem Attribut" -"Form Fieldset with the same code","Formular-Fieldset mit gleichem Code" -"Form Type with the same code","Formulartyp mit gleichem Code" -"Form code is not defined","Formularcode ist nicht definiert" -"Frontend label is not defined","Frotend-Label ist nicht definiert" -"Input Validation for Store Owner","Eingabeprüfung für Shopbesitzer" -"Integer Number","Ganze Zahl" -"Invalid EAV attribute.","Ungültiges EAV-Attribut." -"Invalid alias, already exists in joint attributes","Ungültiger Alias, existiert bereits in gemeinsamen Attributen" -"Invalid attribute name: %s","Ungültiger Attributname: %s" -"Invalid attribute requested: %s","Ungültiges Attribut angefragt: %s" -"Invalid attribute type","Ungültiger Attributtyp: %s" -"Invalid character encountered in increment ID: %s","Ungültiges Zeichen in hochgezählter ID gefunden: %s" -"Invalid date","Ungültiges Datum" -"Invalid default date","Ungültiges Standarddatum" -"Invalid default decimal value","Ungültiger dezimaler Standardwert" -"Invalid entity specified","Ungültiger Datensatz angegeben" -"Invalid entity supplied.","Ungültiger Datensatz angegeben." -"Invalid entity supplied: %s","Ungültige Entity eingegeben: %s" -"Invalid entity type","Ungültiger Entity-Typ" -"Invalid entity_id, skipping the record.","Ungültige Datensatz ID, Eintrag wird übersprungen." -"Invalid entity_type specified: %s","Ungültiger Datensatztyp angegeben: %s" -"Invalid foreign key","Ungültiger ausländischer Schlüssel" -"Invalid form type.","Ungültiger Formulartyp." -"Invalid joint fields","Ungültige gemeinsame Felder" -"Invalid store specified","Ungültiger Store definiert" -"Invalid type given. String expected","Ungültigen Typ angegeben. Zeichenfolge erwartet." -"Joined field with this alias is already declared","Mit diesem Alias verbundenes Feld ​​ist bereits deklariert" -"Joint field or attribute expression with this alias is already declared","Gemeinsames Feld oder zusätzlicher Ausdruck mit diesem Alias ​​ist bereits deklariert" -"Letters","Buchstaben" -"Letters (a-z, A-Z) or Numbers (0-9)","Buchstaben (a-z, A-Z) oder Zahlen (0-9)" -"Loaded %d records","%d Einträge geladen" -"Maximum length of attribute code must be less then %s symbols","Die maximale Länge dieses Attributcodes sollte nicht länger als %s Zeichen sein." -"Multiple Select","Mehrfache Auswahl" -"No","Nein" -"No options found in config node %s","Keine Optionen in Konfigurationsknoten %s gefunden" -"None","Keine" -"Not shared with other products","Nicht mit anderen Produkten geteilt" -"Problem loading the collection, aborting. Error: %s","Problem beim Laden der Zusammenstellung, Abbruch. Fehler: %s" -"Problem saving the collection, aborting. Error: %s","Problem beim Speichern der Zusammenstellung, Abbruch. Fehler: %s" -"Required","Benötigt" -"Saved %d record(s).","%d Eingaben gespeichert." -"Source model ""%s"" not found for attribute ""%s""","Quellen-Modell ""%s"" wurde nicht gefunden für das Attribut ""%s""" -"System","System" -"Text Area","Textbereich" -"Text Field","Textfeld" -"The value of attribute ""%s"" must be unique","Der Wert des Attributs ""%s"" muss einzigartig sein." -"The value of attribute ""%s"" must be unique.","Der Wert des Attributs ""%s"" muss einzigartig sein." -"This attribute is used in configurable products","Dieses Attribut wird für konfigurierbare Produkte verwendet" -"URL","URL" -"Unique Value","Einmaliger Wert" -"Unique Value (not shared with other products)","Einmaliger Wert (nicht mit anderen Produkten geteilt)" -"Unknown parameter","Unbekannter Parameter" -"Values Required","Pflichtangabe" -"Wrong attribute group ID","Falsche Attribut-Gruppen-ID" -"Wrong attribute set ID","Falsche Attribut-ID" -"Wrong entity ID","Falsche Entity-ID" -"Wrong type definition for %s","Falsche Typdefinition für %s" -"Yes","Ja" -"Yes/No","Ja/Nein" diff --git a/app/locale/de_DE/Mage_GiftMessage.csv b/app/locale/de_DE/Mage_GiftMessage.csv deleted file mode 100644 index ab3adc26c..000000000 --- a/app/locale/de_DE/Mage_GiftMessage.csv +++ /dev/null @@ -1,38 +0,0 @@ -"Add","Hinzufügen" -"Add gift message for shopping cart","Grußbotschaft für Warenkorb hinzufügen" -"Add gift messages for quote item of shopping cart","Grußbotschaften für bestimmte Artikel im Warenkorb hinzufügen" -"Add gift messages to products of shopping cart","Grußbotschaften für Produkte im Warenkorb hinzufügen" -"Add gift options","Geschenkoptionen hinzufügen" -"Add gift options for Individual Items","Geschenkoptionen für einzelne Artikel hinzufügen" -"Add gift options for the Entire Order","Geschenkoptionen für die gesamte Bestellung hinzufügen" -"Add gift options.","Geschenkoptionen hinzufügen." -"Allow Gift Messages for Order Items","Geschenknachrichten für Bestellartikel erlauben" -"Allow Gift Messages on Order Level","Geschenknachrichten auf Bestellebene erlauben" -"An error occurred while saving the gift message.","Beim Speichern der Geschenknachricht ist ein Fehler aufgetreten." -"Are you sure?","Sind Sie sicher?" -"Cancel","Abbrechen" -"Do you have any gift items in your order?","Haben Sie Geschenkartikel in Ihrer Bestellung?" -"Edit","Bearbeiten" -"From","Von" -"Gift Message","Grußnachricht" -"Gift Message API","Grußbotschaft API" -"Gift Options","Geschenkoptionen" -"Gift Options for","Geschenkoptionen für" -"Gift Options for Individual Items","Geschenkoptionen für einzelne Artikel" -"Gift Options for the Entire Order.","Geschenkoptionen für den gesamten Auftrag." -"Gift Options for this address.","Geschenkoptionen für diese Anschrift." -"Item %d of %d","Artikel %d von %d" -"Message","Nachricht" -"No","Nein" -"OK","OK" -"Save Gift Message","Geschenknachricht speichern" -"The gift message has been removed","Die Geschenknachricht wurde entfernt" -"The gift message has been saved","Die Geschenknachricht wurde gespeichert" -"The gift message has been saved.","Die Geschennachricht wurde gespeichert." -"To","An" -"Unknown entity type","Unbekannter Entitätentyp" -"Use config","Konfiguration benützen" -"Yes","Ja" -"You can leave this box blank if you do not wish to add a gift message for the item.","Lassen Sie diese Box leer, wenn Sie keine Geschenknachricht zum Artikel hinzufügen wollen." -"You can leave this box blank if you do not wish to add a gift message for this address.","Lassen Sie diese Box leer, wenn Sie keine Geschenknachricht zu dieser Adresse hinzufügen wollen." -"You can leave this box blank if you do not wish to add a gift message for whole order.","Lassen Sie diese Box leer, wenn Sie keine Geschenknachricht zur gesamten Bestellung hinzufügen wollen." diff --git a/app/locale/de_DE/Mage_GoogleAnalytics.csv b/app/locale/de_DE/Mage_GoogleAnalytics.csv deleted file mode 100644 index 197111eea..000000000 --- a/app/locale/de_DE/Mage_GoogleAnalytics.csv +++ /dev/null @@ -1,5 +0,0 @@ -"Account Number","Kundenkontonummer" -"Enable","Aktivieren" -"Enable IP anonymization","IP-Anonymisierung aktivieren" -"Google API","Google-API" -"Google Analytics","Google Analytics" diff --git a/app/locale/de_DE/Mage_GoogleBase.csv b/app/locale/de_DE/Mage_GoogleBase.csv deleted file mode 100644 index cc5f839e5..000000000 --- a/app/locale/de_DE/Mage_GoogleBase.csv +++ /dev/null @@ -1,82 +0,0 @@ -"Active","Aktiv" -"Add Attribute Mapping","Attributmapping hinzufügen" -"Add New Attribute","Neues Attribut hinzufügen" -"Add to Google Base","Zu Google Base hinzufügen" -"Are you sure?","Sind Sie sicher?" -"Attribute","Attribut" -"Attribute Set","Attributset" -"Attribute Set and Item Type","Attributset und Artikeltyp" -"Attributes","Attribute" -"Attributes Mapping","Attributmapping" -"Attributes Set","Attributset" -"AuthSub","AuthSub" -"Available Products","Verfügbare Produkte" -"Base Currency should be set to %s for %s in system configuration. Otherwise item prices won't be correct in Google Base.","Base-Währung sollte in der Systemkonfiguration auf %s für %s eingestellt sein. Ansonsten sind die Artikelpreise auf Google Base nicht korrekt." -"Cannot update Google Base Item for Store '%s'","Google Grundgröße kann nicht für Store '%s' aktualisiert werden. - - - -" -"Captcha confirmation error: %s","Fehler bei Captcha Bestätigung: %s" -"Captcha has been confirmed.","Captcha wude bestätigt." -"Catalog","Katalog" -"Clicks","Klicks" -"ClientLogin","ClientLogin" -"Confirm","Bestätigen" -"Current Mapping will be reloaded. Continue?","Derzeitiges Mapping wird neu geladen. Fortfahren?" -"Custom attribute, no mapping","Benutzerdefiniertes Attribut, kein Mapping" -"Delete","Löschen" -"Delete Mapping","Mapping löschen" -"Edit Item Type","Itemtyp ändern" -"Edit Item Type ""%s""","Artikelart ""%s"" bearbeiten." -"Error: %s","Fehler: %s" -"Expires","Läuft ab" -"Google","Google" -"Google Base","Google Base" -"Google Base Attribute","Google Base Attribut" -"Google Base ID","Google Base ID" -"Google Base Item Type","Google Base Itemtyp" -"Google Base Item type","Google Base-Artikelart" -"Google Base Items","Google Base Artikel" -"Google base","Google base" -"Hide","Verstecken" -"Hosted","Gehostet" -"Hosted or Google","Gehostet oder Google" -"Impr.","Impr." -"Invalid Product Model for Google Base Item","Ungültiges Produktmodel für Google Base Artikel" -"Item Type was deleted","Artikeltyp wurde gelöscht" -"Item Types","Artikeltypen" -"Item model is not specified to delete Google Base entry.","Artikelmodell ist nicht spezifiziert um Google Base Eintrag zu löschen." -"Items","Artikel" -"Manage Attribute Mapping","Attributmapping verwalten" -"Manage Attributes","Attribute verwalten" -"Manage Items","Artikel verwalten" -"New Item Type","Neuer Artikeltyp" -"New ItemType","Neuer Artikeltyp" -"No","Nein" -"No items were deleted from Google Base","Keine Artikel wurden aus Google Base gelöscht" -"No items were published","Keine Artikel wurden veröffentlicht" -"No items were saved as inactive items","Keine Artikel wurden als inaktive Artikel gespeichert" -"No products were added to Google Base","Keine Produkte wurden zu Google Base hinzugefügt" -"Object model is not specified to save Google Base entry.","Objektmodell ist nicht spezifiziert um Google Base Eintrag zu speichern." -"Please, select Attribute Set and Google Item Type to load attributes","Bitte wählen sie Attributset und Google Artikeltyp um Attribute zu laden." -"Product Name","Produktname" -"Publish","Veröffentlichen" -"Published","Veröffentlicht" -"Remove","Entfernen" -"Save Mapping","Mapping speichern" -"Session expired during export. Please revise exported products and repeat the process if necessary.","Session ist während Export abgelaufen. Bitte überarbeiten Sie exportierte Produkte und versuchen Sie es, falls nötig, noch einmal." -"Synchronize","Synchronisieren" -"Target Country","Zielland" -"The item type has been saved.","Der Artikeltyp wurde gespeichert." -"This action will update items statistics and remove the items which are not available in Google Base. Continue?","Diese Aktion aktualisiert Artikelstatistiken und entfernt Artikel, die nicht in Google Base verfügbar sind. Fortfahren?" -"Total of %d items(s) have been deleted; total of %d items(s) have been updated.","Gesamtzahl von %d Artikel wurden gelöscht; Gesamtzahl von %d Artikel wurden aktualisiert." -"Total of %d items(s) have been published.","Gesamtzahl von %d Artikel wurden veröffentlicht." -"Total of %d items(s) have been removed from Google Base.","Gesamtzahl von %d Artikel wurden von Google Base entfernt." -"Total of %d items(s) have been saved as inactive items.","Gesamtzahl von %d Artikel wurden als inaktive Artikel gespeichert." -"Total of %d product(s) have been added to Google Base.","Gesamtzahl von %d Produkte(n) wurden zu Google Base hinzugefügt." -"Unable to connect to Google Base. Please, check Account settings in configuration.","Verbindung zu Google Base kann nicht hergestellt werden. Bitte checken Sie Kontoeinstellungen in der Konfiguration." -"Unable to select a Store View.","Shopansicht kann nicht gewählt werden." -"View Available Products","Verfügbare Produkte anzeigen" -"View Item in Google Base","Artikel in Google Base anzeigen" -"Yes","Ja" diff --git a/app/locale/de_DE/Mage_GoogleCheckout.csv b/app/locale/de_DE/Mage_GoogleCheckout.csv deleted file mode 100644 index b783ebe3d..000000000 --- a/app/locale/de_DE/Mage_GoogleCheckout.csv +++ /dev/null @@ -1,131 +0,0 @@ -"* Select shipping method","* Versandart auswählen" -"2Day","2Day" -"2nd Day Air","Flupost am zweiten Tag" -"2nd Day Air AM","Morgenstundenflugpost am zweiten Tag" -"3 Day Select","3 Day Select" -"
    Warning: %s
    ","
    Warnung: %s
    " -"Warning! This option disables the merchant calculated shipping. With this option, Google API ignores any attempt to affect shipping prices.","Warnung! Diese Einstellung deaktiviert den vom Verkäufer kalkulierten Versand. Mit dieser Einstellung ignoriert die Google-Programmierschnittstelle jeglichen Versuch, Versandpreise zu beeinflussen." -"A virtual item to reflect the discount total","Ein virtueller Artikel, der den Gesamtrabatt darstellt" -"A virtual item to reflect the tax total","Ein virtueller Artikel, der den Steuersatz darstellt" -"AVS Status: %s","AVS Status: %s" -"Add Shipping Method","Versandart hinzufügen" -"Allowed Methods","Erlaubte Mittel" -"Amount: %s","Betrag: %s" -"Auto-generated from GoogleCheckout Charge","Automatisch generiert aus GoogleCheckout Charge" -"Buyer Account Age: %s days","Alter des Käuferkontos: %s Tage" -"CC Partial: xxxx-%s","CC Teilsumme: xxxx-%s" -"CID Status: %s","CIS Status: %s" -"Carrier Calculated Methods","Frachtführer berechnete Methoden" -"Cart Discount","Warenkorb Rabatt" -"Checkout Image Style","Checkout Bild Stil" -"Commercial","Kommerziell" -"Continue Shopping URL","Einkauf fortsetzen URL" -"Credit memo has been created automatically","Gutschriftenempfänger wurde automatisch erstellt" -"Debug","Debug" -"Default Package Height (in)","Standardhöhe der Verpackung (in Inch)" -"Default Package Length (in)","Standardlänge der Verpackung (in Inch)" -"Default Package Width (in)","Standardbreite der Verpackung (in Inch)" -"Default Price for Methods","Standardpreis für Methoden" -"Default price:","Standardpreis:" -"Delivery Address Category","Lieferanschrift Kategorie" -"Delivery Schedule","Lieferplan" -"Description-based delivery","Beschreibungsbasierte Zustellung" -"Disable Default Tax Tables","Standard-Steuerverzeichnisse deaktivieren" -"Discount Tax","Steuerermäßigung" -"Eligible for Protection: %s","Schutzwürdig: %s" -"Email delivery","E-Mail-Zustellung" -"Enable","Aktivieren" -"Enable Carrier Calculated","""Frachführer berechnet"" aktivieren" -"Enable Digital Delivery","Digitale Lieferung aktivieren" -"Enable Flat Rate","Flat-Rate aktivieren" -"Enable Merchant Calculated","""Händler berechnet"" aktivieren" -"Enable this if your checkout request is too big and being cut off.","Aktivieren, falls Ihre Checkout-Anfrage zu groß ist und unterbrochen wird." -"Expiration: %s","Ende: %s" -"Express Mail","Express-E-Mail" -"Express Saver","Express Saver" -"FedEx","FedEx" -"Financial: %s -> %s","Finanziell: %s -> %s" -"First Overnight","First über Nacht" -"Free Shipping","Versandkostenfrei" -"Fulfillment: %s -> %s","Erfüllt: %s -> %s" -"Google API","Google-API" -"Google Authorization:","Google Autorisierung:" -"Google Buyer ID: %s","Google Käufer ID: %s" -"Google Charge:","Google Gebühr:" -"Google Chargeback:","Google-Rückbuchung:" -"Google Checkout","Google Checkout" -"Google Checkout Shipping - Carrier Calculated","Google Checkout Versand - Frachtführer berechnet" -"Google Checkout Shipping - Digital Delivery","Google Checkout Versand - Digitale Lieferung" -"Google Checkout Shipping - Flat Rate","Google Checkout Versand - Flat-Rate" -"Google Checkout Shipping - Merchant Calculated","Google Checkout Versand - Händler berechnet" -"Google Checkout: %s","Google Checkout: %s" -"Google Order Number: %s","Google Bestellnummer: %s" -"Google Order Status Change:","Google Bestellung Statusänderung:" -"Google Refund:","Google Erstattung:" -"Google Risk Information:","Google Risiko-Information:" -"GoogleCheckout is not configured","GoogleCheckout ist nicht konfiguriert" -"Ground","Boden" -"Hide Cart Contents","Warenkorbinhalte verbergen" -"Home Delivery","Heimzustellung" -"IP Address: %s","IP-Addresse: %s" -"If enabled, cart contents will be hidden after clicking on the Google Checkout button in the shopping cart, and restored if ""Edit Cart"" link was activated.","Sofern aktiviert sind Einkaufswageninhalte nach dem Betätigen der Google Checkout-Schaltfläche im Einkaufswagen nicht mehr sichtbar und werden nach dem Betätigen des ""Einkaufswagen bearbeiten""-Links wieder angezeigt." -"Inches","Zoll" -"Invoice Auto-Created: %s","Rechnung automatisch erstellt: %s" -"Is Buyer Willing to Receive Marketing Emails: %s","Ist der Käufer bereit, Marketing-E-Mails zu empfangen: %s" -"Key/URL delivery","Schlüssel/URL-Zustellung" -"Large - %s","Groß - %s" -"Latest Charge: %s","Letzte Belastung: %s" -"Latest Chargeback: %s","Letzte Rückbuchung: %s" -"Latest Refund: %s","Letzte Rückerstattung: %s" -"Location","Ort" -"Media Mail","Media Mail" -"Medium - %s","Medium - %s" -"Merchant ID","Händler-ID" -"Merchant Key","Händlerschlüssel" -"Method","Verfahren" -"New Order Status","Stand der neuen Bestellung" -"Next Day Air","Flugpost am nächsten Tag" -"Next Day Air Early AM","Morgenstundenflugpost am nächsten Tag" -"Next Day Air Saver","Saver-Flugpost am nächsten Tag" -"No","Nein" -"No Comment","Kein Kommentar" -"No Reason","Ohne Grund" -"Optimistic","Optimistisch" -"Optional, leave empty for home page.","Optional, für die Homepage frei lassen." -"Order creation error","Auftragserstellungsfehler" -"Parcel Post","Paketpost" -"Pessimistic","Pessimistisch" -"Priority Mail","Priority-Sendung" -"Priority Overnight","Priority über Nacht" -"Rate 1 Amount","Tarif 1 Betrag" -"Rate 1 Ship To Applicable Countries","Tarif 1 Versand an zutreffende Länder" -"Rate 1 Ship to Specific Countries","Tarif 1 Versand an spezifische Länder" -"Rate 1 Title","Tarif 1 Titel" -"Rate 2 Amount","Tarif 2 Betrag" -"Rate 2 Ship To Applicable Countries","Tarif 2 Versand an zutreffende Länder" -"Rate 2 Ship to Specific Countries","Rate 2 Versand in bestimmte Länder" -"Rate 2 Title","Tarif 2 Titel" -"Rate 3 Amount","Rate 3 Menge" -"Rate 3 Ship To Applicable Countries","Tarif 3 Versand an zutreffende Länder" -"Rate 3 Ship to Specific Countries","Tarif 3 Versand an spezifische Länder" -"Rate 3 Title","Rate 3 Titel" -"Required for live Google Checkout transactions. Make sure that this option corresponds to Use Secure URLs in Frontend (""Web"" > ""Secure"").","Für direkte Google Checkout-Transaktionen erforderlich. Vergewissern Sie sich, dass diese Option Use Secure URLs in Frontend entspricht (""Web"" > ""Secure"")." -"Residential","Domizilzustellung" -"Sandbox","Sandkasten" -"Secure Callback URL","URL für sicheren Rückruf" -"Small - %s","Klein - %s" -"Standard Overnight","Standard über Nacht" -"The tax amount has been applied based on the information received from Google Checkout, because tax amount received from Google Checkout is different from the calculated tax amount","Die Höhe der angerechneten Abgaben basiert auf der Information von Google Checkout, da sich der von Google Checkout gesendete Betrag vom berechneten Betrag unterscheidet" -"Title","Titel" -"Total Chargeback: %s","Gesamtrückbelastung: %s" -"Total Charged: %s","Gesamtbetrag: %s" -"Total Refunded: %s","Erstatteter Gesamtbetrag: %s" -"Transparent","Transparent" -"UPS","UPS" -"USPS","Postdienst der Vereinigten Staaten" -"United Kingdom","Vereintes Königreich" -"United States","Vereinigte Staaten" -"Unknown Reason","Unbekannter Grund" -"White Background","Weißer Hintergrund" -"Yes","Ja" -"You will be redirected to GoogleCheckout in a few seconds.","Sie werden in ein paar Sekunden zu Google Checkout umgeleitet" diff --git a/app/locale/de_DE/Mage_ImportExport.csv b/app/locale/de_DE/Mage_ImportExport.csv deleted file mode 100644 index d3c0afe90..000000000 --- a/app/locale/de_DE/Mage_ImportExport.csv +++ /dev/null @@ -1,93 +0,0 @@ -"%s file does not exists or is not readable","Datei %s existiert nicht oder kann nicht gelesen werden" -"-- Please Select --","-- Bitte wählen --" -"Adapter must be an instance of Mage_ImportExport_Model_Import_Adapter_Abstract","Adapter muss eine Anwendung von Mage_ImportExport_Model_Import_Adapter_Abstract sein" -"Adapter object must be an instance of %s","Adapter-Objekt muss eine Instanz von %s sein" -"Adapter type must be a non empty string","Adapter Typ muss eine nicht leere Zeichenfolge sein" -"Append Complex Data","Anhang komplexe Daten" -"Attribute Code","Attributcode" -"Attribute Label","Attributsbezeichnung" -"Attribute does not has options, so filtering is impossible","Attribute haben keine Optionen, Filtern ist daher nicht möglich." -"Begin data validation","Datenvalidierung beginnen" -"Begin export of %s","Export von %s beginnen" -"Begin import of ""%s"" with ""%s"" behavior","Import von ""%s"" mit ""%s""-Verhalten beginnen" -"CSV","CSV" -"Can not determine attribute filter type","Kann die Eigenschaften des Filter-Typs nicht erkennen" -"Can not find required columns: %s","Kann die benötigten Spalten nicht finden: %s" -"Cannot get autoincrement value","Autosteigerungswert kann nicht abgerufen werden." -"Check Data","Daten prüfen" -"Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d","Überprüfte Zeilen: %d, überprüfte Entities: %d, ungültige Zeilen: %d, Fehler insgesamt: %d" -"Column names have duplicates","Die Spaltennamen haben Duplikate" -"Column names is empty or is not an array","Spaltennamen ist leer oder keine Reihe" -"Column names: ""%s"" are invalid","Spaltennamen: ""%s"" sind ungültig" -"Customers","Kunden" -"Data is invalid or file is not uploaded","Daten sind ungültig oder Datei ist nicht hochgeladen" -"Delete Entities","Entitäten löschen" -"Destination directory is not writable","Zielverzeichnis ist nicht beschreibbar" -"Destination file is not writable","Zieldatei ist nicht beschreibbar" -"Destination file path must be a string","Zieldatei-Pfad muss eine Reihe sein" -"Done import data validation","Abgeschlossene Import-Validierung" -"Duplicate Unique Attribute for '%s'","Verdoppeln Sie das einzigartige Attribut für '%s'" -"Entity Type","Entitätstyp" -"Entity adapter obejct must be an instance of Mage_ImportExport_Model_Export_Entity_Abstract","Entität-Adapterobjekt muss eine Instanz von Mage_ImportExportModel_Export_Entity_Abstract sein." -"Entity adapter object must be an instance of Mage_ImportExport_Model_Import_Entity_Abstract","Entity-Adapter-Objekt muss eine Anwendung von Mage_ImportExport_Model_Import_Entity_Abstract sein" -"Entity is unknown","Entity ist unbekannt" -"Entity type model must be an instance of Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract","Entity-Modelltyp muss eine Anwendung von Mage_ImportExport_Model_Import_Entity_Abstract sein" -"Entity type model must be an instance of Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract","Entity-Modelltyp muss eine Anwendung von Mage_ImportExport_Model_Import_Entity_Abstract sein" -"Error in data structure: behaviors are mixed","Fehler in der Datenstruktur: Vorgehensweisen sind unterschiedlich" -"Error in data structure: entity codes are mixed","Fehler in der Datenstruktur: Entity-Codes sind unterschiedlich" -"Errors limit (%d) reached. Please fix errors and re-upload file","Fehlerlimit (%d) erreicht. Bitte Fehler beheben und die Datei neu hochladen." -"Export","Export" -"Export File Format","Export Dateiformat" -"Export Settings","Exporteinstellungen" -"Export has been done.","Export wurde ausgeführt" -"Exported %s rows.","%s Zeilen exportiert." -"File does not contain data.","Datei enthält keine Daten." -"File does not contain data. Please upload another one","Datei enthält keine Daten. Bitte laden Sie eine andere hoch" -"File format is unknown","Dateityp unbekannt" -"File is partially valid, but import is not possible","Datei ist teilweise gültig, Import ist aber nicht möglich" -"File is totally invalid. Please fix errors and re-upload file","Datei ist komplett ungültig. Bitte beheben Sie die Fehler und laden Sie sie erneut hoch" -"File is valid! To start import process press ""Import"" button","Datei ist gültig! Klicken Sie auf den Import-Button, um den Importvorgang zu starten." -"File is valid, but import is not possible","Datei ist gültig, Import ist aber nicht möglich" -"File was not uploaded","Datei wurde nicht hochgeladen" -"Filter","Filter" -"From","Von" -"Header column names already set","Spaltennamen in der Kopfzeile sind schon festgelegt." -"Import","Import" -"Import Behavior","Importverhalten" -"Import Settings","Importeinstellungen" -"Import has been done successfuly.","Import wurde erfolgreich ausgeführt." -"Import successfully done.","Import erfolgreich abgeschlossen." -"Import/Export","Import/Export" -"Input entity code is not equal to entity adapter code","Code der Eingabeeinheit entspricht nicht dem Adapter-Code der Einheit" -"Invalid entity","Ungültige Einheit" -"Invalid entity model","Ungültiges Entitätsmodell" -"Invalid file format","Ungültiger Dateityp" -"Invalid parameters","Ungültige Parameter" -"Invalid seek position","Ungültige Suchposition" -"Invalid value for '%s'","Ungültiger Wert für '%s'" -"Invalid value for '%s' column","Ungültiger Wert für Spalte '%s'" -"No filter data provided","Keine Filterdaten angegeben" -"No source specified","Keine Quelle angegeben" -"No valid data sent","Keine gültige Daten gesendet" -"No writer specified","Nicht Schreiber-spezifiziert" -"Node does not has model token tag","Knoten hat nicht das Schild des Modells" -"Not implemented yet","Noch nicht implementiert" -"Please fix errors and re-upload file","Bitte beheben Sie die Fehler und laden Sie erneut hoch" -"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Bitte beheben Sie die Fehler und laden Sie die Datei erneut hoch, oder betätigen Sie die ""Import""-Schaltfläche um Reihen mit Fehlern zu überspringen" -"Products","Produkte" -"Replace Existing Complex Data","Bereits vorhandene komplexe Daten ersetzen" -"Select File to Import","Datei für Import wählen" -"Skip","Überspringen" -"Source file moving failed","Verschieben der Quelldatei fehlgeschlagen" -"Source file path must be a string","Quelldateipfad muss ein String sein" -"Source is not set","Quelle ist nicht festgelegt" -"Status","Status" -"There are no product types available for export","Es sind keine Produkttypen für den Export verfügbar" -"There is no data for export","Es gibt keine Daten für den Export" -"To","Nach" -"Total size of uploadable files must not exceed %s","Gesamtgröße der hochzuladenden Dateien darf %s nicht übersteigen" -"Unknown attribute filter type","Unbekannter Attributfiltertyp" -"Uploaded file has no extension","Hochgeladene Datei hat keine Dateiendung" -"Validation finished successfully","Validierung erfolgreich beendet" -"in rows","in Zeilen" -"in rows:","in Zeilen:" diff --git a/app/locale/de_DE/Mage_Index.csv b/app/locale/de_DE/Mage_Index.csv deleted file mode 100644 index f4950d4f5..000000000 --- a/app/locale/de_DE/Mage_Index.csv +++ /dev/null @@ -1,47 +0,0 @@ -"%s Index process is working now. Please try run this process later.","%s Index-Verarbeitung läuft gerade. Bitte versuchen Sie, diesen Prozess später zu starten." -"%s index was rebuilt.","%s Index wurde wieder hergestellt." -"'%s' Index Process Information","""%s"" Index-Verarbeitung Information" -"Action","Aktion" -"Cannot initialize the indexer process.","Indexer-Verarbeitung konnte nicht initialisiert werden." -"Change Index Mode","Index-Modus ändern" -"Click here to go to Cache Management and refresh cache types.","Klicken Sie hier, um zur Cacheverwaltung zu gelangen und die Cachetypen zu aktualisieren." -"Click here to go to Index Management and rebuild required indexes.","Klicken Sie hier, um zur Indexverwaltung zu gelangen und nötige Indizes wiederherzustellen." -"Delete","Löschen" -"Description","Beschreibung" -"Disable","Deaktivieren" -"Enable","Aktivieren" -"General","Allgemein" -"Index","Index" -"Index Description","Index Beschreibung" -"Index Management","Index Management" -"Index Mode","Index Modus" -"Index Name","Index Name" -"Index mode","Indexmodus" -"Indexer code is not defined.","Indexer-Code nicht definiert." -"Indexer model is not defined.","Indexer-Vorlage nicht definiert." -"Indexer model should extend Mage_Index_Model_Indexer_Abstract.","Indexer-Vorlage sollte Erweiterung für Mage_Index_Model_Indexer_Abstract sein." -"Manual Update","Manuelle Aktualisierung" -"Mode","Modus" -"Never","Nie" -"No","Nein" -"One or more of the Indexes are not up to date:","Ein oder mehrere Indexe sind nicht aktuell:" -"Please select Index(es)","Bitte Index(e) auswählen" -"Please select Indexes","Bitte Indexe auswählen" -"Process Information","Informationen verarbeiten" -"Processing","Verarbeitung läuft" -"Ready","Fertig" -"Refresh","Aktualisieren" -"Reindex Data","Daten neu indexieren" -"Reindex Required","Neuindexierung erforderlich" -"Revoke","Widerrufen" -"Status","Status" -"System","System" -"The index has been saved.","Der Index wurde gespeichert." -"There was a problem with reindexing process.","Bei der Verarbeitung der Reindexierung ist ein Problem aufgetreten." -"There was a problem with saving process.","Beim Speichern ist ein Problem aufgetreten." -"Total of %d index(es) have changed index mode.","Der Index-Modus von insgesamt %d Index(en) wurde geändert." -"Total of %d index(es) have reindexed data.","Insgesamt %d Index(e) haben neu indexierte Daten." -"Update Required","Update erforderlich" -"Update on Save","Aktualisierung gespeichert." -"Updated At","Aktualisiert am" -"Yes","Ja" diff --git a/app/locale/de_DE/Mage_Install.csv b/app/locale/de_DE/Mage_Install.csv deleted file mode 100644 index 1dbdfe1bd..000000000 --- a/app/locale/de_DE/Mage_Install.csv +++ /dev/null @@ -1,125 +0,0 @@ -"(Make sure you keep it in a safe place.)","(Bitte bewahren Sie es sicher auf.)" -"(Optional. Leave blank for no prefix)","(Optional. Lassen Sie es aus, wenn sie kein Präfix brauchen)" -"(ver. %s)","(ver. &s)" -"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","Zusätzlicher Pfad nach Base URL hinzugefügt um auf Administrationskonsole zuzugreifen (z.B. admin, backend, control etc.)." -"Admin Path","Admin Pfad" -"After successfull installation please click the button below.","Bitte klicken Sie den untenstehenden Link nach erfolgreicher Installation." -"All packages were installed, click 'OK' to continue with installation.","Alle Packages wurden installiert, klicken Sie OK um mit der Installation fortzufahren." -"Alternatively you could try the 'Manual Downloads and Upgrades' method.","Alternativ können Sie die 'Manuelle Downloads und Upgrades' Methode verwenden." -"Base URL","Base URL" -"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Bevor Sie zu Ihrem Shop gehen, bitte beachten Sie Ihren Kodierungsschlüssel. (Magento verwendet ihn um Passwörter, Kreditkarten und mehr zu verschlüsseln)." -"Check out our","Probieren Sie unser" -"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Wählen Sie diese Box nur an, wenn es nicht möglich ist, die Secure URL automatisch zu validieren, wie zum Beispiel wenn eine HTTP Authentifizierung erforderlich ist." -"Check this box only if it is not possible to automatically validate the Base URL.","Wählen Sie diese Box nur an, wenn es nicht möglich ist, die Base URL automatisch zu validieren." -"Choose this if you would like to test frontend and backend functionality.","Wählen Sie dies, wenn Sie Frontend- und Backendfunktionalität testen wollen." -"Configuration","Konfiguration" -"Confirm Password","Passwort bestätigen" -"Connection","Verbindung" -"Continue","Fortsetzen" -"Continue After Manual Download","Nach manuellem Download fortfahren" -"Continue Full Download / SVN Installation","Vollen Download / SVN Installation fortfahren" -"Create Admin Account","Adminkonto erstellen" -"Currently this is the most stable state available for Magento packages.","Dies ist der derzeitig stabileste Zustand für Magento Packages." -"Database","Datenbank" -"Database Connection","Datenbankverbindung" -"Database Name","Datenbankname" -"Database Name cannot be empty.","Datenbankname kann nicht leergelassen werden." -"Database Type","Datenbanktyp" -"Database connection error.","Datenbankverbindungsfehler." -"Database host","Datenbankhost" -"Database server does not support the InnoDB storage engine.","Der Datenbankserver unterstützt die InnoDB Storage-Engine nicht." -"Database user name","Datenbank Benutzername" -"Database user password","Datebank Benutzerpasswort" -"Default Currency","Standardwährung" -"Download","Download" -"Download Magento Core Modules and Updates","Magento Core Modules und Updates herunterladen" -"Downloading and installing Magento, please wait...","Magento wird heruntergeladen und installiert, bitte warten..." -"Email","E-Mail" -"Email Address","E-Mail-Adresse" -"Enable Charts","Tabellen aktivieren" -"Enable this option if you want the charts to be displayed on Dashboard.","Aktivieren Sie diese Option, wenn sie die Tabellen auf dem Armaturenbrett angezeigt haben wollen." -"Enable this option only if you have SSL available.","Aktivieren Sie diese Option nur, wenn Sie über SSL verfügen." -"Encryption Key","Kodierungsschlüssel" -"File System","Dateisystem" -"First Name","Vorname" -"Full Download / SVN Installation","Volles Download / SVN Installation" -"Get ready to experience Open-Source eCommerce Evolved.","Machen Sie sich bereit, Open-Source eCommerce Evolved zu erleben." -"Go to Backend","Zum Backend gehen" -"Go to Frontend","Zum Frontend gehen" -"Having trouble installing Magento?","Probleme bei der Installation von Magento?" -"Help Us to Keep Magento Healthy","Helfen Sie uns, Magento gesund zu halten" -"Host","Host" -"I agree to the above terms and conditions.","Ich stimme den allgemeinen Geschäftsbedingungen zu." -"If you are a developer and would like to have the latest public updates, choose this option.","Wenn Sie Entwickler sind und gerne die neusten öffentlichen Updates erhalten wollen, wählen Sie diese Option." -"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Falls Sie PHP als GCI benützen, könnten Ihre PHP Prozesse under dem selben User ausgeführt werden, der genutzt wurde um Magentodateien hochzuladen." -"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Falls Sie den Installationsassistenten über eine vorher heruntergeladene und installierte Magentoinstallation laufen lassen wollen, fahren Sie mit dieser Method fort." -"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Falls Sie es nicht wünschen oder nicht in der Lage sind, Magento Ordner schreibbar für Webprozessierung zu machen, können Sie PEAR verwenden, welches im Rootverzeichnis der Magentoinstallation zu finden ist." -"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","Falls Sie das volle Package heruntergeladen oder Magento über SVN installiert haben, überspringen Sie Packageinstallation und Validierung indem Sie den untenstehenden Button klicken." -"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","Falls Sie es wünschen Mangeto Packages durch das Web Admin Interface zu verwalten, müssen Sie webschreibbare Erlaubnis auf alle Magento Ordner und Dateien anwenden." -"If your server is running on MS Windows, most probably you will not need to change anything.","Falls Ihr Server auf MS Windows läuft, müssen Sie höchstwahrscheinlich nichts ändern." -"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","In anderen Fällen, müssen Sie Magento Dateien schreibbar für User, unter dem der Webserverprozess läuft, machen." -"Installation","Installation" -"Installation Guide","Installationsanleitung" -"Installer does not exist for %s database type","Es existiert kein Installer für den Datenbanktyp %s" -"Last Name","Nachname" -"License Agreement","Linzenvereinbarung" -"Locale","Sprachumgebung" -"Locale settings","Spracheinstellungen" -"Localization","Lokalisierung" -"Login Information","Login Informationen" -"Magento","Magento" -"Magento Connect Manager Deployment","Magento Verbindungsmanagerentwicklung" -"Magento Installation Wizard","Magento Installationsassistent" -"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento ist eine Schutzmarke von Magento Inc. Copyright © %s Magento Inc." -"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento verwendet diesen Schlüssel um Passwörter, Kreditkarten und mehr zu verschlüsseln. Wenn dieses Feld leer gelassen wird, erstellt das System einen Kodierungsschlüssel für Sie und zeigt ihn auf der nächsten Seite an." -"Manual Downloads and Upgrades","Manuelle Downloads und Upgrades" -"No resource for %s DB model.","Keine Ressource für %s DB Modell." -"One of PHP Extensions ""%s"" must be loaded.","Eine der PHP-Erweiterungen ""%s"" muss geladen werden." -"PHP Extension '%s' loaded","PHP Erweiterung '%s' geladen" -"PHP Extensions ""%s"" must be loaded.","PHP-Erweiterung ""%s"" muss geladen werden." -"PHP extension ""%s"" must be loaded.","PHP-Erweiterung ""%s"" muss geladen werden." -"Package Management through the Web","Packageverwaltung durch das Web" -"Password","Passwort" -"Password Confirmation","Passwortbestätigung" -"Path ""%s"" must be writable.","Pfad ""%s"" muss beschreibbar sein." -"Personal Information","Persönliche Informationen" -"Please correct the user data and try again.","Bitte geben Sie korrekte Benutzerdaten ein und versuchen Sie es nochmal." -"Please make sure that mod_rewrite is enabled in Apache configuration.","Bitte gehen Sie sicher, dass mod_rewrite in der Apache Konfiguration aktiviert ist." -"Please note that it is much less stable than beta.","Bitte beachten Sie, dass es viel weniger stabil als beta ist." -"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","Bitte beachten Sie, dass nur UNIX, Linux und Mac OS X Shells derzeit unterstützt werden. Für Windows, verwenden Sie die Option '%s'." -"Please set all required settings before clicking Continue","Bitte setzen Sie alle erforderlichen Einstellungen bevor Sie auf Weiter klicken" -"Preferred stability: %s","Bevorzugte Stabilität: %s" -"Proceed With Automatic Download (%s)","Mit Automatischem Download (%s) fortfahren" -"Provide a complete base URL for SSL connection. For example: %s","Stellen Sie eine vollständige Base URL für die SSL Verbindung zur Verfügung. Zum Beispiel: %s" -"Report All Bugs","Alle Bugs Melden" -"Required Fields","Pflichtfelder" -"Response from server isn\'t valid.","Serverantwort ist nicht gültig." -"Run admin interface with SSL","Admininterface mit SSL ausführen" -"Run this in your shell from Magento root folder:","Führen Sie dies in Ihrer Shell aus dem Magento Rootordner aus:" -"Save Session Data In","Sessiondaten speichern in" -"Save Session Files In","Sessiondateien speichern in" -"Secure Base URL","Secure Base URL" -"Session Storage Options","Session Storage Optionen" -"Setting preferred state to: %s","Bevorzugter Zustand auf %s gesetzt" -"Skip Base URL Validation Before the Next Step","Base URL Validierung vor dem nächsten Schritt überspringen" -"Skip Secure URL validation before next step","Base URL Validierung vor nächsten Schritt überspringen" -"Tables Prefix","Tabellenpräfix" -"The URL ""%s"" is invalid.","Die URL ""%s"" ist ungültig." -"The URL ""%s"" is not accessible.","Die URL ""%s"" ist nicht verfügbar." -"The database server version doesn\'t match system requirements (required: %s, actual: %s).","Die Version des Datenbankservers stimmt nicht mit den Systemanforderungen (benötigt: %s, vorhanden: %s) überein." -"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","Das Tabellen-Präfix darf nur Buchstaben (a-z), Ziffern (0-9) oder Unterstriche (_) enthalten; das erste Zeichen sollte ein Buchstabe sein." -"There was a problem installing Magento packages. Please read the log, correct errors and try again.","Beim Installieren der Magento Packages ist ein Fehler aufgetreten. Bitte lesen Sie das Log, korrigieren Sie Fehler und versuchen sie es erneut." -"Time Zone","Zeitzone" -"Use Secure URLs (SSL)","Secure URLs (SSL) verwenden" -"Use Web Server (Apache) Rewrites","Webserver (Apache) Rewrites verwenden" -"User Name","Benutzername" -"User Password","Benutzerpasswort" -"Username","Benutzername" -"Validation","Validierung" -"Web access options","Optionen für Webzugang" -"Welcome","Wilkommen" -"Welcome to Magento's Installation Wizard","Wilkommen zum Magento Installationsassistenten" -"You can specify server port, ex.: localhost:3307
    If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","Sie können den Server-Port spezifizieren, Ex.: Lokalhost:3307
    Wenn Sie nicht den Standard-UNIX-Anschluss verwenden, können Sie dies hier anstelle des Host spezifizieren, Ex.: /var/run/mysqld/mysqld.sock" -"You could enable this option to use web server rewrites functionality for improved search engines optimization.","Sie können diese Option aktivieren, um die Webserver Rewrites Funktionalität für verbesserte Suchmachinenoptimierung zu verwenden." -"You're All Set","Sie sind bereit" -"You're All Set!","Sie sind bereit!" diff --git a/app/locale/de_DE/Mage_Log.csv b/app/locale/de_DE/Mage_Log.csv deleted file mode 100644 index 6d7f2c1d8..000000000 --- a/app/locale/de_DE/Mage_Log.csv +++ /dev/null @@ -1,9 +0,0 @@ -"Enable Log Cleaning","Aufräumen des Verlaufs anschalten" -"Error Email Recipient","Email-Empfänger bei auftretenden Fehlern" -"Error Email Sender","Email-Absender bei auftretenden Fehlern" -"Error Email Template","Email-Vorlage bei auftretenden Fehlern" -"Frequency","Frequenz" -"Log Cleaning","Aufräumen des Verlaufs" -"Log cleanup Warnings","Warnungen während Aufräumen des Verlaufs" -"Save Log, Days","Speichere Verlauf, Tage" -"Start Time","Startzeit" diff --git a/app/locale/de_DE/Mage_Media.csv b/app/locale/de_DE/Mage_Media.csv deleted file mode 100644 index 084d8a176..000000000 --- a/app/locale/de_DE/Mage_Media.csv +++ /dev/null @@ -1,4 +0,0 @@ -"An error occurred while creating the image.","Ein Fehler trat auf während der Erstellung des Bildes." -"The image does not exist or is invalid.","Das Bild ist nicht vorhanden oder ungültig." -"This content requires last version of Adobe Flash Player. Get Flash","Dieser Inhalt erfordert die neueste Version des Adobe Flash Players. Flash herunterladen -" diff --git a/app/locale/de_DE/Mage_Newsletter.csv b/app/locale/de_DE/Mage_Newsletter.csv deleted file mode 100644 index 76bab173d..000000000 --- a/app/locale/de_DE/Mage_Newsletter.csv +++ /dev/null @@ -1,137 +0,0 @@ -" Copy","Kopie" -"Action","Aktion" -"Add New Template","Neues Template hinzufügen" -"Add to Queue","Zur Warteschlange hinzufügen" -"Allow Guest Subscription","Gast-Abonnement erlauben" -"An error occurred while saving your subscription.","Ein Fehler ist beim Speichern Ihres Abonnements aufgetreten." -"Are you sure that you want to delete this template?","Sind Sie sicher, dass Sie diese Vorlage löschen möchten?" -"Are you sure that you want to strip all tags?","Sind Sie sicher, dass Sie alle Tags entfernen wollen?" -"Back","Zurück" -"Cancel","Abbrechen" -"Cancelled","Abgebrochen" -"Cannot mark as received subscriber.","Nicht als emfangender Abonnent markierbar." -"Confirmation Email Sender","Bestätigungs-E-Mail-Absender" -"Confirmation Email Template","Bestätigungs-E-Mail-Template" -"Confirmation request has been sent.","Bestätigungs-Anfrage wurde gesendet." -"Convert to Plain Text","In einfachen Text umwandeln" -"Create Newsletter Template","Newsletter-Template erstellen" -"Customer","Kunde" -"Customer First Name","Kunden-Vorname" -"Customer Last Name","Nachname des Kunden" -"Customer My Account Newsletter Subscriptions","Kunde Mein Konto Newsletter Abonnements" -"Date Added","Hinzugefügt am" -"Date Updated","Aktualisierungsdatum" -"Delete","Löschen" -"Delete Selected Problems","Ausgewählte Probleme löschen" -"Delete Template","Template löschen" -"Do you really want to cancel the queue?","Wollen Sie wirklich die Warteschlange abbrechen?" -"Duplicate template code.","Doppelter Template-Code." -"Edit Newsletter","Newsletter bearbeiten" -"Edit Newsletter Template","Newsletter-Template bearbeiten" -"Edit Queue","Warteschlange bearbeiten" -"Edit Template","Template bearbeiten" -"Email","E-Mail" -"Enter your email address","Geben Sie Ihre E-Mail-Adresse ein" -"Error Code","Fehlercode" -"Error Text","Fehlertext" -"Follow this link to unsubscribe {{var subscriber.getUnsubscriptionLink()}}","Folgen sie diesem Link um sich abzumelden <!-- This tag is for unsubscribe link -->{{var subscriber.getUnsubscriptionLink()}}" -"Guest","Gast" -"ID","ID" -"Invalid queue selected.","Ungültige Warteschlange ausgewählt." -"Invalid subscription ID.","Ungültige Abonnement ID." -"Invalid subscription confirmation code.","Ungültiger Abonnement Bestätigungscode." -"Message","Nachricht" -"Need to Confirm","Bestätigung erforderlich" -"New Newsletter Template","Neue Newsletter Vorlage" -"New Template","Neue Vorlage" -"Newsletter","Newsletter" -"Newsletter Message Preview","Newsletternachricht Vorschau" -"Newsletter Problem Reports","Newsletter Problembericht" -"Newsletter Queue","Newsletter Warteschlange" -"Newsletter Section","Newsletterabschnitt" -"Newsletter Sign-up:","Newsletter-Anmeldung:" -"Newsletter Styles","Newsletterstile" -"Newsletter Subscribers","Newsletter Bezieher" -"Newsletter Subscription","Newsletter abonnieren" -"Newsletter Subscription Form Before","Vorhergehende Anmeldung zum Newsletter" -"Newsletter Subscriptions","Newsletter Abos" -"Newsletter Templates","Newsletter Vorlagen" -"Newsletter subscription confirmation","Newsletter Abonnementbestätigung" -"Newsletter subscription success","Newsletter Abonnement erfolgreich" -"Newsletter unsubscription success","Newsletter Abonnement erfolgreich gekündigt" -"No Templates Found","Keine Vorlagen gefunden" -"No problems found.","Keine Probleme gefunden." -"No subscribers selected.","Keine Abonnenten gewählt." -"Not Activated","Nicht aktiviert" -"Not Sent","Nicht gesendet" -"Pause","Pause" -"Paused","Pausiert" -"Please enter a valid email address.","Bitte geben Sie eine gültige E-Mail Adresse ein" -"Please enter new template name","Bitte geben Sie einen neuen Vorlagennamen ein" -"Please refer to exeption.log","Bitte sehen sie hier nach: Ausnahmen.log" -"Please select subscriber(s)","Bitte wählen Sie den/die Abonnent/en" -"Preview","Vorschau" -"Preview Template","Vorschau der Vorlage" -"Processed","Verarbeitet" -"Queue Date Start","Warteschlange Datum Start" -"Queue Finish","Warteschlange Fertig" -"Queue Information","Warteschlange Informationen" -"Queue Newsletter...","Warteschlange Newsletter..." -"Queue Start","Warteschlange Start" -"Queue Subject","Warteschlange Gegendstand" -"Recipients","Empfänger" -"Reset","Zurücksetzen" -"Resume","Fortfahren" -"Return HTML Version","HTML Version zurückholen" -"Save As","Speichern unter" -"Save Newsletter","Newsletter speichern" -"Save Template","Vorlage speichern" -"Save and Resume","Speichern und fortfahren" -"Selected problem subscribers have been unsubscribed.","Ausgewählte Problemabonnenten wurden gekündigt." -"Selected problems have been deleted.","Ausgewählte Probleme wurden gelöscht." -"Sender","Absender" -"Sender Email","Absender E-Mail" -"Sender Name","Absender Name" -"Sending","Wird gesendet" -"Sent","Gesendet" -"Sign Up for Our Newsletter:","Melden Sie sich für unseren Newsletter an:" -"Sign up for our newsletter","Melden Sie sich für unseren Newsletter an" -"Sorry, but administrator denied subscription for guests. Please register.","Wir bitten um Entschuldigung, aber der Administrator hat die Anmeldung für Gäste verweigert. Bitte register." -"Start","Start" -"Status","Status" -"Store","Shop" -"Store View","Store-Ansicht" -"Subject","Betreff" -"Submit","Übermitteln" -"Subscribe","Abonnieren" -"Subscribed","Abonniert" -"Subscriber","Abonnent" -"Subscribers","Abonnenten" -"Subscribers From","Abonennten aus" -"Subscription Options","Abonnement Optionen" -"Success Email Sender","Erfolg E-Mail-Absender" -"Success Email Template","Erfolg E-Mail-Vorlage" -"Template Content","Vorlagen-Inhalt" -"Template Information","Vorlagen-Information" -"Template Name","Name der Vorlage" -"Template Styles","Vorlagenstile" -"Template Subject","Vorlagen-Betreff" -"Template Type","Vorlagentyp" -"Thank you for your subscription.","Danke für Ihr Abonnement." -"The subscription has been removed.","Das Abonnement wurde entfernt." -"The subscription has been saved.","Das Abonnement wurde gespeichert." -"There was a problem with the subscription.","Bei dem Abonnement ist ein Problem aufgetreten." -"There was a problem with the subscription: %s","Beim Abonnement ist ein Problem aufgetreten: %s" -"There was a problem with the un-subscription.","Bei der Kündigung des Abonnements ist ein Problem aufgetreten." -"This email address is already assigned to another user.","Diese E-Mail-Adresse wird schon von einem anderen Nutzer verwendet." -"Type","Typ" -"Unconfirmed","Unbestätigt" -"Unsubscribe","Abonnement kündigen" -"Unsubscribe Selected","""Abonnement beenden"" ausgewählt" -"Unsubscribed","Abonnements gekündigt" -"Unsubscription Email Sender","Kündigungs-E-Mail-Absender" -"Unsubscription Email Template","E-Mail-Vorlage zur Beendigung des Abonnements" -"View Newsletter","Newsletter ansehen" -"Website","Website" -"You have been unsubscribed.","Ihr Abonnement wurde gekündigt." -"Your subscription has been confirmed.","Ihr Abonnement wurde bestätigt." diff --git a/app/locale/de_DE/Mage_Oauth.csv b/app/locale/de_DE/Mage_Oauth.csv deleted file mode 100644 index d4d9d5fe3..000000000 --- a/app/locale/de_DE/Mage_Oauth.csv +++ /dev/null @@ -1,118 +0,0 @@ -"%name% '%value%' is too long. It must has length %min% symbols.","%Name% '%Wert%' ist zu lang. Es muss eine Länge von %min% Zeichen haben." -"%name% '%value%' is too short. It must has length %min% symbols.","%Name% '%Wert%' ist zu kurz. Es muss eine Länge von %min% Zeichen haben." -"* Required Fields","* Notwendige Felder" -"%s requests access to your account","%s erfordert Zugriff auf Ihr Konto" -"Admin","Admin" -"After authorization application will have access to you account.","Nach der Autorisierungsanwendung haben Sie Zugriff auf Ihr Konto." -"An error occurred on confirm authorize.","Es ist ein Fehler beim Bestätigen der Autorisierung aufgetreten." -"An error occurred on delete action.","Es ist ein Fehler beim Löschen der Aktion aufgetreten." -"An error occurred on delete application.","Es ist ein Fehler beim Löschen der Applikation aufgetreten." -"An error occurred on reject authorize.","Es ist ein Fehler beim Ablehnen der Autorisierung aufgetreten." -"An error occurred on saving consumer data.","Es ist ein Fehler beim Speichern der Verbraucherdaten aufgetreten." -"An error occurred on update revoke status.","Es ist ein Fehler bei der Aktualuisierung des Widerruf-Status aufgetreten." -"An error occurred while deleting the consumer.","Es ist ein Fehler beim Löschen des Verbrauchers aufgetreten." -"An error occurred.","Es ist ein Fehler aufgetreten." -"An error occurred. Your authorization request is invalid.","Es ist ein Fehler aufgetreten. Ihre Autorisierungsanforderung ist ungültig." -"App Name","App Name" -"Application ""%s"" has been deleted.","Anwendung ""%s"" wurde entfernt." -"Application ""%s"" has been enabled.","Anwendung ""%s"" wurde aktiviert." -"Application ""%s"" has been revoked.","Anwendung ""%s"" wurde widerrufen." -"Application Name","Applikationsname" -"Application not found.","Anwendung nicht gefunden." -"Are you sure you want to delete this application?","Sind Sie sicher, dass Sie diese Anwendung entfernen möchten?" -"Are you sure you want to disable this application?","Sind Sie sicher, dass Sie diese Anwendung deaktivieren möchten?" -"Are you sure you want to enable this application?","Sind Sie sicher, dass Sie diese Anwendung aktivieren möchten?" -"Authorization confirmed","Autorisierung bestätigt" -"Authorization confirmed.","Zulassung bestätigt." -"Authorize","Autorisieren" -"Authorize application","Anwendung autorisieren" -"Authorized Tokens","Autorisierte Zeichen" -"Callback URL","Rückruf-URL" -"Cleanup Probability","Bereinigungswahrscheinlichkeit" -"Cleanup Settings","Einstellungen für das Bereinigen" -"Close","Schließen" -"Confirm OAuth token authorization","Bestätigen Sie OAuth Zeichen-Autorisierung" -"Confirm token authorization Pop Up for admin","Bestätigen Sie das gewählte Autorisierungs-Popup für Admin" -"Confirm token authorization for admin","Bestätigen Sie die gewählte Autorisierung für Admin" -"Confirmation Of Authorization","Bestätigung der Autorisierung" -"Consumer Information","Verbraucherinformation" -"Consumer Name","Verbrauchername" -"Consumers","Verbraucher" -"Created At","Erstellte At" -"Customer","Kunde" -"Customer My Account My OAuth Applications","Kundenanwendungen Mein Konto Meine OAuth" -"Delete","Löschen" -"Disable","Deaktivieren" -"Disabled","Deaktiviert" -"Edit","Bearbeiten" -"Edit Consumer","Verbraucher bearbeiten" -"Email","E-Mail" -"Email Address","E-Mail-Adresse" -"Enable","Aktivieren" -"Enabled","Aktiviert" -"Entry with ID #%s not found.","Eintrag mit ID #%s nicht gefunden." -"Expiration Period","Ablaufzeitraum" -"Give the verifier code to application administrator","Geben Sie den Prüfer-Code zum Anwendungsadministrator an" -"ID","ID" -"Invalid Callback URL","Ungültige Rückruf-URL" -"Invalid ID parameter.","Ungültige ID-Parameter." -"Invalid Rejected Callback URL","Ungültige abgelehnte Rückruf-URL" -"Invalid entry ID.","Ungültige Eintrag-ID" -"Invalid revoke status.","Ungültiger Widerruf-Status." -"Key","Schlüssel" -"Log In","Login" -"Log in as a customer","Einloggen als Verbraucher" -"Log in as admin","Einloggen als Admin" -"Log in as customer","Einloggen als Kunde" -"Log in to use %s","Loggen Sie sich ein, um %s zu verwenden" -"Login","Login" -"My Applications","Meine Applikationen" -"Name","Name" -"New Consumer","Neuer Verbraucher" -"OAuth","OAuth" -"OAuth Admin My Apps","OAuth Admin Meine Apps" -"OAuth Authorized Tokens","OAuth autorisierte Zeichen" -"OAuth Consumers","OAuth Verbraucher" -"OAuth authorization Pop Up for customer","OAuth Autorisierungs-Popup für Kunden" -"OAuth authorization for admin","OAuth Autorisierung für Admin" -"OAuth authorization for customer","OAuth Autorisierung für Kunden" -"OAuth authorization simple for admin","OAuth Autorisierung einfach für Admin" -"Password","Passwort" -"Permissions","Rechte" -"Please login to proceed authorization.","Bitte loggen Sie ein, um mit der Autorisierung fortzufahren." -"Please select needed row(s).","Bitte wählen Sie die benötigte(n) Zeile(n)." -"Please select revoke status.","Bitte wählen Sie Status widerrufen." -"REST - My Apps","REST - Meine Apps" -"REST - OAuth Authorized Tokens","REST - autorisierte OAuth Zeichen" -"REST - OAuth Consumers","REST - OAuth-Verbraucher" -"Reject","Verwerfen" -"Reject OAuth token authorization","OAuth Zeichen-Autorisierung ablehnen" -"Reject authorization","Autorisierung ablehnen" -"Reject token authorization Pop Up for admin","Ablehnen des gewählten Popups der Autorisierung für Admin" -"Reject token authorization for admin","Ablehnen der gewählten Autorisierung für Admin" -"Rejected Callback URL","Abgelehnte Rückruf-URL" -"Rejection Of Authorization","Ablehnung der Autorisierung" -"Revoked","Widerrufen" -"Role Name","Rollenname" -"Save","Speichern" -"Save and Continue Edit","Speichern und weiter bearbeiten" -"Secret","Geheim" -"Selected entries enabled.","Ausgewählte Einträge aktiviert." -"Selected entries has been deleted.","Ausgewählte Einträge wurden entfernt." -"Selected entries revoked.","Ausgewählte Einträge widerrufen." -"Status","Status" -"System","System" -"The application access request is rejected.","Die Anwendung Zugangsanforderung wird zurückgewiesen." -"The consumer has been deleted.","Der Verbraucher wurde entfernt." -"The consumer has been saved.","Der Verbraucher wurde gespeichert." -"Token Status Change","Statusänderung des Zeichens" -"Token Status Change Email Template","E-Mail-Template Statusänderung des Zeichens" -"Unable to find a consumer.","Es kann kein Verbraucher gefunden werden." -"User ID","Benutzerkennung" -"User Name","Benutzername" -"User Type","Benutzertyp" -"Verifier code: %s","Prüfer-Code: %s" -"You have no applications.","Sie haben keine Anwendungen." -"deleted","gelöscht" -"enabled","aktiviert" -"revoked","widerrufen" diff --git a/app/locale/de_DE/Mage_Page.csv b/app/locale/de_DE/Mage_Page.csv deleted file mode 100644 index b96d3ee43..000000000 --- a/app/locale/de_DE/Mage_Page.csv +++ /dev/null @@ -1,81 +0,0 @@ -"%s Item(s)","%s Artikel" -"%s-%s of %s","%s-%s von %s" -"© 2012 Magento Demo Store. All Rights Reserved.","© 2012 Magento Demo Store. Alle Rechte vorbehalten." -"© 2013 Magento Demo Store. All Rights Reserved.","© 2013 Magento Demo Store. Alle Rechte vorbehalten." -"(Shift-)Click or drag to change value","(Umschalt-)Klick oder ziehen, um Wert zu ändern" -"(ver. %s)","(ver. %s)" -"- Click on any of the time parts to increase it","- Klicken Sie auf einen der Zeitwerte um den Wert zu erhöhen" -"- Hold mouse button on any of the above buttons for faster selection.","- Halten Sie einen der Buttons gedrückt für eine Schnellauswahl." -"- Use the %s buttons to select month","- Benutzen Sie die %s Buttons für die Monatsauswahl" -"- Use the %s, %s buttons to select year","- Benutzen Sie die %s, %s Buttons für die Jahresauswahl" -"- or Shift-click to decrease it","- oder Umschalt-Taste gedrückt halten und klicken, um den Wert zu verkleinern" -"- or click and drag for faster selection.","- oder klicken und ziehen Sie für eine Schnellauswahl." -"-- Please Select --","-- Bitte auswählen –" -"1 column","1 Spalte" -"2 columns with left bar","2 Spalten mit linker Leiste" -"2 columns with right bar","2 Spalten mit rechter Leiste" -"3 columns","3 Spalten" -"About the calendar","Über den Kalender" -"Account","Konto" -"All Empty Layout Pages","Alle leeren Layout-Seiten" -"All One-Column Layout Pages","Alle einspaltigen Layout-Seiten" -"All Pages","Alle Seiten" -"All Pages (Print Version)","Alle Seiten (Druckversion)" -"All Three-Column Layout Pages","Alle dreispaltigen Layout-Seiten" -"All Two-Column Layout Pages (Left Column)","Alle zweispaltigen Layout-Seiten (Linke Spalte)" -"All Two-Column Layout Pages (Right Column)","Alle zweispaltigen Layout-Seiten (Rechte Spalte)" -"Allow","Erlauben" -"Breadcrumbs","Breadcrumbs" -"Click here if nothing has happened","Klicken Sie hier, wenn nichts passiert ist" -"Close","Schließen" -"Close Window","Fenster schließen" -"DHTML Date/Time Selector","DHTML Date/Time Selektor" -"Date selection:","Datumsauswahl:" -"Default Description","Standard Beschreibung" -"Default welcome msg!","Standard Willkommensnachricht!" -"Display %s first","Zeige %s zuerst" -"Distributed under GNU LGPL. See %s for details.","Veröffentlicht unter der GNU LGPL. Mehr Informationen unter %s." -"Drag to move","Ziehen zum Bewegen" -"Empty","Leer" -"For latest version visit: %s","Für die letzte Version besuchen Sie bitte: %s" -"Free Shipping on orders over 50$","Gratisversand bei Bestellungen über $ 50." -"Go Today","Heute aufrufen" -"Help Us to Keep Magento Healthy","Helfen Sie uns Magento gesund zu halten" -"Interface Language","Sprache der Benutzeroberfläche" -"Items %s to %s of %s total","Artikel %s bis %s von insgesamt %s" -"JavaScript seems to be disabled in your browser.","JavaScript scheint in Ihrem Browser deaktiviert zu sein." -"Left Column","Linke Spalte" -"Left Column First (shows above main column on smaller screens)","Linke Spalte zuerst (wird über der Hauptspalte auf kleineren Bildschirmen angezeigt)" -"Main Content Area","Hauptinhaltsbereich" -"Menu","Menü" -"Navigation Bar","Navigationsleiste" -"Next","Weiter" -"Next month (hold for menu)","Nächster Monat (gedrückt halten für Menü)" -"Next year (hold for menu)","Nächstes Jahr (gedrückt halten für Menü)" -"Page Bottom","Seitenende" -"Page Footer","Seitenfuß" -"Page Header","Seitenkopf" -"Page Top","Seitenanfang" -"Page:","Seite:" -"Prev. month (hold for menu)","Vor. Monat (gedrückt halten für Menü)" -"Prev. year (hold for menu)","Vor. Jahr (gedrückt halten für Menü)" -"Previous","Zurück" -"Redirecting...","Umleitung…" -"Report All Bugs","Melden Sie alle Fehler" -"Results per page","Ergebnisse pro Seite" -"Right Column","Rechte Spalte" -"Search","Suche" -"Select Store","Store auswählen" -"Select Store:","Store auswählen:" -"Select date","Datum auswählen" -"Show","Anzeigen" -"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Dies ist ein Demo-Store. Jegliche Bestellung in diesem Store wird weder beachtet noch ausgeführt." -"This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our Privacy Policy page. To accept cookies from this site, please click the Allow button below.","Diese Webseite erfordert Cookies, um alle Funktionen anbieten zu können. Für weitere Informationen darüber, welche Daten in den Cookies enthalten sind, lesen Sie bitte unsere Seite zu Datenschutzrichtlinien. Um Cookies von dieser Seite zu akzeptieren, klicken Sie bitte den Schaltknopf Zulassen unten." -"Time selection:","Zeitauswahl:" -"Time:","Zeit:" -"View All ","Alles anzeigen" -"Welcome, %s!","Willkommen, %s!" -"You must have JavaScript enabled in your browser to utilize the functionality of this website.","Sie müssen JavaScript in Ihrem Browser aktivieren um alle Funktionen dieser Webseite nutzen zu können." -"Your Language","Ihre Sprache" -"Your Language:","Ihre Sprache:" -"per page","pro Seite" diff --git a/app/locale/de_DE/Mage_PageCache.csv b/app/locale/de_DE/Mage_PageCache.csv deleted file mode 100644 index fc7f34f05..000000000 --- a/app/locale/de_DE/Mage_PageCache.csv +++ /dev/null @@ -1,12 +0,0 @@ -"An error occurred while clearing the external full page cache.","Es ist ein Fehler beim Löschen der externen ganzseitigen Cache aufgetreten." -"Cookie Lifetime (seconds)","Cookie Lifetime (Cookie-Laufzeit) (Sekunden)" -"Enable External Cache","Externes Cache aktivieren" -"External Cache Control","Externe Cache-Steuerung" -"External Full Page Cache Settings","Externe ganzseitige Cache Einstellungen" -"External Page Cache","Externer Seiten-Cache" -"External full page cache.","Externes ganzseitiges Cache." -"Failed to load external cache control","Fehler beim Laden des externen Cache-Steuerelements" -"Flush External Page Cache","Externes Seiten Cache spülen (Flush externes Seiten Cache)" -"If empty, default value will be used.","Wenn leer, wird der Standardwert verwendet." -"The external full page cache has been cleaned.","Das externe ganzseitige Cache wurde gereinigt." -"Zend Full Page Cache","Zend ganzseitiges Seiten Cache" diff --git a/app/locale/de_DE/Mage_Paygate.csv b/app/locale/de_DE/Mage_Paygate.csv deleted file mode 100644 index 5e4c4b264..000000000 --- a/app/locale/de_DE/Mage_Paygate.csv +++ /dev/null @@ -1,69 +0,0 @@ -"3D Secure","3D Secure" -"3D Secure Card Validation","3D Secure-Kartenbestätigung" -"API Login ID","API Login-ID" -"Accepted Currency","Akzeptierte Währung" -"Allow Partial Authorization","Teilweise Autorisierung erlauben" -"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","Sind Sie sicher, dass Sie die Zahlung abbrechen möchten? Klicken Sie auf OK, um Ihre Zahlung abzubrechen und den Betrag wieder frei verfügbar zu machen. Klicken Sie auf Abbrechen, um eine andere Kreditkarte anzugeben und mit der Zahlung fortzufahren." -"Authorize Only","Nur genehmigen" -"Authorize and Capture","Genehmigen und erfassen" -"Authorize.Net Transaction ID %s","Authorize.Net Transaktions-ID %s" -"Authorize.net","Genehmigen.net" -"Cancel","Abbrechen" -"Centinel API URL","Centinel API-URL" -"Credit Card Types","Arten von Kreditkarten" -"Credit Card Verification","Überprüfung der Kreditkarte" -"Credit Card: xxxx-%s","Kreditkarte: xxxx-%s" -"Debug","Debug" -"Email Customer","Kunden E-Mail" -"Enabled","Aktiviert" -"Error in payment gateway.","Fehler beim Payment Gateway." -"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","Gateway-Aktionen wurden gesperrt, weil der Gateway eine oder mehrere Transaktionen nicht verarbeiten konnte. Bitte loggen Sie sich in Ihren Authorize.Net-Account ein, um dieses Problem manuell zu beheben." -"Gateway error: %s","Fehler des Gateway: %s" -"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Es wird ein Standardwert verwendet, falls das Feld freigelassen wird. Eine benutzerdefinierte URL darf nach der CardinalCommerce-Vereinbarung angegeben werden." -"Invalid amount for authorization.","Ungültiger Betrag um genehmigt zu werden." -"Invalid amount for capture.","Ungültiger Betrag für die Erfassung." -"Invalid amount for partial authorization.","Ungültiger Betrag für die teilweise Autorisierung." -"Invalid amount for refund.","Ungültiger Betrag für eine Rückerstattung." -"Invalid split tenderId ID.","Ungültige gespaltene Angebotsidentität" -"Invalid transaction ID.","Ungültige Transaktions-ID" -"Maximum Order Total","Höchstsumme der Bestellung" -"Merchant's Email","E-Mail des Händlers" -"Minimum Order Total","Mindestsumme der Bestellung" -"New Order Status","Stand der neuen Bestellung" -"Parent Authorize.Net transaction (ID %s) expired","Parent Authorize.Net-Transaktion (ID %s) abgelaufen - -" -"Payment Action","Zahlungsvorgang" -"Payment authorization error.","Fehler bei der Zahlungsermächtigung." -"Payment canceling error.","Fehler bei Zahlungsabbruch." -"Payment capturing error.","Fehler bei Zahlungserfassung." -"Payment from Applicable Countries","Bezahlung aus den entsprechenden Ländern" -"Payment from Specific Countries","Bezahlung aus bestimmten Ländern" -"Payment partial authorization error.","Fehler bei teilweiser Autorisierung." -"Payment refunding error.","Fehler bei der Rückerstattung." -"Payment updating error.","Fehler beim Zahlungsupdate." -"Payment voiding error.","Fehler beim Stornieren der Zahlung." -"Processed Amount","Bearbeiteter Betrag" -"Remaining Balance","Verbleibender Betrag" -"Severe 3D Secure Card Validation","Strenge Absicherung der 3D geschützten Karte" -"Severe Validation Removes Chargeback Liability on Merchant","Die bestehende strenge Absicherung entzieht den Verkäufer der Verbindlichkeit Ausgleichsbuchungen nachkommen zu müssen" -"Shopping cart contents and/or address has been changed.","Artikel im Einkaufswagen und/oder die Adresse wurden geändert." -"Sort Order","Sortierreihenfolge" -"Test Mode","Testmodus" -"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","Der Betrag auf Ihrer Kreditkarte reicht nicht aus, um den Kauf durchzuführen. Auf den verfügbaren Betrag kann nicht zugegriffen werden. Um den Kauf durchzuführen, klicken Sie bitte auf OK und geben Sie eine weitere Kreditkartennummer an. Um den Kauf abzubrechen und auf den Betrag wieder zugreifen zu können, klicken Sie bitte auf Abbrechen." -"There was an error canceling transactions. Please contact us or try again later.","Es ist ein Fehler beim Abbruch der Transaktion aufgetreten. Bitte kontaktieren Sie uns oder probieren Sie es später noch einmal." -"Title","Titel" -"Transaction Key","Transaction key" -"You have reached the maximum number of credit card allowed to be used for the payment.","Sie haben die maximale Anzahl an Kreditkarten erreicht, die Sie für die Bezahlung verwenden dürfen." -"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","Sie haben die maximale Anzahl an Kreditkarten erreicht, die Sie für eine Bezahlung verwenden dürfen. Die verfügbaren Beträge auf allen verwendeten Karten reichten nicht aus, um die Bezahlung abschließen zu können. Der Zahlungsprozess wurde abgebrochen und die Beträge sind wieder frei verfügbar." -"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","Ihre Kredtikarte wurde abgelehnt. Klicken Sie OK, um eine andere Kreditkarte anzugeben, damit Sie den Zahlungsvorgang abschließen können. Klicken Sie auf Abbrechen, um den verwendeten Betrag wieder verfügbar zu machen und eine andere Zahlungsmethode auszuwählen." -"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","Ihre Bestellung wurde nicht aufgegeben, weil Artikel in Ihrem Einkaufswagen und/oder die Adresse geändert wurden. Bereits autorisierte, ausstehende Beträge von Ihrer vorherigen Zahlung sind wieder frei verfügbar. Bitte führen Sie den Zahlungsvorgang noch einmal durch, um Ihre neu hinzugekommenen Artikel zu erfassen." -"Your payment has been cancelled. All authorized amounts have been released.","Ihre Zahlung wurde abgebrochen. Alle autorisierten Beträge sind wieder frei verfügbar." -"amount %s","Betrag %s" -"authorize","Autorisieren" -"authorize and capture","Autorisieren und Erfassen" -"capture","Erfassen" -"failed","fehlgeschlagen" -"refund","Rückerstattung" -"successful","erfolgreich" -"void","ungültig" diff --git a/app/locale/de_DE/Mage_Payment.csv b/app/locale/de_DE/Mage_Payment.csv deleted file mode 100644 index 9b87159d7..000000000 --- a/app/locale/de_DE/Mage_Payment.csv +++ /dev/null @@ -1,142 +0,0 @@ -"%s %s cycle.","%s %s Zyklus." -"* Required Fields","*Pflichtfelder" -"--Please Select--","--Bitte auswählen--" -"3D Secure Card Validation","3D Secure Card Validierung" -"3D Secure Credit Card Validation","3D Secure Kreditkartenvalidierung" -" %s"," %s" -"A value is required for live mode. Refer to your CardinalCommerce agreement.","Ein Wert ist für live mode erforderlich. Siehe CardinalCommerce Vereinbarung." -"Allow Initial Fee Failure","Erstzahlungsfehlschlag erlauben" -"An internal reference ID is required to save the payment profile.","Eine interne ReferenzID ist erforderlich um das Zahlungsprofil zu speichern." -"Authorize action is not available.","Autorisierungsaktion ist nicht verfügbar." -"Auto Bill on Next Cycle","Automatische Abrechnung beim nächsten Zyklus" -"Automatically Invoice All Items","Automatische Abrechnung aller Artikel" -"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","Den ausstehenden Betrag automatisch im nächsten Rechnungslauf verrechnen (wenn es fehlgeschlagene Zahlungen gab)." -"Bank Transfer Payment","Bezahlung durch Banküberweisung" -"Billing Agreement status is not set.","Abrechnungsvereinbarungsstatus ist nicht gesetzt." -"Billing Amount","Rechnungsbetrag" -"Billing Frequency","Abrechnungsfrequenz" -"Billing Period","Abrechnungsperiode" -"Billing Period Unit","Abrechnungsperiodeneinheit" -"Billing period unit is not defined or wrong.","Abrechnungsperiodeneinheit ist nicht definiert oder falsch." -"Cannot retrieve the payment info model object.","Zahlungsinfomodellobjekt kann nicht abgefragt werden." -"Cannot retrieve the payment information object instance.","Zahlungsinformationen Objektinstanz können nicht abgerufen werden." -"Cannot retrieve the payment method code.","Code der Zahlungsart kann nicht abgerufen werden." -"Cannot retrieve the payment method model object.","Zahlungsartmodellobjekt kann nicht abgefragt werden." -"Capture action is not available.","Auffang-Aktion ist nicht verfügbar." -"Card Verification Number","Kartenprüfnummer" -"Cash On Delivery Payment","Barbezahlung bei Lieferung" -"Centinel API URL","Centinel API URL" -"Check / Money Order","Scheck / Zahlungsansweisung" -"Credit Card Number","Kreditkartennummer" -"Credit Card Number: xxxx-%s","Kreditkartennummer: xxxx-%s" -"Credit Card Type","Kreditkartentyp" -"Credit Card Type: %s","Kreditkartentyp: %s" -"Credit Card Types","Arten von Kreditkarten" -"Credit card number mismatch with credit card type.","Kreditkarten-Nummer passt nicht zum Kreditkarten-Typ" -"Credit card type is not allowed for this payment method.","Der Kreditkarten-Typ ist für diese Zahlungsvariante nicht erlaubt." -"Currency","Währung" -"Currency code is undefined.","Währungscode ist nicht definiert." -"Customer ID is not set.","KundenID ist nicht gesetzt." -"Day","Tag" -"Debug Mode","Debug Modus" -"Enabled","Aktiviert" -"Expiration Date","Ablaufdatum" -"Expiration Date: %s/%s","Ablaufdatum: %s/%s" -"Full name of the person receiving the product or service paid for by the recurring payment.","Voller Name des Empfängers des Produkts oder Services, für das mit turnusmäßigen Zahlungen bezahlt wird." -"Incorrect credit card expiration date.","Falsches Verfallsdatum der Kreditkarte" -"Initial Fee","Erstzahlung" -"Initial non-recurring payment amount due immediately upon profile creation.","Erster nicht turnusmäßiger Zahlungsbetrag ist sofort nach Profilerstellung fällig." -"Instructions","Anleitungen" -"Internal Reference ID","Interne ReferenzID" -"Invalid Credit Card Number","Ungültige Kreditkarten-Nummer" -"Issue Number","Ausgabenumer" -"Make Check Payable to","Scheck zahlbar machen für" -"Make Check payable to:","Scheck zahlbar machen für:" -"Make Check payable to: %s","Scheck zahlbar machen für: %s" -"Maximum Billing Cycles","Maximale Anzahl an Rechnungsläufen" -"Maximum Order Total","Höchstsumme der Bestellung" -"Maximum Payment Failures","Maximale Anzahl an fehlgeschlagenen Zahlungen" -"Maximum Trial Billing Cycles","Maximale Anzahl an Proberechnungsläufen" -"Merchant ID","Händler-ID" -"Minimum Order Total","Mindestsumme der Bestellung" -"Month","Monat" -"N/A","Nicht verfügbar" -"Name on Card","Name auf Karte" -"Name on the Card","Name auf der Karte" -"Name on the Card: %s","Name des Inhabers: %s" -"New Order Status","Stand der neuen Bestellung" -"Number of billing periods that make up one billing cycle.","Anzahl von Abrechnungsperioden die einen Rechnungslauf ausmachen." -"Order action is not available.","Befehlsaktion ist nicht verfügbar." -"Overrides API URL that may be specified by a payment method.","Überschreibt API URL die durch ein Zahlungsart spezifiziert ist." -"Password","Passwort" -"Payment ID: %s","ZahlungsID: %s" -"Payment Method","Zahlungsart" -"Payment Methods","Zahlungsarten" -"Payment Methods Section","Zahlungsartenbereich" -"Payment Reference ID","Zahlungsreferenz ID" -"Payment Services","Zahlungsservices" -"Payment from Applicable Countries","Bezahlung aus den entsprechenden Ländern" -"Payment from Specific Countries","Bezahlung aus bestimmten Ländern" -"Payment method code is not set.","Zahlungsartcode ist nicht gesetzt." -"Payment method code is undefined.","Zahlungsartcode ist nicht definiert." -"Payment profile is invalid:\n%s","Zahlungsprofil ist ungültig:\n%s" -"Period frequency is wrong.","Periodenfrequenz ist falsch." -"Please enter a valid credit card verification number.","Bitte geben Sie eine gültige Verifikationsnummer für Ihre Kreditkarte ein." -"Processor ID","Prozessor ID" -"Purchase Order","Auftrag" -"Purchase Order Number","Auftragsnummer" -"Purchase Order Number:","Auftragsnummer:" -"Purchase Order Number: %s","Auftragsnummer: %s" -"Recurring Profile Start Date","Wiederkehrendes Profilstartdatum" -"Recurring profile start date has invalid format.","Wiederkehrendes Profilstartdatum hat ein ungültiges Format." -"Reference ID is not set.","ReferenzID ist nicht gesetzt." -"Refund action is not available.","Rückerstattung Aktion ist nicht verfügbar." -"Repeats %s time(s).","Wiederholt %s mal(e)." -"Repeats until suspended or canceled.","Wiederholt bis angehalten oder abgebrochen." -"Request Card Security Code","Kartensicherheitscode anfordern" -"Saved CC","Gespeichertes CC" -"Schedule Description","Ablaufplanbeschreibung" -"Schedule description must be not empty.","Ablaufplanbeschreibung darf nicht leer sein." -"Selected payment type is not allowed for billing country.","Der ausgewählte Zahlungstyp ist für das in der Rechnungsadresse genannte Land nicht erlaubt." -"Send Check to","Sende Scheck an" -"Send Check to:","Sende Scheck an:" -"Severe 3D Secure Card Validation","Severe 3D Secure Card Validierung" -"Severe validation removes chargeback liability on merchant.","Severe Validierung entfernt Ausgleichhaftung des Händlers." -"Shipping Amount","Versandbetrag" -"Short description of the recurring payment. By default equals to the product name.","Kurze Beschreibung der turnusmäßigen Zahlung. Standardmäßig ist das der Produktname." -"Sort Order","Sortierreihenfolge" -"Start Date","Startdatum" -"Start date has invalid format.","Startdatum hat ein ungültiges Format." -"Start date is undefined.","Startdatum ist nicht definiert." -"Subscriber Name","Abonnentenname" -"Switch/Solo/Maestro Issue Number","Switch/Solo/Maestro-Issue Number" -"Switch/Solo/Maestro Only","Nur Switch/Solo/Maestro" -"Switch/Solo/Maestro Start Date","Switch/Solo/Maestro-Start Date" -"Tax Amount","Steuerbetrag" -"Test Mode","Testmodus" -"The date when billing for the profile begins.","Das Datum an dem die Abrechnung für das Profil beginnt." -"The number of billing cycles for payment period.","Die Anzahl der Abrechnungszeiträume für die Zahlungsart." -"The number of scheduled payments that can fail before the profile is automatically suspended.","Die Anzahl der planmäßigen Zahlungen die fehlschlagen dürfen bis das Profil automatisch suspendiert wird." -"The payment review action is unavailable.","Die Zahlungsreviewaktion ist nicht verfügbar." -"The requested Payment Method is not available.","Die ausgewählte Zahlungsmethode ist nicht verfügbar." -"Title","Titel" -"Trial Billing Amount","Probeabrechnungsbetrag" -"Trial Billing Frequency","Probeabrechnungsfrequenz" -"Trial Billing Period Unit","Probeabrechnungsperiodeneinheit" -"Trial Period","Probeperiode" -"Trial billing amount is wrong.","Probeabrechnungsbetrag ist falsch." -"Trial billing period unit is wrong.","Probeabrechnungsperiodeneinheit ist falsch." -"Trial period frequency is wrong.","Probeperiodenfrequenz ist falsch." -"Trial period max cycles is wrong.","Maximale Zyklen für Probeperiode ist falsch." -"Two Weeks","Zwei Wochen" -"Unable to save Billing Agreement:","Abrechnungsvereinbarung kann nicht gespeichert werden:" -"Unit for billing during the subscription period.","Einheit für Abrechnung der Abonnementperiode." -"Unsupported currency code: %s.","Nicht unterstützter Währungscode: %s." -"Void action is not available.","Leer-Aktion ist nicht verfügbar." -"Week","Woche" -"What is this?","Was ist das?" -"Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.","Ob das Zahlungsprofil suspendiert werden soll, wenn die Erstzahlung fehlschlägt, oder ob der Betrag zur ausstehenden Bilanz hinzugefügt werden soll." -"Wrong %s specified.","%s ist falsch spezifiziert." -"Wrong or empty billing amount specified.","Falscher oder leerer Abrechnungsbetrag spezifiziert." -"Year","Jahr" -"Zero Subtotal Checkout","Leere Zwischensumme Checkout" diff --git a/app/locale/de_DE/Mage_Paypal.csv b/app/locale/de_DE/Mage_Paypal.csv deleted file mode 100644 index b48365b8c..000000000 --- a/app/locale/de_DE/Mage_Paypal.csv +++ /dev/null @@ -1,623 +0,0 @@ -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -"-OR-","-oder-" -"120 x 240","120 x 240" -"120 x 600","120 x 600" -"120 x 90","120 x 90" -"190 x 100","190 x 100" -"2-pixel perimeter around the header space.","2-pixel Umkreis um das Feld der Kopfzeile" -"234 x 400","234 x 400" -"234 x 60","234 x 60" -"250 x 250","250 x 250" -"300 x 50","300 x 50" -"3D Secure","3D Secure Verfahren" -"3D Secure Card Validation","3D Secure Card Validierung" -"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at http://www.paypal.com/amexupdate.","Für Maestro-Karten wird eine 3D Secure-Bestätigung benötigt. Die Verwendung von American Express-Karten setzt eine weitere Vereinbarung voraus. Mehr Informationen dazu auf http://www.paypal.com/amexupdate." -"468 x 60","468 x 60" -"728 x 90","728 x 90" -"800 x 66","800 x 66" -"Start accepting payments via PayPal!","Akzeptieren Sie jetzt auch PayPal-Zahlungen!" -"A case that has been resolved and close requires a reimbursement.","Ein gelöster und abgeschlossener Fall erfordert eine Rückerstattung." -"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","Diese Transaktion wurde aufgrund eines Kundenstreitfalls mit dem Verdacht nicht befugter Manipulation aufgehoben." -"A reversal has occurred on this transaction because you have given the customer a refund.","Diese Transaktion wurde aufgehoben, da Sie dem Kunden eine Erstattung gegeben haben." -"A reversal has occurred on this transaction due to a chargeback by your customer.","Diese Transaktion wurde aufgehoben, da Ihr Kunde eine Rückbuchung durchgeführt hat." -"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","Diese Transaktion wurde aufgehoben, da Ihr Kunde sich über die Transaktion beschwert hat." -"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","Diese Transaktion wurde aufgehoben, da Ihr Kunde eine Geld-Zurück-Garantie ausgelöst hat." -"A value is required for live mode. Refer to your CardinalCommerce agreement.","Ein Wert ist für live mode erforderlich. Siehe CardinalCommerce Vereinbarung." -"ACH Deposit (Hold for Dispute or Other Investigation)","ACH Einlage (Für Dispute oder andere Untersuchungen zurückgehalten)" -"ACH Deposit (Reversal)","ACH Einlage (Stornierung)" -"ACH Funding for Funds Recovery from Account Balance","ACH Finanzierung der Zurückgewinnung des Kontostands" -"ACH Withdrawal","ACH Abhebung" -"API Authentication Methods","API-Authentifikationsmethoden" -"API Certificate","API-Zertifikat" -"API Password","API Passwort" -"API Signature","API Signatur" -"API Username","API Benutzername" -"API Uses Proxy","API benutzt Proxy" -"Ability for buyer to purchase without PayPal account.","Möglichkeit für Käufer ohne PayPal Konto einzukaufen" -"Accept credit card and PayPal payments securely.","Akzeptieren Sie sicher Kreditkarten- und PayPal-Zahlungen." -"Accept credit cards, debit cards and PayPal payments securely.","Akzeptieren Sie sicher Kreditkarten, Debitkarten und PayPal-Zahlungen." -"Accept payments in your shopping cart. PayPal will process your card payments through the Payflow Gateway.","Akzeptieren Sie Zahlungen in Ihren Einkaufswagen. PayPal wird Ihre Kartenzahlungen durch das Payflow-Gateway abwickeln." -"Accept payments with a PCI compliant checkout that keeps customers on your site.","Akzeptieren Sie Zahlungen mit einer PCI-konformen Kasse, damit Kunden auf Ihrer Webseite bleiben." -"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Akzeptieren Sie Zahlungen mit einer PCI-konformen Kasse, damit Kunden auf Ihrer Webseite bleiben." -"Accept payments with a completely customizable checkout page.","Akzeptieren Sie Zahlungen mit einer komplett anpassbaren Kassen-Webseite." -"Accept payments with a completely customizable checkout.","Akzeptieren Sie Zahlungen mit einer komplett anpassbaren Kasse." -"Acceptance Mark","Akzeptanz Kennzeichnung" -"Acceptance Mark Image","Akzeptanz Kennzeichnungs-Logo" -"Account-to-Account Payment, initiated by PayPal","Konto-zu-Konto Zahlung, von PayPal eingeleitet" -"Add PayPal as an additional payment method to your checkout page to increase your sales.","Fügen Sie Ihrer Kassen-Webseite PayPal als zusätzliche Zahlungsmethode hinzu, um Ihren Umsatz zu steigern." -"Add PayPal as an additional payment method to your checkout page.","Fügen Sie Ihrer Kassen-Webseite PayPal als zusätzliche Zahlungsmethode hinzu." -"Add another payment method to your existing solution or as a stand-alone option.","Ergänzen Sie Ihre bestehende Lösung um eine zusätzliche Zahlungsmethode oder fügen Sie sie als eigenständige Option hinzu." -"Additional Options","Zusätzliche Optionen" -"Address","Adresse" -"Address Verification System Response","Adressen Prüfsystem Rückmeldung" -"Advanced Settings","Erweiterte Einstellungen" -"Advertise Bill Me Later","Bill Me Later bewerben" -"All the address information matched","Alle Adressdaten stimmen überein" -"Allow in Billing Agreement Wizard","Assistent für die Rechnungsvereinbarung wird zugelassen" -"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Erlaubte Werte: ""paypal"", ""primary"" (Standard), ihr_eigener_wert (ein benutzerdefinierter Stil für Ihre Zahlungsseite, den Sie in Ihrem Händlerkonto-Profil festgelegt haben)." -"Allowed Credit Card Types","Zulässige Kreditkarten" -"Also affects mini-shopping cart.","Wirkt sich auch auf den Mini-Warenkorb aus." -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","Sind Sie sicher, dass Sie diese Seite verlassen wollen? Sie müssen wieder die Checkout-Schritte durchlaufen." -"Ask Customer","Beim Kunden anfragen" -"Attempted Authentication, Bad Result","Versuchte Authentifizierung, falsches Ergebnis" -"Attempted Authentication, Good Result","Versuchte Authentifizierung, richtiges Ergebnis" -"Auction Payment other than through eBay","Eine andere Auktionszahlung als über eBay" -"Authenticated, Bad Result","Authentifiziert, falsches Ergebnis" -"Authenticated, Good Result","Authentifiziert, richtiges Ergebnis" -"Authorization","Bewilligung" -"Authorization Honor Period (days)","Autorisation Ehrenzeitraum (Tage)" -"Authorization expired.","Genehmigung abgelaufen" -"Authorization transaction is required to void.","Genehmigungs-Transaktion zur Aufhebung erforderlich" -"Authorization was voided by merchant.","Genehmigung wurde vom Händler für ungültig erklärt" -"Authorized amount of %s.","Autorisierte Menge der %s" -"Authorizing amount of %s is pending approval on gateway.","Autorisation der Anzahl der %s wartet auf die Zulassung." -"Auto","Automatisch" -"AutoSweep","Selbstdurchlauf" -"Available Balance","Verfügbares Guthaben" -"Balance Manager Account Bonus","Guthaben-Manager Kontobonus" -"Basic Settings - PayPal Express Checkout","Grundeinstellungen - PayPal Express-Kasse" -"Basic Settings - PayPal Integral Evolution","Grundeinstellungen - PayPal Integral Evolution" -"Basic Settings - PayPal Pasarela integral","Grundeinstellungen - PayPal Pasarela integral" -"Basic Settings - PayPal Payflow Link","Grundeinstellungen - PayPal Payflow Link" -"Basic Settings - PayPal Payflow Pro","Grundeinstellungen - PayPal Payflow Pro" -"Basic Settings - PayPal Payments Advanced","Grundeinstellungen - PayPal Erweiterte Zahlungen" -"Basic Settings - PayPal Payments Pro","Grundeinstellungen - PayPal Zahlungen Pro" -"Basic Settings - PayPal Payments Pro Hosted Solution","Grundeinstellungen - PayPal Zahlungen Pro gehostete Lösung" -"Basic Settings - PayPal Payments Standard","Grundeinstellungen - PayPal Zahlungen Standard" -"Basic Settings - PayPal Pro","Grundeinstellungen - PayPal Pro" -"Basic Settings - PayPal Website Payments Plus","Grundeinstellungen - PayPal Webseiten-Zahlungen Plus" -"Basic Settings - PayPal Website Payments Pro","Grundeinstellungen - PayPal Webseiten-Zahlungen Pro" -"Basic Settings - PayPal Website Payments Pro Hosted Solution","Grundeinstellungen - PayPal Webseiten-Zahlungen Pro gehostete Lösung" -"Basic Settings - PayPal Website Payments Pro Payflow Edition","Grundeinstellungen - PayPal Webseiten-Zahlungen Pro Payflow Edition" -"Basic Settings - PayPal Website Payments Standard","Grundeinstellungen - PayPal Webseiten-Zahlungen Standard" -"Billing Address","Rechnungsadresse" -"Billing Agreement Signup","Anmeldung zur Rechnungsvereinbarung" -"Billing Information","Rechnungsinformationen" -"Bonus for first ACH Use","Bonus für erste ACH-Benutzung" -"Both section above must be complete. ","Beide Abschnitte oben müssen komplettiert sein." -"Buyer Credit Payment","Käuferkredit Zahlung" -"Buyer claims that a possible duplicate payment was made to the merchant.","Käufer behauptet, dass eine mögliche Doppelzahlung an den Händler getätigt wurde." -"Buyer claims that he did not receive goods or service.","Käufer behauptet, dass er die Ware bzw. den Service nicht erhalten hat." -"Buyer claims that he/she did not authorize transaction.","Käufer behauptet, dass er/sie diese Transaktion nicht autorisiert hat." -"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Käufer behauptet, dass die erhaltene Ware bzw. der Service sich von der Waren- bzw. Service-Beschreibung des Händlers unterscheidet." -"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Käufer behauptet, dass die erhaltene Ware nicht zufriedenstellend, defekt oder beschädigt ist." -"Buyer\'s Tax ID","Steuernummer des Käufers" -"Buyer\'s Tax ID Type","Art der Steuernummer des Käufers" -"By default it is ""reports.paypal.com"".","Standardmäßige Einstellung ist ""reports.paypal.com""." -"CNPJ","CNPJ" -"CPF","CPF" -"CVV Entry is Editable","CVV-Eingabe kann bearbeitet werden" -"CVV2 Check Result by PayPal","CVV2 Prüfergebnis durch PayPal" -"Can not send new order email.","Kann keine neue Bestellungs-E-Mail senden." -"Cannot create target file for reading reports.","Zieldatei zum Lesen der Berichte kann nicht erstellt werden." -"Catalog Category Page","Katalog Kategorieseite" -"Catalog Product Page","Katalog Produktseite" -"Centinel API URL","Centinel Api URL" -"Centinel Custom API URL","Centinel Custom API-URL" -"Charge-off","abbuchen" -"Chargeback","Rücklastschrift" -"Checkout Cart Page","Kasse Warenkorbseite" -"Checkout with PayPal","Mit PayPal abmelden" -"Checkout with PayPal Bill Me Later","Checkout mit PayPal Bill Me Later" -"Choose a secure bundled payment solution for your business.","Wählen Sie eine sichere, verknüpfte Zahlungslösung für Ihr Geschäft." -"City","Stadt" -"Click here if you are not redirected within 10 seconds...","Klicken Sie hier, wenn Sie nicht innerhalb von 10 Sekunden weitergeleitet werden..." -"Close","Schließen" -"Company","Unternehmen" -"Complaint","Beschwerde" -"Completion Date","Fertigstellungsdatum" -"Configure","Konfigurieren" -"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Verbinden Sie Ihr Händlerkonto mit einem PCI-konformen Gateway, mit dem Kunden zahlen können, ohne Ihre Webseite zu verlassen." -"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Verbinden Sie Ihr Händlerkonto mit einem vollständig anpassbaren Gateway, über das Kunden zahlen können, ohne Ihre Webseite zu verlassen." -"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Verbindung zum PayPal SFTP Server um neue Berichte zu holen, wird erstellt. Sind Sie sicher, dass sie fortfahren wollen?" -"Continue","Weiter" -"Countries Payment Applicable From","Länder Zahlungen gültig ab" -"Country","Land" -"Coupon Redemption","Coupon-Einlösung" -"Credit","Guthaben" -"Credit Card Settings","Kreditkarten-Einstellung" -"Currency Conversion required to cover negative balance","Währungsumrechnung erforderlich, um negatives Saldo zu decken" -"Custom","Kundenspezifisch" -"Custom Endpoint Hostname or IP-Address","Benutzerdefinierter Endpoint Hostname oder IP-Adresse" -"Custom Path","Benutzerdefinierter Pfad" -"Customer Information","Kundeninformation" -"Customer did not include a confirmed address.","Kunde hat keine bestätigte Adresse angegeben" -"Customer failed to pay.","Kunde hat nicht bezahlt." -"Customer used non-confirmed address.","Kunde benutzte eine nicht bestätigte Adresse." -"Daily","Täglich" -"Debit","Soll" -"Debit Card Cash Back","Debitkarte Cash Back" -"Debit Card Transaction","Debitkarte Überweisung" -"Debit or Credit","Soll oder Haben" -"Debug Mode","Debug Modus" -"Direct Payment API","Direktzahlung API" -"Discount","Rabatt" -"Display","Display" -"Display Express Checkout in the Payment Information step","Anzeige der Express-Kaufabwicklung im Schritt Zahlungsinformationen" -"Displays on catalog pages and homepage.","Anzeige auf Katalogseiten und auf der Homepage." -"Dispute","Streitfall" -"Don't have a PayPal account? Simply enter your email address.","Sie haben noch kein PayPal-Konto? Tragen Sie einfach Ihre Email-Adresse ein." -"Dynamic","Dynamisch" -"EFT Funding (German banking)","EFT Finanzierung (Deutsches Banksystem)" -"Edit","Bearbeiten" -"Edit Payment Information","Zahlungsinformationen bearbeiten" -"Edit Shopping Cart","Warenkorb bearbeiten" -"Email Address","E-Mail-Adresse" -"Email Associated with PayPal Merchant Account","Email ist mit PayPal Händler-Konto verknüpft" -"Email Associated with PayPal Merchant Account (Optional)","E-Mail, die zum PayPal-Händlerkonto gehört (optional)" -"Enable Automatic Fetching","Automatische Abholung aktivieren" -"Enable Bill Me Later","Bill Me Later aktivieren" -"Enable Express Checkout","Express-Kasse aktivieren" -"Enable PayPal Guest Checkout","PayPal Gast-Abmeldung aktivieren" -"Enable Payflow Link","Payflow Link aktivieren" -"Enable SSL verification","SSL-Verifizierung aktivieren" -"Enable this Solution","Diese Lösung aktivieren" -"Enabled","Aktiviert" -"Event","Vorgang" -"Event Code","Vorgang-Schlüssel" -"Every 10 days","alle 10 Tage" -"Every 14 days","alle 14 Tage" -"Every 3 days","alle 3 Tage" -"Every 30 days","alle 30 Tage" -"Every 40 days","alle 40 Tage" -"Every 7 days","alle 7 Tage" -"Exact Match. Address and Postal Code. International","Genaue Übereinstimmung. Adresse und Postleitzahl. International" -"Exact Match. Address and Postal Code. UK-specific","Genaue Übereinstimmung. Adresse und Postleitzahl. GB-spezifisch" -"Exact Match. Address and nine-digit ZIP code","Genaue Übereinstimmung. Adresse und neunstellige Postleitzahl" -"Explanation: %s.","Erläuterung: %s" -"Express Checkout","Express Kaufabwicklung" -"Express Checkout APIs","Express Kaufabwicklung APIs" -"Express Checkout and Order have been canceled.","Express-Checkout und Bestellung wurden storniert." -"Express Checkout has been canceled.","Express-Checkout storniert." -"Failed to fetch reports from '%s@%s'.","Abholung der Berichte von '%s@%s' fehlgeschlagen." -"Fax","Fax" -"Fee Amount","Gebühr Betrag" -"Fee Debit or Credit","Gebühr Soll oder Haben" -"Fee Reversal","Gebühr: ACH Auslands-Abhebung[caution! - this translation is for job#55147 and vice versa. sorry]" -"Fee: Foreign ACH Withdrawal","Gebühr Storno" -"Fee: Mass Pay Request","Gebühr: Anforderung Sammelzahlung" -"Fee: Web Site Payments Pro Account Monthly","Gebühr: monatliche Zahlungen der Webseite für Konto" -"Fee: WorldLink Check Withdrawal","Gebühr: WorldLink Scheckauszahlung" -"Fetch","Holen" -"Fetch Updates","Aktualisierungen herunterladen" -"Fetched %s report rows from '%s@%s'.","erfasste %s Berichtszeilen von ´%s@%s'." -"For Virtual Quotes Only","Nur für virtuelle Angebote" -"Frontend Experience Settings","Frontend Experience Einstellungen" -"Funding","Finanzierung" -"General (Authorization)","Allgemein (Berechtigung)" -"General (Dividend)","Allgemein (Dividende)" -"General (Funds Transfer from PayPal Account to Another)","Allgemein (Geldtransfer von einem PayPal Konto auf ein anderes)" -"General (Purchase with a credit card)","Allgemein (Kauf mit einer Kreditkarte)" -"General Adjustment without businessrelated event","Allgemeine Einstellung ohne geschäftsbezogenen Vorgang" -"General Currency Conversion","Allgemein Währungsumrechnung" -"General Funding of PayPal Account ","Allgemein Finanzierung des PayPal Kontos" -"General Redemption","Allgemein Rückzahlung" -"General Withdrawal from PayPal Account","Allgemein Abhebung vom PayPal Konto" -"General. Product no longer supported","Allgemein. Produkt wird nicht mehr untersützt" -"General: Use of PayPal account for purchasing as well as receiving payments","Allgemein: Verwendung des PayPal Kontos für Einkauf und den Empfang von Zahlungen" -"General: Withdrawal from PayPal Account","Allgemein: Abhebung vom PayPal Konto" -"General: Withdrawal to Non-Bank Entity","Allgemein: Abhebung von Nichtbank-Finanzintermediären" -"General: adjustment of a type not belonging to the other T12xx categories","Allgemein: Einstellung eines Typs der nicht zu den anderen T12xx Kategorien gehört" -"General: bonus of a type not belonging to the other T08xx categories","Allgemein: Bonus eines Typs der nicht zu den anderen T08xx Kategorien gehört" -"General: event not yet categorized","Allgemein: noch nicht klassifiziert" -"General: non-payment fee of a type not belonging to the other T01xx categories","Gebühr für Zahlungsverweigerung eines Typs, der nicht zu den anderen T01xx Kategorien gehört" -"General: received payment of a type not belonging to the other T00xx categories","Allemein: Zahlung eines Typs erhalten, der nicht zu den anderen T00xx Kategorien gehört" -"General: reversal of a type not belonging to the other T11xx categories","Allgemein: Storno eines Typs der nicht zu den anderen T11xx Kategorien gehört" -"General: temporary hold of a type not belonging to the other T15xx categories","Allgemein: Vorübergehende Einbehaltung eines Typs, der nicht zu den anderen T15xx Kategorien gehört" -"Get Credentials from PayPal","Fordern Sie von PayPal die Anmeldeinformationen an" -"Get Publisher ID from PayPal","Publisher-ID von PayPal erhalten" -"Gift Certificate Payment: purchase of Gift Certificate","Zahlung mit Geschenkgutschein: Kauf von Geschenkgutscheinen" -"Gift Certificate Redemption","Einlösung von Geschenkgutscheinen" -"Gross Amount","Bruttobetrag" -"Header (center)","Header (Mitte)" -"Header Background Color","Kopfzeile Hintergrundfarbe" -"Header Border Color","Kopfzeile Farbe der Umrandung" -"Header Image URL","Kopfzeile Bild URL" -"Help","Hilfe" -"Hidden Virtual PayPal Debit Card Transaction","Verborgene virtuelle PayPal Debitkarten Überweisung" -"Hold for Dispute Investigation","Zurückgehalten wegen Disput Überprüfung" -"Home Page","Homepage" -"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","Tut uns leid - aber wir können die Transaktion nicht abschließen. Bitte kontaktieren Sie uns, damit wir Ihnen helfen können." -"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","Tut uns leid - aber wir konnten Ihre Zahlung nicht verarbeitet. Bitte versuchen Sie eine andere Zahlungsmethode oder kontaktieren Sie uns, damit wir Ihnen helfen können." -"IPN ""%s"".","IPN ""%s""." -"IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""","IPN ""%s"". %s Transaktionsbetrag %s. Transaktions-ID: ""%s""" -"IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s.","IPN ""%s"". Ein Streitfall wurde gelöst und abgeschlossen. %s Transaktionsbetrag %s." -"IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s","IPN ""%s"". Falltyp ""%s"". Fall-ID ""%s"" %s" -"IPN verification ""%s"".","IPN-Verifizierung ""%s""." -"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Wenn leer wird ein Standardwert verwendet. Individuelle URL kann durch CardinalCommerce Vereinbarung ausgegeben werden" -"If not specified, Default Country from General Config will be used","Wenn nicht angegeben, wird das Land, welches in der General Config vorgegeben ist (Default), verwendet." -"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","Wenn diese Option aktiviert ist, kann der Kunde die Versandadresse und die Versandart auf der PayPal Webseite ändern. Im Live-Modus funktioniert dies nur über das HTTPS Protokoll." -"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","Falls Sie auf Ihrem Konto keine mehrfachen Nutzer eingerichtet haben, geben Sie bitte Ihr Verkäufer-/Händler-Login hier noch einmal ein." -"Impossible to issue a refund transaction because the capture transaction does not exist.","Eine Rückerstattungsüberweisung kann nicht erfolgen, da die Überweisungerfassung nicht vorhanden ist" -"Incentive","Anreiz" -"Initiation Date","Aktivierungsdatum" -"Integral Evolution","Integral Evolution" -"Invoice ID","Rechnungsnummer" -"Issuer Liability","Haftung des Ausstellers" -"It is recommended to set this value to ""Debit or Credit Card"" per store views.","Es wird empfohlen, diesen Wert auf ""Debit- oder Kreditkarte"" zu setzen." -"It is recommended to set this value to ""PayPal"" per store views.","Es wird empfohlen, diesen Wert auf ""PayPal"" Ansicht pro Geschäft zu setzen." -"Items in Your Shopping Cart","Artikel in Ihrem Warenkorb" -"Last Correlation ID","Letzte Korrelations Identifizierung" -"Last Transaction ID","Letzte Überweisungs-Kennnummer" -"Learn More","Erfahren Sie mehr" -"Login","Einloggen" -"Mass Pay Payment","""Mass Pay"" Zahlungen" -"Matched (CVV2)","abgeglichen (CVV2)" -"Matched (CVV2CSC)","Übereinstimmung (CVV2CSC)" -"Matched Address only (no ZIP)","Nur übereinstimmende Adresse (keine Postleitzahl)" -"Matched Address only (no ZIP). International","Nur die Adresse stimmt überein (keine Postleitzahl). International" -"Matched Postal Code only (no Address)","Nur die Postleitzahl stimmt überein (keine Adresse)" -"Matched five-digit ZIP only (no Address)","Nur die fünfstellige Postleitzahl stimmt überein (keine Adresse)" -"Matched whole nine-didgit ZIP (no Address)","Die ganze neunstellige Postleitzahl stimmt überein (keine Adresse)" -"Merchant Account","Händler Konto" -"Merchant Country","Händler Land" -"Merchant Liability","Haftbarkeit des Händlers" -"Merchant Location","Händler-Standort" -"Merchant Protection Eligibility","Händlerschutz Berechtigung" -"Merchant Referral Bonus","Händler Empfehlungsbonus" -"Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Das Händlerkonto hat keine Abhebungsfunktion. Der Händler muss die Zahlung manuell annehmen oder ablehnen im ""Account Overview"" (Kontoübersicht)." -"Merchant account is not verified.","Händlerkonto ist nicht verifiziert." -"Merchant denied this pending payment.","Der Händler hat diese ausstehende Zahlung verweigert." -"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Der Händler besitzt ein Nicht-US Konto und hat keinen Überweisungsautomatismus." -"Merchant must upgrade account to Business or Premier status.","Händler muss Konto auf Business- oder Premierstatus upgraden." -"Merchant reference ID format is not supported.","Das Format der Händler-Referenz-ID wird nicht unterstützt." -"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Händler müssen bei PayPal anfragen, um die Funktion ""Rechnungsvereinbarungen"" zu aktivieren. Aktivieren Sie diese Option nicht bevor PayPal bestätigt hat, dass die Rechnungsvereinbarungen für Ihr Händlerkonto aktiviert sind." -"Mobile Payment (made via a mobile phone)","Handy Zahlung (Zahlung erfolgt per Handy)" -"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Mehrfach-Währungs-Vorgang. Der Händler muss diese Zahlung manuell aus der PayPal Kontoübersicht annehmen oder ablehnen." -"N/A","Nicht zutreffend" -"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Adresse nicht geprüft oder der Käufer bekam keine Antwort. Service nicht verfügbar." -"N/A. Global Unavailable","N/A. Weltweit nicht verfügbar" -"N/A. International Unavailable","N/A. International nicht verfügbar" -"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Händler hat angezeigt, dasssich CVV2 nicht auf der Karte befindet." -"N/A. No response","N/A. Keine Antwort" -"N/A. Not allowed for MOTO (Internet/Phone) transactions","Nicht zutreffend. MOTO (Internet/Telefon) Transaktionen nicht erlaubt" -"N/A. Not processed","N/A. Nicht verarbeitet" -"N/A. Retry","N/A. wiederholen" -"N/A. Service not Supported","Nicht zutreffend. Service nicht angeboten" -"N/A. Service not available","N/A. Service ist nicht verfügbar" -"N/A. Service not supported","Nicht verfügbar. Service wird nicht unterstützt." -"N/A. The merchant did not provide AVS information","Nicht zutreffend. Der Händler hat keine AVS Informationen angegeben" -"N/A. The merchant has not implemented CVV2 code handling","N/A. Der Händler benutzt keine CVV2 Code Verarbeitung" -"N/A. Unavailable","N/A. Nicht verfügbar" -"Near Bill Me Later checkout button","In der Nähe der Bill Me Later-Checkout-Schaltfläche" -"Negative Balance","Negatives Guthaben" -"Never","Niemals" -"No","Nein" -"No Details matched","Keine Details stimmen überein" -"No Details matched. International","Keines der Details stimmt überein. International" -"No Liability Shift","Keine Haftung Wechseln" -"No Logo","Kein Logo" -"No match","Keine Übereinstimmung" -"None of the address information matched","Keine der Adress-Informationen stimmt überein" -"Not sure what PayPal payment method to use? Click here to learn more.","Unsicher, welche PayPal-Zahlungmethode man verwenden soll? Klicken Sie hier, um mehr zu erfahren." -"Note: %s","Hinweis: %s" -"Nothing to fetch because of an empty configuration.","Nichts zu holen auf Grund von leerer Konfiguration" -"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Beachten Sie, dass PayPal bis zu 10 Versandoptionen unterstützen kann. Magento wird daher nur die 10 günstigsten Versandoptionen übernehmen, falls es mehr als 10 Optionen gibt." -"Notified customer about creditmemo #%s.","Benachrichteter Kunde über den Kreditvermerk #%s" -"Notified customer about invoice #%s.","Benachrichteter Kunde über Rechnung #%s." -"Now accepting PayPal (150 X 40)","Wir nehmen jetzt PayPal an (150 X 40)" -"Now accepting PayPal (150 X 60)","Jetzt wird PayPal (150 X 60) angenommen" -"Number of Child Authorizations","Anzahl der Kinder-Autorisationen" -"Open Authorization","Autorisierung öffnen" -"Order","Bestellung" -"Order ID","Bestellungsidentifizierung" -"Order Valid Period (days)","Bestellung Geltungsdauer (Tage)" -"Ordered amount of %s.","Bestellte Menge von %s." -"Ordering amount of %s is pending approval on gateway.","Bestellte Menge von %s erwartet die Bestätigung vom Gateway." -"Page Background Color","Seiten Hintergrundfarbe" -"Page Style","Seitengestaltung" -"Part of the address information matched","Die Adressen-Information stimmt teilweise überein" -"Partner","Partner" -"Pasarela integral","Pasarela integral" -"Password","Passwort" -"PayPal All-in-One Payment Solutions  Accept and process credit cards and PayPal payments.","PayPals All-in-One-Zahlungslösungen  Kreditkarten sowie PayPal-Zahlungen akzeptieren und verarbeiten." -"PayPal Balance Manager function of PayPal account","PayPal Guthaben-Managerfunktion des PayPal Kontos" -"PayPal Billing Agreement Settings","PayPal Einstellungen Abrechnungsvereinbarung" -"PayPal Buyer Warranty Bonus","PayPal Käufer Garantiebonus" -"PayPal Debit Card Cash Advance","PayPal Debitkarte Barvorschuss" -"PayPal Debit Card Withdrawal from ATM","PayPal Debitkarte Abhebung von ATM" -"PayPal Express Checkout","PayPal Express-Kasse" -"PayPal Express Checkout Shortcut Wrapper","PayPal Express Checkout Shortcut Wrapper" -"PayPal Express Checkout Token does not exist.","PayPal Express-Checkout Token existiert nicht." -"PayPal Express Checkout is not enabled.","PayPal Express Checkout ist nicht aktiviert." -"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you. - You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®. - Learn More - ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you. - You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®. - Learn More" -"PayPal Express Order Review Form","PayPal Express Ansicht Bestellformular" -"PayPal Fee Information","PayPal Gebühren-Information" -"PayPal Merchant Pages Style","PayPal Händlerseiten Design" -"PayPal Payment Gateways","PayPal Zahlungs-Gateways" -"PayPal Payment Solutions","PayPal Zahlungslösungen" -"PayPal Pro","PayPal Pro" -"PayPal Product Logo","PayPal Produktlogo" -"PayPal Protection Bonus","PayPal Schutz Bonus" -"PayPal Reference ID","PayPal Referenz-Kennnummer" -"PayPal Reference ID Type","PayPal Referenz.Kennnummerntyp" -"PayPal Settlement Reports","PayPal Abrechnungsberichte" -"PayPal certificate does not exist.","PayPal-Zertifikat existiert nicht." -"PayPal certificate file is empty.","PayPal-Zertifikatdatei ist leer." -"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal unterstützt keine Verarbeitung von Bestellungen mit einem Wert von Null. Um Ihren Einkauf abzuschließen, fahren Sie bitte mit dem Standard-Checkout fort." -"PayPal gateway has rejected request. %s","PayPal gateway hat Ihre Anforderung abgewiesen. %s" -"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal empfiehlt, dass Sie einen zusätzlichen Nutzer auf Ihrem Konto bei manager.paypal.com erstellen." -"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal empfiehlt, dass Sie einen zusätzlichen Nutzer auf Ihrem Konto bei manager.paypal.com erstellen, anstatt Ihren Admin-Nutzernamen und Ihr Passwort hier einzugeben. Dies erhöht Ihre Sicherheit und vermeidet Service-Unterbrechungen, falls Sie später Ihr Passwort ändern. Falls Sie keinen zusätzlichen Nutzer einrichten möchten, können Sie hier Ihr Händler-Login noch einmal eingeben." -"PayPal response hasn't required fields.","Die erforderlichen Pflichtfelder für die PayPal Antwort wurden nicht ausgefüllt." -"PayPal retains reports for 45 days.","PayPal behält Aufzeichnungen für 45 Tage." -"PayPal/Centinel Electronic Commerce Indicator","PayPal/Cenitel Electronic Commerce Indikator" -"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa Payer Authentication Service Ergebnis" -"Payer Address ID","Zahler Adressen Kennummer" -"Payer Address Status","Adressenstatus des Zahlers" -"Payer Email","Zahler Email" -"Payer ID","Zahler Kennnummer" -"Payer Status","Zahler Status" -"Payer is not identified.","Zahler ist nicht identifiziert" -"Payflow Link","Payflow Link" -"Payflow Link (Includes Express Checkout)","Payflow Link (enthält Express-Kasse)" -"Payflow Pro","Payflow Pro" -"Payflow Pro (Includes Express Checkout)","Payflow Pro (enthält Express-Kasse)" -"Payflow Pro and Express Checkout","Payflow Pro und Express-Kasse" -"Payment Action","Zahlungsaktion" -"Payment Applicable From","Zahlung zutreffend von" -"Payment Method","Zahlungsmethode" -"Payment Refund initiated by merchant","Rückerstattung der Zahlung durch den Händler initiiert" -"Payment has been declined. Please try again.","Zahlung wurde verweigert. Bitte versuchen Sie es erneut." -"Payment is being reviewed by PayPal for risk.","Zahlung wird durch PayPal auf Risiken überprüft" -"Payment transactions disallow storing objects.","Zahlungen beinhalten nicht das Speichern der Objekte." -"Payment was made to an email address that is not yet registered or confirmed.","Zahlung erging an eine Email-Adresse die noch nicht registriert oder bestätigt wurde." -"Payments Advanced","Erweiterte Zahlungen" -"Payments Advanced (Includes Express Checkout)","Erweiterte Zahlungen (enthält Express-Kasse)" -"Payments Pro (Includes Express Checkout)","Zahlungen Pro (enthält Express-Kasse)" -"Payments Pro Hosted Solution","Zahlungen Pro gehostete Lösung" -"Payments Pro and Express Checkout","Zahlungen Pro und Express-Kasse" -"Payments Standard","Zahlungen Standard" -"Payments by PayPal (150 X 40)","Zahlungen durch PayPal (150 X 40)" -"Payments by PayPal (150 X 60)","Zahlungen durch PayPal (150 X 60)" -"Pending PayPal","PayPal ausstehend" -"Place Order","Erteilen Sie den Auftrag" -"Please agree to all the terms and conditions before placing the order.","Bitte stimmen Sie den Allgemeinen Geschäftsbedingungen zu, bevor Sie die Bestellung aufgeben." -"Please contact PayPal Customer Service.","Bitte benachrichtigen Sie den PayPal Kundenservice." -"Please do not refresh the page until you complete payment.","Bitte die Seite nicht aktualisieren, bis Sie die Zahlung abgeschlossen haben." -"Please re-enable the previously enabled payment solutions.","Bitte reaktivieren Sie die kürzlich ausgesetzten Zahlungsoptionen." -"Please select a shipping method...","Bitte wählen Sie eine Versandart aus..." -"Please select region, state or province","Bitte Region, Staat oder Provinz auswählen." -"Please update order data to get shipping methods and rates","Aktualisieren Sie bitte die Auftragsdaten für Versandmethoden und -tarife" -"Points Incentive Redemption","Einlösung von Loyalitätspunkten" -"Position","Position" -"Postage Payment to either USPS or UPS","Zahlung der Versandgebühr entweder an USPS oder UPS" -"Preapproved Payment (BillUser API), either sent or received","Vorausgenehmigte Bezahlung (BillUser API), entweder geschickt oder erhalten" -"Preapproved Payment ID","Vorabgenehmigte Zahlung Kennnummer" -"Price","Preis" -"Pro","Pro" -"Process payments using your own internet merchant account.","Zahlungsabwicklung mit Verwendung Ihres eigenen Internet-Händlerkontos." -"Product","Produkt" -"Product Name","Produktname" -"Proxy Host","Proxy Host" -"Proxy Port","Proxy Port" -"Publisher ID","Publisher-ID" -"Qty","Anzahl" -"Reauthorization","Erneute Autorisierung" -"Reference Information","Referenz-Information" -"Reimbursement for a chargeback.","Rückerstattung für eine Rückbuchung" -"Reimbursement of Chargeback","Rückerstattung einer Rücklastschrift" -"Report Date","Berichtsdatum" -"Reports","Berichte" -"Requested %s and configured %s merchant emails do not match.","Angeforderte %s und konfigurierte %s Emails der Händler stimmen nicht überein." -"Require CVV Entry","Kartenprüfnummer erfordern" -"Require Customer's Billing Address","Kunden-Rechnungsadresse anfordern" -"Required PayPal Settings","Erforderliche PayPal-Einstellungen" -"Required Settings","Erforderliche Einstellungen" -"Required to display a banner","Wird benötigt, um ein Banner anzuzeigen" -"Reversal","Rückbelastung" -"Reversal of General Account Hold","Storno des Hauptkontos durchführen" -"Reversal of Points Usage","Points Rückbelastung" -"Reversal of an adjustment.","Storno einer Änderung" -"Reversal of hold for Dispute Investigation","Stornierung einer Reservierung des Kontos wegen Disput Untersuchung" -"Review Order","Auftrag überprüfen" -"Reward Voucher Redemption","Belohnungsgutschein Einlösung" -"SFTP Credentials","SFTP Anmeldedaten" -"Sale","Verkauf" -"Sales","Verkäufe" -"Same as shipping","Identisch mit Versand" -"Sandbox Credentials","Sandbox Anmeldeinformationen" -"Sandbox Mode","Sandkasten-Modus" -"Schedule","Planen" -"Schedule description is too long.","Ablaufbeschreibung ist zu lang." -"Scheduled Fetching","vorgesehenes Hochladen" -"Select a Payment Solution","Wählen Sie eine Zahlungslösung" -"Send Email Confirmation","E-Mail-Bestätigung senden" -"Server Error. Please try again.","Server-Fehler. Versuchen Sie es bitte erneut." -"Settlement Consolidation","Zahlung Zusammenführung" -"Settlement Report Settings","Abrechnungsbericht Einstellungen" -"Settlement of a chargeback.","Zahlung eine Rücklastschrift" -"Severe 3D Secure Card Validation","Severe 3D Secure Card Validierung" -"Severe Validation Removes Chargeback Liability on Merchant","Die bestehende strenge Absicherung entzieht den Verkäufer der Verbindlichkeit Ausgleichsbuchungen nachkommen zu müssen" -"Severe validation removes chargeback liability on merchant.","Severe Validierung entfernt Ausgleichhaftung des Händlers." -"Shipping","Lieferung" -"Shipping Address","Lieferadresse" -"Shipping Information","Liefer-und Versandinformation" -"Shipping Method","Lieferungsart" -"Shop now using (150 X 40)","Kaufen Sie jetzt mit (150 X 40)" -"Shop now using (150 X 60)","Kaufen Sie jetzt ein indem sie (150 X 60) nutzen" -"Shortcut","Shortcut" -"Shortcut Buttons Flavor","Kurzbefehl Schaltfläche Geschmack" -"Shortcut on Product View","Kurzbefehl zur Artikelansicht" -"Shortcut on Shopping Cart","Direktweg zum Einkaufswagen" -"Sidebar (right)","Sidebar (rechts)" -"Sign a billing agreement to streamline further purchases with PayPal.","Unterzeichnen sie eine Rechnungsvereinbarung, um zukünftige Käufe mit PayPal zu rationalisieren." -"Size","Größe" -"Skip Order Review Step","Den Schritt Bestellung überprüfen überspringen" -"Solo","Einzeln" -"Some PayPal solutions conflict.","Ein die PayPal-Optionen betreffendes Problem." -"Sorry, no quotes are available for this order at this time.","Es tut uns Leid, es gibt derzeit keine Preisangabe für diese Bestellung." -"Sort Order","Sortierfolge" -"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Spezifizierung, was die Autorisation des Ehrenzeitraumes im PayPal-Konto des Händlers ist. Dies muss den Einstellungen in PayPal entsprechen." -"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Spezifizierung, was die Bestellung der Geltungsdauer im PayPal-Konto des Händlers ist. Dies muss den Einstellungen in PayPal entsprechen." -"State/Province","Staat/Bezirk" -"Static","Statisch" -"Street Address","Anschrift (Straße, Hausnummer, PLZ)" -"Street Address %s","Hausanschrift %s" -"Submitting order information...","Bestellinformationen werden gesendet..." -"Subscriber name is too long.","Der Teilnehmername ist zu lang." -"Subscription ID","Bestellnummer" -"Subscription Payment, either payment sent or payment received","Abonnementzahlung, entweder geschickte Zahlung oder Zahlung erhalten" -"Subtotal","Zwischensumme" -"Summary Text for Aggregated Cart","Zusammenfassung des gesamten Korbs" -"Supporting of American Express cards require additional agreement. Learn more at http://www.paypal.com/amexupdate.","Für die Unterstützung von American Express Karten ist eine gesonderte Vereinbarung erforderlich. Erfahren Sie mehr unter at http://www.paypal.com/amexupdate." -"Switch/Maestro","Switch/ Maestro" -"Telephone","Telefon" -"Test Mode","Testmodus" -"The background color for the checkout page around the header and payment form.","Die Hintergrundfarbe für die Checkout-Seite, um die Überschrift und Zahlungsart herum." -"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","Die Hintergrundfarbe für die Kopfzeile der Abmeldeseite. Groβ- und Kleinschreibung sechs Buchstaben HTML hexadezimal farbcode in ASII." -"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","Die Standardeinstellung für Kinder-Autorisationen in Ihrem Paypal-Konto ist 1. Für mehrfache Autorisationen kontaktieren Sie bitte PayPal und bitten Sie um Erweiterung." -"The following error(s) occured:","Es ist zu dem/den folgenden Fehler(n) gekommen:" -"The image at the top left of the checkout page. Max size is 750x90-pixel. https is highly encouraged.","Das Bild oben links auf der Checkout-Seite. Max. Größe 750 x 90 Pixel. https wird dringend empfohlen." -"The maximum number of child authorizations is reached.","Die maximal mögliche Anzahl an Kinder-Autorisationen ist erreicht." -"The merchant account is not yet verified.","Das Händlerkonto wurde noch nicht verifiziert." -"The payment curency does not match any of the merchant\'s balances currency.","Die Währung der Zahlung stimmt mit keiner der Währungen des Kontos des Händlers überein." -"The payment eCheck is not yet cleared.","Zahlung per eCheck ist noch nicht vereinbart." -"The payment is authorized but not settled.","Die Zahlung wurde autorisiert aber noch nicht ausgeführt." -"The payment is pending because it was made to an email address that is not yet registered or confirmed.","Die Zahlung steht noch aus, da sie an eine Email-Adresse versandt wurde, die weder registriert noch bestätigt ist." -"The payment is pending while it is being reviewed by PayPal for risk.","Zahlung steht noch aus und wird von PayPal auf Risiken geprüft." -"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","Die Zahlung wurde mit Kreditkarte getätigt. Damit der Händler Zahlungen erhalten kann, muss er sein Konto auf Business- oder Premiumstatus upgraden." -"There is already another PayPal solution enabled. Enable this solution instead?","Es wurde bereits eine andere PayPal-Option aktiviert. Soll diese stattdessen verwendet werden?" -"There was an error processing your order. Please contact us or try again later.","Bei der Bearbeitung Ihrer Bestellung ist ein Fehler aufgetreten. Bitte kontaktieren Sie uns oder versuchen Sie es später noch einmal." -"This feature needs be enabled first for the merchant account through PayPal technical support.","Diese Funktion muss zunächst für das Händlerkonto vom Technischen Support von Paypal aktiviert werden." -"This operation requires an existing transaction object.","Dieser Vorgang erfordert einen bestehenden Transaktionsgegenstand." -"Time of Day","Tageszeit" -"Title","Titel" -"To proceed to Checkout, please log in using your email address.","Um zur Kasse zu gelangen, melden Sie sich bitte mit Ihrer Email-Adresse an." -"Transaction ID","TransaktionsID" -"Transaction ID must not be empty.","ID der Transaktion darf nicht leer sein." -"Transaction Information","Überweisungs-Informationen" -"Transaction reversal by PayPal administrators.","Transaktionsaufhebung durch PayPal-Administratoren." -"Transaction reversal due to fraud detected by PayPal administrators.","Transaktionsaufhebung, da Betrug durch die PayPal-Administratoren entdeckt wurde." -"Transfer Cart Line Items","Einkaufswagen-Rechnungsposten transferieren" -"Transfer Shipping Options","Überweisung Versand Optionen" -"Triggered Fraud Filters","Ausgelöste Betrugsfilter" -"URL method for Cancel URL and Return URL","URL-Methode für URL-Stornierung und Rückleitungs-URL" -"Unable to cancel Express Checkout.","Express-Checkout kann nicht abgebrochen werden." -"Unable to change status. Current status is not correspond to real status.","Status kann nicht geändert werden. Der aktuelle Status entspricht nicht dem tatsächlichen Status." -"Unable to communicate with the PayPal gateway.","Es kann keine Verbindung zum PayPal Gatway aufgenommen werden." -"Unable to initialize Express Checkout review.","Express-Checkout Überprüfung kann nicht initialisiert werden." -"Unable to initialize Express Checkout.","Express Abmeldung kann nicht initialisiert werden." -"Unable to place the order.","Bestellung konnte nicht aufgegeben werden." -"Unable to process Express Checkout approval.","Express-Checkout Genehmigung konnte nicht bearbeitet werden." -"Unable to start Express Checkout.","Express-Checkout konnte nicht gestartet werden." -"Unable to update Order data.","Bestellinformation konnte nicht aktualisiert werden." -"Unable to update shipping method.","Die Versandmethode konnte nicht aktualisiert werden." -"Unknown Error. Please try again later.","Unbekannter Fehler. Versuchen Sie es später erneut." -"Unknown reason. Please contact PayPal customer service.","Unbekannter Grund. Bitte kontaktieren Sie den PayPal Kundenservice." -"Update Order Data","Bestellinformation aktualisieren" -"Update Shipping Method","Versandart aktualisieren" -"Use Proxy","Proxy benutzen" -"Use colon to specify port. For example: ""test.example.com:5224"".","Verwenden Sie einen Doppelpunkt, um den Port festzulegen. Zum Beispiel: ""test.example.com:5224""." -"User","Benutzer" -"User-initiated Currency Conversion","Vom Benutzer ausgelöste Währungsumrechnung" -"Uses store frontend name by default.","Benutzt standardmässig store frontend name." -"VAT Number","MwSt.-Nummer" -"Vendor","Anbieter" -"View","Ansicht" -"View Demo","Demo anzeigen" -"View Transaction","Transaktion anzeigen" -"View Transaction Details","Überweisungsdetails zeigen" -"Virtual PayPal Debit Card Transaction","Virtuelle PayPal Überweisung mit Debitkarte" -"Virtual Terminal Payment","Virtuelles Zahlungsterminal" -"Void","Leer" -"Waiting until Customer\'s eCheck will be cleared.","Warten bis der eCheck des Kunden freigegeben ist." -"We prefer PayPal (150 X 40)","Wir bevorzugen PayPal (150 X 40)" -"We prefer PayPal (150 X 60)","Wir bevorzugen PayPal (150 X 60)" -"Website Payments Plus","Webseite Zahlungen Plus" -"Website Payments Pro (Includes Express Checkout)","Webseiten-Zahlungen Pro (enthält Express-Kasse)" -"Website Payments Pro Hosted Solution","Website Payments Pro Gehostete Lösung" -"Website Payments Pro Hosted Solution (Includes Express Checkout)","Webseiten-Zahlungen Pro gehostetete Lösung (enthält Express-Kasse)" -"Website Payments Pro Hosted Solution and Express Checkout","Webseiten-Zahlungen Pro gehostetete Lösung und Express-Kasse" -"Website Payments Pro Payflow Edition (Includes Express Checkout)","Webseiten-Zahlungen Pro Payflow-Edition (enthält Expess-Kasse)" -"Website Payments Pro Payflow Edition and Express Checkout","Webseiten-Zahlungen Pro Payflow-Edition und Express-Kasse" -"Website Payments Pro and Express Checkout","Webseiten-Zahlungen Pro und Express-Kasse" -"Website Payments Standard","Webseite Zahlungen Standard" -"Website Payments Standard Payment","Webseite Zahlungen Standard Zahlung" -"What is PayPal?","Was ist PayPal?" -"Whether to create a billing agreement, if there are no active billing agreements available.","Ob eine Rechnungsvereinbarung angelegt werden muss, wenn keine aktiven Rechnungsvereinbarungen zur Verfügung stehen." -"Will appear as a payment option only for customers who have at least one active billing agreement.","Erscheint nur für die Kunden als Zahlungsoption, die mindestens eine aktive Rechnungsvereinbarung haben." -"WorldLink Withdrawal","WorldLink Abhebung" -"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Würden Sie gerne eine Rechnungsvereinbarung abschliessen, um zukünftige Käufe mit PayPal zu rationalisieren?" -"Wrong Order ID (%s) specified.","Falsche Bestellnummer (%s) angegeben." -"Wrong PayPal Express Checkout Token specified.","Falscher PayPal Express-Checkout Token eingegeben." -"Yes","Ja" -"Yes. Matched Address and five-didgit ZIP","Ja. Adresse und fünfstellige Postleitzahl stimmen überein." -"You cannot void a verification transaction","Sie können eine Prüfung nicht für ungültig erklären" -"You will be redirected to the PayPal website in a few seconds.","Sie werden in wenigen Sekunden auf die PayPal Website weitergeleitet." -"You will be redirected to the PayPal website when you place an order.","Sie werden zur PayPal-Website weitergeleitet, wenn Sie eine Bestellung aufgeben." -"You will be redirected to the PayPal website.","Sie werden zur PayPal Webseite weitergeleitet." -"You will be required to enter your payment details after you place an order.","Sie werden aufgefordert, Ihre Zahlungsdaten eingeben, nachdem Sie eine Bestellung aufgegeben haben." -"Zip/Postal Code","Postleitzahl" -"chargeback reimbursed","Rücklastschrift erstattet." -"chargeback settled","Rücklastschrift beglichen" -"customer complaint","Kundenreklamation" -"customer triggered a chargeback","Kunde hat eine Rückbuchung veranlasst" -"customer triggered money-back guarantee","Der Kunde leitete eine Geld-zurück-Garantie ein" -"eBay Auction Payment","eBay Auktion Zahlung" -"merchant refunded payment","Händler hat Zahlung erstattet" -"no reason","kein Grund" -"reversal of an adjustment","Storno einer Änderung" -"unknown reason","unbekannter Grund" diff --git a/app/locale/de_DE/Mage_PaypalUk.csv b/app/locale/de_DE/Mage_PaypalUk.csv deleted file mode 100644 index dff193d6c..000000000 --- a/app/locale/de_DE/Mage_PaypalUk.csv +++ /dev/null @@ -1,2 +0,0 @@ -"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","PayPal Express Checkout (Payflow Edition) Shortcut Wrapper" -"PayPal Express Order Review Form","PayPal Express Bestellübersichtsformular" diff --git a/app/locale/de_DE/Mage_Persistent.csv b/app/locale/de_DE/Mage_Persistent.csv deleted file mode 100644 index 4e7c228f0..000000000 --- a/app/locale/de_DE/Mage_Persistent.csv +++ /dev/null @@ -1,74 +0,0 @@ -"""Remember Me"" Default Value","""Login merken""-Standardwert" -"(Not %s?)","(Nicht %s?)" -"* Required Fields","* Pflichtfelder" -"Address","Adresse" -"Address Information","Addressinformationen" -"Already registered?","Bereits registriert?" -"Back","Zurück" -"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Mit einem Konto bei unserem Shop geht der Bestell- und Bezahlprozess viel schneller, Sie können mehrere Versandadressen speichern, Ihre Bestellungen ansehen und verfolgen und vieles mehr." -"Cannot load configuration from file %s.","Konfiguration aus Datei %s kann nicht geladen werden." -"Checkout as Guest","Checkout als Gast" -"Checkout as a Guest","Als Gast zur Kasse" -"Checkout as a Guest or Register","Als Gast weiter zur Kasse gehen oder registrieren" -"City","Stadt" -"Clear Persistence on Log Out","Eindeutige Ausdauer beim Ausloggen" -"Close","Schließen" -"Company","Unternehmen" -"Confirm Password","Passwort bestätigen" -"Continue","Weiter" -"Country","Land" -"Create an Account","Ein Konto anlegen" -"Easy access to your order history and status","Schneller Zugriff auf Ihre Bestellungen und Ihren Status" -"Email Address","E-Mail-Adresse" -"Enable ""Remember Me""","""Login merken"" aktivieren" -"Enable Persistence","Ausdauer aktivieren" -"Fast and easy check out","Schnelles und einfaches Bezahlen" -"Faster checkout","Schneller Checkout" -"Fax","Fax" -"Forgot Your Password?","Passwort vergessen?" -"Forgot your password?","Passwort vergessen?" -"General Options","Allgemeine Optionen" -"If you have an account with us, please log in.","Falls Sie ein Konto bei uns haben, loggen Sie bitte ein." -"Loading next step...","Lade nächsten Schritt..." -"Login","Login" -"Login Information","Login-Informationen" -"Login or Create an Account","Einloggen oder Benutzerkonto erstellen" -"New Customers","Neue Kunden" -"New Here?","Neu hier?" -"Password","Passwort" -"Persist Shopping Cart","Bestehender Warenkorb" -"Persistence Lifetime (seconds)","Noch bleibende Lebensdauer (Sekunden)" -"Persistent Shopping Cart","Bleibender Warenkorb" -"Personal Information","Persönliche Angaben" -"Please enter the following information to create your account.","Bitte geben Sie die folgenden Informationen ein, um Ihr Konto zu erstellen." -"Please log in below:","Bitte loggen Sie sich hier ein:" -"Please select region, state or province","Bitte Region, Staat oder Provinz auswählen." -"Register","Registrieren" -"Register and Checkout","Registrieren und checkout" -"Register and save time!","Registrieren und Zeit sparen!" -"Register to Create an Account","Registrieren, um ein Konto zu erstellen" -"Register with us for future convenience:","Registrieren Sie sich bei uns, um den Einkauf so bequem wie möglich zu gestalten:" -"Registered Customers","Registrierte Kunden" -"Registration is free and easy!","Die Anmeldung ist kostenlos und einfach!" -"Remember Me","Eingaben merken" -"Returning Customers","Wiederkehrende Kunden" -"Save in address book","Im Adressbuch speichern" -"Save multiple shipping addresses","Speichern Sie mehrere Lieferadressen" -"Select State/Province...","Bundesland auswählen" -"Select a billing address from your address book or enter a new address.","Rechnungsadresse aus Ihrem Adressbuch auswählen oder neue Adresse eingeben" -"Ship to different address","An eine abweichende Adresse versenden" -"Ship to this address","An diese Adresse versenden" -"Shopping cart has been updated with appropriate prices","Der Einkaufswagen wurde mit entsprechenden Preisen aktualisiert" -"Sign Up for Newsletter","Melden Sie sich für unseren Newsletter an" -"Sign in to speed up your checkout process","Melden Sie sich an, um Ihren Checkout-Prozess zu beschleunigen" -"State/Province","Staat/Bezirk" -"Street Address","Anschrift (Straße, Hausnummer, PLZ)" -"Street Address %s","Hausanschrift %s" -"Submit","Übermitteln" -"Telephone","Telefon" -"To proceed to Checkout, please log in using your email address.","Um weiter zur Kasse zu gehen, melden Sie sich bitte mit Ihrer E-Mail-Adresse an." -"VAT Number","MwSt.-Nummer" -"View and track orders and more","Anzeigen und Nachverfolgen von Aufträgen und mehr" -"Welcome, %s!","Willkommen, %s!" -"What\'s this?","Was ist das?" -"Zip/Postal Code","Postleitzahl" diff --git a/app/locale/de_DE/Mage_Poll.csv b/app/locale/de_DE/Mage_Poll.csv deleted file mode 100644 index 412e27549..000000000 --- a/app/locale/de_DE/Mage_Poll.csv +++ /dev/null @@ -1,42 +0,0 @@ -"Actions","Aktionen" -"Add Answer","Antwort hinzufügen" -"Add New Answer","Neue Antwort hinzufügen" -"Add New Poll","Neue Umfrage hinzufügen" -"Answer Title","Antworttitel" -"Answer Title:","Antworttitel:" -"Answer with the same title in this poll","Antwort mit gleichem Titel in dieser Umfrage" -"Are you sure you want to delete it?","Sind Sie sicher, dass Sie es löschen wollen?" -"Assigned Answers","Zugewiesene Antworten" -"Closed","Geschlossen" -"Community Poll","Community-Umfrage" -"Date Closed","Datum Geschlossen" -"Date Posted","Datum Eingestellt" -"Delete","Löschen" -"Delete Answer","Antwort löschen" -"Delete Poll","Umfrage löschen" -"Disallow Voting in a Poll Multiple Times from Same IP-address","Verbieten mehrerer Umfrageteilnahmen von der selben IP-Adresse" -"Edit Answer '%s'","Antwort '%s' bearbeiten" -"Edit Poll '%s'","Umfrage '%s' bearbeiten" -"Edit Poll Answer","Umfrageantwort bearbeiten" -"ID","ID" -"Invalid Answer.","Ungültige Antwort." -"New Poll","Neue Umfrage" -"Number of Responses","Anzahl an Umfragereaktionen" -"Open","Offen" -"Poll Answers","Umfrageantworten" -"Poll Information","Umfrageinformation" -"Poll Manager","Umfragenverwalter" -"Poll Question","Frage in Umfrage" -"Poll information","Umfrageinformation" -"Poll with the same question","Umfrage mit gleicher Frage" -"Polls","Umfragen" -"Save Answer","Antwort speichern" -"Save Poll","Umfrage speichern" -"Status","Status" -"The answer has been saved.","Die Antwort wurde gespeichert." -"The poll does not exist.","Die Umfrage existiert nicht." -"Unable to find an answer to delete.","Zu löschende Antwort konnte nicht gefunden werden." -"Visible In","Sichtbar in" -"Vote","Stimme" -"Votes Count","Stimmenanzahl" -"Votes Count:","Stimmenanzahl:" diff --git a/app/locale/de_DE/Mage_ProductAlert.csv b/app/locale/de_DE/Mage_ProductAlert.csv deleted file mode 100644 index 21ce1e662..000000000 --- a/app/locale/de_DE/Mage_ProductAlert.csv +++ /dev/null @@ -1,35 +0,0 @@ -"Alert Email Sender","Email-Absender für Benachrichtigung" -"Alert subscription has been saved.","Benachrichtigungsabonnement wurde gespeichert." -"Allow Alert When Product Comes Back in Stock","Benachrichtigung, sobald ein ausverkauftes Produkt wieder verfügbar ist, zulassen" -"Allow Alert When Product Price Changes","Benachrichtigung bei Preisänderungen eines Produkts zulassen" -"Click here not to receive alerts for this product","Klicken Sie hier um keine Benachrichtigungen zu diesem Produkt zu erhalten" -"Error Email Recipient","Email-Empfänger bei auftretenden Fehlern" -"Error Email Sender","Email-Absender bei auftretenden Fehlern" -"Error Email Template","Email-Vorlage bei auftretenden Fehlern" -"Frequency","Frequenz" -"Not enough parameters.","Angaben reichen nicht aus." -"Price Alert Email Template","Email-Vorlage für Preisbenachrichtigungen" -"Price:","Preis:" -"Product Alerts","Produktbenachrichtigungen" -"Product Alerts Run Settings","Produktbenachrichtigungen Ausführungseinstellungen" -"Product alerts Cron error","Produktbenachrichtigungen Cron-Fehler" -"Product price alert","Produktpreisbenachrichtigung" -"Product stock alert","Produktverfügbarkeitsbenachrichtigung" -"Regular Price:","Regulärer Preis:" -"Sign up for price alert","Für Preisbenachrichtigungen anmelden" -"Sign up to get notified when this product is back in stock","Lassen Sie sich benachrichtigen, sobald dieses Produkt wieder verfügbar ist." -"Special price:","Spezialpreis:" -"Start Time","Startzeit" -"Stock Alert Email Template","Email-Vorlage für Verfügbarkeitsbenachrichtigung" -"The alert subscription has been deleted.","Das Benachrichtigungsabonnement wurde gelöscht." -"The alert subscription has been saved.","Das Benachrichtigungsabonnement wurde gespeichert." -"The product is not found.","Das Produkt konnte nicht gefunden werden." -"The product was not found.","Das Produkt konnte nicht gefunden werden." -"Unable to update the alert subscription.","Aktualisierung des Benachrichtigungsabonnements nicht möglich." -"Unsubscribe from all price alerts","Von allen Preisbenachrichtigungen abmelden" -"Unsubscribe from all stock alerts","Von allen Verfügbarkeitsbenachrichtigungen abmelden" -"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","Sie erhalten diese Benachrichtigung, da Sie informiert werden wollten, wenn folgende Produkte wieder verfügbar sind:" -"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","Sie erhalten diese Benachrichtigung, da Sie informiert werden wollten, wenn sich die Preise folgender Produkte ändern:" -"You will no longer receive price alerts for this product.","Sie erhalten zukünftig keine Preisbenachrichtigungen mehr." -"You will no longer receive stock alerts for this product.","Sie erhalten zukünftig keine weiteren Verfügbarkeitsbenachrichtigungen mehr für dieses Produkt." -"You will no longer receive stock alerts.","Sie erhalten zukünftig keine Verfügbarkeitsbenachrichtigungen mehr." diff --git a/app/locale/de_DE/Mage_Rating.csv b/app/locale/de_DE/Mage_Rating.csv deleted file mode 100644 index 402cb83aa..000000000 --- a/app/locale/de_DE/Mage_Rating.csv +++ /dev/null @@ -1,29 +0,0 @@ -"1 star","1 Stern" -"2 stars","2 Sterne" -"3 stars","3 Sterne" -"4 stars","4 Sterne" -"5 stars","5 Sterne" -"Add New Rating","Neue Bewertung hinzufügen" -"Assigned Options","Zugewiesene Optionen" -"Be the first to review this product","Bewerten Sie dieses Produkt als Erster" -"Default Value","Vorgegebener Wert" -"Delete Rating","Vorgegebene Bewertung" -"Edit Rating","Bewertung bearbeiten" -"ID","ID" -"If you do not specify a rating title for a store, the default value will be used.","Wenn Sie keinen Bewertungstitel für einen Store spezifizieren, wird der vorgegebene Wert genutzt." -"Manage Ratings","Bewertungen verwalten" -"New Rating","Neue Bewertung" -"Option Label","Option Label" -"Option Title","Option Titel" -"Option Title:","Option Titel:" -"Please select one of each ratings above","Bitte wählen Sie oben eine Bewertung" -"Rating Information","Bewertungsinformation" -"Rating Name","Bewertungsname" -"Rating Options","Bewertungsoptionen" -"Rating Title","Bewertungstitel" -"Rating Visibility","Sichtbarkeit der Bewertung" -"Rating isn't Available","Bewertung ist nicht verfügbar" -"Rating with the same title","Bewertung mit gleichem Titel" -"Save Rating","Bewertung speichern" -"Sort Order","Sortierfolge" -"Visible In","Sichtbar in" diff --git a/app/locale/de_DE/Mage_Reports.csv b/app/locale/de_DE/Mage_Reports.csv deleted file mode 100644 index b1661cef5..000000000 --- a/app/locale/de_DE/Mage_Reports.csv +++ /dev/null @@ -1,174 +0,0 @@ -"Abandoned Carts","Unbenutzte Einkaufswagen" -"Abandoned carts","Verlassene Warenkörbe" -"Action","Aktion" -"Add to Cart","Zum Warenkobrn hinzufügen" -"Add to Compare","Hinzufügen um zu vergleichen" -"Add to Wishlist","Zum Wunschzettel hinzufügen" -"Any","Etwas" -"Applied Coupon","Benutzter Gutschein" -"Applies to Any of the Specified Order Statuses","Gilt für jeden spezifischen Stand der Bestellung" -"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Sind Sie sicher, dass Sie die Laufzeit der Statistiken aktualisieren möchten? Während dieser Tätigkeit kann die Leistung beeinflusst werden." -"Are you sure?","Sind Sie sicher?" -"Avg. Approved Rating","Durchschnittliche anerkannte Bewertung" -"Avg. Rating","Durchschnittliche Bewertung" -"Bestsellers","Bestseller" -"Bought from wishlists","Vom Wunschzettel gekauft" -"CSV","CSV" -"Carts","Einkaufswagen" -"Catalog Category (Without Subcategories)","Katalogkategorie (ohne Unterkategorien)" -"Compared Products Grid Template","Gittermustervorlage für verglichene Produkte" -"Compared Products List Template","Vorlage für die Liste verglichener Produkte" -"Coupons","Gutscheine" -"Coupons Usage Report","Protokoll zur Anwendung von Gutscheinen" -"Created At","Erstellte At" -"Current Month Starts","Aktuelle monatliche Starts" -"Customer","Kunde" -"Customer Name","Kundenname" -"Customer Tags","Tags des Kunden" -"Customers","Kunden" -"Customers Report","Erfahrungsbericht der Kunden" -"Customers Reviews","Berichte der Kunden" -"Customers Tags","Tags der Kunden" -"Customers by Number of Orders","Kunden nach Bestellnummer" -"Customers by Orders Total","Kunden nach Gesamtzahl der Bestellung" -"Customers by number of orders","Kunden nach der Anzahl der Aufträge" -"Customers by orders total","Kunden nach Aufträgen insgesamt" -"Customers that have wishlist: %s%","Kunden, die einen Wunschzettel haben: %s%" -"Dashboard","Dashboard" -"Day","Tag" -"Default Recently Compared Products Count","Default der kürzlich verglichenen Anzahl der Produkte" -"Default Recently Viewed Products Count","Default der kürzlich angesehenen Anzahl der Produkte" -"Description","Beschreibung" -"Detail","Detail" -"Downloads","Downloads" -"Email","E-Mail" -"Empty Rows","Leere Reihe" -"Excel XML","Excel-XML" -"Filter","Filter" -"First Name","Vorname" -"From","Von" -"Guest","Gast" -"Hits","Treffer" -"ID","ID" -"IP Address","IP Adresse" -"Index model name must be defined","Index Modellname muss definiert sein" -"Invalid date specified.","Ungültiges angegebenes Datum" -"Invoiced","In Rechnung gestellt." -"Items in Cart","Waren im Einkaufswagen" -"Last Name","Nachname" -"Last Review","Letzte Überprüfung" -"Link","Link" -"List of Products Recently Compared and Removed from the Compare List by Visitor","Liste der kürzlich verglichenen Produkte und Produkte, die vom Besucher von der Vergleichsliste entfernt wurden" -"List of Products Recently Viewed by Visitor","Liste der kürzlich angesehenen Produkte des Besuchers" -"Low Stock","Niedriger Lagerbestand" -"Low stock","Wenige Artikel vorrätig" -"Match Period To","Entsprechungszeitraum" -"Month","Monat" -"Most Viewed","am meisten angesehen" -"Name","Name" -"New Accounts","Neue Konten" -"No","Nein" -"Number Added","Anzahl hinzugefügt" -"Number Fulfilled","Anzahl erfüllt" -"Number Of Reviews","Anzahl der Bewertungen" -"Number Purchased","Anzahl der erworbenen Artikel" -"Number Viewed","Anzahl wie oft angesehen" -"Number of Items","Anzahl der Artikel" -"Number of New Accounts","Anzahl der neuen Konten" -"Number of Products to display","Anzahl der darzustellenden Artikel" -"Number of Reviews","Anzahl der Bewertungen" -"Number of Times Deleted","Anzahl wie oft gelöscht" -"Number of Total Tags","Gesamtzahl aller Etiketten" -"Number of Unique Tags","Anzahl einzelner Etiketten" -"Number of Views","Anzahl wie oft angesehen" -"Number of items bought from a wishlist: %s","Anzahl der Artikel die aus einer Wunschliste gekauft wurden: in %" -"Number of times wishlists have been shared (emailed): %s","Anzahl wie oft Wunschlisten per email verteilt wurden: in %" -"Number of wishlist conversions: %s","Anzahl der Konvertierung von Wunschlisten: in %" -"Number of wishlist referrals: %s","Anzahl der Empfehlungen von Wunschlisten: in %" -"Number of wishlists: %s","Anzahl der Wunschlisten: in %" -"Order Status","Status des Auftrags" -"Order Taxes Report Grouped by Tax Rate","Auftragssteuermeldung unterteilt nach Steuersatz" -"Orders","Aufträge" -"Out of stock","Nicht lieferbar" -"Period","Zeitraum" -"Poducts Report","Artikelmeldung" -"Popular Tags","Beliebte Tags" -"Popularity","Popularität" -"Price","Preis" -"Product Name","Produktname" -"Product Reviews","Produktreviews" -"Product SKU","Bestandseinheit des Produktes" -"Product Tags","Produkttags" -"Products","Produkte" -"Products Ordered","Bestellte Artikel" -"Products Report","Artikelmeldung" -"Products Reviews","Artikelbewertungen" -"Products Tags","Etiketten der Artikel" -"Products in carts","Artikel in den Warenkörben" -"Purchases","Käufe" -"Quantity Ordered","bestellte Menge" -"Quantity of Items","Artikelmenge" -"Recently Compared","zuletzt verglichen" -"Recently Compared Products","zuletzt verglichene Artikel" -"Recently Viewed","Kürzlich angesehen" -"Recently Viewed Products","Kürzlich angesehene Produkte" -"Recently Viewed/Compared Products","Kürzlich angesehene / verglichene Produkte" -"Refresh Lifetime Statistics","Aktualisiere lebenslange Statistik" -"Refresh Statistics","Aktualisiere Statistik" -"Refresh Statistics for the Last Day","Aktualisiere Statistik für den letzten Tag" -"Refunds","Gutschriften" -"Report","Report" -"Reports","Berichte" -"Results","Ergebnisse" -"Revenue","Umsatz" -"Review","Review" -"Reviews","Bewertungen" -"Reviews for %s","Bewertungen für %s" -"Sales","Verkäufe" -"Sales Report","Verkaufsreport" -"Search Query","Suchbegriff" -"Search Terms","Suchbegriffe" -"Select day of the month.","Wählen Sie ein Datum aus." -"Shipping","Lieferung" -"Shopping Cart","Warenkorb" -"Shopping Cart Price Rule","Warenkorb Preisregel" -"Show Actual Values","Tatsächliche Werte anzeigen" -"Show Report","Report anzeigen" -"Show for Current","Anzeige für aktuellen Eintrag" -"Specified","Spezifiziert" -"Statistics","Statistik" -"Stock Qty","Anzahl auf Lager" -"Submitted In","Abgeschickt in" -"Submitted On","Abgeschickt am" -"Subtotal","Zwischensumme" -"Tag","Tag" -"Tag ""%s"" details","Schild ""%s"" Details" -"Tag Detail","Detail zu Tag" -"Tag Name","Tagname" -"Tag Use","Tag-Benutzung" -"Tags Submitted by %s","Tags eingetragen von %s" -"Tags submitted to %s","Tags versandt an %s" -"Tax","Steuer" -"Title","Titel" -"To","An" -"Total","Gesamtbetrag" -"Total Invoiced vs. Paid Report","Gesamtgegenüberstellung Berechnet zu Bezahlt" -"Total Ordered Report","Report Gesamtbestellvolumen" -"Total Refunded Report","Gesamtreport zu Rückerstattungen" -"Total Shipped Report","Gesamtreport versendeter Produkte" -"Total Tags","Gesamtanzahl Tags" -"Total invoiced","Insgesamt berechnet" -"Total refunded","Erstatteter Gesamtbetrag" -"Updated At","Aktualisiert am" -"Viewed Products Grid Template","Tabellarische Vorlage für angesehene Produkte" -"Viewed Products List Template","Vorlage für Liste der angesehenen Produkte" -"Visible In","Sichtbar in" -"Wishlist Report","Wunschzettelreport" -"Wishlist vs. Regular Order","Gegenüberstellung Wunschzettel zu regulärer Bestellung" -"Wishlists","Wunschzettel" -"Year","Jahr" -"Year-To-Date Starts","Kalenderjahr startet" -"Yes","Ja" -"Your Recently Compared","Ihre letzten Vergleiche" -"Your Recently Viewed","Ihre zuletzt angesehenen" -"undefined","undefiniert" diff --git a/app/locale/de_DE/Mage_Review.csv b/app/locale/de_DE/Mage_Review.csv deleted file mode 100644 index 265f9aa7d..000000000 --- a/app/locale/de_DE/Mage_Review.csv +++ /dev/null @@ -1,104 +0,0 @@ -"%d Review(s)","%d Review(s)" -"%s Review(s)","%s Review(s)" -"(Posted on %s)","(Am %s gepostet)" -"1 star","1 Stern" -"2 star","2 Sterne" -"2 stars","2 Sterne" -"3 star","3 Sterne" -"3 stars","3 Sterne" -"4 star","4 Sterne" -"4 stars","4 Sterne" -"5 star","5 Sterne" -"5 stars","5 Sterne" -"%2$s %3$s (%4$s)","%2$s %3$s (%4$s)" -"Add New Review","Neues Review hinzufügen" -"Add Your Review","Eigenes Review hinzufügen" -"Administrator","Administrator" -"All Reviews","Alle Reviews" -"All Reviews of Customer `%s`","Alle Reviews des Kunden '%s'" -"All Reviews of Product `%s`","Alle Bewertungen für das Produkt `%s`" -"Allow Guests to Write Reviews","Erlaube Gäste Reviews zu schreiben" -"Approved","Genehmigt" -"Are you sure you want to do this?","Sind Sie sicher, dass sie das tun wollen?" -"Are you sure?","Sind Sie sicher?" -"Average Customer Rating","Durschschnittliche Kundenbewertung" -"Average Customer Rating:","Durschschnittliche Kundenbewertung:" -"Back","Zurück" -"Back to Main Product Info","Zurück zur Hauptproduktinfo" -"Back to My Reviews","Zurück zu Meinen Reviews" -"Back to Product Reviews","Zurück zu Produktreviews" -"Be the first to review this product","Bewerten Sie dieses Produkt als Erster" -"Catalog Product Review View","Katalogprodukt Review Ansicht" -"Catalog Product Reviews List","Katalogprodukt Review Liste" -"Created On","Erstellt am" -"Customer","Kunde" -"Customer My Account Product Reviews","Kunde Mein Konto Produktreviews" -"Customer My Account Review Details","Kunde Mein Konto Reviewdetails" -"Customer Reviews","Kundenreviews" -"Customers Reviews","Kundenbewertungen" -"Delete","Löschen" -"Delete Review","Review löschen" -"Detailed Rating","Detailierte Bewertung" -"Edit Review '%s'","Review '%s' bearbeiten" -"Guest","Gast" -"How do you rate this product?","Wie bewerten Sie dieses Produkt?" -"ID","ID" -"Let us know your thoughts","Teilen Sie uns Ihre Meinung mit" -"Manage Ratings","Bewertungen verwalten" -"My Product Reviews","Meine Produktreviews" -"My Recent Reviews","Meine letzten Reviews" -"Name","Name" -"Name in Store","Name im Shop" -"New Review","Neues Review" -"Nickname","Nickname" -"Nickname can\'t be empty","Nickname darf nicht leer sein" -"Not Approved","Nicht genehmigt" -"Only registered users can write reviews. Please, log in or register","Nur registrierte Benutzer können Bewertungen schreiben. Bitte loggen Sie sich ein oder registrieren Sie sich" -"Pending","ausstehend / anhängig" -"Pending Reviews","Ausstehende Reviews" -"Pending Reviews of Customer `%s`","Ausstehende Reviews des Kunden '%s'" -"Please select a product","Bitte wählen Sie ein Produkt" -"Please select one of each of the ratings above","Bitte wählen Sie jeweils eine der obenstehenden Bewertungen" -"Posted By","Geposted von" -"Price","Preis" -"Product","Produkt" -"Product Name","Produktname" -"Product Rating","Produktbewertung" -"Product Rating:","Produktbewertung:" -"Product Review (submitted on %s):","Produktreview (von %s hinzugefügt):" -"Product Reviews","Produktreviews" -"Product SKU","Bestandseinheit des Produktes" -"Products Reviews","Produktbewertungen" -"Qty","Anzahl" -"Rating:","Bewertung" -"Review","Review" -"Review (submitted on %s):","Review (von %s hinzugefügt):" -"Review Details","Reviewdetails" -"Review Form Fields Before","Felder Bewertungsformular vorher" -"Review by %s","Bewertung von %s" -"Review by %s","Review von %s" -"Review can\'t be empty","Review darf nicht leer sein" -"Review summary can\'t be empty","Zusammenfassung des Reviews darf nicht leer sein" -"Reviews and Ratings","Reviews und Bewertungen" -"SKU","SKU" -"Save Review","Review speichern" -"Status","Status" -"Submit Review","Review abschicken" -"Summary Rating","Bewertungszusammenfassung" -"Summary of Review","Reviewzusammenfassung" -"Summary of Your Review","Zusammenfassung Ihres Reviews" -"Title","Titel" -"Type","Typ" -"Unable to post the review.","Review kann nicht geposted werden." -"Update Status","Status aktualisieren" -"View All Reviews","Alle Reviews ansehen" -"View Details","Details ansehen" -"Visible In","Sichtbar in" -"Websites","Webseiten" -"What's your nickname?","Was ist Ihr Spitzname?" -"Write Your Own Review","Schreiben Sie Ihr eigenes Review" -"You have submitted no reviews.","Sie haben keine Reviews geschrieben." -"You're reviewing:","Sie schreiben ein Review für:" -"Your Rating:","Ihre Bewertung:" -"Your Review (submitted on %s):","Ihr Review (von % hinzugefügt)" -"Your review has been accepted for moderation.","Ihr Review wurde für Moderation akzeptiert." diff --git a/app/locale/de_DE/Mage_Rss.csv b/app/locale/de_DE/Mage_Rss.csv deleted file mode 100644 index 643c7ea44..000000000 --- a/app/locale/de_DE/Mage_Rss.csv +++ /dev/null @@ -1,56 +0,0 @@ -"%s - Discounts and Coupons","%s - Rabatte und Gutscheine" -"%s - Special Products","%s - Sonderangebote" -"%s RSS Feed","%s RSS-Feed" -"%s has reached a quantity of %s.","%s hat eine Menge von %s erreicht." -"%s\'s Wishlist","%ss Wunschzettel" -"Cannot retrieve the wishlist","Kann den Wunschzettel nicht abrufen." -"Catalog","Katalog" -"Category Feeds","Feeds aus Kategorien" -"Click for price","Klicken für den Preis" -"Comment: %s
    ","Kommentar: %s
    " -"Coupons/Discounts","Gutscheine/Rabatte" -"Current Status: %s
    ","Aktueller Stand: %s
    " -"Customer Name: %s","Kundenname: %s" -"Customer Order Status Notification","Benachrichtigung zum Stand der Kundenbestellung" -"Details for %s #%s","Details für %s #%s" -"Discount","Rabatt" -"Discount (%s)","Rabatt (%s)" -"Enable RSS","RSS-Feed aktivieren" -"Error in processing xml. %s","Fehler bei der XML-Bearbeitung von %s" -"From:","Von:" -"Get Feed","RSS-Feed abonnieren" -"Gift Message","Geschenkmitteilung" -"Grand Total","Gesamtbetrag" -"Low Stock Products","Produkte aud dem geringen Lagerbestand" -"Message:","Nachricht:" -"Miscellaneous Feeds","Verschiedene RSS-Feeds" -"New Orders","Neue Bestellungen" -"New Products","Neue Produkte" -"New Products from %s","Neue Produkte von %s" -"Notified Date: %s
    ","Benachrichtigt am: %s
    " -"Order # %s Notification(s)","Benachrichtigung der Bestellung # von %s" -"Order #%s created at %s","Bestellung # von %s erstellt von %s" -"Pending product review(s)","Ausstehender Produktbericht" -"Product: ""%s"" review By: %s","Produkt: ""%s"" Bewertung Von: %s" -"Product: %s
    ","Produkt: %s
    " -"Products tagged with %s","Produkte gekennzeichnet mit %s" -"Purchased From: %s","Gekauft von: %s" -"RSS","RSS" -"RSS Feeds","RSS-Feeds" -"RSS Feeds List","Liste der RSS-Feeds" -"RSS Feeds Section","Bereich RSS-Feeds" -"Review: %s
    ","Bericht: %s
    " -"Rss Config","RSS Konfig" -"Shipping & Handling","Versand und Abwicklung" -"Special Products","Sonderangebote" -"Store: %s
    ","Geschäft: %s
    " -"Subtotal","Zwischensumme" -"Summary of review: %s
    ","Zusammenfassung des Berichtes: %s
    " -"Tags Products","Gekennzeichnete Produkte" -"Tax","Steuer" -"There are no Rss Feeds","Es gibt keine RSS-Feeds." -"To:","An:" -"Top Level Category","Kategorie auf höchster Ebene" -"Total: %s
    ","Summe: %s
    " -"Wishlist","Wunschzettel" -"click here to view the review","Klicken Sie hier um die Bewertung zu sehen" diff --git a/app/locale/de_DE/Mage_Rule.csv b/app/locale/de_DE/Mage_Rule.csv deleted file mode 100644 index 95b7dc91b..000000000 --- a/app/locale/de_DE/Mage_Rule.csv +++ /dev/null @@ -1,42 +0,0 @@ -"ALL","ALLE" -"ANY","JEDE" -"Add","Hinzufügen" -"Apply","Anwenden" -"Conditions Combination","Bedingungenkombination" -"Customer Groups must be specified.","Die Kundengruppen müssen angegeben werden." -"End Date must be greater than Start Date.","Das Enddatum muss hinter dem Anfangsdatum liegen." -"FALSE","FALSCH" -"If %s of these conditions are %s:","Wenn %s dieser Bedingungen sind %s:" -"Invalid discount amount.","Ungültiger Rabattbetrag:" -"Open Chooser","Auswahl öffnen" -"Perform following actions","Folgende Aktionen ausführen" -"Please choose a condition to add...","Bitte wählen Sie eine Bedingung, die hinzugefügt werden soll..." -"Please choose an action to add...","Bitte wählen Sie eine Aktion, die hinzugefügt werden soll..." -"Remove","Entfernen" -"TRUE","WAHR" -"There is no information about associated entity type ""%s"".","Es gibt keine Informationen über den zugehörigen Entitätstyp ""%s"". - -" -"Websites must be specified.","Die Webseiten müssen angegeben werden." -"by","von" -"contains","enthält" -"does not contain","enthält nicht" -"does not contains","enthält nicht" -"equals or greater than","gleich oder größer als" -"equals or less than","gleich oder kleiner als" -"for","für" -"for greater than","für größer als" -"for or greater than","für oder größer als" -"found","gefunden" -"from","von" -"greater than","größer als" -"is","ist" -"is not","ist nicht" -"is not one of","ist nicht einer von" -"is one of","ist einer von" -"less than","weniger als" -"not found","nicht gefunden" -"not from","nicht von" -"to","bis" -"was","war" -"was not","war nicht" diff --git a/app/locale/de_DE/Mage_Sales.csv b/app/locale/de_DE/Mage_Sales.csv deleted file mode 100644 index e4b63f1f3..000000000 --- a/app/locale/de_DE/Mage_Sales.csv +++ /dev/null @@ -1,882 +0,0 @@ -"""%s"" coupon code is not valid.","""%s"" Couponcode ist ungültig." -"%s","%s" -"%s / %s rate:","%s / %s Rate:" -"%s for %s","%s für %s" -"%s order(s) cannot be canceled","%s Bestellung(en) konnte(n) nicht storniert werden" -"%s order(s) have been canceled.","%s Bestellung(en) wurde(n) storniert." -"%s order(s) have been put on hold.","%s Bestellung(en) wurde(n) in Wartestellung gesetzt." -"%s order(s) have been released from holding status.","%s Bestellung(en) wurde(n) aus der Wartestellung genommen." -"%s order(s) were not put on hold.","%s Bestellung(en) wurde(n) nicht in Wartestellung gesetzt." -"%s order(s) were not released from holding status.","%s Bestellung(en) wurde(n) nicht aus der Wartestellung genommen." -"* - Enter custom price excluding tax","* - Geben Sie benutzerdefinierten Preis ohne Steuer ein" -"* - Enter custom price including tax","* - Geben Sie benutzerdefinierten Preis inklusive Steuer ein" -"* Required Fields","* Pflichtfelder" -"-- Please Select --","-- Bitte auswählen --" -"-- Please Select Billing Agreement--","-- Bitte wählen Sie Rechnungsvereinbarung --" -"About This Order:","Über diese Bestellung:" -"About This Profile:","Über dieses Profil:" -"About Your Invoice","Informationen zu Ihrer Rechnung" -"About Your Order","Über Ihre Bestellung" -"About Your Refund","Informationen zu Ihrer Rückerstattung" -"About Your Shipment","Informationen zu Ihrer Sendung" -"Accept Payment","Zahlung akzeptieren" -"Accept or Deny Payment","Zahlung akzeptieren oder ablehnen" -"Account Information","Kontoinformationen" -"Action","Aktion" -"Actions","Aktionen" -"Activate","Aktivieren" -"Active","Aktiv" -"Add","Hinzufügen" -"Add New Address","Neue Adresse hinzufügen" -"Add Order Comments","Bestellungskommentare hinzufügen" -"Add Package","Verpackung hinzufügen" -"Add Products","Produkte hinzufügen" -"Add Selected Product(s) to Option","Ausgewählte Produkte zu Option hinzufügen" -"Add Selected Product(s) to Order","Ausgewählte Produkte zur Bestellung hinzufügen" -"Add Selected Product(s) to Package","Ausgewählte(s) Produkt(e) zur Verpackung hinzufügen" -"Add To Order","Zur Bestellung hinzufügen" -"Add Tracking Number","Trackingnummer hinzufügen" -"Add comment to order","Kommentar zur Bestellung hinzufügen" -"Add new comment to credit memo","Neuen Kommentar zur Gutschrift hinzufügen" -"Add new comment to shipment","Neuen Kommentar zur Sendung hinzufügen" -"Add new tracking number","Neue Trackingnummer hinzufügen" -"Add to Cart","Zum Warenkobrn hinzufügen" -"Additional Product Info","Zusätzliche Angaben zum Produkt" -"Address","Adresse" -"Address model is not defined.","Adressenmodell ist nicht definiert." -"Adjustment Fee","Anpassungsgebühr" -"Adjustment Refund","Anpassungsrückerstattung" -"Agreement Information","Vereinbarungsinformationen" -"Allow Reorder","Nachbestellung erlauben" -"Amount","Summe" -"Amount: %s.","Summe: %s." -"An error occurred while assigning order status. Status has not been assigned.","Bei der Zuweisung des Auftragsstatus ist ein Fehler aufgetreten. Status wurde nicht zugewiesen." -"An error occurred while creating shipping label.","Ein Fehler ist aufgetreten beim Erstellen des Versandlabels." -"An error occurred while saving order status. The status has not been added.","Beim Speichern des Auftragsstatus ist ein Fehler aufgetreten. Der Status wurde nicht hinzugefügt." -"An error occurred while unassigning order status.","Beim Löschen der Zuweisung für einen Auftragsstatus ist ein Fehler aufgetreten." -"An error occurred while updating the order address. The address has not been changed.","Beim Aktualisieren der Bestelladresse ist ein Fehler aufgetreten. Die Adresse wurde nicht geändert." -"An item option with code %s already exists.","Eine Artikeloption mit Code %s existiert bereits." -"Anchor Custom Title","Kundenspezifischen Titel festlegen" -"Append Comments","Kommentare anhängen" -"Apply","Anwenden" -"Apply Coupon Code","Coupon Code anwenden" -"Approved the payment online.","Zahlung online akzeptiert." -"Are you sure you want to accept this payment?","Sind Sie sicher, dass Sie diese Zahlung akzeptieren wollen?" -"Are you sure you want to cancel this order?","Sind Sie sicher, dass Sie diese Bestellung stornieren wollen?" -"Are you sure you want to delete all items from shopping cart?","Sind Sie sicher, dass Sie alle Artikel aus dem Einkaufswagen löschen möchten?" -"Are you sure you want to deny this payment?","Sind Sie sicher, dass Sie diese Zahlung ablehnen wollen?" -"Are you sure you want to do this?","Sind Sie sicher, dass sie das tun wollen?" -"Are you sure you want to send Creditmemo email to customer?","Sind Sie sicher, dass Sie ein Creditmemo E-Mail an den Kunden schicken wollen?" -"Are you sure you want to send Invoice email to customer?","Sind Sie sicher, dass Sie ein Rechnungsmail an den Kunden schicken wollen?" -"Are you sure you want to send Shipment email to customer?","Sind Sie sicher, dass Sie ein Versandmail an den Kunden schicken wollen?" -"Are you sure you want to send order email to customer?","Sind Sie sicher, dass Sie ein Bestellungsmail an den Kunden schicken wollen?" -"Are you sure you want to void the payment?","Sind Sie sicher, dass Sie die Zahlung ungültig machen wollen?" -"Are you sure?","Sind Sie sicher?" -"Are you sure? This order will be canceled and a new one will be created instead","Sind Sie sicher? Diese Bestellung wird storniert und eine neue wird stattdessen erstellt" -"Assign Order Status to State","Staat einen Auftragsstatus zuweisen" -"Assign Status to State","Staat einen Status zuweisen" -"Assignment Information","Informationen zur Zuweisung" -"At least a payment ID must be set.","Es muss mindestens eine ZahlungsID gesetzt sein." -"Authorization","Bewilligung" -"Authorized amount of %s.","Bewilligte Summe von %s." -"Authorizing amount of %s is pending approval on gateway.","Bewilligungssumme von %s wartet auf Zustimmung am Gateway." -"Back","Zurück" -"Back to Billing Agreements","Zurück zu Rechnungsvereinbarungen" -"Back to My Orders","Zurück zu Meine Bestellungen" -"Back to Recurring Profiles","Zurück zu Wiederkehrende Profile" -"Backordered","Rückständig" -"Bestsellers","Bestseller" -"Bill to Name","Rechnung auf Namen" -"Billing","Abrechnung" -"Billing Address","Rechnungsadresse" -"Billing Agreement","Rechnungsvereinbarung" -"Billing Agreement # %s","Rechnungsvereinbarung # %s" -"Billing Agreement #%s","Rechnungsvereinbarung #%s" -"Billing Agreement View","Rechnungsvereinbarung Ansicht" -"Billing Agreements","Rechnungsvereinbarungen" -"Billing Last Name","Nachname in der Rechnung" -"Billing ZIP Code","PLZ in der Rechnung" -"Buy %s for price %s","Kaufen Sie %s zum Preis von %s" -"CSV","CSV" -"Cancel","Abbrechen" -"Cancel credit memo","Gutschrift aufheben" -"Cancel invoice","Rechnung abbrechen" -"Cancel order","Bestellung abbrechen" -"Canceled","Storniert" -"Canceled order offline.","Bestellung offline abgebrochen." -"Canceled order online.","Bestellung online abgebrochen." -"Cannot add order history.","Bestellungshistorie kann nicht hinzugefügt werden." -"Cannot create an empty shipment.","Leere Sendung kann nicht erstellt werden." -"Cannot determine the field name.","Feldname kann nicht bestimmt werden." -"Cannot do invoice for order.","Rechnung für Bestellung kann nicht erstellt werden." -"Cannot do shipment for order.","Versand für Bestellung kann nicht durchgeführt werden." -"Cannot get order instance","Bestellungsinstanz kann nicht gefunden werden." -"Cannot get the order instance.","Die Bestellungsinstanz kann nicht gefunden werden." -"Cannot register an existing credit memo.","Eine bereits existierende Gutschrift kann nicht nochmals registriert werden." -"Cannot register existing invoice","Eine bereits existierende Rechnung kann nicht nochmals registriert werden." -"Cannot register existing shipment","Eine bereits existierende Sendung kann nicht nochmals registriert werden." -"Capture","Erfassung" -"Capture Amount","Erfassungssumme" -"Capture Offline","Offline Erfassung" -"Capture Online","Online Erfassung" -"Capture invoice","Erfassungsrechnung" -"Captured amount of %s online.","Erfassungssumme von %s online." -"Capturing amount of %s is pending approval on gateway.","Erfassungssumme von %s wartet auf Zustimmung am Gateway." -"Carrier","Carrier" -"Carrier/Method","Carrier/Methode" -"Change status, add comments","Status ändern, Kommentare hinzufügen" -"Changing address information will not recalculate shipping, tax or other order amount.","Durch das Ändern von Adressinformationen werden Versandkosten, Steuern oder ein sonstiger Bestellwert nicht neu berechnet." -"Checkout Totals Sort Order","Checkout Gesamtsummen Sortierfolge" -"City","Stadt" -"Clear Shopping Cart","Einkaufswagen leeren" -"Click to change shipping method","Klicken Sie um die Versandart zu ändern" -"Close","Schließen" -"Closed","Geschlossen" -"Comma-separated.","Durch Komma getrennt." -"Comment","Kommentar" -"Comment Text","Kommentartext" -"Comments","Kommentare" -"Comments History","Kommentarhistorie" -"Company","Firma" -"Complete","Vollständig" -"Configure","Konfigurieren" -"Configure and Add to Order","Konfigurieren und zum Auftrag hinzufügen" -"Contents","Inhalt" -"Continue","Weiter" -"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","Überwacht, ob die Kunden-IP in Bestellungen, Rechnungen, Sendungen und Gutschriften angezeigt wird." -"Country","Land" -"Coupons","Gutscheine" -"Create","Erstellen" -"Create New Customer","Neuen Kunden anlegen" -"Create New Order","Neue Bestellung anlegen" -"Create New Order Status","Neuen Auftragsstatus anlegen" -"Create New Order for %s","Neue Bestellung für %s anlegen" -"Create New Order for %s in %s","Neue Bestellung für %s in %s anlegen" -"Create New Order for New Customer","Neue Bestellung für neuen Kunden anlegen" -"Create New Order for New Customer in %s","Neue Bestellung für neuen Kunden in %s anlegen" -"Create New Status","Neuen Status anlegen" -"Create Order","Bestellung anlegen" -"Create Packages","Verpackungen erstellen" -"Create Shipment","Lieferung erstellen" -"Create Shipping Label","Versandlabel erstellen" -"Create Shipping Label...","Versandlabel erstellen..." -"Create new credit memo for order","Neue Gutschrift für Bestellung erstellen" -"Create new invoice for order","Neue Rechnung für Bestellung anlegen" -"Create new shipment for order","Neue Lieferung für Bestellung fertig machen" -"Create...","...erstellen" -"Created At","Erstellte At" -"Created billing agreement #%s.","Rechnungsvereinbahrung #%s erstellt." -"Created:","Erstellt:" -"Credit Memo","Gutschrift" -"Credit Memo #","Gutschrift #" -"Credit Memo # ","Gutschrift Nr. " -"Credit Memo #%1$s | %3$s | %2$s (%4$s)","Gutschrift #%1$s | %3$s | %2$s (%4$s)" -"Credit Memo Comment Email Sender","Gutschrift Kommentar Email Sender" -"Credit Memo Comment Email Template","Gutschrift Kommentar Email Vorlage" -"Credit Memo Comment Email Template for Guest","Gutschrift Kommentar Email Vorlage für Gast" -"Credit Memo Comments","Gutschrift Kommentare" -"Credit Memo Email Sender","Gutschrift Email Sender" -"Credit Memo Email Template","Gutschrift Email Vorlage" -"Credit Memo Email Template for Guest","Gutschrift Email Vorlage für Gast" -"Credit Memo Update","Gutschrift Aktualisierung" -"Credit Memo Update for Guest","Gutschrift Aktualisierung für Gast" -"Credit Memos","Gutschriften" -"Credit memo canceling problem.","Problem bei Gutschriftaufhebung" -"Credit memo cannot be canceled.","Gutschrift kann nicht aufgehoben werden." -"Credit memo has been created automatically","Gutschriftenempfänger wurde automatisch erstellt" -"Custom Price","Kundenpreis" -"Custom Value","Kundenmehrwert" -"Customer","Kunde" -"Customer Can Define Start Date","Kunden können den Starttermin bestimmen" -"Customer Email","Kunden Email" -"Customer Group","Kundengruppe" -"Customer Last Name","Nachname des Kunden" -"Customer My Account Order Creditmemo View","Kundenbestellung My Account Ansicht der Gutschrift" -"Customer My Account Order History","Kundenbestellung My Account Historie" -"Customer My Account Order Invoice View","Kundenbestellung My Account Ansicht der Rechnung" -"Customer My Account Order Shipment View","Kundenbestellung My Account Ansicht der Lieferung" -"Customer My Account Order View","Kundenbestellung My Account Ansicht" -"Customer Name","Kundenname" -"Customer\'s Current Activities","Aktuelle Aktionen des Kunden" -"Customs Value","Zollwert" -"Date","Datum" -"Date Shipped","Versanddatum" -"Default Status","Standardstatus" -"Default Template","Standardvorlage" -"Default logo, will be used in PDF and HTML documents.
    (jpeg, tiff, png) If you see image distortion in PDF, try to use larger image","Standardlogo, wird in PDF- und HTML-Dokumenten verwendet.
    (jpeg, tiff, png) Wenn Sie eine Bildverzerrung im PDF feststellen, versuchen Sie es mit einem größeren Bild" -"Delete","Löschen" -"Delete Package","Verpackung löschen" -"Denied the payment online.","Bezahlung online verweigert." -"Deny Payment","Bezahlung verweigern" -"Description Message","Beschreibungsmitteilung" -"Discount","Rabatt" -"Discount (%s)","Rabatt (%s)" -"Discount Amount","Rabattbetrag" -"Display Order ID in Header","Auftrags-ID in der Kopfzeile anzeigen" -"Edit","Bearbeiten" -"Edit Order #%s","Bestellung #%s bearbeiten" -"Edit Order %s %s Address","Bestelladresse %s %s bearbeiten" -"Edit Order Status","Auftragsstatus bearbeiten" -"Email","E-Mail" -"Email Address","E-Mail-Adresse" -"Email Copy of Credit Memo","E-Mail-Kopie der Gutschrift" -"Email Copy of Invoice","Rechnungskopie per E-Mail senden" -"Email Copy of Shipment","E-Mail-Kopie der Versandinformationen" -"Email Order Confirmation","E-Mail mit Auftragsbestätigung" -"Enable","Aktivieren" -"Enabled","Aktiviert" -"Enter the billing last name and email/ZIP as in the order billing address","Geben Sie den Nachnamen und die E-Mail/PLZ wie auf der Rechnungsadresse in der Bestellung ein." -"Entered data is incorrect. Please try again.","Die eingegebenen Daten sind inkorrekt. Bitte nochmal versuchen." -"Error to Show in Shopping Cart","Fehler beim Anzeigen im Warenkorb" -"Excel XML","Excel-XML" -"Excl. Tax","ohne Steuern" -"Expired","Abgelaufen" -"Explanation","Erklärung" -"Failed to cancel the billing agreement.","Aufhebung von Billing Agreement fehlgeschlagen." -"Failed to create billing agreement for this order.","Erstellen von Billing Agreement für diese Bestellung fehlgeschlagen." -"Failed to finish billing agreement wizard.","Abschließen von Billing Agreement Assistent fehlgeschlagen." -"Failed to send the order email.","Senden der Auftrags-E-Mail fehlgeschlagen." -"Failed to start billing agreement wizard.","Start von Billing Agreement Assistent fehlgeschlagen." -"Failed to update the payment.","Aktualisieren der Bezahlung fehlgeschlagen." -"Failed to update the profile.","Aktualisierung des Profils fehlgeschlagen." -"Failed to void the payment.","Aufheben der Bezahlung fehlgeschlagen." -"Fetch","Holen" -"File extension not known or unsupported type in the following shipment: %s","Dateierweiterung ist unbekannt oder wird nicht unterstützt bei der folgenden Lieferung: %s" -"Find Order By:","Bestellungen finden durch:" -"First Name","Vorname" -"From","Von" -"From Name","Von Name" -"From:","Von:" -"G.T. (Base)","G.B. (Basis)" -"G.T. (Purchased)","G.T. (gekauft)" -"General","Allgemein" -"General Information","Allgemeine Informationen" -"Get Payment Update","Zahlungsaktualisierung abrufen" -"Get Update","Update erhalten" -"Get shipping methods and rates","Versandarten und -kosten abrufen" -"Gift Message","Grußnachricht" -"Gift Message for This Order","Geschenknachricht für diese Bestellung" -"Gift Message for the Entire Order","Geschenkmitteilung für die gesamte Bestellung" -"Gift Message for this Order","Grußnachricht für diesen Auftrag" -"Gift Options","Geschenkoptionen" -"Gift Wrapping for the Entire Order","Geschenkverpackung für gesamte Bestellung" -"Girth","Umfang" -"Go to Home Page","Go to Home Page" -"Grand Total","Gesamtbetrag" -"Grand Total to be Charged","Gesamtsumme die belastet werden soll" -"Guest","Gast" -"Height","Höhe" -"Hide Customer IP","Kunden-IP verbergen" -"Hold","Warten" -"Hold action is not available.","Zurückstellen nicht verfügbar." -"Hold order","Bestellung zurückstellen" -"Home","Home" -"ID","ID" -"ID #","ID Nr." -"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"". Credit Memo has not been created. Please create offline Credit Memo.","IPN ""Erstattet"". Erstattung vom Händler ausgestellt. Benachrichtigung über zurückerstatteten Betrag von %s registriert. Transaktions-ID: ""%s"". Gutschrift wurde nicht erstellt. Bitte erstellen Sie offline eine Gutschrift." -"If empty, the default description above will be used.","Wenn leer wird die Standardbeschreibung oben verwendet." -"If empty, the default error above will be used.","Wenn leer, wird der obenstehende Standardfehler benutzt." -"If the invoice was created offline, try creating an offline creditmemo.","Wenn Rechnung offline erstellt wurde, versuchen Sie einen Offline Gutschein zu erstellen." -"Incl. Tax","Steuer inkludieren" -"Information","Information" -"Initial Fee","Erstzahlung" -"Initial Fees","Anfängliche Gebühren" -"Initial period payment","Anfangszahlung" -"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","Unzureichende Informationen um ein Versandetikett/en zu erstellen. Bitte bestätigen Sie Ihre Shop Informationen und Versandeinstellungen." -"Invalid block: %s.","Ungültiger Block: %s." -"Invalid carrier specified.","Ungültiger Versender angegeben." -"Invalid draw line data. Please define ""lines"" array.","Ungültige Draw Line-Daten. Bitte ""lines""-Array definieren." -"Invalid entity model","Ungültiges Entitätsmodell" -"Invalid item option format.","Ungültiges Format für Artikeloption." -"Invalid qty to invoice item ""%s""","Ungültige Anz., um Artikel ""%s"" zu fakturieren" -"Invalid qty to refund item ""%s""","Ungültige Anz., um Artikel ""%s"" zurückzuerstatten" -"Invalid qty to ship for item ""%s""","Ungültige Anz. bezüglich der Lieferung des Artikels ""%s""" -"Invalid renderer model","Ungültiges Renderer-Modell" -"Invalid request for adding product to quote.","Ungültige Anfrage, dem Angebot Produkte hinzuzufügen." -"Invalid value(s) for Qty to Ship","Unzulässige(r) Wert(e) für die Liefermenge" -"Invoice","Rechnung" -"Invoice #","Rechnung Nr." -"Invoice # ","Invoice # " -"Invoice #%1$s | %2$s | %4$s (%3$s)","Rechnung Nr.%1$s | %2$s | %4$s (%3$s)" -"Invoice #%s","Rechnung #%s" -"Invoice Comment Email Sender","Rechnung Kommentar E-Mail Absender" -"Invoice Comment Email Template","Rechnung Kommentar E-Mail Vorlage" -"Invoice Comment Email Template for Guest","E-Mail-Vorlage für Rechnungszusätze für Gäste" -"Invoice Comments","Kommentare zur Rechnung" -"Invoice Date","Rechnungsdatum" -"Invoice Email Sender","Rechnung an E-Mail-Versender ausstellen" -"Invoice Email Template","Rechnung Email Vorlage" -"Invoice Email Template for Guest","Rechnung E-Mail Vorlage für Gast" -"Invoice Update","Aktualisierte Rechnung" -"Invoice Update for Guest","Aktualisierte Rechnung für Gast" -"Invoice and Packing Slip Design","Gestaltung von Rechnung und Lieferschein" -"Invoice and Ship","Rechnung und Auslieferung" -"Invoice canceling problem.","Problem beim Annullieren der Rechnung" -"Invoice cannot be canceled.","Rechnung kann nicht widerrufen werden." -"Invoice cannot be captured.","Rechnung kann nicht abgefangen werden." -"Invoice cannot be voided.","Rechnung kann nicht ungültig gemacht werden." -"Invoice capturing problem.","Fehler bei Rechnungserfassung." -"Invoice void problem","Problem beim Ungültigmachen der Rechnung." -"Invoice will be created without communication with payment gateway.","Rechnung wird ohne Verbindung zur Zahlungsschnittstelle erstellt." -"Invoiced","In Rechnung gestellt." -"Invoices","Rechnungen" -"Is Closed","Geschlossen" -"Item","Objekt" -"Item Status","Artikelstatus" -"Item object is not specified.","Objekt des Artikels nicht näher beschrieben." -"Item options declaration error.","Fehler bei der Angabe der Artikeloptionen." -"Item ordered qty","Bestellte Menge des Artikels" -"Item qty declaration error.","Fehler bei Eingabe der Artikelmenge." -"Items","Artikel" -"Items Invoiced","In Rechnung gestellte Artikel" -"Items Ordered","Bestellte Artikel" -"Items Refunded","Rückvergütete Artikel" -"Items Shipped","Artikel versandt" -"Items in the Package","Artikel in der Sendung" -"Items maximum quantity or price do not allow checkout.","Nicht möglich, zur Kasse zu gehen wegen maximaler Menge oder Preis der Artikel." -"Items options declaration error.","Fehler bei Angabe der Artikeloptionen." -"Items to Refund","Artikel zur Rückvergütung" -"Items to Ship","Zu versendende Artikel" -"Key","Schlüssel" -"Last Name","Letzter Name" -"Last Ordered Items","Zuletzte bestellte Artikel" -"Last status can\'t be unassigned from state.","Letzter Status kann vom Zustand nicht entfernt werden." -"Length","Länge" -"Link to the New Order","Link zu neuer Bestellung" -"Link to the Previous Order","Link zu vorheriger Bestellung" -"Logo for HTML Print View","Logo für HTML-Druckansicht" -"Logo for HTML documents only. If empty, default will be used.
    (jpeg, gif, png)","Logo nur für HTML-Dokumente. Falls leer wird eine Standardvoreinstellung verwendet.
    (jpeg, gif, png)" -"Logo for PDF Print-outs (200x50)","Logo für PDF-Ausdrucke (200x50)" -"Make Check payable to:","Scheck zur Auszahlung an:" -"Manage","Verwalten" -"Maximum amount available to refund is %s","Maximale Summe, die für eine Rückerstattung verfügbar ist, beträgt %s" -"Maximum shipping amount allowed to refund is: %s","Erlaubte maximale Liefermenge zur Rückvergütung ist:%s" -"Message","Nachricht" -"Message:","Nachricht:" -"Minimum Amount","Mindestmenge" -"Minimum Order Amount","Mindestmenge für Bestellung" -"Mixed","Gemischt" -"Most Viewed","Am häufigsten betrachtet" -"Most Viewed Products Report","Bericht über die am häufigsten betrachteten Produkte" -"Move to Shopping Cart","In den Einkaufskorb legen" -"Move to Wishlist","Auf Wunschzettel schreiben" -"Multi-address Description Message","Nachricht für Mehrfachadressen-Beschreibung" -"Multi-address Error to Show in Shopping Cart","Mehrfachadressen-Fehler für Anzeige im Warenkorb" -"My Orders","Meine Bestellungen" -"My Orders - Details","Meine Bestellungen - Details" -"N/A","Nicht verfügbar" -"Name","Name" -"New","Neu" -"New Billing Agreement","Neue Abrechnungsvereinbarung" -"New Credit Memo","Neue Gutschrift" -"New Credit Memo for Guest","Neue Gutschrift für Gast" -"New Credit Memo for Invoice #%s","Neue Gutschrift für Rechnung #%s" -"New Credit Memo for Order #%s","Neue Gutschrift für Bestellung #%s" -"New Invoice","Neue Rechnung" -"New Invoice and Shipment for Order #%s","Neue Rechnung und Versand für Bestellung #%s" -"New Invoice for Guest","Neue Rechnung für Gast" -"New Invoice for Order #%s","Neue Rechnung für die Bestellung #%s" -"New Order","Neue Bestellung" -"New Order Confirmation Email Sender","Neue Bestellbestätigung E-Mail Absender" -"New Order Confirmation Template","Neue Vorlage für Bestellbestätigung" -"New Order Confirmation Template for Guest","Neue Bestellbestätigung Vorlage für Gast" -"New Order RSS","RSS für neue Bestellung" -"New Order Status","Neuer Bestellstatus" -"New Order for Guest","Neue Bestellung für Gast" -"New Shipment","Neue Lieferung" -"New Shipment for Guest","Neue Sendung für Gast" -"New Shipment for Order #%s","Neue Sendung für Bestellung #%s" -"Newsletter Subscription","Newsletter-Abonnement" -"No","Nein" -"No Items","Keine Artikel" -"No Items To Refund","Keine Artikel für Erstattung" -"No Payment Methods","Keine Zahlungsmethoden" -"No detail for number ""%s""","Keine Details zur Nummer ""%s""" -"No information available.","Keine Informationen verfügbar." -"No items","Keine Artikel" -"No order(s) were put on hold.","Keine Bestellung(en) zurückgestellt." -"No order(s) were released from holding status.","Für keine Bestellung(en) wurde der Wartestatus aufgehoben." -"No ordered items","Keine bestellten Artikel" -"No shipping information available","Keine Versandinformation verfügbar" -"Nominal Items","Nominelle Artikel" -"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","Nominelle Artikel können nur einzeln erworben werden. Um fortzufahren, entfernen Sie bitte die übrigen Artikel aus dem Angebot." -"Nominal order registered.","Beispielbestellung registriert." -"Not Capture","Nicht gespeichert" -"Not Initialized","Nicht initialisiert" -"Not Notified","Nicht benachrichtigt" -"Not enough valid data to save the parent transaction ID.","Nicht genügend gültige Daten, um die Transaktions-ID der Haupttransaktion zu speichern." -"Notification Not Applicable","Benachrichtigung nicht möglich" -"Notified","Benachrichtigt" -"Notify Customer by Email","Kunde per E-Mail benachrichtigen" -"Number","Nummer" -"Number of Invoiced Orders","Anzahl der abgerechneten Bestellungen" -"Number of Orders","Anzahl der Bestellungen" -"Number of Refunded Orders","Anzahl der erstatteten Bestellungen" -"OK","OK" -"Offline Refunded","Offline rückerstattet" -"On Hold","Zurückgestellt" -"Online Refunded","Online erstattet" -"Order","Bestellung" -"Order #","Bestellung Nr." -"Order # ","Order # " -"Order # %s","Bestellung # %s" -"Order # %s %s | %s","Bestellung # %s %s | %s" -"Order #%s","Bestellung #%s" -"Order #%s - %s","Bestellung #%s - %s" -"Order API","Auftrags-API" -"Order Address Information","Lieferadressen-Information" -"Order Comment","Kommentar zur Bestellung" -"Order Comment Email Sender","Auftragskommentar vom E-Mail-Versender" -"Order Comment Email Template","Kommentar zur Bestellung E-Mail Vorlage" -"Order Comment Email Template for Guest","Kommentar zur Bestellung E-Mail Vorlage für Gast" -"Order Comments","Kommentare zur Bestellung" -"Order Credit Memos","Gutschriften anfordern" -"Order Currency:","Währung der Bestellung:" -"Order Date","Bestelldatum" -"Order Date (%s)","Bestelldatum (%s)" -"Order Date: ","Bestelldatum" -"Order Date: %s","Bestelldatum %s" -"Order Details","Bestellungsdetail" -"Order Grand Total","Gesamtsumme Bestellung" -"Order History","Bestellungshistorie" -"Order History Info","Bestellverlaufs-Information" -"Order ID","BestellungsID" -"Order Information","Bestellungsinformationen" -"Order Invoices","Rechnungen anfordern" -"Order Shipments","Sendungen zur Bestellung" -"Order State","Bestellstatus" -"Order Status","Status des Auftrags" -"Order Status Information","Bestellstatus-Information" -"Order Statuses","Bestellstatus" -"Order Subtotal","Zwischensumme Bestellung" -"Order Taxes Report Grouped by Tax Rates","Bestellungssteuerbericht nach Steuersätzen gruppiert" -"Order Total","Gesamtsumme Bestellung" -"Order Totals","Gesamtbeträge Bestellung" -"Order Update","Update zur Bestellung" -"Order Update for Guest","Update zur Bestellung für Gast" -"Order View","Bestellungsansicht" -"Order credit memo","Gutschrift anfordern" -"Order does not allow to be canceled.","Der Auftrag kann nicht annulliert werden." -"Order invoice","Rechnung zur Bestellung" -"Order is suspended as its authorizing amount %s is suspected to be fraudulent.","Bestellung ist ausgesetzt, da der autorisierte Betrag %s vermutlich betrügerisch ist." -"Order is suspended as its capture amount %s is suspected to be fraudulent.","Die Bestellung wurde ausgesetzt, da die erfasste Bestellmenge %s unter dem Verdacht betrügerischer Aktivitäten steht." -"Order object is not specified.","Bestellungsobjekt ist nicht spezifiziert." -"Order saving error: %s","Fehler beim Speichern der Bestellung: %s" -"Order shipments","Bestellungslieferungen" -"Order status does not exist.","Bestellstatus existiert nicht." -"Order status with the same status code already exist.","Es existiert schon ein Bestellstatus mit diesem Statuscode." -"Order was placed using %s","Bestellung wurde unter Verwendung von %s durchgeführt." -"Ordered","Bestellt" -"Ordered amount of %s.","Bestellte Menge von %s." -"Ordering amount of %s is pending approval on gateway.","Bestellte Menge von %s erwartet die Bestätigung vom Gateway." -"Orders","Aufträge" -"Orders and Returns","Bestellungen und Retouren" -"Orders and Returns Search Form","Suchmaske Bestellungen und Rücksendungen" -"Original Price","Originalpreis" -"Original order item that recurring payment profile correspondss to.","Ursprünglich bestellter Artikel, der dem Zahlungsprofil entspricht." -"PDF Credit Memos","PDF Gutschriften" -"PDF Invoices","PDF Rechnungen" -"PDF Packingslips","PDF Packzettel" -"PDF Print-outs","PDF Ausdrucke" -"PDF object is not specified.","PDF Objekt ist nicht spezifiziert." -"PDF page object is not specified.","PDF Seitenobjekt ist nicht spezifiziert" -"PDF total model should extend Mage_Sales_Model_Order_Pdf_Total_Default","PDF Gesamtmodell sollte Mage_Sales_Model_Order_Pdf_Total_Default erweitern" -"Package","Paket" -"Package types are disregarded for USPS domestic shipments.","Paket-Typen werden für den USPS Inlandsversand außer Acht gelassen." -"Packages","Verpackungen" -"Packingslip # ","Packzettel #" -"Paid","bezahlt" -"Paid Amount","Bezahlter Betrag" -"Parent Transaction ID","Ursprüngliche Transaktions-ID" -"Parent transaction ID must have a transaction ID.","Die Transaktions-Stammkennung muss eine Transaktionskennung haben" -"Partial","Unvollständig" -"Payment Failed","Bezahlung fehlgeschlagen" -"Payment Information","Information zur Zahlung" -"Payment Method","Zahlungsart" -"Payment Method Name","Name der Bezahlungsmethode" -"Payment Method:","Zahlungsweise:" -"Payment Review","Bezahlungsüberprüfung" -"Payment disallow storing objects.","Die Zahlung erlaubt keine Speicherung von Objekten" -"Payment transactions disallow storing objects.","Zahlungen beinhalten nicht das Speichern der Objekte." -"Payment type","Zahlungsart" -"Payment update has been made.","Update der Zahlung ist erfolgt" -"Pending","Ausstehend" -"Pending Payment","Ausstehende Bezahlung" -"Period","Zeitraum" -"Place Order Using Billing Agreements","Auftrag mithilfe von Rechnungsvereinbahrungen erteilen" -"Placed from IP","Bestellt von IP Nummer" -"Please Select Products to Add","Bitte wählen Sie hinzuzufügende Produkte" -"Please Select a Customer","Bitte wählen sie einen Kunden" -"Please Select a Store","Bitte wählen sie ein Geschäft aus" -"Please check billing address information. %s","Bitte überprüfen Sie die Rechnungsadresse. %s" -"Please check shipping address information. %s","Bitte überprüfen Sie die Lieferadresse. %s" -"Please define PDF object before using.","Bitte bestimmen sie vor Gebrauch das PDF Objekt" -"Please enter positive number in this field.","Bitte schreiben sie in dieses Feld Pluszahlen." -"Please select a valid payment method.","Bitte wählen Sie eine gültige Zahlungsmethode." -"Please specify a shipping method.","Bitte geben Sie eine Versandart an." -"Please specify a valid grid column alias name that exists in grid table.","Bitte geben sie eine gültige Reihenbezeichnung, die in der Matrix existiert, an." -"Price","Preis" -"Print","Ausdrucken" -"Print All","Alles ausdrucken" -"Print All Invoices","Alle Rechnungen drucken" -"Print All Refunds","Alle Rückerstattungen ausdrucken" -"Print All Shipments","Allen Versand drucken" -"Print Credit Memos","Gutschriften ausdrucken" -"Print Invoice","Rechnung drucken" -"Print Invoices","Rechnungen ausdrucken" -"Print Order","Bestellung ausdrucken" -"Print Order # %s","Bestellung # %s ausdrucken" -"Print Packingslips","Packbelege ausdrucken" -"Print Refund","Erstattung drucken" -"Print Shipment","Lieferung ausdrucken" -"Print Shipping Label","Versandetikett drucken" -"Print Shipping Labels","Versandetiketten drucken" -"Processing","Bearbeitung" -"Product","Produkt" -"Product Name","Produktname" -"Products","Produkte" -"Products Bestsellers Report","Bericht der am meisten verkauften Artikel" -"Products in Comparison List","Artikel in der Vergleichsliste" -"Products should be added to package(s)","Produkte sollten dem Paket/den Paketen hinzugefügt werden" -"Profile #%s","Profil #%s" -"Profile Information","Profilinformation" -"Profile State","Profilstatus" -"Profit","Ertrag" -"Promotion Coupons Usage Report","Bericht über die Verwendung von Werbungsgutscheinen" -"Proper payment object must be set.","Es muss ein geeignetes Bezahlungsobjekt eingestellt werden." -"Purchase Order Number:","Bestellungsnummer:" -"Purchased From","Gekauft von" -"Purchased From (Store)","Erworben von (Geschäft)" -"Purchased Item","Erworbener Artikel" -"Purchased On","Gekauft am" -"Qty","Anzahl" -"Qty Invoiced","In Rechnung gestellte Menge" -"Qty Ordered","Bestellte Menge" -"Qty Shipped","Gelieferte Menge" -"Qty To Add","Hinzuzufügende Menge" -"Qty to Add","Hinzuzufügende Anz." -"Qty to Invoice","Zu berechnende Menge" -"Qty to Refund","Zu erstattende Menge" -"Qty to Ship","Zu versendende Menge" -"Quantity Ordered","bestellte Menge" -"Quote item id is not received.","Die angegebene Artikelnummer wurde nicht empfangen." -"Quote item is not loaded.","Der bestellte Artikel wird nicht geladen." -"Rate","Steuersatz" -"Recent Orders","Kürzlich aufgegebene Bestellungen" -"Recently Compared Products","zuletzt verglichene Artikel" -"Recently Viewed","Kürzlich angesehen" -"Recently Viewed Products","Kürzlich angesehene Produkte" -"Recurring Profile # %s","Wiederkehrendes Profil #%s" -"Recurring Profile Initial Fee","Wiederkehrendes Profil Einrichtungsgebühr" -"Recurring Profiles","Wiederkehrende Profile" -"Recurring Profiles (beta)","Wiederkehrende Profile (Beta)" -"Reference ID","Referenz-ID" -"Reference ID:","Referenz-ID:" -"Refresh","Aktualisieren" -"Refund","Erstatten" -"Refund #","Erstatten #" -"Refund #%s","Rückerstattung #%s" -"Refund Amount","Erstattungsbetrag" -"Refund Offline","Offline-Rückerstattung" -"Refund Shipping","Erstattung Versand" -"Refund Shipping (Excl. Tax)","Erstattung Versand (exkl. Steuer)" -"Refund Shipping (Incl. Tax)","Erstattung Versand (inkl. Steuer)" -"Refund Totals","Gesamtrückerstattung" -"Refunded","Rückerstattet" -"Refunded amount of %s offline.","Erstatteter Betrag von %s offline." -"Refunded amount of %s online.","Erstatteter Betrag von %s online." -"Refunds","Gutschriften" -"Registered a Void notification.","Ungültige Benachrichtigung registriert." -"Registered notification about approved payment.","Registrierte Benachrichtigung über akzeptierte Bezahlung." -"Registered notification about captured amount of %s.","Benachrichtigung über begrenzten Betrag von %s registriert." -"Registered notification about denied payment.","Benachrichtigung über abgelehnte Zahlung registriert." -"Registered notification about refunded amount of %s.","Registrierte Benachrichtigung über rückerstatteten Betrag von %s." -"Registered update about approved payment.","Aktualisierung über bestätigte Zahlung registriert." -"Registered update about denied payment.","Registrierte Aktualisierung bezüglich abgelehnter Zahlung." -"Regular Payment","Reguläre Zahlung" -"Related Orders","Dazugehörige Bestellungen" -"Remove","Entfernen" -"Remove Coupon Code","Gutscheincode entfernen" -"Remove tracking number","Tracking-Nummer entfernen" -"Reorder","Wieder bestellen" -"Retrieve credit memo info","Gutschrifts-Info abrufen" -"Retrieve credit memo information","Gutschriftinformationen abrufen" -"Retrieve credit memo list","Gutschrifts-Liste abrufen" -"Retrieve invoice info","Rechnungsinformationen abrufen" -"Retrieve invoice information","Rechnungsinformationen abrufen" -"Retrieve list of credit memos by filters","Gutschrifts-Liste filtern" -"Retrieve list of invoices by filters","Rechnungsliste nach Filtern abrufen" -"Retrieve list of orders by filters","Bestellliste nach Filtern abrufen" -"Retrieve list of shipments by filters","Versandliste nach Filtern abrufen" -"Retrieve order information","Bestellinformation abrufen" -"Retrieve orders info","Bestellungsinformationen abrufen" -"Retrieve shipment info","Versandinformationen abrufen" -"Retrieve shipment information","Versandinformation abrufen" -"Return to Stock","Zurück zum Inventar" -"Returned","Zurückgesendet" -"Returns","Rücksendungen" -"Revenue","Umsatz" -"Row Subtotal","Zeilengesamtsumme" -"Row Total","Zeilensumme" -"SKU","Artikelposition" -"Sales","Verkäufe" -"Sales Discount","Verkaufsermäßigung" -"Sales Emails","Verkaufs-E-Mails" -"Sales Emails Section","Verkaufsemailbereich" -"Sales Invoice Print View","Rechnungsdruckansicht" -"Sales Items","Verkaufsartikel" -"Sales Order Print View","Auftrags-Druckansicht" -"Sales Section","Verkaufsbereich" -"Sales Shipment Print View","Versendungskauf-Druckansicht" -"Sales Shipping","Versendungskauf" -"Sales Tax","Umsatzsteuer" -"Sales Total","Gesamtbetrag des Verkaufs" -"Same As Billing Address","Identisch mit Rechnungsadresse" -"Save Order Address","Bestelladresse speichern" -"Save Status","Status speichern" -"Save Status Assignment","Statuszuweisung speichern" -"Save in address book","Speichern im Adressbuch" -"Schedule","Planen" -"Select","Auswählen" -"Select All","Alle auswählen" -"Select from existing customer addresses:","Wählen Sie eine existierende Kundenadresse aus:" -"Selected option(s) or their combination is not currently available.","Ausgewählte Option(en) oder deren Kombination ist derzeit nicht verfügbar." -"Send Credit Memo Comment Email Copy To","Kreditkommentaremail in Kopie schicken an" -"Send Credit Memo Comments Email Copy Method","Senden Gutschrift Kommentare E-Mail Kopie Methode" -"Send Credit Memo Email Copy Method","Senden Gutschrift E-Mail Kopie Methode" -"Send Credit Memo Email Copy To","Kreditkommentaremail in Kopie schicken an" -"Send Email","E-Mail senden" -"Send Invoice Comment Email Copy To","Rechnungskommentaremail in Kopie schicken an" -"Send Invoice Comments Email Copy Method","Rechnung schicken Kommentare E-Mail Kopieren Methode" -"Send Invoice Email Copy Method","Rechnung schicken E-Mail Kopieren Methode" -"Send Invoice Email Copy To","Kopie der Rechnungs-E-Mail versenden an" -"Send Order Comment Email Copy To","Bestellungskommentaremail in Kopie schicken an" -"Send Order Comments Email Copy Method","Bestellung schicken Kommentare E-Mail Kopieren Methode" -"Send Order Email","E-Mail mit der Bestellung versenden" -"Send Order Email Copy Method","Bestellungsemail in Kopie schicken an" -"Send Order Email Copy To","Bestellungskommentaremail in Kopie schicken an" -"Send Sales Emails","Verkaufsemails verschicken" -"Send Shipment Comment Email Copy To","Kopie der E-Mail mit dem Lieferungsvermerk versenden an" -"Send Shipment Comments Email Copy Method","Senden Versand Kommentare E-Mail Kopie Methode" -"Send Shipment Email Copy Method","Sendung schicken E-Mail Kopieren Methode" -"Send Shipment Email Copy To","Kopie der Lieferungs-E-Mail versenden an" -"Send Tracking Information","Rückverfolgungsinformation schicken" -"Send shipment info","Versandinformationen senden" -"Set order for existing transactions not allowed","Die Reihenfolge für existierende Transaktionen festzulegen ist nicht gestattet" -"Ship","Versenden" -"Ship To","Lieferung an" -"Ship to Name","Lieferung auf Namen" -"Ship to:","Versenden nach:" -"Shipment","Lieferung" -"Shipment #","Lieferung #" -"Shipment #%1$s | %3$s (%2$s)","Lieferung #%1$s | %3$s (%2$s)" -"Shipment #%s","Lieferung #%s" -"Shipment Comment Email Sender","Lieferungskommentaremail-Absender" -"Shipment Comment Email Template","Lieferungskommentaremail-Vorlage" -"Shipment Comment Email Template for Guest","Lieferungskommentaremail-Vorlage für Gast" -"Shipment Comments","Lieferungskommentare" -"Shipment Email Sender","Lieferungsemail-Absender" -"Shipment Email Template","Lieferungsemail-Vorlage" -"Shipment Email Template for Guest","Lieferungsemail-Vorlage für Gast" -"Shipment Update","Lieferungsupdate" -"Shipment Update for Guest","Lieferungsaktualisierung für Gast" -"Shipments","Lieferungen" -"Shipped","Versandt" -"Shipped By","Geliefert von" -"Shipping","Lieferung" -"Shipping & Handling","Lieferung und Verarbeitung" -"Shipping & Handling","Versand und Abwicklung" -"Shipping & Handling Information","Versandinformationen" -"Shipping Address","Lieferungsadresse" -"Shipping Amount","Lieferungsbetrag" -"Shipping Information","Lieferungsinformation" -"Shipping Method","Liefermethode" -"Shipping Method:","Liefermethode:" -"Shipping Refund","Versanderstattung" -"Shipping and Tracking Information","Lieferungs- und Rückverfolgungsinformation" -"Shopping Cart","Einkaufswagen" -"Show Packages","Sendungen anzeigen" -"Signature Confirmation","Bestätigung Unterschrift" -"Signed Up From","Angemeldet seit" -"Size","Größe" -"Sku","SKU" -"Sold to:","Verkauft an:" -"Some item options or their combination are not currently available.","Einige Optionen oder deren Kombination sind zurzeit nicht verfügbar." -"Some of the products below do not have all the required options.","Einige der unten aufgeführten Produkte haben nicht alle der erforderlichen Optionen." -"Some of the selected options are not currently available.","Einige der ausgewählten Optionen sind nicht verfügbar." -"Sorry, no quotes are available for this order at this time.","Es tut uns Leid, es gibt derzeit keine Preisangabe für diese Bestellung." -"Source object is not specified.","Quellobjekt ist nicht angegeben." -"Specified profile does not exist.","Spezifiziertes Profil existiert nicht." -"State Code [State Title]","Statuscode [Statustitel]" -"State/Province","Staat/Bezirk" -"Status","Status" -"Status Code","Statuscode" -"Status Label","Statuslabel" -"Status:","Status:" -"Store Credit","Guthaben aufbewahren" -"Store View Specific Labels","Ladenansicht Spezifische Marken" -"Street Address","Anschrift (Straße, Hausnummer, PLZ)" -"Submit Comment","Kommentar abschicken" -"Submit Credit Memo","Gutschrift übermitteln" -"Submit Invoice","Rechnung einreichen" -"Submit Invoice and Shipment","Rechnung und Lieferung vorlegen" -"Submit Order","Bestellung abschicken" -"Submit Shipment","Versand eingeben" -"Subscribe to Newsletter","Newsletter abonnieren" -"Subscribe to Order Status","Zum Auftragsstatus anmelden" -"Subtotal","Zwischensumme" -"Subtotal after discount.","Zwischensumme nach Rabatt." -"Subtotal:","Zwischensumme:" -"Suspected Fraud","Betrug vermutet" -"Suspend","Aufheben" -"Suspended","Suspendiert" -"Tax","Steuer" -"Tax Amount","Steuerbetrag" -"Tax Percent","Steuer Prozent" -"Telephone","Telefon" -"The Order State ""%s"" must not be set manually.","Der Auftragsstatus ""%s"" darf nicht manuell festgelegt werden." -"The address total model should be extended from Mage_Sales_Model_Quote_Address_Total_Abstract.","Das adress total model sollte von Mage_Sales_Model_Quote_Address_Total_Abstract erweitert werden." -"The billing agreement ""%s"" has been canceled.","Die Rechnungsvereinbarung ""%s"" wurde annuliert." -"The billing agreement ""%s"" has been created.","Die Rechnungsvereinbarung ""%s"" wurde erstellt." -"The coupon code has been accepted.","Der Gutscheincode ist akzeptiert worden." -"The message has been sent.","Die Nachricht ist gesendet." -"The message was sent.","Die Nachricht ist gesendet worden." -"The order address has been updated.","Die Auftragsadresse wurde aktualisiert." -"The order email has been sent.","Die Auftrags-E-Mail ist gesendet worden." -"The order has been cancelled.","Die Bestellung wurde storniert." -"The order has been created.","Die Bestellung wurde erstellt." -"The order has been put on hold.","Die Bestellung wurde auf Wartestellung gesetzt." -"The order has been released from holding status.","Die Bestellung wurde aus der Wartestellung genommen." -"The order has not been cancelled.","Die Bestellung wurde nicht storniert." -"The order status has been assigned.","Der Auftragsstatus wurde festgesetzt." -"The order status has been saved.","Der Auftragsstatus wurde gespeichert." -"The order status has been unassigned.","Der Auftragsstatus wurde entfernt." -"The order was not put on hold.","Die Bestellung wurde nicht auf Wartestellung gesetzt." -"The order was not unheld.","Der Auftrag ist nicht freigegeben worden." -"The order was placed using %s","Die Bestellung wurde unter Verwendung von %s durchgeführt" -"The order(s) cannot be canceled","Die Bestellung(en) konnte(n) nicht storniert werden" -"The payment has been accepted.","Die Bezahlung ist akzeptiert worden." -"The payment has been denied.","Die Zahlung wurde abgelehnt." -"The payment has been voided.","Die Zahlung wurde ungültig gemacht." -"The profile has been updated.","Das Profil wurde aktualisiert." -"The profile has no changes.","Es gibt keine Änderungen zum Profil." -"The profile state has been updated.","Der Profilstand wurde aktualisiert." -"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","Die Menge, die Sie hinzufügen möchten übersteigt die Gesamtanzahl des ausgewählten Produktes / der ausgewählten Produkte." -"The requested Payment Method is not available.","Die angeforderte Zahlungsart ist nicht verfügbar." -"The shipping label has been created.","Das Versandlabel wurde erstellt." -"The transaction ""%s"" (%s) is already closed.","Die Transaktion ""%s"" (%s) ist bereits abgeschlossen." -"The transaction ""%s"" cannot be captured yet.","Die Transaktion ""%s"" kann noch nicht erfasst werden." -"The value that you entered is not valid.","Der von Ihnen eingegebene Wert ist ungültig." -"There are no billing agreements yet.","Es gibt noch keine Rechnungsvereinbahrungen." -"There are no printable documents related to selected orders.","Es gibt keine ausdruckbaren Dokumente verbunden mit den gewählten Bestellungen." -"There are no shipping labels related to selected orders.","Es gibt keine Versandetiketten zu den ausgewählten Bestellungen." -"There are no shipping labels related to selected shipments.","Es gibt keine Versandetiketten zu den ausgewählten Sendungen." -"There is no need to approve this payment.","Diese Zahlung muss nicht bestätigt werden." -"There is no need to deny this payment.","Diese Bezahlung muss nicht verweigert werden." -"There is no update for the payment.","Es gibt kein Update zur Zahlung." -"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","Diese Nachricht erscheint im Warenkorb, wenn Zwischensumme nach Rabatt weniger als Mindestbetrag." -"This operation requires an existing transaction object.","Diese Operation erfordert ein existierendes Transaktionsobjekt." -"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","Diese Bestellung enthält (%s) Artikel und kann deshalb nicht mit der Administrator-Oberfläche bearbeitet werden. Wenn Sie fortfahren möchten, werden die (%s) Artikel entfernt, die Bestellung wird gelöscht und eine neue erstellt." -"This order no longer exists.","Diese Bestellung existiert nicht mehr." -"This product does not have any configurable options","Dieses Produkt hat keine Einstellungsmöglichkeiten." -"This profile state cannot be changed to ""%s"".","Dieser Profilstatus kann nicht zu ""%s"" geändert werden." -"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","Dies erstellt eine Offine Rückerstattung. Um eine Online Rückerstattung zu erstellen, öffnen Sie eine Rechnung und erstellen Sie eine Gutschrift. Wollen Sie fortfahren?" -"Tier Pricing","Preisebene" -"Title","Titel" -"To","An" -"To Name","Name" -"To:","An:" -"Total","Gesamt" -"Total %d product(s)","Gesamtsumme %d Produkt(e)" -"Total (ex)","Gesamt (ex)" -"Total (inc)","Gesamtsumme (ink)" -"Total Due","Gesamtsumme fällig" -"Total Invoiced","Gesamtsumme in Rechnung" -"Total Invoiced Paid","Gesamtsumme in Rechnung, bezahlt" -"Total Invoiced VS Paid Report","Gesamtsumme in Rechnung VS Paid Report" -"Total Invoiced not Paid","Gesamtsumme in Rechnung, nicht bezahlt" -"Total Ordered Report","Report Gesamtbestellvolumen" -"Total Paid","Gesamtsumme bezahlt" -"Total Qty","Gesamtanzahl" -"Total Refund","Erstattungsbetrag" -"Total Refunded","Gesamtsumme rückerstattet" -"Total Refunded Report","Gesamtreport zu Rückerstattungen" -"Total Sales Shipping","Gesamtumsatz Versand" -"Total Shipped Report","Gesamtreport versendeter Produkte" -"Total Shipping","Gesamtsumme Versand" -"Total Shipping Charges","Gesamte Versandkosten" -"Total Tax","Gesamtsteuern" -"Total Weight","Gesamtgewicht" -"Total model should be extended from Mage_Sales_Model_Order_Total_Abstract.","Das Gesamtmodell ist um Mage_Sales_Model_Order_Total_Abstract zu erweitern." -"Track Order","Bestellung nachverfolgen" -"Track all shipment(s)","Alle Sendungen nachverfolgen" -"Track all shipments","Allen Versand verfolgen" -"Track this shipment","Diese Sendung nachverfolgen" -"Track your order","Ihre Bestellung nachverfolgen" -"Tracking","Tracking" -"Tracking Number","Verfolgungsnummer" -"Tracking Number(s):","Trackingnummer(n):" -"Transaction ""%s"" was already processed.","Transaktion ""%s"" wurde schon bearbeitet." -"Transaction # %s | %s","Transaktions-Nr. %s | %s" -"Transaction ID","TransaktionsID" -"Transaction ID must not be empty.","TransaktionsID darf nicht leer sein." -"Transaction ID: ""%s"".","Transaktions-ID: ""%s""." -"Transaction Type","Transaktionstyp" -"Transactions","Transaktionen" -"Trial ","Test" -"Trial Payment","Probezahlung" -"Trial Period","Testperiode" -"Trial period payment","Probeperiodenzahlung" -"Type","Typ" -"Unassign","Zuweisung entfernen" -"Unhold","Freigabe" -"Unhold action is not available.","Freigabe der Aktion ist nicht verfügbar." -"Unhold order","Bestellung freigeben" -"Unknown State","Unbekannter Status" -"Unknown Status","Unbekannter Status" -"Unsupported transaction type ""%s"".","Nicht unterstützter Transaktionstyp ""%s""." -"Update Changes","Änderungen aktualisieren" -"Update Items and Qty\'s","Artikel und Mengen aktualisieren" -"Update Qty\'s","Anzahl aktualisieren" -"Updated At","Aktualisiert am" -"Updated:","Aktualisiert:" -"Use Aggregated Data (beta)","Gesamtdaten (Beta) verwenden" -"Use Order Status As Default","Bestellstatus als Standard verwenden" -"Validate Each Address Separately in Multi-address Checkout","Jede Adresse im Multiadress-Ausgang gesondert validieren" -"Value","Wert" -"View","Ansicht" -"View All","Alle ansehen" -"View Another Order","Eine andere Bestellung ansehen" -"View Order","Bestellung ansehen" -"Visible on Frontend","Am Frontende sichtbar" -"Void","Leer" -"Void invoice","Leere Rechnung" -"Voided authorization.","Ungültige Berechtigung." -"Website","Website" -"Weight","Gewicht" -"Whether buyer can define the date when billing for the profile begins.","Ob Käufer das Datum festlegen kann, wann Abrechnung des Profils beginnt." -"Width","Breite" -"Wishlist","Wunschzettel" -"Wrong billing agreement ID specified.","Falsche Zahlungsvereinbarungs-ID angegeben." -"Wrong quote item id to update configuration.","Falsche Angebotskennnummer zur Aktualisierung der Konfiguration." -"Wrong state: ""%s"".","Falscher Zustand: ""%s""." -"Yes","Ja" -"You can leave a box blank if you don\'t wish to add a gift message for whole order","Sie können ein Eingabefeld leer lassen, wenn Sie keine Geschenkmitteilung für die gesamte Bestellung hinzufügen möchten." -"You don\'t have permissions to manage this order because of one or more products are not permitted for your website.","Sie haben keine Erlaubnis, diese Bestellung zu verwalten, weil eines oder mehrere Produkte für Ihre Webseite nicht zulässig sind." -"You have placed no orders.","Sie haben keine Bestellungen aufgegeben." -"You will be redirected to the payment system website.","Sie werden zu der Zahlungssystem-Website weitergeleitet." -"Your credit card will be charged for","Ihre Kreditkarte wird belastet mit" -"ZIP/Post Code","Postleitzahl" -"Zip/Postal Code","Postleitzahl" -"cm","cm" -"in","in" -"kg","kg" -"lb","US-Pfund" -"the credit memo email is not sent","die Gutschrifts-E-Mail wurde nicht gesendet" -"the credit memo email was sent","die Gutschrift-E-Mail wurde versendet" -"the invoice email is not sent","die Rechnungs-E-Mail ist nicht versendet" -"the invoice email was sent","die Rechnungs-E-Mail wurde versendet" -"the order confirmation email is not sent","die Auftragsbestätigungs-E-Mail ist nicht versendet" -"the order confirmation email was sent","die Auftragsbestätigungs-E-Mail wurde versendet" -"the shipment email is not sent","die Versand-E-Mail wurde nicht gesendet" -"the shipment email was sent","die Lieferungs-E-Mail wurde versendet" diff --git a/app/locale/de_DE/Mage_SalesRule.csv b/app/locale/de_DE/Mage_SalesRule.csv deleted file mode 100644 index 58af5e2b8..000000000 --- a/app/locale/de_DE/Mage_SalesRule.csv +++ /dev/null @@ -1,132 +0,0 @@ -"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","%d Warenkorb Preisregeln für ""%s"" Eigenschaften wurden deaktiviert." -"%s Coupon(s) have been generated","Es wurden %s Kupons erstellt." -"Actions","Aktionen" -"Active","Aktiv" -"Add New Rule","Neue Regel hinzufügen" -"Alphabetical","Alphabetisch" -"Alphanumeric","Alphanumerisch" -"An error occurred while generating coupons. Please review the log and try again.","Während er Erstellung der Kupons trat ein Fehler auf. Bitte überprüfen sie diese und versuchen sie es nochmals." -"Apply","Anwenden" -"Apply To","Anwenden auf" -"Apply the rule only if the following conditions are met (leave blank for all products)","Regel nur bei folgenden Bedingungen anwenden (Leer lassen für alle Produkte)" -"Apply the rule only to cart items matching the following conditions (leave blank for all items)","Regel nur auf Artikel im Warenkorb mit den folgenden Bedingungen anwenden (Leer lassen für alle Artikel)" -"Apply the rule to cart items matching the following conditions","Regel nur bei folgenden Bedingungen auf Artikel im Warenkorb anwenden" -"Apply to Shipping Amount","Auf Versandbetrag anwenden" -"Are you sure you want to delete the selected coupon(s)?","Wollen sie die ausgewählten Kupons wirklich löschen?" -"Auto","Automatisch" -"Auto Generated Specific Coupon Codes","Automatische generierte spezifische Kupon-Kennung" -"Buy X get Y free (discount amount is Y)","X kaufen, Y kostenlos bekommen (Rabattbetrag ist Y)" -"By Fixed value","Nach festen Wert" -"By Percentage","Nach Prozent" -"Can\'t acquire coupon.","Kann Gutschein nicht erwerben." -"Cart Attribute","Warenkorbattribut" -"Catalog","Katalog" -"Code Format","Kennung -Format" -"Code Length","Kennung -Länge" -"Code Prefix","Kennung- Präfix" -"Code Suffix","Kennung - Zusatz" -"Conditions","Bedingungen" -"Conditions combination","Bedingungskombination" -"Coupon","Gutschein" -"Coupon Code","Gutscheincode" -"Coupon Qty","Anzahl Kupon" -"Coupon with the same code","Kupon mit gleicher Kennung" -"Coupons Information","Kuponinformationen" -"Created On","Erstellt am" -"Customer Groups","Kundengruppen" -"Dash Every X Characters","Trennstrichs alle X Ziffern" -"Date Expire","Verfalldatum" -"Date Start","Startdatum" -"Default Label","Standardlabel" -"Default Rule Label for All Store Views","Standardregel Label für alle StoreViews" -"Description","Beschreibung" -"Discount Amount","Rabattbetrag" -"Discount Qty Step (Buy X)","Rabattmengenschritt (X kaufen)" -"Edit Rule","Regel ändern" -"Edit Rule '%s'","Regel '%s' ändern" -"Excluding prefix, suffix and separators.","Ausgenommen Präfix, Zusatzziffern und Trenner." -"FOUND","GEFUNDEN" -"Fixed amount discount","Rabatt mit festem Wert" -"Fixed amount discount for whole cart","Fester Rabattbetrag für gesamten Warenkorb" -"For matching items only","Nur für passende Artikel" -"For shipment with matching items","Für Versand mit passenden Artikeln" -"Free Shipping","Versandkostenfrei" -"From Date","Von Datum" -"General Information","Allgemeine Information" -"Generate","Erstellen" -"ID","ID" -"If %s %s %s for a subselection of items in cart matching %s of these conditions:","Falls %s %s %s für eine Unterauswahl der Artikel im Einkaufswagen %s dieser Bedingungen entspricht:" -"If an item is %s in the cart with %s of these conditions true:","Falls ein Artikel im Einkaufswagen %s ist und %s dieser Bedingungen vorliegen:" -"If empty no separation.","Wenn leer, keine Trennung." -"If you select and save the rule you will be able to generate multiple coupon codes.","Wenn sie diese Erstellungsregel auswählen und abspeichern, können sie mehrere Kupon-Kennziffern erstellen." -"Inactive","Nicht aktiv" -"Item totals are not set for rule.","Artikel-Summen sind keine Regel." -"Labels","Bezeichnungen" -"Manage Coupon Codes","Kupon-Kennungen verwalten" -"Maximum Qty Discount is Applied To","Maximal angewendete Rabattmenge" -"NOT FOUND","NICHT GEFUNDEN" -"NOT LOGGED IN","NICHT ANGEMELDET" -"New Rule","Neue Regel" -"No","Nein" -"No Coupon","Kein Gutschein" -"Not valid data provided","Es liegen keine gültigen Daten vor" -"Number of Uses","Anzahl der Verwendungen" -"Numeric","Numerisch" -"Payment Method","Zahlungsart" -"Percent of product price discount","Prozente für Rabatt auf den Verkaufspreis" -"Period","Zeitraum" -"Price in cart","Preis im Warenkorb" -"Priority","Priorität" -"Product attribute combination","Kombination der Produktmerkmale" -"Products subselection","Produktunterauswahl" -"Promotions","Promotionen" -"Public In RSS Feed","Im RSS Feed veröffentlichen" -"Quantity in cart","Menge im Warenkorb" -"Row total in cart","Zeile Gesamt im Warenkorb" -"Rule Information","Regelinformation" -"Rule Name","Regelname" -"Rule is not defined","Regel nicht definiert" -"Sales Discount Amount","Rabttbetrag des Verkaufs" -"Sales Subtotal Amount","Zwischensumme des Verkaufsbetrags" -"Sales Total Amount","Gesamtbetrag des Verkaufs" -"Save and Continue Edit","Speichern und Bearbeitung fortsetzen" -"Shipping Country","Lieferland" -"Shipping Method","Lieferungsart" -"Shipping Postcode","Postleitzahl der Lieferadresse" -"Shipping Region","Region der Lieferadresse" -"Shipping State/Province","Bundesland/Provinz der Lieferadresse" -"Shopping Cart Price Rule","Warenkorb Preisgebot" -"Shopping Cart Price Rules","Warenkorb Preisgebote" -"Special Price","Sonderpreis" -"Specific Coupon","spezieller Gutschein" -"Status","Status" -"Stop Further Rules Processing","Weitere Regelbearbeitung abbrechen" -"Store View Specific Labels","Überblick spezifischer Etikette im Lager" -"Subtotal","Zwischensumme" -"Subtotal Amount","Zwischensumme des Betrags" -"The rule has been deleted.","Die Regel wurde gelöscht." -"The rule has been saved.","Die Regel wurde gespeichert." -"This rule no longer exists.","Diese Regel existiert nicht mehr." -"Times Used","Wie oft eingelöst" -"To Date","Bis Datum" -"To Fixed Value","Zu festen Wert" -"To Percentage","Zu Prozent" -"Total","Gesamtbetrag" -"Total Amount","Gesamtbetrag" -"Total Items Quantity","Gesamtmenge aller Artikel" -"Total Weight","Gesamtgewicht" -"Unable to create requested Coupon Qty. Please check settings and try again.","Angeforderte Anzahl an Kupons konnte nicht erstellt werden. Bitte Einstellungen überprüfen und nochmals versuchen." -"Unable to find a rule to delete.","Keine Regel zum Löschen gefunden." -"Update prices using the following information","Finden Sie neue Preise mit den folgenden Informationen" -"Update product's %s %s: %s","%s %s: %s von Produkt aktualisieren" -"Update the Product","Produkt aktualisieren" -"Use Auto Generation","Über Automatische Erstellung" -"Used","Eingelöst" -"Uses per Coupon","Verwendung je Gutschein" -"Uses per Customer","Verwendung je Kunde" -"Website","Webseite" -"Websites","Websites" -"Wrong rule specified.","Falsche Regel angegeben." -"Yes","Ja" -"total amount","Gesamtsumme" -"total quantity","Gesamtmenge" diff --git a/app/locale/de_DE/Mage_Sendfriend.csv b/app/locale/de_DE/Mage_Sendfriend.csv deleted file mode 100644 index acda3c76b..000000000 --- a/app/locale/de_DE/Mage_Sendfriend.csv +++ /dev/null @@ -1,38 +0,0 @@ -"Add Recipient","Empfänger hinzufügen" -"Allow for Guests","Für Gäste erlauben" -"An invalid email address for recipient was entered.","Sie haben eine ungültige E-Mail-Adresse als Empfänger angegeben." -"At least one recipient must be specified.","Es muss mindestens ein Empfänger eingetragen werden." -"Back","Zurück" -"Catalog Product Email to a Friend","Produkt aus dem Katalog per E-Mail an einen Freund senden" -"Email Address","E-Mail-Adresse" -"Email Address:","E-Mail-Adresse:" -"Email Templates","E-Mail Vorlagen" -"Email to a Friend","E-Mail an einen Freund" -"Email:","E-Mail:" -"Enabled","Aktiviert" -"Invalid Sender Information","Ungültiger Absender" -"Invalid sender email.","Ungültige Absender E-Mail-Adresse." -"Limit Sending By","Senden einschränken auf" -"Max Products Sent in 1 Hour","Maximale Anzahl in einer Stunde gesendeter Produkte" -"Max Recipients","Maximale Empfängeranzahl" -"Maximum %d email addresses allowed.","Maximal %d E-Mail-Adressen erlaubt." -"Message:","Nachricht:" -"Name","Name" -"Name:","Name:" -"No more than %d emails can be sent at a time.","Es können nicht mehr als %d E-Mails auf einmal versendet werden." -"Please define a correct Cookie instance.","Legen Sie bitte eine korrekte Cookie-Instanz fest." -"Please define a correct Product instance.","Legen Sie bitte eine korrekte Produkt-Instanz fest." -"Please define the correct Sender information.","Bitte legen Sie korrekte Senderinformationen fest." -"Recipient:","Empfänger:" -"Remove Email","E-Mail löschen" -"Select Email Template","E-Mail-Vorlage wählen" -"Send Email","E-Mail senden" -"Send product to a friend","Dieses Produkt an einen Freund senden" -"Sender:","Absender:" -"Some emails were not sent.","Einige E-Mail wurden nicht gesendet." -"The link to a friend was sent.","Der Link wurde an den Freund gesendet." -"The message cannot be empty.","Das Nachrichten-Feld kann nicht freigelassen werden." -"The messages cannot be sent more than %d times in an hour","Die Nachrichten können nicht öfter als %d mal pro Stunde gesendet werden" -"The sender name cannot be empty.","Der Absender-Name kann nicht freigelassen werden." -"There were some problems with the data.","Es traten Probleme mit den Daten auf." -"You have exceeded limit of %d sends in an hour","Sie haben das Limit von %d Nachrichten pro Stunde überschritten" diff --git a/app/locale/de_DE/Mage_Shipping.csv b/app/locale/de_DE/Mage_Shipping.csv deleted file mode 100644 index 286b1b4b0..000000000 --- a/app/locale/de_DE/Mage_Shipping.csv +++ /dev/null @@ -1,93 +0,0 @@ -" for more information or ","für mehr Information oder" -"# of Items (and above)","Anzahl (und höher)" -"# of Items vs. Destination","Anzahl zu Destination" -"Allow Shipping to Multiple Addresses","Lieferung an Mehrere Adressen Erlauben" -"An error occurred while import table rates.","Während des Imports der Kostentabelle trat ein Fehler auf." -"Calculate Handling Fee","Bearbeitungsgebühr berechnen" -"Carrier:","Transport:" -"City","Stadt" -"Close Window","Fenster Schließen" -"Condition","Bedingung" -"Country","Land" -"Custom Value","Zollwert" -"Date","Datum" -"Delivered on:","Geliefert am:" -"Delivered to:","Geliefert an:" -"Description","Beschreibung" -"Displayed Error Message","Angezeigte Fehlermeldung" -"Divide to equal weight (one request)","Auf gleiches Gewicht verteilen (eine Anfrage)" -"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","Zeile duplizieren #%s (Land""%s"", Region/Bundesland ""%s"", PLZ ""%s"" und Wert ""%s"")." -"Enabled","Aktiviert" -"Error:","Fehler:" -"Export","Export" -"File has not been imported. See the following list of errors: %s","Die Datei konnte nicht importiert werden. Vgl. die folgende Fehlerliste: %s" -"Fixed","Fix" -"Flat Rate","Pauschaltarif:" -"Free Shipping","Versandkostenfrei" -"Google Sitemap Section","Google-Sitemap-Sektion" -"Handling Fee","Bearbeitungsgebühren" -"Import","Import" -"Include Virtual Products in Price Calculation","Virtuelle Produkte in Preiskalkulation miteinbeziehen" -"Info:","Info:" -"Invalid %s ""%s"" in the Row #%s.","%s ""%s"" ungültig in Zeile #%s." -"Invalid Country ""%s"" in the Row #%s.","Ungültiges Land ""%s"" in Zeile #%s." -"Invalid Region/State ""%s"" in the Row #%s.","Ungültige Region/Bundesland ""%s"" in Zeile #%s." -"Invalid Shipping Price ""%s"" in the Row #%s.","Ungültiger Lieferpreis ""%s"" in Zeile #%s." -"Invalid Table Rate code for type %s: %s","Ungültiger Tabellenraten-Code für Typ %s: %s" -"Invalid Table Rate code type: %s","Ungültiger Tabellenraten-Code des Typs: %s" -"Invalid Table Rates File Format","Ungültiges Tabellenraten-Dateiformat" -"Invalid Table Rates format in the Row #%s","Ungültiges Format für Tabellenwerte in Zeile #%s" -"Local Time","Ortszeit" -"Location","Ort" -"Maximum Qty Allowed for Shipping to Multiple Addresses","Erlaubte Höchstanzahl für Lieferung an Mehrere Adressen" -"Method Name","Methodenname" -"Minimum Order Amount","Mindestmenge für Bestellung" -"N/A","Nicht verfügbar" -"None","Keine" -"Options","Optionen" -"Order Subtotal (and above)","Bestellungszwischensumme (und höher)" -"Origin","Ursprung" -"Per Order","Auf Bestellung" -"Per Package","Pro Paket" -"Percent","Prozent" -"Price","Preis" -"Price vs. Destination","Preis zu Destination" -"Region/State","Region/Bundesland" -"Service Type:","Dienstleistungstyp:" -"Ship to Applicable Countries","Versand in zutreffende Länder" -"Ship to Specific Countries","Versand in angegebene Länder" -"Shipment #","Lieferung #" -"Shipment Tracking Popup","Lieferungs-Tracking-Popup" -"Shipped or billed on:","Geliefert und in Rechnung gestellt an:" -"Shipping Methods","Lieferungsmethoden" -"Shipping Methods Section","Lieferungsmethoden-Sektion" -"Shipping Settings","Lieferungsoptionen" -"Shipping Settings Section","Lieferungsoptionen-Sektion" -"Show Method if Not Applicable","Wenn nicht anwendbar, Verfahren anzeigen" -"Signed by:","Unterschrieben von:" -"Sort Order","Sortierreihenfolge" -"Status:","Status:" -"Store Pickup","Abholung" -"Street Address","Anschrift (Straße, Hausnummer, PLZ)" -"Street Address Line 2","Adressangabe Straße Zeile 2" -"Table Rates","Tabellenraten" -"The shipping module is not available for selected delivery country.","Dieses Lieferungsmodul ist für das ausgewählte Lieferungsland nicht verfügbar." -"The shipping module is not available.","Dieser Lieferungsmodul ist nicht verfügbar." -"There is no tracking available for this shipment.","Für diese Lieferung ist kein Tracking verfügbar." -"There is no tracking available.","Tracking ist nicht verfügbar." -"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","Diese Lieferungsmethode ist zur Zeit nicht verfügbar. Wenn Sie mit diese Lieferungsmethode verwenden wollen, kontaktieren Sie uns bitte." -"This shipping method is not available, please specify ZIP-code","Diese Lieferungsmethode ist nicht verfügbar, bitte geben Sie eine Postleitzahl an" -"Title","Titel" -"Track:","Route:" -"Tracking Information","Routeninformation" -"Tracking Number:","Tracking-Nummer:" -"Tracking information is currently not available. Please ","Tracking-Information ist zur Zeit nicht verfügbar. Bitte" -"Tracking information is currently unavailable.","Tracking-Information ist zur Zeit nicht verfügbar." -"Type","Typ" -"Use origin weight (few requests)","Ursprungsgewicht verwenden (wenige Anfragen)" -"Weight (and above)","Gewicht (und höher)" -"Weight vs. Destination","Gewicht zu Destination" -"Weight:","Gewicht:" -"ZIP/Postal Code","Postleitzahl" -"contact us","kontaktieren Sie uns" -"email us at ","schreiben Sie uns eine E-Mail an" diff --git a/app/locale/de_DE/Mage_Sitemap.csv b/app/locale/de_DE/Mage_Sitemap.csv deleted file mode 100644 index da6f5137f..000000000 --- a/app/locale/de_DE/Mage_Sitemap.csv +++ /dev/null @@ -1,46 +0,0 @@ -"Action","Aktion" -"Add Sitemap","Sitemap hinzufügen" -"Always","Immer" -"CMS Pages Options","CMS Seitenoptionen" -"Categories Options","Kategorien Optionen" -"Daily","Täglich" -"Edit Sitemap","Sitemap bearbeiten" -"Enabled","Aktiviert" -"Error Email Recipient","Email-Empfänger bei auftretenden Fehlern" -"Error Email Sender","Email-Absender bei auftretenden Fehlern" -"Error Email Template","Email-Vorlage bei auftretenden Fehlern" -"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","Datei ""%s"" kann nicht gespeichert werden. Bitte stellen Sie sicher, dass das Verzeichnis ""%s"" seitens des Webservers beschreibbar ist." -"Filename","Dateiname" -"Frequency","Frequenz" -"Generate","Generieren" -"Generation Settings","Generierungseinstellungen" -"Google Sitemap","Google Sitemap" -"Hourly","Stündlich" -"ID","ID" -"Last Time Generated","Zuletzt generiert" -"Link for Google","Link für Google" -"Monthly","Monatlich" -"Never","Niemals" -"New Sitemap","Neue Sitemap" -"Path","Pfad" -"Please create the specified folder ""%s"" before saving the sitemap.","Bitte erstellen sie den benötigten Ordner ""%s"", bevor Sie die Sitemap speichern." -"Please define correct path","Bitte definieren Sie einen korrekten Pfad" -"Please make sure that ""%s"" is writable by web-server.","Bitte vergewissern Sie sich, dass ""%s"" seitens des Webservers beschreibbar ist." -"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","Bitte verwenden Sie nur Buchstaben (a-z oder A-Z), Zahlen (0-9) oder Unterstriche (_) im Dateinamen. Leerzeichen oder andere Zeichen sind nicht zugelassen." -"Priority","Priorität" -"Products Options","Produkte Optionen" -"Sitemap","Sitemap" -"Sitemap generate Warnings","Warnungen zu Sitemap generieren" -"Start Time","Startzeit" -"Store View","Store-Ansicht" -"The priority must be between 0 and 1.","Die Priorität muss zwischen 0 und 1 liegen." -"The sitemap ""%s"" has been generated.","Die Sitemap ""%s"" wurde generiert." -"The sitemap has been deleted.","Die Sitemap wurde gelöscht." -"The sitemap has been saved.","Die Sitemap wurde gespeichert." -"This sitemap no longer exists.","Diese Sitemap existiert nicht mehr." -"Unable to find a sitemap to delete.","Sitemap zur Löschung konnte nicht gefunden werden." -"Unable to find a sitemap to generate.","Sitemap, die generiert werden soll, konnte nicht gefunden werden." -"Unable to generate the sitemap.","Sitemap kann nicht erstellt werden." -"Valid values range: from 0.0 to 1.0.","Gültige Eingaben: zwischen 0,0 und 1,0." -"Weekly","Wöchentlich" -"Yearly","Jährlich" diff --git a/app/locale/de_DE/Mage_Tag.csv b/app/locale/de_DE/Mage_Tag.csv deleted file mode 100644 index 5ea592ea1..000000000 --- a/app/locale/de_DE/Mage_Tag.csv +++ /dev/null @@ -1,101 +0,0 @@ -"# of Uses","Anzahl der Verwendungen" -"%s tag(s) have been accepted for moderation.","%s Tag(s) wurde(n) für die Moderation akzeptiert." -"Tag Name: %s","Tag-Bezeichnung: %s" -"Action","Aktion" -"Add","Hinzufügen" -"Add New Tag","Neuen Tag hinzufügen" -"Add Tags","Tags hinzufügen" -"Add Your Tags:","Fügen Sie Ihre Tags hinzu:" -"Add tag(s) to product","Tag(s) zum Produkt hinzufügen" -"Add to Cart","Zum Warenkobrn hinzufügen" -"Add to Wishlist","Zum Wunschzettel hinzufügen" -"All Tags","Alle Tags" -"Approved","Bestätigt" -"Are you sure you want to delete this tag?","Sind Sie sicher, diesen Tag löschen zu wollen?" -"Are you sure you want to do this?","Sind Sie sicher, dass sie das tun wollen?" -"Are you sure?","Sind Sie sicher?" -"Back","Zurück" -"Back to Tags List","Zurück zur Tagliste" -"Base Popularity","Popularität aufbauen" -"Block Information","Blockinformation" -"CSV","CSV" -"Catalog Product View","Katalog-Produktansicht" -"Change status","Status ändern" -"Click on a tag to view your corresponding products.","Klicken Sie auf einen Tag, um die zugehörigen Produkte zu sehen." -"Country","Land" -"Customer My Account My Tags List","Kunde Mein Konto Meine Tagliste" -"Customer My Account Tag View","Kunde Mein Konto Tag-Ansicht" -"Customer Since","Kunde Seit" -"Customers","Kunden" -"Customers Submitted this Tag","Kunden Haben diesen Tag Eingereicht" -"Customers Tagged '%s'","Kunden Haben '%s' getaggt" -"Delete","Löschen" -"Delete Tag","Tag löschen" -"Disabled","Deaktiviert" -"Edit Tag '%s'","Tag '%s' Bearbeiten" -"Email","E-Mail" -"First Name","Vorname" -"General Information","Allgemeine Information" -"Grid","Raster" -"ID","ID" -"Info","Informationen" -"Last Name","Nachname" -"List","Liste" -"Manage Tags","Tags Verwalten" -"My Recent Tags","Meine Neuesten Tags" -"My Tags","Meine Tags" -"Name","Name" -"New Tag","Neuer Tag" -"No matches found.","Keine Übereinstimmungen gefunden." -"Other people marked this product with these tags:","Andere Leute haben dieses Produkt mit diesen Tags gekennzeichnet:" -"Pending","Ausstehend" -"Pending Tags","Unbestätigte Tags" -"Popular","Beliebt" -"Popular Tags","Beliebte Tags" -"Price","Preis" -"Product Name","Produktname" -"Product SKU","Bestandseinheit des Produktes" -"Product Tag API","Produkttag-Programmierschnittstelle" -"Product Tags","Produkttags" -"Products","Produkte" -"Products Tagged by Administrators","Von Administratoren Getaggte Produkte" -"Products Tagged by Customers","Von Kunden Getaggte Produkte" -"Products Tagged with '%s'","Mit '%s' getaggte Produkte" -"Products tagged with '%s'","Mit '%s' gekennzeichnete Produkte" -"Rebuild Tag aggregation data","Datenansammlungen im Anhang wiederherstellen" -"Remove","Löschen" -"Remove product tag","Produkttag entfernen" -"Retrieve list of tags by product","Liste von Tags nach Produkten abrufen" -"Retrieve product tag info","Produkttag-Informationen abrufen" -"SKU","SKU" -"Save Tag","Tag speichern" -"Save and Continue Edit","Speichern und Bearbeitung fortsetzen" -"Status","Status" -"Store View","Store-Ansicht" -"Tag","Tag" -"Tag ""%s"" has already been added to the product.","Etikett ""%s"" wurde bereits zum Produkt hinzugefügt." -"Tag ""%s"" has been added to the product.","Etikett ""%s"" wurde zum Produkt hinzugefügt." -"Tag ""%s"" has been rejected by administrator.","Etikett ""%s"" wurde vom Administrator abgelehnt." -"Tag Aggregation Data","Tag Gruppierungsdaten" -"Tag Name","Tagname" -"Tagged Products List","Liste von Produkten mit Tags" -"Tags","Tags" -"Tags List (All Available)","Tagliste (Alle verfügbar)" -"Tags List Before","Etikettenliste zuerst" -"Tags:","Tags:" -"Telephone","Telefon" -"The tag has been deleted.","Das Tag wurde gelöscht." -"There are no tags available.","Es sind keine Tags verfügbar." -"Unable to find any products tagged with '%s' in the current store","Es konnten keine Produkte mit dem Tag '%s' in diesem Shop gefunden werden." -"Unable to remove tag. Please, try again later.","Tag kann nicht entfernt werden. Bitte versuchen Sie es später noch einmal." -"Unable to save tag(s).","Tag(s) konnte(n) nicht gespeichert werden." -"Update","Aktualisieren" -"Update product tag","Produkttag aktualisieren" -"Use spaces to separate tags. Use single quotes (') for phrases.","Verwenden Sie Leerzeichen um Tags zu trennen. Verwenden Sie Apostrophe (') für Phrasen." -"View All Tags","Alle Tags ansehen" -"View Customers","Kunden ansehen" -"View Products","Produkte ansehen" -"XML","XML" -"You have not tagged any products yet.","Sie haben noch keinen Produkten Tags hinzugefügt." -"ZIP/Post Code","Postleitzahl" -"[STORE VIEW]","[SHOP ANSICHT]" diff --git a/app/locale/de_DE/Mage_Tax.csv b/app/locale/de_DE/Mage_Tax.csv deleted file mode 100644 index ebcb20980..000000000 --- a/app/locale/de_DE/Mage_Tax.csv +++ /dev/null @@ -1,163 +0,0 @@ -"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - gleicht mit allem ab; 'xyz*' - gleicht mit allem ab, was mit 'xyz' beginnt und nicht länger als %d ist." -"-- Please Select --","-- Bitte auswählen --" -"Add New Class","Neue Klasse hinzufügen" -"Add New Tax Rate","Neuen Steuersatz hinzufügen" -"Add New Tax Rule","Neue Steuerregel hinzufügen" -"After Discount","Nach Rabatt" -"An error occurred while deleting this rate.","Beim Löschen dieses Steuersatzes ist ein Fehler aufgetreten." -"An error occurred while deleting this rate. Incorrect rate ID.","Beim Löschen dieses Steuersatzes ist ein Fehler aufgetreten. Inkorrekte SatzID." -"An error occurred while deleting this tax class.","Beim Löschen dieser Steuerklasse ist ein Fehler aufgetreten." -"An error occurred while deleting this tax rule.","Beim Löschen dieser Steuerregel ist ein Fehler aufgetreten." -"An error occurred while saving this tax class.","Beim Sepichern dieser Steuerklasse ist ein Fehler aufgetreten." -"An error occurred while saving this tax class. A class with the same name","Beim Speichern dieser Steuerklasse ist ein Fehler aufgetreten. Eine Klasse mit dem selben Namen" -"Apply Customer Tax","Kundensteuer anwenden" -"Apply Discount On Prices","Rabatt auf Preise anwenden" -"Apply Tax On","Steuer anwenden auf" -"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Der Rabatt auf den Preis einschließlich Steuern basiert auf der Ladensteuer, wenn ""Steuer nach dem Rabatt"" gewählt wurde." -"Are you sure you want to do this?","Sind Sie sicher, dass sie das tun wollen?" -"Back","Zurück" -"Before Discount","Vor Rabatt" -"CSV","CSV" -"Calculate off subtotal only","Berechnen Sie nur Teilsummen" -"Calculation Settings","Berechnungseinstellungen" -"Catalog Prices","Katalogpreise" -"Class Name","Klassenname" -"Click here to go to Tax configuration and change your settings.","Klicken Sie hier, um unter Tax configuration Ihre Einstellungen zu ändern." -"Code","Code" -"Country","Land" -"Custom price if available","Benutzerdefinierter Preis falls verfügbar" -"Customer Tax Class","Kundensteuerklasse" -"Customer Tax Class Information","Kunden Steuerklasse Information" -"Customer Tax Classes","Kunden Steuerklassen" -"Default Country","Standard Land" -"Default Post Code","Standard Postleitzahl" -"Default State","Standard Staat" -"Default Tax Destination Calculation","Standard Steuerzielberechnung" -"Delete Class","Klasse löschen" -"Delete Rate","Steuersatz löschen" -"Delete Rule","Regel löschen" -"Display Full Tax Summary","Vollständige Steuerzusammenfassung anzeigen" -"Display Prices","Preise anzeigen" -"Display Product Prices In Catalog","Produktpreise im Katalog anzeigen" -"Display Shipping Amount","Versandbetrag anzeigen" -"Display Shipping Prices","Versandpreise anzeigen" -"Display Subtotal","Zwischensumme anzeigen" -"Display Zero Tax Subtotal","Nullsteuer Zwischensumme anzeigen" -"Edit Class","Klasse bearbeiten" -"Edit Class '%s'","Klasse bearbeiten '%s'" -"Edit Rule","Regel ändern" -"Edit Tax Rate","Steuersatz bearbeiten" -"Enable Cross Border Trade","Cross Border Trade aktivieren" -"Excel XML","Excel-XML" -"Excl. Tax","Steuer weglassen" -"Excl. Tax:","Zzgl. Steuern:" -"Excluding Tax","Zuzüglich Steuern" -"Export Tax Rates","Steuersätze exportieren" -"Grand Total (Excl. Tax)","Gesamtsumme (zzgl. Steuern)" -"Grand Total (Excl.Tax)","Gesamtsumme (zzgl. Steuern)" -"Grand Total (Incl. Tax)","Gesamtsumme (inkl. Steuern)" -"Grand Total (Incl.Tax)","Gesamtsumme (inkl. Steuern)" -"Grand Total Excl. Tax","Gesamtsumme zzgl. Steuern" -"Grand Total Incl. Tax","Gesamtsumme inkl. Steuern" -"Ignore this notification","Ignorieren Sie diese Meldung" -"Import / Export Tax Rates","Steuersätze importieren / exportieren" -"Import Tax Rates","Steuersätze importieren" -"Inc. Tax","Inkl. Steuern" -"Incl. Tax","Steuer inkludieren" -"Incl. Tax:","Inkl. Steuern:" -"Include Tax In Grand Total","Steuern in Gesamtsumme inklusive" -"Including Tax","Inklusive Steuern" -"Including and Excluding Tax","Inklusive und zuzüglich Steuern" -"Invalid file format upload attempt","Ungültiges Dateiformat hochgeladen" -"Invalid file upload attempt","Ungültige Datei hochgeladen" -"Manage Customer Tax Classes","Kundensteuerklassen verwalten" -"Manage Product Tax Classes","Produktsteuerklassen verwalten" -"Manage Tax Rates","Steuersätze verwalten" -"Manage Tax Rules","Steuerregeln verwalten" -"Manage Tax Zones & Rates","Steuerzonen und -sätze verwalten" -"Maximum zip code length is 9.","Maximale Länge der Postleitzahl beträgt 9 Ziffern." -"Name","Name" -"New Class","Neue Steuerklasse" -"New Rule","Neue Regel" -"New Tax Rate","Neuer Steuersatz" -"No","Nein" -"None","Keine" -"One of the country has invalid code.","Eines der Bundesländer hat einen ungültigen Code." -"Orders, Invoices, Credit Memos Display Settings","Bestellungen, Rechnungen, Verkaufsgutschriften Display-Einstellungen" -"Original price only","Nur Originalpreis" -"Please fill all required fields with valid information.","Bitte füllen Sie alle Pflichtfelder mit gültigen Informationen aus." -"Please see source for more details.","Weitere Einzelheiten sehen Sie bitte unter source." -"Price Display Settings","Anzeige-Einstellungen für Preis" -"Priority","Priorität" -"Product Tax Class","Produktsteuerklasse" -"Product Tax Class Information","Produktsteuerklasse Information" -"Product Tax Classes","Produktsteuerklassen" -"Range From","Im Bereich von" -"Range To","Im Bereich bis" -"Range To should be equal or greater than Range From.","Bereich ""bis"" muss gleich oder größer als Bereich ""von"" sein." -"Rate","Steuersatz" -"Rate Percent","Steuersatz Prozent" -"Rate Percent should be a positive number.","Prozentrate muss eine positive Zahl sein." -"Reset","Zurücksetzen" -"Row Total","Zeilensumme" -"Sales","Verkäufe" -"Save Class","Steuerklasse speichern" -"Save Rate","Steuersatz speichern" -"Save Rule","Regel speichern" -"Save and Continue Edit","Speichern und Bearbeitung fortsetzen" -"Shipping & Handling (Excl.Tax)","Versandkosten (exkl. MwSt.)" -"Shipping & Handling (Incl.Tax)","Versandkosten (inkl. MwSt)" -"Shipping & Handling Tax","Versandkosten & Steuern" -"Shipping (Excl. Tax)","Versand (excl. MwSt.)" -"Shipping (Incl. Tax)","Versand (inkl. MwSt.)" -"Shipping Excl. Tax (%s)","Versand exkl. MwSt. (%s)" -"Shipping Incl. Tax (%s)","Versand inkl. MwSt. (%s)" -"Shipping Prices","Versandpreise" -"Shopping Cart Display Settings","Warenkorb Anzeige Einstellungen" -"Sort Order","Sortierreihenfolge" -"State","Staat" -"State/Region","Bundesstaat/Region" -"Subtotal (Excl. Tax)","Zwischensumme (exkl. MwSt.)" -"Subtotal (Excl.Tax)","Zwischensumme (exkl. MwSt.)" -"Subtotal (Incl. Tax)","Zwischensumme (inkl. MwSt.)" -"Subtotal (Incl.Tax)","Zwischensumme (inkl. MwSt.)" -"Subtotal only","nur Teilergebnis" -"Tax","Steuer" -"Tax Calculation Based On","Steuerberechnung basiert auf" -"Tax Calculation Method Based On","Steuerberechnungsmethode basiert auf" -"Tax Class for Shipping","Steuerklasse für Versand" -"Tax Classes","Steuerklassen" -"Tax Identifier","Steuerbezeichner" -"Tax Rate","Steuersatz" -"Tax Rate Information","Steuersatzinformation" -"Tax Rule Information","Steuerregelinformation" -"Tax Rules","Steuerregeln" -"Tax Section","Steuerbereich" -"Tax Titles","Steuertitel" -"Tax rate cannot be removed. It exists in tax rule","Steuersätze können nicht entfernt werden. Diese bestehen in der Regelsteuer" -"Tax rates at the same priority are added, others are compounded.","Steuersätze mit gleicher Priorität sind hinzugefügt, andere sind zusammengesetzt." -"The tax class has been deleted.","Die Steuerklasse wurde gelöscht." -"The tax class has been saved.","Die Steuerklasse wurde gespeichert." -"The tax rate has been deleted.","Der Steuersatz wurde gelöscht." -"The tax rate has been imported.","Der Steuersatz wurde importiert." -"The tax rate has been saved.","Der Steuersatz wurde gespeichert." -"The tax rule has been deleted.","Die Steuerregel wurde gelöscht." -"This class no longer exists","Diese Klasse existiert nicht mehr." -"This rule no longer exists","Diese Regel existiert nicht mehr." -"This rule no longer exists.","Diese Regel existiert nicht mehr." -"Total","Gesamtbetrag" -"Unit Price","Einheitspreis" -"Warning tax configuration can result in rounding errors","Achtung: Steuer-Konfiguration kann zu Rundungsfehlern führen" -"Warning tax configuration can result in unexpected FPT prices on applicable devices","Warnung: Die Steuer-Konfiguration kann bei geeigneten Geräten zu unerwarteten Festpreis-Offerten führen" -"Warning tax discount configuration might result in different discounts than a customer might expect","Warnung: Steuerrabatt-Konfiguration kann zu anderen als vom Kunden erwarteten Rabatten führen" -"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","Wenn der Katalogpreis Steuern enthält, aktiviert diese Einstellung den Preis unabhängig vom Steuersatz des Kunden." -"Whether catalog prices entered by admin include tax.","Ob vom Admin eingegebene Katalogpreise Steuer beinhalten." -"Whether shipping amounts entered by admin or obtained from gateways include tax.","Ob vom Admin eingegebene oder vom Gateway erhaltene Versandbeträge Steuer beinhalten." -"Yes","Ja" -"You cannot delete this tax class as it is used for %d customer groups.","Sie können diese Steuerklasse nicht löschen, da sie für %d Kundengruppen verwendet wird." -"You cannot delete this tax class as it is used for %d products.","Sie können diese Steuerklasse nicht löschen, da sie für %d Produkte verwendet wird." -"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","Sie können diese Steuerklasse nicht löschen da sie in den Steuerregeln verwendet wird. Sie müssen die Regeln, in der sie verwendet wird, zuerst löschen." -"Zip code should not contain characters other than digits.","Postleitzahl darf keine anderen Zeichen als Ziffern enthalten." -"Zip/Post Code","Postleitzahl" -"Zip/Post is Range","Postleitzahl ist im Bereich" -"for store(s)","für Store(s)" diff --git a/app/locale/de_DE/Mage_Usa.csv b/app/locale/de_DE/Mage_Usa.csv deleted file mode 100644 index 000ecb4c1..000000000 --- a/app/locale/de_DE/Mage_Usa.csv +++ /dev/null @@ -1,381 +0,0 @@ -" was not delivered nor scanned","wurde weder zugestellt noch eingescannt" -"""Per Order"" allows single handling fee for entire order. ""Per Package"" allows individual handling fee for each package.","""Pro Bestellung"" bedeutet einzelne Bearbeitungsgebühr für die gesamte Bestellung. ""Pro Paket"" bedeutet individuelle Bearbeitungsgebühr für jedes Paket." -"1 Day Freight","1-Tag Fracht" -"2 Day","2 Tage" -"2 Day AM","2 Tag morgens" -"2 Day Freight","2-Tage-Fracht" -"2Day","2 Tage" -"2nd Day Air","2. Tag Luftpost" -"2nd Day Air AM","2. Tag Luftpost vormittags" -"2nd Day Air AM Letter","2. Tag Luftpost vormittags Briefsendung" -"2nd Day Air Letter","2. Tag Luftpost Briefsendung" -"3 Day Freight","3-Tage-Fracht" -"3 Day Select","3-Tage-Select" -"Access ID","Zugangsnummer" -"Access License Number","Zugangslizenznummer" -"Account ID","Kundenkonto-ID" -"Account Number","Kundenkontonummer" -"Additional Protection Configuration Value","Zusätzliche Absicherung Konfigurationswert" -"Additional Protection Enabled","Zusätzliche Absicherung aktiviert" -"Additional Protection Min Subtotal","Zusätzliche Absicherung Mindestzwischensumme" -"Additional Protection Value","Zusätzliche Absicherung Wert" -"Additional Protection Value Rounding Method","Zusätzliche Absicherung Rundungsmethode für den Wert" -"Adult","Erwachsener" -"Adult Signature Required","Unterschrift eines Erwachsenen erforderlich" -"Allowed Methods","Erlaubte Mittel" -"Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges.","Das Gewicht der Gesamtbestellung kann in kleinere Stücke geteilt werden, wenn es %s %s überschreitet, um genaue Berechnung der Versandkosten zu gewährleisten." -"Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","Das Gewicht der Gesamtbestellung kann in kleinere Stücke geteilt werden, wenn es 70 kg überschreitet, um genaue Berechnung der Versandkosten zu gewährleisten." -"Bound Printed Matter","Gebundene Drucksache" -"Break bulk economy","Sperrgut-Economy" -"Break bulk express","Sperrgut-Express" -"Business Service Center","Geschäftskundenservicezentrum" -"Calculate Handling Fee","Bearbeitungsgebühr berechnen" -"Canada Standard","Kanada Standard" -"Cannot identify measure unit for %s","Maßeinheit für %s kann nicht identifiziert werden" -"Cannot identify weight unit for %s","Gewichtseinheit für %s kann nicht identifiziert werden." -"Cannot retrieve shipping rates","Versandkosten konnten nicht abgerufen werden." -"Centimeters","Zentimeter" -"Commercial","Kommerziell" -"Configuration","Konfiguration" -"Container","Container" -"Content Type","Art des Inhaltes" -"Customer Packaging","Kundenverpackung" -"Customer Supplied Package","Vom Kunden geliefertes Paket" -"Customer services","Kundenservice" -"DHL","DHL" -"DHL (Deprecated)","DHL (veraltet)" -"DHL service is not available at %s date","DHL service is not available at %s date" -"Debug","Debug" -"Default Package Height","Standard Verpackungshöhe" -"Default Package Length","Standard Verpackungslänge" -"Default Package Width","Standard Verpackungsbreite" -"Delivered","Zugestellt" -"Delivery Confirmation","Lieferbestätigung" -"Depth","Tiefe" -"Destination Type","Zieltyp" -"Destination facility code is empty","Ziel Einrichtungscode ist leer" -"Development","Entwicklung" -"Direct","Direkt" -"Displayed Error Message","Angezeigte Fehlermeldung" -"Divide Order Weight","Teilen Sie das Bestellgewicht" -"Documents","Dokumente" -"Domestic Shipment Days","Versandtage im Inland" -"Domestic economy select","Auswahl heimische Wirtschaft" -"Domestic express","Inland Express" -"Drop Box","Briefkasten" -"Dropoff","Einwurf" -"Easy shop","Katalog" -"Economy select","Auswahl Wirtschaft" -"Empty response","Leere Rückmeldung" -"Enable Negotiated Rates","Vereinbarte Kosten aktivieren" -"Enabled for Checkout","Fertig zum Checkout" -"Enables/Disables SSL verification of Magento server by UPS.","Aktiviert/Deaktiviert die SSL-Überprüfung des Magneto Servers von UPS." -"Error #%s : %s","Fehler #%s : %s" -"Error #%s : %s (%s)","Fehler #%s: %s (%s)" -"Error #%s: %s","Fehler #%s: %s (%s)" -"Europack","Europack" -"Europe First Priority","Europa Höchste Priorität (Europe First Priority)" -"Exchange rate %s (Base Currency) -> %s not found. DHL method %s skipped","Umtauschkurs %s (Basiswährung) -> %s nicht gefunden. DHL-Methode %s übersprungen" -"Express","Express" -"Express 10:30","Express 10:30" -"Express 10:30 AM","Express bis 10:30 Uhr" -"Express 12:00","Express 12:00" -"Express 9:00","Express 9:00" -"Express Mail","Express-Sendung" -"Express Saturday","Express-Samstagszustellung" -"Express Saver","Express-Saver" -"Express easy","Express easy" -"Express envelope","Express-Umschlag" -"Express worldwide","Express Weltweit" -"Failed to parse xml document: %s","Konnte das XML-Dokument nicht analysieren: %s" -"FedEx","FedEx" -"FedEx 10kg Box","FedEx 10kg Box" -"FedEx 25kg Box","FedEx 25kg Box" -"FedEx Box","FedEx Box" -"FedEx Envelope","FedEx Brief (FedEx Envelope)" -"FedEx Pak","FedEx Paket (FedEx Pak)" -"FedEx Tube","FedEx Röhre (FedEx Tube)" -"First Overnight","Erste Klasse Übernacht-Service (First Overnight)" -"First-Class","Erste Klasse (First-Class)" -"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope" -"First-Class Mail International Letter","First-Class Mail International Letter" -"First-Class Mail International Postcard","First-Class Mail International Postcard" -"First-Class Mail Large Envelope","First-Class Mail Large Envelope" -"First-Class Mail Large Postcards","First-Class Mail Large Postcards" -"First-Class Mail Letter","First-Class Mail Letter" -"First-Class Mail Parcel","First-Class Mail Parcel" -"First-Class Mail Postcards","First-Class Mail Postcards" -"First-Class Package International Service","First-Class Package International Service" -"First-Class Package Service","First-Class Package Service" -"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup" -"Flat","Einheitstarif (Flat)" -"Flat-Rate Box","Flatrate Box" -"Flat-Rate Envelope","Flatrate Envelope" -"Free Method","Kostenloses Mittel" -"Free Shipping with Minimum Order Amount","Kostenloser Versand dank Mindestsumme der Bestellung" -"Freight","Fracht" -"Freight worldwide","Fracht Weltweit" -"Gateway URL","Gateway URL" -"Gateway XML URL","Gateway XML URL" -"Gift","Geschenk" -"Girth","Umfang" -"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)" -"Global Express Guaranteed Document","Global Express Guaranteed Document" -"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular" -"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular" -"Globalmail business","Globalmail Business" -"Ground","Ground" -"Ground Commercial","Ground Commercial" -"Ground Residential","Ground Commercial" -"Handling Applied","Hinzugefügte Bearbeitungsgebühren" -"Handling Fee","Bearbeitungsgebühren" -"Height","Höhe" -"Height, width and length should be equal or greater than %s","Höhe, Breite und Tiefe sollten gleich oder größer als %s sein" -"Home Delivery","Lieferung frei Haus" -"Hub ID","Hub-ID" -"Inches","Zoll" -"Indirect","Indirekt" -"International Economy","International Economy" -"International Express","International Express" -"International First","International Erste Klasse (International First)" -"International Ground","International Landweg" -"International Priority","International Priorität (International Priority)" -"International Shipment Days","International Versandtage" -"Intl Economy Freight","International Economy Fracht" -"Intl Priority Freight","International Priority Fracht" -"Jetline","Jetline" -"Jumbo box","Jumbo Box" -"Key","Schlüssel" -"Kilograms","Kilogramm" -"Large","Groß" -"Large Express Box","Große Expressbox" -"Length","Länge" -"Letter","Brief" -"Library","Sammlung" -"Library Mail","Library Mail" -"Live","Live" -"Machinable","Maschinell bearbeitbar" -"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Höchstgewicht pro Sendung (Bitte fragen Sie Ihren Versanddienstleister nach dem Höchstgewicht der Sendung.)" -"Media Mail","Media Mail" -"Medical express","Medikamente Express" -"Medium Express Box","Mittlere Expressbox" -"Merchandise","Trikots" -"Meter Number","Anzahl Meter" -"Minimum Order Amount for Free Shipping","Mindestbestellmenge für kostenlosen Versand." -"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","Mindestgewicht der Verpackung (bitte wenden Sie sich an Ihren Frachtführer, um das zulässige Mindestgewicht der Verpackung zu erfragen)" -"Mode","Modus" -"National Freight","Nationale Fracht" -"Next Afternoon","Am nächsten Nachmittag" -"Next Day Air","Am nächsten Tag per Luftpost" -"Next Day Air Early AM","Am nächsten Tag per Luftpost am frühen Vormittag" -"Next Day Air Early AM Letter","Am nächsten Tag per Luftbrief am frühen Vormittag" -"Next Day Air Intra (Puerto Rico)","Am nächsten Tag per Inlands-Luftpost (Puerto Rico)" -"Next Day Air Letter","Am nächsten Tag per Luftbrief" -"Next Day Air Saver","Am nächsten Tag per Air Saver" -"Next Day Air Saver Letter","Am nächsten Tag per Air Saver Brief" -"No","Nein" -"No packages for request","Keine Sendungen angefordert" -"Non Documents","Keine Dokumente" -"Non documents","Keine Dokumente" -"Non-rectangular","Nicht rechteckig" -"None","Keins" -"Not Required","Nicht erforderlich" -"Order","Bestellung" -"Order #%s","Bestellung #%s" -"Origin of the Shipment","Herkunftsort der Sendung" -"Origin serviceAreaCode is missing","Ursprungsservice AreaCode fehlt" -"Other","Sonstige" -"Others","Anderes" -"PAK","PAK" -"Package","Verpackung" -"Package Description","Beschreibung der Verpackung" -"Package content is missing","Paketinhalte fehlen" -"Packages Request Type","Pakete-Anforderungstyp" -"Packaging","Verpackungsmaterial" -"Pallet","Strohsack" -"Parcel","Paket" -"Parcel Post","Paketpost" -"Password","Passwort" -"Pickup Method","Abholmethode" -"Piece Id barcode is missing","Stück ID Barcode fehlt" -"Piece number information is missing","Information zur Stückzahl fehlt" -"Please make sure to use only digits here. No dashes are allowed.","Bitte geben Sie hier nur Ziffern ein. Striche sind unzulässig." -"Please, specify origin country","Bitte geben Sie das Herkunftsland an" -"Pounds","Pfund" -"Priority Mail","Eilpost" -"Priority Mail Express","Priority Mail Express" -"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes" -"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup" -"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope" -"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup" -"Priority Mail Express International","Priority Mail Express International" -"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes" -"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope" -"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope" -"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope" -"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope" -"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope" -"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery" -"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes" -"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope" -"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope" -"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope" -"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope" -"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup" -"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope" -"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup" -"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup" -"Priority Mail International","Priority Mail International" -"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box" -"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope" -"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope" -"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box" -"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box" -"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope" -"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box" -"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope" -"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box" -"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope" -"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope" -"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box" -"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup" -"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope" -"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup" -"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box" -"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup" -"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope" -"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup" -"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A" -"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup" -"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B" -"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup" -"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C" -"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup" -"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box" -"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup" -"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope" -"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup" -"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope" -"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup" -"Priority Overnight","Eilpost Übernacht" -"Product content code is invalid","Produkt-Inhaltscode ist ungültig" -"Product name is missing","Produktname fehlt" -"Receiver","Empfänger" -"Rectangular","Rechteckig" -"Reference code is missing","Der Referenzcode fehlt" -"Regular","Regulär" -"Regular Pickup","Reguläre Abholung" -"Request Courier","Kurier anfordern" -"Required","Erforderlich" -"Required for negotiated rates; 6-character UPS.","Für vereinbarte Raten erforderlich; 6-Buchstaben UPS" -"Residential","Stationär" -"Residential Delivery","Lieferung an den stationären Wohnsitz" -"Response is in the wrong format","Antwort im falschen Format" -"Return","Retoure / Rücksendung" -"Round","Rund" -"Routing barcode is missing","Routen-Barcode fehlt" -"Same day","Am selben Tag" -"Sample","Beispiel" -"Sandbox Mode","Sandkasten-Modus" -"Second Day Service","Lieferung am zweiten Tag" -"Secure Gateway URL","Sichere Eingangs-URL" -"Secureline","Secureline" -"Sender","Absender" -"Sender city info is missing","Stadtinformation Absender fehlt" -"Sender contact name is missing","Kontaktname Absender fehlt" -"Sender country info is missing","Information Absenderland fehlt" -"Service type does not match","Service-Typ stimmt nicht überein" -"Ship to Applicable Countries","Versand in zutreffende Länder" -"Ship to Specific Countries","Versand in angegebene Länder" -"Shipment Contains Hazardous Materials","Sendung enthält gefährliche Substanzen" -"Shipment Dutiable","Sendung zollpflichtig" -"Shipment Duty Payment Type","Versand Zoll Zahlungstyp" -"Shipment Type","Versandtyp" -"Shipment is not available.","Versand nicht verfügbar." -"Shipment picked up","Sendung abgeholt" -"Shipper Number","Nummer des Spediteurs" -"Shipping Accept XML URL","Versand XML URL akzeptieren" -"Shipping Confirm XML URL","Versand XML URL bestätigen" -"Shipping Key","Sendungsnummer" -"Shipping Key (International)","Sendungsnummer (International)" -"Show Method if Not Applicable","Wenn nicht anwendbar, Verfahren anzeigen" -"Signature Required","Unterschrift erforderlich" -"Size","Grösse" -"Small Express Box","Kleine Express Box" -"Smart Post","Smart Post" -"Sort Order","Sortierreihenfolge" -"Specific","Spezifik" -"Sprintline","Sprintline" -"Standard Overnight","Standard über Nacht" -"Standard Post","Standard-Postversand" -"Station","Station" -"Subtotal","Zwischensumme" -"Subtotal With Discount","Zwischensumme mit Preisnachlass" -"The field is applicable if the Smart Post method is selected.","Dieses Feld ist anwendbar, wenn die Smart-Post-Methode gewählt wird." -"The response is in wrong format.","Die Antwort hat ein falsches Format" -"There is no available method for selected shipping address.","Für die ausgewählte Methode ist keine Versandadresse verfügbar" -"There is no items in this order","Es gibt keine Artikel in dieser Bestellung" -"Third Party","Dritte Person" -"Title","Titel" -"To Lower","herabsetzen" -"To Upper","hochsetzen" -"Tracking XML URL","Nachverfolgung XML URL" -"UPS","UPS" -"UPS Expedited","UPS Expeditiert" -"UPS Express","UPS Express" -"UPS Express Box","UPS Express Box" -"UPS Express Early A.M.","UPS Express in der Frühe" -"UPS Express Plus","USP Express Plus" -"UPS Ground","UPS Boden" -"UPS Letter Envelope","UPS Briefumschlag" -"UPS Next Day Air","UPS Luftfracht am Folgetag" -"UPS Next Day Air Early A.M.","UPS Luftfracht am frühen Morgen des nächsten Tages" -"UPS Next Day Air Saver","UPS Luftfracht Absicherung am Folgetag" -"UPS Saver","UPS Absicherung" -"UPS Second Day Air","UPS Luftfracht am zweiten Tag" -"UPS Second Day Air A.M.","UPS Luftfracht am zweiten Tag Früh" -"UPS Standard","UPS Standard" -"UPS Three-Day Select","UPS Drei Tage Auswahl" -"UPS Today Dedicated Courrier","UPS Heute bestimmter Courrier" -"UPS Today Express","UPS Heute Epress" -"UPS Today Express Saver","UPS Heute Express Absicherung" -"UPS Today Intercity","UPS Heute Intercity" -"UPS Today Standard","UPS Heute Standard" -"UPS Tube","UPS Untergrundbahn" -"UPS Type","UPS Typ" -"UPS Worldwide 10 kilo","UPS Weltweit 10 Kilogramm" -"UPS Worldwide 25 kilo","UPS Weltweit 25 Kilogramm" -"UPS Worldwide Expedited","UPS Weltweit Epeditiert" -"UPS Worldwide Express","UPS Weltweit Express" -"UPS Worldwide Express Plus","UPS Weltweit Express Plus" -"UPS Worldwide Express PlusSM","UPS Weltweit Express PlusSM" -"UPS Worldwide Saver","UPS Weltweit Spar" -"USPS","USPS" -"USPS GXG Envelopes","USPS GXG Envelopes" -"Unable to retrieve tracking","Nachverfolgung kann nicht abgerufen werden" -"United Parcel Service","United Parcel Service" -"United Parcel Service XML","United Parcel Service XML" -"Unknown error","Unbekannter Fehler" -"Used only when ""Additional Protection Value"" is set to ""Configuration"". Can contain only numeric amount.","Nur wenn ""Wert des zusätzlichen Schutzes"" auf ""Konfigurieren"" eingestellt ist. Darf nur Zahlenwert enthalten." -"User ID","Benutzerkennung" -"Variable","Variable" -"Waybill barcode information is missing","Frachtbrief Barcodeinformation fehlt" -"Weight Unit","Gewichtseinheit" -"Weight unit is invalid","Gewichtseinheit ist ungültig" -"Width","Breite" -"Worldwide Expedited","Weltweit Expediert" -"Worldwide Express","Weltweit Express" -"Worldwide Express Letter","Weltweit Expressbrief" -"Worldwide Express Plus","Weltweit Express Plus" -"Worldwide Express Plus Letter","Weltweit Express Plus Brief" -"Worldwide Express Saver","Weltweit Express Absicherung" -"Wrong Content Type.","Falscher Inhaltstyp." -"Wrong Region.","Falsche Region." -"Yes","Ja" -"Your Packaging","Ihre Verpackung" -"Zero shipping charge for '%s'","Null Versandkosten für '%s'" -"cm","cm" -"inch","Inch" diff --git a/app/locale/de_DE/Mage_Weee.csv b/app/locale/de_DE/Mage_Weee.csv deleted file mode 100644 index e61f3f0c7..000000000 --- a/app/locale/de_DE/Mage_Weee.csv +++ /dev/null @@ -1,25 +0,0 @@ -"All Websites","Alle Webseiten" -"Apply Discounts To FPT","Rabatte auf FPT anwenden" -"Apply Tax To FPT","Steuer auf FPT anwenden" -"Display Prices In Emails","Preise in E-Mails anzeigen" -"Display Prices In Product Lists","Preise in Produktlisten anzeigen" -"Display Prices In Sales Modules","Preise in Verkaufsmdulen anzeigen" -"Display Prices On Product View Page","Preise auf der Produktansichtseite anzeigen" -"Enable FPT","FPT aktivieren" -"Excluding FPT","Ausschließlich FPT" -"Excluding FPT, FPT description, final price","Ausschließlich FPT, FPT-Beschreibung, Endpreis" -"FPT Tax Configuration","Steuer-Konfiguration für Festpreis-Offerten" -"Fixed Product Tax","Feste Produktsteuer" -"Fixed Product Taxes","Feste Produktsteuern" -"Include FPT In Subtotal","FPT in Zwischensumme einschließen" -"Including FPT and FPT description","Einschließlich FPT und FPT-Beschreibung" -"Including FPT and FPT description [incl. FPT VAT]","Einschließlich FPT und FPT-Beschreibung [inkl. FPT-MwSt]" -"Including FPT only","Lediglich einschließlich FPT" -"Loaded and Displayed with Tax","Geladen und mit Steuer angezeigt" -"Not Taxed","Nicht besteuert" -"Taxed","Besteuert" -"Total","Gesamtbetrag" -"Total Incl. Tax","Gesamtbetrag inkl. Steuer" -"Total excl. tax","Gesamtbetrag exkl. Steuern" -"Total incl. tax","Gesamtbetrag inkl. Mehrwertsteuer" -"Total:","Gesamt:" diff --git a/app/locale/de_DE/Mage_Widget.csv b/app/locale/de_DE/Mage_Widget.csv deleted file mode 100644 index 1a98688fc..000000000 --- a/app/locale/de_DE/Mage_Widget.csv +++ /dev/null @@ -1,75 +0,0 @@ -"%s","%s" -"-- Please Select --","-- Bitte auswählen --" -"Actions","Aktionen" -"Add Layout Update","Layout-Update hinzufügen" -"Add New Widget Instance","Neue Widget-Instanz hinzufügen" -"All","Alle" -"All Pages","Alle Seiten" -"All Product Types","Alle Produkttypen" -"An error occurred during saving a widget: %s","Ein Fehler ist beim Speichern eines Widgets aufgetreten: %s." -"Anchor Categories","Grundkategorien" -"Apply","Anwenden" -"Assign to Store Views","Zu Shopansichten zuweisen" -"Big Image","Größeres Bild" -"Block Reference","Blockreferenz" -"CMS","CMS" -"Categories","Kategorien" -"Choose...","Auswählen..." -"Close","Schließen" -"Continue","Fortsetzen" -"Default Template","Standardvorlage" -"Delete","Löschen" -"Design Package/Theme","Design-Paket/Theme" -"Export to:","Exportieren nach:" -"Frontend Properties","Oberflächeneigenschaften" -"Generic Pages","Generische Seiten" -"Images","Bilder" -"Insert Widget","Widgt einfügen" -"Insert Widget...","Widget einfügen..." -"Layout Updates","Layout-Updates" -"Manage Widget Instances","Widget-Instanzen verwalten" -"New Instance","Neue Instanz" -"New Widget Instance","Neue Widget-Instanz" -"Next page","Nächste Seite" -"Non-Anchor Categories","nicht grundlegende Kategorien" -"Not Selected","Nicht ausgewählt" -"Open Chooser","Chooser öffnen (Auswählfunktion öffnen)" -"Page","Seite" -"Please Select Block Reference First","Bitte erst Blockreferenz auswählen" -"Previous page","Vorhergehende Seite" -"Products","Produkte" -"Remove Layout Update","Layout-Update entfernen" -"Save and Continue Edit","Speichern und Bearbeitung fortsetzen" -"Select All","Alle auswählen" -"Select Visible","Sichtbare auswählen" -"Settings","Einstellungen" -"Sort Order","Sortierreihenfolge" -"Sort Order of widget instances in the same block reference","Sortierreihenfolge der Widget-Instanzen in der gleichen Blockreferenz" -"Specific %s","Spezifische %s" -"Specified Page","Bestimmte Seite" -"Template","Vorlage" -"The information in this tab has been changed.","Die Informationen in diesem Tab wurden geändert." -"The widget instance has been deleted.","Die Widget-Instanz wurde gelöscht." -"The widget instance has been saved.","Die Widget-Instanz wurde gespeichert." -"This tab contains invalid data. Please solve the problem before saving.","Der Tab enthält ungültige Daten. Bitte das Problem vor dem Speichern beheben." -"Thumbnail","Miniaturansicht" -"Total %d records found","Gesamtzahl von %d Einträgen gefunden" -"Type","Typ" -"Unselect All","Alle abwählen" -"Unselect Visible","Sichtbare abwählen" -"View","Anzeigen" -"Widget","Widget" -"Widget ""%s""","Grafikobjekt ""%s"" " -"Widget ID","Widget-ID" -"Widget Insertion","Widget-Einbindung" -"Widget Instance","Widget-Instanz" -"Widget Instance Title","Widget-Instanz-Titel" -"Widget Options","Widget-Optionen" -"Widget Type","Widget-Typ" -"Widget Type is not specified","Widget-Typ nicht festgelegt" -"Widget instance is not full complete to create.","Widget-Instanz nicht zur Erstellung vollständig." -"Widgets","Widgets" -"Wrong widget instance specified.","Falsche Widget Instanz angegeben." -"items selected","Objekte ausgewählt" -"of %s pages","von %s Seiten" -"per page","pro Seite" diff --git a/app/locale/de_DE/Mage_Wishlist.csv b/app/locale/de_DE/Mage_Wishlist.csv deleted file mode 100644 index d0b798241..000000000 --- a/app/locale/de_DE/Mage_Wishlist.csv +++ /dev/null @@ -1,100 +0,0 @@ -"%1$s has been updated in your wishlist.","%1$s wurde in Ihrer Wunschliste aktualisiert." -"%d product(s) have been added to shopping cart: %s.","%d Produkt(e) wurden zum Warenkorb hinzugefügt: %s." -"%s for ""%s"".","%s für ""%s""." -"%s has been moved to wishlist %s","%s befindet sich nun auf der Wunschliste %s." -"%s's Wishlist","%ss Wunschzettel" -"* Required Fields","* Notwendige Felder" -"Add All to Cart","Alle zum Warenkorb hinzufügen" -"Add to Cart","Zum Warenkobrn hinzufügen" -"Add to Compare","Zum Vergleich hinzufügen" -"Add to Wishlist","Zum Wunschzettel hinzufügen" -"Added From","Hinzugefügt von" -"An error occurred while adding item to wishlist.","Ein Fehler trat auf beim Hinzufügen des Objekts zum Wunschzettel." -"An error occurred while adding item to wishlist: %s","Ein Fehler trat auf beim Hinzufügen des Objekts zum Wunschzettel: %s" -"An error occurred while deleting the item from wishlist.","Ein Fehler trat auf beim Löschen des Objekts vom Wunschzettel." -"An error occurred while deleting the item from wishlist: %s","Ein Fehler trat auf beim Löschen des Objekts vom Wunschzettel: %s" -"An error occurred while updating wishlist.","Beim Aktualisieren der Wunschliste ist ein Fehler aufgetreten." -"Are you sure you want to remove this product from your wishlist?","Sind Sie sicher, dass Sie dieses Produkt von Ihrem Wunschzettel entfernen möchten?" -"Are you sure you would like to remove this item from the wishlist?","Sind Sie sicher, dass Sie dieses Objekt von Ihrem Wunschzettel entfernen möchten?" -"Back","Zurück" -"Can\'t delete item from wishlist","Artikel kann nicht aus Wunschliste gelöscht werden" -"Can\'t save description %s","Kann Beschreibung nicht sichern %s" -"Can\'t update wishlist","Kann Wunschzettel nicht aktualisieren" -"Cannot add item to shopping cart","Kann Objekt nicht zum Warenkorb hinzufügen" -"Cannot add the following product(s) to shopping cart: %s.","Der Warenkorb kann nicht um das/die folgende(n) Produkt(e) erweitert werden: %s." -"Cannot add the item to shopping cart.","Kann das Objekt nicht zum Warenkorb hinzufügen." -"Cannot configure product","Produkt kann nicht konfiguriert werden" -"Cannot load wishlist item","Artikel aus Wunschliste kann nicht geladen werden" -"Cannot move item to wishlist","Artikel kann nicht auf die Wunschliste gesetzt werden." -"Cannot specify product.","Kann Produkt nicht bestimmen." -"Cannot specify wishlist item.","Artikel aus Wunschliste kann nicht spezifiziert werden." -"Cannot specify wishlist.","Kann Wunschzettel nicht bestimmen." -"Cannot update wishlist","Kann Wunschzettel nicht aktualisieren" -"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Dieses Kästchen aktivieren, wenn Sie einen RSS-Feed-Link zu Ihrem Wunschzettel hinzufügen möchten." -"Click for price","Klicken für den Preis" -"Comment","Kommentar" -"Comment:","Kommentar" -"Configure Wishlist Item","Wunschlistenartikel konfigurieren" -"Configured Price:","Konfigurierter Preis:" -"Could not find such wishlist","Eine derartige Wunschliste konnte nicht aufgefunden werden." -"Could not find wishlist","Wunschliste konnte nicht aufgefunden werden." -"Customer My Account My Wishlist","Kunde Mein Konto Mein Wunschzettel" -"Customer My Account Wishlist Sharing Form","Kunde Mein Konto Wunschzettel Sharing-Formular" -"Customer Shared Wishlist View","Kunde Geteilter Wunschzettel Anzeigen" -"Date Added","Datum hinzugefügt" -"Days in Wishlist","Tage in Wunschliste" -"Display Wishlist Summary","Zusammenfassung der Wunschliste anzeigen" -"Edit","Bearbeiten" -"Email Sender","E-Mail-Absender" -"Email Template","E-Mail-Vorlage" -"Email address can\'t be empty.","E-Mail-Adressfeld darf nicht leer sein." -"Email addresses, separated by commas","E-Mail-Adressen, durch Komma getrennt" -"Enabled","Aktiviert" -"General Options","Allgemeine Optionen" -"Go to Wishlist","Zum Wunschzettel gehen" -"Helper for wishlist options rendering doesn't implement required interface.","Hilfsprogramm für die Darstellung der Wunschlistenoptionen implementiert die erforderliche Schnittstelle nicht." -"In stock","Auf Lager" -"Last Added Items","Zuletzt hinzugefügte Objekte" -"Message","Nachricht" -"My Wishlist","Mein Wunschzettel" -"My Wishlist (%d item)","Mein Wunschzettel (%d Objekt)" -"My Wishlist (%d items)","Mein Wunschzettel (%d Objekte)" -"My Wishlist (%d)","Mein Wunschzettel (%d)" -"My Wishlist Link","Link ""Meine Wunschliste""" -"Options Details","Optionen Details" -"Out of stock","Nicht lieferbar" -"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Bitte geben Sie gültige E-Mail-Adressen ein, durch Komma getrennt, wie z.B. johndoe@domain.com, johnsmith@domain.com." -"Please input a valid email address.","Bitte geben Sie eine gültige E-Mail-Adresse ein." -"Please, enter your comments...","Bitte geben Sie Ihre Kommentare ein..." -"Price","Preis" -"Product","Produkt" -"Product Details and Comment","Produktangaben und Kommentare" -"Product(s) %s have required options. Each of them can be added to cart separately only.","Produkt(e) %s haben notwendige Optionen. Jedes kann nur einzeln zum Warenkob hinzugefügt werden." -"Product(s) %s have required options. Each product can only be added individually.","Produkt(e) %s verfügt/en über die gewünschten Optionen. Jedes Produkt kann nur einzeln hinzugefügt werden." -"Quantity","Menge" -"RSS Feed","RSS-Feed" -"RSS link to %s's wishlist","RSS-Link zu %ss Wunschzettel" -"Remove Item","Objekt entfernen" -"Remove This Item","Dieses Objekt entfernen" -"Remove item","Artikel löschen" -"Requested cart item doesn't exist","Der gewünschte Warenkorbartikel existiert nicht." -"Requested wishlist doesn't exist","Die gewünschte Wunschliste existiert nicht." -"Share Options","Optionen teilen" -"Share Wishlist","Wunschzettel teilen" -"Share Your Wishlist","Ihren Wunschzettel teilen" -"Sharing Information","Sharing-Information" -"This Wishlist has no Items","Diese Wunschliste enthält keine Artikel" -"This product(s) is currently out of stock","Diese(s) Produkt(e) ist/sind gerade nicht lieferbar." -"Unable to add the following product(s) to shopping cart: %s.","Das/die folgende(n) Produkt(e) kann/können nicht zum Warenkorb hinzugefügt werden: %s." -"Update Wishlist","Wunschzettel aktualisieren" -"User Description","Benutzerbeschreibung" -"View Details","Details anzeigen" -"View Product","Produkt anzeigen" -"What's this?","Was ist das?" -"Wishlist","Wunschzettel" -"Wishlist Section","Wunschzettelauswahl" -"Wishlist Sharing","Teilen des Wunschzettels" -"Wishlist could not be created.","Wunschliste konnte nicht erstellt werden." -"Wishlist is empty now.","Der Wunschzettel ist jetzt leer." -"You have no items in your wishlist.","Sie haben keine Objekte auf Ihrem Wunschzettel." -"Your Wishlist has been shared.","Ihr Wunschzettel wurde geteilt." diff --git a/app/locale/de_DE/Mage_XmlConnect.csv b/app/locale/de_DE/Mage_XmlConnect.csv deleted file mode 100644 index d607bb099..000000000 --- a/app/locale/de_DE/Mage_XmlConnect.csv +++ /dev/null @@ -1,1200 +0,0 @@ -" But cart has some errors.","Der Einkaufswagen jedoch weist Fehler auf." -" Note: Image size affects the performance of your app."," Note: Image size affects the performance of your app." -"""Description"" is more than %d characters long","""Beschreibung"" überschreitet die erlaubten %d Zeichen" -"""Title"" is more than %d characters long","""Titel"" überschreitet die erlaubten %d Zeichen" -"""id"" attribute is required for a ""%s"" field.","Das ""id""-Attribut ist erforderlich für ein ""%s""-Feld." -"""line_count"" attribute is required for ""multiline"" element.","Das ""line_count""-Attribut ist erforderlich für ein ""multiline""-Element." -"""message"" attribute is required for ""%s"" validator rule.","Das ""message""-Attribut ist erforderlich für die ""%s""-Bestätigungsregel." -"%1$s has been added to your wishlist.","%1$s wurde auf Ihren Wunschzettel geschrieben." -"%1$s incl tax.","%1$s inkl. MwSt." -"%@ is not correct","%@ is not correct" -"%s API Key required.","%s API-Key benötigt." -"%s Application ID required.","%s Anwendungsidentifikation benötigt." -"%s Secret Key required.","%s Geheimschlüssel benötigt." -"%s attribute is required.","Das Attribut %s ist erforderlich." -"%s fields is required","%s fields is required" -"%s has been added to your cart.","%s wurde in Ihren Einkaufswagen gelegt." -"%s id:","%s id:" -"%s was updated in your shopping cart.","%s was updated in your shopping cart." -"(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)","(Dazu gehören weitere Ländern außer den genannten. Als Eigentümer der Anwendung sind sie für die Einhaltung der Rechtsvorschriften ihres Landes hinsichtlich der Verbreitung oder dem Verkauf ihrer Anwendung in jeweiligem Land, einschließlich ihrem Heimatland, selbst verantwortlich.)" -"* - field is required","* - field is required" -"*Subject to change","*Änderung vorbehalten" -"1. Please select type of the action:","1. Please select type of the action:" -"10:40 AM","10:40 Uhr" -"2. Please select a page","2. Please select a page" -"2. Type Category Name","2. Type Category Name" -"2. Type Product Name","2. Type Product Name" -"80px x 80px","80px x 80px" -"80x80 px","80x80 px" -"Login to Urabn Airship.","Bei Urban Airship anmelden." -"Login to Urban Airship.","Login to Urban Airship." -"A Catalog Only App will not support functions such as add to cart, add to wishlist, or login.","Eine Catalog Only App unterstützt Funktionen wie Zum Warenkorb Hinzufügen, Auf den Wunschzettel oder Login nicht." -"A new password has been sent.","Ein neues Passwort wurde gesendet." -"About","About" -"Access forbidden","Access forbidden" -"Account","Konto" -"Account Information","Account Information" -"Account Settings","Account Settings" -"Account confirmation is required. Please check your email for the confirmation link.","Kontoinformation benötigt. Überprüfen Sie bitte für den Bestätigungslink Ihren Posteingang." -"Account information has been saved.","Kontoinformation wurde gespeichert." -"Action","Aktion" -"Action type does\'t recognized","Action type does\'t recognized" -"Action type does\'t recognized.","Action type does\'t recognized." -"Action type doesn\'t recognized.","Action type doesn\'t recognized." -"Activate","Aktivieren" -"Activate PayPal Checkout","PayPal Checkout aktivieren" -"Activate PayPal MECL","PayPal-MECL aktivieren" -"Activation Key","Aktivierungsschlüssel" -"Add","Add" -"Add Action","Add Action" -"Add Address from Contacts","Add Address from Contacts" -"Add App","Neue App" -"Add Custom","Add Custom" -"Add New Address","Add New Address" -"Add New Template","Neue Vorlage" -"Add Page","Neue Seite" -"Add To Wishlist","Add To Wishlist" -"Add a billing address","Add a billing address" -"Add a shipping address","Add a shipping address" -"Add to Cart","Zum Warenkorb hinzufügen" -"Add to Wishlist","Zur Wunschliste hinzufügen" -"Adding Product to Cart...","Adding Product to Cart..." -"Adding Product to WishList...","Adding Product to WishList..." -"Additional Address","Zusätzliche Anschrift" -"Additional Info","Additional Info" -"Address","Adresse" -"Address 2","Anschrift 2" -"Address Book","Address Book" -"Address Book Updated","Address Book Updated" -"Address Info","Address Info" -"Address book is empty","Address book is empty" -"Address data not specified.","Keine Anschriftsdaten angegeben." -"Address does not belong to this customer.","Die Anschrift gehört nicht zu diesem Kunden." -"Address has been deleted.","Anschrift wurde gelöscht." -"Address has been saved.","Anschrift wurde gespeichert." -"Admin Application Settings","Admin Application Settings" -"Admin Mobile Application","Admin Mobile Application" -"Admin application has not been enabled","Admin application has not been enabled" -"Administrative contact for this app and for app submission issues.","Administrativer Ansprechpartner für diese App und für Probleme mit dem App-Angebot." -"Advanced Settings","Erweiterte Einstellungen" -"After submitting the App to Magento, please contact %1$s to receive the Application Key, Application Secret and Application Master Secret.","Nachdem Sie die App zu Magento gesendet haben, kontaktieren Sie bitte %1$s, um Ihren Anwendungsschlüssel, den Geheimcode und den Mastergeheimcode zu erhalten." -"AirMail Message Queue","AirMail Nachrichtenschlange" -"AirMail Messages Queue","AirMail Nachrichtenschlange" -"AirMail Template Preview","AirMail Template Vorschau" -"AirMail message","AirMail Nachricht" -"AirMail templates","AirMail Vorlagen" -"All Allowed Countries","Alle zugelassenen Länder" -"All Images","All Images" -"All locations","Alle Orte" -"Amount","Amount" -"Amount in %@","Amount in %@" -"Amounts","Amounts" -"An account with this email address already exists.","Ein Account mit dieser E-Mail Adresse ist bereits vorhanden." -"An error occurred while adding item to wishlist.","Beim Hinzufügen dieses Artikels zur Wunschliste ist ein Fehler aufgetreten." -"An error occurred while deleting the address.","Beim Löschen der Anschrift ist ein Fehler aufgetreten." -"An error occurred while loading categories.","Beim Laden der Kategorien ist ein Fehler aufgetreten." -"An error occurred while loading category filters.","Beim Laden der Kategoriefilter ist ein Fehler aufgetreten." -"An error occurred while loading configuration.","An error occurred while loading configuration." -"An error occurred while loading localization.","An error occurred while loading localization." -"An error occurred while loading login form.","An error occurred while loading login form." -"An error occurred while loading wishlist.","Beim Laden der Wunschliste ist ein Fehler aufgetreten." -"An error occurred while processing your order. Please contact us or try again later.","Beim Bearbeiten Ihrer Bestellung ist ein Fehler aufgetreten. Bitte kontaktieren Sie uns oder versuchen Sie es später noch einmal." -"An error occurred while processing your request.","Bei der Bearbeitung Ihrer Anfrage ist ein Fehler aufgetreten." -"An error occurred while removing item from wishlist.","Beim Löschen des Artikels von der Wunschliste ist ein Fehler aufgetreten." -"An error occurred while removing items from wishlist.","Beim Löschen der Artikel aus der Wunschliste ist ein Fehler aufgetreten." -"Analytics","Analytik" -"Android","Android" -"Android doesn\'t support AirMail message type.","Der AirMail-Nachrichtentyp wird von Android nicht unterstützt." -"App Background","App Hintergrund" -"App Background (landscape mode)","App Background (landscape mode)" -"App Background (landscape mode).","App Hintergrund (Querformat)." -"App Background (portrait mode)","App Background (portrait mode)" -"App Background (portrait mode).","App Hintergrund (Hochformat)." -"App Background
    (landscape mode)","App Hintergrund
    (Querformat)" -"App Background
    (portrait mode)","App Hintergrund
    (Hochformat)" -"App Background image missing.","App Hintergrundbild fehlt." -"App Code","App Code" -"App Information","App Information" -"App Name","App Name" -"App Stores","App Stores" -"App Submission History","App Einsendungshistorie" -"App Title","App Titel" -"App code","App code" -"App code required.","App Code erforderlich" -"App does not exist.","App existiert nicht." -"App has been deleted.","App wurde gelöscht." -"App has been saved.","App wurde gespeichert." -"App has been submitted.","App wurde abgesendet." -"App model not loaded.","App-Modell nicht geladen." -"App with specified code does not exist.","Eine App mit dem eingegebenen Code existiert nicht." -"Appears in the info section of your app (example: Copyright 2010 – Your Company, Inc.)","Wird im Info-Abschnitt Ihrer App angezeigt (Beispiel: Copyright 2010 - Ihr Unternehmen, Inc.)" -"Application","Anwendung" -"Application Key","Anwendungsschlüssel" -"Application Master Secret","Application Master Secret" -"Application Name","Applikationsname" -"Application Secret","Application Secret" -"Application doesn\'t exist.","Application doesn\'t exist." -"Apply","Apply" -"Applying Coupon Code","Applying Coupon Code" -"Applying Gift Card %@","Applying Gift Card %@" -"Are you sure you want to cancel a message?","Are you sure you want to cancel a message?" -"Are you sure you want to cancel selected records?","Are you sure you want to cancel selected records?" -"Are you sure you want to delete a message?","Are you sure you want to delete a message?" -"Are you sure you want to delete selected records?","Are you sure you want to delete selected records?" -"Are you sure you want to delete this theme? This change will affect all applications.","Sind Sie sicher, dass Sie dieses Design löschen möchten? Diese Änderung wird alle Anwendungen betreffen." -"Are you sure you want to do this?","Sind Sie sicher, dass Sie dies tun möchten?" -"Are you sure you want to remove this item?","Are you sure you want to remove this item?" -"Are you sure you whant to cancel a message?","Sind Sie sicher, dass Sie die Nachricht abbrechen möchten?" -"Are you sure you whant to delete a message?","Sind Sie sicher, dass Sie die Nachricht löschen möchten?" -"Are you sure you what to cancel selected records?","Sind Sie sicher, dass Sie die ausgewählten Einträge löschen möchten?" -"Are you sure you what to delete selected records?","Sind Sie sicher, dass Sie die ausgewählten Einträge löschen möchten?" -"As Low As","As Low As" -"As Low Excl. Tax","As Low Excl. Tax" -"As Low Incl. Tax","As Low Incl. Tax" -"As a Magento customer, Urban Airship is offering you unlimited Push Notifications and Rich Push for $100/year* along with a 60 day free trial.","Als Magento-Kunde bietet Ihnen Urban Airship unbegrenzte Push-Benachrichtigungen an sowie Rich-Push für 100 Dollar pro Jahr* zusammen mit einem 60-tägigen Test." -"As low as","As low as" -"As low as excl. tax","As low as excl. tax" -"As low as incl. tax","As low as incl. tax" -"At last one application has to be created.","Es muss zumindest eine Anwendung erstellt werden." -"At least one option should be selected","At least one option should be selected" -"Authentication complete.","Authentifikation abgeschlossen." -"Authentication to %@ did failed...","Authentication to %@ did failed..." -"Average Order Amount","Average Order Amount" -"Average Orders","Average Orders" -"Average Rating","Average Rating" -"Back","Zurück" -"Back to App Edit","Zurück zur App-Bearbeitung" -"Background Color","Hintergrundfarbe" -"Balance","Saldo" -"Balance Change","Saldoänderung" -"Balance History","Saldoverlauf" -"Banner on Home Screen","Banner auf dem Startbildschirm" -"Banner on Home Screen (landscape mode)","Banner on Home Screen (landscape mode)" -"Banner on Home Screen (landscape mode) image missing.","Banner-Bilddatei für den Startbildschirm (Landschaftsmodus) fehlt." -"Banner on Home Screen (portrait mode)","Banner on Home Screen (portrait mode)" -"Banner on Home Screen (portrait mode) image missing.","Banner-Bilddatei für den Startbildschirm (Porträtmodus) fehlt." -"Banner on Home Screen
    (landscape mode)","Banner für Startbildschirm
    (Landschaftsmodus)" -"Banner on Home Screen
    (portrait mode)","Banner für Startbildschirm
    (Porträtmodus)" -"Banner on Home Screen image missing.","Banner für Startbildschirm fehlt." -"Banners on Home Screen","Banners on Home Screen" -"Best Sellers","Best Sellers" -"Billing","Billing" -"Billing Address","Rechnungsadresse" -"Billing address","Billing address" -"Billing address has been set.","Rechnungsadresse wurde festgelegt." -"Bundle Products","Bundle Products" -"Buy %1$s for %2$s","Kaufen Sie %1$s für %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Kaufen Sie %1$s für jeweils %2$s (%3$s inkl. Steuern)" -"Buy %1$s for %2$s each","Kaufen Sie %1$s für jeweils %2$s" -"Buy %1$s with %2$s discount each","Kaufen sie %1$s mit jeweils %2$s Nachlass" -"Buy More & Save","Buy More & Save" -"Buyer country is not allowed by store.","Sie können aus diesem Land nicht einkaufen." -"CMS Page","CMS Page" -"CMS Pages haven\'t been found.","CMS Pages haven\'t been found." -"Cache Lifetime (seconds)","Cache-Lebenszeit (Sekunden)" -"Cache Management","Cache-Verwaltung" -"Can\'t add item to shopping cart.","Artikel kann nicht zum Einkaufswagen hinzugefügt werden." -"Can\'t apply the coupon code.","Couponcode kann nicht verwendet werden." -"Can\'t copy file ""%s"" to ""%s"".","Datei ""%s"" kann nicht nach ""%s"" kopiert werden." -"Can\'t create wishlist.","Wunschzettel kann nicht erstellt werden." -"Can\'t delete ""%s"" theme.","Das Design ""%s"" kann nicht gelöscht werden." -"Can\'t load XML.","XML kann nicht geladen werden." -"Can\'t load admin application settings.","Can\'t load admin application settings." -"Can\'t load application with id ""%s""","Die Anwendung mit der ID ""%s"" kann nicht geladen werden" -"Can\'t load cart info.","Einkaufswagen-Information kann nicht geladen werden." -"Can\'t load cart.","Der Einkaufswagen kann nicht geladen werden." -"Can\'t load customer form.","Kundenformular kann nicht geladen werden." -"Can\'t load default themes.","Die Standard-Designs können nicht geladen werden." -"Can\'t load selected theme. Please check your media folder permissions.","Das ausgewählte Design kann nicht geladen werden. Bitte überprüfen Sie die Zugriffsberechtigung für den Medienordner." -"Can\'t load template with id ""%s""","Can\'t load template with id ""%s""" -"Can\'t open submission form.","Anmeldeformular kann nicht geöffnet werden." -"Can\'t read file ""%s"".","Datei ""%s"" kann nicht gelesen werden." -"Can\'t remove the item.","Artikel kann nicht entfernt werden." -"Can\'t reset theme.","Thema kann nicht zurückgesetzt werden." -"Can\'t save address.","Adresse kann nicht gespeichert werden." -"Can\'t save the customer.","Kunde kann nicht gespeichert werden." -"Can\'t save theme.","Thema kann nicht gespeichert werden." -"Can\'t show configuration.","Konfiguration kann nicht angezeigt werden." -"Can\'t specify product.","Produkt kann nicht spezifiziert werden." -"Can\'t submit application.","Anwendung kann nicht aktiviert werden." -"Can\'t update cart.","Warenkorb kann nicht aktualisiert werden." -"Can\'t write to file ""%s"".","In die Datei ""%s"" kann nicht geschrieben werden." -"Cancel","Abbrechen" -"Canceled","Gelöscht" -"Canceling PayPal ...","Canceling PayPal ..." -"Cancelled","Gelöscht" -"Cannot apply gift card.","Der Geschenkgutschein kann nicht angewandt werden." -"Cannot configure product.","Cannot configure product." -"Cannot load theme ""%s"".","Thema ""%s"" kann nicht geladen werden." -"Cannot redeem Gift Card.","Der Geschenkgutschein kann nicht eingelöst werden." -"Cannot remove gift card.","Der Geschenkgutschein kann nicht gelöscht werden." -"Cannot save theme ""%s"". Incorrect data received","Thema ""%s"" kann nicht gespeichert werden. Falsche Dateneingabe" -"Cannot update the item.","Cannot update the item." -"Card Verification Number","Kreditkartenprüfnummer" -"Card verification number is wrong","Verifizierungsnummer der Karte ist falsch" -"Carrier","Carrier" -"Cart","Einkaufswagen" -"Cart Updated","Cart Updated" -"Cart has been updated.","Warenkorb wurde aktualisiert." -"Cart has some errors.","Warenkorb enthält einige Fehler." -"Cart is empty.","Warenkorb ist leer." -"Catalog Only App?","Nur Katalog-App?" -"Category","Category" -"Category Button Color","Farbe des Kategoriebuttons" -"Category Item Background Color","Hintergrundfarbe des Kategorieartikels" -"Cc:","Cc:" -"Chairs","Stühle" -"Change Orientation","Ausrichtung ändern" -"Change Password","Passwort ändern" -"Changes have been saved to theme.","Änderungen zum Thema wurden gespeichert." -"Check","Check" -"Check Gift Card","Check Gift Card" -"Check Gift Card Promo Redeemed","Check Gift Card Promo Redeemed" -"Checking Gift Card %@","Checking Gift Card %@" -"Checkout","Checkout" -"Checkout Page Registration","Checkout Page Registration" -"Checkout as Guest","Checkout as Guest" -"Checkout as Guest or Register","Checkout as Guest or Register" -"Checkout has been initialized.","Zahlungsvorgang wurde eingeleitet." -"Checkout initialization...","Checkout initialization..." -"Checkout initialized!","Checkout initialized!" -"Choose Store View","Choose Store View" -"Choose amount","Choose amount" -"Choose file","Choose file" -"City","Stadt" -"Clear","Clear" -"Close","Close" -"Color Themes","Farbschemata" -"Colors","Farben" -"Commiting updates...","Commiting updates..." -"Company","Unternehmen" -"Completed","Fertiggestellt" -"Configuration data have been saved","Configuration data have been saved" -"Configure Cart Item","Configure Cart Item" -"Confirm New Password","Neues Passwort bestätigen" -"Confirm Password","Passwort bestätigen" -"Connecting","Connecting" -"Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate.","Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate." -"Contact Email","Kontakt-E-Mail-Adresse" -"Contact Information","Kontaktinformationen" -"ContactsAreEmpty","ContactsAreEmpty" -"Container is not defined.","Der Container ist nicht definiert." -"Content","Inhalt" -"Continue","Continue" -"Copyright","Copyright" -"Copyright Page Logo","Logo auf der Copyright-Seite" -"Copyright Page Logo (iPhone 4 retina)","Copyright Page Logo (iPhone 4 retina)" -"Copyright Page Logo
    (iPhone 4 retina)","Logo auf der Copyright-Seite
    (iPhone 4 Retina)" -"Copyright: Magento (c) 2010","Copyright: Magento (c) 2010" -"Countries","Countries" -"Countries Payment Applicable From","Länder Woher Zahlung Möglich" -"Country","Land" -"Country options don\'t recognized for ""%s"".","Länderoptionen nicht erkannt für ""%s""." -"Coupon code %s is not valid.","Couponcode %s ist nicht gültig." -"Coupon code %s was applied.","Couponcode %s wurde hinzugefügt." -"Coupon code is empty.","Gutscheincode ist leer." -"Coupon code was canceled.","Gutscheincode wurde annuliert." -"Create Account","Create Account" -"Create an Account","Create an Account" -"Creating a Template is allowed only for applications which have device type iPhone.","Das Erstellen einer Vorlage ist nur für Anwendungen mit dem Gerätetyp iPhone erlaubt." -"Credit Card","Kreditkarte" -"Credit Card %s","Kreditkarten" -"Credit Card Number","Kreditkartennummer" -"Credit Card Type","Kreditkartentyp" -"Credit card number does not match credit card type.","Kreditkartennummer entspricht nicht dem Kreditkartentyp." -"Cross Sells","Cross Sells" -"Current Balance: %s","Aktuelles Saldo: %s" -"Current Password","Derzeitiges Passwort" -"Currently, PayPal MEP is not available for the Android application","Im Augenblick ist PayPal MEP nicht für die Android-Anwendung verfügbar" -"Currently, the system does not support the viewing of the order detail.","Currently, the system does not support the viewing of the order detail." -"Custom App Icon","Benutzerspezifisches App-Symbol" -"Custom App Icon (iPhone 4 retina)","Custom App Icon (iPhone 4 retina)" -"Custom App Icon
    (iPhone 4 retina)","Benutzerspezifisches App-Symbol
    (iPhone 4 retina)" -"Custom Colors","Benutzerdefinierte Farben" -"Custom amount","Custom amount" -"Customer","Customer" -"Customer Name","Customer Name" -"Customer authentication problem.","Problem bei der Benutzerauthentifizierung." -"Customer balance available in enterprise version of Magento only.","Das Kundensaldo ist nur in der Enterprise-Version von Magento verfügbar." -"Customer balance is disabled for current store","Das Kundensaldo ist für den aktuellen Shop deaktiviert." -"Customer email not specified.","Keine E-Mail-Adresse des Benutzers festgelegt." -"Customer logout problem.","Abmeldeproblem des Benutzers." -"Customer not logged in.","Benutzer nicht angemeldet." -"Customers","Customers" -"DD","TT" -"Date","Datum" -"Date Created","Erstellungsdatum" -"Date Submitted","Abschickdatum" -"Date Updated","Aktualisierungsdatum" -"Date:","Date:" -"Day","Tag" -"Deeper Messaging and Engagement with Rich Push.","Tieferes Nachrichten-Schreiben und Engagement mit Rich Push." -"Default Billing Address","Standardrechnungsadresse" -"Default Shipping Address","Standardlieferungsadresse" -"Default Theme","Standardthema" -"Default themes are missed.","Default themes are missed." -"Delete","Löschen" -"Delete Action","Delete Action" -"Delete theme","Theme entfernen" -"Deleted","Gelöscht" -"Description","Beschreibung" -"Description that appears in Android Market. %s chars maximum. ","Beschreibung, die im Android Market erscheint. %s Zeichen-Maximum." -"Description that appears in the iTunes App Store. %s chars maximum. ","Beschreibung, wie sie im iTUnes App Store erscheint. Maximal %s Zeichen." -"Deselect All","Alle abwählen" -"Design","Design" -"Device","Gerät" -"Device Information","Geräteangaben" -"Device Type","Geräteart" -"Device doesn\'t recognized","Device doesn\'t recognized" -"Device doesn\'t recognized. Unable to load a template.","Gerät wird nicht erkannt. Vorlage kann nicht geladen werden." -"Device doesn\'t recognized: ""%s"". Unable to load a helper.","Gerät wird nicht erkannt: ""%s"". Hilfe kann nicht geladen werden." -"Device doesn\'t recognized: ""%s"". Unable to load preview model.","Gerät wird nicht erkannt: ""%s"". Vorschaumodell kann nicht geladen werden." -"Device type doesn\'t recognized.","Device type doesn\'t recognized." -"Discount code is empty","Discount code is empty" -"Discount:","Discount:" -"Done","Done" -"Downloadable Products Updated","Downloadable Products Updated" -"Downloads limit:","Downloads limit:" -"E-mail","E-mail" -"Edit","Bearbeiten" -"Edit Action","Edit Action" -"Edit Address","Edit Address" -"Edit AirMail Message","AirMail-Nachricht bearbeiten." -"Edit AirMail Message Queue #%s","AirMail-Nachrichtschlange #%s bearbeiten." -"Edit App ""%s""","App %s bearbeiten" -"Edit Filter","Filter bearbeiten" -"Edit Image","Edit Image" -"Edit Mail List","Edit Mail List" -"Edit Template ""%s""","Vorlage ""%s"" bearbeiten" -"Edit filter","Edit filter" -"Edit note","Edit note" -"Either remote URL or application code was not set. Please make sure you filled all the values and try again.","Either remote URL or application code was not set. Please make sure you filled all the values and try again." -"Element with id %s already exists","Element mit ID %s ist bereits vorhanden" -"Email","E-Mail" -"Email Address","E-Mail-Adresse" -"Email address you provided is not valid. Please provide a valid one.","Email address you provided is not valid. Please provide a valid one." -"Email is not correct","Email is not correct" -"Email is not specified","Email is not specified" -"Enable Admin Application","Enable Admin Application" -"Enable AirMail Message Push notification","AirMail Browser-Nachrichten aktivieren" -"Enable Facebook","Facebook aktivieren" -"Enable Flurry Analytics","Flurry Analytics aktivieren" -"Enable Flurry Analytics for the merchant.","Flurry Analytics aktivieren für Händler" -"Enable LinkedIn","LinkedIn aktivieren" -"Enable Standard Checkout","Übliche Zahlungsweise aktivieren" -"Enable Twitter","Twitter aktivieren" -"Enter Name","Enter Name" -"Enter discount code first.","Enter discount code first." -"Enter discount code if any","Enter discount code if any" -"Enter e-mail","Enter e-mail" -"Enter giftcard promo code here","Enter giftcard promo code here" -"Enter text","Enter text" -"Enter the gift card code","Enter the gift card code" -"Error","Error" -"Error Loading Configuration Format","Error Loading Configuration Format" -"Error during shortening url","Error during shortening url" -"Error message text is missed.","Error message text is missed." -"Error while processing file ""%s"".","Fehler beim Verarbeiten von Datei ""%s""." -"Error while reading data from Payment Bridge. Please, try again.","Fehler beim Einlesen der Daten von Payment Bridge. Bitte versuchen sie es später noch einmal." -"Error while reading remote data","Error while reading remote data" -"Error while uploading file ""%s"".","Fehler beim Laden der Datei ""%s""." -"Error while uploading file ""%s"". Disallowed file type. Only ""jpg"", ""jpeg"", ""gif"", ""png"" are allowed.","Beim Upload der Datei ""%s"" ist ein Fehler aufgetreten. Unerlaubter Dateityp. Nur ""jpg"", ""jpeg"", ""gif"", ""png"" sind erlaubt." -"Error.","Fehler." -"Excl. Tax","Excl. Tax" -"Expiration Date - Month","Gültig bis - Monat" -"Expiration Date - Year","Gültig bis - Jahr" -"Expires: %s","Gültig bis: %s" -"Extend the life of your app with Urban Airship Push Notifications.","Verlängern Sie das Leben Ihrer App mit den Push-Benachrichtigungen von Urban Airship." -"Extensions","Erweiterungen" -"FILTERS APPLIED","FILTER ANGEWENDET" -"Facebook","Facebook" -"Facebook API","Facbook API" -"Facebook Application ID","Facebook Application ID" -"Facebook post failed...","Facebook post failed..." -"Fax","Fax" -"File can\'t be uploaded.","Datei kann nicht hochgeladen werden." -"File doesn\'t exist ""%s"".","Datei existiert nicht ""%s""." -"Filter","Filter" -"Filters","Filters" -"First Name","Vorname" -"Fixed amounts","Fixed amounts" -"Flurry API Code","Flurry API Code" -"Flurry Analytics","Flurry Analytics" -"Flurry Analytics Site","Flurry Analytics Seite" -"Fonts","Schriftarten" -"Forgot Password","Forgot Password" -"Forgot Password?","Forgot Password?" -"Forgot your password?","Forgot your password?" -"Form","Form" -"Free","Kostenlos" -"From","From" -"From Excl. Tax","From Excl. Tax" -"From Incl. Tax","From Incl. Tax" -"From excl. tax","From excl. tax" -"From incl. tax","From incl. tax" -"Full Description","Full Description" -"Funk Leaf","Funk Leaf" -"Gallery","Gallery" -"General","Allgemein" -"Generate Offline Catalog","Generate Offline Catalog" -"Get Content from CMS Page","Holen sie sich Inhalte von der CMS-Seite." -"Gift Card ""%s"" was added.","Geschenkgutschein ""%s"" wurde hinzugefügt." -"Gift Card ""%s"" was redeemed.","Geschenkgutschein ""%s"" wurde eingelöst." -"Gift Card ""%s"" was removed.","Geschenkgutschein ""%s"" wurde entfernt." -"Gift Card (%s)","Geschenkgutschein (%s)" -"Gift Card amount applied to order: %s","Die Summe des Geschenkgutscheins wird auf die Bestellung angewandt: %s" -"Gift Card code is empty.","Der Geschenkgutschein-Code ist leer." -"Gift Card: %s","Geschenkgutschein: %s" -"Gift card account available in enterprise version of Magento only.","Das Geschenkgutschein-Konto ist nur in der Enterprise-Version von Magento verfügbar." -"Giftcard promo code","Giftcard promo code" -"Grand Total","Grand Total" -"Grand Total (Excl. Tax)","Endsumme (ohne Mwst.)" -"Grand Total (Incl. Tax)","Endsumme (mit Mwst.)" -"Guest","Gast" -"Header Background Color","Hintergrundfarbe der Kopfzeile" -"Header Font Color","Schriftfarbe der Kopfzeile" -"High Resolution Application Icon","Hochauflösendes Applikations-Icon" -"Home","Startseite" -"Hot Red","Knallrot" -"How do you rate this product?","Wie bewerten Sie dieses Produkt?" -"How to incorporate Urban Airship within your application:","Wie Sie Urban Airship in Ihre Anwendung einbinden:" -"I Agree","I Agree" -"I agree to the Terms and Conditions","I agree to the Terms and Conditions" -"ID","ID" -"Icon that will appear on the user\'s device after they download your app.","Icon that will appear on the user\'s device after they download your app." -"Icon that will appear on the user\'s device after they download your app. Recommended size: 48px x 48px.","Icon, das nach dem Download Ihrer App auf dem Gerät des Benutzers erscheinen wird. Empfohlene Größe: 48px x 48px." -"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 72px x 72px.","Das Icon wird auf dem Gerät des Nutzers erscheinen, nachdem sie die App heruntergeladen haben. Sie müssen keinen Verlauf oder runde Ecken einfügen (dies wird automatisch von Apple gemacht). Empfohlene Größe: 72px x 72px." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 114px x 114px.","Icon, das nach dem Download Ihrer App auf dem Handy des Benutzers erscheinen wird. Sie brauchen keinen Farbverlauf oder weiche Kanten anwenden (dies wird automatisch von Apple erledigt). Empfohlene Größe: 114px x 114px." -"Icon that will appear on the user’s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 57px x 57px at 72 dpi.","Das Icon wird auf dem Gerät des Nutzers erscheinen, nachdem die App heruntergeladen wurde. Sie müssen keinen Verlauf oder runde Ecken einfügen (dies wird automatisch von Apple gemacht). Empfohlene Größe: 57px x 57px bei 72 dpi." -"Icons","Icons" -"If leave this field empty, the message will be sent immediately","Wenn dieses Feld frei bleibt, wird die Nachricht sofort gesendet." -"If you want to disable the cache on the application side, leave the field empty. Warning! When disabling cache, the application will take time to load each page.","Wenn Sie den Cache auf Seiten der Applikation deaktivieren möchten, müssen Sie dieses Feld frei lassen. Vorsicht! Wenn Sie den Cache deaktivieren, benötigt die Applikation mehr Zeit, um jede Seite zu laden." -"Image %s is required.","Image %s is required." -"Image action has been saved.","Image action has been saved." -"Image does not exist. Please reload this page.","Image does not exist. Please reload this page." -"Image file was not found.","Bilddatei wurde nicht gefunden." -"Image has been deleted.","Image has been deleted." -"Image id is required.","Image id is required." -"Image limits don\'t recognized for ""%s"" image type","Image limits don\'t recognized for ""%s"" image type" -"Image that appears on first screen while your app is loading.","Image that appears on first screen while your app is loading." -"Image that appears on first screen while your app is loading. Required size: 1024px x 768px.","Bild, das zuerst auf dem Bildschirm erscheint, wenn die App lädt. Benötigte Größe: 1024px x 768px." -"Image that appears on first screen while your app is loading. Required size: 320px x 455px.","Bild, das zuerst auf dem Bildschirm erscheint, wenn die App lädt. Benötigte Größe: 320px x 455px." -"Image that appears on first screen while your app is loading. Required size: 320px x 460px.","Bild, das zuerst auf dem Bildschirm erscheint, wenn die App lädt. Benötigte Größe: 320px x 460px." -"Image that appears on first screen while your app is loading. Required size: 640px x 920px.","Bild, das zuerst auf dem Bildschirm erscheint, wenn die App lädt. Benötigte Größe: 640px x 920px." -"Image that appears on first screen while your app is loading. Required size: 768px x 1024px.","Bild, das zuerst auf dem Bildschirm erscheint, wenn die App lädt. Benötigte Größe: 768px x 1024px." -"Image type doesn\'t recognized: ""%s"".","Image type doesn\'t recognized: ""%s""." -"Image type is required.","Image type is required." -"Images","Bilder" -"Images order has been updated.","Images order has been updated." -"In Queue","In der Warteschlange" -"In Stock","Vorrätig" -"In addition, click here to review Urban Airship\'s Terms of Service: click here.","Klicken Sie auch hier, um Nutzungsbedingungen von Urban Airship zu sehen: click here." -"In order to resubmit your app, you need to first purchase a %s from MagentoCommerce","Um Ihre App erneut senden zu können, müssen Sie zunächst einen %s von MagentoCommerce kaufen." -"In order to submit your app, you need to first purchase a %s from MagentoCommerce","Um Ihre App einreichen zu können, müssen Sie zunächst einen %s von MagentoCommerce kaufen." -"Inactive Tabs","Inaktive Tabs" -"Incl. Tax","Incl. Tax" -"Incl. tax","Incl. tax" -"Initialization PayPal ...","Initialization PayPal ..." -"Initialization of the PayPal checkout failed!","Initialization of the PayPal checkout failed!" -"Invalid XML.","Ungültiges XML." -"Invalid current password.","Ungültiges aktuelles Passwort." -"Invalid customer data.","Ungültige Kundendaten." -"Invalid data.","Ungültige Daten." -"Invalid email address.","Ungültige E-Mail-Adresse." -"Invalid item or wishlist.","Ungültige(r) Artikel oder Wunschzettel." -"Invalid login or password.","Ungültiger Login oder ungültiges Passwort" -"Invalid shipping method.","Ungültige Versandart." -"Issue Number","Ausstellnummer" -"It\'s not allowed to delete submitted application.","Das Löschen einer eingereichten Applikation ist nicht möglich." -"Item","Item" -"Item Options","Item Options" -"Item has been added to cart.","Artikel wurde zum Einkaufswagen hinzugefügt." -"Item has been deleted from cart.","Artikel wurde aus dem Einkaufswagen gelöscht." -"Item has been removed from wishlist.","Artikel wurde vom Wunschzettel gelöscht." -"Items","Items" -"Items were updated. But can\'t update wishlist.","Artikel aktualisiert. Wunschzettel konnte jedoch nicht aktualisiert werden." -"Keep your image size below %s KB for optimal performance.","Keep your image size below %s KB for optimal performance." -"Key","Schlüssel" -"Keywords","Schlüsselwörter" -"Label","Label" -"Landscape app Background","Landscape app Background" -"Landscape banners on Home Screen","Landscape banners on Home Screen" -"Large iTunes Icon","Großes iTunes-Icon" -"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.","Großes Icon, das im iTunes App-Store erscheint. Sie müssen keinen Verlauf oder runde Ecken einfügen (dies wird automatisch von Apple gemacht). Benötigte Größe: 512px x 512px." -"Last 5 Orders","Last 5 Orders" -"Last 5 Search Terms","Last 5 Search Terms" -"Last Name","Letzter Name" -"Last update: %@","Last update: %@" -"Lifetime Sales","Lifetime Sales" -"LindedIn","LindedIn" -"Link:","Link:" -"LinkedIn","LinkedIn" -"LinkedIn API","LinkedIn-API" -"LinkedIn API Key","LinkedIn-API-Schlüssel" -"LinkedIn Authorization","LinkedIn Authorization" -"LinkedIn Autorization","LinkedIn Autorization" -"LinkedIn Secret Key","Geheimschlüssel für LinkedIn" -"Linkedin post failed...","Linkedin post failed..." -"List of downloadable products is empty","List of downloadable products is empty" -"Load more items","Load more items" -"Loader Splash Screen","Ladeprogramm für Splash Screen" -"Loader Splash Screen (iPhone 4 retina)","Loader Splash Screen (iPhone 4 retina)" -"Loader Splash Screen (landscape mode)","Loader Splash Screen (landscape mode)" -"Loader Splash Screen (portrait mode)","Loader Splash Screen (portrait mode)" -"Loader Splash Screen
    (iPhone 4 retina)","Ladeprogramm für Splash Screen
    (iPhone 4 Retina Display)" -"Loader Splash Screen
    (landscape mode)","Ladeprogramm für Splash Screen
    (Querformat)" -"Loader Splash Screen
    (portrait mode)","Ladeprogramm für Splash Screen
    (Hochformat)" -"Loading %@...","Loading %@..." -"Loading Account Form...","Loading Account Form..." -"Loading Address Book...","Loading Address Book..." -"Loading Address Form...","Loading Address Form..." -"Loading CMS page ...","Loading CMS page ..." -"Loading Cart...","Loading Cart..." -"Loading Gallery...","Loading Gallery..." -"Loading Login Form...","Loading Login Form..." -"Loading My Downloadable Products...","Loading My Downloadable Products..." -"Loading Order Details","Loading Order Details" -"Loading Orders List...","Loading Orders List..." -"Loading Preview...","Lade Vorschau..." -"Loading Product Options...","Loading Product Options..." -"Loading Products...","Loading Products..." -"Loading Registration Form...","Loading Registration Form..." -"Loading Restore Password Form...","Loading Restore Password Form..." -"Loading Store Credit...","Loading Store Credit..." -"Loading WishList...","Loading WishList..." -"Loading Write Review Form...","Loading Write Review Form..." -"Loading category ...","Loading category ..." -"Loading more items...","Loading more items..." -"Loading product ...","Loading product ..." -"Loading shipping methods ...","Loading shipping methods ..." -"Loading...","Loading..." -"Locations","Standorte" -"Log In","Login" -"Log Out","Log Out" -"Log in to Admin Panel","Log in to Admin Panel" -"Log into Account","Log into Account" -"Log into your account","Log into your account" -"Log out Account","Log out Account" -"LogInMessageTitle","LogInMessageTitle" -"Login and password are required.","Login und Passwort werden benötigt." -"Logo in Header","Logo in der Kopfzeile" -"Logo in Header image missing.","Logo in der Kopfzeile fehlt." -"Logout complete.","Logout abgeschlossen." -"M.I.","A.Z.V." -"MEP is PayPal\'s native checkout experience for the iPhone. You can choose to use MEP alongside standard checkout, or use it as your only checkout method for Magento mobile. PayPal MEP requires a PayPal business account","MEP ist die ursprüngliche PayPal-Kasse für das iPhone. Sie können MEP neben der Standard-Kaufabwicklung, oder als Ihre einzige Bezahlmethode für Magento Mobile verwenden. Für Paypal MEP benötigen Sie ein PayPal-Geschäftskonto" -"MM","MM" -"Mailbox title","Titel für das Postfach" -"Main Tabs","Haupt-Tabs" -"Make Inactive","Inaktiv machen" -"Make this app available in the following territories","Die App in den folgenden Gebieten zur Verfügung stellen" -"Manage Apps","Apps verwalten" -"Manage Mobile App","Mobile App verwalten" -"Maximum length is 140","Maximale Länge beträgt 140" -"Maximum length is 255","Maximale Länge beträgt 255" -"Maximum size: %s KB.","Maximum size: %s KB." -"Maximum: %.2f","Maximum: %.2f" -"Merchant Label","Händlermarke" -"Merge","Merge" -"Message","Message" -"Message Queue","Nachrichten-Warteschlange" -"Message Settings","Nachrichten-Einstellungen" -"Message Templates","Nachrichtenvorlagen" -"Message Title","Nachrichtentitel" -"Message Type","Nachrichtentyp" -"Message can be edited when status of the message is ""In Queue"" only.","Die Nachricht kann nur bearbeitet werden, wenn der Status der Nachricht auf ""In der Warteschlange"" steht." -"Message content","Nachricht Inhalt" -"Message text is missed.","Message text is missed." -"Message title","Nachricht Titel" -"Message too long, please use 140 symbols","Message too long, please use 140 symbols" -"Message type doesn\'t recognized","Message type doesn\'t recognized" -"Minimize","Minimize" -"Minimum %@, maximum %@","Minimum %@, maximum %@" -"Minimum: %.2f","Minimum: %.2f" -"Mobile","Mobil" -"Mobile Express Checkout has been canceled.","Der Mobile Express Bezahlvorgang wurde abgebrochen." -"Mobile Express Checkout processed successfully.","Der Mobile Express-Bezahlvorgang wurde erfolgreich bearbeitet." -"Month","Monat" -"More","Mehr" -"More Info","Weitere Informationen" -"More Tabs","Mehr Tabs" -"Most Viewed Products","Most Viewed Products" -"My Account","My Account" -"My Downloadable Products","My Downloadable Products" -"My Orders","My Orders" -"My Wishlist","My Wishlist" -"Name","Name" -"Name on Card","Name des Inhabers" -"Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize. %s chars max.","Name, der unter Ihrer App angezeigt werden, wenn der Anwender diese auf sein Gerät installiert. Wir empfehlen, einen 10-12 stelligen Namen zu wählen, den Ihre Kunden wiedererkennen. Max. %s Zeichen." -"New AirMail Message","Neue AirMail Nachricht" -"New AirMail Message Queue","Neue AirMail Nachricht in Warteschlange" -"New App","Neue App" -"New Customers","New Customers" -"New Password","Neues Passwort" -"New Template","Neue Vorlage" -"New to Our Store?","New to Our Store?" -"Nickname","Nickname" -"No","No" -"No Payment Information Required","Keine Zahlungsinformation notwendig" -"No Ratings","No Ratings" -"No internet connection. Retry later ...","No internet connection. Retry later ..." -"No items were specifed to update.","Es wurden keine zu aktualisierenden Elemente angegeben." -"No items were updated.","Es wurden keine Elemente aktualisiert." -"No product selected.","Es wurde kein Produkt ausgewählt." -"No products found. Please retry with other term","No products found. Please retry with other term" -"No shipping method required.","Keine Versandart erforderlich." -"No such file ""%s"".","Datei ""%s"" existiert nicht." -"Not Submitted","Nicht abgesendet" -"Note: Image size affects the performance of your app.","Note: Image size affects the performance of your app." -"Notice","Hinweis" -"Number of Orders","Number of Orders" -"Number of Uses","Number of Uses" -"OK","OK" -"OR, Pay with Standard Checkout","OR, Pay with Standard Checkout" -"Offline Catalog","Offline Catalog" -"Offline cart stored on server","Offline cart stored on server" -"Offline catalog export complete.","Offline catalog export complete." -"Offline catalog export failed.","Offline catalog export failed." -"One or more keywords that describe your app. Keywords are matched to users\' searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum.","Ein oder mehrere Keywords, die Ihre App beschreiben. Keyword werden mit den Suchanfragen der Anwender im App Store verglichen und helfen dabei, genauere Suchergebnisse zu erzielen. Trennen Sie die einzelnen Keywords durch Kommata. Max. 100 Zeichen." -"Onepage checkout is disabled.","""Checkout-Übersicht auf einer Seite"" ist deaktiviert." -"Only custom theme can be deleted","Nur benutzerdefinierte Designs können gelöscht werden." -"Only default theme can be reset","Nur Standard-Theme kann zurückgesetzt werden" -"Only free apps are allowed in this version.","In dieser Version sind nur kostenlose Apps zulässig." -"Only registered users can write reviews. Please, log in or register.","Nur registrierte Anwender können Bewertungen verfassen. Bitte melden Sie sich an oder registrieren Sie sich." -"Open","Open" -"Options","Options" -"Options menu items","Optionsmenü-Elemente" -"Order","Order" -"Order #","Order #" -"Order #%s - %s","Bestell-Nr.%s - %s" -"Order Date: %s","Bestelldatum: %s" -"Order Details Updated","Order Details Updated" -"Order ID","Order ID" -"Order ID:","Order ID:" -"Order Info","Order Info" -"Order List Updated","Order List Updated" -"Order Number","Order Number" -"Order Review","Order Review" -"Order canceled","Order canceled" -"Order failed","Order failed" -"Order id is not specified.","Bestellungs-ID wurde nicht angegeben." -"Order is not available.","Die Bestellung ist nicht verfügbar." -"Ordered","Bestellt" -"Ordered Items","Ordered Items" -"Orders","Orders" -"Other amount","Other amount" -"Out of Stock","Out of Stock" -"Output format is not specified. Please, specify ""format"" key in constructor, or set it using setFormat().","Ausgabe-Format ist nicht angegeben. Bitte geben Sie den ""Format""-Schlüssel im Konstruktor an, oder legen Sie es mit setFormat() fest." -"Overall Activity","Overall Activity" -"POST data is not valid.","POST-Daten sind nicht gültig." -"Pages","Seiten" -"Password","Passwort" -"Password fields cannot be empty.","Passwortfelder dürfen nicht leer sein." -"Password is not specified","Password is not specified" -"Password:","Password:" -"PayPal","PayPal" -"PayPal Checkout","PayPal Checkout" -"PayPal MECL is the mobile version of PayPal\'s Express Checkout service. You can choose to use MECL alongside standard checkout, or use it as your only checkout method for Magento Mobile.","PayPal MECL ist die mobile Version von PayPal Express Checkout-Service. Sie können MECL neben der Standard-Kaufabwicklung oder als einzige Bezahlmethode für Magento Mobile verwenden." -"PayPal MEP","PayPal MEP" -"PayPal Mobile Embedded Payment (MEP)","PayPal Mobile Embedded Payment (MEP)" -"PayPal Mobile Express Checkout","PayPal Mobile Express Checkout" -"PayPal Mobile Express Checkout Library (MECL)","PayPal Mobile Express Checkout Library (MECL)" -"PayPal Mobile Express Checkout Token does not exist.","Der PayPal Mobile Express Checkout Token existert nicht." -"Payer Email: %s","Zahler E-Mail: %s" -"Payment Applicable From","Zahlung Möglich Von" -"Payment Bridge module unavailable.","Das Modul zur Zahlungsüberbrückung ist nicht verfügbar." -"Payment Information","Payment Information" -"Payment Method","Zahlungsart" -"Payment Method has been set.","Bezahlungsmethode wurde festgelegt." -"Payment Methods","Bezahlungsmethoden" -"Payment method","Payment method" -"Payment method was successfully set.","Bezahlungsmethode wurde erfolgreich festgelegt." -"Paypal MEP doesn\'t support checkout with any discount.","Paypal MEP unterstützt keine Zahlungsvorgänge mit Rabatten." -"Place Order","Place Order" -"Placing order ...","Placing order ..." -"Please click here to see how to setup and retrieve API credentials.","Bitte klicken Sie hier, um Ihre API-Zugangsdaten einzurichten und zu erhalten." -"Please Select Application","Bitte Applikation auswählen" -"Please Select Device Type","Bitte Gerätetyp auswählen" -"Please agree to all the terms and conditions before placing the order.","Bitte stimmen Sie den Allgemeinen Geschäftsbedingungen zu, bevor Sie die Bestellung aufgeben." -"Please create and save an application first.","Bitte erstellen und speichern Sie zunächst eine Anwendung." -"Please enter ""App Title"".","Bitte geben Sie den ""App-Titel"" ein." -"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Bitte geben Sie eine gültige URL mit dem dazugehörigen Protokoll (http://, https:// oder ftp://) an." -"Please enter a valid date.","Bitte geben Sie eine gültige Angabe ein." -"Please enter a valid email address. For example johndoe@domain.com.","Bitte geben Sie eine gültige E-Mail-Adresse ein. Zum Beispiel maxmustermann@domain.de." -"Please enter at least one email recipient","Please enter at least one email recipient" -"Please enter issue number or start date for switch/solo card type.","Bitte geben Sie Ihre Ausgabenummer oder das Erstellungsdatum Ihrer EC-/Debitkarte an." -"Please enter the Activation Key.","Bitte geben Sie den Aktivierungsschlüssel ein." -"Please enter the Copyright.","Bitte geben Sie den Copyright-Text ein." -"Please enter the Description.","Bitte geben Sie die Beschreibung ein." -"Please enter the Price.","Bitte geben Sie den Preis ein." -"Please enter the Resubmission Key.","Bitte geben Sie den Wiedervorlageschlüssel ein." -"Please enter the Title.","Bitte geben Sie den Titel ein." -"Please make sure your passwords match.","Bitte stellen Sie sicher, dass die Passwörter übereinstimmen." -"Please save application first.","Please save application first." -"Please select an option.","Bitte wählen Sie eine Option." -"Please select at least one country.","Bitte wählen Sie mindestens ein Land aus." -"Please select payment method to cover a quote","Please select payment method to cover a quote" -"Please set email","Please set email" -"Please specify payment method","Please specify payment method" -"Please specify shipping method","Please specify shipping method" -"Please upload an image for ""App Background (landscape mode)"" field from Design Tab.","Bitte laden Sie ein Bild für das Feld ""App-Hintergrund (Landschaftsmodus)"" im Design-Tab hoch." -"Please upload an image for ""App Background (portrait mode)"" field from Design Tab.","Bitte laden Sie ein Bild für das Feld ""App-Hintergrund (Porträtmodus)"" im Design-Tab hoch." -"Please upload an image for ""App Background"" field from Design Tab.","Bitte laden Sie ein Bild für das Feld ""App-Hintergrund"" im Design-Tab hoch." -"Please upload an image for ""Banner on Home Screen (landscape mode)"" field from Design Tab.","Bitte laden Sie aus dem Design-Tab ein Bild für das Feld ""Banner auf dem Startbildschirm (Landschaftsmodus)"" hoch" -"Please upload an image for ""Banner on Home Screen (portrait mode)"" field from Design Tab.","Bitte laden Sie aus dem Design-Tab ein Bild für das Feld ""Banner auf dem Startbildschirm (Porträtmodus)"" hoch" -"Please upload an image for ""Banner on Home Screen"" field from Design Tab.","Bitte laden Sie ein Bild für das Feld ""Banner auf der Startseite"" aus dem Design Tab hoch." -"Please upload an image for ""Logo in Header"" field from Design Tab.","Bitte laden Sie ein Bild für das Feld ""Logo im Kopffeld"" aus dem Design Tab hoch." -"Please use letters only (a-z or A-Z) in this field.","Bitte verwenden Sie ausschließlich Buchstaben (a-z oder A-Z) in diesem Feld." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Bitte verwenden Sie in diesem Feld nur Zahlen. Vermeiden Sie bitte Leerzeichen und andere Zeichen, wie Punkt oder Komma." -"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Bitte verwenden Sie nur Buchstaben (a-z oder A-Z) oder Zahlen (0-9) in diesem Feld. Leerzeichen oder andere Zeichen sind nicht erlaubt." -"Please wait...","Please wait..." -"Please, specify gift card amount!","Please, specify gift card amount!" -"Portrait app Background","Portrait app Background" -"Portrait banners on Home Screen","Portrait banners on Home Screen" -"Post data is empty.","Post data is empty." -"Post this product to your wall","Post this product to your wall" -"Posting to e-mails","Posting to e-mails" -"Preferred size: %spx x %spx.","Preferred size: %spx x %spx." -"Prefix","Präfix" -"Preset Theme","Aktuelles Theme" -"Preview","Vorschau" -"Price","Preis" -"Price Font Color","Preis-Schriftfarbe" -"Price excluding tax","Price excluding tax" -"Price including tax","Price including tax" -"Primary Color","Primärfarbe" -"Primary Font Color","Primärschriftfarbe" -"Problem changing or sending password.","Problem beim Ändern oder Senden des Passworts." -"Proceed to Checkout","Proceed to Checkout" -"Product","Product" -"Product Added to Cart","Product Added to Cart" -"Product Added to Wishlist","Product Added to Wishlist" -"Product Gallery Updated","Product Gallery Updated" -"Product Name3 ","Produktname3" -"Product Name3 1","Produktname3 1" -"Product Name3 2","Produktname3 2" -"Product Options Updated","Product Options Updated" -"Product Removed From Wishlist","Product Removed From Wishlist" -"Product Reviews Updated","Product Reviews Updated" -"Product SKU","Product SKU" -"Product Updated","Product Updated" -"Product added","Product added" -"Product is out of stock","Product is out of stock" -"Product is unavailable.","Produkt nicht verfürbar." -"Product only available on the website.","Product only available on the website." -"Product succesfully added to cart","Product succesfully added to cart" -"Product was not specified.","Produkt wurde nicht angegeben." -"Product(s) currently out of stock.","Produkt(e) momentan nicht lagernd." -"Products","Products" -"Pull Down To Update..","Pull Down To Update.." -"Purchase Order Number","Bestellungsnummer des Kaufs." -"Push Notification","Push-Benachrichtigung" -"Push Notifications allow you to send messages directly to the people who have installed your app on their device. Send messages to your full audience even when your app is closed. Push Notifications are one of the best ways to keep your app active by delivering valuable content directly to your customers. Learn more about Push Notifications - %1$s","Push-Benachrichtigungen ermöglichen es Ihnen, Nachrichten direkt an die Kunden zu schicken, die Ihre App auf ihrem Gerät installiert haben. Sie können Nachrichten an Ihre gesamte Kundschaft senden, auch wenn die App geschlossen ist. Push-Benachrichtigungen sind eine der besten Möglichkeiten, um Ihre App aktuell zu halten, indem Sie wertvollen Content direkt an Ihre Kunden senden. Erfahren Sie mehr über Push-Benachrichtigungen - %1$s" -"Push Title","Push-Titel" -"Push message","Push-Nachricht" -"Push title","Push-Titel" -"Qty","Qty" -"Qty:","Qty:" -"Quantity","Quantity" -"Quantity:","Quantity:" -"Queue Date","Datum der Schlange" -"Queue Message","Schlangennachricht" -"Queue does not exist.","Schlange existiert nicht." -"Queue is allowed only for applications with enabled Push Notification.","Die Warteschlange ist nur für Anwendungen mit aktivierter Push-Benachrichtigung aktiviert." -"Quote instance is required.","Quotenexemplar nötig." -"Quote item is not found.","Quote item is not found." -"Range param doesn\'t recognized","Range param doesn\'t recognized" -"Ratings and Reviews","Ratings and Reviews" -"Read the Terms and Conditions","Read the Terms and Conditions" -"Recent Activity","Recent Activity" -"Recipient Information","Empfängerinformation" -"Recommended size %spx x %spx.","Recommended size %spx x %spx." -"Recommended size 1024px x 344px. Note: Image size affects the performance of your app.","Empfohlene Größe: 1024 px x 344 px. Beachten Sie bitte, dass die Bildgröße die Performance Ihrer App beeinflusst." -"Recommended size 1024px x 704px. Note: Image size affects the performance of your app.","Empfohlene Größe: 1024 x 704 Pixel. Hinweis: Die Bildgröße hat Einfluss auf die Leistung ihrer App." -"Recommended size 320px x 230px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Empfohlene Größe: 320 x 230 Pixel. Hinweis: Die Bildgröße hat Einfluss auf die Leistung ihrer App. Für eine optimale Anzeige sollte ihr Bild kleiner als 50 KB sein." -"Recommended size 320px x 258px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Empfohlene Größe: 320 x 258 Pixel. Hinweis: Die Bildgröße hat Einfluss auf die Leistung ihrer App. Für eine optimale Anzeige sollte ihr Bild kleiner als 50 KB sein." -"Recommended size 320px x 367px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.","Empfohlene Größe: 320 x 367 Pixel. Hinweis: Die Bildgröße hat Einfluss auf die Leistung ihrer App. Für eine optimale Anzeige sollte ihr Bild kleiner als 75 KB sein." -"Recommended size 35px x 35px.","Empfohlene Größe: 35 x 35 Pixel." -"Recommended size 768px x 294px. Note: Image size affects the performance of your app.","Empfohlene Größe: 768 x 294 Pixel. Hinweis: Die Bildgröße hat Einfluss auf die Leistung ihrer App." -"Recommended size 768px x 960px. Note: Image size affects the performance of your app.","Empfohlene Größe: 768 x 960 Pixel. Hinweis: Die Bildgröße hat Einfluss auf die Leistung ihrer App." -"Recommended size: %spx x %spx at %s dpi.","Recommended size: %spx x %spx at %s dpi." -"Recommended size: %spx x %spx.","Recommended size: %spx x %spx." -"Recover","Recover" -"Redeem","Redeem" -"Redeeming Gift Card %@","Redeeming Gift Card %@" -"Redemption functionality is disabled.","Die Rücknahme-Funktionalität ist deaktiviert." -"Refunded","Zurückerstattet" -"Regions","Regions" -"Register","Register" -"Registering cart ...","Registering cart ..." -"Registering user ...","Registering user ..." -"Regular","Regular" -"Regular and confirmation passwords must be equal","Alter Passwort und Passwortbestätigung müssen identisch sein" -"Related Product Background Color","Hintergrundfarbe Verwandtes Produkt" -"Release To Update...","Release To Update..." -"Relevance","Relevance" -"Remaining downloads","Remaining downloads" -"Remove","Remove" -"Remove Address...","Remove Address..." -"Removing %@...","Removing %@..." -"Removing Coupon...","Removing Coupon..." -"Removing Gift Card...","Removing Gift Card..." -"Removing Product from WishList...","Removing Product from WishList..." -"Removing Store Credit...","Removing Store Credit..." -"Request internal error.","Interner Fehler bei Anfrage." -"Request param %s is missed","Request param %s is missed" -"Required size: %spx x %spx.","Required size: %spx x %spx." -"Reset theme to default","Auf Standard-Theme zurücksetzen" -"Resubmission Key","Wiedervorlageschlüssel" -"Resubmit App","App erneut abschicken" -"Resubmit App failure. %s","Resubmit App failure. %s" -"Results","Results" -"Revenue","Revenue" -"Revert","Revert" -"Revert Discount","Revert Discount" -"Review","Überprüfen" -"Rich Push allows you to create and send engaging experiences by adding HTML and other rich media components to your push notifications. Moving beyond alerts and badge updates, Rich Push takes users into the app while displaying content in a customizable WebKit view. Create branded messages that engage your users with new content and information, all without having to update your app. Learn more about Rich Push - %1$s","Rich-Push ermöglicht es Ihnen, mit HTML und anderen Rich-Media-Komponenten aufregende Nutzererlebnisse zu erzeugen und diese über Ihre Push-Benachrichtigungen zu versenden. Alerts und Badge-Updates waren erst der Anfang. Rich-Push nimmt die User mit in die App, während es die Inhalte in einer anpassbaren WebKit-Ansicht anzeigt. Erstellen Sie auf Ihre Marke abgestimmte Nachrichten, die Ihre User mit neuen Inhalten und Informationen versorgen, ohne dass sie Ihre App aktualisieren müssen. Erfahren Sie mehr über Rich-Push - %1$s" -"SORT BY:","SORTIEREN NACH:" -"Sample","Sample" -"Samples","Samples" -"Save","Speichern" -"Save As","Speichern als" -"Save Theme","Theme Speichern" -"Save and Continue Edit","Speichern und weiter bearbeiten" -"Save and Submit App","Speichern und abschicken" -"Save in address book","Im Adressbuch speichern" -"Saving Address...","Saving Address..." -"Saving changes ...","Saving changes ..." -"Saving shipping address ...","Saving shipping address ..." -"Saving shipping methods ...","Saving shipping methods ..." -"Screen resolution is not supported","Screen resolution is not supported" -"Screens:","Bildschirme:" -"Scroll Background Color","Hintergrundfarbe durchblättern" -"Search","Suche" -"Search Term","Search Term" -"Search Updated","Search Updated" -"Searching for %@...","Searching for %@..." -"Secondary Color","Zweitfarbe" -"Secondary Font Color","Zweitfarbe für Schrift" -"See all","See all" -"Select %@","Select %@" -"Select All","Alle auswählen" -"Select Chart","Select Chart" -"Select Links","Select Links" -"Select Options","Select Options" -"Select Payment Method","Select Payment Method" -"Select Range","Select Range" -"Select a","Select a" -"Select a Billing Address","Select a Billing Address" -"Select a Shipping Address","Select a Shipping Address" -"Select from Address Book","Select from Address Book" -"Select shipping method","Select shipping method" -"Selected product is unavailable.","Das ausgewählte Produkt ist nicht verfügbar." -"Send","Send" -"Sender Information","Absenderangaben" -"Sending e-mail failed...","Sending e-mail failed..." -"Set","Set" -"Settings","Einstellungen" -"Shake device to reset the filter","Shake device to reset the filter" -"Share","Share" -"Share on LinkedIn","Share on LinkedIn" -"Share on Twitter","Share on Twitter" -"Ship method","Ship method" -"Shipped","Versendet" -"Shipping","Shipping" -"Shipping Address","Lieferadresse" -"Shipping Method","Liefermethode" -"Shipping address","Shipping address" -"Shipping address has been set.","Die Versandadresse wurde gespeichert." -"Shipping method","Shipping method" -"Shipping method has been set.","Die Versandart wurde gespeichert." -"Shipping method is required","Es wird eine Versandmethode benötigt" -"Shipping method successfully updated","Versandart erfolgreich aktualisiert" -"Shipping to this address is not possible.","Ein Versand an diese Adresse ist nicht möglich." -"Shop","Shop" -"Shop All","Shop All" -"Shop Updated","Shop Updated" -"Shopping Cart","Shopping Cart" -"Shopping cart is empty.","Der Einkaufswagen ist leer." -"Show Password","Show Password" -"Sign In","Sign In" -"Signing In...","Signing In..." -"Signing Out ...","Signing Out ..." -"Sky Blue","Sky Blue" -"Social Networking","Social Networking" -"Some emails were not sent.","Einige Mails wurden nicht gesendet." -"Sorry, no payment options are available for this order at this time.","Tut uns leid, aber momentan sind einige Zahlungsarten für diese Bestellung nicht verfügbar." -"Sorry, no quotes are available for this order at this time.","Tut uns leid, aber momentan sind für diese Bestellung keine Kostenvoranschläge verfügbar." -"Sorry, there are no items in this category.","Sorry, there are no items in this category." -"Special","Special" -"Special Excl. Tax","Special Excl. Tax" -"Special Incl. Tax","Special Incl. Tax" -"Specific Countries","Bestimmte Länder" -"Specified address does not exist.","Die eingegebene Anschrift existiert nicht." -"Specified invalid app code.","Der eingegebene App-Code ist ungültig." -"Specified invalid data.","Die eingegebenen Daten sind ungültig." -"Specified item does not exist in wishlist.","Der angegebene Artikel steht nicht auf der Wunschliste." -"Standard Checkout","Übliche Zahlungsweise" -"Standard Checkout uses the checkout methods provided by Magento. Only inline payment methods are supported. (e.g PayPal Direct, Authorize.Net, etc.)","Die übliche Zahlungsweise funktioniert nur mit den Zahlungsarten von Magento. Es werden nur Online-Zahlungen akzeptiert (z.B. PayPal Direct, Authorize.Net, etc.)" -"Start Date","Startdatum" -"Start Date - Month","Anfangsdatum - Monat" -"Start Date - Year","Anfangsdatum - Jahr" -"Starting At","Starting At" -"Starting At Excl. Tax","Starting At Excl. Tax" -"Starting At Incl. Tax","Starting At Incl. Tax" -"Starting at excl. tax","Starting at excl. tax" -"Starting at incl. tax","Starting at incl. tax" -"State/Province","Staat/Bezirk" -"Status","Status" -"Storage of offline cart on server failed. Please retry later","Storage of offline cart on server failed. Please retry later" -"Store Credit Info Updated","Store Credit Info Updated" -"Store Credit payment is not being used in your shopping cart.","Die Guthabenbezahlungen wird in Ihrem Einkaufswagen nicht verwendet." -"Store View","Ladenansicht" -"Store credit","Store credit" -"Store logo that is displayed on copyright page of app.","Store logo that is displayed on copyright page of app." -"Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.","Das Ladenzeichen wird auf der Copyright-Seite der App angezeigt. Beste Auflösung: 100 x 100 Pixel." -"Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px.","Das Ladenloge wird auf der Copyright-Seite der App angezeigt. Beste Auflösung: 200x200 Pixel." -"Store switcher hasn\'t been defined","Store switcher hasn\'t been defined" -"Street Address","Anschrift (Straße, Hausnummer, PLZ)" -"Street Address 2","Anschrift 2" -"Subject:","Subject:" -"Submission","Abschicken" -"Submission Fields","Eingabefelder" -"Submission History","Bisherige Eingaben" -"Submit App","App abschicken" -"Submit App ""%s""","App abschicken ""%s""" -"Submit App failure. %s","App wurde nicht übermittelt. %s" -"Submit App failure. Invalid activation key provided","App wurde nicht übermittelt. Ungültiger Aktivierungsschlüssel angegeben." -"Submit Review","Submit Review" -"Submitted","Eingereicht" -"Submitting Review...","Submitting Review..." -"Subtotal","Subtotal" -"Subtotal (Excl. Tax)","Zwischensumme (ohne Mwst.)" -"Subtotal (Incl. Tax)","Zwischensumme (mit Mwst.)" -"Subtotal Excl. Tax","Subtotal Excl. Tax" -"Subtotal Incl. Tax","Subtotal Incl. Tax" -"Subtotal excluding tax","Subtotal excluding tax" -"Subtotal incl. tax:","Subtotal incl. tax:" -"Subtotal including tax","Subtotal including tax" -"Subtotal:","Subtotal:" -"Success","Success" -"Successfully posted to Facebook","Successfully posted to Facebook" -"Successfully posted to Linkedin","Successfully posted to Linkedin" -"Suffix","Suffix" -"Summary of Your Review","Übersicht ihrer Bewertung" -"Swipe a product to reveal more options","Swipe a product to reveal more options" -"T-Shirts","T-Shirts" -"Tabs","Registerkarten" -"Tax","Steuern" -"Telephone","Telefon" -"Tell a Friend","Weiterempfehlen" -"Tell a Friend is disabled.","Weiterempfehlen ist deaktiviert." -"Tell a Friend link has been sent.","Weiterempfehlen- Link wurde verschickt." -"Template","Vorlage" -"Template Content","Inhalt der Vorlage" -"Template Name","Name der Vorlage" -"Template does not exist.","Vorlage existiert nicht." -"Template for new AirMail Message does not exist.","Vorlage für neue AirMail-Nachricht existiert nicht." -"Template has been deleted.","Die Vorlage wurde gelöscht." -"Terms And Conditions","Terms And Conditions" -"Text length does not satisfy specified max text range.","Textlänge entspricht nicht dem angegebenen maximalen Textbereich." -"Text length does not satisfy specified min text range.","Textlänge entspricht nicht dem angegebenen minimalen Textbereich." -"Thank you for registering!","Danke für Ihre Registrierung!" -"Thank you for your purchase! ","Vielen Dank für Ihren Einkauf!" -"The %s field should be filled.","The %s field should be filled." -"The Mailbox title will be shown in the More Info tab. To understand more about the title, please click here","Der Titel des Postfachs wird in dem Tab ""Mehr Informationen"" angezeigt. Für mehr Informationen zum Titel, klicken Sie bitte hier." -"The application is currently inactive.\nPlease try again later.","The application is currently inactive.\nPlease try again later." -"The cart is empty","The cart is empty" -"The custom amount value should be higher than 0.","The custom amount value should be higher than 0." -"The custom amount value should not be higher than %s.","The custom amount value should not be higher than %s." -"The custom amount value should not be lower than %s.","The custom amount value should not be lower than %s." -"The following email(s) are either mistyped or have incorrect format. Check them and try again:\n","The following email(s) are either mistyped or have incorrect format. Check them and try again:\n" -"The icon that appears in the Android Market.","The icon that appears in the Android Market." -"The icon that appears in the Android Market. Recommended size: 512px x 512px. Maximum size: 1024 KB.","Das Icon erscheint im Android Market. Empfohlene Größe: 512px x 512px. Maximale Größe: 1024 KB." -"The length of the text in the %s field is too big. Please shorten the text.","The length of the text in the %s field is too big. Please shorten the text." -"The max length of the field ""%@"" is %d!","The max length of the field ""%@"" is %d!" -"The minimum password length is 6","The minimum password length is 6" -"The server responded with invalid data.","The server responded with invalid data." -"The shortening service returned status code %d indicating a client side error.","The shortening service returned status code %d indicating a client side error." -"The shortening service returned status code %d indicating a server side error.","The shortening service returned status code %d indicating a server side error." -"The store credit payment has been removed from shopping cart.","Die Guthabenbezahlung wurde aus Ihrem Einkaufswagen entfernt." -"The value is too big!","The value is too big!" -"The value should not be greater than %.2f!","The value should not be greater than %.2f!" -"The value should not be less than %.2f!","The value should not be less than %.2f!" -"Theme configurations are successfully reset.","Themenkonfigurationen wurden erfolgreich zurückgesetzt." -"Theme has been created.","Das Design wurde erstellt." -"Theme has been delete.","Theme wurde entfernt." -"Theme label can\'t be empty","Das Design-Label darf nicht leer sein" -"Theme label:","Design-Label:" -"Theme name is not set.","Kein Themenname festgelegt." -"There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?","There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?" -"There are no items here","There are no items here" -"There are no items in your cart","There are no items in your cart" -"There is an error in loading an app\'s configuration","There is an error in loading an app\'s configuration" -"There is an error in retrieving the data. Please try again later","There is an error in retrieving the data. Please try again later" -"There is no addresses for this contact","There is no addresses for this contact" -"There is no store credit history!","There is no store credit history!" -"There were some problems with the data.","Es sind Probleme mit den Daten aufgetreten." -"This email address was not found in our records.","Die E-Mail-Adresse konnte in unseren Aufzeichnungen nicht gefunden werden." -"This functionality disabled in offline mode","This functionality disabled in offline mode" -"This is a required field.","Dies ist ein Pflichtfeld." -"This product has no images.","This product has no images." -"Title","Titel" -"Title bar","Titelleiste" -"To","To" -"To Excl. Tax","To Excl. Tax" -"To Incl. Tax","To Incl. Tax" -"To activate PayPal MEP payment method activate Express checkout first. ","Um die PayPal-MEP-Zahlungsmethode zu aktivieren, müssen Sie zunächst den Express-Zahlungsvorgang aktivieren." -"To excl. tax","To excl. tax" -"To incl. tax","To incl. tax" -"To preview the newly uploaded images, please save your application first.","To preview the newly uploaded images, please save your application first." -"To:","To:" -"Token has not been set.","Es wurde kein Token festgelegt." -"Too many recipients have been set. Max amount of recipients is:","Too many recipients have been set. Max amount of recipients is:" -"Top Search Terms","Top Search Terms" -"Total","Total" -"Total Order Amount","Total Order Amount" -"Total incl. Tax: %1$s","Gesamtsumme inkl. Steuern: %1$s" -"Total incl. tax","Total incl. tax" -"Totals","Totals" -"Touch and hold a product to delete from shopping cart","Touch and hold a product to delete from shopping cart" -"Touch and hold a product to reveal more options","Touch and hold a product to reveal more options" -"Try Again","Try Again" -"Twitter","Twitter" -"Twitter API","Twitter-API" -"Twitter API Key","Twitter-API-Schlüssel" -"Twitter Authorization","Twitter Authorization" -"Twitter Autorization","Twitter Autorization" -"Twitter Secret Key","Twitter-Geheimschlüssel" -"Twitter post failed...","Twitter post failed..." -"Type","Type" -"Type and data is required","Type and data is required" -"URL","URL" -"Unable to cancel Mobile Express Checkout.","Mobile Express Checkout kann nicht gelöscht werden." -"Unable to cancel queue.","Schlange kann nicht abgebrochen werden." -"Unable to collect cart totals.","Einkaufswagen-Gesamtmenge kann nicht berechnet werden." -"Unable to delete queue.","Schlange kann nicht gelöscht werden." -"Unable to find an app to delete.","Es kann keine löschbare App gefunden werden." -"Unable to find template to delete.","Es kann keine löschbare Vorlage gefunden werden." -"Unable to get shipping methods list.","Liste der Versandarten kann nicht zusammengestellt werden." -"Unable to initialize MEP Checkout.","MEP-Checkout kann nicht initialisiert werden." -"Unable to initialize PayPal Mobile Express Checkout.","PayPal Mobile Express Checkout kann nicht ausgeführt werden." -"Unable to initialize express checkout review.","Die Überprüfuing des Express-Checkouts konnte nicht geladen werden." -"Unable to initialize express checkout shipping method list.","Die Liste der Versandmethoden für den Express Checkout konnte nicht geladen werden." -"Unable to initialize return action.","Rückkehrvorgang kann nicht ausgeführt werden." -"Unable to load addresses.","Adressen können nicht geladen werden." -"Unable to load application form.","Antragsformular kann nicht geladen werden." -"Unable to load banners.","Unable to load banners." -"Unable to load billing address form.","Formular der Rechnungsadresse kann nicht geladen werden." -"Unable to load billing address.","Rechnungsadresse kann nicht geladen werden." -"Unable to load categories.","Kategorien können nicht geladen werden." -"Unable to load checkout.","Checkout kann nicht geladen werden." -"Unable to load localization.","Unable to load localization." -"Unable to load order list.","Die Bestellungsliste konnte nicht geladen werden." -"Unable to load order review.","Die Überprüfung der Bestellung konnte nicht geladen werden." -"Unable to load product gallery.","Produktgalerie kan nicht geladen werden." -"Unable to load product info.","Produktinformationen konnten nicht geladen werden." -"Unable to load product options.","Produktoptionen konnten nicht geladen werden." -"Unable to load product review.","Produktübersicht kann nicht geladen werden." -"Unable to load product reviews.","Produktübersichten können nicht geladen werden." -"Unable to load review form.","Das Überprüfungsformular konnte nicht geladen werden." -"Unable to load search.","Suche kann nicht geladen werden." -"Unable to load shipping address form.","Das Adressformular für den Versand konnte nicht geladen werden." -"Unable to place the order.","Bestellung konnte nicht aufgegeben werden." -"Unable to post the review.","Bewertung konnte nicht abgesendet werden." -"Unable to process preview.","Vorschau konnte nicht verarbeitet werden." -"Unable to render a gift card account.","Es konnte kein Geschenkgutschein-Konto erstellt werden." -"Unable to render an order.","Bestellung kann nicht zurückgenommen werden." -"Unable to render downloadable products.","Unable to render downloadable products." -"Unable to render the store credits.","Die Guthaben können nicht erstattet werden." -"Unable to save app.","App konnte nicht gespeichert werden." -"Unable to save message.","Nachricht konnte nicht gespeichert werden." -"Unable to save shipping address.","Lieferadresse konnte nicht gespeichert werden." -"Unable to save shipping method.","Versandmethode konnte nicht gespeichert werden." -"Unable to save template.","Vorlage konnte nicht gespeichert werden." -"Unable to start MEP Checkout.","MEP Checkout konnte nicht gestartet werden." -"Unable to start Mobile Express Checkout.","Mobile Express Checkout kann nicht gestartet werden." -"Unable to update shipping method.","Die Versandmethode konnte nicht aktualisiert werden." -"Undefined","Undefiniert" -"Unit Price","Unit Price" -"Unit Price:","Unit Price:" -"Unknown Error","Unbekannter Fehler" -"Unknown Error.","Unbekannter Fehler." -"Unknown Payment Bridge Error","Unknown Payment Bridge Error" -"Unknown error ocured. Please retry later","Unknown error ocured. Please retry later" -"Unsupported character in path: ""%s""","Nicht unterstütztes Zeichen im Pfad: ""%s""" -"Unsupported value type received","Nicht unterstützter Werttyp erhalten" -"Update Comment Error","Update Comment Error" -"Update Preview","Update Vorschau" -"Updating ...","Updating ..." -"Updating Cart...","Updating Cart..." -"Upon receiving these credentials, please fill in the corresponding fields.","Füllen Sie nach dem Empfang dieser Anmeldeinformationen bitte die entsprechenden Felder aus." -"Urban Airship Push Notification","Urban Airship Push-Nachricht" -"Use Billing Address","Use Billing Address" -"Use Store Credit (%s available)","Verwenden Sie Store-Guthaben (%s verfügbar)" -"Use as my default billing address","Als meine Standard-Rechnungsadresse verwenden" -"Use as my default shipping address","Als meine Standardlieferadresse verwenden" -"Use billing address for shipping","Use billing address for shipping" -"User Name:","User Name:" -"User session is expired","User session is expired" -"Version","Version" -"View Cart","View Cart" -"View Details","Details anzeigen" -"View Gallery","Galerie ansehen" -"View Wishlist","View Wishlist" -"Warning: All related AirMail messages will be deleted!","Warnung: Alle zugehörigen AirMail-Nachrichten werden gelöscht!" -"Website is offline","Website is offline" -"Website is offline.","Die Website ist offline." -"WishList Updated","WishList Updated" -"Wishlist has been cleared.","Wunschliste wurde gelöscht." -"Wishlist has been updated.","Wunschliste wurde aktualisiert." -"Wishlist has been updated. But there are accrued some errors while updating some items.","Wunschliste wurde aktualisiert. Bei der Aktualisierung einiger Artikel sind jedoch Fehler aufgetreten." -"Wishlist is empty.","Wishlist is empty." -"Write a Review","Write a Review" -"Write a review","Write a review" -"Wrong Ipad background image orientation has been specified: ""%s"".","Falsche Ausrichtung für Ipad-Hintergrundbild angegeben: ""%s""." -"Wrong PayPal Mobile Express Checkout Token specified.","Falsches PayPal Mobile Express Checkout-Zeichen angegeben." -"Wrong device type.","Falscher Gerätetyp." -"Wrong email format","Falsches E-Mail-Format" -"Wrong or expired Gift Card Code.","Falscher oder abgelaufener Geschenkgutscheincode." -"Wrong theme format.","Falsches Themen-Format." -"YYYY","YYYY" -"Year","Jahr" -"Yes","Yes" -"You are already logged in.","Sie sind bereits eingeloggt." -"You are not logged in","You are not logged in" -"You can watch statistics here.","Sie können sich hier die Statistiken anschauen." -"You canceled your order. Touch ""Pay with PayPal"" to try again.","You canceled your order. Touch ""Pay with PayPal"" to try again." -"You have entered an incorrect decimal value in the custom amount field. Provide a valid value.","You have entered an incorrect decimal value in the custom amount field. Provide a valid value." -"You have placed no orders.","You have placed no orders." -"You have uncommitted actions. Commit?","You have uncommitted actions. Commit?" -"You may also like","You may also like" -"You must login first","You must login first" -"You must read and agree to the Terms and Conditions before placing your order.","You must read and agree to the Terms and Conditions before placing your order." -"You need to enable PayPal Express Checkout first from the Payment configuration before enabling PayPal MECL.","Sie müssen zunächst PayPal Express Checkout aus der Konfiguration der Zahlung aktivieren, bevor Sie PayPal MECL aktivieren." -"You will receive an order confirmation email with details of your order and a link to track its progress.","Sie erhalten eine Bestellbestätigungs-E-Mail mit den Details zu Ihrer Bestellung und einem Link, um den Verlauf zu verfolgen." -"Your current balance is:","Ihr aktueller Kontostand beträgt:" -"Your order # is: %s. ","Ihre Bestell # ist: %s." -"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it." -"Your order failed. Touch ""Pay with PayPal"" to try again.","Your order failed. Touch ""Pay with PayPal"" to try again." -"Your review has been accepted for moderation.","Ihre Bewertung wurde für die Moderation akzeptiert." -"Your tweet has been sent. Thanks for sharing this product on Twitter","Your tweet has been sent. Thanks for sharing this product on Twitter" -"Zip/Postal Code","Postleitzahl" -"\'%s\' exceeds the allowed file size: %d (bytes)","\'%s\' überschreitet die zulässige Dateigröße: %d (Bytes)" -"\'%s\' height exceeds allowed value of %d px","\'%s\' Höhe übertrifft den erlaubten Wert von %d Pixeln." -"\'%s\' is not a valid file extension. Allowed extensions: %s","\'%s\' ist keine gültige Dateiendung. Erlaubte Dateiendungen: %s" -"\'%s\' width exceeds allowed value of %d px","\'%s\' Breite überschreitet den zulässigen Wert um %d px" -"and","und" -"as Guest","as Guest" -"each","jede" -"field is required","field is required" -"iPad","iPad" -"iPhone","iPhone" -"image_id is required","image_id is required" -"not set","not set" -"required","required" -"save","Speichern" -"ver. %s","ver. %s" diff --git a/app/locale/de_DE/Phoenix_Moneybookers.csv b/app/locale/de_DE/Phoenix_Moneybookers.csv deleted file mode 100644 index f45184f22..000000000 --- a/app/locale/de_DE/Phoenix_Moneybookers.csv +++ /dev/null @@ -1,42 +0,0 @@ -"All Credit Cards / Visa, Mastercard, AMEX, JCB, Diners (powered by Moneybookers) - International","Alle Kreditkarten / Visa, Mastercard, AMEX, JCB, Diners (mittels Moneybookers) – International" -"CartaSi (powered by Moneybookers) - Italy","CartaSi (mittels Moneybookers) – Italien" -"Carte Bleue (powered by Moneybookers) - France","Carte Bleue (mittels Moneybookers) – Frankreich" -"Customer ID","Kundenidentifikationsbezeichnung" -"Dankort (powered by Moneybookers) - Denmark","Dankort (mittels Moneybookers) – Dänemark" -"EPS Online-Überweisung (powered by Moneybookers) - Austria","eps Online-Überweisung (mittels Moneybookers) – Österreich" -"Enabled","Aktiviert" -"Find out more about Online Bank Transfer","Erfahren Sie mehr über Online Banküberweisung" -"Giropay (powered by Moneybookers) - Germany","Giropay (mittels Moneybookers) – Deutschland" -"Laser (powered by Moneybookers) - Ireland","Laser (mittels Moneybookers) – Irland" -"Lastschrift (ELV) (powered by Moneybookers) - Germany","Lastschrift (ELV) (mittels Moneybookers) – Deutschland" -"Loading secure payment page (SSL)","Sicherheitszahlungsseite (SSL) wird geladen" -"Maestro (powered by Moneybookers) - United Kingdom, Austria, Spain","Maestro (unterstützt von Moneybookers) - Vereinigtes Königreich, Österreich, Spanien" -"Moneybookers","Moneybookers" -"Moneybookers Settings","Moneybookers-Einstellungen" -"Moneybookers Transaction ID: %s","Moneybookers-Transaktionsidentifizierung: %s" -"Moneybookers eWallet","Moneybookers eWallet" -"More information about Moneybookers","Weitere Information über Moneybookers" -"Nordea Solo (powered by Moneybookers) - Finland","Nordea Solo (mittels Moneybookers) – Finnland" -"Nordea Solo (powered by Moneybookers) - Sweden","Nordea Solo (mittels Moneybookers) – Schweden" -"Online Bank Transfer (powered by Moneybookers)","Online Banküberweisung (unterstützt von Moneybookers)" -"Order ID","Bestellungsidentifizierung" -"POLi (powered by Moneybookers) - Australia","POLi (mittels Moneybookers) – Australien" -"Payment failed.","Zahlung fehlgeschlagen." -"Payment from Applicable Countries","Zahlung aus geeigneten Ländern" -"Payment from Specific Countries","Zahlung aus spezifischen Ländern" -"Payment has not been processed yet.","Zahlung wurde noch nicht durchgeführt." -"Payment was canceled.","Die Zahlung wurde storniert." -"Pending bank transfer created.","Ausstehende Banküberweisung erstellt." -"Please pay your order now","Bitte bezahlen Sie Ihre Bestellung jetzt" -"Postepay (powered by Moneybookers) - Italy","Postepay (betrieben durch Moneybookers) - Italien" -"Powered by Moneybookers","Unterstützt durch Moneybookers" -"Przelewy24 (powered by Moneybookers) - Poland","Przelewy24 (betrieben durch Moneybookers) - Polen" -"Sofortüberweisung (powered by Moneybookers) - Germany","Sofortüberweisung (betrieben durch Moneybookers) - Deutschland" -"Sort Order","Sortierfolge" -"The amount has been authorized and captured by Moneybookers.","Der Betrag wurde genehmigt und von Moneybookers erfasst." -"The customer was redirected to Moneybookers.","Der Kunde wurde zu Moneybookers zurückverwiesen." -"The order has been canceled.","Die Bestellung wurde storniert." -"Title","Titel" -"You will be redirected to our secure payment page when you place an order.","Sie werden zu unserer sicheren Zahlungsseite weitergeleitet, wenn Sie eine Bestellung aufgeben." -"eNETS (powered by Moneybookers) - Singapore","eNETS (betrieben durch Moneybookers) - Singapur" -"iDeal (powered by Moneybookers) - Netherlands","iDEAL (betrieben durch Moneybookers) - Niederlande" diff --git a/app/locale/de_DE/template/email/account_new.html b/app/locale/de_DE/template/email/account_new.html deleted file mode 100644 index b6d8b0d3e..000000000 --- a/app/locale/de_DE/template/email/account_new.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}}
    -

    Sehr geehrte(r) {{htmlescape var=$customer.name}},

    -

    Herzlich willkommen beim {{var store.getFrontendName()}}. Für die Anmeldung bei Ihrem Besuch auf unserer Website klicken Sie einfach oben auf einer beliebigen Seite auf Anmelden oder auf Mein Konto und geben Sie dann Ihre E-Mail-Adresse und Ihr Passwort ein.

    -

    - Geben Sie die folgenden Werte ein, wenn Sie zur Anmeldung aufgefordert werden:
    - E-Mail-Adresse: {{var customer.email}}
    - Passwort: {{htmlescape var=$customer.password}}

    -

    Wenn Sie sich bei Ihrem Konto anmelden, können Sie:

    -
      -
    • – – Ihren Einkauf schneller an der Kasse abwickeln
      • -
    • – – Den Status Ihrer Bestellungen überprüfen
      • -
    • – – Frühere Bestellungen anzeigen
      • -
    • – – Ihre Kontodaten ändern
      • -
    • – – Ihr Passwort ändern
      • -
    • – – Zusätzliche Adressen speichern (für die Lieferung an verschiedene Familienangehörige und Freunde!)
      • -
    -

    Bei Fragen zu Ihrem Konto oder sonstigen Anliegen dürfen Sie sich jederzeit gerne an uns wenden unter {{config path='trans_email/ident_support/email'}} oder telefonisch unter der Rufnummer {{config path='general/store_information/phone'}}.

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/account_new_confirmation.html b/app/locale/de_DE/template/email/account_new_confirmation.html deleted file mode 100644 index 9eb314cf1..000000000 --- a/app/locale/de_DE/template/email/account_new_confirmation.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Sehr geehrte(r) {{htmlescape var=$customer.name}},

    -

    Sie müssen Ihre E-Mail-Adresse {{var customer.email}} erst bestätigen, bevor Sie sich damit bei unserem Laden anmelden können.

    -

    Wenn Sie Ihre E-Mail-Adresse bestätigen und sich gleich danach anmelden möchten, rufen sie bitte diesen Bestätigungslink auf. Dieser Link ist nur zur einmaligen Verwendung gültig.

    -

    - Geben Sie die folgenden Werte ein, wenn Sie zur Anmeldung aufgefordert werden:
    - E-Mail-Adresse: {{var customer.email}}
    - Passwort: {{htmlescape var=$customer.password}}

    -

    Bei Fragen zu Ihrem Konto oder sonstigen Anliegen dürfen Sie sich jederzeit gerne an uns wenden unter {{config path='trans_email/ident_support/email'}} oder telefonisch unter der Rufnummer {{config path='general/store_information/phone'}}.

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/account_new_confirmed.html b/app/locale/de_DE/template/email/account_new_confirmed.html deleted file mode 100644 index a72840396..000000000 --- a/app/locale/de_DE/template/email/account_new_confirmed.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Sehr geehrte(r) {{htmlescape var=$customer.name}},

    -

    Herzlich willkommen beim Demo-Laden. Für die Anmeldung bei Ihrem Besuch auf unserer Website klicken Sie einfach oben auf einer beliebigen Seite auf Anmelden oder auf Mein Konto und geben Sie dann Ihre E-Mail-Adresse und Ihr Passwort ein.

    -

    Wenn Sie sich bei Ihrem Konto anmelden, können Sie:

    -
      -
    • – – Ihren Einkauf schneller an der Kasse abwickeln
      • -
    • – – Den Status Ihrer Bestellungen überprüfen
      • -
    • – – Frühere Bestellungen anzeigen
      • -
    • – – Ihre Kontodaten ändern
      • -
    • – – Ihr Passwort ändern
      • -
    • – – Zusätzliche Adressen speichern (für die Lieferung an verschiedene Familienangehörige und Freunde!)
      • -
    -

    Bei Fragen zu Ihrem Konto oder sonstigen Anliegen dürfen Sie sich jederzeit gerne an uns wenden unter {{config path='trans_email/ident_support/email'}} oder telefonisch unter der Rufnummer {{config path='general/store_information/phone'}}.

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/account_password_reset_confirmation.html b/app/locale/de_DE/template/email/account_password_reset_confirmation.html deleted file mode 100644 index 8f7196c53..000000000 --- a/app/locale/de_DE/template/email/account_password_reset_confirmation.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Hallo {{htmlescape var=$customer.name}},

    -

    Wir haben vor kurzem eine Bitte erhalten, das Kennwort zu Ihrem Konto zu ändern.

    -

    Wenn Sie diese Änderung verlangt haben, klicken Sie bitte auf den folgenden Link, um Ihr Kennwort neu einzustellen: {{store url="customer/account/resetpassword/" _query_id=$customer.id _query_token=$customer.rp_token}}

    -

    Wenn das nicht funktioniert, dann kopieren Sie bitte die URL-Adresse und fügen sie in der Adresszeile Ihres Browsers ein.

    -
    -

    Wenn Sie diese Änderung nicht verlangt haben, dann irgnorieren Sie bitte diese Nachricht und Ihr Kennwort wird unverändert bleiben.

    -

    Danke!, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/de_DE/template/email/admin_password_new.html b/app/locale/de_DE/template/email/admin_password_new.html deleted file mode 100644 index df49dd771..000000000 --- a/app/locale/de_DE/template/email/admin_password_new.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Sehr geehrte(r) {{htmlescape var=$user.name}},

    -

    Ihr neues Passwort lautet: {{htmlescape var=$password}}

    -

    Sie können Ihr Passwort jederzeit ändern. Dazu müssen Sie sich bei Ihrem Konto.

    -

    anmelden, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/admin_password_reset_confirmation.html b/app/locale/de_DE/template/email/admin_password_reset_confirmation.html deleted file mode 100644 index cdf0e0c33..000000000 --- a/app/locale/de_DE/template/email/admin_password_reset_confirmation.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Liebe/r {{htmlescape var=$user.name}},

    -

    Wir haben vor kurzem eine Bitte erhalten, das Kennwort zu Ihrem Konto zu ändern.

    -

    Wenn Sie diese Änderung verlangt haben, klicken Sie bitte auf den folgenden Link, um Ihr Kennwort neu einzustellen: {{store url="adminhtml/index/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}

    -

    Wenn das nicht funktioniert, dann kopieren Sie bitte die URL-Adresse und fügen sie in der Adresszeile Ihres Browsers ein.

    -
    -

    Wenn Sie diese Änderung nicht verlangt haben, dann irgnorieren Sie bitte diese Nachricht und Ihr Kennwort wird unverändert bleiben.

    -

    Danke!, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/de_DE/template/email/amazonpayments_asp_notification_error.html b/app/locale/de_DE/template/email/amazonpayments_asp_notification_error.html deleted file mode 100644 index 9b19ada4a..000000000 --- a/app/locale/de_DE/template/email/amazonpayments_asp_notification_error.html +++ /dev/null @@ -1,12 +0,0 @@ - - -
    -
    __('Amazon Simple Pay notification message')__
    -
    __('Request')__:
    -
    {{var request}}
    -
    __('Error')__:
    -
    {{var error}}
    -
    \ No newline at end of file diff --git a/app/locale/de_DE/template/email/contact_form.html b/app/locale/de_DE/template/email/contact_form.html deleted file mode 100644 index 675b26630..000000000 --- a/app/locale/de_DE/template/email/contact_form.html +++ /dev/null @@ -1,12 +0,0 @@ - - -Name: {{var data.name}} -E-Mail-Adresse: {{var data.email}} -Telefon: {{var data.telephone}} - -Bemerkungen: {{var data.comment}} \ No newline at end of file diff --git a/app/locale/de_DE/template/email/currency_update_warning.html b/app/locale/de_DE/template/email/currency_update_warning.html deleted file mode 100644 index 5a289c6b6..000000000 --- a/app/locale/de_DE/template/email/currency_update_warning.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Hinweise zur Aktualisierung von Währungen: {{var warnings}}: - - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/de_DE/template/email/log_clean_warning.html b/app/locale/de_DE/template/email/log_clean_warning.html deleted file mode 100644 index ab59056d5..000000000 --- a/app/locale/de_DE/template/email/log_clean_warning.html +++ /dev/null @@ -1,7 +0,0 @@ - - -Warnmeldungen über die Löschung von Protokolleinträgen: {{var warnings}}: - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/de_DE/template/email/moneybookers_activateemail.html b/app/locale/de_DE/template/email/moneybookers_activateemail.html deleted file mode 100644 index 3727bd5f0..000000000 --- a/app/locale/de_DE/template/email/moneybookers_activateemail.html +++ /dev/null @@ -1,6 +0,0 @@ - -{{var store.getFrontendName()}}
    -Moneybookers E-Mail-Adresse: {{var email_addr}}
    -Moneybookers Kunden-ID: {{var customer_id}}
    -URL: {{var url}}
    -Sprache: {{var language}}
    diff --git a/app/locale/de_DE/template/email/newsletter_subscr_confirm.html b/app/locale/de_DE/template/email/newsletter_subscr_confirm.html deleted file mode 100644 index aea76908a..000000000 --- a/app/locale/de_DE/template/email/newsletter_subscr_confirm.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Vielen Dank, dass Sie unseren Newsletter abonniert haben.

    -

    Damit Ihnen der Newsletter zugestellt wird, müssen Sie Ihr Abonnement erst noch bestätigen. Klicken Sie dazu auf den folgenden Link:
    - {{var subscriber.getConfirmationLink()}}

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/newsletter_subscr_success.html b/app/locale/de_DE/template/email/newsletter_subscr_success.html deleted file mode 100644 index 947fd690c..000000000 --- a/app/locale/de_DE/template/email/newsletter_subscr_success.html +++ /dev/null @@ -1,2 +0,0 @@ - -Newsletter-Abonnement erfolgreich \ No newline at end of file diff --git a/app/locale/de_DE/template/email/newsletter_unsub_success.html b/app/locale/de_DE/template/email/newsletter_unsub_success.html deleted file mode 100644 index b441c7f14..000000000 --- a/app/locale/de_DE/template/email/newsletter_unsub_success.html +++ /dev/null @@ -1,2 +0,0 @@ - -Newsletter-Abbestellung erfolgreich \ No newline at end of file diff --git a/app/locale/de_DE/template/email/password_new.html b/app/locale/de_DE/template/email/password_new.html deleted file mode 100644 index b440009fe..000000000 --- a/app/locale/de_DE/template/email/password_new.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Sehr geehrte(r) {{htmlescape var=$customer.name}},

    -

    Ihr neues Passwort lautet: {{htmlescape var=$customer.password}}

    -

    Sie können Ihr Passwort jederzeit ändern. Dazu müssen Sie sich bei Ihrem Konto.

    -

    anmelden, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/de_DE/template/email/payment_failed.html b/app/locale/de_DE/template/email/payment_failed.html deleted file mode 100644 index 21e021dde..000000000 --- a/app/locale/de_DE/template/email/payment_failed.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - -
    Zahlungstransaktion fehlgeschlagen.
    -

    - Grund
    - {{var reason}} -

    -

    - Kassentyp
    - {{var checkoutType}} -

    -

    - Kunde:
    - {{var customer}} <{{var customerEmail}}> -

    -

    - Artikel
    - {{var items}} -

    -

    - Summe:
    - {{var total}} -

    -

    - Rechnungsanschrift:
    - {{var billingAddress.format('html')}} -

    -

    - Lieferadresse:
    - {{var shippingAddress.format('html')}} -

    -

    - Liefermethode:
    - {{var shippingMethod}} -

    -

    - Zahlungsform:
    - {{var paymentMethod}} -

    -

    - Datum/Uhrzeit:
    - {{var dateAndTime}} -

    -
    \ No newline at end of file diff --git a/app/locale/de_DE/template/email/product_alert_cron_error.html b/app/locale/de_DE/template/email/product_alert_cron_error.html deleted file mode 100644 index a0d9e7105..000000000 --- a/app/locale/de_DE/template/email/product_alert_cron_error.html +++ /dev/null @@ -1,7 +0,0 @@ - - -Produktmeldungen Cron-Warnmeldungen: {{var warnings}}: - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/de_DE/template/email/product_price_alert.html b/app/locale/de_DE/template/email/product_price_alert.html deleted file mode 100644 index 2ec9da972..000000000 --- a/app/locale/de_DE/template/email/product_price_alert.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Hallo {{var customerName}}, - -{{var alertGrid}} \ No newline at end of file diff --git a/app/locale/de_DE/template/email/product_share.html b/app/locale/de_DE/template/email/product_share.html deleted file mode 100644 index ca169a216..000000000 --- a/app/locale/de_DE/template/email/product_share.html +++ /dev/null @@ -1,13 +0,0 @@ - - - -Herzlich willkommen, {{htmlescape var=$name}}

    Bitte schauen Sie sich {{var product_name}}

    an:
    {{var message}}

    \ No newline at end of file diff --git a/app/locale/de_DE/template/email/product_stock_alert.html b/app/locale/de_DE/template/email/product_stock_alert.html deleted file mode 100644 index adb67adb6..000000000 --- a/app/locale/de_DE/template/email/product_stock_alert.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Hallo {{var customerName}}, - -{{var alertGrid}} \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/creditmemo_new.html b/app/locale/de_DE/template/email/sales/creditmemo_new.html deleted file mode 100644 index 102b771ad..000000000 --- a/app/locale/de_DE/template/email/sales/creditmemo_new.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo, {{htmlescape var=$order.getCustomerName()}}

    -

    - Vielen Dank für Ihre Bestellung bei {{var store.getFrontendName()}}. - Sie können den Status Ihrer Bestellung überprüfen, indem Sie sich bei Ihrem Konto anmelden. - Bei Fragen zu Ihrer Bestellung wenden Sie sich bitte an uns unter {{config path='trans_email/ident_support/email'}} oder rufen Sie uns an unter {{config path='general/store_information/phone'}} Sie erreichen uns montags bis freitags von 8.00 bis 17.00 Uhr Pacific Standard Time. -

    -
    -

    Ihre Gutschrift Nr. {{var creditmemo.increment_id}} für die Bestellung Nr. {{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Rechnungsdaten:Zahlungsform:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Lieferdaten:Liefermethode:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} -

    {{var comment}}

    -

    Haben Sie recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/creditmemo_new_guest.html b/app/locale/de_DE/template/email/sales/creditmemo_new_guest.html deleted file mode 100644 index 08a6ca123..000000000 --- a/app/locale/de_DE/template/email/sales/creditmemo_new_guest.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo, {{htmlescape var=$billing.getName()}}

    -

    - Vielen Dank für Ihre Bestellung bei {{var store.getFrontendName()}}. Bei Fragen zu Ihrer Bestellung wenden Sie sich bitte an uns unter. - Wenn Sie eine Frage zu Ihrer Bestellung haben, kontaktieren Sie uns bitte unter {{config path='trans_email/ident_support/email'}} __('or call us at')__ {{config path='general/store_information/phone'}} Sie erreichen uns montags bis freitags von 8.00 bis 17.00 Uhr Pacific Standard Time. -

    -
    -

    Ihre Gutschrift Nr. {{var creditmemo.increment_id}} fГјr die Bestellung Nr. {{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Rechnungsdaten:Zahlungsform:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Lieferdaten:Liefermethode:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} -

    {{var comment}}

    -

    Danke!, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/creditmemo_update.html b/app/locale/de_DE/template/email/sales/creditmemo_update.html deleted file mode 100644 index 41412062d..000000000 --- a/app/locale/de_DE/template/email/sales/creditmemo_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Sehr geehrte(r) {{htmlescape var=$order.getCustomerName()}},

    -

    - Ihre Bestellung mit der Nummer {{var order.increment_id}} wurde
    - {{var order.getStatusLabel()}}. -

    -

    Sie können den Status Ihrer Bestellung überprüfen, indem Sie sich bei Ihrem Konto anmelden.

    -

    {{var comment}}

    -

    - Bei Fragen dürfen Sie sich jederzeit gerne an uns wenden unter - {{config path='trans_email/ident_support/email'}} - oder telefonisch unter der Rufnummer {{config path='general/store_information/phone'}}. -

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/creditmemo_update_guest.html b/app/locale/de_DE/template/email/sales/creditmemo_update_guest.html deleted file mode 100644 index 4e6903bd6..000000000 --- a/app/locale/de_DE/template/email/sales/creditmemo_update_guest.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Sehr geehrte(r) {{htmlescape var=$billing.getName()}},

    -

    - Ihre Bestellung mit der Nummer {{var order.increment_id}} wurde
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Bei Fragen dürfen Sie sich jederzeit gerne an uns wenden unter - {{config path='trans_email/ident_support/email'}} - oder telefonisch unter der Rufnummer {{config path='general/store_information/phone'}}. -

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/invoice_new.html b/app/locale/de_DE/template/email/sales/invoice_new.html deleted file mode 100644 index 100846b12..000000000 --- a/app/locale/de_DE/template/email/sales/invoice_new.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo, {{htmlescape var=$order.getCustomerName()}}

    -

    - Vielen Dank für Ihre Bestellung bei {{var store.getFrontendName()}}. Sie können den Status Ihrer Bestellung überprüfen, indem Sie sich. - bei Ihrem Konto anmelden Bei Fragen zu Ihrer Bestellung wenden Sie sich bitte an uns unter. - oder rufen Sie uns an unter {{config path='trans_email/ident_support/email'}} Sie erreichen uns montags bis freitags von 8.00 bis 17.00 Uhr Pacific Standard Time {{config path='general/store_information/phone'}} Ihre Rechnung Nr. {{var invoice.increment_id}} für die Bestellung Nr. {{var order.increment_id}}. -

    -
    -

    Rechnungsdaten

    -
    - - - - - - - - - - - - - - - -
    Zahlungsform:Lieferdaten:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Liefermethode:Haben Sie nochmals recht herzlichen Dank:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}}  -
    -
    - {{/depend}} - {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} -

    {{var comment}}

    -

    Nochmals vielen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/invoice_new_guest.html b/app/locale/de_DE/template/email/sales/invoice_new_guest.html deleted file mode 100644 index 993051db9..000000000 --- a/app/locale/de_DE/template/email/sales/invoice_new_guest.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo, {{htmlescape var=$billing.getName()}}

    -

    - Vielen Dank für Ihre Bestellung bei {{var store.getFrontendName()}}. - Wenn Sie eine Frage zu Ihrer Bestellung haben, kontaktieren Sie uns bitte unter {{config path='trans_email/ident_support/email'}} oder rufen Sie uns an unter {{config path='general/store_information/phone'}} Sie erreichen uns montags bis freitags von 8.00 bis 17.00 Uhr Pacific Standard Time. -

    -
    -

    Ihre Rechnung Nr. {{var invoice.increment_id}} für die Bestellung Nr. {{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Zahlungsform:Lieferdaten:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Liefermethode:Liefermethode:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} -

    {{var comment}}

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/invoice_update.html b/app/locale/de_DE/template/email/sales/invoice_update.html deleted file mode 100644 index b2d6df37d..000000000 --- a/app/locale/de_DE/template/email/sales/invoice_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Sehr geehrte(r) {{htmlescape var=$order.getCustomerName()}},

    -

    - Ihre Bestellung mit der Nummer {{var order.increment_id}} wurde
    - {{var order.getStatusLabel()}}. -

    -

    Sie können den Status Ihrer Bestellung überprüfen, indem Sie sich bei Ihrem Konto anmelden.

    -

    {{var comment}}

    -

    - Bei Fragen dürfen Sie sich jederzeit gerne an uns wenden unter - {{config path='trans_email/ident_support/email'}} - oder telefonisch unter der Rufnummer {{config path='general/store_information/phone'}}. -

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/invoice_update_guest.html b/app/locale/de_DE/template/email/sales/invoice_update_guest.html deleted file mode 100644 index 1c832131d..000000000 --- a/app/locale/de_DE/template/email/sales/invoice_update_guest.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Sehr geehrte(r) {{htmlescape var=$billing.getName()}},

    -

    - __('Your order # {{var order.increment_id}} has been')__
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Bei Fragen dürfen Sie sich jederzeit gerne an uns wenden unter - {{config path='trans_email/ident_support/email'}} - oder telefonisch unter der Rufnummer {{config path='general/store_information/phone'}}. -

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/order_new.html b/app/locale/de_DE/template/email/sales/order_new.html deleted file mode 100644 index 8e4cc584e..000000000 --- a/app/locale/de_DE/template/email/sales/order_new.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo, {{htmlescape var=$order.getCustomerName()}}

    -

    - Vielen Dank für Ihre Bestellung bei {{var store.getFrontendName()}}. Sobald Ihre Bestellung ausgeliefert wird, senden wir Ihnen eine E-Mail mit einem Link, über den Sie Ihre Bestellung verfolgen können. Sie können den Status Ihrer Bestellung überprüfen, indem Sie sich. - bei Ihrem Konto anmelden. - Bei Fragen zu Ihrer Bestellung wenden Sie sich bitte an uns unter oder rufen Sie uns an unter. - Sie erreichen uns montags bis freitags von 8.00 bis 17.00 Uhr Pacific Standard Time {{config path='trans_email/ident_support/email'}} Ihre Auftragsbestätigung ist unten aufgeführt. Haben Sie nochmals recht herzlichen Dank für Ihren Einkauf {{config path='general/store_information/phone'}} Ihre Bestellung mit der Nummer {{var order.increment_id}}. -

    -

    (aufgegeben am {{var order.getCreatedAtFormated('long')}}).

    -
    -

    Rechnungsdaten Zahlungsform

    -
    - - - - - - - - - - - - - - - -
    Lieferdaten:Liefermethode:
    - {{var order.getBillingAddress().format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Haben Sie recht herzlichen Dank:Liefermethode:
    - {{var order.getShippingAddress().format('html')}} -   -   - {{var order.getShippingDescription()}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_items" order=$order}} -

    {{var order.getEmailCustomerNote()}}

    -

    Danke!, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/order_new_guest.html b/app/locale/de_DE/template/email/sales/order_new_guest.html deleted file mode 100644 index 49a5fb4cc..000000000 --- a/app/locale/de_DE/template/email/sales/order_new_guest.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo, {{htmlescape var=$order.getBillingAddress().getName()}}

    -

    - Vielen Dank für Ihre Bestellung bei {{var store.getFrontendName()}}. Sobald Ihre Bestellung ausgeliefert wird, senden wir Ihnen eine E-Mail mit einem Link, über den Sie Ihre Bestellung verfolgen können. Bei Fragen zu Ihrer Bestellung wenden Sie sich bitte an uns unter. - Sobald sich Ihr Paket auf dem Versandweg befindet, senden wir Ihnen eine E-Mail mit einem Link, über den Sie Ihre Bestellung verfolgen können. - Wenn Sie eine Frage zu Ihrer Bestellung haben, kontaktieren Sie uns bitte unter {{config path='trans_email/ident_support/email'}} oder rufen Sie uns an unter {{config path='general/store_information/phone'}} Sie erreichen uns montags bis freitags von 8.00 bis 17.00 Uhr Pacific Standard Time. -

    -

    Ihre Auftragsbestätigung ist unten aufgeführt. Haben Sie nochmals recht herzlichen Dank für Ihren Einkauf.

    -
    -

    Ihre Bestellung mit der Nummer {{var order.increment_id}} (aufgegeben am {{var order.getCreatedAtFormated('long')}})

    -
    - - - - - - - - - - - - - - - -
    Rechnungsdaten:Zahlungsform:
    - {{var order.getBillingAddress().format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Lieferdaten:Liefermethode:
    - {{var order.getShippingAddress().format('html')}} -   -   - {{var order.getShippingDescription()}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_items" order=$order}} -

    {{var order.getEmailCustomerNote()}}

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/order_update.html b/app/locale/de_DE/template/email/sales/order_update.html deleted file mode 100644 index 0037b2b87..000000000 --- a/app/locale/de_DE/template/email/sales/order_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Sehr geehrte(r) {{htmlescape var=$order.getCustomerName()}},

    -

    - Ihre Bestellung mit der Nummer {{var order.increment_id}} wurde
    - {{var order.getStatusLabel()}}. -

    -

    Sie können den Status Ihrer Bestellung überprüfen, indem Sie sich bei Ihrem Konto anmelden.

    -

    {{var comment}}

    -

    - Bei Fragen dürfen Sie sich jederzeit gerne an uns wenden unter - {{config path='trans_email/ident_support/email'}} - oder telefonisch unter der Rufnummer {{config path='general/store_information/phone'}}. -

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/order_update_guest.html b/app/locale/de_DE/template/email/sales/order_update_guest.html deleted file mode 100644 index 1e8f5ce6d..000000000 --- a/app/locale/de_DE/template/email/sales/order_update_guest.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Sehr geehrte(r) {{htmlescape var=$billing.getName()}},

    -

    - Ihre Bestellung mit der Nummer {{var order.increment_id}} wurde
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Bei Fragen dürfen Sie sich jederzeit gerne an uns wenden unter - {{config path='trans_email/ident_support/email'}} - oder telefonisch unter der Rufnummer {{config path='general/store_information/phone'}}. -

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/shipment_new.html b/app/locale/de_DE/template/email/sales/shipment_new.html deleted file mode 100644 index 47c82bf64..000000000 --- a/app/locale/de_DE/template/email/sales/shipment_new.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo, {{htmlescape var=$order.getCustomerName()}}

    -

    - Vielen Dank für Ihre Bestellung bei {{var store.getFrontendName()}}. Sie können den Status Ihrer Bestellung überprüfen, indem Sie sich. - bei Ihrem Konto anmelden Bei Fragen zu Ihrer Bestellung wenden Sie sich bitte an uns unter. - oder rufen Sie uns an unter {{config path='trans_email/ident_support/email'}} Sie erreichen uns montags bis freitags von 8.00 bis 17.00 Uhr Pacific Standard Time {{config path='general/store_information/phone'}} Ihre Lieferbestätigung ist unten aufgeführt. Haben Sie nochmals recht herzlichen Dank für Ihren Einkauf. -

    -

    - Ihre Lieferung Nr. {{var shipment.increment_id}} für die Bestellung Nr. {{var order.increment_id}}. -

    -
    -

    Rechnungsdaten

    -
    - - - - - - - - - - - - - - - -
    Zahlungsform:Lieferdaten:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - - - - - - - - - - - - - - - -
    Liefermethode:Haben Sie recht herzlichen Dank:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -

    {{var comment}}

    -

    Danke!, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/shipment_new_guest.html b/app/locale/de_DE/template/email/sales/shipment_new_guest.html deleted file mode 100644 index 0a91cc0d2..000000000 --- a/app/locale/de_DE/template/email/sales/shipment_new_guest.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo, {{htmlescape var=$billing.getName()}}

    -

    - Vielen Dank für Ihre Bestellung bei {{var store.getFrontendName()}}. Bei Fragen zu Ihrer Bestellung wenden Sie sich bitte an uns unter. - Bei Fragen zu Ihrer Bestellung wenden Sie sich bitte an uns unter {{config path='trans_email/ident_support/email'}} oder rufen Sie uns an unter {{config path='general/store_information/phone'}} Sie erreichen uns montags bis freitags von 8.00 bis 17.00 Uhr Pacific Standard Time. -

    -

    - Ihre Lieferbestätigung ist unten aufgeführt. Haben Sie nochmals recht herzlichen Dank für Ihren Einkauf. -

    -
    -

    Ihre Lieferung Nr. {{var shipment.increment_id}} für die Bestellung Nr. {{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Rechnungsdaten:Zahlungsform:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - - - - - - - - - - - - - - - -
    Lieferdaten:Liefermethode:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -

    {{var comment}}

    -

    Danke!, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/shipment_update.html b/app/locale/de_DE/template/email/sales/shipment_update.html deleted file mode 100644 index 6354687d8..000000000 --- a/app/locale/de_DE/template/email/sales/shipment_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Sehr geehrte(r) {{htmlescape var=$order.getCustomerName()}},

    -

    - Ihre Bestellung mit der Nummer {{var order.increment_id}} wurde
    - {{var order.getStatusLabel()}}. -

    -

    Sie können den Status Ihrer Bestellung überprüfen, indem Sie sich bei Ihrem Konto anmelden.

    -

    {{var comment}}

    -

    - Bei Fragen dürfen Sie sich jederzeit gerne an uns wenden unter - {{config path='trans_email/ident_support/email'}} - oder telefonisch unter der Rufnummer {{config path='general/store_information/phone'}}. -

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sales/shipment_update_guest.html b/app/locale/de_DE/template/email/sales/shipment_update_guest.html deleted file mode 100644 index 372c78140..000000000 --- a/app/locale/de_DE/template/email/sales/shipment_update_guest.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Sehr geehrte(r) {{htmlescape var=$billing.getName()}},

    -

    - Ihre Bestellung mit der Nummer {{var order.increment_id}} wurde
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Bei Fragen dürfen Sie sich jederzeit gerne an uns wenden unter - {{config path='trans_email/ident_support/email'}} - oder telefonisch unter der Rufnummer {{config path='general/store_information/phone'}}. -

    -

    Haben Sie nochmals recht herzlichen Dank, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/de_DE/template/email/sitemap_generate_warning.html b/app/locale/de_DE/template/email/sitemap_generate_warning.html deleted file mode 100644 index d105a323b..000000000 --- a/app/locale/de_DE/template/email/sitemap_generate_warning.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Von der Sitemap generierte Warnmeldungen: {{var warnings}}: - - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/de_DE/template/email/token.html b/app/locale/de_DE/template/email/token.html deleted file mode 100644 index ce357767f..000000000 --- a/app/locale/de_DE/template/email/token.html +++ /dev/null @@ -1,9 +0,0 @@ - - - -Hallo, {{htmlescape var=$userName}}

    -Ihr Berechtigung für {{htmlescape var=$applicationName}} ist geändert worden auf {{htmlescape var=$status}} durch das Admin-Team.

    diff --git a/app/locale/de_DE/template/email/wishlist_share.html b/app/locale/de_DE/template/email/wishlist_share.html deleted file mode 100644 index 29c5ce89c..000000000 --- a/app/locale/de_DE/template/email/wishlist_share.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Hallo,
    schaut euch doch einmal meine Wunschliste beim Demo-Laden an.

    -

    {{var message}}

    - {{var items}} -
    - {{depend salable}}

    Alle Artikel in den Einkaufswagen legen |{{/depend}} Alle Artikel auf der Wunschliste anzeigen

    -

    Herzlichen Dank, {{htmlescape var=$customer.name}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/en_US/Mage_Adminhtml.csv b/app/locale/en_US/Mage_Adminhtml.csv index de7b29cf7..7a362f65e 100644 --- a/app/locale/en_US/Mage_Adminhtml.csv +++ b/app/locale/en_US/Mage_Adminhtml.csv @@ -197,7 +197,6 @@ "Cannot send shipment information.","Cannot send shipment information." "Cannot update item quantity.","Cannot update item quantity." "Cannot update the item\'s quantity.","Cannot update the item\'s quantity." -"Card Verification Number","Card Verification Number" "Catalog","Catalog" "Catalog Price Rules","Catalog Price Rules" "Catalog Rewrites","Catalog Rewrites" @@ -236,10 +235,6 @@ "Create URL Rewrite:","Create URL Rewrite:" "Created At","Created At" "Credit Card %s","Credit Card %s" -"Credit Card Number","Credit Card Number" -"Credit Card Number: xxxx-%s","Credit Card Number: xxxx-%s" -"Credit Card Type","Credit Card Type" -"Credit Card Type: %s","Credit Card Type: %s" "Credit Memo History","Credit Memo History" "Credit Memo Totals","Credit Memo Totals" "Credit Memos","Credit Memos" @@ -348,8 +343,6 @@ "Excel XML","Excel XML" "Excl. Tax","Excl. Tax" "Exclude media folder from backup","Exclude media folder from backup" -"Expiration Date","Expiration Date" -"Expiration Date: %s/%s","Expiration Date: %s/%s" "Export","Export" "Export CSV","Export CSV" "Export Filters","Export Filters" @@ -403,7 +396,6 @@ "Go to messages inbox","Go to messages inbox" "Go to notifications","Go to notifications" "Google Base","Google Base" -"Google Content","Google Content" "Google Sitemaps","Google Sitemaps" "Grand Total","Grand Total" "Grid (default) / List","Grid (default) / List" @@ -531,7 +523,6 @@ "Manage Categories","Manage Categories" "Manage Content","Manage Content" "Manage Currency Rates","Manage Currency Rates" -"Manage Currency Symbols","Manage Currency Symbols" "Manage Customers","Manage Customers" "Manage Options (values of your attribute)","Manage Options (values of your attribute)" "Manage Ratings","Manage Ratings" @@ -555,8 +546,6 @@ "N/A","N/A" "NOTICE","NOTICE" "Name","Name" -"Name on Card","Name on Card" -"Name on the Card: %s","Name on the Card: %s" "Name:","Name:" "Never (production)","Never (production)" "New ","New " @@ -597,7 +586,6 @@ "New User","New User" "New Variable","New Variable" "New Website","New Website" -"New attribute set mapping","New attribute set mapping" "New password field cannot be empty.","New password field cannot be empty." "Newsletter","Newsletter" "Newsletter Problems","Newsletter Problems" @@ -608,7 +596,6 @@ "Next year (hold for menu)","Next year (hold for menu)" "No","No" "No (price without tax)","No (price without tax)" -"No Data","No Data" "No Data Found","No Data Found" "No Templates Found","No Templates Found" "No change","No change" @@ -923,12 +910,7 @@ "Submit","Submit" "Subpackage cannot be conflicting.","Subpackage cannot be conflicting." "Subtotal","Subtotal" -"Switch/Solo card issue number: %s","Switch/Solo card issue number: %s" -"Switch/Solo card start Date: %s/%s","Switch/Solo card start Date: %s/%s" "Switch/Solo/Maestro Only","Switch/Solo/Maestro Only" -"Switch/Solo/Maestro(UK Domestic) Only","Switch/Solo/Maestro(UK Domestic) Only" -"Switch/Solo/Maestro(UK Domestic) card issue number: %s","Switch/Solo/Maestro(UK Domestic) card issue number: %s" -"Switch/Solo/Maestro(UK Domestic) card start Date: %s/%s","Switch/Solo/Maestro(UK Domestic) card start Date: %s/%s" "Symbol","Symbol" "Synchronization is required.","Synchronization is required." "Synchronization of media storages has been successfully completed.","Synchronization of media storages has been successfully completed." @@ -1086,7 +1068,6 @@ "Unable to initialize import model","Unable to initialize import model" "Unable to refresh lifetime statistics.","Unable to refresh lifetime statistics." "Unable to refresh recent statistics.","Unable to refresh recent statistics." -"Unable to save Cron expression","Unable to save Cron expression" "Unable to save the cron expression.","Unable to save the cron expression." "Unable to save the invoice.","Unable to save the invoice." "Unable to send the invoice email.","Unable to send the invoice email." diff --git a/app/locale/en_US/Mage_Bundle.csv b/app/locale/en_US/Mage_Bundle.csv index 3a67ad7d5..dc5782f22 100644 --- a/app/locale/en_US/Mage_Bundle.csv +++ b/app/locale/en_US/Mage_Bundle.csv @@ -7,7 +7,6 @@ "As low as","As low as" "Bundle Items","Bundle Items" "Bundle Product","Bundle Product" -"Bundle Product View Summary","Bundle Product View Summary" "Buy %1$s","Buy %1$s" "Buy %1$s for","Buy %1$s for" "Buy %1$s for %2$s","Buy %1$s for %2$s" diff --git a/app/locale/en_US/Mage_Catalog.csv b/app/locale/en_US/Mage_Catalog.csv index 58e212359..67e0838bd 100644 --- a/app/locale/en_US/Mage_Catalog.csv +++ b/app/locale/en_US/Mage_Catalog.csv @@ -57,7 +57,6 @@ "Allow HTML Tags on Frontend","Allow HTML Tags on Frontend" "Allowed File Extensions","Allowed File Extensions" "Allowed file extensions to upload","Allowed file extensions to upload" -"Amount","Amount" "An error occurred while adding products to websites.","An error occurred while adding products to websites." "An error occurred while clearing comparison list.","An error occurred while clearing comparison list." "An error occurred while deleting this review.","An error occurred while deleting this review." @@ -102,7 +101,6 @@ "Attribute add","Attribute add" "Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter." "Attribute group with the \"/name/\" name already exists","Attribute group with the \"/name/\" name already exists" -"Attribute group with the \/name/\ name already exists","Attribute group with the \/name/\ name already exists" "Attribute remove","Attribute remove" "Attribute with the same code already exists","Attribute with the same code already exists" "Attributes","Attributes" @@ -266,7 +264,6 @@ "Double click on above image to view full picture","Double click on above image to view full picture" "Downloadable Information","Downloadable Information" "Duplicate","Duplicate" -"Duplicate amount found.","Duplicate amount found." "Duplicate website group price customer group.","Duplicate website group price customer group." "Duplicate website tier price customer group and quantity.","Duplicate website tier price customer group and quantity." "Duplicate website, country and state tax found.","Duplicate website, country and state tax found." @@ -413,7 +410,6 @@ "More Views","More Views" "Move","Move" "Move category in tree","Move category in tree" -"Multi update product","Multi update product" "Must be in the allowed values list.","Must be in the allowed values list." "N/A","N/A" "Name","Name" @@ -467,15 +463,11 @@ "Please click on the Close Window button if it is not closed automatically.","Please click on the Close Window button if it is not closed automatically." "Please enter a new group name","Please enter a new group name" "Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management" -"Please refresh ""Product Attributes"" in System -> Index Management","Please refresh ""Product Attributes"" in System -> Index Management" "Please select a static block ...","Please select a static block ..." "Please select items.","Please select items." "Please select one or more attributes.","Please select one or more attributes." "Please select product(s).","Please select product(s)." "Please select products for attributes update","Please select products for attributes update" -"Please set up merge date/time","Please set up merge date/time" -"Please set up merge date/time later then present date","Please set up merge date/time later then present date" "Please specify date required option(s).","Please specify date required option(s)." "Please specify the number of products, that will not be divided into subintervals.","Please specify the number of products, that will not be divided into subintervals." "Please specify the product required option(s)","Please specify the product required option(s)" @@ -619,7 +611,6 @@ "Search Information","Search Information" "Search Query","Search Query" "Search Term with such search query already exists.","Search Term with such search query already exists." -"Search Weight","Search Weight" "Searchable","Searchable" "See price before order confirmation.","See price before order confirmation." "Select Category...","Select Category..." @@ -735,7 +726,6 @@ "Top/Left","Top/Left" "Top/Right","Top/Right" "Total Qty Base Items","Total Qty Base Items" -"Total Qty Content Items","Total Qty Content Items" "Total incl. Tax: %1$s","Total incl. Tax: %1$s" "Total of %d record(s) have been deleted.","Total of %d record(s) have been deleted." "Total of %d record(s) have been updated.","Total of %d record(s) have been updated." @@ -804,8 +794,6 @@ "Watermark Position","Watermark Position" "We Also Recommend","We Also Recommend" "Website","Website" -"Website Item Must be checked","Website Item Must be checked" -"Website Store Must be checked","Website Store Must be checked" "Websites","Websites" "What's this?","What's this?" "Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Whether to show ""All"" option in the ""Show X Per Page"" dropdown." diff --git a/app/locale/en_US/Mage_CatalogRule.csv b/app/locale/en_US/Mage_CatalogRule.csv index 17124ed1e..b0668fe94 100644 --- a/app/locale/en_US/Mage_CatalogRule.csv +++ b/app/locale/en_US/Mage_CatalogRule.csv @@ -26,7 +26,6 @@ "Edit Rule","Edit Rule" "Edit Rule '%s'","Edit Rule '%s'" "Enable Discount to Subproducts","Enable Discount to Subproducts" -"Expiration Date","Expiration Date" "From Date","From Date" "General Information","General Information" "ID","ID" @@ -41,19 +40,16 @@ "Rule Name","Rule Name" "Save and Apply","Save and Apply" "Save and Continue Edit","Save and Continue Edit" -"Start Date","Start Date" "Status","Status" "Stop Further Rules Processing","Stop Further Rules Processing" "The rule has been deleted.","The rule has been deleted." "The rule has been saved.","The rule has been saved." "The rules have been applied.","The rules have been applied." -"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","There are rules that have been changed but were not applied. Only users with exclusive access can apply rules." "There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog." "This rule no longer exists.","This rule no longer exists." "To Date","To Date" "To Fixed Amount","To Fixed Amount" "To Percentage of the Original Price","To Percentage of the Original Price" -"Type","Type" "Unable to apply rules.","Unable to apply rules." "Unable to find a rule to delete.","Unable to find a rule to delete." "Update Prices Using the Following Information","Update Prices Using the Following Information" diff --git a/app/locale/en_US/Mage_Checkout.csv b/app/locale/en_US/Mage_Checkout.csv index 8ef674e37..2b52826cf 100644 --- a/app/locale/en_US/Mage_Checkout.csv +++ b/app/locale/en_US/Mage_Checkout.csv @@ -169,7 +169,6 @@ "My Cart","My Cart" "My Cart (%s item)","My Cart (%s item)" "My Cart (%s items)","My Cart (%s items)" -"My Cart Extra Actions","My Cart Extra Actions" "My Cart Link","My Cart Link" "New Address","New Address" "New Condition","New Condition" diff --git a/app/locale/en_US/Mage_Core.csv b/app/locale/en_US/Mage_Core.csv index ce253e84b..5af0ae346 100644 --- a/app/locale/en_US/Mage_Core.csv +++ b/app/locale/en_US/Mage_Core.csv @@ -152,7 +152,6 @@ "Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list." "Invalid URL '%value%'.","Invalid URL '%value%'." "Invalid base url type","Invalid base url type" -"Invalid block name to set child %s: %s","Invalid block name to set child %s: %s" "Invalid block type: %s","Invalid block type: %s" "Invalid block: %s","Invalid block: %s" "Invalid connection","Invalid connection" diff --git a/app/locale/en_US/Mage_Cron.csv b/app/locale/en_US/Mage_Cron.csv index ae57874f6..f902cb6f8 100644 --- a/app/locale/en_US/Mage_Cron.csv +++ b/app/locale/en_US/Mage_Cron.csv @@ -1,24 +1,16 @@ -"10 minutes","10 minutes" -"15 minutes","15 minutes" -"20 minutes","20 minutes" -"30 minutes","30 minutes" -"5 minutes","5 minutes" "Cron (Scheduled Tasks) - all the times are in minutes","Cron (Scheduled Tasks) - all the times are in minutes" "Daily","Daily" "Failure History Lifetime","Failure History Lifetime" "For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set." "Generate Schedules Every","Generate Schedules Every" "History Cleanup Every","History Cleanup Every" -"Hourly","Hourly" "Invalid callback: %s::%s does not exist","Invalid callback: %s::%s does not exist" "Invalid model/method definition, expecting ""model/class::method"".","Invalid model/method definition, expecting ""model/class::method""." -"Minute Intervals","Minute Intervals" "Missed if Not Run Within","Missed if Not Run Within" "Monthly","Monthly" "No callbacks found","No callbacks found" "Schedule Ahead for","Schedule Ahead for" "Success History Lifetime","Success History Lifetime" "Too late for the schedule.","Too late for the schedule." -"Unable to delete the cron task.","Unable to delete the cron task." "Unable to save the cron expression.","Unable to save the cron expression." "Weekly","Weekly" diff --git a/app/locale/en_US/Mage_Customer.csv b/app/locale/en_US/Mage_Customer.csv index 53ce49937..a979865b7 100644 --- a/app/locale/en_US/Mage_Customer.csv +++ b/app/locale/en_US/Mage_Customer.csv @@ -1,4 +1,3 @@ -" or "," or " "'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' appears to be a DNS hostname but cannot extract TLD part" "'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' appears to be a DNS hostname but cannot match TLD against known list" "'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'" @@ -408,7 +407,6 @@ "To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","To show VAT number on frontend, set Show VAT Number on Frontend option to Yes." "Total","Total" "Type","Type" -"Unable to save the customer.","Unable to save the customer." "Unknown","Unknown" "Unsubscribe from Newsletter","Unsubscribe from Newsletter" "Update","Update" @@ -465,4 +463,3 @@ "Zip/Postal Code","Zip/Postal Code" "n/a","n/a" "or","or" -"register","register" diff --git a/app/locale/en_US/Mage_Directory.csv b/app/locale/en_US/Mage_Directory.csv index 3f2500b92..1dcb6cf25 100644 --- a/app/locale/en_US/Mage_Directory.csv +++ b/app/locale/en_US/Mage_Directory.csv @@ -39,7 +39,6 @@ "State is required for","State is required for" "State/Province","State/Province" "States Options","States Options" -"Strikeiron Email Update Warnings","Strikeiron Email Update Warnings" "Unable to initialize the import model.","Unable to initialize the import model." "Undefined rate from ""%s-%s"".","Undefined rate from ""%s-%s""." "WARNING:","WARNING:" diff --git a/app/locale/en_US/Mage_Page.csv b/app/locale/en_US/Mage_Page.csv index 9c9384857..f0ed7a4e5 100644 --- a/app/locale/en_US/Mage_Page.csv +++ b/app/locale/en_US/Mage_Page.csv @@ -1,5 +1,4 @@ "%s Item(s)","%s Item(s)" -"© 2012 Magento Demo Store. All Rights Reserved.","© 2012 Magento Demo Store. All Rights Reserved." "© 2013 Magento Demo Store. All Rights Reserved.","© 2013 Magento Demo Store. All Rights Reserved." "(Shift-)Click or drag to change value","(Shift-)Click or drag to change value" "(ver. %s)","(ver. %s)" @@ -64,7 +63,6 @@ "Select date","Select date" "Show","Show" "This is a demo store. Any orders placed through this store will not be honored or fulfilled.","This is a demo store. Any orders placed through this store will not be honored or fulfilled." -"This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our Privacy Policy page. To accept cookies from this site, please click the Allow button below.","This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our Privacy Policy page. To accept cookies from this site, please click the Allow button below." "Time selection:","Time selection:" "Time:","Time:" "Welcome, %s!","Welcome, %s!" diff --git a/app/locale/en_US/Mage_PageCache.csv b/app/locale/en_US/Mage_PageCache.csv index 8cf0a18b0..79f380c0c 100644 --- a/app/locale/en_US/Mage_PageCache.csv +++ b/app/locale/en_US/Mage_PageCache.csv @@ -3,7 +3,6 @@ "Enable External Cache","Enable External Cache" "External Cache Control","External Cache Control" "External Full Page Cache Settings","External Full Page Cache Settings" -"External Page Cache","External Page Cache" "External full page cache.","External full page cache." "Failed to load external cache control","Failed to load external cache control" "Flush External Page Cache","Flush External Page Cache" diff --git a/app/locale/en_US/Mage_Paygate.csv b/app/locale/en_US/Mage_Paygate.csv index c8baa53ea..853b0774d 100644 --- a/app/locale/en_US/Mage_Paygate.csv +++ b/app/locale/en_US/Mage_Paygate.csv @@ -25,7 +25,6 @@ "Invalid amount for partial authorization.","Invalid amount for partial authorization." "Invalid amount for refund.","Invalid amount for refund." "Invalid split tenderId ID.","Invalid split tenderId ID." -"Invalid transaction ID.","Invalid transaction ID." "Maximum Order Total","Maximum Order Total" "Merchant's Email","Merchant's Email" "Minimum Order Total","Minimum Order Total" diff --git a/app/locale/en_US/Mage_Payment.csv b/app/locale/en_US/Mage_Payment.csv index 8a270056a..e5b609fb4 100644 --- a/app/locale/en_US/Mage_Payment.csv +++ b/app/locale/en_US/Mage_Payment.csv @@ -27,9 +27,7 @@ "Centinel API URL","Centinel API URL" "Check / Money Order","Check / Money Order" "Credit Card Number","Credit Card Number" -"Credit Card Number: xxxx-%s","Credit Card Number: xxxx-%s" "Credit Card Type","Credit Card Type" -"Credit Card Type: %s","Credit Card Type: %s" "Credit Card Types","Credit Card Types" "Credit card number mismatch with credit card type.","Credit card number mismatch with credit card type." "Credit card type is not allowed for this payment method.","Credit card type is not allowed for this payment method." @@ -40,7 +38,6 @@ "Debug Mode","Debug Mode" "Enabled","Enabled" "Expiration Date","Expiration Date" -"Expiration Date: %s/%s","Expiration Date: %s/%s" "Full name of the person receiving the product or service paid for by the recurring payment.","Full name of the person receiving the product or service paid for by the recurring payment." "Incorrect credit card expiration date.","Incorrect credit card expiration date." "Initial Fee","Initial Fee" @@ -62,13 +59,11 @@ "N/A","N/A" "Name on Card","Name on Card" "Name on the Card","Name on the Card" -"Name on the Card: %s","Name on the Card: %s" "New Order Status","New Order Status" "Number of billing periods that make up one billing cycle.","Number of billing periods that make up one billing cycle." "Order action is not available.","Order action is not available." "Overrides API URL that may be specified by a payment method.","Overrides API URL that may be specified by a payment method." "Password","Password" -"Payment ID: %s","Payment ID: %s" "Payment Method","Payment Method" "Payment Methods","Payment Methods" "Payment Methods Section","Payment Methods Section" diff --git a/app/locale/en_US/Mage_Paypal.csv b/app/locale/en_US/Mage_Paypal.csv index 54165ef52..34bccdd71 100644 --- a/app/locale/en_US/Mage_Paypal.csv +++ b/app/locale/en_US/Mage_Paypal.csv @@ -52,9 +52,7 @@ "Authenticated, Good Result","Authenticated, Good Result" "Authorization","Authorization" "Authorization Honor Period (days)","Authorization Honor Period (days)" -"Authorization expired.","Authorization expired." "Authorization transaction is required to void.","Authorization transaction is required to void." -"Authorization was voided by merchant.","Authorization was voided by merchant." "Authorized amount of %s.","Authorized amount of %s." "Authorizing amount of %s is pending approval on gateway.","Authorizing amount of %s is pending approval on gateway." "Auto","Auto" @@ -123,8 +121,6 @@ "Custom Path","Custom Path" "Customer Information","Customer Information" "Customer did not include a confirmed address.","Customer did not include a confirmed address." -"Customer failed to pay.","Customer failed to pay." -"Customer used non-confirmed address.","Customer used non-confirmed address." "Daily","Daily" "Debit","Debit" "Debit Card Cash Back","Debit Card Cash Back" @@ -161,7 +157,6 @@ "Exact Match. Address and Postal Code. International","Exact Match. Address and Postal Code. International" "Exact Match. Address and Postal Code. UK-specific","Exact Match. Address and Postal Code. UK-specific" "Exact Match. Address and nine-digit ZIP code","Exact Match. Address and nine-digit ZIP code" -"Explanation: %s.","Explanation: %s." "Express Checkout","Express Checkout" "Express Checkout APIs","Express Checkout APIs" "Express Checkout and Order have been canceled.","Express Checkout and Order have been canceled." @@ -215,7 +210,6 @@ "IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""","IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""" "IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s.","IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s." "IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s","IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s" -"IPN verification ""%s"".","IPN verification ""%s""." "If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement." "If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used" "If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only." @@ -247,15 +241,10 @@ "Merchant Location","Merchant Location" "Merchant Protection Eligibility","Merchant Protection Eligibility" "Merchant Referral Bonus","Merchant Referral Bonus" -"Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview." -"Merchant account is not verified.","Merchant account is not verified." -"Merchant denied this pending payment.","Merchant denied this pending payment." "Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Merchant holds a non-U.S. account and does not have a withdrawal mechanism." -"Merchant must upgrade account to Business or Premier status.","Merchant must upgrade account to Business or Premier status." "Merchant reference ID format is not supported.","Merchant reference ID format is not supported." "Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account." "Mobile Payment (made via a mobile phone)","Mobile Payment (made via a mobile phone)" -"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview." "N/A","N/A" "N/A. Address not checked, or acquirer had no response. Service not available","N/A. Address not checked, or acquirer had no response. Service not available" "N/A. Global Unavailable","N/A. Global Unavailable" @@ -347,9 +336,7 @@ "Payment Applicable From","Payment Applicable From" "Payment Refund initiated by merchant","Payment Refund initiated by merchant" "Payment has been declined. Please try again.","Payment has been declined. Please try again." -"Payment is being reviewed by PayPal for risk.","Payment is being reviewed by PayPal for risk." "Payment transactions disallow storing objects.","Payment transactions disallow storing objects." -"Payment was made to an email address that is not yet registered or confirmed.","Payment was made to an email address that is not yet registered or confirmed." "Payments Advanced","Payments Advanced" "Payments Advanced (Includes Express Checkout)","Payments Advanced (Includes Express Checkout)" "Payments Pro (Includes Express Checkout)","Payments Pro (Includes Express Checkout)" @@ -361,7 +348,6 @@ "Pending PayPal","Pending PayPal" "Place Order","Place Order" "Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order." -"Please contact PayPal Customer Service.","Please contact PayPal Customer Service." "Please do not refresh the page until you complete payment.","Please do not refresh the page until you complete payment." "Please re-enable the previously enabled payment solutions.","Please re-enable the previously enabled payment solutions." "Please select a shipping method...","Please select a shipping method..." @@ -384,7 +370,6 @@ "Reimbursement of Chargeback","Reimbursement of Chargeback" "Report Date","Report Date" "Reports","Reports" -"Requested %s and configured %s merchant emails do not match.","Requested %s and configured %s merchant emails do not match." "Require CVV Entry","Require CVV Entry" "Require Customer's Billing Address","Require Customer's Billing Address" "Required PayPal Settings","Required PayPal Settings" @@ -499,7 +484,6 @@ "Virtual PayPal Debit Card Transaction","Virtual PayPal Debit Card Transaction" "Virtual Terminal Payment","Virtual Terminal Payment" "Void","Void" -"Waiting until Customer\'s eCheck will be cleared.","Waiting until Customer\'s eCheck will be cleared." "We prefer PayPal (150 X 40)","We prefer PayPal (150 X 40)" "We prefer PayPal (150 X 60)","We prefer PayPal (150 X 60)" "Website Payments Plus","Website Payments Plus" @@ -517,7 +501,6 @@ "Will appear as a payment option only for customers who have at least one active billing agreement.","Will appear as a payment option only for customers who have at least one active billing agreement." "WorldLink Withdrawal","WorldLink Withdrawal" "Would you like to sign a billing agreement to streamline further purchases with PayPal?","Would you like to sign a billing agreement to streamline further purchases with PayPal?" -"Wrong Order ID (%s) specified.","Wrong Order ID (%s) specified." "Wrong PayPal Express Checkout Token specified.","Wrong PayPal Express Checkout Token specified." "Yes","Yes" "Yes. Matched Address and five-didgit ZIP","Yes. Matched Address and five-didgit ZIP" @@ -527,13 +510,4 @@ "You will be redirected to the PayPal website.","You will be redirected to the PayPal website." "You will be required to enter your payment details after you place an order.","You will be required to enter your payment details after you place an order." "Zip/Postal Code","Zip/Postal Code" -"chargeback reimbursed","chargeback reimbursed" -"chargeback settled","chargeback settled" -"customer complaint","customer complaint" -"customer triggered a chargeback","customer triggered a chargeback" -"customer triggered money-back guarantee","customer triggered money-back guarantee" "eBay Auction Payment","eBay Auction Payment" -"merchant refunded payment","merchant refunded payment" -"no reason","no reason" -"reversal of an adjustment","reversal of an adjustment" -"unknown reason","unknown reason" diff --git a/app/locale/en_US/Mage_Rule.csv b/app/locale/en_US/Mage_Rule.csv index 8418c3a23..06c9ccdd3 100644 --- a/app/locale/en_US/Mage_Rule.csv +++ b/app/locale/en_US/Mage_Rule.csv @@ -19,22 +19,12 @@ "by","by" "contains","contains" "does not contain","does not contain" -"does not contains","does not contains" "equals or greater than","equals or greater than" "equals or less than","equals or less than" -"for","for" -"for greater than","for greater than" -"for or greater than","for or greater than" -"found","found" -"from","from" "greater than","greater than" "is","is" "is not","is not" "is not one of","is not one of" "is one of","is one of" "less than","less than" -"not found","not found" -"not from","not from" "to","to" -"was","was" -"was not","was not" diff --git a/app/locale/en_US/Mage_Sales.csv b/app/locale/en_US/Mage_Sales.csv index 28762e362..5ef4c76de 100644 --- a/app/locale/en_US/Mage_Sales.csv +++ b/app/locale/en_US/Mage_Sales.csv @@ -155,7 +155,6 @@ "Create New Order for New Customer","Create New Order for New Customer" "Create New Order for New Customer in %s","Create New Order for New Customer in %s" "Create New Status","Create New Status" -"Create Order","Create Order" "Create Packages","Create Packages" "Create Shipment","Create Shipment" "Create Shipping Label","Create Shipping Label" @@ -168,7 +167,7 @@ "Created billing agreement #%s.","Created billing agreement #%s." "Created:","Created:" "Credit Memo","Credit Memo" -"Credit Memo #","Credit Memo # " +"Credit Memo #","Credit Memo #" "Credit Memo # ","Credit Memo # " "Credit Memo #%1$s | %3$s | %2$s (%4$s)","Credit Memo #%1$s | %3$s | %2$s (%4$s)" "Credit Memo Comment Email Sender","Credit Memo Comment Email Sender" @@ -259,7 +258,6 @@ "Gift Message for the Entire Order","Gift Message for the Entire Order" "Gift Message for this Order","Gift Message for this Order" "Gift Options","Gift Options" -"Gift Wrapping for the Entire Order","Gift Wrapping for the Entire Order" "Girth","Girth" "Go to Home Page","Go to Home Page" "Grand Total","Grand Total" @@ -273,7 +271,6 @@ "Home","Home" "ID","ID" "ID #","ID #" -"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"". Credit Memo has not been created. Please create offline Credit Memo.","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"". Credit Memo has not been created. Please create offline Credit Memo." "If empty, the default description above will be used.","If empty, the default description above will be used." "If empty, the default error above will be used.","If empty, the default error above will be used." "If the invoice was created offline, try creating an offline creditmemo.","If the invoice was created offline, try creating an offline creditmemo." @@ -295,7 +292,7 @@ "Invalid request for adding product to quote.","Invalid request for adding product to quote." "Invalid value(s) for Qty to Ship","Invalid value(s) for Qty to Ship" "Invoice","Invoice" -"Invoice #","Invoice # " +"Invoice #","Invoice #" "Invoice # ","Invoice # " "Invoice #%1$s | %2$s | %4$s (%3$s)","Invoice #%1$s | %2$s | %4$s (%3$s)" "Invoice #%s","Invoice #%s" @@ -417,7 +414,7 @@ "On Hold","On Hold" "Online Refunded","Online Refunded" "Order","Order" -"Order #","Order # " +"Order #","Order #" "Order # ","Order # " "Order # %s","Order # %s" "Order # %s %s | %s","Order # %s %s | %s" diff --git a/app/locale/en_US/Mage_Shipping.csv b/app/locale/en_US/Mage_Shipping.csv index 010a93e26..9c61e0ef0 100644 --- a/app/locale/en_US/Mage_Shipping.csv +++ b/app/locale/en_US/Mage_Shipping.csv @@ -9,7 +9,6 @@ "Close Window","Close Window" "Condition","Condition" "Country","Country" -"Custom Value","Custom Value" "Date","Date" "Delivered on:","Delivered on:" "Delivered to:","Delivered to:" diff --git a/app/locale/en_US/Mage_Usa.csv b/app/locale/en_US/Mage_Usa.csv index 7b8117a57..b4d72cb96 100644 --- a/app/locale/en_US/Mage_Usa.csv +++ b/app/locale/en_US/Mage_Usa.csv @@ -4,7 +4,6 @@ "2 Day","2 Day" "2 Day AM","2 Day AM" "2 Day Freight","2 Day Freight" -"2Day","2Day" "2nd Day Air","2nd Day Air" "2nd Day Air AM","2nd Day Air AM" "2nd Day Air AM Letter","2nd Day Air AM Letter" @@ -25,7 +24,6 @@ "Allowed Methods","Allowed Methods" "Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges.","Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges." "Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges." -"Bound Printed Matter","Bound Printed Matter" "Break bulk economy","Break bulk economy" "Break bulk express","Break bulk express" "Business Service Center","Business Service Center" @@ -81,7 +79,6 @@ "Express 10:30 AM","Express 10:30 AM" "Express 12:00","Express 12:00" "Express 9:00","Express 9:00" -"Express Mail","Express Mail" "Express Saturday","Express Saturday" "Express Saver","Express Saver" "Express easy","Express easy" @@ -96,7 +93,6 @@ "FedEx Pak","FedEx Pak" "FedEx Tube","FedEx Tube" "First Overnight","First Overnight" -"First-Class","First-Class" "First-Class Mail International Large Envelope","First-Class Mail International Large Envelope" "First-Class Mail International Letter","First-Class Mail International Letter" "First-Class Mail International Postcard","First-Class Mail International Postcard" @@ -151,7 +147,6 @@ "Large Express Box","Large Express Box" "Length","Length" "Letter","Letter" -"Library","Library" "Library Mail","Library Mail" "Live","Live" "Machinable","Machinable" @@ -194,7 +189,6 @@ "Packaging","Packaging" "Pallet","Pallet" "Parcel","Parcel" -"Parcel Post","Parcel Post" "Password","Password" "Pickup Method","Pickup Method" "Piece Id barcode is missing","Piece Id barcode is missing" diff --git a/app/locale/en_US/Mage_Weee.csv b/app/locale/en_US/Mage_Weee.csv index 3f84d556c..04e7170a1 100644 --- a/app/locale/en_US/Mage_Weee.csv +++ b/app/locale/en_US/Mage_Weee.csv @@ -1,6 +1,5 @@ "All Websites","All Websites" "Apply Discounts To FPT","Apply Discounts To FPT" -"Apply Tax To FPT","Apply Tax To FPT" "Display Prices In Emails","Display Prices In Emails" "Display Prices In Product Lists","Display Prices In Product Lists" "Display Prices In Sales Modules","Display Prices In Sales Modules" @@ -22,4 +21,3 @@ "Total Incl. Tax","Total Incl. Tax" "Total excl. tax","Total excl. tax" "Total incl. tax","Total incl. tax" -"Total:","Total:" diff --git a/app/locale/en_US/Mage_Wishlist.csv b/app/locale/en_US/Mage_Wishlist.csv index 81bf3b5ac..13d8beef9 100644 --- a/app/locale/en_US/Mage_Wishlist.csv +++ b/app/locale/en_US/Mage_Wishlist.csv @@ -21,7 +21,6 @@ "Can\'t save description %s","Can\'t save description %s" "Can\'t update wishlist","Can\'t update wishlist" "Cannot add item to shopping cart","Cannot add item to shopping cart" -"Cannot add the following product(s) to shopping cart: %s.","Cannot add the following product(s) to shopping cart: %s." "Cannot add the item to shopping cart.","Cannot add the item to shopping cart." "Cannot configure product","Cannot configure product" "Cannot load wishlist item","Cannot load wishlist item" @@ -36,7 +35,6 @@ "Comment:","Comment:" "Configure Wishlist Item","Configure Wishlist Item" "Configured Price:","Configured Price:" -"Could not find such wishlist","Could not find such wishlist" "Could not find wishlist","Could not find wishlist" "Customer My Account My Wishlist","Customer My Account My Wishlist" "Customer My Account Wishlist Sharing Form","Customer My Account Wishlist Sharing Form" @@ -69,7 +67,6 @@ "Product","Product" "Product Details and Comment","Product Details and Comment" "Product(s) %s have required options. Each of them can be added to cart separately only.","Product(s) %s have required options. Each of them can be added to cart separately only." -"Product(s) %s have required options. Each product can only be added individually.","Product(s) %s have required options. Each product can only be added individually." "RSS Feed","RSS Feed" "RSS link to %s's wishlist","RSS link to %s's wishlist" "Remove Item","Remove Item" diff --git a/app/locale/es_ES/Mage_AdminNotification.csv b/app/locale/es_ES/Mage_AdminNotification.csv deleted file mode 100644 index 198550494..000000000 --- a/app/locale/es_ES/Mage_AdminNotification.csv +++ /dev/null @@ -1,31 +0,0 @@ -"Actions","Acciones" -"An error occurred while marking notification as read.","Se ha producido un error al marcar la notificación como leída." -"An error occurred while marking the messages as read.","Se ha producido un error al marcar los mensajes como leídos." -"An error occurred while removing messages.","Se ha producido un error al eliminar los mensajes." -"An error occurred while removing the message.","Se ha producido un error al eliminar el mensaje." -"Are you sure?","¿Está seguro?" -"Date Added","Añadido el día" -"Last Update","Última actualización" -"Mark as Read","Marcar como leído" -"Mark as read","Marcar como leído" -"Message","Mensaje" -"Messages Inbox","Bandeja de entrada" -"Notifications","Notificaciones" -"Please select messages.","Por favor, selecciona al menos un mensaje." -"Read Details","Leer detalles" -"Remove","Eliminar" -"Severity","Gravedad" -"Show List","Mostrar lista" -"Show Toolbar","Mostrar barra de herramientas" -"The message has been marked as read.","El mensaje ha sido marcado como leído." -"The message has been removed.","El mensaje ha sido eliminado." -"Total of %d record(s) have been marked as read.","%d informe(s) ha(n) sido marcado(s) como leído(s)." -"Total of %d record(s) have been removed.","%d informe(s) ha(n) sido eliminado(s)." -"Unable to proceed. Please, try again.","Imposible realizar la operación. Inténtalo de nuevo." -"Update Frequency","Frecuencia de actualización" -"Use HTTPS to Get Feed","Utiliza HTTPS para obtener información" -"Wrong message type","Tipo de mensaje incorrecto" -"critical","crítico" -"major","mayor" -"minor","menor" -"notice","aviso" diff --git a/app/locale/es_ES/Mage_Adminhtml.csv b/app/locale/es_ES/Mage_Adminhtml.csv deleted file mode 100644 index 1321821aa..000000000 --- a/app/locale/es_ES/Mage_Adminhtml.csv +++ /dev/null @@ -1,1215 +0,0 @@ -" The customer does not exist in the system anymore.","El cliente ya no existe en el sistema." -" [deleted]"," [eliminado]" -" and "," y " -"%s (Default Template from Locale)","%s (Plantilla Predeterminada en Ubicación Local)" -"%s cache type(s) disabled.","%s tipo(s) de caché desactivado(s)." -"%s cache type(s) enabled.","%s tipo(s) de caché activado(s)." -"%s cache type(s) refreshed.","%s tipo(s) de caché actualizado(s)." -"(For Type ""Local Server"" need to use relative path to Magento install var/export or var/import, e.g. var/export, var/import, var/export/some/dir, var/import/some/dir)","(Para el Tipo ""Servidor Local"") necesitas usar una ruta relativa para instalar Magento var/export o var/import, ej. var/export, var/import, var/export/some/dir, var/import/some/dir)" -"(For US 2-letter state names)","(Para los nombres de estado de 2 letras de los EE.UU.)" -"(If left empty will be auto-generated)","(Se generará automáticamente si se deja en blanco)" -"(Leave empty for first spreadsheet)","(Dejar en blanco para la primera hoja de cálculo)" -"(Products will be added/updated to this store if 'store' column is blank or missing in the import file.)","(Los productos se añadirán/actualizarán en esta tienda si la columna 'tienda' está vacía o no aparece en el fichero de importación.)" -"(Shift-)Click or drag to change value","Pulse (Shift-) o arrastre para modificar el valor" -"(Starting with)","(Comenzando con)" -"(When 'No', only mapped fields will be imported. When mapping, use 'column1', 'column2', etc.)","(Cuando 'No', solo los campos mapeados se importarán. Al hacer los mapas, usa 'column1', 'column2', etc.)" -"(You have to increase php memory_limit before changing this value)","(Debe aumentar el límite de memoria php antes de modificar este valor)" -"(\\t for tab)","(\t para tabular)" -"* - If indexing is in progress, it will be killed and new indexing process will start.","* - Si está ejecutándose un indexado, será interrumpido y empezará un nuevo proceso de indexado." -"* Required Fields","* Campos obligatorios" -"- Click on any of the time parts to increase it","- Pulse sobre cualquiera de los fragmentos de tiempo para aumentarlo" -"- Hold mouse button on any of the above buttons for faster selection.","- Mantenga pulsado el botón del ratón sobre cualquiera de los botones de arriba para obtener una selección más rápida." -"- Use the %s buttons to select month","- Utilice los botones %s para seleccionar el mes" -"- Use the %s, %s buttons to select year","- Utilice los botones %s, %s para seleccionar el año" -"- or Shift-click to decrease it","- o pulse Shift para disminuirlo" -"- or click and drag for faster selection.","- o pulse y arrastre para obtener una selección más rápida." -"-- Not Selected --","-- Sin seleccionar --" -"-- Please Select --","-- Por favor seleccione --" -"-- Please Select Billing Agreement--","-- Por favor, Seleccione el Acuerdo de Facturación--" -"-- Please Select a Category --","-- Por favor, Elija una Categoría --" -"-- Please select --","--Por favor, selecciona--" -"--Please Select--","--Seleccione--" -"1 Hour","1 Hora" -"12 Hours","12 Horas" -"12h AM/PM","12h AM/PM" -"2 Hours","2 Horas" -"24 Hours","24 Horas" -"24h","24h" -"2YTD","2YTD" -"6 Hours","6 Horas" -"

    404 Error

    Page not found.

    ","

    Error 404

    Página no encontrada.

    " -"%s requests access to your account","%s solicitudes de acceso a tu cuenta" -"Attention: Captcha is case sensitive.","Atención: Captcha es sensible al uso de mayúsculas y minúsculas." -"A user with the same user name or email aleady exists.","Ya existe un usuario con el mismo nombre de usuario o correo electrónico." -"API Key","Clave API" -"API Key Confirmation","Confirmación de Clave API" -"ASCII","ASCII" -"Abandoned Carts","Carros Abandonados" -"About the calendar","Sobre el calendario" -"Access Denied","Acceso denegado" -"Access denied","Acceso denegado" -"Access denied.","Acceso denegado" -"Account Created in:","Cuenta Creada en:" -"Account Created on (%s):","Cuenta Creada en (%s):" -"Account Created on:","Cuenta Creada en:" -"Account Information","Información de Cuenta" -"Account Status","Estado de la cuenta" -"Account status","Estado de la cuenta" -"Action","Acción" -"Actions","Acciones" -"Actions XML","Acciones XML" -"Active","Activo" -"Add","Agregar" -"Add Exception","Añadir Excepción" -"Add Field Mapping","Añadir Mapeo de Campo" -"Add Field with URL:","Añadir Campo con URL:" -"Add New","Añadir Nuevo" -"Add New Image","Añadir Nueva Imagen" -"Add New Profile","Añadir Nuevo Perfil" -"Add New Role","Añadir Nuevo Papel" -"Add New Template","Agregar nueva plantilla" -"Add New URL Rewrite","Añadir Nueva Reescritura de URL" -"Add New User","Añadir Nuevo Usuario" -"Add New Variable","Añadir Nueva Variable" -"Add Products","Añadir productos" -"Add URL Rewrite","Añadir Reescritura de URL" -"Add URL Rewrite for a Category","Añadir Reescritura de URL para una Categoría" -"Add URL Rewrite for a Product","Añadir Reescritura de URL para un Producto" -"Add after","Añadir después" -"Additional Cache Management","Gestión de Caché Adicional" -"Address Type:","Tipo de dirección:" -"Admin","Administrar" -"Advanced Admin Section","Sección de Adminsitración Avanzada" -"Advanced Profiles","Perfiles Avanzados" -"Advanced Section","Sección Avanzada" -"After authorization application will have access to you account.","Después de la solicitud de autorización tendrás acceso a tu cuenta." -"All","Todo" -"All Allowed Countries","Todos los Paises Aceptados" -"All Cache","Todo Cache" -"All Files","Todos los Archivos" -"All Reviews","Todas las Revisiones" -"All Store Views","Todas las vistas de tienda" -"All Tags","Todas la Etiquetas" -"All Websites","Todos los Sitios Web" -"All countries","Todos los países" -"All fields","Todos los campos" -"All possible rates were fetched, please click on ""Save"" to apply","Todas las tarifas posibles se recuperaron, por favor, haz clic en ""Guardar"" para aplicarlas." -"All rates were fetched, please click on ""Save"" to apply","Todas las tarifas se recuperaron. por favor, haz clic en ""Guardar"" para aplicarlas" -"All valid rates have been saved.","Todas las tarifas válidas han sido guardadas" -"Always (during development)","Siempre (durante el desarrollo)" -"Amounts","Cantidades" -"An error has occured while syncronizing media storages.","Ha ocurrido un error mientras se sincronizaban los soportes audiovisuales." -"An error occurred while clearing the JavaScript/CSS cache.","Un error ocurrió mientras se borraba el cache de JavaScript/CSS." -"An error occurred while clearing the image cache.","Un error ocurrió mientras se borraba el cache de imagen" -"An error occurred while deleting URL Rewrite.","Ha habido un error al borrar la URL, reescribela." -"An error occurred while deleting email template data. Please review log and try again.","Un error ocurrió mientras se borraba la plantilla de datos de e-mail. Por favor revisa el usuario e intente otra vez." -"An error occurred while deleting record(s).","Ha habido un error al borrar el(los) historial(es)." -"An error occurred while deleting this role.","Un error ocurrió mientras se borraba esta función." -"An error occurred while deleting this set.","Un error ocurrió mientras se borraba este modelo." -"An error occurred while deleting this template.","Un error ocurrió mientras se borraba esta plantilla." -"An error occurred while finishing process. Please refresh the cache","Un error ocurrió mientras se finalizaba el proceso. Por favor actualice el cache." -"An error occurred while rebuilding the CatalogInventory Stock Status.","Un error ocurrió mientras se reconstruia el estado del catálogo-inventario" -"An error occurred while rebuilding the catalog index.","Un error ocurrió mientras se reconstruía el índice del catálogo." -"An error occurred while rebuilding the flat catalog category.","Un error ocurrió mientras se reconstruía la categoría catálogo." -"An error occurred while rebuilding the flat product catalog.","Un error ocurrió mientras se reconstruía el catálogo de producto." -"An error occurred while rebuilding the search index.","Un error ocurrió mientras se reconstruía el índice buscador." -"An error occurred while refreshing the Catalog Rewrites.","Un error ocurrió mientras se actualizaba los correcciones en el catálogo." -"An error occurred while refreshing the Layered Navigation indices.","Se produjo un error al actualizar los índices de navegación por capas." -"An error occurred while refreshing the catalog rewrites.","Ha ocurrido un error al actualizar la reescritura de los catálogos." -"An error occurred while refreshing the layered navigation indices.","Ha ocurrido un error al actualizar los índices de navegación por capas." -"An error occurred while saving URL Rewrite.","Ha habido un error al guardar la URL, reescribela." -"An error occurred while saving account.","Se produjo un error al guardar la cuenta" -"An error occurred while saving review.","Ha habido un error al guardar la reseña." -"An error occurred while saving the customer.","Se produjo un error al guardar el cliente." -"An error occurred while saving this configuration:","Se produjo un error al guardar esta configuración:" -"An error occurred while saving this role.","Se produjo un error al guardar esta profesión." -"An error occurred while saving this template.","Se produjo un error al salvar este modelo." -"An error occurred while updating the selected review(s).","Se produjo un error al actualizar la(s) revisión(es) seleccionada(s)." -"Any","Cualquier" -"Any Attribute Set","Cualquier Atributo Establecido." -"Any Group","Todos los grupos" -"Any Status","Todos los estados" -"Any Store","Cualquier Tienda." -"Any Type","Todos los tipos" -"Any Visibility","Todas las visualizaciones" -"Any data created since the backup was made will be lost including admin users, customers and orders.","Cualquier archivo creado desde la creación de la copia de seguridad se perderá, incluyendo usuarios administradores, clientes y pedidos." -"Archive file name:","Nombre del archivo:" -"Are you sure that you want to delete this template?","¿Está seguro de que quiere borrar esta plantilla?" -"Are you sure that you want to strip tags?","¿Está seguro de que quiere eliminar las etiquetas?" -"Are you sure you want to do this?","¿Estás seguro de querer hacer esto?" -"Are you sure you want to proceed?","¿Estás seguro de que quieres continuar?" -"Area","Área" -"As low as:","Tan bajo como:" -"Assigned","Asignado" -"Associated Tags","Etiquetas asociadas" -"Attribute Set Name:","Nombre del conjunto de atributos:" -"Attributes","Atributos" -"Authorization confirmed","Autorización confirmada" -"Authorize","Autorizar" -"Authorize application","Autorizar aplicación" -"Authorized OAuth Tokens","Símbolos autorizados de OAuth" -"Automatic (equalize price ranges)","Automático (igualar precio de productos)" -"Automatic (equalize product counts)","Automático (igualar total de productos)" -"Average Order Amount","Cantidad orden media" -"Average Orders","Órdenes promedias" -"BINARY","BINARIO" -"Back","Volver" -"Back to Login","Volver a Conexión" -"Backup","Copia de respaldo" -"Backup Name","Nombre de la copia de seguridad" -"Backup options","Opciones de la copia de seguridad" -"Backups","Copias de seguridad" -"Base currency","Moneda base" -"Bcc","CO" -"Bestsellers","Los más vendidos" -"Billing Address","Dirección de facturación" -"Billing Address: ","Dirección de facturación:" -"Billing Agreement","Acuerdo de facturación" -"Billing Agreements","Contratos de facturación" -"Block Information","Información de bloque" -"Both (without and with tax)","Ambos (con y sin impuestos)" -"Both IPN and PDT","Tanto IPN como PDT" -"Browse Files...","Examinar archivos..." -"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","Un lote con precio dinámico no puede incluir opciones personalizadas. No se grabarán las opciones." -"CMS","CMS" -"CRITICAL","crítico" -"CSV","CSV" -"CSV / Tab separated","CSV / separado por tabuladores" -"Cache Control","Control de memoria caché" -"Cache Control (beta)","Control de memoria caché (beta)" -"Cache Management","Gestión de Caché." -"Cache Type","Tipo de memoria caché" -"Cancel","Cancelar" -"Cannot add new comment.","No se puede agregar un nuevo comentario." -"Cannot add tracking number.","No se puede agregar un número de seguimiento." -"Cannot create an invoice without products.","No se puede crear una factura sin productos." -"Cannot create credit memo for the order.","No se puede crear una nota de crédito para el pedido." -"Cannot delete the design change.","No se puede eliminar el cambio de diseño." -"Cannot delete tracking number.","No se puede eliminar el número de seguimiento." -"Cannot do shipment for the order separately from invoice.","No se pueden hacer envíos para el pedido independientemente de la factura." -"Cannot do shipment for the order.","No se pueden hacer envíos para el pedido." -"Cannot initialize shipment for adding tracking number.","No se puede inicializar el envío para agregar el número de seguimiento." -"Cannot initialize shipment for delete tracking number.","No se puede inicializar el envío para eliminar el número de seguimiento." -"Cannot load track with retrieving identifier.","No se puede cargar el seguimiento con el identificador de recuperación." -"Cannot retrieve tracking number detail.","No se puede recuperar el detalle del número de seguimiento." -"Cannot save shipment.","No se puede guardar el envío." -"Cannot save the credit memo.","No se puede guardar la nota de crédito." -"Cannot send shipment information.","No se puede enviar información del envío." -"Cannot update item quantity.","No se puede actualizar la cantidad de artículos." -"Cannot update the item\'s quantity.","No se puede actualizar la cantidad del artículo." -"Card Verification Number","Número de Verificación de Tarjeta" -"Catalog","Catálogo" -"Catalog Price Rules","Catálogo de Normas sobre Precios" -"Catalog Rewrites","Reescrituras de catálogo" -"Categories","Categorías" -"Category","Categoría" -"Category:","Categoría:" -"Chart is disabled. If you want to enable chart, click here.","Tabla deshabilitada. Si quere habilitar la tabla, pulse here." -"Checkbox","Casilla de verificación" -"Child Transactions","Transacciones hija" -"Choose Store View:","Selecciona Vista de la Tienda:" -"Choose an attribute","Elija un atributo" -"Chosen category does not associated with any website, so url rewrite is not possible.","La categoría elegida no está asociada con ninguna página web, así que no es posible reescribir la url." -"Chosen product does not associated with any website, so url rewrite is not possible.","El producto elegido no está asociado con ninguna página web, así que no es posible reescribir la url." -"Clear","Limpiar" -"Close","cerrar" -"Code","Code" -"Comment text field cannot be empty.","El campo de texto de comentarios no puede quedar vacío." -"Complete","Completo" -"Config form fieldset clone model required to be able to clone fields","Configurar el formulario de Fieldset para el modelo clon requerido para clonar campos" -"Configuration","Configuración" -"Confirm New Password","Confirmar Nueva Contraseña" -"Confirm token authorization Pop Up for admin","Confirmar símbolo de autorización Pop Up para administradores" -"Confirm token authorization for admin","Confirmar símbolo de autorización para administradores" -"Confirmation Of Authorization","Confirmación de autorización" -"Confirmed email:","Correo electrónico confirmado:" -"Connect with the Magento Community","Conectarse con la comunidad Magento" -"Continue","Continuar" -"Convert to Plain Text","Convertir a texto sin formato" -"Cookie (unsafe)","Cookie (no segura)" -"Country","País" -"Country:","País:" -"Coupons","Cupones" -"Create","Crear." -"Create DB Backup","Crear Copia de Seguridad de la Base de Datos" -"Create New Attribute","Crear Nuevo Atributo" -"Create URL Rewrite:","Crear Reestructura de URL:" -"Created At","Creado en" -"Credit Card %s","%s de la tarjeta de crédito" -"Credit Card Number","Número de Tarjeta de Crédito" -"Credit Card Number: xxxx-%s","Número de Tarjeta de Crédito: xxxx-%s" -"Credit Card Type","Tipo de Tarjeta de Crédito" -"Credit Card Type: %s","Tipo de Tarjeta de Crédito: %s" -"Credit Memo History","Historial de facturas rectificativas" -"Credit Memo Totals","Total de las facturas rectificativas" -"Credit Memos","Facturas rectificativas" -"Credit memo #%s comment added","%s Comentario añadido en la nota de crédito" -"Credit memo #%s created","Creada nota de crédito #%s" -"Credit memo\'s total must be positive.","El total de la nota de crédito debe ser positivo." -"Currency","Divisa" -"Currency ""%s"" is used as %s in %s.","Moneda ""%s"" es usada como %s en %s." -"Currency Information","Información sobre la Divisa" -"Currency Setup Section","Sección de Configuración de Divisa" -"Current Configuration Scope:","Rango de configuración actual:" -"Current Month","Mes Actual" -"Custom","Personalizado" -"Custom Variable ""%s""","""%s"" customizados variables" -"Custom Variables","Variables personalizadas" -"Customer","Cliente" -"Customer Group:","Grupo de clientes:" -"Customer Groups","Grupos de Cliente" -"Customer Name","Nombre del Cliente" -"Customer Reviews","Revisiones de Cliente" -"Customer Shopping Carts","Carritos de la Compra del Cliente" -"Customer Since:","Cliente desde:" -"Customer Tax Classes","Tipos de impuestos del cliente" -"Customer with the same email already exists.","Ya existe un cliente con el mismo correo electrónico." -"Customers","Clientes" -"Customers by Number of Orders","Clientes por número de pedidos." -"Customers by Orders Total","Clientes por total de pedidos" -"DHTML Date/Time Selector","Selector de fecha/hora DHTML" -"Dashboard","Panel de control" -"Data Format","Formato de la fecha" -"Data transfer:","Transferencia de datos:" -"Database","Base de datos" -"Dataflow - Advanced Profiles","Flujo de datos - Perfiles avanzados" -"Dataflow - Profiles","Flujo de datos - Perfiles" -"Date","Fecha" -"Date & Time","Fecha y Hora" -"Date Added","Añadido el día" -"Date Updated","Fecha de actualización" -"Date selection:","Elección de la fecha:" -"Date selector","Selector de fechas" -"Day","Día" -"Decimal separator:","Separador de decimales:" -"Default (Admin) Values","Valores iniciales (de admin.)" -"Default Billing Address","Dirección de Facturación por Defecto" -"Default Config","Configuración por Defecto" -"Default Template from Locale","Configuración Regional de la Plantilla por Defecto" -"Default Values","Valores por Defecto" -"Default display currency ""%s"" is not available in allowed currencies.","""%s"" de la moneda por defecto no disponible en monedas permitdas." -"Default scope","Ámbito por defecto." -"Delete","Eliminar" -"Delete %s","Borrar %s" -"Delete %s '%s'","Borrar %s '%s'" -"Delete File","Borrar Archivo" -"Delete Image","Borrar Imagen" -"Delete Profile","Borrar Perfil" -"Delete Role","Borrar Rol" -"Delete Store","Eliminar tienda" -"Delete Store View","Eliminar vista de la tienda" -"Delete Template","Eliminar plantilla" -"Delete User","Borrar Usuario" -"Delete Website","Eliminar página web" -"Description","Descripción" -"Design","Diseño" -"Design Section","Sección de diseño" -"Details","Detalles" -"Developer Section","Sección para desarrolladores" -"Direction:","Dirección:" -"Disable","Desactivar" -"Disabled","Deshabilitado" -"Display %s first","Mostrar %s primero" -"Display default currency","Mostrar moneda predeterminada" -"Distributed under GNU LGPL. See %s for details.","Distribuido según la LGPL de GNU. Para más información véase %s." -"Do you really want to KILL parallel process and start new indexing process?","¿Desea anular todos los procesos paralelos y comenzar un nuevo proceso de indexación?" -"Do you really want to proceed?","¿De verdad que quieres seguir?" -"Download","Descargar" -"Downloads","Descargas." -"Drag to move","Arrastrar para mover" -"Drop-down","Desplegable" -"Edit","Editar" -"Edit Design Change","Editar Diseñar cambio" -"Edit Email Template","Editar plantilla de correo electrónico" -"Edit Order","Editar pedido" -"Edit Poll","Editar encuesta" -"Edit Queue","Editar cola" -"Edit Review","Editar Comentario" -"Edit Role","Modificar el rol" -"Edit Store View","Editar vista de la tienda" -"Edit System Template","Editar plantilla del sistema" -"Edit Template","Editar plantilla" -"Edit URL Rewrite","Editar Reescritura de URL" -"Edit User","Editar Usuario" -"Edit User '%s'","Modificar usuario «%s»" -"Edit Website","Editar página web" -"Email","Correo electrónico" -"Email Address:","Dirección de Correo Electrónico:" -"Email Preview","Vista previa de email" -"Email to a Friend","Escribir un Email a un amigo" -"Email:","Email:" -"Enable","Habilitar" -"Enabled","Habilitado" -"Enclose Values In:","Adjuntar valores en:" -"Entity Attributes","Atributos de la Entidad" -"Entity Type","Tipo de Entidad" -"Entity type:","Tipo de entidad:" -"Error","Error" -"Excel XML","Excel XML" -"Excl. Tax","Impuestos no incluidos" -"Exclude media folder from backup","Excluir carpetas de archivos multimedia para la copia de seguridad" -"Expiration Date","Fecha de Caducidad" -"Expiration Date: %s/%s","Fecha de caducidad: %s/%s" -"Export","Exportar" -"Export CSV","Exportar CSV" -"Export Filters","Exportar Filtros" -"Export to:","Exportar a:" -"Export:","Exportar:" -"FTP Host","Servidor FTP" -"FTP Host[:Port]","Servidor FTP[:Puerto]" -"FTP Login","Inicio de sesión FTP" -"FTP Password","Contraseña FTP" -"FTP credentials","Credenciales FTP" -"Failed","Fallido" -"Failed to add a product to cart by id ""%s"".","Fallo en añadir producto a la cesta por ""%s"" de id." -"Failed to cancel the billing agreement.","No se pudo cancelar el acuerdo de pago." -"Failed to clear the JavaScript/CSS cache.","No se pudo borrar la memoria caché de JavaScript/CSS." -"Failed to delete the billing agreement.","No se pudo eliminar el acuerdo de pago." -"Failed to update the profile.","No se ha podido actualizar el perfil." -"Field","Campo" -"Field Mapping","Mapeo del área" -"File","Archivo" -"File Information","Información de Archivo" -"File System","Sistema de archivos" -"File mode","Modo de archivo" -"File name:","Nombre del archivo:" -"File size should be more than 0 bytes","El tamaño del archivo debe ser mayor a 0 bytes" -"Finished profile execution.","Ejecución del perfil finalizada" -"First Invoice Created Date","Fecha de Creación de la Primera Factura" -"First Name","Nombre" -"First Name is required field.","El campo Nombre es obligatorio." -"First Name:","Nombre:" -"Fixed","Fijo" -"Flush Catalog Images Cache","Limpiar la caché de imágenes de catálogo" -"Flush JavaScript/CSS Cache","Limpiar la caché del JavaScrip/CSS" -"For category","Para la categoría" -"For latest version visit: %s","Para la última versión visita: %s" -"For product","Para el producto" -"Forgot Admin Password","Ha olvidado la contraseña de Administrador" -"Forgot your password?","¿Olvidaste tu contraseña?" -"Forgot your user name or password?","¿Ha olvidado el usuario o la contraseña?" -"From","desde" -"GLOBAL","GLOBAL" -"Gb","Gb" -"General Information","Información general" -"General Section","Sección general" -"Get Image Base64","Obtener imagen Base64" -"Get help for this page","Consiga ayuda para esta página" -"Give the verifier code to application administrator","Proporcionar el código de verificación al administrador de la aplicación" -"Global Attribute","Atributo global" -"Global Record Search","Búsqueda de registro global" -"Global Search","Búsqueda global" -"Go Today","Ir a Hoy" -"Go to messages inbox","Ir al buzón de entrada de mensajes" -"Go to notifications","Ir a notificaciones" -"Google Base","Google Base" -"Google Content","Contenido de Google" -"Google Sitemaps","Google Sitemaps" -"Grand Total","Suma total" -"Grid (default) / List","Cuadrícula (por omisión) / lista" -"Grid Only","Solo cuadrícula" -"Group:","Grupo:" -"Guest","Invitado" -"HTTP (unsecure)","HTTP (inseguro)" -"HTTPS (SSL)","HTTPS (SSL)" -"Help Us Keep Magento Healthy - Report All Bugs","Ayúdanos a Mantener Magento Saludable - Informar de Todos los Errores" -"Helper attributes should not be used in custom layout updates.","Los atributos del asistente no se deberían utilizar en las actualizaciones de diseños personalizados." -"Helper for options rendering doesn't implement required interface.","El asistente para la ejecución de opciones no implementa la interfaz solicitada." -"Home","Inicio" -"ID","Identificación" -"ID Path","Ruta de la ID" -"IP Address","Dirección IP" -"IPN (Instant Payment Notification) Only","Sólo IPN (notificación de pago instantánea)" -"Id","Id" -"If there is an account associated with %s you will receive an email with a link to reset your password.","Si hay una cuenta asociada con %s recibirás un correo electrónico con un enlace para reiniciar tu contraseña." -"If this message persists, please contact the store owner.","Si persiste este mensaje póngase en contacto con el dueño de la tienda." -"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Al no especificar un valor de opción para una vista de tienda específica, se utilizará el valor por defecto (Admin)." -"Images (.gif, .jpg, .png)","Imágenes (.gif, .jpg, .png)" -"Images Cache","Caché de Imágenes" -"Import","Importar" -"Import Service","Importar servicio" -"Import and Export","Importación y exportación" -"Import and Export Tax Rates","Impuestos de importación y exportación" -"Import/Export","Importación/exportación" -"Import/Export Advanced","Importar/Exportar Avanzados" -"Import/Export Profile","Perfil de importación/exportación" -"Important: ","Importante:" -"Imported %s records","Registros importados de %s" -"In","En" -"In Database:","En base de datos:" -"In File:","En el Archivo:" -"Inactive","Inactivo" -"Incl. Tax","Impuestos incluidos" -"Incoming Message","Mensaje nuevo" -"Insert Variable...","Insertar variable..." -"Interactive","Interactivo" -"Interface Locale: %s","Configuración regional de interfaz: %s" -"Invalid Form Key. Please refresh the page.","Clave de Formulario No Válida. Por favor, actualice la página." -"Invalid Import Service Specified","Se Especificó un Servicio de Importación No Válido." -"Invalid POST data (please check post_max_size and upload_max_filesize settings in your php.ini file).","Datos introducidos no válidos (compruebe la configuración de entrada_tamaño_máximo y carga_tamañodearchivo_máximo en su archivo php.ini)." -"Invalid Secret Key. Please refresh the page.","Clave Secreta No Válida. Por favor, actualice la página." -"Invalid User Name or Password.","La contraseña o nombre usuario no son correctos." -"Invalid directory: %s","Directorio inválido: %s" -"Invalid email address ""%s"".","Dirección de mail ""%s"" no válida." -"Invalid email address.","Dirección de correo electrónico no válida." -"Invalid file: %s","Archivo no válido: %s" -"Invalid input data for %s => %s rate","Datos de entrada no válidos para %s => %s tasa" -"Invalid parent block for this block","Bloque principal no válido para este bloque" -"Invalid parent block for this block.","Bloque padre no válido para este bloque." -"Invalid password reset token.","La contraseña no es correcta, reinicia el token." -"Invalid sender name ""%s"". Please use only visible characters and spaces.","Nombre de remitente ""%s"" no válido. Por favor, utilice solo caracteres visibles y espacios." -"Invalid timezone","Zona horaria no válida" -"Invalidated","Invalidado" -"Inventory Stock Status","Estado de Existencias de Inventario" -"Invoice #%s comment added","Comentario de factura #%s añadido" -"Invoice #%s created","Factura #%s creada" -"Invoice History","Historial de Facturas" -"Invoice Totals","Total de la factura" -"Invoice canceling error.","Error de cancelación de factura." -"Invoice capturing error.","Error de captura de factura." -"Invoice voiding error.","Error de anulación de factura." -"Invoices","Facturas" -"Is Closed","Está cerrado" -"Is Default","Por defecto" -"Issue Number","Número de Emisión" -"Items","Artículos." -"JavaScript seems to be disabled in your browser.","Puede que JavaScript esté deshabilitado en tu navegador." -"JavaScript/CSS","JavaScript/CSS" -"JavaScript/CSS Cache","JavaScript/CSS Caché" -"Kb","Kb" -"Last 24 Hours","Últimas 24 Horas" -"Last 5 Orders","Últimos 5 pedidos." -"Last 5 Search Terms","Últimas 5 búsquedas." -"Last 7 Days","Últimos 7 Días" -"Last Credit Memo Created Date","Fecha de Creación de la Última Factura de Abono" -"Last Invoice Created Date","Fecha de Creación de la Última Factura" -"Last Logged In (%s):","Última conexión (%s):" -"Last Logged In:","Último inicio de sesión:" -"Last Name","Apellido" -"Last Name is required field.","El campo Apellido es obligatorio." -"Last Name:","Apellido:" -"Last updated: %s. To refresh last day\'s statistics, click here.","Última actualización: %s. Para refrescar las estadísticas del último día, pinche aquí." -"Latest Message:","Último mensaje:" -"Layered Navigation Indices","Índices de Navegación en Capas" -"Layered Navigation Indices were refreshed.","Los índices de la navegación por capas se han refrescado." -"Leave empty to use tax identifier","Deje en blanco para identificación fiscal" -"Lifetime Sales","Ventas de por vida" -"Lifetime statistics have been updated.","Se actualizaron las estadísticas de vigencia." -"Links","Enlaces" -"Links with associated products will retain only after saving current product.","Los enlaces a los productos relacionados sólo quedarán registrados tras guardar el producto actual." -"List (default) / Grid","Lista (por defecto) / cuadrícula" -"List Only","Lista Solamente" -"Load Template","Cargar Plantilla" -"Load default template","Cargar plantilla por defecto" -"Loading...","Cargando..." -"Local Server","Servidor local" -"Local/Remote Server","Servidor local/remoto" -"Locale","Configuración regional" -"Log In","Acceder" -"Log Out","Cerrar sesión" -"Log in to Admin Panel","Iniciar Sesión en el Panel de Administración" -"Log in to use %s","Acceder para utilizar %s" -"Log into Magento Admin Page","Iniciar Sesión en la Página de Administración de Magento" -"Logged in as %s","Sesión iniciada como %s" -"Login","Iniciar sesión" -"Low Stock","Existencias Bajas" -"MAJOR","mayor" -"MINOR","MENOR" -"MS Excel XML","MS Excel XML" -"Magento Admin","Administración de Magento" -"Magento Commerce - Administrative Panel","Magento Commerce - Panel de administración" -"Magento Connect","Magento Connect" -"Magento Connect Manager","Administrador de Magento Connect" -"Magento Logo","Logotipo de Magento" -"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento es una marca registrada de Magento Inc. Copyright © %s Magento Inc." -"Magento root directory","Directorio raíz Magento" -"Magento ver. %s","Magento versión %s" -"Magento™ is a trademark of Magento Inc.
    Copyright © %s Magento Inc.","Magento™ es una marca registrada de Magento Inc.
    Copyright ©: %s Magento Inc." -"Make sure that data encoding in the file is consistent and saved in one of supported encodings (UTF-8 or ANSI).","Asegúrese de que la codificación de los datos en el archivo es consistente y han sido guardados en alguno de los códigos admitidos (UTF-8 o ANSI)." -"Manage Attribute Sets","Administrar conjuntos de atributos" -"Manage Attributes","Administrar atributos" -"Manage Categories","Gestionar categorías" -"Manage Content","Administre Contenido" -"Manage Currency Rates","Gestionar Tasa de Moneda" -"Manage Currency Symbols","Gestionar símbolos de moneda" -"Manage Customers","Gestionar Clientes" -"Manage Options (values of your attribute)","Administrar opciones (valores de tus atributos)" -"Manage Ratings","Administrar puntuaciones" -"Manage Stores","Gestionar Tiendas" -"Manage Tax Rules","Gestión de las normas fiscales" -"Manage Tax Zones and Rates","Administrar zonas y tasas impositivas" -"Manage Titles (Size, Color, etc.)","Administrar títulos (tamaño, color, etc.)" -"Manual","Manual" -"Matched Expression","Expresión de coincidencia" -"Maximum sender name length is 255. Please correct your settings.","La extensión máxima del nombre del remitente es de 255. Por favor, corrige los ajustes." -"Mb","Mb" -"Media (.avi, .flv, .swf)","Archivos multimedia (.avi, .flv, swf)" -"Media storages synchronization has completed!","¡Se ha completado la sincronización del almacenamiento de contenido!" -"Messages Inbox","Bandeja de entrada de mensajes" -"Month","Mes" -"Most Viewed","Los Más Vistos" -"Most Viewed Products","Productos Más Vistos" -"Multiple Select","Elección múltiple" -"My Account","Mi cuenta" -"My Applications","Mis aplicaciones" -"N/A","N/A" -"NOTICE","aviso" -"Name","Nombre" -"Name on Card","Nombre en la Tarjeta" -"Name on the Card: %s","Nombre en la Tarjeta: %s" -"Name:","Nombre:" -"Never (production)","Nunca (producción)" -"New ","Nuevo" -"New API Key","Nueva clave de API" -"New Accounts","Nuevas Cuentas" -"New Attribute","Nuevo Atributo" -"New Block","Nuevo bloque" -"New Category","Nueva categoría" -"New Class","Nueva clase" -"New Condition","Nueva condición" -"New Custom Variable","Nueva variable personalizada" -"New Customer","Nuevo cliente" -"New Customers","Nuevos Clientes" -"New Design Change","Nuevo cambio de diseño" -"New Email Template","Plantilla de nuevo correo" -"New Group","Nuevo grupo" -"New Invoice","Nueva Factura" -"New Item Type","Nuevo tipo de artículo" -"New Memo","Nueva nota" -"New Memo for #%s","Nueva nota para n.º %s" -"New Page","Nueva Página" -"New Password","Nueva Contraseña" -"New Poll","Nueva encuesta" -"New Profile","Nuevo perfil" -"New Rate","Nueva tasa" -"New Rating","Nueva puntuación" -"New Review","Nueva Revisión" -"New Role","Nuevo rol" -"New Rule","Nueva Regla" -"New Search","Nueva búsqueda" -"New Set","Nuevo Conjunto" -"New Shipment","Nuevo Envío" -"New Sitemap","Nuevo mapa del sitio web" -"New Store View","Nueva vista de tienda" -"New System Template","Nueva plantilla del sistema" -"New Tag","Nueva Etiqueta" -"New Template","Nueva Plantilla" -"New User","Nuevo usuario" -"New Variable","Nueva variable" -"New Website","Nuevo Sitio Web" -"New attribute set mapping","Asignar nuevo atributo" -"New password field cannot be empty.","El campo de nueva contraseña no puede estar en blanco." -"Newsletter","Boletín de noticias" -"Newsletter Problems","Problemas del Boletín" -"Newsletter Queue","Cola de Boletín de Noticias" -"Newsletter Subscribers","Suscriptores de Boletín de Noticias" -"Newsletter Templates","Plantillas de Boletín de Noticias" -"Next month (hold for menu)","Próximo mes (mantener para menú)" -"Next year (hold for menu)","Año siguiente (mantenga presionado para ver menú)" -"No","No" -"No (price without tax)","No (precio sin impuestos)" -"No Data","Sin datos" -"No Data Found","No se han encontrado datos" -"No Templates Found","No se Encontraron Plantillas" -"No change","Sin cambios" -"No customer id defined.","No se ha definido ningún id de cliente." -"No information available.","No hay información disponible." -"No profile loaded...","No hay perfil cargado..." -"No records found for this period.","No se han encontrado registros para este período." -"No records found.","No se han encontrado registros." -"No report code specified.","No se especificó el código de informe." -"No search keywords.","No hay palabras de búsqueda." -"No search modules were registered","No se han registrado módulos de búsqueda" -"No wishlist item id defined.","No se ha definido ningún id de artículo de lista de intención de compra." -"None","Ninguno" -"Note:","Nota:" -"Notes","Notas" -"Notifications","Notificaciones" -"Number of Orders","Número de pedidos" -"Number of Uses","Número de Usos" -"Number of Views","Número de visualizaciones" -"Number of records:","Número de registros:" -"OAuth Consumers","Consumidores de OAuth" -"OAuth authorization for admin","Autorización de OAuth para administradores" -"OAuth authorization simple for admin","Autorización simple de OAuth para administradores" -"OK","Aceptar" -"Old rate:","Tasa anterior:" -"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Al iniciar sesión en tu cuenta de pagos avanzados de PayPal has de acceder a la configuración del servicio - Páginas receptoras de pago - Configuración del menú y ajustar las opciones descritas a continuación" -"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Al iniciar sesión en tu cuenta PayPal Payflow Link, has de acceder a la configuración del servicio - Páginas receptoras de pago - Configuración del menú y ajustar las opciones descritas a continuación" -"One or more media files failed to be synchronized during the media storages syncronization process. Refer to the log file for details.","Ha fallado la sincronización de uno o más ficheros de contenido durante el proceso de sincronización del almacenamiento de contenido. Revise el fichero de log para ver más detalles." -"One or more of the Cache Types are invalidated:","Están invalidados uno o más de los tipos de caché:" -"Online Customers","Clientes conectados" -"Only Once (version upgrade)","Solo una vez (actualización de la versión)" -"Only attributes with scope ""Global"", input type ""Dropdown"" and Use To Create Configurable Product ""Yes"" are available.","Solo están disponibles los atributos con alcance ""Global"", tipo de selección ""Lista desplegable"" y los de tipo Utilizar para Crear Producto Configurable ""Si""." -"Only mapped fields","Sólo campos mapeados" -"Optional","Opcional" -"Options","Opciones" -"Options is required","Opciones requeridas" -"Order","Pedido" -"Order #%s","Pedido #%s" -"Order #%s (%s)","Pedido #%s (%s)" -"Order Created Date","Fecha de creación del pedido" -"Order ID","Solicitar ID" -"Order Totals","Solicitar totales" -"Order Updated Date","Fecha de actualización del pedido" -"Order Updated Date report is real-time, does not need statistics refreshing.","El informe de la fecha de actualización del pedido se hace en tiempo real, así que no es necesario actualizar la estadística." -"Orders","Pedidos" -"Original Magento attribute names in first row:","Nombres originales de atributos Magento en la primera fila:" -"Out of stock","Sin existencias" -"PDT (Payment Data Transfer) Only","Sólo PDT (transmisión de datos de pago)" -"Package Extensions","Extensiones de paquete" -"Pages","Páginas" -"Parent Product Thumbnail","Miniatura del producto padre" -"Parent Transaction ID","ID de la transacción de origen" -"Passive mode","Modo pasivo" -"Password","Contraseña" -"Password Confirmation","Confirmación de contraseña" -"Password confirmation must be same as password.","La confirmación de contraseña debe ser igual que la contraseña." -"Password must be at least of %d characters.","La contraseña debe tener al menos %d caracteres." -"Password must include both numeric and alphabetic characters.","La contraseña debe contener letras y números." -"Password:","Contraseña:" -"Path:","Ruta:" -"Payment method instance is not available.","No está disponible la instancia del método de pago." -"Payment method is not available.","No está disponible el método de pago." -"Payment method must be specified.","Se debe especificar el método de pago." -"Pending Reviews","Revisiones Pendientes" -"Pending Tags","Etiquetas Pendientes" -"Per Item","Por artículo" -"Per Order","Por Pedido" -"Percent","Porcentaje" -"Performed At","Realizo en" -"Period","Período" -"Permanent (301)","Permanente (301)" -"Permissions","Permisos" -"Personal Information","Información Personal" -"Phone:","Teléfono:" -"Please Select","Seleccionar, por favor." -"Please confirm site switching. All data that hasn\'t been saved will be lost.","Confirme el cambio de sitio. Se perderán todos los datos que no se hayan guardado." -"Please enter 6 or more characters.","Ingrese 6 o más caracteres." -"Please enter a number greater than 0 in this field.","Ingrese un número mayor que 0 en este campo." -"Please enter a valid $ amount. For example $100.00.","Ingrese un monto válido en $. Por ejemplo: $100.00." -"Please enter a valid URL. For example http://www.example.com or www.example.com","Ingrese una dirección URL válida. Por ejemplo: http://www.ejemplo.com o www.ejemplo.com" -"Please enter a valid URL. http:// is required","Ingrese una dirección URL válida. El prefijo http:// es obligatorio" -"Please enter a valid credit card number.","Por favor, introduce un número de tarjeta de crédito válido." -"Please enter a valid date.","Ingrese una fecha válida." -"Please enter a valid email address. For example johndoe@domain.com.","Ingrese una dirección de correo electrónico válida. Por ejemplo: juanperez@dominio.com." -"Please enter a valid email.","Por favor, escriba un email válido." -"Please enter a valid number in this field.","Ingrese un número válido en este campo." -"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Ingrese un número de teléfono válido. Por ejemplo: (123) 456-7890 o 123-456-7890." -"Please enter a valid social security number. For example 123-45-6789.","Ingrese un número de seguro social válido. Por ejemplo: 123-45-6789." -"Please enter a valid value from list","Ingrese un valor válido de la lista" -"Please enter a valid value, ex: 10,20,30","Ingrese un valor válido, por ej., 10, 20, 30" -"Please enter a valid zip code.","Por favor, introduce un código postal válido." -"Please enter a valid zip code. For example 90602 or 90602-1234.","Ingrese un código postal válido. Por ejemplo: 90602 o 90602-1234." -"Please enter another credit card number to complete your purchase.","Escriba el número de otra tarjeta de crédito para terminar su compra." -"Please enter password","Por favor introduce la contraseña" -"Please enter password to confirm rollback.","Por favor introduce la contraseña para confirmar la restauración." -"Please enter valid password.","Ingrese una contraseña válida." -"Please make sure that all global admin search modules are installed and activated.","Asegúrese de que todos los módulos de búsqueda de administración global estén instalados y activados." -"Please make sure that your changes were saved before running the profile.","Por favor, asegúrate de que los cambios se guardan antes de iniciar el perfil." -"Please make sure your passwords match.","Asegúrese de que sus contraseñas coincidan." -"Please select State/Province.","Por favor, selecciona Estado/Provincia." -"Please select a customer.","Seleccione un cliente." -"Please select a store.","Seleccione una tienda." -"Please select an option.","Por favor selecciona una opción." -"Please select catalog searches.","Seleccione búsquedas de catálogos." -"Please select customer(s).","Seleccione clientes." -"Please select message(s).","Por favor, seleccione mensaje(s)." -"Please select one of the above options.","Por favor, selecciona una de las opciones anteriores." -"Please select one of the options.","Seleccione una de las opciones." -"Please select review(s).","Seleccione reseñas." -"Please select tag(s).","Por favor, selecciona la(s) etiqueta(s):" -"Please specify backup creation options","Por favor especifica las opciones de creación de la copia de seguridad" -"Please specify the admin custom URL.","Por favor, especifica la dirección URL personalizada de administración." -"Please try to logout and sign in again.","Intente cerrar sesión y volver a iniciarla." -"Please type the letters from the image:","Por favor escribe las letras de la imagen:" -"Please use in this field only ""a-z,0-9,_"".","En este campo sólo se pueden escribir letras, números y guiones bajos (""a-z,0-9,_"")." -"Please use letters only (a-z) in this field.","Por favor, utiliza solo las letras (a-z) en este campo." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","En este campo sólo se pueden escribir números. Evite los espacios en blanco u otros caracteres, como los puntos o las comas, por ejemplo." -"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","Por favor, utilice solo letras (a-z o A-Z), números (0-9) o espacios en este campo." -"Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Por favor, utiliza solo letras (a-z) o números (0-9) en este campo. No se permiten espacios u otros caracteres." -"Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.","Utilice sólo letras (a-z) o números (0-9), o espacios y números en este campo." -"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Utilice este formato de fecha: dd/mm/aaaa. Por ejemplo, 17/03/2006 para el 17 de marzo de 2006." -"Please wait while the indexes are being refreshed.","Espere mientras se actualizan los índices." -"Please wait, loading...","Espera, por favor. Cargando...." -"Please wait...","Por favor, espera..." -"Please, add some answers to this poll first.","Agregue algunas respuestas a esta encuesta antes de continuar." -"Please, select ""Visible in Stores"" for this poll first.","Por favor, seleccione ""Visible en tiendas"" para esta votación antes." -"Poll Manager","Administrador de encuesta" -"Polls","Encuestas" -"Popular","Popular" -"Position","Posición" -"Position of Watermark for %s","Posición de la marca de agua para %s" -"Pregenerated product images files.","Archivos de imágenes de producto generadas previamente." -"Prev. month (hold for menu)","Mes anterior (mantener para menú)" -"Prev. year (hold for menu)","Año anterior (mantenga presionado para ver el menú)" -"Preview","Vista previa" -"Preview Template","Vista previa de la plantilla" -"Price","Precio" -"Price alert subscription was saved.","Se guardó la suscripción de alerta de precio." -"Price:","Precio:" -"Processed %s%% %s/%d records","Procesados %s%% %s/%d registros" -"Product","Producto" -"Product Name","Nombre de Producto" -"Product Reviews","Opiniones de Producto" -"Product Tax Classes","Clases de Impuestos a Productos" -"Product Thumbnail Itself","Imagen en miniatura del producto" -"Product is not loaded.","El producto no está cargado." -"Product:","Producto:" -"Products","Productos" -"Products Bestsellers Report","Informe de Productos Más Vendidos" -"Products Most Viewed Report","Informe de productos con más visualizaciones" -"Products Ordered","Productos Encargados" -"Products in Carts","Productos en Carritos" -"Profile Action","Acción del perfil" -"Profile Actions XML","XML de las acciones del perfil" -"Profile Direction","Dirección del perfil" -"Profile History","Historial del perfil" -"Profile Information","Información de perfil" -"Profile Name","Nombre de perfil" -"Profile Payments","Pagos del perfil" -"Profile Schedule","Programación del perfil" -"Profile Wizard","Asistente del perfil" -"Profiles","Perfiles" -"Promo","Promoción" -"Promotions","Promociones" -"Purchased Item","Artículo Comprado" -"Put store on the maintenance mode while backup creation","Ponga la tienda en el modo de mantenimiento mientras se crea la copia de seguridad" -"Put store on the maintenance mode while rollback processing","Pon la tienda en modo de mantenimiento mientras se procesa la restauración" -"Quantity","Cantidad" -"Queue Refresh","Actualizar la cola" -"Queued... Cancel","En cola... cancelar" -"REST Roles","Otras funciones" -"Radio Buttons","Botones de selección" -"Rates","Tasas" -"Read details","Leer detalles" -"Rebuild","Reconstruir" -"Rebuild Catalog Index","Reconstruir índice del catálogo" -"Rebuild Flat Catalog Category","Reconstruir Categoría Catálogo Plano" -"Rebuild Flat Catalog Product","Reconstruir Producto Catálogo Plano" -"Recent Orders","Pedidos recientes" -"Recent statistics have been updated.","Se han actualizado las estadísticas recientes." -"Recurring Profile View","Vista de perfil recurrente" -"Recursive Dir","Dir Repetitivo" -"Redirect","Redirigir" -"Reference","Referencia" -"Reference ID","ID de referencia" -"Refresh","Actualizar" -"Refresh Now*","Actualizar ahora*" -"Refresh Statistics","Actualizar Estadísticas" -"Region/State","Región/Provincia" -"Regular Price:","Precio habitual:" -"Reject","Rechazar" -"Reject token authorization Pop Up for admin","Rechazar símbolo de autorización Pop Up para administradores" -"Reject token authorization for admin","Rechazar símbolo de autorización Pop Up" -"Rejection Of Authorization","Rechazo de la autorización" -"Release","Versión" -"Release Stability","Estabilidad de la versión" -"Release Version","Lanzar Versión" -"Reload captcha","Volver a cargar captcha" -"Remote FTP","FTP remoto" -"Remove","Eliminar" -"Reports","Informes" -"Request Path","Solicitud de ruta" -"Required","Obligatorio" -"Reset","Reiniciar" -"Reset Filter","Restablecer Filtro" -"Reset Password","Reiniciar contraseña" -"Reset a Password","Restablecer contraseña" -"Resize","Redimensionar" -"Resource Access","Acceso a recursos" -"Resources","Recursos" -"Results","Resultados" -"Retrieve Password","Recuperar Contraseña" -"Return Html Version","Volver a la versión html" -"Revenue","Ingresos" -"Reviews","Reseñas" -"Reviews and Ratings","Revisiones y Valoraciones" -"Rewrite Rules","Volver a escribir reglas" -"Role ID","ID del rol" -"Role Info","Información del rol" -"Role Information","Información de la función" -"Role Name","Nombre de la función" -"Role Resources","Recursos de la función" -"Role Users","Usuario con roles" -"Roles","Roles" -"Roles Resources","Recursos de roles" -"Root Category","Root Category" -"Rotate CCW","Girar a la izquierda" -"Rotate CW","Girar a la derecha" -"Run","Ejecutar" -"Run Profile","Ejecutar el perfil" -"Run Profile Inside This Window","Ejecutar el perfil en esta ventana" -"Run Profile in Popup","Ejecutar el perfil en una nueva ventana" -"Running... Kill","Ejecutar.......Detener" -"SKU","SKU (Número de Referencia)" -"SKU:","SKU:" -"SSL Error: Invalid or self-signed certificate","Error SSL: certificado inválido o autofirmado" -"Sales","Ventas" -"Sales Report","Informe de ventas" -"Samples","Ejemplos" -"Save","Guardar" -"Save & Generate","Grabar y generar" -"Save Account","Guardar cuenta" -"Save Cache Settings","Guardar los ajustes caché" -"Save Config","Guardar configuración" -"Save Currency Rates","Guardar tasas de cambio" -"Save Profile","Guardar perfil" -"Save Role","Guardar función" -"Save Template","Guardar Plantilla" -"Save User","Guardar usuario" -"Save and Continue Edit","Guardar y continuar editando" -"Search","Buscar" -"Search Index","Índice de Búsqueda" -"Search Term","Plazo de búsqueda" -"Search Terms","Buscar Términos" -"Select","Seleccionar" -"Select All","Seleccionar todo" -"Select Category","Seleccionar Categoría" -"Select Date","Seleccionar Fechas" -"Select Range","Seleccionar Rango" -"Select date","Seleccionar fecha" -"Selected allowed currency ""%s"" is not available in installed currencies.","La divisa permitida seleccionada ""%s"" no está disponible en las divisas instaladas." -"Selected base currency is not available in installed currencies.","La moneda base seleccionada no está disponible en las monedas instaladas." -"Selected default display currency is not available in allowed currencies.","La divisa seleccionada en la pantalla predeterminada no está disponible entre las instaladas." -"Selected default display currency is not available in installed currencies.","La moneda seleccionada por defecto para mostrar no está disponible entre las monedas instaladas." -"Self-assigned roles cannot be deleted.","Los roles autoasignados no se pueden borrar." -"Sender","Remitente" -"Separate Email","Correo aparte" -"Shipment #%s comment added","El comentario al envío #%s ha sido añadido" -"Shipment #%s created","Se creó el envío #%s" -"Shipment Comments","Comentarios de Envío" -"Shipment History","Historial de Envíos" -"Shipments","Envíos" -"Shipping","Envío" -"Shipping Address","Dirección de Envío" -"Shipping Address: ","Dirección de" -"Shipping Origin","Origen del envío" -"Shipping Price","Precio de Envío" -"Shipping address selection is not applicable","La selección de dirección de envío no es aplicable" -"Shipping method must be specified.","El método de envío debe ser especificado." -"Shipping method selection is not applicable","La selección del método de envío no es aplicable" -"Shopping Cart","Cesta de la Compra" -"Shopping Cart Price Rules","Reglas de Precios del Carrito de Compra" -"Shopping Cart from %s","Carro de compra de %s" -"Show By","Mostrar Por" -"Show Report For:","Mostrar informe de:" -"Show Reviews","Mostrar Análisis" -"Sitemap Information","Información del Mapa de la Web" -"Size for %s","Tamaño de %s" -"Skip Category Selection","Saltar Selección de Categoría" -"Some items in this order have different invoice and shipment types. You can create shipment only after the invoice is created.","Algunos artículos de este pedido tienen diferentes tipos de factura y envío. Sólo puede crearse el envío una vez se haya creado la factura." -"Some of the ordered items do not exist in the catalog anymore and will be removed if you try to edit the order.","Algunos de los artículos solicitados no existen ya en el catálogo y serán eliminados si intentas modificar el pedido." -"Sorry, this feature is coming soon...","Lo siento, esta prestación pronto estará disponible..." -"Special Price:","Precio especial:" -"Specific Countries","Especifique países" -"Specified","Especificado" -"Specified profile does not exist.","No existe el perfil solicitado." -"Spreadsheet Name:","Nombre de la Hoja de cálculo:" -"Start Date","Fecha de Inicio" -"Starting profile execution, please wait...","Comenzando la ejecución del perfil, espere por favor..." -"State/Province:","Estado/Provincia:" -"Static Blocks","Bloques estáticos" -"Status","Progreso" -"Status:","Situación:" -"Stock Quantity:","Cantidad en Existencias:" -"Stock notification was saved.","Se ha guardado la notificación de stock." -"Store","Tienda" -"Store Email Addresses Section","Almacenar Sección de Direcciones de Correo Electrónico" -"Store View","Ver Tienda" -"Store:","Tienda:" -"Stores","Tiendas" -"Subject","Asunto" -"Submit","Enviar" -"Subpackage cannot be conflicting.","El Subpaquete no puede estar en conflicto" -"Subtotal","Subtotal" -"Switch/Solo card issue number: %s","Número de emisión de la tarjeta Switch/Solo: %s" -"Switch/Solo card start Date: %s/%s","Fecha de emisión de la tarjeta Switch/Solo: %s/%s" -"Switch/Solo/Maestro Only","Únicamente Switch/Solo/Maestro" -"Switch/Solo/Maestro(UK Domestic) Only","Switch/Solo/Maestro(UK Domestic) Unicamente" -"Switch/Solo/Maestro(UK Domestic) card issue number: %s","Switch/Solo/Maestro(UK Domestic) número de emisión de tarjeta: %s" -"Switch/Solo/Maestro(UK Domestic) card start Date: %s/%s","Switch/Solo/Maestro(UK Domestic) fecha de activación de la tarjeta: %s%s" -"Symbol","Símbolo" -"Synchronization is required.","Se requiere sincronización." -"Synchronization of media storages has been successfully completed.","La sincronización de los almacenamientos de medios se ha completado correctamente." -"Synchronize","Sincronizar" -"Synchronizing %s to %s","Sincronizando %s con %s" -"Synchronizing...","Sincronizando..." -"System","Sistema" -"System Section","Selección de Sistema" -"System busy","El sistema está ocupado" -"Tags","Etiquetas" -"Target Path","Ruta objetivo" -"Tax","Impuestos" -"Tb","Tb" -"Template","Plantilla" -"Template Content","Contenido de la plantilla" -"Template Information","Información de Plantilla" -"Template Name","Nombre de la plantilla" -"Template Styles","Estilos de plantilla" -"Template Subject","Tema de la plantilla" -"Template Type","Tipo de plantilla" -"Temporary (302)","Temporal (302)" -"Terms and Conditions","Términos y Condiciones" -"Text","Texto" -"The Catalog Rewrites were refreshed.","La Reescritura del Catálogo ha sido refrescada." -"The CatalogInventory Stock Status has been rebuilt.","Se ha reconstruido el Estado del Stock del Inventario de Catálogo." -"The Comment Text field cannot be empty.","El campo Comentar Texto no puede estar vacío." -"The Flat Catalog Product was rebuilt","El Cátalogo Plano de Producto ha sido reconstruido" -"The JavaScript/CSS cache has been cleaned.","La cache de JavaScript/CSS se ha limpiado" -"The JavaScript/CSS cache has been cleared.","Se ha limpiado la caché de JavaScript/CSS." -"The Layered Navigation indexing has been queued.","La Indexación de la Navegación por Capas se ha puesto en cola." -"The Layered Navigation indexing queue has been canceled.","La cola de indexación de la Navegación por Capas ha sido cancelada" -"The Layered Navigation indices were refreshed.","Los índices de Navegación por Capas han sido refrescados." -"The Layered Navigation process has been queued to be killed.","El proceso de Navegación por Capas ha sido puesto en cola para su finalización." -"The Magento cache storage has been flushed.","Se ha vaciado el almacenamiento de caché de Magento." -"The URL Rewrite has been deleted.","La URL Reescrita ha sido borrada" -"The URL Rewrite has been saved.","La URL Reescrita ha sido guardada" -"The account has been saved.","La cuenta se ha guardado." -"The archive can be uncompressed with %s on Windows systems","El archivo se puede descomprimir con %s en sistemas Windows" -"The attribute set has been removed.","Se eliminó el conjunto de atributos." -"The backup's creation process will take time.","El proceso de creación de la copia de seguridad llevará tiempo." -"The billing agreement has been canceled.","Se canceló el acuerdo de facturación." -"The billing agreement has been deleted.","Se eliminó el acuerdo de facturación." -"The cache storage has been flushed.","Se borró el almacenamiento de memoria caché." -"The carrier needs to be specified.","Necesita especificarse el transportista." -"The catalog index has been rebuilt.","Se reconstruyó el índice del catálogo." -"The catalog rewrites have been refreshed.","Se actualizaron las reescrituras del catálogo." -"The configuration has been saved.","Se guardó la configuración." -"The credit memo has been canceled.","Se canceló la nota de crédito." -"The credit memo has been created.","Se creó la nota de crédito." -"The credit memo has been voided.","La nota de crédito ha sido cancelada." -"The custom variable has been deleted.","Se eliminó la variable personalizada." -"The custom variable has been saved.","Se ha guardado la variable personalizada." -"The customer has been deleted.","Se eliminó el cliente." -"The customer has been saved.","Se ha guardado el cliente." -"The design change has been deleted.","Se eliminó el cambio de diseño." -"The design change has been saved.","Se guardó el cambio de diseño." -"The email address is empty.","La dirección de correo electrónico está vacía." -"The email template has been deleted.","Se ha eliminado la plantilla de correo electrónico." -"The email template has been saved.","Se guardó la plantilla de correo electrónico." -"The flat catalog category has been rebuilt.","Se ha reconstruido la categoría de catálogo plana." -"The group node name must be specified with field node name.","Debe especificarse el nombre del nodo grupal con el nombre del nodo de campo." -"The image cache was cleaned.","Se borró la memoria caché de la imagen." -"The image cache was cleared.","Se borró la memoria caché de la imagen." -"The invoice and shipment have been created.","Se creó la factura y el envío." -"The invoice and the shipment have been created. The shipping label cannot be created at the moment.","La factura y el envío se han creado. La etiqueta de envío no se puede crear en este momento." -"The invoice has been canceled.","Se canceló la factura." -"The invoice has been captured.","Se capturó la factura." -"The invoice has been created.","La factura ha sido creada." -"The invoice has been voided.","La factura se ha anulado." -"The invoice no longer exists.","La factura ya no existe." -"The item %s (SKU %s) does not exist in the catalog anymore.","El artículo %s (SKU %s) ya no existe en el catálogo." -"The order does not allow creating an invoice.","El pedido no permite crear una factura." -"The order no longer exists.","El pedido ya no existe." -"The poll has been deleted.","Se eliminó la encuesta." -"The poll has been saved.","Se ha guardado la encuesta." -"The profile has been deleted.","Se eliminó el perfil." -"The profile has been saved.","Se ha guardado el perfil." -"The profile has been updated.","El perfil ha sido actualizado." -"The profile has no changes.","El perfil no ha cambiado." -"The profile you are trying to save no longer exists","El perfil que está intentando guardar ya no existe" -"The rating has been deleted.","Se ha eliminado la valoración." -"The rating has been saved.","Se guardó la puntuación." -"The role has been deleted.","Se eliminó el rol." -"The role has been saved.","Se guardó el rol." -"The role has been successfully saved.","Se guardó correctamente el rol." -"The search index has been rebuilt.","Se reconstruyó el índice de búsqueda." -"The shipment has been created.","Se creó el en" -"The shipment has been sent.","Se ha enviado el pedido." -"The shipping label has been created.","Se ha creado la etiqueta de envío." -"The tag has been deleted.","Se ha borrado la etiqueta." -"The tag has been saved.","Se ha guardado la etiqueta." -"The transaction details have been updated.","Se han actualizado los detalles de la transacción." -"The user has been deleted.","Se eliminó el usuario." -"The user has been saved.","Se ha guardado el usuario." -"Themes JavaScript and CSS files combined to one file.","Archivos de tema de JavaScript y CSS combinados en un archivo." -"There is an error in one of the option rows.","Se produjo un error en una de las filas de opción." -"This Account is","Esta cuenta es" -"This Email template no longer exists.","Esta plantilla de correo electrónico ya no existe." -"This Role no longer exists","Este Rol ya no existe" -"This Role no longer exists.","Este rol ya no existe." -"This account is","Esta cuenta es" -"This account is inactive.","Esta cuenta está inactiva." -"This action cannot be undone.","Esta acción no se puede deshacer." -"This attribute set does not have attributes which we can use for configurable product","Este conjunto de atributos no tiene atributos que podamos utilizar para un producto configurable" -"This attribute shares the same value in all the stores","Este atributo comparte el mismo valor en todas las tiendas" -"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Esta es una tienda de demostración. Cualquier pedido que se realice a través de esta tienda no será tramitado o completado." -"This is a required field.","Este es un campo obligatorio." -"This product is currently disabled.","Este producto está desactivado actualmente." -"This report depends on timezone configuration. Once timezone is changed, the lifetime statistics need to be refreshed.","Este informe depende de la configuración de la zona horaria. Una vez que se cambia la zona horaria, el periodo de extensión de las estadísticas ha de ser actualizado." -"This section is not allowed.","Esta sección no está permitida." -"This user no longer exists.","Este usuario ya no existe." -"Time","Hora" -"Time selection:","Selección de hora:" -"Time:","Hora:" -"Timeout limit for response from synchronize process was reached.","Se ha alcanzado el límite de tiempo de espera del proceso de sincronización." -"To","A" -"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","Para cancelar autorizaciones pendientes y liberar importes que ya se han procesado durante este pago, haga clic en Cancelar." -"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","Para utilizar el Payflow Link de PayPal, tienes que configurar tu cuenta de PayPal Payflow Link en la página web de PayPal." -"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","Para utilizar las opciones avanzadas de pago de PayPal, tienes que configurar tu cuenta de pagos de PayPal en la página web de PayPal." -"Toggle Editor","Cambiar a editor" -"Tools","Herramientas" -"Top 5 Search Terms","5 Artículos Más Buscados" -"Total","Total" -"Total Invoiced","Total facturado" -"Total Order Amount","Cantidad total del pedido" -"Total Refunded","Total reembolsado" -"Total of %d record(s) have been deleted.","Total de % registrado se ha eliminado." -"Total of %d record(s) have been updated.","Un total de %d registro(s) ha(n) sido actualizado(s)." -"Total of %d record(s) were canceled.","Se ha cancelado un total de %d registro(s)." -"Total of %d record(s) were deleted","Se han eliminado un total de %d registro(s)" -"Total of %d record(s) were deleted.","Se han eliminado un total de %d registro(s)." -"Total of %d record(s) were updated","Se han actualizado un total de %d registro(s)" -"Total of %d record(s) were updated.","Se han actualizado un total de %d registro(s)." -"Track Order","Rastrear un Pedido" -"Track this shipment","Rastrear este envío" -"Tracking number %s for %s assigned","Número de seguimiento %s asignado para %s" -"Tracking number cannot be empty.","El número de seguimiento no puede estar vacío." -"Transaction Data","Datos de la Transacción" -"Transaction Details","Detalles de la transacción" -"Transaction ID","Número de identificación de la transacción" -"Transaction Type","Tipo de Transacción" -"Transactional Emails","Emails Transaccionales" -"Transactions","Transacciones" -"Try Magento Go for Free","Prueba gratis Magento" -"Type","Tipo" -"Type:","Tipo:" -"URL Rewrite","Reescritura de la URL" -"URL Rewrite Information","Información de reescritura de URL" -"URL Rewrite Management","Administración de la reescritura de la URL" -"Unable to cancel the credit memo.","Deshabilitar cancelación de nota de crédito." -"Unable to find a Email Template to delete.","Deshabilitar encontrar plantilla de email para eliminar." -"Unable to find a poll to delete.","Deshabilitar encontrar una encuesta para eliminar." -"Unable to find a tag to delete.","Incapaz de encontrar el tag a eliminar" -"Unable to find a user to delete.","No se puede encontrar un usuario para eliminar." -"Unable to initialize import model","Incapaz de iniciar el modelo de importación" -"Unable to refresh lifetime statistics.","Incapaz de volver a cargar estadísticas totales." -"Unable to refresh recent statistics.","Imposible actualizar las estadísticas" -"Unable to save Cron expression","Imposible guardar la expresión Cron" -"Unable to save the cron expression.","No se puede guardar la expresión de cron." -"Unable to save the invoice.","Imposible guardar la factura." -"Unable to send the invoice email.","Imposible mandar la factura por correo electrónico." -"Unable to send the shipment email.","No ha sido posible mandar el correo electrónico de envío." -"Unable to update transaction details.","No es posible actualizar la información de la transación." -"Unable to void the credit memo.","Imposible anular la nota de crédito." -"Unknown","Desconocido" -"Unlimited","Ilimitado" -"Update","Actualizar" -"Updated At","Hora de actualización" -"Upload File","Cargar Archivo" -"Upload Files","Subir archivos" -"Upload HTTP Error","Error HTTP de carga" -"Upload I/O Error","Cargar Error I/O" -"Upload Security Error","Error de seguridad de carga" -"Upload import file","Cargar archivo importado" -"Uploaded file is larger than %.2f kilobytes allowed by server","El archivo subido es mayor de los %.2f kb que permite el servidor" -"Use All Available Attributes","Utilizar todas las características disponibles" -"Use Config Settings","Usar Opciones de Configuración" -"Use Default","El uso por defecto" -"Use Default Value","Utilizar Valor por Defecto" -"Use Default Variable Values","Utilizar los valores variables por defecto" -"Use FTP Connection","Usar conexión FTP" -"Use Website","Utilizar el sitio web" -"Used Currently For","Utilizado actualmente para" -"Used as Default For","Utilizado por defecto para" -"User Email","Dirección de correo del cliente" -"User ID","ID de Usuario" -"User Info","Información del usuario" -"User Information","Información de usuario" -"User Name","Nombre de usuario" -"User Name is required field.","El nombre del usuario es un campo obligatorio." -"User Name:","Nombre usuario:" -"User Password","Contraseña del usuario" -"User Role","Profesión del usuario" -"User Roles","Papeles de Usuario" -"User Roles Information","Información de profesión del usuario" -"User Type Resources","Recursos para tipos de usuarios" -"User name","Nombre de usuario" -"Users","Usuarios" -"VAT Number is Invalid","El número de IVA es inválido" -"VAT Number is Valid","El número de IVA es válido" -"Validation Results","Resultados de Validación" -"Value","Valor" -"Value Delimiter:","Separador de valores:" -"Variable","Variable" -"Variable Code","Código Variable" -"Variable HTML Value","Valor de HTML Variable" -"Variable ID","ID de variable" -"Variable Name","Nombre Variable" -"Variable Plain Value","Valor Simple Variable" -"Verifier code: %s","Código de verificación: %s" -"View Actions XML","Ver Acciones XML" -"View Full Size","Ver a tamaño completo" -"View Memo","Ver Memorándum" -"View Memo for #%s","Ver el memorándum de #%s" -"View Shipment","Ver Envío" -"View Statistics For:","Ver estadísticas de:" -"Visibility:","Visibilidad:" -"Warning","Aviso" -"Warning! Empty value can cause problems with CSV format.","Atención: los valores vacíos pueden causar problemas con el formato CSV." -"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","¡Atención!\r\nLa acción eliminará al usuario de un rol ya asignado.\r\n¿Está seguro?" -"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","¡Atención!\r\nEsta acción borrará aquellos usuarios de los roles ya asignados\r\n¿Está seguro?" -"Warning: Please do not close the window during importing/exporting data","Atención: No cierre la ventana mientras importa/exporta datos" -"Watermark File for %s","Archivo de Marca de Agua de %s" -"We appreciate our merchants\' feedback, please take our survey to provide insight on the features you would like included in Magento. Remove this notification","Agradecemos los comentarios de nuestros vendedores. Por favor, rellene nuestra encuesta para indicarnos las funcionalidades que querría ver en Magento. Eliminar esta notificación" -"We\'re in our typing table, coding away more features for Magento. Thank you for your patience.","Estamos en nuestro escritorio, codificando más características para Magento. Gracias por su paciencia." -"Web Section","Sección Web" -"Web Services","Servicios Web" -"Web services","Servicios web" -"Website","Sitio web" -"What is this?","¿Qué es esto?" -"Wishlist Report","Informe de lista de deseos" -"Wishlist item is not loaded.","El artículo de la lista de intención de compra no está cargado." -"Wrong account specified.","La cuenta especificada es errónea." -"Wrong billing agreement ID specified.","Se ha especificado un ID de acuerdo de facturación no válido." -"Wrong column format.","Formato de columna erróneo." -"Wrong newsletter template.","Plantilla de boletín de noticias errónea." -"Wrong quote item.","Artículo mal expresado." -"Wrong tab configuration.","Configuración de pestañas no válido." -"Wrong tag was specified.","Se ha especificado una etiqueta errónea." -"Wrong transaction ID specified.","ID de transacción especificada errónea." -"XML","XML" -"XML data is invalid.","dato XML inválido" -"XML object is not instance of ""Varien_Simplexml_Element"".","El objeto XML no es un caso de ""Varien_Simplexml_Element""." -"YTD","YTD" -"Year","Año" -"Yes","Sí" -"Yes (301 Moved Permanently)","Sí (301 Movidos Permanentemente)" -"Yes (302 Found)","Sí (302 Encontrados)" -"Yes (only price with tax)","Si (solo el precio con impuestos)" -"You cannot delete your own account.","No puede borrar su propia cuenta." -"You have %s unread message(s).","Tiene %s mensaje(s) sin leer." -"You have %s unread message(s). Go to messages inbox.","Tienes %s mensaje(s) sin leer. Ir a la bandeja de entrada." -"You have %s, %s and %s unread messages. Go to messages inbox.","Tienes %s, %s y %s mensajes sin leer. Ir a la bandeja de entrada." -"You have logged out.","Se ha desconectado." -"You have not enough permissions to use this functionality.","No tiene suficientes permisos para usar esta función." -"You must have JavaScript enabled in your browser to utilize the functionality of this website.","Debe tener activado JavaScript en su navegador para utilizar la funcionalidad de esta página web." -"You need to specify order items.","Tiene que especificar objetos de orden." -"You will need to wait when the action ends.","Tendrá que esperar cuando termine la acción." -"Your answers contain duplicates.","Sus respuestas contienen duplicados." -"Your password has been updated.","Se ha actualizado su contraseña." -"Your password reset link has expired.","El enlace para reiniciar la contraseña ha caducado." -"Your server PHP settings allow you to upload files not more than %s at a time. Please modify post_max_size (currently is %s) and upload_max_filesize (currently is %s) values in php.ini if you want to upload larger files.","La configuración del PHP de su servidor sólo le permite subir archivos de no más de %s de una vez. Modifique los valores de post_max_size (actualmente es %s) y upload_max_filesize (actualmente es %s) de php.ini si quiere subir archivos mayores." -"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Tu servidor web está configurado incorrectamente. Como resultado, los ficheros de configuración con información confidencial son accesibles desde fuera. Por favor, contacta a tu proveedor de alojamiento." -"Zip/Postal Code","Código postal" -"Zip/Postal Code:","Código postal:" -"[ deleted ]","[ eliminado ]" -"[GLOBAL]","[GLOBAL]" -"[STORE VIEW]","[VISTA DE TIENDA]" -"[WEBSITE]","[PÁGINA WEB]" -"b","b" -"close","cerrar" -"critical","crítico" -"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","ejemplo: ""sitemap/"" o ""/"" para la ruta base (la ruta debe poder reescribirse)" -"example: sitemap.xml","ejemplo: sitemap.xml" -"failed","error" -"from","de" -"major","mayor" -"minor","menor" -"notice","aviso" -"store(%s) scope","ámbito de almacenamiento(%s)" -"successful","exitoso" -"to","para" -"website(%s) scope","ámbito de página web(%s)" -"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento configuration.","{{base_url}} no recomienda usarse en un ambiente de producción para declarar la URL Base Insegura / URL Base Segura. Es altamente recomendable cambiar este valor en tu configuración de Magento." diff --git a/app/locale/es_ES/Mage_AmazonPayments.csv b/app/locale/es_ES/Mage_AmazonPayments.csv deleted file mode 100644 index 1340b8106..000000000 --- a/app/locale/es_ES/Mage_AmazonPayments.csv +++ /dev/null @@ -1,101 +0,0 @@ -" Select Shipping Method","Elegir método de envío" -"
    Trace confirmation request:
    %s","
    Seguimiento de la solicitud de confirmación:
    %s" -"Access Key","Clave de acceso" -"Access Key ID","ID de clave de acceso" -"Amazon Simple Pay","Amazon Simple Pay" -"Amazon Simple Pay notification error","Notificación de error de Amazon Simple Pay" -"Amazon Simple Pay service capture confirmation error: confirmation request amount is not equal to the amount of order.","Error en la confirmación de la captura por parte del servicio de Amazon Simple Pay: la cantidad de la solicitud de confirmación no es igual que la del pedido." -"Amazon Simple Pay service capture confirmation error: the amount in the existing invoice does not match the amount in the confirmation request.","Captura del error en la confirmación del servicio de Amazon Simple Pay: la cantidad en la factura existente no se corresponde con la cantidad en la solicitud de confirmación." -"Amazon Simple Pay service capture confirmation error: the existing transaction ID does not match the transaction ID in the confirmation request.","Error en la confirmación de captura por parte del servicio de Amazon Simple Pay: el ID de la transacción existente no se corresponde con el ID de la transacción de la solicitud de confirmación." -"Amazon Simple Pay service capture confirmation. The invoice was captured automatically.","Confirmación de captura del servicio Amazon Simple Pay. La factura se capturó automáticamente." -"Amazon Simple Pay service confirmation error: order states sequence violation.","Error del servicio de confirmación de Amazon Simple Pay: violación en la secuencia del estado del pedido" -"Amazon Simple Pay service confirmation error: the order currency does not match the currency of the IPN request.","Error en la confirmación por parte del servicio de Amazon Simple Pay: la divisa del pedido no se corresponde con la de la solicitud IPN." -"Amazon Simple Pay service confirmation error: the order specified in the IPN request cannot be found.","Error de confirmación del servicio de Amazon Simple Pay: no se encuentra el pedido especificado en la solicitud IPN." -"Amazon Simple Pay service confirmation error: the payment method in the order is not Amazon Simple Pay.","Error del servicio de confirmación de Amazon Simple Pay: el método de pago del pedido no es Amazon Simple Pay." -"Amazon Simple Pay service confirmed capture for invoice %s.","El servicio de Amazon Simple Pay ha confirmado la captura de la factura %s." -"Amazon Simple Pay service confirmed refund for credit memo %s.","El servicio de Amazon Simple Pay confirmó el reembolso de la nota de crédito %s." -"Amazon Simple Pay service has confirmed amount authorization.","El servicio Amazon Simple Pay ha confirmado la autorización del importe." -"Amazon Simple Pay service has confirmed cancelation.","El servicio de Amazon Simple Pay ha confirmado la cancelación." -"Amazon Simple Pay service has confirmed capture for invoice %s. The invoice was automatically captured.","El servicio de Amazon Simple Pay ha confirmado que ha tomado la factura %s. La factura se ha capturado automáticamente." -"Amazon Simple Pay service has confirmed capture initiation.","El servicio Amazon Simple Pay ha confirmado la iniciación de la captura." -"Amazon Simple Pay service has confirmed capture.","El servicio de Amazon Simple Pay ha confirmado la captura." -"Amazon Simple Pay service has confirmed payment capture. Invoice %s was automatically created after confirmation.","El servicio Amazon Simple Pay ha confirmado que ha tomado el pago. Tras las confirmación, se creó la factura %s automáticamente." -"Amazon Simple Pay service has confirmed payment capture. Invoice was created automatically.","El servicio de Amazon Simple Pay ha confirmado la captura del pago. Se creó, automáticamente, la factura." -"Amazon Simple Pay service has confirmed payment refund. Credit memo %s was automatically created after confirmation.","El servicio Amazon Simple Pay ha confirmado el reembolso del pago. Tras la confirmación, se creó una nota de crédito %s de manera automática." -"Amazon Simple Pay service has confirmed payment refund. Credit memo was created automatically.","El servicio de Amazon Simple Pay ha confirmado el reembolso del pago. Se creó una nota de crédito automáticamente." -"Amazon Simple Pay service has confirmed payment refund. The credit memo was created automatically.","El servicio de Amazon Simple Pay ha confirmado el reembolso del pago. Se creó, automáticamente, la nota de crédito." -"Amazon Simple Pay service has confirmed refund.","El servicio Amazon Simple Pay ha confirmado el reembolso." -"Amazon Simple Pay service has confirmed refund. The credit memo was processed automatically.","El servicio Amazon Simple Pay ha confirmado el reembolso. Se procesó, automáticamente, la nota de crédito." -"Amazon Simple Pay service has confirmed refunded credit memo %s. The credit memo was processed automatically.","El servicio de Amazon Simple Pay ha confirmado el rembolso de la nota de crédito %s. Se procesó, automáticamente, la nota de crédito." -"Amazon Simple Pay service is not available. Payment was not processed.","El servicio de Amazon Simple Pay no se encuentra disponible. No se procesó el pago." -"Amazon Simple Pay service payment confirmation has failed.","Confirmación del servicio Amazon Simple Pay fallida." -"Amazon Simple Pay service refund confirmation error: the amount in the existing creditmemo does not match the amount in the confirmation request.","Error en la confirmación del reembolso por parte del servicio Amazon Simple Pay: la cantidad en la nota de crédito existente no se corresponde con la cantidad de la solicitud de confirmación." -"Amazon Simple Pay service refund confirmation error: the confirmation request amount does not match the order amount.","Error en la confirmación de reembolso del servicio de Amazon Simple Pay: la cantidad en la solicitud de confirmación no se corresponde con la cantidad del pedido." -"Amazon Simple Pay service refund confirmation error: the transaction ID in the existing creditmemo does not match the transaction ID in the confirmation request.","Error en la confirmación de reembolso por parte del servicio de Amazon Simple Pay: el ID de la transacción de la nota de crédito existente no se corresponde con el ID de la transacción de la solicitud de confirmación." -"Authorize Only","Sólo autorizar" -"Authorize and Capture","Autorizar y capturar" -"Cancel Description","Cancelar descripción" -"Cancel Order Notification received from Checkout by Amazon service.","Notificación de cancelación de pedido recibida por parte del servicio de Tramitar pedido de Amazon." -"Checkout by Amazon","Trámite del pedido por Amazon" -"Continue Shopping","Continuar comprando" -"Customer was redirected to Amazon Simple Pay site","Se redireccionó al cliente al sitio de Amazon Simple Pay" -"Debug","Depurar" -"Debug Log","Registro de eliminación de fallos" -"Email Sender","Remitente del email" -"Enable","Habilitar" -"Error Log","Registro de errores" -"FPS Sandbox Service URI","Servicio URI de FPS Sandbox" -"FPS Service URI","Servicio URI de FPS" -"Immediate Return","Devolución inmediata" -"Invalid action code.","Código de acción no válido." -"Invalid request.","Solicitud no válida." -"Invoice was created with Checkout by Amazon.","Se creó la factura con el servicio de Tramitar pedido de Amazon." -"Merchant ID","Identificación de Comerciante" -"Merchant Login","Inicio de sesión del comerciante" -"Merchant Name","Nombre del comerciante" -"Merchant Password","Contraseña del comerciante" -"Merchant Token","Clave del comerciante" -"Method Choice Checkout Message","Mensaje del método elegido de trámite de pedido" -"New Order Notification received from Checkout by Amazon service.","Nueva notificación de pedido recibida por parte del servicio Tramitar pedido de Amazon." -"New Order Status","Estado de los nuevos pedidos" -"Notification Error Transactional Email","Correo de notificación de error en la transacción" -"Order Ready To Ship Notification received form Checkout by Amazon service.","Pedido listo para enviar, notificación recibida por parte del servicio de Tramitar pedido de Amazon." -"Order was canceled with Checkout by Amazon.","Se canceló el pedido con el servicio de Tramitar pedido de Amazon." -"Payment Action","Acción de Pago" -"Payment Description","Descripción del pago" -"Payment Sandbox Service URI","Servicio URI de pago Sandbox" -"Payment Service URI","Servicio de pago URI" -"Payment authorization canceled with Amazon Simple Pay service.","Autorización de pago cancelada con el servicio Amazon Simple Pay." -"Pending Amazon Simple Pay","Pendiente Amazon Simple Pay" -"Redirect Message","Redireccionar mensaje" -"Refund Description","Descripción de reembolso" -"Refund was created with Checkout by Amazon.","Se ha creado el reembolso con el servicio de Tramitar pedido de Amazon." -"Report Email","Informar por correo" -"Report Error to Email","Informar del error por correo electrónico" -"Response body is not a valid FPS response.","La respuesta no es una respuesta FPS válida." -"SUCCESS","ÉXITO" -"Sandbox","Recinto" -"Secret Key","Clave secreta" -"Secret Key ID","ID de llave secreta" -"Shipment was created with Checkout by Amazon.","Se creó un envío mediante el servicio de Tramitar pedido de Amazon." -"Thank you for your purchase!","Gracias por su compra." -"The customer has canceled payment and successfully returned from Amazon Simple Pay site","El cliente ha cancelado el pago y ha vuelto, con éxito, al sitio de Amazon Simple Pay" -"The customer has successfully returned from Amazon Simple Pay site","El cliente ha vuelto, con éxito, del sitio de Amazon Simple Pay" -"The invoice was created (online capture). Waiting for capture confirmation from Amazon Simple Pay service.","Se creó la factura (captura en línea). Esperando confirmación de la captura desde el servicio de Amazon Simple Pay." -"The invoice was not refunded. Amazon Simple Pay service error: [%s] %s","No se ha reembolsado la factura. Error de servicio de Amazon Simple Pay: [%s] %s" -"The item specified in callback request XML was not found in quote.","No se encontró, en el presupuesto, el artículo especificado en la solicitud callback XML." -"The order was not canceled. Amazon Simple Pay service error: [%s] %s","No se canceló el pedido. Error del servicio Amazon Simple Pay: [%s] %s" -"The order was not captured online. Authorization confirmation is required.","No se pudo capturar el pedido en línea. Se necesita una confirmación de autorización." -"The order was not captured. Amazon Simple Pay service error: [%s] %s","No se ha tomado el pedido. Error de servicio de Amazon Simple Pay: [%s] %s" -"The payment was captured online with Amazon Simple Pay service. The invoice was created. Waiting for capture confirmation from the payment service.","Se ha tomado el pago en línea mediante el servicio de Amazon Simple Pay. Se ha creado la factura. Esperando confirmación de captura del servicio de pago." -"The payment was refunded online with Amazon Simple Pay service. The credit memo was created. Waiting for refund confirmation from Amazon Simple Pay service.","Se reembolsó el pago en línea mediante el servicio de Amazon Simple Pay. Se creó la nota de crédito. Esperando confirmación de reembolso del servicio de Amazon Simple Pay." -"The payment was refunded online. Waiting for refund confirmation from Amazon Simple Pay service.","Se reembolsó el pago en línea. Esperando que el servicio Amazon Simple Pay confirme el reembolso." -"The request is not a valid IPN request.","La solicitud no es una solicitud IPN válida." -"The request was signed incorrectly or the signature is missing.","La solicitud se firmó de forma incorrecta o falta la firma." -"Title","Título" -"Use Callback API","Usar la API Callback" -"You will be redirected to Checkout by Amazon in a few seconds.","Amazon le redireccionará a Tramitar pedido en unos segundos." -"You will receive an order confirmation email with details of your order and a link to track its progress.","Recibirá un mensaje de correo electrónico con los detalles de su pedido y un enlace para hacer un seguimiento de su progreso." -"You will receive an order confirmation email with details of your order and a link to track its progress.
    ","Recibirá un correo con la confirmación del pedido con los datos de su pedido y un enlace para realizar el seguimiento del progreso.
    " -"Your billing address will be ignored and you will be redirected to Checkout by Amazon website.","Su dirección de facturación se ignorará y será redirigido a la página de tramitar pedido de Amazon." -"Your order has been received.","Se recibió su pedido." diff --git a/app/locale/es_ES/Mage_Api.csv b/app/locale/es_ES/Mage_Api.csv deleted file mode 100644 index ff8b04cdc..000000000 --- a/app/locale/es_ES/Mage_Api.csv +++ /dev/null @@ -1,18 +0,0 @@ -"Access denied.","Acceso denegado" -"Can not find webservice adapter.","No es posible encontrar el adaptador del servicio web." -"Client Session Timeout (sec.)","Plazo límite de la sesión cliente (seg.)" -"Default Response Charset","Conjunto de caracteres de respuesta por omisión" -"Email","Correo electrónico" -"Enable WSDL Cache","Activar caché WSDL" -"General Settings","Opciones generales" -"Invalid webservice adapter specified.","Adaptador de servicio web especificado inválido" -"Invalid webservice handler specified.","Controlador de servicio web especificado inválido" -"Magento Core API","API del núcleo de Magento" -"Magento Core API Section","Apartado de la API (interfaz de programación de aplicaciones) del núcleo de Magento" -"SOAP/XML-RPC - Roles","SOAP/XML-RPC - Funciones" -"SOAP/XML-RPC - Users","SOAP/XML-RPC - Usuarios" -"Unable to login.","No es posible entrar al sistema." -"User Name","Nombre de usuario" -"WS-I Compliance","Conformidad con WS-I" -"Web Services","Servicios web" -"Your account has been deactivated.","Se ha desactivado su cuenta." diff --git a/app/locale/es_ES/Mage_Api2.csv b/app/locale/es_ES/Mage_Api2.csv deleted file mode 100644 index 1a6e13f62..000000000 --- a/app/locale/es_ES/Mage_Api2.csv +++ /dev/null @@ -1,238 +0,0 @@ -"%s","%s" -"%s role is a special one and can\'t be changed.","El rol %s es especial y no puede cambiarse." -"%s role is a special one and can\'t be deleted.","El rol %s es especial y no puede suprimirse." -"%s role is protected.","El rol %s está protegido." -"ACL Attribute Rules","Reglas de atributo ACL" -"ACL Attributes Information","Información de atributos ACL" -"Add","Añadir" -"Add Admin Role","Añadir rol de administrador" -"Add New Role","Añadir Nuevo Papel" -"Address Type","Tipo de dirección" -"Admin","Administrar" -"Allow","Permitir" -"An error occurred while deleting the role.","Se produjo un error al suprimir el rol." -"An error occurred while saving attribute rules.","Se produjo un error al guardar las reglas del atributo." -"An error occurred while saving role.","Se produjo un error al guardar el rol." -"Api Rules Information","Información de reglas Api" -"Assigned","Asignado" -"Associate to Website","Asociar a sitio web" -"Attribute Rules Information","Información de reglas de atributo" -"Attribute Set","Conjunto de atributos" -"Attributes","Atributos" -"Automatically Return Credit Memo Item to Stock","Devolver Automáticamente Artículo de Factura de Abono a Existencias" -"Back","Volver" -"Backorders","Pedidos Pendientes" -"Base Currency","Divisa base" -"Base Customer Balance","Saldo base de cliente" -"Base Discount","Descuento base" -"Base Discount Amount","Total descuento base" -"Base Item Subtotal","Subtotal artículo base" -"Base Item Subtotal Including Tax","Subtotal artículo base incluyendo impuestos" -"Base Original Price","Precio original base" -"Base Price","Precio base" -"Base Price Including Tax","Precio base incluyendo impuestos" -"Base Shipping","Gastos de envío base" -"Base Shipping Discount","Descuento en los gastos de envío base" -"Base Shipping Tax","Tasas de envío base" -"Base Subtotal","Subtotal base" -"Base Subtotal Including Tax","Subtotal base incluyendo impuestos" -"Base Tax Amount","Total impuestos base" -"Base Total Due","Deuda total base" -"Base Total Paid","Total base pagado" -"Base Total Refunded","Total base reembolsado" -"Buy Now URL","URL de Comprar ahora" -"Can Be Divided into Multiple Boxes for Shipping","Se puede dividir en varias cajas para su envío" -"Canceled Qty","Cantidad cancelada" -"Catalog","Catálogo" -"Catalog Product","Producto del catálogo" -"CatalogInventory","Catalogar inventario" -"Category ID","ID de Categoría" -"City","Ciudad" -"Company","Compañía" -"Country","País" -"Coupon Code","Código de cupón" -"Create","Crear." -"Create Permanent Redirect for old URL","Crear Redirección Permanente para la antigua URL" -"Created From","Creado desde" -"Customer","Cliente" -"Customer Address","Dirección del cliente" -"Customer Address ID","ID de dirección de cliente" -"Customer Balance","Saldo de cliente" -"Customer First Name","Nombre del cliente" -"Customer ID","ID del cliente" -"Customer Last Name","Apellido del cliente" -"Customer Middle Name","Segundo nombre del cliente" -"Customer Prefix","Prefijo de cliente" -"Customer Suffix","Sufijo cliente" -"Default Image","Imagen predeterminada" -"Delete","Eliminar" -"Deny","Denegar" -"Disable automatic group change based on VAT ID","Deshabilitar cambio de grupo automático según ID del IVA" -"Discount","Descuento" -"Discount Amount","Cantidad Descontada" -"Discount Description","Descripción del descuento" -"Edit","Editar" -"Edit %s ACL attribute rules","Editar reglas de atributo ACL de %s" -"Edit Role","Modificar el rol" -"Edit attribute rules for %s Role","Editar reglas de atributo para rol %s" -"Email","Correo electrónico" -"Enable Qty Increments","Posibilitar Incrementos de Cantidad" -"Exclude","Excluir" -"File Content","Contenido del archivo" -"File MIME Type","Archivo tipo MIME" -"File Name","Nombre de Archivo" -"Final Price With Tax","Precio final con impuestos" -"Final Price Without Tax","Precio final sin impuestos" -"First Name","Nombre" -"Gift Message","Mensaje regalo" -"Grand Total","Suma total" -"Grand Total to Be Charged","Total global a aplicar" -"Group","Grupo" -"Guest","Invitado" -"Has Custom Options","Dispone de opciones personalizadas" -"ID","ID" -"Inventory Data","Datos de inventario" -"Invoiced Qty","Cantidad facturada" -"Is Confirmed","Está confirmado" -"Is Default Billing Address","Dirección de facturación predeterminada" -"Is Default Shipping Address","Es la dirección de envío predeterminada" -"Item ID","ID de artículo" -"Item Subtotal","Subtotal del artículo" -"Item Subtotal Including Tax","Subtotal del artículo incluyendo impuestos" -"Label","Etiqueta" -"Last Logged In","Último inicio de sesión" -"Last Name","Apellido" -"Low Stock Date","Fecha de bajas existencias" -"Manage Stock","Gestionar Existencias" -"Maximum Qty Allowed in Shopping Cart","Cantidad Máxima Permitida en el Carro de la Compra" -"Minimum Qty Allowed in Shopping Cart","Cantidad Mínima Permitida en el Carro de la Compra" -"New Role","Nuevo rol" -"Notify for Quantity Below","Notificar cuando la Cantidad sea Inferior a" -"OAuth","OAuth" -"Order","Encargar" -"Order Addresses","Direcciones de pedido" -"Order Comments","Comentarios del pedido" -"Order Currency","Moneda de pedido" -"Order Date","Fecha del pedido" -"Order ID","ID de Pedido" -"Order ID (internal)","ID de pedido (interna)" -"Order Item ID","Pedir ID de artículo" -"Order Items","Artículos de pedido" -"Order Status","Estado del pedido" -"Ordered Qty","Cantidad pedida" -"Orders","Pedidos" -"Original Price","Precio original" -"Parent Order Item ID","ID del artículo del pedido principal" -"Payment Method","Método de pago" -"Phone Number","Número de teléfono" -"Placed from IP","Realizado desde IP" -"Please enter a valid number in ""max_sale_qty"" field","Por favor, introduce un número válido en el campo ""max_sale_qty""" -"Please enter a valid number in ""min_qty"" field","Por favor, introduce un número válido en el campo ""min_qty""" -"Please enter a valid number in ""min_sale_qty"" field","Por favor, introduce un número válido en el campo ""min_sale_qty""" -"Please enter a valid number in ""notify_stock_qty"" field","Por favor, introduce un número válido en el campo ""notify_stock_qty""" -"Please use numbers only in ""category_id"" field.","Por favor, utilice solamente números en el campo ""category_id""." -"Please use numbers only in ""qty_increments"" field. Please avoid spaces or other characters such as dots or commas.","Por favor, utiliza solamente números en el campo ""qty_increments"". Por favor, evita espacios u otros caracteres tales como puntos o comas." -"Position","Posición" -"Price","Precio" -"Price Including Tax","Precio incluyendo impuestos" -"Product","Producto" -"Product Category","Categoría de producto" -"Product ID","ID de Producto" -"Product Image","Imagen del artículo" -"Product Type","Tipo de Producto" -"Product URL","URL de producto" -"Product Website","Sitio web de producto" -"Product and Custom Options Name","Nombre de producto y opciones personalizadas" -"Qty","Cantidad" -"Qty Increments","Incrementos de Cantidad" -"Qty Uses Decimals","La Cantidad Usa Decimales" -"Qty for Item's Status to Become Out of Stock","Cantidad de artículos disponibles antes de agotarse" -"REST - Attributes","REST - Atríbutos" -"REST - Roles","REST - Roles" -"REST ACL Attributes","Atributos ACL REST" -"REST Attributes","Atributos REST" -"REST Role","Rol REST" -"REST Roles","Otras funciones" -"REST Roles Information","Información de roles de REST" -"Read","Leer" -"Refunded Qty","Cantidad reembolsada" -"Regular Price With Tax","Precio normal incluyendo impuestos" -"Regular Price Without Tax","Precio estándar sin impuestos" -"Rest Roles","Roles de Rest" -"Retrieve","Recuperar" -"Role ""%s"" no longer exists","La clase ""%s"" ya no existe" -"Role ""%s"" not found.","No se encontró el rol ""%s""." -"Role API Resources","Función de los recursos de la API" -"Role Info","Información del rol" -"Role Information","Información de la función" -"Role Name","Nombre de la función" -"Role Users","Usuario con roles" -"Role has been deleted.","El rol se ha suprimido." -"Roles","Roles" -"SKU","SKU" -"Salability Status","Estado vendible" -"Sales","Ventas" -"Save","Guardar" -"Shipped Qty","Cantidad enviada" -"Shipping Amount","Gastos de Envío" -"Shipping Discount","Descuento de gastos de envío" -"Shipping Including Tax","Envío sin impuestos" -"Shipping Method","Método de envío" -"Shipping Tax","Tasas de envío" -"State","Estado" -"Stock Availability","Disponibilidad de inventario" -"Stock ID","Identificación de mercancía" -"Stock Item","Artículo disponible" -"Stock Status","Estado de Existencias" -"Store Currency to Order Currency Rate","Tasa de cambio de la divisa de la tienda a la divisa del pedido" -"Store Name","Nombre de la Tienda" -"Street","Calle" -"Subtotal","Subtotal" -"Subtotal Including Tax","Subtotal con impuestos" -"System","Sistema" -"Tax Amount","Importe del Impuesto" -"Tax Name","Nombre de impuesto" -"Tax Percent","Porcentaje de impuestos" -"Tax Rate","Tarifa de Impuestos" -"The ""enable_qty_increments"" field must be set to 0 or 1.","El campo ""enable_qty_increments"" debe estar fijado en 0 o 1." -"The ""is_decimal_divided"" field must be set to 0 or 1.","El campo ""is_decimal_divided"" debe estar fijado en 0 o 1." -"The ""is_in_stock"" field must be set to 0 or 1.","El campo ""is_in_stock"" debe estar fijado en 0 o 1." -"The ""is_qty_decimal"" field must be set to 0 or 1.","El campo ""is_qty_decimal"" debe estar fijado en 0 o 1." -"The ""is_qty_decimal"" field must be set to 0, 1, or 2.","El campo ""is_qty_decimal"" debe estar fijado en 0, 1 o 2." -"The ""manage_stock"" field must be set to 0 or 1.","El campo ""manage_stock"" debe estar fijado en 0 o 1." -"The ""stock_status_changed_auto"" field must be set to 0 or 1.","El campo ""stock_status_changed_auto"" debe estar fijado en 0 o 1." -"The ""use_config_backorders"" field must be set to 0 or 1.","El campo ""use_config_backorders"" debe estar fijado en 0 o 1." -"The ""use_config_enable_qty_inc"" field must be set to 0 or 1.","El campo ""use_config_enable_qty_inc"" debe estar fijado en 0 o 1." -"The ""use_config_manage_stock"" field must be set to 0 or 1.","El campo ""use_config_manage_stock"" debe estar fijado en 0 o 1." -"The ""use_config_max_sale_qty"" field must be set to 0 or 1.","El campo ""use_config_max_sale_qty"" debe estar fijado en 0 o 1." -"The ""use_config_min_qty"" field must be set to 0 or 1.","El campo ""use_config_min_qty"" debe estar fijado en 0 o 1." -"The ""use_config_min_sale_qty"" field must be set to 0 or 1.","El campo ""use_config_min_sale_qty"" debe estar fijado en 0 o 1." -"The ""use_config_notify_stock_qty"" field must be set to 0 or 1.","El campo ""use_config_notify_stock_qty"" debe estar fijado en 0 o 1." -"The ""use_config_qty_increments"" field must be set to 0 or 1.","El campo ""use_config_qty_increments"" debe estar fijado en 0 o 1." -"The attribute rules were saved.","Las reglas de atributo se han guardado." -"The role has been saved.","Se guardó el rol." -"The role is a special one and not for assigning it to admin users.","El rol es especial y no se puede asignar a usuarios administradores." -"Total Due","Total de deuda" -"Total Paid","Total pagado" -"Total Refunded","Total reembolsado" -"Total Reviews Count","Recuento total de comentarios" -"Type","Tipo" -"URL","URL" -"Update","Actualizar" -"Use Config Settings for Allow Gift Message","Utilizar los ajustes de configuración para permitir mensaje en el regalo" -"Use Config Settings for Allow Gift Wrapping","Utilice los Ajustes de Configuración para Permitir Envolver Regalo" -"Use Config Settings for Backorders","Usar los ajustes de configuración para los pedidos pendientes" -"Use Config Settings for Enable Qty Increments","Utilizar los ajustes de configuración para habilitar los incrementos de cantidad" -"Use Config Settings for Manage Stock","Utilizar los ajustes de configuración para gestionar el stock" -"Use Config Settings for Maximum Qty Allowed in Shopping Cart","Usar los ajustes de configuración para ajustar la cantidad máxima permitida en el carro de compra." -"Use Config Settings for Minimum Qty Allowed in Shopping Cart","Utilizar los ajustes de configuración para ajustar la cantidad mínima permitida en el carro de compra" -"Use Config Settings for Notify for Quantity Below","Utilizar los ajustes de configuración para notificar cuando baje la cantidad" -"Use Config Settings for Qty Increments","Utilizar los ajustes de configuración para los incrementos de cantidad" -"Use Config Settings for Qty for Item's Status to Become Out of Stock","Utilizar los ajustes de configuración para que el estado del artículo sea Fuera de Stock" -"User Type","Tipo de usuario" -"User type ""%s"" no longer exists","El tipo de usuario ""%s"" ya no existe" -"User type ""%s"" not found.","Tipo de usuario ""%s"" no encontrado." -"Web Services","Servicios web" -"Web services","Servicios web" -"Write","Escribir" -"ZIP/Postal Code","Código Postal" diff --git a/app/locale/es_ES/Mage_Authorizenet.csv b/app/locale/es_ES/Mage_Authorizenet.csv deleted file mode 100644 index e6b2397c0..000000000 --- a/app/locale/es_ES/Mage_Authorizenet.csv +++ /dev/null @@ -1,41 +0,0 @@ -"--Please Select--","--Por favor, seleccione-" -"API Login ID","Id. de inicio de sesión de API" -"Accepted Currency","Moneda Aceptada" -"Amount of %s approved by payment gateway. Transaction ID: ""%s"".","Cantidad de %s aprobada por el portal de acceso de pago. ID de transacción: ""%s""." -"Authorize.net Direct Post","Enlace directo a authorize.net" -"Card Verification Number","Número de Verificación de Tarjeta" -"Card Verification Number Visual Reference","Referencia visual del número de verificación de tarjeta" -"Close","Cerrar" -"Credit Card Information","Información de la tarjeta de crédito" -"Credit Card Number","Número de Tarjeta de Crédito" -"Credit Card Type","Tipo de Tarjeta de Crédito" -"Credit Card Types","Tipos de Tarjeta de Crédito" -"Credit Card Verification","Verificación de Tarjeta de Crédito" -"Debug","Depurar" -"Email Customer","Cliente de correo" -"Enabled","Habilitado" -"Expiration Date","Fecha de Caducidad" -"Gateway URL","URL de la puerta de enlace" -"Maximum Order Total","Total del pedido máximo" -"Merchant MD5","MD5 del comerciante" -"Merchant's Email","Email del comerciante" -"Minimum Order Total","Total del pedido mínimo" -"New Order Status","Estado de los nuevos pedidos" -"Order saving error: %s","Error al guardar el pedido: %s" -"Payment Action","Acción de Pago" -"Payment authorization error.","Error en la autorización de pago." -"Payment authorization error. Transacion id is empty.","Error de autorización del pago. El identificador de transacción está vacío." -"Payment error. Order was not found.","Error de pago. No se encontró el pedido." -"Payment error. Paid amount doesn\'t match the order amount.","Error de pago. El importe pagado no coincide con el importe del pedido." -"Payment from Applicable Countries","Pago desde países aplicables" -"Payment from Specific Countries","Pago desde países específicos" -"Please, choose payment method","Seleccione un método de pago" -"Response hash validation failed. Transaction declined.","Fallo de validación del hash de respuesta. Se rechazó la transacción." -"Sort Order","Orden de selección" -"Test Mode","Modo de prueba" -"The order has been created.","Se ha creado el pedido." -"There was an error processing your order. Please contact us or try again later.","Se produjo un error en el proceso de su pedido. Contacte con nosotros o inténtelo más tarde." -"Title","Título" -"Transaction Key","Clave de transacción" -"What is this?","¿Qué es esto?" -"You will be required to enter your payment details before you place an order.","Se le solicitará que introduzca los detalles de pago antes de realizar un pedido." diff --git a/app/locale/es_ES/Mage_Backup.csv b/app/locale/es_ES/Mage_Backup.csv deleted file mode 100644 index 44b3ea4ef..000000000 --- a/app/locale/es_ES/Mage_Backup.csv +++ /dev/null @@ -1,55 +0,0 @@ -"Action","Acción" -"An error occurred while creating the backup.","Error al crear la copia de seguridad." -"An error occurred while writing to the backup file ""%s"".","Ocurrió un error al guardar el archivo de la copia de seguridad ""%s""." -"Are you sure you want to delete the selected backup(s)?","¿Seguro que desea eliminar las copias de seguridad seleccionadas?" -"Backup Type","Tipo de copia de seguridad" -"Backup file ""%s"" cannot be read from or written to.","No se puede leer o escribir en el archivo de la copia de seguridad ""%s""." -"Backup file ""%s"" does not exist.","El archivo de la copia de seguridad ""%s"" no existe." -"Backup file does not exist.","El archivo de copia de seguridad no existe." -"Backup file handler was unspecified.","No se ha especificado el procesador del archivo de copia de seguridad." -"Backup file not found","Copia de seguridad no encontrada" -"Backup file path was not specified.","No se ha especificado la ruta del archivo de copia de seguridad." -"Backups","Copias de seguridad" -"Cannot read backup file.","No se puede leer el archivo de copia de seguridad." -"Create Backup","Crear Copia de seguridad" -"Database","Base de datos" -"Database Backup","Copia de seguridad de base de datos" -"Database and Media","Base de datos y medios" -"Database and Media Backup","Copia de seguridad de base de datos y medios" -"Database was successfuly backed up.","Se ha creado con éxito una copia de seguridad de la base de datos." -"Download","Descargar" -"Enable Scheduled Backup","Activar copia de seguridad programada" -"Failed to connect to FTP","No ha sido posible establecer conexión con el FTP" -"Failed to delete one or several backups.","No ha sido posible eliminar una o varias copias de seguridad." -"Failed to rollback","No ha sido posible revertir" -"Failed to validate FTP","No ha sido posible validar el FTP" -"Frequency","Frecuencia" -"Invalid Password.","Contraseña no válida" -"Maintenance Mode","Modo de Mantenimiento" -"Name","Nombre" -"Not enough free space to create backup.","No hay espacio libre suficiente para crear la copia de seguridad." -"Not enough permissions to create backup.","No hay permisos suficientes para crear la copia de seguridad." -"Not enough permissions to perform rollback","No hay permisos suficientes para realizar la reversión." -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup.""","Desmarque la casilla de selección ""Poner la tienda en modo de mantenimiento"" o actualice sus permisos para proceder a la copia de seguridad." -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback.""","Desmarque la casilla de selección ""Poner la tienda en modo de mantenimiento"" o actualice sus permisos para proceder a la reversión." -"Put store on the maintenance mode while backup's creation","Ponga la tienda en modo de mantenimiento durante la creación de la copia de seguridad" -"Rollback","Revertir" -"Scheduled Backup Settings","Configuración de copia de seguridad programada" -"Size, Bytes","Tamaño, Bytes" -"Start Time","Tiempo de Inicio" -"System","Sistema" -"System (excluding Media)","Sistema (excepto los medios)" -"System Backup","Copia de seguridad del sistema" -"System couldn't put store on the maintenance mode","El sistema no ha podido poner la tienda en modo de mantenimiento" -"The database and media backup has been created.","Se ha creado la copia de seguridad de la base de datos y de los medios." -"The database backup has been created.","Se ha creado la copia de seguridad de la base de datos." -"The file was compressed with Zlib, but this extension is not installed on server.","El archivo ha sido comprimido con Zlib, pero esta extensión no está instalada en el servidor." -"The selected backup(s) has been deleted.","Se han eliminado las copias de seguridad seleccionadas." -"The system (excluding Media) backup has been created.","Se ha creado la copia de seguridad del sistema (excepto los medios)." -"The system backup has been created.","Se ha creado la copia de seguridad del sistema." -"Time","Tiempo" -"Type","Tipo" -"Unable to create backup. Please, try again later.","No se puede crear la copia de seguridad. Por favor, inténtelo de nuevo más tarde." -"Unable to save the cron expression.","No ha sido posible guardar la expresión cron." -"Wrong order of creation for new backup.","Orden incorrecta de creación de nueva copia de seguridad." -"You do not have sufficient permissions to enable Maintenance Mode during this operation.","No tiene suficientes permisos para activar el Modo de mantenimiento durante esta operación." diff --git a/app/locale/es_ES/Mage_Bundle.csv b/app/locale/es_ES/Mage_Bundle.csv deleted file mode 100644 index 6d88e539a..000000000 --- a/app/locale/es_ES/Mage_Bundle.csv +++ /dev/null @@ -1,71 +0,0 @@ -"%1$s incl tax.","%1$s incl tax." -"* Required Fields","* Campos obligatorios" -"-- Select --","-- Seleccionar --" -"Add New Option","Añadir Nueva Opción" -"Add Selection","Añadir Selección" -"As Low as","Tan bajo como" -"As low as","Tan bajo como" -"Bundle Items","Grupo de Artículos" -"Bundle Product","Grupo de Productos" -"Bundle Product View Summary","Ver Resumen del Paquete del Producto" -"Buy %1$s","Buy %1$s" -"Buy %1$s for","Buy %1$s for" -"Buy %1$s for %2$s","Buy %1$s for %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Buy %1$s for %2$s (%3$s incl. tax) each" -"Buy %1$s for %2$s each","Buy %1$s for %2$s each" -"Buy %1$s with %2$s discount each","Compra %1$s con %2$s de descuento cada uno" -"Catalog Product View (Bundle)","Ver Producto Catálogo (Grupo)" -"Checkbox","Casilla de verificación" -"Choose a selection...","Elegir una selección..." -"Click for price","Click for price" -"Close","Cerrar" -"Default","Predeterminada" -"Default Qty","Cantidad por Defecto" -"Default Title","Título por Defecto" -"Drop-down","Desplegable" -"Dynamic","Dinámico" -"Excl. Tax","Impuestos no incluidos" -"Excl. Tax:","Excl. Tax:" -"Fixed","Fijo" -"From","De" -"From:","Desde:" -"Gift Message","Mensaje de Regalo" -"Incl. Tax","Impuestos incluidos" -"Incl. Tax:","Incl. Tax:" -"Input Type","Introducir tipo" -"Is Required","Es Requerido" -"Message:","Mensaje:" -"Multiple Select","Elección múltiple" -"N/A","N/A" -"No options of this product are available.","No hay opciones disponibles de este producto" -"None","Nada" -"Percent","Porcentaje" -"Percent Discount","Descuento porcentaje" -"Please Select Products to Add","Por favor, Selecciona Productos a Añadir" -"Please enter a number greater 0 in this field.","Por favor, introduce un número superior a 0 en este campo." -"Please enter search conditions to view products.","Por favor, indica las condiciones de búsqueda para ver productos." -"Please select options for product.","Por favor, selecciona opciones para el producto" -"Please specify product option(s).","Por favor, especifica opción(es) del producto" -"Position","Posición" -"Price Range","Rango de Precio" -"Price Type","Tipo de Precio" -"Price as configured","Precio según configuración" -"Qty:","Cantidad:" -"Radio Buttons","Botón de Radio" -"Required options are not selected.","No se han seleccionado las opciones requeridas." -"Selected required options are not available.","Las opciones requeridas seleccionadas no están disponibles." -"Separately","Separadamente" -"Ship Bundle Items","Enviar Artículos en Grupo" -"Shipment","Envío" -"Store View Title","Título de Vista de Tienda" -"There is no defined renderer for ""%s"" option type.","No hay un visualizador definido para el tipo de opción ""%s""." -"This product is also part of bundle(s)","Este producto es también parte de un(os) paquete(s)" -"To","Para" -"To:","A:" -"Together","Juntos" -"Total incl. Tax: %1$s","Total incl. Tax: %1$s" -"Use Default Value","Usar Valor por Defecto" -"User Defined Qty","Cantidad Definida por el Usuario" -"and","and" -"each","each" -"save","save" diff --git a/app/locale/es_ES/Mage_Captcha.csv b/app/locale/es_ES/Mage_Captcha.csv deleted file mode 100644 index 3c359bc8b..000000000 --- a/app/locale/es_ES/Mage_Captcha.csv +++ /dev/null @@ -1,22 +0,0 @@ -"Attention: Captcha is case sensitive.","Atención: Captcha es sensible al uso de mayúsculas y minúsculas." -"After number of attempts to login","Tras varios intentos de iniciar sesión" -"Always","Siempre" -"CAPTCHA","CAPTCHA" -"CAPTCHA Timeout (minutes)","Tiempo de expiración del CAPTCHA (en minutos)" -"CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen","Si así se elige, el CAPTCHA estará siempre en funcionamiento en los formularios de «Nuevo usuario» y «Olvido de contraseña»" -"Case Sensitive","Distingue mayúsculas y minúsculas" -"Displaying Mode","Modo de visualización" -"Enable CAPTCHA in Admin","Habilitar el CAPTCHA en Administrador" -"Enable CAPTCHA on Frontend","Habilitar el CAPTCHA en el interfaz de usuario" -"Font","Fuente" -"Forms","Formularios" -"If 0 is specified, CAPTCHA on the Login form will be always available.","Si se especifica 0, el CAPTCHA siempre estará disponible en el formulario de inicio de sesión." -"Incorrect CAPTCHA.","CAPTCHA incorrecto." -"Number of Symbols","Número de símbolos" -"Number of Unsuccessful Attempts to Login","Número de intentos fallidos de iniciar sesión" -"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Especifique un máximo de 8 símbolos. Se permiten intervalos (por ejemplo, 3-5)" -"Please type the letters below","Teclee las letras más abajo" -"Please type the letters from the image:","Por favor escribe las letras de la imagen:" -"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.
    Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Utilice solo letras (a-z o A-Z) o números (0-9) en este campo. No se permiten espacios ni otros caracteres.
    Los caracteres de apariencia semejante (por ejemplo, «i», «l», «1») dificultan su reconocimiento por parte del cliente." -"Reload captcha","Volver a cargar captcha" -"Symbols Used in CAPTCHA","Símbolos utilizados en el CAPTCHA" diff --git a/app/locale/es_ES/Mage_Catalog.csv b/app/locale/es_ES/Mage_Catalog.csv deleted file mode 100644 index 564d7e184..000000000 --- a/app/locale/es_ES/Mage_Catalog.csv +++ /dev/null @@ -1,848 +0,0 @@ -"# of Use","# de uso" -"%1$s incl tax.","%1$s con impuestos incluidos." -"%s - %s","%s - %s" -"%s Item(s)","%s artículo(s)" -"%s and above","%s y superior" -"%s-%s of %s","%s-%s de %s" -"(%d)","(%d)" -"(Copy data from: %s)","(Copiar datos de: %s)" -"* Required Fields","* Campos Requeridos" -"-- Please Select --","-- Seleccionar, por favor --" -"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","La opción predeterminada es 86400, si no se la configura. Para actualizarla instantáneamente, borre la memoria caché de salida HTML del bloque." -"Warning! Applying MAP by default will hide all product prices on the frontend.","¡Atención! El MAP aplicado por defecto esconderá todos los precios de productos en la parte frontal." -"A group with the same name already exists.","Ya existe un grupo con el mismo nombre." -"A name is required","Se requiere un nombre" -"A product type is not defined for the indexer.","No hay un tipo de producto definido para el motor de indexación." -"ALL GROUPS","TODOS LOS GRUPOS" -"AM","AM" -"Action","Acción" -"Actual Price","Precio Actual" -"Add","Añadir" -"Add Attribute","Añadir Atributo" -"Add Design Change","Agregar cambio de diseño" -"Add Group","Agregar grupo" -"Add Group Price","Añadir precio de grupo" -"Add New","Añadir Nuevo" -"Add New Attribute","Añadir Nuevo Atributo" -"Add New Attribute Set","Agregar nuevo conjunto de atributos" -"Add New Group","Agregar nuevo grupo" -"Add New Images","Agregar nuevas imágenes" -"Add New Option","Añadir Nueva Opción" -"Add New Row","Agregar nueva fila" -"Add New Search Term","Añadir Nueva Cláusula de Búsqueda" -"Add New Set","Agregar nuevo conjunto" -"Add Product","Agregar producto" -"Add Product To Websites","Agregar producto a sitios web" -"Add Root Category","Agregar categoría raíz" -"Add Subcategory","Agregar subcategoría" -"Add Tax","Agregar impuestos" -"Add Tier","Agregar capa" -"Add attribute into attribute set","Añadir atributo al conjunto de atributos" -"Add group into attribute set","Añadir grupo al conjunto de atributos" -"Add new custom option into product","Añadir nueva opción de personalización al producto" -"Add new values into custom option","Añadir nuevos valores a la opción de personalización" -"Add option","Añadir opción" -"Add to Cart","Añadir al Carrito" -"Add to Compare","Añadir para comparar." -"Add to Wishlist","Añadir a lista que quieres." -"Additional Information","Información adicional" -"Alert Urls","Direcciones URL de alerta" -"All","Todo" -"All Product Types","Todos los tipos de productos" -"All Websites","Todos los Sitios Web" -"All products","Todos los productos" -"All products - recently added products, New products - products marked as new","Todos los productos - productos añadidos recientemente, Nuevos productos - productos marcados como nuevos" -"All products of this set will be deleted! Are you sure you want to delete this attribute set?","¡Todos los productos de este conjunto serán eliminados! ¿Estás seguro que quieres eliminar este conjunto de atributos?" -"Allow All Products per Page","Permitir todos los productos por página" -"Allow Dynamic Media URLs in Products and Categories","Permitir direcciones URL multimedia dinámicas en productos y categorías" -"Allow HTML Tags on Frontend","Permitir etiquetas HTML en la interfaz del cliente" -"Allowed File Extensions","Extensiones de archivo permitidas" -"Allowed file extensions to upload","Extensiones de archivo permitidas para la carga" -"Amount","Importe" -"An error occurred while adding products to websites.","Se produjo un error mientras se agregaban productos a los sitios web." -"An error occurred while clearing comparison list.","Se produjo un error mientras se borraba la lista de comparación." -"An error occurred while deleting this review.","Se produjo un error al eliminar esta revisión." -"An error occurred while removing products from websites.","Se produjo un error mientras se eliminaban productos de sitios web." -"An error occurred while saving the URL rewrite","Se produjo un error al guardar la URL reescrita" -"An error occurred while saving the attribute set.","Se produjo un error mientras se guardaba el conjunto de atributos." -"An error occurred while saving the collection, aborting. Error message: %s","Se produjo un error al guardar la recopilación, abortando. Mensaje de error: %s" -"An error occurred while saving the product. ","Se produjo un error mientras se guardaba el producto." -"An error occurred while saving the search query.","Se produjo un error mientras se guardaba el enunciado de búsqueda." -"An error occurred while saving this group.","Se produjo un error mientras se guardaba este grupo." -"An error occurred while saving this review.","Se produjo un error al guardar esta revisión." -"An error occurred while trying to delete the category.","Se produjo un error mientras se intentaba eliminar la categoría." -"An error occurred while updating the product(s) attributes.","Se produjo un error al actualizar los atributos del producto o productos." -"An error occurred while updating the product(s) status.","Se produjo un error al actualizar el estado del producto o productos." -"An invalid group ID is specified, skipping the record.","Se ha especificado una identificación de grupo inválida, saltando el registro." -"An invalid option ID is specified for %s (%s), skipping the record.","Se especificó un ID de opción no válido para %s (%s). Se omitirá este registro." -"An invalid store was specified.","Se especificó una tienda no válida." -"Anchor Custom Text","Texto personalizado del delimitador" -"Anchor Custom Title","Título personalizado del delimitador" -"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","Aplicable únicamente a las categorías y los productos de catálogo. Todo el contenido multimedia se insertará en el editor como una dirección URL estática. No se actualiza si cambia la dirección URL básica de configuración del sistema." -"Apply MAP (Default Value)","Aplicar MAP (Valor por Defecto)" -"Apply To","Aplicar a." -"Approved","Aprobado" -"Are you sure you want to delete this category?","¿Está seguro de que desea eliminar esta categoría?" -"Are you sure you would like to remove all products from your comparison?","¿Está seguro de que desea eliminar todos los productos de la comparación?" -"Are you sure you would like to remove this item from the compare products?","¿Está seguro de que desea eliminar este artículo de los productos de la comparación?" -"Are you sure?","¿Está seguro?" -"As low as:","Valor mínimo:" -"Assign","Asignar" -"Assign product link","Asignar enlace de producto" -"Assign product to category","Asignar producto a categoría" -"Assigned Products","Productos asignados" -"Associated Products","Productos asociados" -"Attrib. Set Name","Nombre de conjunto de atributos" -"Attribute ""%s"" is invalid.","El atributo ""%s"" es inválido." -"Attribute ""%s"" is required.","El atributo ""%s"" es requerido." -"Attribute Information","Información de Atributo" -"Attribute Model","Modelo de atributo" -"Attribute Name:","Nombre de atributo:" -"Attribute Set","Conjunto de atributos" -"Attribute Sets","Conjunto de atributos" -"Attribute add","Añadir atributo" -"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","El código de atributo no es válido. Por favor, usa solo letras (a-z), números (0-9) o guión bajo(_) en este campo, el primer carácter ha de ser una letra." -"Attribute group with the \"/name/\" name already exists","Grupo de atributos con el \"/name/\" nombre ya existe" -"Attribute group with the \/name/\ name already exists","El grupo de atributo con el nombre \/name/\ ya existe." -"Attribute remove","Eliminar atributo" -"Attribute with the same code already exists","Ya existe un atributo con el mismo código" -"Attributes","Atributos" -"Attrribute names can be specified per store.","Pueden especificarse nombres de atributos por tienda." -"Autogenerate","Generar automáticamente" -"Availability:","Disponibilidad:" -"Back","Volver" -"Backend Model","Modelo de administración del sitio:" -"Backend Table","Tabla de administración del sitio" -"Backend Table Title","Título de la tabla de administración del sitio" -"Backorders","Pedidos Pendientes" -"Based On","Basado en" -"Before Order Confirmation","Antes de la Confirmación del Pedido" -"Best Value","Mejor valor" -"Block after Info Column","Bloque posterior a la columna de información" -"Bottom Block Options Wrapper","Ajuste de opciones del bloque inferior" -"Bottom/Left","Inferior/izquierda" -"Bottom/Right","Inferior/derecha" -"Browse By","Ver por" -"Bundle Items","Elementos en Paquete" -"Buy %1$s","Comprar %1$s" -"Buy %1$s for","Comprar %1$s por" -"Buy %1$s for %2$s","Comprar %1$s por %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Comprar %1$s por %2$s (%3$s con impuestos incluidos) cada uno" -"Buy %1$s for %2$s each","Comprar %1$s por %2$s cada uno" -"Cache Lifetime (Seconds)","Duración máxima de la memoria caché (segundos)" -"Cache refresh needed.","Es necesario actualizar la memoria caché." -"Can be Divided into Multiple Boxes for Shipping","Puede dividirse en varias cajas para el envío" -"Can be used only with catalog input type Dropdown","Sólo puede utilizarse con el tipo de entrada de catálogo Lista desplegable" -"Can be used only with catalog input type Dropdown, Multiple Select and Price","Sólo puede utilizarse con los tipos de entrada de catálogo Lista desplegable, Selección múltiple y Precio" -"Can\'t create image.","No se puede crear la imagen." -"Cancel","Cancelar" -"Cannot create image.","No se puede crear la imagen." -"Cannot create writeable directory '%s'.","No se puede crear el directorio con permiso de escritura '%s'." -"Cart Item Attribute","Atributo de artículo del carrito" -"Catalog","Catálogo" -"Catalog Category (Anchor)","Categoría de Catálogo (Ancla)" -"Catalog Category (Non-Anchor)","Categoría de catálogo (Sin ancla)" -"Catalog Category (Without Subcategories)","Categoría del catálogo (sin subcategorías)" -"Catalog Category Link","Enlace a la Categoría de Catálogo" -"Catalog New Products List","Lista de Nuevos Productos del Catálogo" -"Catalog Price Scope","Rango de Precios del Catálogo" -"Catalog Product Compare List","Lista de Comparación de Productos del Catálogo" -"Catalog Product Email to a Friend","Enviar Email a un amigo con el Catálogo de Productos" -"Catalog Product Image Gallery Popup","Galería de imágenes emergente del Catálogo de Productos" -"Catalog Product Link","Enlace al Catálgo de Productos" -"Catalog Product View (Any)","Vista del Catálogo de Producto (cualquiera)" -"Catalog Product View (Configurable)","Vista del Catálogo de Producto (Configurable)" -"Catalog Product View (Grouped)","Vista del Catálogo de Producto (Agrupada)" -"Catalog Product View (Simple)","Vista del Catálogo de Producto (Simple)" -"Catalog Product View (Virtual)","Vista del Catálogo de Producto (Virtual)" -"Catalog Section","Sección de Catálogo" -"Catalog Seo Sitemap (Category List)","Mapa del Sitio Catálogo Seo (Lista de categorías)" -"Catalog Seo Sitemap (Category Tree)","Mapa del Sitio Catálogo Seo (Árbol de Categorías)" -"Catalog Seo Sitemap (Common)","Mapa del Sitio Catálogo Seo (Común)" -"Catalog Seo Sitemap (Product List)","Mapa del Sitio Catálogo Seo (Lista de Productos)" -"Catalog URL Rewrites","Nueva versión de URL de Catálogo" -"Catalog product custom option values API","API para los valores de las opciones de personalización del producto de catálogo" -"Catalog product custom options API","API para las opciones de personalización del producto de catálogo" -"Catalog, Search","Catálogo, Búsqueda" -"Categories","Categorías" -"Categories Sitemap","Mapa del Sitio Categorías" -"Category","Categoría" -"Category API","API Categoría" -"Category Data","Datos de Categoría" -"Category Flat Data","Datos planos de Categoría" -"Category Link Block Template","Modelo del bloque de enlaces de Categorías" -"Category Link Inline Template","Modelo de enlaces en línea a Categorías" -"Category Products","Categoría de Productos" -"Category Top Navigation","Navegación superior en Categoría" -"Category URL Suffix","Sufijo URL de Categoría" -"Category attributes API","API de atributos de Categoría" -"Category move error","Error al mover Categoría" -"Category move error %s","Error al mover la categoría %s" -"Category move operation is not possible: parent category is equal to child category.","La operación de mover categoría no es posible: categoría padre es igual a categoría niño." -"Category move operation is not possible: the current category was not found.","La operación de mover categoría no es posible: no se encontró la categoría actual." -"Category move operation is not possible: the new parent category was not found.","No es posible la operación de mover Categoría: no se ha encontrado una nueva categoría de origen." -"Category must be an instance of Mage_Catalog_Model_Category.","La Categoría debe ser una instancia de Mage_Catálogo_Modelo_Categoría." -"Center","Centro" -"Change","Cambio" -"Change or Retrieve attribute store view","Cambiar o Recuperar la caracterísitica de vista de tienda" -"Change status","Cambiar estado" -"Check items to add to the cart or","Comprueba los productos para añadir al carro o." -"Choose an Option...","Elegir una Opción..." -"Clear All","Limpiar Todo" -"Clear Price","Borrar precio" -"Click for price","Clic para precio" -"Close Window","Cerrar Ventana" -"Collapse All","Desplegar Todo" -"Comma-separated.","Separados por comas." -"Comparable","Comparable" -"Comparable on Front-end","Comparable en el Panel Frontal" -"Comparable on the Frontend","Comparable en el Panel Frontal" -"Compare","Comparar" -"Compare Products","Comparar Productos" -"Conditions Combination","Combinación de condiciones" -"Configurable Product","Producto Configurable" -"Configurable Product Settings","Parametrización de Producto Configurable" -"Configure Product","Configurar Producto" -"Continue","Continuar" -"Copy From Configurable","Copiar desde Configurable" -"Country/State","País/Estado" -"Create","Crear." -"Create (Upload)","Crear (Cargar)" -"Create Empty","Crear Vacío" -"Create Permanent Redirect for URLs if URL Key Changed","Crear redirección permanente para las URL si cambia la clave de URL" -"Create Permanent Redirect for old URL","Crear Redirección Permanente para la antigua URL" -"Create Product Settings","Crear Configuración de Producto" -"Create Simple Associated Product","Crear Producto Asociado Simple" -"Create attribute set based on another set","Crear conjunto de atributos basándose en otro conjunto" -"Create new attribute","Crear un nuevo atributo" -"Create new category","Crear nueva categoría" -"Create new product","Crear nuevo producto" -"Cross-sells","Ventas cruzadas." -"Currently Shopping by:","Actualmente Comprando en:" -"Custom Design","Diseño Personalizado" -"Custom Options","Opciones Personalizadas" -"Custom options","Opciones de personalización" -"Customer Group","Grupo de Clientes" -"Customers Reviews","Revisiones Personalizadas" -"Customers Tagged Product","Producto Etiquetado de Clientes" -"Data Type for Saving in Database","Tipo de Datos a Guardar en la Base de Datos" -"Date & Time Custom Options","Opciones Personalizadas de Fecha y Hora" -"Date Fields Order","Pedido de Campos de Fecha" -"Date Subscribed","Fecha suscrita" -"Datetime","Fecha" -"Decimal","Decimal" -"Declare attribute value saving scope","Declarar alcance de grabación de valor de atributo" -"Default ""What's This"" Text Message","Mensaje de Texto ""Qué es esto"" por defecto" -"Default Popup Text Message","Mensaje de Texto Emergente por Defecto" -"Default Price","Precio por Defecto" -"Default Price Navigation Step","Paso de Navegación de Precio por Defecto" -"Default Qty","Cantidad por Defecto" -"Default Values","Valores por Defecto" -"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","Define el ámbito de la divisa base (""Configuración de Divisas"" > ""Opciones de Divisas"" > ""Divisa Base"")." -"Delete","Eliminar" -"Delete Attribute","Borrar Atributo" -"Delete Attribute Set","Establecer Atributo de Borrado" -"Delete Category","Borrar categoría" -"Delete Group Price","Eliminar precio de grupo" -"Delete Option","Borrar Opción" -"Delete Row","Borrar Fila" -"Delete Search","Borrar Búsqueda" -"Delete Selected Group","Borrar Grupo Seleccionado" -"Delete Tier","Borrar escalonamiento" -"Delete attribute","Eliminar atributo" -"Delete category","Eliminar categoría" -"Delete product","Borrar producto" -"Depends on design theme","Depende del tema de diseño" -"Design","Diseño" -"Details","Detalles" -"Disabled","Deshabilitado" -"Disallowed file type.","Tipo de archivo no permitido" -"Display Actual Price","Mostrar Precio Actual" -"Display Page Control","Mostrar Control de Página" -"Display Price Interval as One Price","Mostrar intervalo de precios como un único precio" -"Display Product Count","Mostrar la cuenta de productos" -"Display Type","Tipo de visualización" -"Display in Suggested Terms","Mostrar Cláusulas Sugeridas" -"Double click on a group to rename it","Pinchar dos veces en un grupo para renombrarlo" -"Double click on above image to view full picture","Pinchar dos veces en la imagen superior para verla completa" -"Downloadable Information","Información Descargable" -"Duplicate","Duplicar" -"Duplicate amount found.","Cantidad duplicada encontrada" -"Duplicate website group price customer group.","Duplicar grupo de cliente precio de grupo de sitio web" -"Duplicate website tier price customer group and quantity.","Duplicar precio de nivel de página web grupo de cliente y cantidad." -"Duplicate website, country and state tax found.","Encontrados página web duplicada, impuesto de país y estado" -"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","P. ej. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Rendimiento de catálogo de impactos de análisis de directivas dinámicas." -"Edit","Editar" -"Edit Attribute Set '%s'","Editar el conjunto de características ""%s""" -"Edit Product Attribute","Editar característica de producto" -"Edit Product Attribute ""%s""","Editar Atributo ""%s"" de Producto" -"Edit Search","Editar búsqueda" -"Edit Search '%s'","Editar búsqueda ""%s""" -"Edit Set Name","Editar nombre del conjunto" -"Email","Correo electrónico" -"Email to a Friend","Escribir un Email a un amigo" -"Empty","Vacío(a)" -"Enable MAP","Activar MAP" -"Enable Qty Increments","Posibilitar Incrementos de Cantidad" -"Enable WYSIWYG","Habilitar WYSIWYG" -"Enable for reindexing a big number of SKUs.","Permite reindexar un gran número de SKU." -"Enabled","Habilitado" -"Error during retrieval of option value: %s","Error al recuperar el valor de la opción: %s" -"Exclude","Excluir" -"Expand All","Expandir todo" -"Failed","Ha fallado" -"Failed to copy file %s. Please, delete media with non-existing images and try again.","Error al copiar el archivo %s. Por favor, elimina los medios con imágenes no existentes e inténtalo de nuevo." -"Failed to move file: %s","Error al mover el fichero: %s" -"Feature Products","Presentar productos" -"Field is not complete","No se ha completado el campo" -"File options format is not valid.","El formato de opciones de archivo no es válido." -"File upload failed","Fallo al cargar el archivo" -"Filter","Filtrar" -"Filter model name must be declared.","Debe indicarse el nombre del modelo de filtro." -"Filter must be an object. Please set correct filter.","El filtro tiene que ser un objeto. Por favor, establezca un filtro válido." -"Filterable (no results)","Filtrable (sin resultados)" -"Filterable (with results)","Filtrable (con resultados)" -"First Name","Nombre" -"Fixed","Fijo" -"For internal use.","Para uso interno." -"For the last time placed.","Para la última vez que se ha colocado." -"Frontend","Entrada" -"Frontend Model","Modelo de entrada" -"Frontend Properties","Propiedades del Panel Delantero" -"Gallery","Galería" -"General Information","Información general" -"Get full information about attribute with list of options","Obtener completa información sobre el atributo con lista de opciones" -"Get full information about custom option in product","Obtener toda la información sobre las opciones de personalización del producto" -"Get list of available custom option types","Obtener una lista de los tipos de opciones de personalización disponibles" -"Get list of non-default attributes by product type and attributes set","Obtener lista de atributos no predeterminados por tipo de producto y conjunto de atributos" -"Get list of possible attribute types","Obtener lista de tipos de atributos posibles" -"Get special price","Obtener un precio especial" -"Global","Global" -"Globally Editable","Editable globalmente" -"Go to Home Page","Ir a la página de inicio" -"Grid","Parrilla" -"Group add","Añadir grupo" -"Group remove","Eliminación de grupo" -"Grouped Product","Producto agrupado" -"Groups","Grupos" -"Home","Inicio" -"ID","ID" -"ID: %s","ID: %s" -"If empty, the Category Name will be used","Si se deja en blanco, se usará el Nombre de Categoría" -"If empty, the Product Name will be used","Si está vacío se utilizará el nombre del producto" -"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Si usted no especifica un valor de opción para una vista de tienda concreta, entonces se usará el valor por defecto (Admin)." -"Image","Imagen" -"Image content is not valid base64 data.","El contenido de imagen no es un dato base64 válido." -"Image does not exist.","La imagen no existe." -"Image file was not found.","No se ha encontrado el fichero de imagen." -"Image type and information need to be specified for each store view.","Se necesita especificar el tipo de imagen y la información para cada vista de tienda" -"In Cart","Carrito" -"In Stock","En stock" -"In stock","En existencias" -"Incl. Tax","Impuestos incluidos" -"Index product and categories URL rewrites","Indexar las nuevas versiones de las URL de productos y categorías" -"Index product attributes for layered navigation building","Indexar las características de producto para construir una navegación en capas" -"Index product prices","Indexar los precios de productos" -"Indexed category/products association","Asociación categoría/productos indexada" -"Info","Información" -"Info Column Options Wrapper","Envoltorio de las opciones de columna de información" -"Input Type","Introducir tipo" -"Integer","Entero" -"Interval Division Limit","Límite de División de Intervalo" -"Invalid Tier Prices","Precios de capa no válidos" -"Invalid attribute %s","Atributo %s inválido" -"Invalid attribute option specified for attribute %s (%s), skipping the record.","Se especificó una opción de atributo no válida para el atributo %s (%s). Se omitirá el registro." -"Invalid attribute set specified, skipping the record.","Se ha especificado un conjunto de atributos no válido. Saltando el registro." -"Invalid block: %s.","Bloque no válido: %s." -"Invalid category IDs.","ID de categoría no válidos." -"Invalid category.","Categoría no válida." -"Invalid image file type.","Tipo de imagen no válido." -"Invalid image type.","Tipo de imagen no válido." -"Invalid option ID specified for %s (%s), skipping the record.","Se especificó un ID de opción no válido para %s (%s). Se omitirá el registro." -"Invalid product type specified, skipping the record.","Se ha especificado un tipo de producto no válido. Saltando el registro." -"Invalid store specified","Se especificó una tienda no válida" -"Invalid store specified, skipping the record.","Se especificó una tienda no válida. Se omitirá el registro." -"Invalid tier prices. The product is not associated to the requested website.","Precios de nivel no válidos. El producto no está asociado a la página web solicitada." -"Inventory","Inventario" -"Is Default","Es Por Defecto" -"Is Required","Es Requerido" -"Items %s to %s of %s total","Elementos %s a %s de un total de %s" -"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Los artículos que no quieres mostrar en el catálogo o en los resultados de búsqueda deberían tener el estado ""Inhabilitado"" en la tienda solicitada." -"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Los artículos que no desee ver en el catálogo o en los resultados de búsqueda deben tener el estado 'Desactivado' en la tienda correspondiente." -"Keep your eyes open for our special Back to School items and save A LOT!","Esté atento a nuestros artículos especiales para el comienzo de clases y AHORRE." -"Label","Etiqueta" -"Last Name","Apellido" -"Last Notification","Última notificación" -"Layered Navigation","Navegación en capas" -"Learn More","Más información" -"Line %d, Email: %s","Línea %d, correo electrónico: %s" -"Line %d, SKU: %s","Línea %d, código de artículo (SKU): %s" -"Link (Related, Up sell, Cross sell)","Enlace (relacionado, venta adicional, venta cruzada)" -"Link product does not exist.","El producto de enlace no existe." -"Link to a Specified Category","Enlace a una categoría específica" -"Link to a Specified Product","Enlace a un producto específico" -"List","Lista" -"List Mode","Modo de lista" -"List of Products that are set as New","Lista de productos marcados como nuevos" -"List of types","Lista de tipos" -"Manage Attribute Sets","Administrar conjuntos de atributos" -"Manage Attributes","Administrar atributos" -"Manage Catalog Categories","Gestionar categorías del catálogo" -"Manage Categories","Administrar categorías" -"Manage Label / Options","Gestionar etiquetas y opciones" -"Manage Options (values of your attribute)","Administrar opciones (valores del atributo)" -"Manage Product Attributes","Administrar atributos del producto" -"Manage Product Sets","Administrar conjuntos de productos" -"Manage Products","Administrar productos" -"Manage Stock","Gestionar Existencias" -"Manage Titles (Size, Color, etc.)","Administrar títulos (tamaño, color, etc.)" -"Max Characters","Número máximos de caractéres" -"Maximal Depth","Profundidad Máxima" -"Maximum Image Size","Tamaño máximo de imagen" -"Maximum Number of Price Intervals","Número máximo de intervalos de precios" -"Maximum Qty Allowed in Shopping Cart","Cantidad Máxima Permitida en el Carro de la Compra" -"Maximum allowed image size for '%s' is %sx%s px.","Tamaño máximo de imagen permitido para '%s' es %sx%s px." -"Maximum image height","Altura máxima de imagen" -"Maximum image width","Anchura máxima de la imagen" -"Maximum number of characters:","Cantidad máxima de caracteres" -"Maximum number of price intervals is 100","El número máximo de intervalos de precios es 100" -"Media Image","Imagen multimedia" -"Minimum Advertised Price","Precio mínimo anunciado" -"Minimum Lines per Page","Cant. máxima de líneas por página" -"Minimum Qty Allowed in Shopping Cart","Cantidad mínima permitida en el carro de la compra" -"Minimum Qty for Item\'s Status to be Out of Stock","Cant. mínima para que el estado del artículo pase a ""Sin inventario""" -"Missing SKU, skipping the record.","Falta el código de producto (SKU). Se omitirá el registro." -"More Views","Más vistas" -"Move","Mover" -"Move category in tree","Mover la categoría en el árbol" -"Multi update product","Multiactualización de productos" -"Must be in the allowed values list.","Debe estar en la lista de valores permitidos." -"My Account","Mi cuenta" -"N/A","N/A" -"Name","Nombre" -"Name in %s","Nombre en %s" -"New Product","Nuevo producto" -"New Product Attribute","Nuevo atributo de producto" -"New Products","Nuevos productos" -"New Products Grid Template","Plantilla de cuadrícula de nuevos productos" -"New Products List Template","Plantilla de lista de nuevos productos" -"New Root Category","Nueva Categoría Raíz" -"New Search","Nueva búsqueda" -"New Set Name","Nuevo nombre de conjunto" -"New Subcategory","Nueva Subcategoría" -"New products","Nuevos productos" -"Next","Siguiente" -"No","No" -"No image","Sin imagen" -"No layout updates","No hay actualizaciones de diseño" -"No options of this product are available.","No hay opciones disponibles de este producto" -"No product collections found.","No se han encontrado colecciones de producto" -"None","Nada" -"Not Visible Individually","No es visible individualmente" -"Notify Low Stock RSS","RSS de notificación de bajas cantidades en inventario" -"Notify for Quantity Below","Notificar cuando la Cantidad sea Inferior a" -"Number of Products per Page","Número de Productos por Página" -"Number of Products to Display","Número de productos a mostrar" -"Number of Uses","Número de Usos" -"Number of results","Número de resultados" -"Number of results (For the last time placed)","Número de resultados (colocado por última vez)" -"OK","Aceptar" -"OR","O BIEN" -"Old Price:","Precio anterior:" -"On Gesture","Sobre el gesto" -"Option validation failed to add product to cart.","La validación de opción no pudo agregar el producto al carrito." -"Option values","Valores de opción" -"Option:","Opción:" -"Options","Opciones" -"Options Control","Control de opciones" -"Options is required","Opciones requeridas" -"Our customer service is available 24/7. Call us at (555) 555-0123.","Nuestro departamento de servicio al cliente está disponible todos los días, las 24 horas. Llámenos al teléfono (555) 555-0123." -"Out of Stock","Agotado" -"Out of stock","Sin existencias" -"PM","PM" -"Page Title Separator","Separador de título de página" -"Parent Category","Categoría principal" -"Pending","Pendiente" -"Pending Reviews RSS","RSS de reseñas pendientes" -"Percentage","Porcentaje" -"Please add rows to option.","Por favor, añadir filas a la opción." -"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","Tenga en cuenta que al hacer clic en la fila se cargarán los datos de paquete del archivo seleccionado, y se perderán todos los datos del formulario que no se hayan guardado." -"Please click on the Close Window button if it is not closed automatically.","Por favor, pinche en el botón de cerrar ventana si no se cierra automáticamente." -"Please enter a new group name","Ingrese un nuevo nombre de grupo" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Por favor refresca ""Reescritura de URL de Catalogo"" y ""Atributos de Producto"" en Sistema -> Index Management" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Por favor, actualiza ""Reescrituras de URL de Catálogo"" y ""Atributos de Producto"" en Sistema -> Administración de Índice" -"Please refresh ""Product Attributes"" in System -> Index Management","Por favor refresca ""Atributos de Productos"" en Sistema -> Index Management" -"Please select a static block ...","Por favor, seleccione un bloque estático..." -"Please select items.","Seleccione artículos." -"Please select one or more attributes.","Seleccione un atributo o atributos." -"Please select product(s).","Por favor, seleccione el/los producto(s)." -"Please select products for attributes update","Por favor, seleccione productos para actualización de atributos" -"Please set up merge date/time","Configure la fecha/hora de la combinación" -"Please set up merge date/time later then present date","Por favor, establezca una fecha y hora de fusión mayor que la fecha actual" -"Please specify date required option(s).","Especifique las opciones obligatorias de la fecha." -"Please specify the number of products, that will not be divided into subintervals.","Por favor, especifica el número de productos, que no será dividido en subintervalos." -"Please specify the product required option(s)","Por favor, especifique la(s) opcioón/opciones obligatoria(s) de producto" -"Please specify the product required option(s).","Por favor, especifique la(s) opción/opciones obligatoria(s) de producto" -"Please specify the product\'s option(s).","Especifique las opciones del producto." -"Please specify the product\'s required option(s).","Por favor, especifique la(s) opción/opciones obligatoria(s) del producto." -"Please specify the quantity of product(s).","Por favor, especifique la cantidad de producto(s)." -"Please specify time required option(s).","Especifique las opciones obligatorias de la hora." -"Please wait...","Por favor, espera..." -"Position","Posición" -"Position in Layered Navigation","Posición de navegación en capas" -"Position of attribute in layered navigation block","Posición de atributo en el bloque de navegación en capas" -"Prev","Prev" -"Previous","Anterior" -"Price","Precio" -"Price Navigation Step Calculation","Cálculo de paso de navegación de precios" -"Price Type","Tipo de precio" -"Price is not available","Precio no disponible" -"Price values for options should be specified in system base currency.","Los valores de precio de las opciones deben especificarse en la moneda básica del sistema." -"Price:","Precio:" -"Price: %s","Precio: %s" -"Print This Page","Imprimir esta página" -"Product","Producto" -"Product API","API de Producto" -"Product Alerts","Alertas de producto" -"Product Attribute","Atributos del producto" -"Product Attributes","Atributos del producto" -"Product Categories","Categorías de Producto" -"Product Description","Descripción del producto" -"Product Extra Info","Información Extra del Producto" -"Product Flat Data","Datos Fijos de Producto" -"Product ID","ID de Producto" -"Product Image Placeholders","Marcadores de Posición de Imagen de Producto" -"Product Image Watermarks","Marcas de Agua de Imagen de Producto" -"Product Images","Imágenes de Producto" -"Product Images API","API de Imágenes de Producto" -"Product In Websites","Producto en Sitios Web" -"Product Info Column","Columna de Información de Producto" -"Product Information","Información de producto" -"Product Link Block Template","Plantilla de Bloque de Vínculo de Producto" -"Product Link Inline Template","Plantilla En Línea de Vínculo de Producto" -"Product Listing Sort by","Listado de Productos Ordenar Por" -"Product Name","Nombre de Producto" -"Product Prices","Precios de Producto" -"Product Reviews","Opiniones de Producto" -"Product Tags","Etiqueta de Producto" -"Product Tier Price API","API de Precio de Nivel de Producto" -"Product Type","Tipo de Producto" -"Product URL Suffix","Sufijo de URL de producto" -"Product View Extra Hint","Sugerencia Adicional de Vista de Producto" -"Product attribute sets API","API de conjuntos de atributo de producto" -"Product attributes API","API de atributos de producto" -"Product collection expected.","Colección esperada de producto." -"Product is not loaded","El producto no se ha cargado" -"Product links API (related, cross sells, up sells)","API de vínculos de producto (relacionados, ventas cruzadas, ventas incrementadas)" -"Product types API","API de tipos de producto" -"Product with this combination of attributes already associated to configurable.","El producto con esta combinación de atributos ya ha sido asociado a configurables." -"Products","Productos" -"Products Comparison List","Lista de Comparación de Productos" -"Products Information","Información de Productos" -"Products Reviews","Opiniones de Productos" -"Products Sitemap","Mapa del sitio de productos" -"Products only","Sólo productos" -"Products per Page on Grid Allowed Values","Productos por Página en Valores Permitidos por la Cuadrícula" -"Products per Page on Grid Default Value","Productos por Página en Valor Predeterminado por la Cuadrícula" -"Products per Page on List Allowed Values","Productos por Página en Valores Permitidos por la Lista" -"Products per Page on List Default Value","Productos por Página en Valor Predeterminado de la Lista" -"Properties","Propiedades" -"Qty","Cantidad" -"Qty Increments","Incrementos de cantidad" -"Qty Uses Decimals","La Cantidad Usa Decimales" -"Qty for Item\'s Status to Become Out of Stock","La cant. para el estado del artículo se va a quedar sin unidades disponibles" -"Qty:","Cantidad:" -"Quantity","Cantidad" -"Quick Create","Creación Rápida" -"Quick Overview","Descripción rápida" -"Quick simple product creation","Creación rápida de producto sencillo" -"Records for ""%s"" store found.","Se han encontrado registros para la tienda ""%s""." -"Redirect","Redirigir" -"Redirect URL","Redirigir URL" -"Regular Price:","Precio Habitual:" -"Related Products","Productos Relacionados" -"Remove","Borrar" -"Remove Product From Websites","Eliminar el Producto de los sitios de Internet" -"Remove This Item","Eliminar este artículo" -"Remove attribute from attribute set","Eliminar atributo de conjunto de atributos" -"Remove attribute set","Eliminar conjunto de atributos" -"Remove custom option","Eliminar opción personalizada" -"Remove group from attribute set","Eliminar grupo de conjunto de atributos" -"Remove option","Eliminar opción" -"Remove product assignment","Eliminar la asignación de producto" -"Remove product image","Eliminar imagen del producto" -"Remove product link","Eliminar el enlace del producto" -"Remove value from custom option","Eliminar valor de las opciones de personalización" -"Rename existing group","Renombrar un grupo existente" -"Rename group","Renombrar un grupo" -"Reorganize EAV category structure to flat structure","Reorganizar la esctructura de categoría EAV a una estructura plana" -"Reorganize EAV product structure to flat structure","Reorganizar la esctructura de producto EAV a una estructura plana" -"Reset","Reiniciar" -"Results","Resultados" -"Results per page","Resultados por página" -"Retrieve attribute data","Recuperar datos de atributo" -"Retrieve attribute list","Recuperar la lista de atributo" -"Retrieve attribute options","Recuperar las opciones de atributo" -"Retrieve categories tree","Recuperar árbol de categorías" -"Retrieve category attributes","Recuperar los atributos de categorías" -"Retrieve category data","Recuperar los datos de categorías" -"Retrieve hierarchical tree","Recuperar el árbol jerárquico" -"Retrieve linked products","Recuperar los productos enlazados" -"Retrieve list of assigned products","Recuperar la lista de productos asignados" -"Retrieve list of option values","Recuperar lista de valores de opción" -"Retrieve list of product custom options","Recuperar lista de opciones de personalización del producto" -"Retrieve one level of categories by website/store view/parent category","Recuperar un nivel de categorías por sitio de Internet/vista de tienda/categoría matriz" -"Retrieve option value info","Recuperar información sobre el valor de opción" -"Retrieve product","Recuperar producto" -"Retrieve product attribute sets","Recuperar conjuntos de atributos de producto" -"Retrieve product image","Recuperar imagen del producto" -"Retrieve product image list","Recuperar lista de imágenes de producto" -"Retrieve product image types","Recuperar tipos de imágenes de producto" -"Retrieve product link type attributes","Recuperar atributos de tipo de enlace de producto" -"Retrieve product link types","Recuperar tipos de enlace de producto" -"Retrieve product tier prices","Recuperar precios de nivel de producto" -"Retrieve product types","Recuperar tipos de producto" -"Retrieve products data","Recuperar datos de productos" -"Retrieve products list by filters","Recuperar lista de productos por medio de filtros" -"Reviews","Reseñas" -"Roll Over for preview","Desplegar para visualización previa" -"Root","Raíz" -"SKU","SKU (Número de Referencia)" -"SKU length should be %s characters maximum.","La longitud de SKU debe ser de un máximo de % carácteres." -"Save","guardar" -"Save Attribute","Guardar Atributo" -"Save Attribute Set","Grabar conjunto de atributos" -"Save Category","Guardar Categoría" -"Save Search","Guardar Búsqueda" -"Save and Continue Edit","Guardar y continuar editando" -"Saved %d record(s)","Registro(s) %d Guardado(s)" -"Scope","Alcance" -"Scope must not be changed, because the attribute is used in configurable products.","No se puede cambiar el ámbito de aplicación, dado que el atributo se utiliza en productos configurables." -"Search","Buscar" -"Search Engine Optimizations","Optimizaciones de motor de búsqueda" -"Search Information","Información de búsqueda" -"Search Query","Consulta de búsqueda" -"Search Term with such search query already exists.","Ya existe un término de búsqueda con esa consulta." -"Search Weight","Buscar peso" -"Searchable","Puede buscarse" -"See price before order confirmation.","Ver precio antes de la confirmación del pedido." -"Select Category...","Seleccionar categoría..." -"Select Configurable Attributes ","Seleccionar atributos configurables" -"Select Product...","Seleccionar producto..." -"Select type of option","Seleccionar tipo de opción" -"Select type options required values rows.","Determinados tipos de opciones requieren filas de valores." -"Selected Product Types","Tipos de productos seleccionados" -"Send Count","Cantidad de envíos" -"Set Ascending Direction","En sentido ascendente" -"Set Descending Direction","Establecer dirección descendente" -"Set Name","Establecer nombre" -"Set Root Category for Store","Establecer categoría raíz para la tienda" -"Set root category for this store in the configuration","Programar una categoría raíz de esta tienda en la configuración" -"Set special price","Establecer precio especial" -"Set/Get current store view","Establecer/Obtener la vista actual de la tienda" -"Settings","Configuración" -"Share Facebook","Compartir en Facebook" -"Share on Facebook","Compartir en Facebook" -"Share on Twitter","Compartir en Twitter" -"Shop By","Comprar por" -"Shopping Options","Opciones de compra" -"Show","Mostrar" -"Show Details","Mostrar detalles" -"Show Tags","Mostrar etiquetas" -"Simple Product","Producto simple" -"Site Map","Mapa de sitio" -"Sitemap","Mapa del sitio" -"Skip import row, is not valid value ""%s"" for field ""%s""","Saltarse importar fila, no es un valor válido ""%s"" para el campo ""%s""" -"Skip import row, required field ""%s"" for the new customer is not defined.","Omitir la fila de importación, el campo obligatorio ""%s"" para el nuevo cliente no está definido." -"Skip import row, the value ""%s"" is invalid for field ""%s""","Saltarse importar la fila, el valor ""%s"" no es válido para el campo ""%s""" -"Skipping import row, required field ""%s"" for new products is not defined.","Saltando una fila importante, el campo obligatorio ""%s"" para nuevos productos no está definido." -"Skipping import row, required field ""%s"" is not defined.","Omitir la fila de importación, el campo obligatorio ""%s"" no está definido." -"Skipping import row, store ""%s"" field does not exist.","Saltándose la importación de fila, el campo de reserva ""%s"" no existe." -"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Omitir la fila de importación, el valor ""%s"" no es válido para el campo ""%s""." -"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Algunos de los productos procesados no tienen un valor SKU definido. Por favor, rellénalo antes de operar con esos productos." -"Some of the selected item options are not currently available.","Algunos de los artículos seleccionados no están disponibles en este momento." -"Sort By","Ordenar por" -"Sort Order","Orden de selección" -"Source Model","Modelo de origen" -"Special Expires On: %s","Especial Expira en: %s" -"Special Price:","Precio especial:" -"Special Price: %s","Precio especial: %" -"Starting at:","Inicio:" -"Static","Estático" -"Static block and products","Bloque y productos estáticos" -"Static block only","Solo bloque estático" -"Status","Estado" -"Stock Availability","Disponibilidad de inventario" -"Store","Tienda" -"Store View","Ver Tienda" -"Stretch","Flexibilidad" -"Subscribe to RSS Feed","Suscribirse a las noticias por RSS" -"Super product attributes configuration","Configuración de atributos de producto superior" -"Synonym For","Sinónimo para" -"System Properties","Propiedades del sistema" -"Tag Name","Nombre de la etiqueta" -"Tax","Impuestos" -"Template","Plantilla" -"Text","Texto" -"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","El módulo de Catálogo de Planos tiene un límite de %2\$d atributos filtrables y ordenables. Actualmente hay %1\$d de ellos. Por favor, reduce el número de atributos filtrables/ordenables para poder usar este módulo" -"The From Date value should be less than or equal to the To Date value.","El valor Desde la fecha debe ser inferior o igual al valor Hasta la fecha." -"The attribute code \'%s\' is reserved by system. Please try another attribute code","El código de atributo \'%s\' está reservado por el sistema. Por favor, prueba con otro código de atributo" -"The attribute model is not defined","El modelo de atributo no está definido" -"The attribute set has been saved.","Se ha guardado el conjunto de atributos." -"The base directory to upload file is not specified.","El directorio base para cargar el archivo no ha sido especificado." -"The category has been deleted.","Se eliminó la categoría." -"The category has been saved.","Se ha guardado la categoría." -"The comparison list was cleared.","Se borró la lista de comparación." -"The file '%s' for '%s' has an invalid extension","El archivo '%s' para '%s' tiene una extensión no válida" -"The file '%s' you uploaded is larger than %s Megabytes allowed by server","El archivo '%s' subido es mayor que los '%s' Megabytes permitidos por el servidor" -"The file you uploaded is larger than %s Megabytes allowed by server","El archivo que has subido es más grande de % Megabytes admitidos por el servidor." -"The filters must be an array.","Los filtros deben ser una disposición." -"The image contents is not valid base64 data.","El contenido de la imagen no es un dato base64 válido." -"The image is not specified.","No se especificó la imagen." -"The model collection resource name is not defined.","El nombre del recurso de la colección de modelos no está definido." -"The product %s has been added to comparison list.","Se agregó el producto %s a la lista de comparación." -"The product %s has been removed from comparison list.","Se eliminó el producto %s de la lista de comparación." -"The product attribute has been deleted.","Se eliminó el atributo de producto." -"The product attribute has been saved.","Se guardó el atributo de producto." -"The product has been created.","Se creó el producto." -"The product has been deleted.","Se eliminó el producto." -"The product has been duplicated.","Se duplicó el producto." -"The product has been saved.","Se ha guardado el producto." -"The product has required options","El producto tiene opciones obligatorias" -"The review has been deleted","Se eliminó la reseña" -"The review has been saved.","Se guardó la reseña." -"The review was removed by another user or does not exist.","La reseña no existe o fue eliminada por otro usuario." -"The search was deleted.","Se eliminó la búsqueda." -"The text is too long","El texto es demasiado largo." -"There are no %s available.","No hay %s disponibles." -"There are no customers for this alert","No hay clientes para esta alerta" -"There are no customers for this alert.","No hay clientes para esta alerta." -"There are no products matching the selection.","No hay ningún producto que se ajuste a su selección." -"There was an error while request processing.","Ocurrió un error al procesar la petición." -"This Attribute no longer exists","El atributo ya no existe" -"This attribute cannot be deleted.","No puede eliminarse este atributo." -"This attribute cannot be edited.","No se puede editar este atributo." -"This attribute cannot be updated.","No puede actualizarse este atributo." -"This attribute is used in configurable products.","Este atributo se utiliza en productos configurables." -"This attribute is used in configurable products. You cannot remove it from the attribute set.","Este atributo se utiliza en productos configurables. No es posible eliminarlo del conjunto de atributos." -"This attribute no longer exists","Este atributo ya no existe." -"This attribute set no longer exists.","Este conjunto de atributos ya no existe." -"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","Este grupo contiene atributos utilizados en productos configurables. Páselos a otro grupo y vuelva a intentarlo." -"This group contains system attributes. Please move system attributes to another group and try again.","Este grupo contiene atributos del sistema. Pase los atributos del sistema a otro grupo y vuelva a intentarlo." -"This is a required option","Esta es una opción obligatoria" -"This product no longer exists.","Este producto ya no existe." -"This search no longer exists.","Esta búsqueda ya no existe." -"This setting will be applied when all prices in the specific price interval are equal.","Esta configuración se aplicará cuando todos los precios en el intervalo de precios específicos sean iguales." -"Tier Pricing","Precio de nivel" -"Tile","Mosaico" -"Time Format","Formato de hora" -"Title","Título" -"To reindex the enabled product(s), the store or product must be specified","Para reindexar el producto(s) activado(s), se ha de especificar la tienda o el producto" -"To see product price, add this item to your cart. You can always remove it later.","Para ver el precio del producto añade este artículo al carrito. Siempre puedes eliminarlo posteriormente." -"Top/Left","Superior/izquierda" -"Top/Right","Arriba/Derecha" -"Total Qty Base Items","Cant. total de artículos básicos" -"Total Qty Content Items","Cantidad total de artículos contenidos" -"Total incl. Tax: %1$s","Total con impuestos inculido: %1$" -"Total of %d record(s) have been deleted.","Total de % registrado se ha eliminado." -"Total of %d record(s) have been updated.","Se actualizó un total de %d registro(s)." -"Total of %d record(s) were updated","Se han actualizado un total de %d registro(s)" -"Type","Tipo" -"URL Rewrite Management","Gestión de reescritura de URL" -"Unable to complete this request.","No se puede completar esta solicitud." -"Unable to find a search term to delete.","No se puede encontrar un término de búsqueda para eliminar." -"Unable to find an attribute to delete.","No se puede encontrar un atributo para eliminar." -"Unable to get the product ID.","No ha sido posible obtener el ID de producto." -"Unassigned Attributes","Atributos sin asignar" -"Unknown EAV indexer type ""%s"".","Tipo de indexador EAV desconocido ""%s""." -"Unknown attribute: %s.","Atributo desconocido: %s." -"Unsupported product type ""%s"".","Tipo de producto no compatible ""%s""." -"Up-sells","Ventas Sugestivas" -"Update","Actualización" -"Update Attributes","Actualizar atributos" -"Update Tier Price","Actualizar precio de capa" -"Update assigned product","Actualizar producto asignado" -"Update attribute","Actualizar atributo" -"Update attributes","Actualizar atributos" -"Update category","Actualizar categoría" -"Update custom option of product","Actualizar opción personalizada de producto" -"Update product","Actualizar producto" -"Update product image","Actualizar imagen de producto" -"Update product link","Actualizar enlace del producto" -"Update product tier prices","Actualizar precios de capa de productos" -"Update value of custom option","Actualizar valor de la opción personalizada" -"Upload new product image ","Cargar nueva imagen de producto" -"Use Canonical Link Meta Tag For Categories","Utilizar metaetiqueta de enlace canónico para categorías" -"Use Canonical Link Meta Tag For Products","Utilizar meta-etiqueta de enlace canónico para los productos" -"Use Categories Path for Product URLs","Utilizar ruta de categorías para direcciones URL de productos" -"Use Config Settings","Usar Opciones de Configuración" -"Use Default Value","Usar Valor por Defecto" -"Use Flat Catalog Category","Utilizar categoría de catálogo plano" -"Use Flat Catalog Product","Utilizar producto de catálogo plano" -"Use In Layered Navigation","Utilizar en navegación en capas" -"Use In Search Results Layered Navigation","Utilizar en la navegación por capas de los resultados de búsqueda" -"Use JavaScript Calendar","Utilizar calendario de JavaScript" -"Use Static URLs for Media Content in WYSIWYG for Catalog","Utilizar URL estáticas para contenido multimedia en WYSIWYG para el catálogo" -"Use To Create Configurable Product","Utilizar para crear producto configurable" -"Use Tree Like Category Sitemap","Utilizar mapa de sitio con categorías jerárquicas" -"Use config","Usar configuración" -"Use default","Uso por defecto" -"Use for Promo Rule Conditions","Utilizar para condiciones de reglas de promoción" -"Use four-digit year format.","Utilizar formato de año de cuatro dígitos." -"Use in Advanced Search","Utilizar en búsqueda avanzada" -"Use in Layered Navigation","Usar en navegación por capas" -"Use in Layered Navigation
    (Can be used only with catalog input type 'Dropdown')","Utilizar en navegación en capas
    (Puede utilizarse sólo con el tipo de entrada de catálogo 'Lista desplegable')" -"Use in Quick Search","Utilizar en búsqueda rápida" -"Used for Sorting in Product Listing","Se utiliza para ordenar las listas de productos" -"Used in Product Listing","Se utiliza en las listas de productos" -"Value for ""%s"" is invalid.","El valor para ""%s"" es inválido." -"Value for ""%s"" is invalid: %s","Valor para ""%"" no es válido: %" -"Varchar","Varchar" -"View Details","Ver detalles" -"View as","Ver como" -"Virtual Product","Producto virtual" -"Visibility","Visibilidad" -"Visible","Visible" -"Visible on Catalog Pages on Front-end","Visible en páginas de catálogo en la vista del cliente" -"Visible on Product View Page on Front-end","Visible en páginas de vista de productos en la vista del cliente" -"WYSIWYG Editor","Editor WYSIWYG" -"Watermark","Marca de agua" -"Watermark Default Size","Tamaño predeterminado de la marca de agua" -"Watermark Opacity, Percent","Opacidad de la marca de agua, porcentaje" -"Watermark Position","Posición de la marca de agua" -"We Also Recommend","También recomendamos" -"Website","Sitio web" -"Website Item Must be checked","Debe controlarse el artículo del sitio web" -"Website Store Must be checked","Se tiene que comprobar la tienda de la página web" -"Websites","Páginas web" -"What's this?","¿Qué es esto?" -"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Preguntar si mostrar ""Todas"" las opciones en el desplegable ""Mostrar X por página""." -"Will make search for the query above return results for this search.","Realizar la búsqueda para la consulta anterior devuelve resultados para esta búsqueda." -"Wrong BuyRequest instance in options group.","Instancia incorrecta de BuyRequest en el grupo de opciones." -"Wrong configuration item instance in options group.","Configuración de ejemplo de artículo incorrecta en el grupo de opciones." -"Wrong configuration item option instance in options group.","Configuración de ejemplo de opción de artículo incorrecta en el grupo de opciones." -"Wrong option instance type in options group.","Instancia de opción incorrecta en el grupo de opciones." -"Wrong option type to get group instance.","Tipo de opción incorrecto en el grupo de opciones." -"Wrong product instance type in options group.","Tipo de instancia de producto no válido en el grupo de opciones." -"Wrong product type filter specified","Se especificó un filtro de tipo de producto incorrecto" -"Wrong product type to extract configurable options.","Tipo de producto incorrecto para extraer opciones configurables." -"Year Range","Rango de años" -"Yes","Sí" -"You cannot remove system attribute from this set.","No es posible eliminar atributos del sistema de este conjunto." -"You have no items to compare.","No tiene artículos para comparar." -"You may also be interested in the following product(s)","Te podría(n) interesar también el/los siguiente(s) producto(s)" -"Zoom In","Aumentar" -"Zoom Out","Alejar" -"and","y" -"and above","y por encima" -"categories","categorías" -"each","cada" -"ex. http://domain.com","por ejemplo, http:/dominio.com" -"leave blank if its not an image","dejar en blanco si no es una imagen" -"per page","por página" -"products","productos" -"px.","px." -"save","guardar" -"select all","seleccionar todo" -"unselect all","Deseleccionar todo" -"x","x" diff --git a/app/locale/es_ES/Mage_CatalogInventory.csv b/app/locale/es_ES/Mage_CatalogInventory.csv deleted file mode 100644 index 6776d4112..000000000 --- a/app/locale/es_ES/Mage_CatalogInventory.csv +++ /dev/null @@ -1,62 +0,0 @@ -"""%s"" is not available in the requested quantity. %s of the items will be backordered.","""%s"" no está disponible en la cantidad solicitada. %s de los artículos han sido quitados del pedido." -"%s is available for purchase in increments of %s only.","%s sólo se puede comprar en incrementos de %s." -"%s is not a correct comparsion method.","%s no es un método de comparación correcto." -"Note that these settings are applicable to cart line items, not the whole cart.","Tenga en cuenta que esta configuración es aplicable a los artículos de línea del carro de la compra, no al carro en su totalidad." -"Add Minimum Qty","Añadir Cantidad Mínima" -"Allow Qty Below 0","Permitir cantidad menor que 0" -"Allow Qty Below 0 and Notify Customer","Permitir Cantidad Menor que 0 y Notificar al Cliente" -"Automatically Return Credit Memo Item to Stock","Devolver Automáticamente Artículo de Factura de Abono a Existencias" -"Backorders","Pedidos Pendientes" -"By Fixed value","Por valor Fijo" -"By Percentage","Por Porcentaje" -"Cannot specify product identifier for the order item.","No se puede especificar el identificador del producto para el artículo del pedido." -"Catalog Inventory","Inventario del Catálogo" -"Decrease Stock When Order is Placed","Disminuir Existencias Cuando Se Realiza El Pedido" -"Display Out of Stock Products","Visualizar los productos agotados" -"Display products availability in stock in the frontend","Mostrar la disponibilidad de productos en stock en la parte delantera" -"Enable Qty Increments","Posibilitar Incrementos de Cantidad" -"In Stock","En Existencia" -"Index Product Stock Status","Estado de Existencias de Producto de Índice" -"Inventory","Inventario" -"Inventory API","API de Inventario" -"Inventory Section","Sección del Inventario" -"Manage Stock","Gestionar Existencias" -"Maximum Qty Allowed in Shopping Cart","Cantidad Máxima Permitida en el Carro de la Compra" -"Minimum Qty","Cantidad Mínima" -"Minimum Qty Allowed in Shopping Cart","Cantidad Mínima Permitida en el Carro de la Compra" -"Multi update product stock data","Multiactualización de datos de stock de productos" -"No Backorders","No Hay Pedidos Pendientes" -"Not all products are available in the requested quantity","No todos los productos están disponibles en la cantidad solicitada." -"Notify for Quantity Below","Notificar cuando la Cantidad sea Inferior a" -"Only %s left","Solo queda %s" -"Only X left Threshold","Sólo X ha superado el Umbral" -"Out of Stock","Sin Existencias" -"Product Name","Nombre del producto" -"Product Stock Options","Opciones de Existencias de Producto" -"Products will still be shown by direct product URLs.","Los productos se seguirán mostrando por URL de producto directa" -"Qty","Cant." -"Qty Increments","Incrementos de Cantidad" -"Qty for Item's Status to Become Out of Stock","Cantidad de artículos disponibles antes de agotarse" -"Retrieve stock data","Recuperar datos de existencias" -"Retrieve stock data by product ids","Recuperar datos de existencias por identificadores de producto" -"Rule price","Regla de precio" -"Set Items' Status to be In Stock When Order is Cancelled","Establecer Estado de Artículos en Existencias Cuando Se Cancela Un Pedido" -"Some of the products are currently out of stock.","Algunos de los productos están actualmente agotados." -"Some of the products cannot be ordered in requested quantity.","Algunos de los productos no se pueden encargar en la cantidad solicitada." -"Some of the products cannot be ordered in the requested quantity.","No se puede realizar el pedido de algunos productos en la cantidad solicitada." -"Stock Options","Opciones de Existencias" -"Stock Status","Estado de Existencias" -"The maximum quantity allowed for purchase is %s.","La cantidad máxima permitida para comprar es de %s." -"The minimum quantity allowed for purchase is %s.","La cantidad mínima permitida para comprar es de %s." -"The requested quantity for ""%s"" is not available.","La cantidad solicitada de ""%s"" no está disponible." -"The stock item for Product in option is not valid.","El artículo de existencias para el Producto en opción no es válido." -"The stock item for Product is not valid.","El artículo de existencias para el Producto no es válido." -"This product is available for purchase in increments of %s only.","Este producto esta disponible para la compra en incrementos de %s únicamente." -"This product is currently out of stock.","Este producto está agotado en este momento." -"This product is not available in the requested quantity. %s of the items will be backordered.","Este producto no está disponible en la cantidad solicitada. Se cancelará el pedido de %s de los artículos." -"To Fixed Value","Para Valor Fijo" -"To Percentage","Para Porcentaje" -"Undefined product type.","Tipo de producto no definido." -"Update","Actualización" -"Update product stock data","Actualizar datos de existencias de producto" -"Update the Product","Actualizar el Producto" diff --git a/app/locale/es_ES/Mage_CatalogRule.csv b/app/locale/es_ES/Mage_CatalogRule.csv deleted file mode 100644 index aa711aa2d..000000000 --- a/app/locale/es_ES/Mage_CatalogRule.csv +++ /dev/null @@ -1,64 +0,0 @@ -"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","%d Las reglas del precio de catálogo basadas en el atributo ""%s"" se han desactivado." -"Actions","Acciones" -"Active","Activo" -"Add New Rule","Añadir nueva regla" -"An error occurred while deleting the rule. Please review the log and try again.","Un error ocurrió mientras se eliminaba la regla. Por favor, revise el registro e inténtelo de nuevo." -"An error occurred while saving the rule data. Please review the log and try again.","Un error ocurrió mientras se guardaban los datos de la regla. Por favor, revise el registro e inténtelo de nuevo." -"Apply","Confirmar" -"Apply Rules","Aplicar reglas" -"Attribute Set","Conjunto de atributos" -"By Fixed Amount","Por importe fijo" -"By Percentage of the Original Price","Por porcentaje del precio original" -"Catalog","Catálogo" -"Catalog Price Rule","Regla de Precios" -"Catalog Price Rules","Catálogo de Normas sobre Precios" -"Category","Categoría" -"Conditions","Condiciones" -"Conditions (leave blank for all products)","Condiciones (para todos los productos déjelo en blanco)" -"Conditions Combination","Combinación de condiciones" -"Customer Groups","Grupos de Cliente" -"Date Expire","Fecha de caducidad" -"Date From","Fecha a partir de" -"Date Start","Fecha de inicio" -"Date To","Fecha" -"Description","Descripción" -"Discount Amount","Cantidad de descuento" -"Edit Rule","Editar Regla" -"Edit Rule '%s'","Editar Regla '%s'" -"Enable Discount to Subproducts","Habilitar descuento para subproductos" -"Expiration Date","Fecha de Caducidad" -"From Date","A partir de la fecha" -"General Information","Información general" -"ID","ID" -"Inactive","Inactivo" -"New Rule","Nueva Regla" -"No","No" -"Options","Opciones" -"Priority","Prioridad" -"Product Attribute","Atributos del producto" -"Promotions","Promociones" -"Rule Information","Información sobre la Regla" -"Rule Name","Nombre de la Regla" -"Save and Apply","Guardar y Aplicar" -"Save and Continue Edit","Guardar y continuar editando" -"Start Date","Fecha de Inicio" -"Status","Estado" -"Stop Further Rules Processing","Detener el Procesamiento de Reglas adicionales" -"The rule has been deleted.","La regla ha sido eliminada." -"The rule has been saved.","La regla ha sido guardada." -"The rules have been applied.","Las reglas han sido aplicadas." -"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","Hay reglas que han cambiado pero no se aplican. Solo los usuarios con acceso exclusivo pueden aplicar estas reglas." -"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Hay reglas que han sido modificadas pero no aplicadas. Por favor, haga clic en Aplicar Reglas con el fin de ver el efecto inmediato en el catálogo." -"This rule no longer exists.","Esta regla ya no existe." -"To Date","Hasta la fecha" -"To Fixed Amount","A cantidad fija" -"To Percentage of the Original Price","A porcentaje del precio original" -"Type","Tipo" -"Unable to apply rules.","No se pueden aplicar las reglas." -"Unable to find a rule to delete.","No se puede encontrar una regla para eliminar." -"Update Prices Using the Following Information","Actualizar los precios según las siguiente información" -"Update product's %s %s: %s","Actualizar los productos de %s %s: %s" -"Website","Página web" -"Websites","Páginas web" -"Wrong rule specified.","Regla especificada incorrecta." -"Yes","Sí" diff --git a/app/locale/es_ES/Mage_CatalogSearch.csv b/app/locale/es_ES/Mage_CatalogSearch.csv deleted file mode 100644 index a948deb6c..000000000 --- a/app/locale/es_ES/Mage_CatalogSearch.csv +++ /dev/null @@ -1,49 +0,0 @@ -"%s and greater","%s y mayor" -"%d item(s) were found using the following search criteria","%d artículo(s) fueron encontrados siguiendo los criterios de búsqueda" -"Advanced Search","Búsqueda avanzada" -"Advanced Search Form","Formulario de búsqueda avanzada" -"Advanced Search Result","Resultados de búsqueda avanzada" -"All","Todo" -"Applies for ""Like"" search type only.","Se aplica sólo a tipo de búsqueda ""Como""." -"Apply Layered Navigation if Search Results are Less Than","Aplicar navegación por capas si los resultados de búsqueda son menos que" -"Attribute setting change related with Search Index. Please run Rebuild Search Index process.","Cambio de configuración del atributo relacionado con el índice de búsqueda. Inicie el proceso Reconstruir índice de búsqueda" -"Autogenerated Site Map","Mapa del sitio autogenerado" -"Catalog Advanced Search","Búsqueda de catálogo avanzada" -"Catalog Search","Catálogo de búsquedas" -"Catalog Search Index","Índice de búsqueda del catálogo" -"Don't see what you're looking for?","¿No encuentra lo que busca?" -"Enter ""0"" to enable layered navigation for any number of results.","Escriba ""0"" para permitir navegación en capas para cualquier número de resultados." -"Go","Ir" -"Go to Home Page","Ir a la página de inicio" -"Grid","Parrilla" -"Home","Inicio" -"List","Lista" -"Maximum Query Length","Longitud máxima de consulta" -"Maximum Query Words Count","Contador de palabras máximas de consulta" -"Maximum Search query length is %s. Your query was cut.","La longitud máxima de la consulta de búsqueda es %s. Su consulta fue acortada." -"Maximum words count is %1$s. In your search query was cut next part: %2$s.","El recuento máximo de palabras es de %1$s. En tu petición de búsqueda se redujo a lo siguiente: %2$s." -"Minimal Query Length","Longitud mínima de búsqueda" -"Minimum Search query length is %s","La longitud mínima de consultas de búsqueda es %s" -"Modify your search","Modificar la búsqueda" -"No","No" -"No items were found using the following search criteria.","No se encontraron productos usando estos criterios de búsqueda" -"Please specify at least one search term.","Por favor especifica al menos un término de búsqueda." -"Popular Search Terms","Términos de búsqueda populares" -"Quick Search Form","Formulario de búsquda rápida" -"Rebuild Catalog product fulltext search index","Reconstruir Catálogo producto todoeltexto búsqueda índice" -"Relevance","Relevancia" -"Results","Resultados" -"Search","Buscar" -"Search Settings","Ajustes de búsqueda" -"Search Terms","Términos de búsqueda" -"Search Type","Tipo de búsqueda" -"Search entire store here...","Buscar en toda la tienda..." -"Search results for '%s'","Resultados de búsqueda para '%s'" -"Search results for: '%s'","Resultados de búsqueda para: '%s'" -"Search:","Buscar:" -"Specified date is invalid.","La fecha especificada no es válida" -"Subscribe to Feed","Suscribirse al Feed" -"There are no search terms available.","No hay términos de búsqueda disponibles." -"Yes","Sí" -"Your search returns no results.","La búsqueda no da ningún resultado." -"up to %s","hasta %s" diff --git a/app/locale/es_ES/Mage_Centinel.csv b/app/locale/es_ES/Mage_Centinel.csv deleted file mode 100644 index 4d3280945..000000000 --- a/app/locale/es_ES/Mage_Centinel.csv +++ /dev/null @@ -1,33 +0,0 @@ -"3D Secure CAVV","CAVV Seguro 3D" -"3D Secure Card Validation","Validación segura 3D de tarjeta" -"3D Secure Cardholder Validation","Validación segura 3D del títular de la tarjeta" -"3D Secure Electronic Commerce Indicator","Indicador comercio electrónico seguro 3D" -"3D Secure Verification Result","Resultados de la verificación segura 3D" -"3D Secure XID","XID Seguro 3D" -"Card Issuer Liability","Responsabilidad del emisor de la tarjeta" -"Card Verification","Verificación de tarjeta" -"Enrolled","Inscrito" -"Enrolled but Authentication Unavailable","Inscrito pero autentificación no disponible" -"Failed","Ha fallado" -"MasterCard SecureCode","MasterCard Código Seguro" -"Merchant Liability","Responsabilidad del comerciante" -"Not Enrolled","No inscrito" -"Order cannot be placed.","El pedido no puede ser realizado." -"Payment information error. Please start over.","Error de información de pago. Por favor, comience de nuevo." -"Please continue with placing order.","Por favor continue con su pedido." -"Please verify the card with the issuer bank before placing the order.","Por favor verifique la tarjeta con el banco emisor antes de realizar el pedido." -"Please verify the card with the issuer bank:","Por favor verifique la tarjeta con el banco emisor:" -"Start/Reset Validation...","Comenzar/Resetear validación..." -"Successful","Exitoso" -"Successful attempt","Intento exitoso" -"The card has failed verification with the issuer bank.","La tarjeta ha fallado la verificación con el banco emisor." -"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Se ha enviado información errónea o el límite de tiempo ha expirado. Por favor, inténtelo de nuevo." -"There has been wrong payment information submitted or time limit has expired. Please, try again.","Se ha enviado información errónea o el límite de tiempo ha expirado. Por favor, inténtelo de nuevo." -"This card has failed validation and cannot be used.","Esta tarjeta ha fallado su validación y no puede ser usada." -"To ensure the security of your transactions","Para asegurar la seguridad de sus transacciones" -"Unable to complete","No se ha podido completar" -"Validation failed.","Validación errónea." -"Verification Failed","Verificación errónea" -"Verification Successful","Verificación exitosa" -"Verification cannot be processed","La verificación no puede ser procesada" -"Verified by Visa","Verificado por Visa" diff --git a/app/locale/es_ES/Mage_Checkout.csv b/app/locale/es_ES/Mage_Checkout.csv deleted file mode 100644 index 492825bdd..000000000 --- a/app/locale/es_ES/Mage_Checkout.csv +++ /dev/null @@ -1,360 +0,0 @@ -"%s was added to your shopping cart.","%s se ha añadido a su cesta" -"%s was updated in your shopping cart.","Se actualizó %s en su cesta de la compra." -"* Required Fields","* Campos Requeridos" -"Add New Address","Añadir Nueva Dirección" -"Add New Condition","Añadir nueva condición" -"Add coupon code for shopping cart","Agregar código promocional a la cesta de la compra" -"Add gift messages to shopping cart","Agregar mensajes de regalo a la cesta de la compra" -"Add product to shopping cart","Agregar producto a la cesta de la compra" -"Add product(s) to shopping cart","Agregar producto(s) a la cesta de la compra" -"Add to Cart","Añadir al Carrito" -"Add to Compare","Añadir para comparar." -"Add to Wishlist","Añadir a lista que quieres." -"Additional Product Info","Información adicional del producto" -"Address","Dirección" -"Address %s of %s","Dirección %s de %s" -"After Adding a Product Redirect to Shopping Cart","Después de añadir un producto volver a la cesta de compra" -"Allow Guest Checkout","Permitir salir al cliente" -"Already registered?","¿Ya está registrado?" -"An error occurred in the process of payment","Se produjo un error durante el proceso de pago" -"An error occurred while deleting this condition.","Se produjo un error al eliminar esta condición." -"An error occurred while saving this condition.","Se produjo un error al guardar esta condición." -"Apply","Aplicar" -"Apply Coupon","Aplicar cupón" -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","¿Está seguro de que desea abandonar esta página? Tendrá que realizar el pedido de nuevo." -"Are you sure you would like to remove this item from the shopping cart?","¿Está seguro de que desea eliminar este artículo de la cesta de la compra?" -"Back","Volver" -"Back to Billing Information","Volver a la información de la factura" -"Back to Select Addresses","Volver a la selección de la dirección" -"Back to Shipping Information","Volver a la información de envío" -"Back to Shopping Cart","Volver a la cesta de la compra" -"Based on your selection, you may be interested in the following items:","Basándonos en tu selección, puede que estés interesado(a) en los siguientes artículos." -"Billing Address","Dirección de facturación" -"Billing Information","Detalles de facturación" -"Billing Information - %s","Detalles de facturación - %s" -"Can not remove the item.","No se puede eliminar este elemento." -"Can not save item.","No se puede guardar este elemento." -"Cancel","Cancelar" -"Cancel Coupon","Cancelar cupón" -"Cannot add item to the shopping cart.","No se puede añadir el artículo a la cesta de la compra" -"Cannot add the item to shopping cart","No se puede añadir el artículo a la cesta de la compra" -"Cannot add the item to shopping cart.","Imposible añadir el artículo a la cesta de la compra." -"Cannot apply the coupon code.","Imposible aplicar el código del cupón" -"Cannot configure product.","No se puede configurar el producto." -"Cannot open the overview page","Imposible abrir la vista preliminar" -"Cannot process the item.","No se puede procesar el artículo." -"Cannot remove the item.","Imposible eliminar el artículo." -"Cannot update shopping cart.","Imposible actualizar la cesta de la compra." -"Cannot update the item.","No se puede actualizar el artículo." -"Card Verification Number Visual Reference","Verificación de la tarjeta Número de Referencia Visual" -"Cart","Cesta" -"Cart Product API","API del producto de la cesta" -"Cart Subtotal:","Subtotal de la cesta:" -"Change","Cambio" -"Change Billing Address","Cambiar la Dirección de Facturación" -"Checkbox Text","Casilla de verificación de texto" -"Checkout","Pedido" -"Checkout Conditions","Condiciones de pedido" -"Checkout Forms Extra","Formularios de pedido adicionales" -"Checkout Method","Método de pedido" -"Checkout Options","Opciones de pedido" -"Checkout Progress Wrapper","Plataforma del progreso de pago" -"Checkout Section","Sección de pedido" -"Checkout Terms and Conditions","Verificar términos y condiciones" -"Checkout as Guest","Pedido como invitado" -"Checkout as a Guest or Register","Pedido como invitado o registro" -"Checkout with Multiple Addresses","Pedido con varias direcciones" -"City","Ciudad" -"Clear Shopping Cart","Vaciar carro de la compra" -"Click here to print a copy of your order confirmation.","Pulse aquí para imprimir una copia de la confirmación del pedido." -"Click here to continue shopping.","Click aquí para continuar comprando." -"Close","Cerrar" -"Company","Compañía" -"Condition Name","Nombre de condición" -"Configurable Product Image","Imagen configurable del producto" -"Configure Cart Item","Configurar artículo de la cesta" -"Confirm Password","Confirma Contraseña" -"Content","Contenido" -"Content Height","Altura del contenido" -"Content Height (css)","Altura del contenido (css)" -"Continue","Continuar" -"Continue Shopping","Continuar comprando" -"Continue to Billing Information","Continuar a información de facturación" -"Continue to Review Your Order","Continuar a revisión de pedido" -"Continue to Shipping Information","Continuar a información de envío" -"Country","País" -"Coupon code ""%s"" is not valid.","El código promocional ""%s"" no es válido." -"Coupon code ""%s"" was applied.","Se aplicó el código ""%s""." -"Coupon code was canceled.","El código de cupón se ha cancelado." -"Create Billing Address","Crear dirección de facturación" -"Create Shipping Address","Crear dirección de envío" -"Create an order from shopping cart","Crear un pedido a partir de su cesta de la compra" -"Create shopping cart","Crear cesta de la compra" -"Customer Address is not valid.","La dirección del cliente no es válida." -"Customer Information","Información del cliente" -"Customer's information","Información del cliente" -"Data saving problem","Error al guardar los datos." -"Default Billing","Facturación por defecto" -"Default Shipping","Envío por defecto" -"Delete Condition","Eliminar condición" -"Details","Detalles" -"Disabled","Deshabilitado" -"Discount Codes","Códigos de descuento" -"Display Cart Summary","Mostrar el resumen del carro" -"Display Shopping Cart Sidebar","Mostrar el carro en la barra lateral" -"Display item quantities","Mostrar cantidades de artículos" -"Display number of items in cart","Mostrar número de artículos en el carro" -"Display number of items in wishlist","Mostrar número de artículos en la lista de la compra" -"Easy access to your order history and status","Acceso rápido a su historial de pedidos y estado" -"Edit","Editar" -"Edit Address","Cambiar la dirección" -"Edit Billing Address","Editar la dirección de facturación" -"Edit Condition","Editar condición" -"Edit Items","Editar artículos" -"Edit Shipping Address","Editar la dirección de envío" -"Edit Terms and Conditions","Editar claúsulas y condiciones" -"Edit Your Cart","Editar carro" -"Edit item","Editar artículo" -"Edit item parameters","Editar parámetros del artículo" -"Email Address","Dirección de email" -"Empty Cart","Vaciar la cesta" -"Empty Shopping Cart Content Before","Vaciar antes el contenido de la cesta" -"Enable Onepage Checkout","Habilitar página de pago única" -"Enable Terms and Conditions","Habilitar claúsulas y condiciones" -"Enabled","Habilitado" -"Enter a New Address","Introducir una dirección nueva" -"Enter your coupon code if you have one.","Introducir un código de cupón, si tiene." -"Enter your destination to get a shipping estimate.","Introduzca un destino para obtener una estimación de los gastos de envío." -"Estimate","Estimar" -"Estimate Shipping and Tax","Estimación de los costes de envío y tasas" -"Excl. Tax","Impuestos no incluidos" -"Fast and easy check out","Pago sencillo" -"Fax","Fax" -"Forgot an Item?","¿Olvidó un artículo?" -"Forgot your password?","¿Olvidó su contraseña?" -"Get a Quote","Obtener una cotización" -"Get list of available payment methods","Obtener la lista de métodos de pago disponibles" -"Get list of available shipping methods","Obtener la lista de tipos de envío disponibles" -"Get list of products in shopping cart","Obtenga la lista de productos en el carro de la compra" -"Get terms and conditions","Obtener los términos y condiciones" -"Get total prices for shopping cart","Obtener los precios totales del carro de la compra" -"Gift Message","Mensaje regalo" -"Grand Total:","Total final:" -"Grouped Product Image","Imagen de productos agrupados" -"HTML","HTML" -"ID","Identificación" -"Incl. Tax","Impuestos incluidos" -"Invalid checkout type.","Página no válida." -"Invalid data.","Datos no válidos." -"Invalid email address ""%s""","Dirección de correo electrónico no válida ""%s""" -"Invalid method: %s","Método no válido: %s" -"Invalid shipping method.","Método de compra no válido." -"Item not found or already ordered","No se encontró el artículo, o ya fue pedido" -"Item was removed successfully.","Elemento eliminado." -"Item was updated successfully.","Elemento actualizado." -"Items","Artículos." -"Items After","Artículos Después" -"Items Before","Artículos Antes" -"Load customer quote error","Error en la carga de cotización del cliente" -"Loading next step...","Cargando próximo paso..." -"Login","Entrar" -"Login/Registration Before","Iniciar sesión/Registrarse antes" -"Manage Terms and Conditions","Gestión de términos y condiciones" -"Maximum Display Recently Added Item(s)","Cantidad máxima de artículos agregados recientemente que se muestran" -"Maximum qty allowed for Shipping to multiple addresses is %s","La cantidad máxima permitida para el envío a varias direcciones es de %s" -"Mini-cart promotion block","Bloque de promociones de la minicarta" -"Minimum order amount is %s","El importe mínimo del pedido es %s" -"Move","Mover" -"Move to Wishlist","Trasladar a la Lista de Deseos" -"Move to wishlist","Mover a favoritos" -"Multishipping Checkout","Compra con envío a varias direcciones" -"Multishipping Checkout Address (Any) Form","Formulario de dirección (cualquiera) de compra con envío a varias direcciones" -"Multishipping Checkout Billing Address Creation","Creación de dirección de facturación para compra con envío a varias direcciones" -"Multishipping Checkout Billing Address Edit Form","Formulario de edición de dirección de facturación para compra con envío a varias direcciones" -"Multishipping Checkout Billing Address Selection","Selección de dirección de facturación para compra con envío a varias direcciones" -"Multishipping Checkout Billing Information Step","Paso de información de facturación para compra con envío a varias direcciones" -"Multishipping Checkout Customer Address Edit Form","Formulario de edición de dirección del cliente para compra con envío a varias direcciones" -"Multishipping Checkout Overview","Descripción general de la compra con envío a varias direcciones" -"Multishipping Checkout Shipping Address Creation","Creación de dirección de envío para compra con envío a varias direcciones" -"Multishipping Checkout Shipping Address Edit Form","Formulario de edición de dirección de envío para compra con envío a varias direcciones" -"Multishipping Checkout Shipping Address Selection","Selección de dirección de envío para compra con envío a varias direcciones" -"Multishipping Checkout Shipping Information Step","Paso de información de envío para compra con envío a varias direcciones" -"Multishipping Checkout Success","La compra con envío a varias direcciones se realizó correctamente" -"My Cart","Mi carrito" -"My Cart (%s item)","Mi carrito (% artículos)" -"My Cart (%s items)","Mi carrito (% artículos)" -"My Cart Extra Actions","Otras Acciones de Mi Cesta" -"My Cart Link","Enlace a mi carrito" -"New Address","Nueva dirección" -"New Condition","Nueva condición" -"New Terms and Conditions","Nuevos términos y condiciones" -"No Payment Methods","No existen métodos de pago" -"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","EL TOTAL DEL PEDIDO SE MOSTRARÁ ANTES DE QUE ENVÍE EL PEDIDO" -"One Page Checkout","Cobro de una página" -"One Page Checkout Failure","Error en la compra en una página" -"One Page Checkout Overview","Resumen en un página de la caja" -"One Page Checkout Success","La compra en una página se realizó correctamente" -"One item of products do not have identifier or sku","Un artículo de productos no tiene identificador o número de referencia" -"One item of products is not belong any of quote item","Un artículo de productos no pertenece a ningún artículo citado" -"Order #","Número de pedido" -"Order Review","Comentario del pedido" -"Order Success","El pedido se realizó correctamente" -"Order place error.","Error en el pedido" -"Other Items in Your Order","Otros artículos de su pedido" -"Overview Items After","Resumen de artículos después" -"Password","Contraseña" -"Payment Failed Email Reciever","Correo electrónico del receptor del pago fallido" -"Payment Failed Email Sender","Remitente del mensaje de correo electrónico de error en el pago" -"Payment Failed Emails","Mensajes de correo electrónico de error en el pago" -"Payment Failed Template","Plantilla de error en el pago" -"Payment Information","Información de pago" -"Payment Method","Método de pago" -"Payment Methods After","Método de pago después" -"Payment Methods After Checkout Button","Métodos de pago después de presionar el botón de compra" -"Payment Methods Before","Método de pago antes" -"Payment Methods Before Checkout Button","Métodos de pago antes del botón de cobro" -"Payment method information","Información de las formas de pago" -"Payment method is not defined","El método de pago no está definido" -"Payment methods in shopping cart","Formas de pago del carro de la compra" -"Payment profile # %s: ""%s"".","Perfil de pago # %s: ""%s""." -"Place Order","Hacer un pedido" -"Please agree to all Terms and Conditions before placing the order.","Debe manifestar su conformidad con todos los términos y condiciones antes de hacer el pedido." -"Please agree to all Terms and Conditions before placing the orders.","Debe manifestar su conformidad con todos los términos y condiciones antes de hacer los pedidos." -"Please agree to all the terms and conditions before placing the order.","Debe manifestar su conformidad con todos los términos y condiciones antes de hacer el pedido." -"Please check billing address information.","Por favor, verifique la dirección de facturación." -"Please check shipping address information.","Por favor, verifique la dirección de envío." -"Please check shipping addresses information.","Por favor, verifique las direcciones de envío" -"Please choose to register or to checkout as a guest","Por favor, seleccione la opción de registrarse o la de tramitar el pedido como invitado" -"Please log in below:","Inicie sesión a continuación:" -"Please select region, state or province","Por favor, seleccionar región, estado o provincia" -"Please select shipping address for applicable items","Seleccione la dirección de envío para los artículos correspondientes" -"Please select shipping methods for all addresses","Seleccione los métodos de envío para todas las direcciones" -"Please select valid payment method.","Por favor, seleccione un método de pago válido." -"Please specify payment method.","Especifique el método de pago." -"Please specify shipping method.","Por favor, especifique el modo de envío." -"Please specify shipping methods for all addresses.","Por favor, especifique los modos de envío en todas las direcciones." -"Price","Precio" -"Proceed to Checkout","Continuar con la compra" -"Product","Producto" -"Product Name","Nombre de Producto" -"Products","Productos" -"Qty","Cant." -"Qty:","Cant.:" -"Quantity was recalculated from %d to %d","La cantidad ha sido recalculada a partir de %d a %d" -"Quote Lifetime (days)","Período de validez de la cotización (días)" -"Quote item does not exist.","El artículo mencionado no existe." -"Quote item is not found.","El artículo mencionado no se ha encontrado" -"Recently added item(s)","Elementos agregados recientemente" -"Register","Registrarse" -"Register and save time!","Regístrese y ahorre tiempo." -"Register to Create an Account","Registrarse para crear una cuenta" -"Register with us for future convenience:","Regístrese con nosotros para que sus futuras transacciones sean más cómodas:" -"Remove Item","Eliminar elemento" -"Remove This Item","Eliminar Este Artículo" -"Remove coupon code from shopping cart","Quite el código del cupón del carro de la compra" -"Remove item","Eliminar artículo" -"Remove product from shopping cart","Quite el producto del carro de la compra" -"Remove product(s) from shopping cart","Quite el producto(s) del carro de la compra" -"Require Customer To Be Logged In To Checkout","El cliente debe estar conectado para realizar el pedido" -"Retrieve information about shopping cart","Recupere la información de carro de la compra" -"Review Order","Revise su pedido" -"Review Order - %s","Revise su pedido - %s" -"SKU","Número de referencia" -"Sales","Ventas" -"Save Condition","Guardar cambio" -"Save in address book","Guardar en libreta de direcciones" -"See price before order confirmation.","Ver precio antes de la confirmación del pedido." -"Select Address","Seleccionar dirección" -"Select Addresses","Seleccionar direcciones" -"Select Shipping Method","Seleccionar método de envío" -"Select State/Province...","Seleccionar estado/provincia..." -"Select a billing address from your address book or enter a new address.","Seleccione una dirección de facturación de su libreta de direcciones o ingrese una nueva." -"Select a shipping address from your address book or enter a new address.","Seleccione una dirección de envío desde su libreta de direcciones o introduzca una nueva dirección." -"Send Payment Failed Email Copy Method","Método de envío de correo electrónico de error en el pago" -"Send Payment Failed Email Copy To","Destinatario de correo electrónico de error en el pago" -"Send To","Enviar a" -"Separate by "","".","Separado por "",""." -"Set customer for shopping cart","Ajuste del cliente para el carro de la compra" -"Set customer's addresses in shopping cart","Indique dirección del cliente en el carrito de la compra" -"Set payment method","Seleccione método de pago" -"Set shipping method","Seleccione método de envío" -"Ship to Multiple Addresses","Enviar a varias direcciones" -"Ship to different address","Enviar a distintas direcciones" -"Ship to this address","Enviar a esta dirección" -"Shipping Address","Dirección de Envío" -"Shipping Information","Dirección de envío" -"Shipping Method","Método de envío" -"Shipping Methods","Métodos de envío" -"Shipping To","Envío a" -"Shipping information","Información de envío" -"Shipping method has not been selected yet","Aun no se ha seleccionado un método de envío" -"Shipping methods in shopping cart","Métodos de envío en el carrito de la compra" -"Shipping selection is not applicable.","No se aplica la selección de envío." -"Shopping Cart","Carro de la compra" -"Shopping Cart Form Before","Formulario previo al carrito de compras" -"Shopping Cart Items After","Elementos de la cesta antes" -"Shopping Cart Items Before","Elementos de la cesta después" -"Shopping Cart Sidebar","Barra lateral del carrito de compras" -"Shopping Cart Sidebar Extra Actions","Opciones extra en la barra lateral del carrito de la compra" -"Shopping Cart is Empty","El carrito de compras está vacío" -"Shopping cart ability to set coupon code","Posibilidad de aplicar código de descuento en el carrito de la compra" -"Show Content as","Mostrar contenido como" -"Some of the requested products are not available in the desired quantity.","Algunos de los productos solicitados no están disponibles en la cantidad deseada." -"Some of the requested products are unavailable.","Alguno de los productos solicitados no está disponible." -"Some products quantities were recalculated because of quantity increment mismatch","Las cantidades de algunos productos se han recalculado debido a desajustes en el incremento de cantidades" -"Sorry, guest checkout is not enabled. Please try again or contact store owner.","Lo sentimos, la opción de pago como invitado no está habilitada. Por favor, inténtelo de nuevo o contacte con el dueño de la tienda." -"Sorry, no quotes are available for this order at this time.","Lamentamos informarle que en este momento no hay cotizaciones disponibles para este pedido." -"State/Province","Estado/Provincia" -"Status","Progreso" -"Store View","Ver Tienda" -"Street Address","Calle" -"Street Address %s","Calle %s" -"Submitting order information...","Enviando información del pedido..." -"Subtotal","Subtotal" -"Subtotal must exceed minimum order amount","El subtotal debe superar el importe mínimo del pedido" -"Telephone","Teléfono" -"Terms and Conditions","Términos y condiciones" -"Terms and Conditions Information","Información sobre los términos y condiciones" -"Terms and conditions","Términos y condiciones" -"Text","Texto" -"Thank you for your purchase!","Gracias por su compra." -"The condition has been deleted","Se eliminó la condición" -"The condition has been saved.","Se guardó la condición." -"The onepage checkout is disabled.","El pago por página está deshabilitado." -"The product could not be found.","No se encontró el producto." -"The product does not exist.","El producto no existe." -"There are %s items in your cart.","Hay %s productos en su carrito." -"There is 1 item in your cart.","Hay 1 producto en su carrito." -"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","Ya hay un cliente registrado con esta dirección de correo electrónico. Por favor, conéctese utilizando esta dirección o introduzca una dirección de correo electrónico diferente para crear su cuenta." -"There was an error processing your order. Please contact us or try again later.","Se produjo un error al procesar su pedido. Póngase en contacto con nosotros o vuelva a intentarlo más tarde." -"This condition no longer exists.","Esta condición ya no existe." -"Total","Total" -"Total for this address","Total para esta dirección" -"Unable to set Payment Method.","No se puede establecer método de pago." -"Unit Price","Precio por unidad" -"Update","Actualizar" -"Update Cart","Actualizar carrito" -"Update Qty & Addresses","Actualizar cantidad y direcciones" -"Update Shopping Cart","Actualizar carrito de compras" -"Update Total","Actualizar total" -"Update product quantities in shopping cart","Actualizar cantidades del producto en el carrito de la compra" -"Update product(s) quantities in shopping cart","Actualizar cantidades de (los) producto(s) en el carrito de la compra" -"Use Billing Address","Utilizar dirección de facturación" -"VAT Number","Número de IVA" -"View Shopping Cart","Ver cesta de la compra" -"Visible items in minicart","Elementos visibles en la minicesta" -"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","Estamos procesando su pedido y pronto recibirá un mensaje de correo electrónico con los detalles de éste. Cuando se envíe su pedido, recibirá otro correo electrónico con un enlace para hacer un seguimiento de su progreso." -"What's this?","¿Qué es esto?" -"What's this?","¿Qué es esto?" -"You have no items in your shopping cart.","No tiene artículos en su carrito de compras." -"You will receive an order confirmation email with details of your order and a link to track its progress.","Recibirá un mensaje de correo electrónico con los detalles de su pedido y un enlace para hacer un seguimiento de su progreso." -"Your Checkout Progress","Progreso de su compra" -"Your billing agreement # is: %s.","Su número de acuerdo de facturación es: %s." -"Your order # is: %s.","Su número de pedido es: %s." -"Your order cannot be completed at this time as there is no payment methods available for it.","Su pedido no se ha podido completar porque no hay ningún método de pago disponible." -"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Su pedido no puede completarse en este momento ya que no hay métodos de envío disponibles. Realice los cambios necesarios en su dirección de envío." -"Your order has been received.","Se recibió su pedido." -"Your order number is ","Su número de pedido es" -"Your recurring payment profiles:","Su perfil de pago periódico:" -"Zip/Postal Code","Código Postal" -"ok","De acuerdo" diff --git a/app/locale/es_ES/Mage_Cms.csv b/app/locale/es_ES/Mage_Cms.csv deleted file mode 100644 index 69eeff804..000000000 --- a/app/locale/es_ES/Mage_Cms.csv +++ /dev/null @@ -1,123 +0,0 @@ -"A block identifier with the same properties already exists in the selected store.","Ya existe un identificador de bloque con las mismas propiedades en la tienda seleccionada." -"A directory with the same name already exists. Please try another folder name.","Ya existe un directorio con el mismo nombre. Por favor elija otro nombre de carpeta." -"A page URL key for specified store already exists.","Ya existe una clave de página URL para la tienda especificada." -"Action","Acción" -"Add New Block","Añadir nuevo bloque" -"Add New Page","Añadir nueva página" -"All Countries","Todos los países" -"An error occurred while saving the page.","Ocurrió un error mientras se grababa la página." -"Anchor Custom Text","Texto personalizado del delimitador" -"Anchor Custom Title","Título personalizado del delimitador" -"Are you sure you want to delete current folder?","Está usted seguro de borrar la carpeta acutal?" -"Are you sure you want to delete the selected file?","Está usted seguro de borrar el archivo seleccionado?" -"Block","Bloque" -"Block Information","Información de bloque" -"Block Title","Título de bloque" -"CMS","CMS" -"CMS Content Wrapper","CMS contenedor de contenido" -"CMS Home Page","Página principal del CMS" -"CMS No Cookies Page","Página CMS sin cookies" -"CMS No Route Page","Página CMS sin ruta" -"CMS No-Route Page","Página sin ruta del CMS" -"CMS Page","Página CMS" -"CMS Page Link","Enlace de página CMS" -"CMS Page Link Block Template","Plantilla en bloque de la página de enlaces del CMS" -"CMS Page Link Inline Template","Plantilla en línea de la página de enlaces del CMS" -"CMS Pages (All)","Páginas del CMS (Todas)" -"CMS Static Block","Bloque estático CMS" -"CMS Static Block Default Template","Tema por defecto del bloque estático CMS" -"Cannot create new directory.","No puede crearse un nuevo directorio." -"Cannot delete directory %s.","No puede borrarse el directorio %s." -"Cannot delete root directory %s.","No puede borrarse el directorio raíz %s." -"Cannot upload file.","No puede subir el archivo" -"Collapse All","Desplegar Todo" -"Content","Contenido" -"Content Heading","Cabecera de Contenido" -"Content Management","Gestión de Contenido" -"Contents of a Static Block","Cotenidos de un bloque estático" -"Create Folder...","Crear Carpeta ..." -"Custom Design","Diseño Personalizado" -"Custom Design From","Diseño personalizado desde" -"Custom Design To","Diseño personalizado a" -"Custom Layout","Diseño Personalizado" -"Custom Layout Update XML","Actualización diseño personalizado XML" -"Custom Theme","Tema personalizado" -"Customer Tax Class Information","Información de clase de impuestos del cliente" -"Date Created","Fecha Creada" -"Delete Block","Borrar Bloque" -"Delete File","Borrar Archivo" -"Delete Folder","Borrar Carpeta" -"Delete Page","Borrar Página" -"Description","Descripción" -"Design","Diseño" -"Disabled","Deshabilitado" -"Disabled Completely","Desactivar completamente" -"Disabled by Default","Deshabilitado por defecto" -"Edit Block","Editar bloque" -"Edit Block '%s'","Editar Bloque '%s'" -"Edit Page","Editar Página" -"Edit Page '%s'","Editar Página '%s'" -"Enable WYSIWYG Editor","Activar Editor WYSIWYG" -"Enabled","Habilitado" -"Enabled by Default","Habilitado por defecto" -"Expand All","Expandir todo" -"General Information","Información general" -"Go to Home Page","Ir a la página de inicio" -"Home","Inicio" -"ID","ID" -"Identifier","Identificador" -"If empty, the Page Title will be used","Si se deja vacío, se usará elTítulo de la Página" -"Images (%s)","Imágenes (%s)" -"Insert File","Añadir Fichero" -"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","Nombre de carpeta inválido. Por favor, use caracteres alfanuméricos, subrayados y guiones." -"Keywords","Palabras clave" -"Last Modified","Ultima modificación" -"Layout","Diseño" -"Layout Update XML","XML para actualización de diseño" -"Link to a CMS Page","Enlace a una página de CMS" -"Manage Pages","Administrar páginas" -"Media Gallery","Galería de medios" -"Media Storage","Almacenamiento de objetos multimedia" -"Meta Data","Metadatos" -"Meta Description","Metadescipción" -"Meta Keywords","Meta palabras clave" -"New Block","Nuevo bloque" -"New Folder Name:","Nombre de la nueva carpeta" -"New Page","Nueva Página" -"No files found","No se encontraron archivos" -"Page Information","Información de la página" -"Page Layout","Diseño de página" -"Page Status","Estado de la página" -"Page Title","Título de la página" -"Pages","Páginas" -"Product Tax Class Information","Información de clase impositiva del producto" -"Redirect to CMS-page if Cookies are Disabled","Redirigir a página CMS si las cookies están desactivadas" -"Relative to Website Base URL","En relación a la URL básica del sitio web" -"Save Block","Guardar bloque" -"Save Page","Guardar página" -"Save Process","Guardar proceso" -"Select Block...","Seleccionar bloque..." -"Select Page...","Seleccionar página..." -"Show Breadcrumbs for CMS Pages","Mostrar rastro de navegación para las páginas CMS" -"Show Notice if JavaScript is Disabled","Mostrar aviso si JavaScript está desactivado" -"Static Blocks","Bloques estáticos" -"Status","Estado" -"Storage Root","Raíz de almacenamiento" -"Store View","Ver Tienda" -"Template","Plantilla" -"The block has been deleted.","Se eliminó el bloque." -"The block has been saved.","Se guardó el bloque." -"The directory %s is not writable by server.","El servidor no puede escribir en el directorio %s." -"The page URL key cannot consist only of numbers.","La clave de dirección URL de la página no puede consistir sólo en números." -"The page URL key contains capital letters or disallowed symbols.","El URL de la página contiene letras mayúsculas o símbolos no permitidos." -"The page has been deleted.","Se eliminó la página." -"The page has been saved.","Se guardó la página." -"The static block content cannot contain directive with its self.","El contenido del bloque estático no puede incluir directriz dentro de sí." -"This block no longer exists.","Este bloque ya no existe." -"This page no longer exists.","Esta página ya no existe." -"Title","Título" -"URL Key","Clave URL" -"Unable to find a block to delete.","No se puede encontrar un bloque para eliminar." -"Unable to find a page to delete.","No se puede encontrar una página para eliminar." -"WYSIWYG Options","Opciones de formato WYSIWYG" -"px.","px." diff --git a/app/locale/es_ES/Mage_Compiler.csv b/app/locale/es_ES/Mage_Compiler.csv deleted file mode 100644 index d4c17d2e6..000000000 --- a/app/locale/es_ES/Mage_Compiler.csv +++ /dev/null @@ -1,21 +0,0 @@ -"Collected Files Count","Cantidad de archivos compilados" -"Compilation","Compilación" -"Compilation State","Estado de compilación" -"Compilation error","Error de compilación" -"Compiled","Compilado" -"Compiled Scopes Count","Cantidad de análisis compilados" -"Compiler Status","Estado del compilador" -"Compiler include path is disabled.","La ruta de inclusión del compilador está desactivada." -"Compiler include path is enabled.","La ruta de inclusión del compilador está activada." -"Directory ""%s"" must be writeable","Es necesario que se pueda escribir en el directorio ""%s""" -"Disable","Desactivar" -"Disabled","Deshabilitado" -"Enable","Habilitar" -"Enabled","Habilitado" -"File ""%s"" must be writeable","Es necesario que se pueda escribir en el archivo ""%s""" -"Not Compiled","No compilado" -"Run Compilation Process","Ejecutar proceso de compilación" -"Scopes Compilation Settings","Configuración de compilación de análisis" -"System","Sistema" -"The compilation has completed.","Se completó la compilación." -"Tools","Herramientas" diff --git a/app/locale/es_ES/Mage_Connect.csv b/app/locale/es_ES/Mage_Connect.csv deleted file mode 100644 index c5a5abbfc..000000000 --- a/app/locale/es_ES/Mage_Connect.csv +++ /dev/null @@ -1,58 +0,0 @@ -"1.5.0.0 & later","1.5.0.0 y posterior" -"Action","Acción" -"Add Author","Añadir Autor" -"Add Contents Path","Añadir Trayectoria de Contenidos" -"Add PHP Extension dependency","Añadir dependencia de la Extensión PHP" -"Add Package dependency","Añadir dependencia del Paquete" -"Add files","Agregar archivos" -"Authors","Autores" -"Channel","Canal" -"Contents","Contenido" -"Create Extension Package","Crear paquete de extensión" -"Dependencies","Dependencias" -"Description","Descripción" -"Edit Extension","Editar extensión" -"Email","Correo electrónico" -"Extension","Extensión" -"Extensions","Extensiones" -"Failed to create the package.","No se pudo crear el paquete." -"Failed to load the package data.","No se pudo cargar los datos del paquete." -"Failed to save the package.","No se pudo guardar el paquete." -"Files","Archivos" -"Folder","Carpeta" -"Ignore","Ignorar" -"Include","Incluir" -"License","Licencia" -"License URI","Dirección URI de la licencia" -"Load Local Package","Cargar paquete local" -"Load local Package","Cargar Paquete local" -"Magento Connect","Magento Connect" -"Magento Connect Manager","Administrador de Magento Connect" -"Max","Máximo" -"Maximum","Máximo" -"Min","Mínimo" -"Minimum","Mínimo" -"Name","Nombre" -"New Extension","Nueva extensión" -"PHP Version","Versión de PHP" -"Package","Paquete" -"Package Extensions","Extensiones de paquete" -"Package File Name","Nombre de archivo de paquete" -"Package Info","Información de paquete" -"Packages","Paquetes" -"Path","Camino" -"Pre-1.5.0.0","Pre 1.5.0.0" -"Release Info","Información de versión" -"Remove","Eliminar" -"Save As...","Guardar como..." -"Save Data and Create Package","Guardar datos y crear paquete" -"Save package with custom package file name","Guardar paquete con nombre de archivo de paquete personalizado" -"Summary","Resumen" -"Supported releases","Publicaciones soportadas" -"System","Sistema" -"Target","Destino" -"The package %s data has been loaded.","Se cargaron los datos del paquete %s." -"The package data has been saved.","Se guardaron los datos del paquete." -"There was a problem saving package data","Se produjo un problema al guardar los datos del paquete" -"Type","Tipo" -"User","Usuario" diff --git a/app/locale/es_ES/Mage_Contacts.csv b/app/locale/es_ES/Mage_Contacts.csv deleted file mode 100644 index 6bbf70d8d..000000000 --- a/app/locale/es_ES/Mage_Contacts.csv +++ /dev/null @@ -1,19 +0,0 @@ -"* Required Fields","* Campos Requeridos" -"Comment","Comentario" -"Contact Form","Formulario de contacto" -"Contact Information","Información de Contacto" -"Contact Us","Contáctenos" -"Contact Us Form","Formulario de contacto" -"Contacts","Contactos" -"Contacts Section","Sección de contactos" -"Email","Correo electrónico" -"Email Options","Opciones de correo electrónico" -"Email Sender","Remitente del email" -"Email Template","Plantilla de email" -"Enable Contact Us","Activar Contactar" -"Name","Nombre" -"Send Emails To","Enviar correo electrónico a" -"Submit","Enviar" -"Telephone","Teléfono" -"Unable to submit your request. Please, try again later","No se ha podido enviar su solicitud. Por favor, inténtelo más tarde" -"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","Su solicitud ha sido enviada y le responderemos con la mayor brevedad posible. Gracias por contactar con nosotros" diff --git a/app/locale/es_ES/Mage_Core.csv b/app/locale/es_ES/Mage_Core.csv deleted file mode 100644 index 7fc2b3da8..000000000 --- a/app/locale/es_ES/Mage_Core.csv +++ /dev/null @@ -1,394 +0,0 @@ -"%s","%s" -"%s already exist.","%s ya existen." -"%s already exists.","%s ya existe." -"-- Please Select --","-- Seleccionar, por favor --" -"Warning! When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","¡Aviso!Al usar CDN, en algunos casos JavaScript puede no funcionar correctamente si CDN no está en tu subdominio" -"Warning! When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).","Precaucion! Cuando se utiliza el codigo de tienda en las URL, en algunos casos el sistema puede llegar a no funcionar correctamente si las URLs sin los codigos de las tiendas estan especificados en sistemas externos (como PayPal etc.)." -"A category object is required for determining the product request path.","Se requiere un objeto de categoría para determinar la ruta de solicitud del producto." -"Add Block Names to Hints","Agregar nombres de bloques a la ayuda" -"Add Secret Key to URLs","Agregar clave secreta a las direcciones URL" -"Add Store Code to Urls","Agregar código de tienda a las direcciones URL" -"Admin","Administrar" -"Admin Base URL","Dirección URL básica de administración" -"Admin User Emails","Correos electrónicos de usuario de administración" -"Advanced","Avanzado" -"After selecting a new media storage location, press the Synchronize button - to transfer all media to that location. Media will not be available in the new - location until the synchronization process is complete.","Después de seleccionar una nueva ubicación de almacenamiento multimedia, pulsa el botón Sincronizar para transferir todos los archivos multimedia a esa ubicación. Los archivos multimedia no estarán disponibles en la nueva ubicación hasta que el proceso de sincronización se complete." -"Allow Countries","Permitir países" -"Allow Magento Backend to run in frame","Permitir que el motor de Magento se ejecute en un marco" -"Allow Magento Frontend to run in frame","Permitir que la interfaz de Magento se ejecute en un marco" -"Allow Symlinks","Permitir Symlinks" -"Allowed IPs (comma separated)","Direcciones IP permitidas (separadas por comas)" -"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Tipos de archivo permitidos: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. ¡No todos los exploradores admiten todos estos formatos!" -"Allows customers to stay logged in when switching between different stores.","Permitir que los clientes sigan con su sesión abierta al pasar de una tienda a otra." -"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Texto alternativo para el enlace a la siguiente página en el menú de paginación. Si queda en blanco, se utilizará la imagen de flecha predeterminada." -"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Texto alternativo para el enlace a la página anterior en el menú de paginación. Si queda en blanco, se utilizará la imagen de flecha predeterminada." -"An error occurred while saving. Please review the error log.","Se produjo un error al guardar. Consulte el registro de errores." -"Anchor Text for Next","Texto de ancla para página siguiente" -"Anchor Text for Previous","Texto de ancla para página anterior" -"Anchor symbol (#) is not supported in request path","El símbolo ancla (#) no está soportado en la ruta solicitada" -"Anchor symbol (#) is not supported in url rewrite suffix","El símbolo ancla (#) no está soportado en el sufijo de reescritura de url" -"Are you sure?","¿Está seguro?" -"Auto-redirect to Base URL","Redireccionar automáticamente a la dirección URL básica" -"Back","Volver" -"Backup Options","Opciones de copia de respaldo" -"Base JavaScript URL","Dirección URL básica de JavaScript" -"Base Link URL","Dirección URL básica de enlace" -"Base Media URL","Dirección URL básica multimedia" -"Base Secure URL","Base URL segura" -"Base Skin URL","Dirección URL básica para apariencias" -"Base URL","Dirección URL básica" -"Base Unsecure URL","Base URL insegura" -"Before modifying the store view code please make sure that it is not used in index.php.","Antes de modificar el código de vista de tienda, asegúrese de que no se lo utilice en index.php." -"Before modifying the website code please make sure that it is not used in index.php.","Antes de modificar el código del sitio web, asegúrese de que no se lo utilice index.php." -"Block with name ""%s"" already exists","El bloque llamado ""%s"" ya existe" -"Browser Capabilities Detection","Detección de capacidades del navegador" -"CSS Settings","Configuración de CSS" -"Cache Storage Management","Administración de almacenamiento de memoria caché" -"Cache storage may contain additional data. Are you sure that you want flush it?","El almacenamiento de caché puede contener datos adicionales. ¿Estás seguro de que deseas eliminarlo?" -"Can not create invoice. Order was not found.","No se puede crear la factura. No se encontró el pedido." -"Can't retrieve request object","No se puede recuperar el objeto solicitado" -"Can\'t retrieve entity config: %s","No se puede recuperar configuración de entidad: %s" -"Cancel","Cancelar" -"Cannot complete this operation from non-admin area.","No se puede completar esta operación desde una área que no sea de administración." -"Card type does not match credit card number.","El tipo de tarjeta no se ajusta al número de tarjeta de crédito." -"Code","Código" -"Controller file was loaded but class does not exist","Se cargó el archivo de controlador, pero la clase no existe" -"Cookie Domain","Dominio para cookies" -"Cookie Lifetime","Duración de las cookies" -"Cookie Path","Ruta de las cookies" -"Cookie Restriction Mode","Modo de restricción de cookies" -"Copyright","Copyright" -"Core","Núcleo" -"Countries Options","Opciones de países" -"Country","País" -"Create Store","Crear tienda" -"Create Store View","Crear vista de tienda" -"Create Website","Crear sitio web" -"Credit card number does not match credit card type.","El número de tarjeta de crédito no se ajusta al tipo de tarjeta de crédito." -"Current Package Name","Nombre actual del paquete" -"Custom Admin Path","Personalizar Ruta de Admin" -"Custom Admin URL","URL de administración personalizada" -"Custom Design","Diseño Personalizado" -"Custom Email 1","Correo electrónico personalizado 1" -"Custom Email 2","Correo electrónico personalizado 2" -"Custom Variables","Variables personalizadas" -"Custom1 Contact Email","Correo electrónico de contacto del cliente1" -"Custom1 Contact Name","Nombre de contacto del cliente1" -"Custom2 Contact Email","Correo electrónico de contacto del cliente2" -"Custom2 Contact Name","Nombre de contacto del cliente2" -"Customer Support","Soporte al cliente" -"Dashboard","Panel de control" -"Date From","Fecha a partir de" -"Date To","Fecha" -"Date/time format ""%s"" is not supported.","El formato fecha/hora ""%s"" no se soporta." -"Debug","Depurar" -"Default","Predeterminada" -"Default Country","País predeterminado" -"Default Description","Descripción predeterminada" -"Default Keywords","Palabras clave predeterminadas" -"Default No-route URL","Dirección URL sin ruta predeterminada" -"Default Pages","Páginas predeterminadas" -"Default Robots","Robots predeterminados" -"Default Store","Tienda predeterminada" -"Default Store View","Vista de tienda predeterminada" -"Default Title","Título por Defecto" -"Default Web URL","Dirección URL web predeterminada" -"Delete","Eliminar" -"Delete Store","Eliminar tienda" -"Delete Store View","Eliminar vista de la tienda" -"Delete Website","Eliminar página web" -"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","Eliminar un/una %1$s no eliminará la información asociada con el/la %1$s (ej.: categorías, productos, etc.), pero no será posible recuperar el/la %1$s. Le sugerimos que respalde la base de datos antes de eliminar el/la %1$s." -"Design","Diseño" -"Design Change","Diseñar cambio" -"Developer","Desarrollador" -"Developer Client Restrictions","Restricciones del cliente del desarrollador" -"Disable Email Communications","Desactivar las notificaciones por correo electrónico" -"Disable Modules Output","Desactivar la salida de los módulos" -"Display Demo Store Notice","Mostrar aviso de tienda de demostración" -"Duplicate Of Template Name","Duplicado del nombre de plantilla" -"Edit Design Change","Editar Diseñar cambio" -"Edit Store","Editar tienda" -"Edit Store View","Editar vista de la tienda" -"Edit Website","Editar página web" -"Empty identifier field name","Vaciar el nombre del campo del identificador" -"Empty main table name","Vaciar el nombre de la tabla principal" -"Enable Charts","Activar gráficos" -"Enabled","Habilitado" -"Enabled for Admin","Activado para el administrador" -"Enabled for Frontend","Activado para el Frontend" -"Environment Update Time","Tiempo de Actualización del Entorno" -"Error in file: ""%s"" - %s","Error el el archivo ""%s"" - %s" -"European Union Countries","Países de la Unión Europea" -"Exceptions Log File Name","Nombre del archivo de registro de excepciones" -"Favicon Icon","Icono de favoritos" -"File %s does not exist","El archivo %s no existe" -"File %s is not readable","El archivo %s no es legible" -"File not found","Archivo no encontrado" -"File system","Sistema de archivos" -"File with an extension ""%value%"" is protected and cannot be uploaded","El archivo con extensión ""%value%"" está protegido y no se puede subir" -"First Day of Week","Primer día de la semana" -"Flush Cache Storage","Vaciar memoria caché" -"Flush Magento Cache","Vaciar la caché de Magento" -"Footer","Pie de página" -"Forgot Password Email Sender","Emisor del correo de contraseña olvidada" -"Forgot Password Email Template","Plantilla del correo de contraseña olvidada" -"General","General" -"General Contact","Contacto general" -"General Contact Email","Correo electrónico de contacto general" -"General Contact Name","Nombre de contacto general" -"General Settings","Opciones generales" -"Get info about current Magento installation","Obten informacion acerca de esta instalacion de Magento" -"Global","Global" -"HTML Head","Encabezado HTML" -"HTML tags are not allowed","No están permitidas las etiquetas HTML" -"Header","Encabezado" -"Host","Host" -"How many links to display at once.","Número de enlaces para mostrar a la vez." -"ID Path for Specified Store","Id ruta para tienda especificada" -"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","Si la posición actual del marco no cubre la mayoría de las páginas, se procesará un enlace a la posición actual más/menos este valor." -"Incorrect credit card expiration date.","Fecha de caducidad de la tarjeta de crédito incorrecta" -"Input type ""%value%"" not found in the input types list.","El tipo de entrada ""%value%"" no se encuentra en la lista de tipos de entrada." -"Invalid URL '%value%'.","URL Invalida'%value%'." -"Invalid base url type","El tipo de dirección URL base no es válido." -"Invalid block name to set child %s: %s","Nombre de bloque para establecer %s infantil no válido: %s" -"Invalid block type: %s","Tipo de bloque no válido: %s" -"Invalid block: %s","Bloque no válido: %s" -"Invalid connection","Conexión no válida" -"Invalid date","Invalid date" -"Invalid layout update handle","El controlador para actualizar el diseño no es válido." -"Invalid messages storage ""%s"" for layout messages initialization","Almacenamiento de mensajes no válido ""%s"" para el diseño de inicialización de mensajes" -"Invalid query","Consulta no válida" -"Invalid transactional email code: %s","Codigo de correo transaccional invalido: %s" -"Invalid website\'s configuration path: %s","Ruta de configuración de la página web no válida: %s" -"JavaScript Settings","Configuración JavaScript" -"Layout","Diseño" -"Leave empty for access from any location.","Déjese en blanco para acceder desde cualquier sitio." -"List of stores","Listado de tiendas" -"Locale","Configuración regional" -"Locale Options","Opciones de configuración regional" -"Log Settings","Configuración de registro" -"Logging from Mage::log(). File is located in {{base_dir}}/var/log","Registro desde Mage::log(). El archivo se encuentra ubicado en {{base_dir}}/var/log" -"Logging from Mage::logException(). File is located in {{base_dir}}/var/log","Registro desde Mage::logException(). El archivo se encuentra ubicado en {{base_dir}}/var/log" -"Login is Case Sensitive","Se distinguen mayúsculas al iniciar sesión." -"Logo Image","Imagen del Logo" -"Logo Image Alt","Imagen del logotipo alternativa" -"Logo Image Src","Src de imagen de logotipo" -"Magento info","Informacion de Magento" -"Magento info API","Informacion de Magento API" -"Mail Sending Settings","Configuración del envío de correo" -"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Asegúrese de que la dirección URL base termina con '/' (barra diagonal), ej.: http://yourdomain/magento/" -"Manage Stores","Gestionar Tiendas" -"Match expressions in the same order as displayed in the configuration.","Haga coincidir las expresiones siguiendo el mismo orden que se muestra en la configuración." -"Media Storage","Almacenamiento de Medios" -"Merge CSS Files","Combinar Archivos CSS" -"Merge JavaScript Files","Combinar archivos JavaScript" -"Miscellaneous HTML","HTML diverso" -"Miscellaneous Scripts","Miscelánea Scripts" -"Model collection resource name is not defined.","No está definido el nombre de recurso de recopilación de modelos." -"Module ""%1$s"" cannot depend on ""%2$s"".","El módulo ""%1$s"" no puede depender de ""%2$s""." -"Module ""%1$s"" requires module ""%2$s"".","El módulo ""%1$s"" requiere del módulo ""%2$s""." -"Name","Nombre" -"New Design Change","Nuevo cambio en el diseño" -"New Store","Nueva tienda" -"New Store View","Nueva vista de tienda" -"New Website","Nuevo sitio web" -"No","No" -"Offloader header","Encabezado del descargador" -"PHP SOAP extension is required.","Se requiere la extensión PHP SOAP" -"Package","Paquete" -"Pagination","Paginación" -"Pagination Frame","Marco de paginación" -"Pagination Frame Skip","Omisión de marco de paginación" -"Parent directory does not exist: %s","El directorio padre no existe: %s" -"Path ""%value%"" is not available and cannot be used.","La ruta ""%value%"" no está disponible y no puede usarse." -"Path ""%value%"" is protected and cannot be used.","La ruta ""%value%"" está protegida y no se puede utilizar." -"Path ""%value%"" may not include parent directory traversal (""../"", ""..\\).""","La ruta ""%value%"" no puede incluir accesos de ejecución transversal (""../"", ""..\).""" -"Please define flag code.","Defina el código de marcado." -"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Introduzca 6 o más caracteres. Se ignorarán los espacios antes o después." -"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Por favor, introduzca 7 o más caracteres. La contraseña tiene que contener tanto caracteres numéricos como alfabéticos." -"Please enter a number 0 or greater in this field.","Por favor, introduzca un número 0 o superior en este campo." -"Please enter a number 1 or greater in this field.","Por favor, introduzca un 1 o un número superior en este campo." -"Please enter a number greater than 0 in this field.","Ingrese un número mayor que 0 en este campo." -"Please enter a number lower than 100.","Por favor, introduzca un número menor que 100." -"Please enter a valid $ amount. For example $100.00.","Ingrese un monto válido en $. Por ejemplo: $100.00." -"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Por favor, introduzca una Clave de URL válida. Por ejemplo ""pagina-ejemplo"", ""pagina-ejemplo.html"" o ""otronivel/pagina-ejemplo""" -"Please enter a valid URL. For example http://www.example.com or www.example.com","Por favor, introduzca una URL válida. Por ejemplo, http://www.example.com o www.example.com" -"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Por favor, introduzca una URL válida. Es necesario el protocolo (http://, https:// or ftp://)" -"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Por favor, introduzca un identificador-XML válido. Por ejemplo, algo_1, bloque5, id-4." -"Please enter a valid credit card number.","Ingrese un número de tarjeta de crédito válido." -"Please enter a valid credit card verification number.","Introduzca un número correcto de verificación de tarjeta de crédito." -"Please enter a valid date between %s and %s","Por favor, introduzca una fecha válida entre %s y %s" -"Please enter a valid date equal to or greater than %s","Por favor, introduzca una fecha válida igual o superior a %s" -"Please enter a valid date less than or equal to %s","Por favor, introduzca una fecha válida menor o igual a %s" -"Please enter a valid date.","Ingrese una fecha válida." -"Please enter a valid day (1-%d).","Por favor, introduzca un día válido (1-%d)." -"Please enter a valid email address. For example johndoe@domain.com.","Ingrese una dirección de correo electrónico válida. Por ejemplo: juanperez@dominio.com." -"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Por favor, introduzca un número de fax válido. Por ejemplo (123) 456-7890 o 123-456-7890." -"Please enter a valid full date","Por favor, introduzca una fecha válida completa" -"Please enter a valid month (1-12).","Por favor, introduzca un mes válido (1-12)." -"Please enter a valid number in this field.","Ingrese un número válido en este campo." -"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Ingrese un número de teléfono válido. Por ejemplo: (123) 456-7890 o 123-456-7890." -"Please enter a valid social security number. For example 123-45-6789.","Ingrese un número de seguro social válido. Por ejemplo: 123-45-6789." -"Please enter a valid year (1900-%d).","Por favor, introduzca un año válido (1900-%d)." -"Please enter a valid zip code.","Ingrese un código postal válido." -"Please enter a valid zip code. For example 90602 or 90602-1234.","Ingrese un código postal válido. Por ejemplo: 90602 o 90602-1234." -"Please enter issue number or start date for switch/solo card type.","Por favor, introduzca un número de emisión o fecha de inicio para el tipo de tarjeta switch/solo." -"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Por favor, introduzca una longitud válida de CSS. Por ejemplo, 100px o 77pt o 20em o .5ex o 50%" -"Please make sure your passwords match.","Asegúrese de que sus contraseñas coincidan." -"Please select State/Province.","Por favor, selecciona Estado/Provincia." -"Please select a file","Por favor seleccione un archivo" -"Please select an option.","Seleccione una opción." -"Please select one of the above options.","Por favor, selecciona una de las opciones anteriores." -"Please select one of the options.","Seleccione una de las opciones." -"Please set available and/or protected paths list(s) before validation.","Por favor, indique la(s) lista(s) de rutas disponibles y/o protegidas antes de la validación." -"Please specify either a category or a product, or both.","Especifique una categoría, un producto o ambos." -"Please use letters only (a-z or A-Z) in this field.","Por favor, use sólo letras (a-z o A-Z) en este campo." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","En este campo sólo se pueden escribir números. Evite los espacios en blanco u otros caracteres, como los puntos o las comas, por ejemplo." -"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Por favor, utilice solo letras (a-z o A-Z) o números (0-9) solo en este campo. No están permitidos los espacios u otros caracteres." -"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Por favor, utilice solo letras (a-z o A-Z) o números (0-9) o espacios y # solo en este campo." -"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Por favor, utilice solamente letras (a-z o A-Z), números (0-9) o guion bajo (_) en este campo, el primer carácter debe ser una letra." -"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Utilice sólo letras (a-z), números (0-9) o guiones bajos (_) en este campo. El primer caracter debe ser una letra." -"Please use only visible characters and spaces.","Por favor, utilice solo caracteres visibles y espacios." -"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Utilice este formato de fecha: dd/mm/aaaa. Por ejemplo, 17/03/2006 para el 17 de marzo de 2006." -"Please wait, loading...","Espera, por favor. Cargando...." -"Polls","Encuestas" -"Port (25)","Puerto (25)" -"Profiler","Motor de perfiles" -"Recovery Link Expiration Period (days)","Periodo de caducidad del enlace de recuperación (días)" -"Request Path for Specified Store","Solicitar ruta para la tienda especificada" -"Request path length exceeds allowed %s symbols.","Longitud de la Solicitud del camino supera los %s symbolos permitidos." -"Requested file may not include parent directory traversal (""../"", ""..\\ notation)""","El fichero solicitado no puede incluir accesos de ejecución tranversal (""../"", ""..\ notación)""" -"Requested invalid store ""%s""","Solicitada tienda ""%s"" no válida" -"Resource is not set.","No se estableció el recurso." -"Retrieve info about current Magento installation","Recuperar informacion acerca de la instalacion actual de Magento" -"Retrieve store data","Obtener datos de la tienda" -"Retrieve store list","Obtener lista de tiendas" -"Return-Path Email","Correo electrónico de ruta de retorno" -"Root Category","Categoría de raíz" -"Sales Representative","Representante de ventas" -"Sales Representative Contact Email","Correo electrónico de contacto del agente de ventas" -"Sales Representative Contact Name","Nombre de contacto del agente de ventas" -"Save","Guardar" -"Save Store","Guardar tienda" -"Save Store View","Guardar vista de tienda" -"Save Website","Guardar sitio web" -"Search Engines Optimization","Optimización de motores de búsqueda" -"Secure","Seguro" -"Security","Seguridad" -"Select Date","Seleccionar Fechas" -"Select Media Database","Selecionar base de datos de medios" -"Sender Email","E-mail del Remitente" -"Sender Name","Nombre del remitente" -"Services","Servicios" -"Session Cookie Management","Gestión de las Cookies de sesión" -"Session Lifetime (seconds)","Duración de la sesión (en segundos)" -"Session Validation Settings","Ajustes de validación de sesión" -"Set Return-Path","Establecer path de vuelta" -"Set as Default","Establecer por defecto" -"Skin (Images / CSS)","Apariencia (Imágenes / CSS)" -"Small Logo Image Src","Fuente de la imagen del logo" -"Sort Order","Orden de selección" -"Specified date/time ""%1$s"" do not match format ""%2$s"".","Señalar fecha/hora ""%1$s"" no coincide con el formato ""%2$s""." -"Start date cannot be greater than end date.","La fecha de inicio no puede ser mayor que la de fin." -"Startup Page","Página de inicio" -"Status","Estado" -"Storage Configuration for Media","Configuración del almacenamiento de medios" -"Store","Tienda" -"Store API","Tienda API" -"Store Contact Address","Almacenar información de contacto" -"Store Contact Information","Almacenar información de Contacto" -"Store Contact Telephone","Almacenar teléfono de contacto" -"Store Email Addresses","Almacenar dirección de email" -"Store Information","Almacenar información" -"Store Name","Nombre de la Tienda" -"Store View","Ver Tienda" -"Store View Information","Ver Información de la Tienda" -"Store View Name","Nombre de la vista de tienda" -"Store view doesn't exist","El nombre de la tienda no existe" -"Store with the same code","Tienda con el mismo código" -"System","Sistema" -"System Log File Name","Nombre de archivo de registro del sistema" -"Template Path Hints","Pistas del path de plantilla" -"Template Settings","Modelo de los ajustes" -"Template Variables","Variables de plantilla" -"Templates","Plantillas" -"Text length does not satisfy specified text range.","La longitud del texto no satisface el rango de texto señalado" -"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","El %s que ha introducido no es válido. Por favor asegurese de que sigue el formato ""http://domain.com/""" -"The From Date value should be less than or equal to the To Date value.","El valor Desde la fecha debe ser inferior o igual al valor Hasta la fecha." -"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","El código de tienda sólo puede contener letras (a-z), números (0-9) o guiones bajos (_). El primer caracter debe ser una letra" -"The store does not exist","La tienda no existe" -"The store has been deleted.","La tienda se ha eliminado." -"The store has been saved.","Se ha grabado la tienda." -"The store view has been deleted.","La vista de tienda se ha eliminado." -"The store view has been saved","La vista de tienda se ha guardado" -"The template Name must not be empty.","El nombre de plantilla no debe quedar vacío." -"The value is not within the specified range.","El valor no está dentro del rango permitido." -"The website does not exist.","El sitio web no existe." -"The website has been deleted.","El sitio web se eliminó." -"The website has been saved.","Se ha grabado la página web." -"Themes","Temas" -"This category and all its child elements","Esta categoría y sus elementos secundarios" -"This category and its child categories only","Sólo esta categoría y sus categorías secundarias" -"This category and its products only","Solo esta categoría y sus productos" -"This category only","Solo esta categoría" -"This date is a required value.","La fecha es un valor obligatorio." -"This is a required field.","Este es un campo obligatorio." -"This store cannot be deleted.","No se puede eliminar esta tienda." -"This store view cannot be deleted.","No se puede eliminar esta vista de tienda." -"This website cannot be deleted.","No se puede borrar la página web." -"This will be displayed just before body closing tag.","Este texto se mostrará antes de la etiqueta de cierre del cuerpo." -"This will be included before head closing tag in page HTML.","Esto se incluirá antes de la etiqueta de cierre de cabecera en el HTML de la página." -"Timezone","Zona horaria" -"Title Prefix","Prefijo del título" -"Title Suffix","Sufijo del título" -"Transactional Emails","Correos electrónicos transaccionales" -"Translate Inline","Línea interna de traducción" -"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Traducir, bloques y otros caches de salida deben ser desactivadso para las traducciones de la parte delantera y de admininstración." -"Translations","Traducciones" -"Two and more slashes together are not permitted in request path","No se permiten dos o más barras juntas en la linea de solicitud" -"Two and more slashes together are not permitted in url rewrite suffix","No se permiten dos o más barras juntas en el sufijo de la url" -"Unable to create directory: %s","No ha sido posible crear el directorio: %s" -"Unable to delete store view. Please, try again later.","No se puede eliminar la vista de tienda. Vuelva a intentarlo más tarde." -"Unable to delete store. Please, try again later.","No se ha podido borrar la tienda. Por favor, inténtelo de nuevo más tarde." -"Unable to delete website. Please, try again later.","No se puede eliminar el sitio web. Vuelva a intentarlo más tarde." -"Unable to proceed. Please, try again","No ha sido posible realizar el proceso. Por favor, inténtelo de nuevo." -"Unable to proceed. Please, try again.","Imposible realizar la operación. Inténtalo de nuevo." -"Unable to save file ""%s"" at ""%s""","No ha sido posible guardar el archivo ""%s"" en ""%s""" -"Unable to save file: %s","No ha sido posible guardar el archivo: %s" -"Unknown old style column type definition: {$definition}.","Definición de tipo de columna de estilo antiguo desconocida: {$definition}." -"Unknown scope ""%s"".","Campo desconocido ""%s""" -"Unsecure","Sin seguridad" -"Url Options","Opciones de dirección URL" -"Use Custom Admin Path","Usar ruta de acceso de administrador personalizada" -"Use Custom Admin URL","Utilizar URL de administración personalizada" -"Use HTTP Only","Utilizar sólo HTTP" -"Use SID on Frontend","Utilizar SID en la interfaz del cliente" -"Use Secure URLs in Admin","Utilizar direcciones URL seguras en la administración" -"Use Secure URLs in Frontend","Utilizar direcciones URL seguras en la interfaz del cliente" -"Use Web Server Rewrites","Utilizar reescrituras del servidor web" -"VAT Number","Número de IVA" -"Validate HTTP_USER_AGENT","Validar HTTP_USER_AGENT" -"Validate HTTP_VIA","Validar HTTP_VIA" -"Validate HTTP_X_FORWARDED_FOR","Validar HTTP_X_FORWARDED_FOR" -"Validate REMOTE_ADDR","Validar REMOTE_ADDR" -"Validation has failed.","Falló la validación." -"Values less than 60 are ignored. Note that changes will apply after logout.","Los valores por debajo de 60 se ignoran. Tenga en cuenta que los cambios se aplicarán después de la desconexión" -"Variable Code must be unique.","El código de variable debe ser único." -"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","¡Atención! No se recomienda habilitar esta función en un entorno de producción ya que representa un potencial riesgo a la seguridad." -"Web","Web" -"Website","Sitio web" -"Website Information","Información del sitio web" -"Website Name","Nombre de sitio web" -"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","El código de la página web solo puede contener letras (a-z), números (0-9) o guiones bajos (_) y el primer carácter tiene que ser una letra" -"Website with the same code","Sitio web con el mismo código" -"Weekend Days","Días de semana" -"Welcome Text","Texto de bienvenida" -"Wrong file info format","Formato de información del archivo incorrecto" -"Wrong number of arguments for %s","Número incorrecto de argumentos para %s" -"Wrong old style column type definition: {$definition}.","Definición errónea de tipo de columna de estilo antiguo: $definition}." -"Yes","Sí" -"You will have to log in after you save your custom admin path.","Tendrás que iniciar sesión después de guardar tu ruta de acceso de administrador personalizada." -"Your design change for the specified store intersects with another one, please specify another date range.","Su cambio de diseño para la tienda especificada se superpone con otro. Especifique otro rango de fecha." -"database ""%s""","base de datos ""%s""" diff --git a/app/locale/es_ES/Mage_Cron.csv b/app/locale/es_ES/Mage_Cron.csv deleted file mode 100644 index 12c401101..000000000 --- a/app/locale/es_ES/Mage_Cron.csv +++ /dev/null @@ -1,24 +0,0 @@ -"10 minutes","10 minutos" -"15 minutes","15 minutos" -"20 minutes","20 minutos" -"30 minutes","30 minutos" -"5 minutes","5 minutos" -"Cron (Scheduled Tasks) - all the times are in minutes","Cron. (tareas programadas), todos los tiempos se expresan en minutos" -"Daily","Diario" -"Failure History Lifetime","Período de validez del historial de errores" -"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","En el caso de las direcciones URL correctas generadas durante ejecuciones de cron, asegúrese de configurar expresamente Web > Direcciones URL básicas seguras y no seguras." -"Generate Schedules Every","Generar programas cada" -"History Cleanup Every","Borrar el historial cada" -"Hourly","Cada hora" -"Invalid callback: %s::%s does not exist","Llamada no válida: %s::%s no existe" -"Invalid model/method definition, expecting ""model/class::method"".","Definición de modelo/método no válida, a la espera de ""model/class::method"". " -"Minute Intervals","Intervalos en minutos" -"Missed if Not Run Within","Falla si no se ejecuta dentro de" -"Monthly","Mensualmente" -"No callbacks found","No se encontraron llamadas" -"Schedule Ahead for","Programar con anticipación" -"Success History Lifetime","Período de validez del historial de ejecuciones correctas" -"Too late for the schedule.","Es demasiado tarde para este programa." -"Unable to delete the cron task.","No se ha podido borrar la tarea programada." -"Unable to save the cron expression.","No se puede guardar la expresión de cron." -"Weekly","Semanalmente" diff --git a/app/locale/es_ES/Mage_CurrencySymbol.csv b/app/locale/es_ES/Mage_CurrencySymbol.csv deleted file mode 100644 index 52dedd1b6..000000000 --- a/app/locale/es_ES/Mage_CurrencySymbol.csv +++ /dev/null @@ -1,10 +0,0 @@ -"Currency","Moneda" -"Custom currency symbols were applied successfully.","Los símbolos personalizados de divisas se aplicaron con éxito." -"Manage Currency","Gestión de divisas" -"Manage Currency Rates","Tasa de cambio de divisas" -"Rates","Tasas" -"Save Currency Symbols","Guardar símbolos de divisas" -"Symbol","Símbolo" -"Symbols","Símbolos" -"System","Sistema" -"Use Standard","Utilizar la opción estándar" diff --git a/app/locale/es_ES/Mage_Customer.csv b/app/locale/es_ES/Mage_Customer.csv deleted file mode 100644 index 701125b34..000000000 --- a/app/locale/es_ES/Mage_Customer.csv +++ /dev/null @@ -1,469 +0,0 @@ -" or ","o bien" -"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' parece ser un servidor DNS pero no puede extraer la parte TLD" -"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' parece ser un servidor DNS pero no puede hacer coincidir en TLD con la lista" -"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' parece ser un servidor DNS pero no puede hacer coincidir el esquema del servidor con el TLD '%tld%'" -"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' parece ser un servidor DNS pero contiene un guión en una posición inválida" -"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","%value%' parece ser un nombre de servidor DNS pero no se puede descifrar la notación del Punycode introducido" -"'%value%' appears to be a local network name but local network names are not allowed","'%value%' parece ser un nombre de red local pero no se permiten los nombres de redes locales" -"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' parece ser una dirección IP, pero no se permiten direcciones IP" -"'%value%' does not appear to be a valid local network name","'%value%' no parece ser un nombre válido de red local" -"* Required Fields","* Campos Requeridos" -"ALL GROUPS","TODOS LOS GRUPOS" -"Account Dashboard","Panel de control de la cuenta" -"Account Information","Información de Cuenta" -"Account Sharing Options","Opciones de intercambio de la cuenta" -"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please click here.","Es necesario confirmar la cuenta. Por favor, abra en su correo electrónico el enlace de confirmación. Para volver a enviar el correo electrónico de confirmación por favor, pulse aquí." -"Action","Acción" -"Add New Address","Añadir Nueva Dirección" -"Add New Customer","Agregar nuevo cliente" -"Add New Customer Group","Agregar nuevo grupo de clientes" -"Added From","Agregado de" -"Additional Address Entries","Anotaciones Adicionales de Dirección" -"Address","Dirección" -"Address Book","Libreta de Direcciones" -"Address Books","Libretas de direcciones" -"Address Information","Información de Dirección" -"Address Templates","Plantillas de direcciones" -"Addresses","Direcciones" -"Admin","Administrar" -"All","Todo" -"All Store Views","Todas las vistas de tienda" -"All countries","Todos los países" -"Always optional.","Siempre opcional." -"Amount","Importe" -"An error occurred while deleting the address.","Se produjo un error al eliminar la dirección." -"An error occurred while retrieving the option value: %s.","Se produjo un error al recuperar el valor de opción: %s." -"An error occurred while saving the collection, aborting. Error: %s","Se produjo un error al guardar la colección. Se anulará la operación. Error: %s" -"An invalid option ID is specified for %s (%s), skipping the record.","Se especificó un ID de opción no válido para %s (%s). Se omitirá este registro." -"Approved","Aprobado" -"Are you sure that you want to remove this item?","¿Está seguro de que desea eliminar este artículo?" -"Are you sure you want to cancel adding of this address?","¿Está seguro de que desea cancelar el proceso de agregado de esta dirección?" -"Are you sure you want to delete this address?","¿Estás seguro de querer borrar esta dirección?" -"Are you sure?","¿Está seguro?" -"Array of Entity collections is expected.","Se espera una disposición de colecciones de entidad." -"Assign a Customer Group","Asignar un grupo de clientes" -"Average Sale","Venta promedio" -"Back","Volver" -"Back - link to the previously viewed page","Atrás: enlace a la página vista anteriormente" -"Back to Login","Volver a Conexión" -"Bad request.","Solicitud incorrecta." -"Based on the VAT ID, the customer would belong to the Customer Group %s.","En base al ID del IVA, el cliente pertenece al Grupo de clientes %s." -"Bill to Name","Nombre de la factura" -"Bought From","Comprado a" -"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Al crear una cuenta con nuestra tienda podrás moverte más rápidamente por el proceso de pago, guardar múltiples direcciones de envío, ver y seguir el rastro de los pedidos de tu cuenta y más." -"CSV","CSV" -"Cancel","Cancelar" -"Cannot save a new password.","No se ha podido grabar una nueva contraseña." -"Cannot save address.","No se puede guardar la dirección." -"Cannot save the customer.","No se puede guardar el cliente." -"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","No se pueden compartir las cuentas de cliente de forma global porque existen algunas cuentas de cliente con la misma dirección de correo electrónico en varios sitios web, y no se pueden combinar." -"Change Account Password","Cambiar contraseña de cuenta" -"Change Billing Address","Cambiar la Dirección de Facturación" -"Change Password","Cambiar Contraseña" -"Change Shipping Address","Cambiar la Dirección de Envío" -"City","Ciudad" -"Company","Compañía" -"Config","Configuración" -"Configure","Configurar" -"Confirm New Password","Confirmar la Nueva Contraseña" -"Confirm Password","Confirma Contraseña" -"Confirmation Link Email","Enlace de confirmación de Email" -"Confirmed","Confirmado" -"Contact Information","Información de Contacto" -"Continue Shopping","Continuar comprando" -"Country","País" -"Create","Crear." -"Create New Account Options","Crear nuevas opciones de cuenta" -"Create New Customer Account","Crear nueva cuenta de cliente" -"Create Order","Crear pedido" -"Create an Account","Crear una Cuenta" -"Create customer","Crear cliente" -"Create customer address","Crear dirección de cliente" -"Current Password","Contraseña Actual" -"Customer","Cliente" -"Customer API","API del cliente" -"Customer Account Edit Form","Formulario de Edición de Cuenta del Cliente" -"Customer Account Login Form","Formulario de Conexión de Cuenta del Cliente" -"Customer Account Logout Success","Desconexión correcta de la Cuenta del Cliente" -"Customer Account Registration Form","Formulario de Registro de Cuenta del Cliente" -"Customer Addresses","Dirección de cliente" -"Customer Configuration","Configuración de cliente" -"Customer Forgot Password Form","Formulario de Contraseña Olvidada del Cliente" -"Customer Group","Grupo de Clientes" -"Customer Groups","Grupos de Cliente" -"Customer Information","Información de cliente" -"Customer Login","Identificador de cliente" -"Customer My Account (All Pages)","Mi Cuenta de Cliente (Todas las Páginas)" -"Customer My Account Address Book","Libreta de Dirección de Mi Cuenta de Cliente" -"Customer My Account Address Edit Form","Formulario de Edición de Direcciones de Mi Cuenta de Cliente" -"Customer My Account Dashboard","Panel de Control de Mi Cuenta de Cliente" -"Customer Since","Cliente desde" -"Customer View","Vista de cliente" -"Customer collection expected.","Se espera colección de clientes" -"Customer email is required","Se requiere email del cliente" -"Customer website ID must be specified when using the website scope","Debe especificarse la identificación de página web del cliente cuando se usa el campo de la página web" -"Customer will stay on the current page if ""No"" is selected.","El cliente permanecerá en la página actual si se elige «No»." -"Customers","Clientes" -"Customers Only","Sólo clientes" -"Customers Section","Sección de clientes." -"DD","DD" -"Date","Fecha" -"Date Added","Añadido el día" -"Date of Birth","Fecha de Nacimiento" -"Day","Día" -"Days in Wishlist","Días en la lista de deseos" -"Default Addresses","Dirección por Defecto" -"Default Billing Address","Dirección de Facturación por Defecto" -"Default Email Domain","Email predeterminado del dominio" -"Default Group","Grupo por defecto" -"Default Shipping Address","Dirección de Envío por Defecto" -"Default Value for Disable Automatic Group Changes Based on VAT ID","Valor por defecto para deshabilitar los cambios automáticos de grupo en base al ID del IVA" -"Default Welcome Email","Email de bienvenida predeterminado" -"Delete","Eliminar" -"Delete Address","Borrar Dirección" -"Delete Customer","Borrar cliente" -"Delete Customer Group","Borrar grupo de cliente" -"Delete customer","Eliminar cliente" -"Delete customer address","Borrar dirección de cliente" -"Deleted Stores","Tiendas borradas" -"Details","Detalles" -"Disabled","Deshabilitado" -"Edit","Editar" -"Edit Account Info","Editar información de cuenta" -"Edit Account Information","Cambiar la información de la cuenta" -"Edit Address","Cambiar la dirección" -"Edit Address Entry","Cambiar el registro de la dirección" -"Edit Customer Group ""%s""","Editar grupo de clientes ""%s""" -"Edit Customer Groups","Editar grupos de clientes" -"Edit Customer's Address","Editar dirección del cliente" -"Edit Group","Editar grupo" -"Edit Newsletters","Cambiar los boletines" -"Email","Correo electrónico" -"Email Address","Dirección de email" -"Email Sender","Remitente del email" -"Email:","Email:" -"Enable Automatic Assignment to Customer Group","Habilitar asignación automática al grupo de clientes" -"Entity collection is expected.","Se espera entidad de recogida." -"Excel XML","Excel XML" -"Failed to confirm customer account.","Falló al confirmar la cuenta de cliente." -"Fax","Fax" -"First Name","Nombre" -"Forgot Email Template","Plantilla de Email olvidada" -"Forgot Password","Olvidé la contraseña" -"Forgot Your Password","Olvidaste Tu Contraseña" -"Forgot Your Password?","¿Ha olvidado la contraseña?" -"Forgot and Remind Email Sender","Emisor de dirección de correo olvidada y recordatorio" -"Form Fields Before","Campos de Formulario Antes de" -"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","Desde el «panel de control de mi cuenta» puede ver una instantánea de la actividad reciente en su cuenta y actualizar la información de su cuenta. Elija uno de los siguientes enlaces para ver o cambiar la información." -"Gender","Género" -"Gender is required.","Se requiere el género." -"General Subscription","Suscripción general" -"Generate Human-Friendly Customer ID","Generar ID de cliente amigable" -"Global","Global" -"Group","Grupo" -"Group Information","Información de grupo" -"Group Name","Nombre de grupo" -"Group for Invalid VAT ID","Grupo para ID del IVA no válido" -"Group for Valid VAT ID - Domestic","Grupo para ID del IVA válido - Doméstico" -"Group for Valid VAT ID - Intra-Union","Grupo para ID del IVA válido - Intraunión" -"Guest","Invitado" -"HTML","HTML" -"Hello, %s!","Hola, %s:" -"ID","Identificación" -"IP Address","Dirección IP" -"If you believe this is an error, please contact us at %s","Si cree que es un error, por favor, contacte con nosotros en %s" -"If you have an account with us, please log in.","Si usted tiene una cuenta con nosotros, por favor ingrese." -"Invalid attribute option specified for attribute %s (%s), skipping the record.","Se especificó una opción de atributo no válida para el atributo %s (%s). Se omitirá el registro." -"Invalid attribute set specified, skipping the record.","Se especificó un conjunto de atributos no válido. Se omitirá el registro." -"Invalid billing address for (%s)","Dirección de facturación no válida para (%s)" -"Invalid current password","Contraseña actual inválida" -"Invalid customer data","datos de cliente inválidos" -"Invalid email address ""%s"".","Dirección de mail ""%s"" no válida." -"Invalid email address.","dirección de email inválida" -"Invalid login or password.","usuario o contraseña inválidos." -"Invalid password reset token.","La contraseña no es correcta, reinicia el token." -"Invalid shipping address for (%s)","Dirección de envío no válida para (%s)" -"Invalid store specified, skipping the record.","Se especificó una tienda no válida. Se omitirá el registro." -"Invalid website, skipping the record, line: %s","Página web no válida, saltando el registro, línea: %s" -"Last Activity","Ultima actividad" -"Last Date Subscribed","Ultima fecha suscrita" -"Last Date Unsubscribed","Ultima fecha no suscrita" -"Last Name","Apellido" -"Last URL","Ultima URL" -"Leave empty for default (15 minutes).","Dejar en blanco para tomar el valor por defecto (15 minutos)." -"Leave empty for default (2). Valid range: 1-4","Dejar en blanco por defecto (2). Rango válido: 1-4" -"Lifetime Sales","Ventas de por vida" -"Log In","Inicio de sesión" -"Log Out","Fin de sesión" -"Login","Entrar" -"Login Information","Información de registro" -"Login Options","Opciones de ingreso" -"Login and password are required.","Se requiere identificador y contraseña." -"Login or Create an Account","Entre o cree una cuenta" -"MM","MM" -"Manage Addresses","Gestionar las direcciones" -"Manage Customers","Gestionar Clientes" -"Maximum length must be less then %s symbols","La longitud máxima debe ser menor de %s símbolos." -"Missing email, skipping the record, line: %s","Falta la dirección de correo, saltando el registro, línea: %s" -"Missing email, skipping the record.","Falta email, saltando el registro." -"Missing first name, skipping the record, line: %s","Falta el nombre, saltando el registro, línea: %s" -"Missing firstname, skipping the record.","Falta el nombre, saltando el registro." -"Missing last name, skipping the record, line: %s","Falta el apellido, saltando el registro, línea: %s" -"Missing lastname, skipping the record.","Falta apellido, saltando el registro." -"Missing website, skipping the record, line: %s","Falta la página web, saltando el registro, línea: %s" -"Month","Mes" -"My Account","Mi cuenta" -"My Account Wrapper","El Wrapper de mi Cuenta" -"My Dashboard","Mi panel de control" -"My Orders","Mis pedidos" -"Name","Nombre" -"Name and Address Options","Opciones de nombre y dirección" -"Never","Nunca" -"New Address","Nueva Dirección" -"New Address Entry","Nueva Anotación de Dirección" -"New Customer","Nuevo cliente" -"New Customer Address","Nueva dirección de cliente" -"New Customer Group","Nuevo grupo de cliente" -"New Customer Groups","Nuevos grupos de clientes" -"New Customers","Nuevos Clientes" -"New Group","Nuevo grupo" -"New Password","Nueva contraseña" -"New account","Nueva cuenta" -"New account confirmation key","Nueva clave de confirmación de cuenta" -"New account confirmed","Nueva cuenta confirmada" -"New password field cannot be empty.","El campo de nueva contraseña no puede estar en blanco." -"Newsletter","Boletín informativo" -"Newsletter Finish","Fin del boletín informativo" -"Newsletter Information","Información del boletín informativo" -"Newsletter Received","Boletín informativo recibido" -"Newsletter Start","Inicio del boletín informativo" -"Newsletter Subscription","Suscripción al boletín de noticias" -"Newsletters","Boletín de Noticias" -"No Items Found","No se encontraron artículos" -"No Newsletter Found","No se encontraron boletines informativos" -"No customer collections found","No se encontraron recopilaciones de clientes" -"No item specified.","No es especificaron artículos." -"Not Sent","No enviado" -"Not confirmed, can login","Sin confirmar. Puede iniciar sesión" -"Not confirmed, cannot login","Sin confirmar. No puede iniciar sesión" -"Number of Lines in a Street Address ","Cantidad de líneas de la dirección" -"Offline","Sin conexión" -"Online","Conectado" -"Online Customers","Clientes conectados" -"Online Customers Options","Opciones de los clientes conectados" -"Online Minutes Interval","Intervalo de minutos con conexión" -"Order #","Número de pedido" -"Order Total","Total del pedido" -"Orders","Pedidos" -"PDF","PDF" -"Password","Contraseña" -"Password Management","Administración de contraseñas" -"Password Options","Opciones de contraseña" -"Password forgotten","Olvido de contraseña" -"Password:","Contraseña:" -"Paused","En pausa" -"Pending","Pendiente" -"Per Website","Por sitio web" -"Personal Information","Información Personal" -"Please enter a number 1 or greater in this field.","Por favor, introduzca un 1 o un número superior en este campo." -"Please enter a valid date between %s and %s at %s.","Por favor, introduzca una fecha válida entre %s y %s en %s." -"Please enter a valid date equal to or greater than %s at %s.","Por favor, introduzca una fecha válida igual o mayor que %s en %s." -"Please enter a valid date less than or equal to %s at %s.","Por favor, introduzca una fecha válida menor o igual que %s en %s." -"Please enter the city.","Por favor, introduce la ciudad." -"Please enter the country.","Por favor, introduce el país." -"Please enter the first name.","Por favor, introduce el nombre." -"Please enter the last name.","Por favor, introduce el apellido." -"Please enter the state/province.","Por favor, introduce el estado/provincia." -"Please enter the street.","Por favor, introduce la calle." -"Please enter the telephone number.","Por favor, introduce el número de teléfono." -"Please enter the zip/postal code.","Por favor, introduce el código postal." -"Please enter your email address below. You will receive a link to reset your password.","Escriba su correo electrónico más abajo. Recibirá un enlace para restablecer su contraseña." -"Please enter your email below and we\'ll send you confirmation link for it.","Introduzca su dirección de correo electrónico a continuación y le enviaremos un enlace de confirmación." -"Please enter your email.","Introduzca su dirección de correo electrónico." -"Please make sure your passwords match.","Por favor, asegúrate de que las contraseñas coinciden." -"Please select a website which contains store view","Por favor, seleccione una página web que contenga la vista de tienda" -"Please select region, state or province","Por favor, seleccionar región, estado o provincia" -"Please, check your email for confirmation key.","Revise su correo electrónico y busque la clave de confirmación." -"Prefix Dropdown Options","Opciones de la lista desplegable de prefijos" -"Price","Precio" -"Product","Producto" -"Product ID","ID de Producto" -"Product Name","Nombre del producto" -"Product Reviews","Opiniones de Producto" -"Product Tags","Etiqueta de Producto" -"Purchase On","Adquirido el" -"Purchased On","Comprado en" -"Qty","Cantidad" -"Recent Orders","Pedidos recientes" -"Records for %s store found.","Se encontraron registros para la tienda %s." -"Recovery Link Expiration Period (days)","Periodo de caducidad del enlace de recuperación (días)" -"Redirect Customer to Account Dashboard after Logging in","Redirigir a los clientes al Panel de Control de la cuenta después de iniciar sesión" -"Refunded","Reembolsado" -"Register","Registrarse" -"Registered Customers","Clientes Registrados" -"Remind Email Template","Plantilla de recordatorio de correo electrónico" -"Remind Password","Recordar contraseña" -"Remove","Eliminar" -"Require Emails Confirmation","Solicitar confirmación por correo electrónico" -"Reset a Password","Restablecer contraseña" -"Retrieve address data","Recuperar datos de la dirección" -"Retrieve address info","Recuperar información de la dirección" -"Retrieve customer addresses","Recuperar direcciones de los clientes" -"Retrieve customer data","Recuperar datos de los clientes" -"Retrieve customer groups","Recuperar grupos de clientes" -"Retrieve customer info","Recuperar información de los clientes" -"Retrieve customers","Recuperar clientes" -"Retrieve your confirmation link here","Recupere aquí su enlace de confirmación" -"Retrieve your password here","Recupere aquí su contraseña" -"SKU","SKU" -"Sales Statistics","Estadísticas de ventas" -"Save","Guardar" -"Save Address","Guardar Dirección" -"Save Customer","Guardar cliente" -"Save Customer Group","Guardar grupo de clientes" -"Save Password","Guardar Contraseña" -"Save and Continue Edit","Guardar y continuar editando" -"Saved %d record(s)","Registro(s) %d Guardado(s)" -"Semicolon (;) separated values.
    Put semicolon in the beginning for empty first option.
    Leave empty for open text field.","Valores separados por punto y coma (;).
    Coloque un punto y coma al comienzo para dejar la primera opción vacía.
    Deje el primer lugar vacío para crear un campo de texto abierto." -"Send Auto-Generated Password","Enviar la contraseña generada automáticamente" -"Send From","Enviar Desde" -"Send Welcome Email","Enviar mensaje de correo electrónico de bienvenida" -"Send Welcome Email after Confirmation","Enviar mensaje de correo electrónico de bienvenida después de la confirmación" -"Send confirmation link","Enviar enlace de confirmación" -"Sending","Enviando" -"Sent","Enviada" -"Session Start Time","Hora de inicio de sesión" -"Set as Default Billing Address","Establecer como dirección de facturación predeterminada" -"Set as Default Shipping Address","Establecer como dirección de envío predeterminada" -"Share Customer Accounts","Compartir cuentas de cliente" -"Shipped to First Name","Nombre del destinatario" -"Shipped to Last Name","Apellido del destinatario" -"Shipped to Name","Nombre del destinatario" -"Shopping Cart","Cesta de la Compra" -"Shopping Cart - %d item(s)","Carrito de compras: %d artículos" -"Shopping Cart of %1$s - %2$d item(s)","Carro de la compra de %1$s - %2$d artículo(s)" -"Show Date of Birth","Mostrar fecha de nacimiento" -"Show Gender","Mostrar sexo" -"Show Middle Name (initial)","Mostrar segundo nombre (inicial)" -"Show Prefix","Mostrar prefijo" -"Show Suffix","Mostrar sufijo" -"Show Tax/VAT Number","Mostrar número de IVA/impuestos" -"Show VAT Number on Frontend","Mostrar el número del IVA en la parte delantera" -"Sign Up for Newsletter","Darse de Alta para Boletín de Noticias" -"Skipping import row, required field ""%s"" is not defined.","Omitir la fila de importación, el campo obligatorio ""%s"" no está definido." -"Skipping import row, website ""%s"" field does not exist.","Omitida la importación de la fila, el campo ""%s"" de la página web no existe" -"State/Province","Estado/Provincia" -"Status","Estado" -"Store","Tienda" -"Store View","Ver Tienda" -"Street Address","Dirección de Calle" -"Street Address %s","%s de Calle" -"Subject","Asunto" -"Submit","Enviar" -"Subscribe to Newsletter","Suscribir al boletín informativo" -"Subscribed to Newsletter?","¿Está suscrito al boletín informativo?" -"Suffix Dropdown Options","Opciones de la lista desplegable Sufijos" -"Tag Name","Nombre de la etiqueta" -"Tax Calculation Based On","Cálculo de impuestos en base a" -"Tax Class","Clase impositiva" -"Tax/VAT number","Número de IVA/impuestos" -"Telephone","Teléfono" -"Text","Texto" -"Text One Line","Texto (una línea)" -"Thank you for registering with %s.","Gracias por registrarse en %s." -"The Date of Birth is required.","Se requiere la fecha de nacimiento." -"The TAX/VAT number is required.","Se requiere el número de IVA." -"The VAT ID entered (%s) is not a valid VAT ID.","El ID de IVA introducido (%s) no es un ID de IVA válido." -"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","El ID de IVA introducido (%s) no es un ID de IVA válido. El cliente podría pertenecer al grupo de clientes %s." -"The VAT ID is valid. The current Customer Group will be used.","El ID de IVA no es válido. Se utilizará el Grupo de cliente actual." -"The account information has been saved.","Se guardó la información de la cuenta." -"The address does not belong to this customer.","La dirección no pertenece a este cliente." -"The address has been deleted.","Se eliminó la dirección." -"The address has been saved.","Se guardó la dirección." -"The customer ID and email did not match, skipping the record, line: %s","El ID de cliente y el correo electrónico no coinciden, saltando el registro, línea: %s" -"The customer does not have default billing address.","El cliente no tiene una dirección de facturación predeterminada." -"The customer email (%s) already exists, skipping the record, line: %s","La dirección de correo (%s) del cliente ya existe, saltando el registro, línea: %s" -"The customer group has been deleted.","Se eliminó el grupo de clientes." -"The customer group has been saved.","Se guardó el grupo de clientes." -"The customer is currently assigned to Customer Group %s.","El cliente está asignado actualmente al grupo de cliente %s." -"The first name cannot be empty.","El nombre no puede estar vacío." -"The group ""%s"" cannot be deleted","El grupo ""%s"" no se puede eliminar" -"The last name cannot be empty.","El apellido no puede estar vacío." -"The minimum password length is %s","La longitud mínima de la contraseña es de %s" -"The password cannot be empty.","La contraseña no puede estar vacía." -"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","La contraseña debe tener al menos 6 caracteres. Se ignorarán los espacios antes o después." -"The suffix that goes after name (Jr., Sr., etc.)","El sufijo que va después de nombre (padre, hijo, etc.)" -"The title that goes before name (Mr., Mrs., etc.)","El título que va antes del nombre (señor, señorita, etc.)" -"There are no items in customer's wishlist at the moment","En este momento no hay artículos en la lista de deseos del cliente." -"There are no items in customer\'s shopping cart at the moment","En este momento no hay artículos en el carrito de compras del cliente." -"There is already an account with this email address. If you are sure that it is your email address, click here to get your password and access your account.","Ya existe una cuenta con esta dirección de correo electrónico. Si está seguro de que esa es su dirección de correo electrónico, pulse aquí para conseguir su contraseña y acceder a su cuenta." -"There was an error validating the VAT ID.","Ha habido un error validando el ID de IVA." -"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","Ha habido un error validando el ID de IVA. El cliente podría pertenecer al grupo de cliente %s." -"This account is not confirmed.","Esta cuenta no está confirmada." -"This customer email already exists","Este correo electrónico de cliente ya existe" -"This customer has no saved addresses.","Este cliente no tiene direcciones guardadas." -"This email does not require confirmation.","Esta dirección de correo electrónico no necesita confirmación." -"This email will be sent instead of default welcome email, after account confirmation.","Se enviará este mensaje de correo electrónico en lugar del mensaje de bienvenida predeterminado, después de la confirmación de la cuenta." -"This is My Default %s Address","Esta es mi %s Dirección por Defecto" -"To Cart","Al carrito" -"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","Para mostrar el número del IVA en la parte delantera, configure la opción Mostrar número de IVA en la parte delantera a Sí." -"Total","Total" -"Type","Tipo" -"Unable to save the customer.","No se puede guardar el cliente." -"Unknown","Desconocido" -"Unsubscribe from Newsletter","Cancelar suscripción al boletín informativo" -"Update","Actualización" -"Update customer address data","Actualizar datos de dirección del cliente" -"Update customer data","Actualizar datos del cliente" -"Use as My Default %s Address","Utilizar como mi %s Dirección por Defecto" -"Use as My Default Billing Address","Utilizar como mi dirección de facturación por defecto" -"Use as My Default Shipping Address","Utilizar como mi dirección de envío por defecto" -"Use as my default billing address","Usar como mi dirección de facturación por defecto" -"Use as my default shipping address","Utilizar como mi dirección de envío por defecto" -"VAT Number","Número de IVA" -"VAT Request Date","Fecha de petición de IVA" -"VAT Request Identifier","Identificador de petición de IVA" -"Validate VAT Number","Validar número de IVA" -"Validate on Each Transaction","Validar en cada transacción" -"Validation Error Group","Grupo de error de validación" -"View","Ver" -"View Order","Ver Pedido" -"Visitor","Visitante" -"Visitors Only","Sólo para visitantes" -"Website","Sitio web" -"Welcome Email","Mensaje de correo electrónico de bienvenida" -"Wishlist","Lista de deseos" -"Wishlist - %d item(s)","Lista de deseos: %d artículos" -"Would you like to change the Customer Group for this order?","¿Quiere cambiar el grupo de cliente para este pedido?" -"Wrong confirmation key.","Clave de confirmación incorrecta." -"Wrong customer account specified.","Se especificó una cuenta de cliente incorrecta." -"Wrong email.","Dirección de correo electrónico incorrecta." -"Wrong transactional account email type","Tipo de correo electrónico de cuenta de transacciones equivocado" -"YYYY","AAAA" -"Year","Año" -"You are currently not subscribed to any newsletter.","Actualmente no estás suscrito a ningún boletín de noticias" -"You are currently not subscribed to our newsletter.","Actualmente no está suscrito a nuestro boletín informativo." -"You are currently subscribed to 'General Subscription'.","Actualmente estás suscrito a 'Suscripción General'." -"You are currently subscribed to our newsletter.","Actualmente estás suscrito a nuestro boletín de noticias" -"You are now logged out","Ha cerrado sesión." -"You have logged out and will be redirected to our homepage in 5 seconds.","Ha cerrado sesión y será redirigido a nuestra página principal en 5 segundos." -"You have no additional address entries in your address book.","No tienes anotaciones adicionales de dirección en tu libreta de direcciones." -"You have no additional entries in your address book.","No tiene más entradas en su libreta de direcciones." -"You have no default billing address in your address book.","No tienes ninguna dirección de facturación por defecto en tu libreta de direcciones." -"You have no default entries in your address book.","No tiene entradas predeterminadas en su libreta de direcciones." -"You have no default shipping address in your address book.","No tienes ninguna dirección de envío por defecto en tu libreta de direcciones." -"You have not set a default billing address.","No ha establecido una dirección de facturación predeterminada." -"You have not set a default shipping address.","No ha establecido una dirección de envío predeterminada." -"You have placed no orders yet.","Aún no ha hecho pedidos." -"You have placed no products yet.","Aún no ha ingresado productos." -"You will be charged tax.","Se le cargarán los impuestos." -"You will not be charged tax.","No se le cargarán los impuestos." -"Your Tax ID cannot be validated.","Su ID de impuestos no se ha podido validar." -"Your VAT ID was successfully validated.","Su ID de IVA se ha validado correctamente." -"Your account balance is: %s","El saldo de su cuenta es: %s" -"ZIP","Código postal" -"ZIP/Post Code","Código postal" -"Zip/Postal Code","Código Postal" -"n/a","n/d" -"or","o bien" -"register","registro" diff --git a/app/locale/es_ES/Mage_Dataflow.csv b/app/locale/es_ES/Mage_Dataflow.csv deleted file mode 100644 index a0cefe26b..000000000 --- a/app/locale/es_ES/Mage_Dataflow.csv +++ /dev/null @@ -1,32 +0,0 @@ -"Link","Link" -"Actions XML is not valid.","Las acciones XML no son válidas." -"An error occurred while opening file: ""%s"".","Se ha producido un error mientras se abría el archivo: ""%s""." -"Could not load file: ""%s"".","No se ha podido cargar el archivo: ""%s""." -"Could not save file: %s.","No se pudo guardar el archivo: %s." -"Declared adapter %s was not found.","El adaptador declarado %s no se ha encontrado." -"Destination folder ""%s"" is not a directory.","La carpeta de destino ""%s"" no es un directorio." -"Destination folder ""%s"" is not writable.","No se puede escribir en la carpeta de destino ""%s""." -"Done","Hecho" -"Dry run set, stopping execution.","Error en la ejecución, finalizando." -"ETA: %s","ETA: %s" -"Error in field mapping: field list for mapping is not defined.","Error en la asignación de campos: la lista de campos para la asignación no está definida." -"File ""%s"" does not exist.","El archivo ""%s"" no existe." -"Found %d rows.","Se encontraron %d filas." -"Less than a minute","Menos de un minuto" -"Loaded successfully: ""%s"".","Se ha cargado correctamente: ""%s""." -"Memory Used: %s","Memoria en uso: %s" -"Method ""%s"" not defined in adapter %s.","El método ""%s"" no está definido en el adaptador %s." -"Method ""%s"" was not defined in adapter %s.","No se ha definido el método ""%s"" en el adaptador %s." -"Please declare ""adapter"" and ""method"" nodes first.","Por favor, primero declare los nodos ""adaptador"" y ""método""." -"Processed records: %s","Registros procesados: %s" -"Profile with the same name already exists.","El perfil con el mismo nombre ya existe." -"Saved successfully: ""%s"" [%d byte(s)].","Se ha guardado correctamente: ""%s"" [%d byte(s)]." -"Sheet 1","Página 1" -"Skip undefined row.","Saltar fila indefinida." -"Starting %s :: %s","Inicio %s :: %s" -"The destination folder ""%s"" does not exist or there is no access to create it.","La carpeta de destino ""%s"" no existe o no se puede crear." -"Total records: %s","Registros totales: %s" -"hour","hora" -"hours","horas" -"minute","minuto" -"minutes","minutos" diff --git a/app/locale/es_ES/Mage_Directory.csv b/app/locale/es_ES/Mage_Directory.csv deleted file mode 100644 index bfb911d3a..000000000 --- a/app/locale/es_ES/Mage_Directory.csv +++ /dev/null @@ -1,49 +0,0 @@ -"-- Please select --","-- Por favor seleccione --" -"Allowed Currencies","Divisas permitidas" -"Base Currency","Divisa base" -"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","La divisa base se utiliza en todas las transacciones de pago en línea. El alcance queda definido por el alcance del precio del catálogo ((""Catálogo"" > ""Precio"" > ""Alcance del Precio del Catálogo"")." -"Can\'t convert rate from ""%s-%s"".","No se puede convertir la tarifa de ""%s-%s""." -"Cannot retrieve rate from %s.","No se puede obtener el tipo de cambio de %s." -"Connection Timeout in Seconds","Plazo de expiración de la conexión en segundos" -"Continue »","Seguir >" -"Country","País" -"Country API","API de país" -"Country and Format Type combination should be unique","La combinación de tipo de formato y país debe ser única" -"Currency","Divisa" -"Currency Options","Opciones de divisas" -"Currency Setup","Configuración de divisas" -"Currency Update Warnings","Avisos de actualización de divisas" -"Default Display Currency","Divisa para mostrar por omisión" -"Directory","Directorio" -"Display not required State","Mostrar Estado no necesario" -"Enabled","Habilitado" -"Error Email Recipient","Error en el destinatario del mensaje" -"Error Email Sender","Error en el remitente del mensaje" -"Error Email Template","Error en la plantilla del mensaje" -"FATAL ERROR:","ERROR FATAL:" -"Frequency","Frecuencia" -"Installed Currencies","Divisas instaladas" -"Invalid Import Service specified.","Ha indicado un servicio de importación incorrecto." -"Invalid country code: %s","Código de divisa incorrecto: %s" -"Invalid rates received","Se han recibido tipos de cambio incorrectos" -"Invalid target currency.","Divisa final incorrecta." -"List of countries","Lista de países" -"List of regions in specified country","Lista de regiones del país indicado" -"Postal Code is Optional for the following countries","El código postal es opcional para los países siguientes" -"Region","Región" -"Region API","API de región" -"Scheduled Import Settings","Configuración de la importación programada" -"Select Your Currency","Elija su divisa" -"Service","Servicio" -"Start Time","Tiempo de inicio." -"State is required for","Se necesita el Estado para" -"State/Province","Estado/Provincia" -"States Options","Opciones de Estados" -"Strikeiron Email Update Warnings","Avisos de actualización de correo electrónico Strikeiron" -"Unable to initialize the import model.","No se puede inicializar el modelo de importación" -"Undefined rate from ""%s-%s"".","Tipo de cambio de ""%s-%s"" sin definir." -"WARNING:","AVISO:" -"Webservicex","Webservicex" -"Your Currency","Su moneda" -"Your Currency:","Su moneda:" -"Your current currency is: %s","Su divisa actual es: %s" diff --git a/app/locale/es_ES/Mage_Downloadable.csv b/app/locale/es_ES/Mage_Downloadable.csv deleted file mode 100644 index b69684869..000000000 --- a/app/locale/es_ES/Mage_Downloadable.csv +++ /dev/null @@ -1,95 +0,0 @@ -"Add","Añadir" -"Add New Row","Agregar nueva fila" -"Add links and samples to downloadable product","Añadir enlaces y muestras al producto de descarga" -"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.","Se recomiendan los caracteres alfanuméricos, guión y guión bajo para los nombres de fichero. Los caracteres incorrectos se reemplazarán con '_'." -"An error occurred while getting the requested content.","Ocurrió un error mientras se recibía el contenido solicitado." -"An error occurred while getting the requested content. Please contact the store owner.","Ocurrió un error mientras se recibía el contenido solicitado. Por favor, póngase en contacto con el propietario de la tienda." -"An error occurred while saving the file(s).","Ocurrió un error mientras se guardaba(n) el(los) fichero(s)." -"Availability:","Disponibilidad:" -"Back","Volver" -"Canceled","Cancelado" -"Cannot connect to remote host, error: %s.","No se puede conectar con el servidor remoto, error: %s." -"Catalog Product View (Downloadable)","Vista de los Productos en Catálogo (Descargable)" -"Category API","Categoría API" -"Customer My Account Downloadable Items","Cliente Mi Cuenta Artículos Descargables" -"Date","Fecha" -"Default Link Title","Título de Enlace por Defecto" -"Default Maximum Number of Downloads","Número Máximo de Descargas por Defecto" -"Default Sample Title","Título de Muestra por Defecto" -"Delete","Eliminar" -"Disable Guest Checkout if Cart Contains Downloadable Items","Inutilizar la Facturación del Cliente si el Carrito Contiene Artículos Descargables" -"Downloadable Information","Información Descargable" -"Downloadable Product","Producto Descargable" -"Downloadable Product Options","Opciones de Producto Descargable" -"Downloadable Product Section","Sección de producto de descarga" -"Edit","Editar" -"Edit item parameters","Editar parámetros del artículo" -"Excl. Tax","Impuestos no incluidos" -"File","Fichero" -"From:","Desde:" -"Gift Message","Mensaje de Regalo" -"Go to My Downloadable Products","Vaya a Mis productos descargables" -"Guest checkout will only work with shareable.","La facturación de cliente sólo funcionará si se puede compartir" -"In stock","En stock" -"Incl. Tax","Impuestos incluidos" -"Invalid download URL host.","Servidor de URL de descarga no válido." -"Invalid download URL scheme.","Esquema de URL de descarga no válido." -"Invalid download link type.","Tipo de enlace de descarga no válido." -"Invoiced","Facturado" -"Links can be purchased separately","Los enlaces pueden adquirirse por separado" -"List","Lista" -"Max. Downloads","Máximo de Descargas" -"Message:","Mensaje:" -"Move","Mover" -"Move to wishlist","Mover a favoritos" -"My Downloadable Products","Mis Productos Descargables" -"Open Links in New Window","Abrir Enlaces en una Nueva Ventana" -"Order #","Número de pedido" -"Order Item Status to Enable Downloads","Pedir Situación del Artículo para Permitir las Descargas" -"Order id cannot be null","El ID del pedido no puede ser nulo" -"Order item id cannot be null","El ID del artículo del pedido no puede ser nulo" -"Ordered","Pedido" -"Out of stock","Agotado" -"Pending","Pendiente" -"Please log in to download your product or purchase %s.","Por favor, acceda a su cuenta para descargar su producto o compra %s." -"Please log in to download your product.","Por favor, entre en el sistema para descargar su producto." -"Please set resource file and link type.","Por favor, asigne el fichero de recurso y el tipo de enlace." -"Please specify product link(s).","Por favor, especifique el(los) enlace(s) de producto." -"Price","Precio" -"Product downloadable links","Enlaces de descarga de productos" -"Qty","Cantidad" -"Refunded","Reembolsado" -"Remaining Downloads","Descargas Pendientes" -"Remove","Borrar" -"Remove Item","Eliminar Artículo" -"Remove links and samples from downloadable product","Eliminar los enlaces y las muestras del producto de descarga" -"Requested link does not exist.","El enlace solicitado no existe." -"Retrieve links and samples list from downloadable product","Recupere la lista de enlaces y muestras del producto de descarga" -"SKU","Número de referencia" -"Sample","muestra" -"See price before order confirmation.","Ver precio antes de la confirmación del pedido." -"Shareable","Se puede compartir" -"Shipped","Enviado" -"Sorry, there was an error getting requested content. Please contact the store owner.","Lo sentimos, ha habido un error al acceder al contenido solicitado. Por favor, contacte con el propietario de la tienda." -"Sort Order","Ordenar Pedido" -"Start Download","Comenzar la Descarga" -"Status","Estado" -"Subtotal","Total" -"The file does not exist.","El fichero no existe" -"The link has expired.","El enlace ha caducado." -"The link is not available.","En enlace no está disponible." -"There are files that were selected but not uploaded yet. Please upload or remove them first","Hay archivos que se han seleccionado pero aún no se han subido. Por favor, súbalos o elimínelos primero" -"Title","Título" -"To:","A:" -"U","U" -"Unlimited","Ilimitado" -"Update","Actualizar" -"Use Content-Disposition","Utilizar Contenido-Disposición" -"Use Default Value","Usar Valor por Defecto" -"View Order","Ver Pedido" -"What's this?","¿Qué es esto?" -"You have not purchased any downloadable products yet.","Todavía no ha adquirido ningún producto descargable." -"attachment","documento adjunto" -"download","descarga" -"inline","en línea" -"sample","muestra" diff --git a/app/locale/es_ES/Mage_Eav.csv b/app/locale/es_ES/Mage_Eav.csv deleted file mode 100644 index 24d0efd40..000000000 --- a/app/locale/es_ES/Mage_Eav.csv +++ /dev/null @@ -1,124 +0,0 @@ -"""%s"" contains not only digit characters.","""%s"" no solo contiene dígitos." -"""%s"" does not fit the entered date format.","""%s"" no se ajusta al formato de fecha introducido." -"""%s"" exceeds the allowed file size.","""%s"" supera el tamaño de archivo permitido." -"""%s"" exceeds the allowed length.","""%s"" excede la extensión permitida." -"""%s"" has not only alphabetic and digit characters.","""%s"" no solo contiene letras y dígitos." -"""%s"" has not only alphabetic characters.","""%s"" no solo contiene letras." -"""%s"" height exceeds allowed value of %s px.","""%s"" excede la altura permitida para el valor de %s px." -"""%s"" invalid type entered.","""%s"" introducido inválido." -"""%s"" is a required value.","""%s"" es un valor necesario." -"""%s"" is an empty string.","""%s"" es una cadena vacía." -"""%s"" is not a valid URL.","""%s"" no es un URL válido." -"""%s"" is not a valid date.","""%s"" no es una fecha válida." -"""%s"" is not a valid email address.","""%s"" no es una dirección de e-mail válida." -"""%s"" is not a valid file","""%s"" no es un archivo válido" -"""%s"" is not a valid file extension.","""%s"" no es una extensión de archivo válida." -"""%s"" is not a valid file.","""%s"" no es un archivo válido." -"""%s"" is not a valid hostname.","""%s"" no es un servidor válido." -"""%s"" is not a valid image format","""%s"" no es un formato de imagen válido" -"""%s"" length must be equal or greater than %s characters.","La longitud de ""%"" debe ser igual o mayor a los caracteres de %." -"""%s"" length must be equal or less than %s characters.","La longitud de ""%"" debe ser igual o menor a los caracteres de %." -"""%s"" width exceeds allowed value of %s px.","""%s"" el ancho excede el valor permitido de %s px." -"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' parece ser un servidor DNS pero no puede extraer la parte TLD" -"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' parece ser un servidor DNS pero no puede hacer coincidir en TLD con la lista" -"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' parece ser un servidor DNS pero no puede hacer coincidir el esquema del servidor con el TLD '%tld%'" -"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' parece ser un servidor DNS pero contiene un guión en una posición inválida" -"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","%value%' parece ser un nombre de servidor DNS pero no se puede descifrar la notación del Punycode introducido" -"'%value%' appears to be a local network name but local network names are not allowed","'%value%' parece ser un nombre de red local pero no se permiten los nombres de redes locales" -"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' parece ser una dirección IP, pero no se permiten direcciones IP" -"'%value%' does not appear to be a valid URI hostname","'%value%' no parece ser un nombre de servidor URI válido" -"'%value%' does not appear to be a valid local network name","'%value%' no parece ser un nombre válido de red local" -"'%value%' does not match the expected structure for a DNS hostname","'%value%' no concuerda con la estructura prevista de un nombre de servidor DNS" -"A joint field with this alias (%s) is already declared","Ya se ha declarado un campo conjunto con este alias (%s)" -"Add Option","Agregar opción" -"An error occurred while loading a record, aborting. Error: %s","Se produjo un error al cargar un registro. Se anulará la operación. Error: %s" -"An error occurred while loading the collection, aborting. Error: %s","Se produjo un error al cargar la recopilación. Se anulará la operación. Error: %s" -"An error occurred while saving a record, aborting. Error: ","Se produjo un error al guardar un registro. Se anulará la operación. Error: %s" -"Attempt to add an invalid object","Intento de añadir un objeto inválido" -"Attribute '%s' used in configurable products","Campo ""%s"" utilizado en productos configurables" -"Attribute Code","Código de atributo" -"Attribute Label","Etiqueta de atributo" -"Attribute Properties","Propiedades de atributo" -"Attribute object is undefined","Objeto de campo indefinido" -"Attribute set with the ""%s"" name already exists.","El atributo fijado con el nombre ""%s"" ya existe." -"Attribute with the same code","Atributo con el mismo código" -"Can\'t create table: %s","No se puede crear la tabla: %s" -"Catalog Input Type for Store Owner","Tipo de entrada de catálogo para el dueño de la tienda" -"Current module EAV entity is undefined","Entidad de módulo EAV actual indefinida" -"Current module pathname is undefined","Módulo URL actual indefinido" -"Data integrity: No header row found for attribute","Integridad de datos: No se ha encontrado una línea de encabezamiento para el campo" -"Date","Fecha" -"Decimal Number","Número decimal" -"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","Listado de productos predeterminados clasificados por no existe en Listado de productos disponibles clasificados por." -"Default Value","Valor predeterminado" -"Default option value is not defined","Valor automático indefinido" -"Delete","Eliminar" -"Dropdown","Desplegar" -"Email","Correo electrónico" -"Entity collection expected.","Se espera una recopilación de entidades." -"Entity collections expected.","Se esperan recopilaciones de entidades." -"Entity instance is not defined","Contenido de la entidad indefinido" -"Entity is not initialized","Entidad no iniciada" -"Entity object is undefined","Objeto de entidad indefinido" -"Failed to load node %s from config","Fallo al cargar el nodo %s de la configuración" -"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","Para uso interno. Debe ser único, sin espacios. La longitud máxima del código de atributo debe ser menor que los símbolos %s" -"Form Element with the same attribute","Formar elemento con el mismo atributo" -"Form Fieldset with the same code","Formar conjunto de campos con el mismo código" -"Form Type with the same code","Formar tipo con el mismo código" -"Form code is not defined","Código indefinido" -"Frontend label is not defined","Etiqueta inicial indefinida" -"Input Validation for Store Owner","Validación de entrada para el dueño de la tienda" -"Integer Number","Número entero" -"Invalid EAV attribute.","Atributo de EAV no válido." -"Invalid alias, already exists in joint attributes","Alias no válido, ya existe en campos conjuntos" -"Invalid attribute name: %s","Nombre de campo no válido: %s" -"Invalid attribute requested: %s","Se solicitó un atributo no válido: %s" -"Invalid attribute type","Tipo de campo no válido" -"Invalid character encountered in increment ID: %s","Se encontró un caracter no válido en el ID de incremento: %s" -"Invalid date","Fecha no válida" -"Invalid default date","Fecha por defecto no válida" -"Invalid default decimal value","Valor decimal por defecto no válido" -"Invalid entity specified","Se especificó una entidad no válida" -"Invalid entity supplied.","Se suministró una entidad no válida." -"Invalid entity supplied: %s","Entidad indicada no válida: %s" -"Invalid entity type","Tipo de entidad no válido" -"Invalid entity_id, skipping the record.","entity_id no válido. Se omitirá el registro." -"Invalid entity_type specified: %s","Se especificó un entity_type no válido: %s" -"Invalid foreign key","Clave externa no válida" -"Invalid form type.","Tipo de forma no válido." -"Invalid joint fields","Campos de la joint no válidos" -"Invalid store specified","Se especificó una tienda no válida" -"Invalid type given. String expected","Tipo incorrecto introducido. Se esperaba una cadena" -"Joined field with this alias is already declared","Ya se ha declarado un campo de join con este alias" -"Joint field or attribute expression with this alias is already declared","Ya se ha declarado un campo de join o una expresión de atributos con este alias" -"Letters","Letras" -"Letters (a-z, A-Z) or Numbers (0-9)","Letras (a-z, A-Z) o números (0-9)" -"Loaded %d records","Se cargaron %d registros" -"Maximum length of attribute code must be less then %s symbols","La longitud máxima del código de atributo tiene que ser menor de %s símbolos" -"Multiple Select","Elección múltiple" -"No","No" -"No options found in config node %s","No se encontraron opciones en el nodo de configuración %s" -"None","Nada" -"Not shared with other products","No se comparte con otros productos" -"Problem loading the collection, aborting. Error: %s","Se produjo un problema al cargar la recopilación. Se anulará la operación. Error: %s" -"Problem saving the collection, aborting. Error: %s","Se produjo un problema al guardar la recopilación. Se anulará la operación. Error: %s" -"Required","Obligatorio" -"Saved %d record(s).","Se guardaron %d registros." -"Source model ""%s"" not found for attribute ""%s""","No se ha encontrado el modelo fuente ""%s"" para el atributo ""%s""" -"System","Sistema" -"Text Area","Área de Texto" -"Text Field","Campo de Texto" -"The value of attribute ""%s"" must be unique","El valor del atributo ""%s"" tiene que ser único" -"The value of attribute ""%s"" must be unique.","El valor del atributo ""%s"" tiene que ser único." -"This attribute is used in configurable products","Este atributo se utiliza en productos configurables" -"URL","URL" -"Unique Value","Valor único" -"Unique Value (not shared with other products)","Valor único (no se comparte con otros productos)" -"Unknown parameter","Parámetro desconocido" -"Values Required","Valores obligatorios" -"Wrong attribute group ID","ID de grupo de atributos no válido" -"Wrong attribute set ID","ID de conjunto de atributos no válido" -"Wrong entity ID","ID de entidad no válido" -"Wrong type definition for %s","Definición de tipo no válida para %s" -"Yes","Sí" -"Yes/No","Si/No" diff --git a/app/locale/es_ES/Mage_GiftMessage.csv b/app/locale/es_ES/Mage_GiftMessage.csv deleted file mode 100644 index 8a05da44a..000000000 --- a/app/locale/es_ES/Mage_GiftMessage.csv +++ /dev/null @@ -1,38 +0,0 @@ -"Add","Agregar" -"Add gift message for shopping cart","Añadir mensaje de regalo para el carro de la compra" -"Add gift messages for quote item of shopping cart","Añadir mensajes de regalo para artículo presupuestado del carro de la compra" -"Add gift messages to products of shopping cart","Añadir mensajes de regalo a productos del carro de la compra" -"Add gift options","Añadir opciones de regalo" -"Add gift options for Individual Items","Añadir opciones de regalo para artículos individuales" -"Add gift options for the Entire Order","Añadir opciones de regalo para todo el pedido" -"Add gift options.","Añadir opciones de regalo." -"Allow Gift Messages for Order Items","Permitir mensajes de regalo en artículos del pedido" -"Allow Gift Messages on Order Level","Permitir mensajes de regalo en el nivel del pedido" -"An error occurred while saving the gift message.","Se ha producido un error al grabar el mensaje del regalo." -"Are you sure?","¿Está seguro?" -"Cancel","Cancelar" -"Do you have any gift items in your order?","¿Tiene artículos de regalo en su pedido?" -"Edit","Editar" -"From","De" -"Gift Message","Mensaje regalo" -"Gift Message API","API de mensaje de regalo" -"Gift Options","Opciones de regalo" -"Gift Options for","Opciones de regalo para" -"Gift Options for Individual Items","Opciones de regalo para artículos individuales" -"Gift Options for the Entire Order.","Opciones de regalo para todo el pedido." -"Gift Options for this address.","Opciones de regalo para esta dirección." -"Item %d of %d","Artículo %d de %d" -"Message","Mensaje" -"No","No" -"OK","Aceptar" -"Save Gift Message","Grabar el mensaje de regalo" -"The gift message has been removed","Se ha borrado el mensaje de regalo" -"The gift message has been saved","Se ha grabado el mensaje de regalo" -"The gift message has been saved.","Se ha grabado el mensaje de regalo." -"To","Para" -"Unknown entity type","Tipo de entidad desconocido" -"Use config","Usar config" -"Yes","Sí" -"You can leave this box blank if you do not wish to add a gift message for the item.","Puede dejar esta caja en blanco si no quiere añadir un mensaje de regalo para el artículo." -"You can leave this box blank if you do not wish to add a gift message for this address.","Puede dejar esta caja en blanco si no quiere añadir un mensaje de regalo para esta dirección." -"You can leave this box blank if you do not wish to add a gift message for whole order.","Puede dejar esta caja en blanco si no quiere añadir un mensaje de regalo para el pedido completo." diff --git a/app/locale/es_ES/Mage_GoogleAnalytics.csv b/app/locale/es_ES/Mage_GoogleAnalytics.csv deleted file mode 100644 index 5d46e83aa..000000000 --- a/app/locale/es_ES/Mage_GoogleAnalytics.csv +++ /dev/null @@ -1,5 +0,0 @@ -"Account Number","Número de cuenta" -"Enable","Habilitar" -"Enable IP anonymization","Habilitar anonimizacion de la IP" -"Google API","Google API" -"Google Analytics","Google Analytics" diff --git a/app/locale/es_ES/Mage_GoogleBase.csv b/app/locale/es_ES/Mage_GoogleBase.csv deleted file mode 100644 index e1a9292b1..000000000 --- a/app/locale/es_ES/Mage_GoogleBase.csv +++ /dev/null @@ -1,78 +0,0 @@ -"Active","Activo" -"Add Attribute Mapping","Agregar asignación de atributo" -"Add New Attribute","Añadir Nuevo Atributo" -"Add to Google Base","Agregar a Google Base" -"Are you sure?","¿Está seguro?" -"Attribute","Atributo" -"Attribute Set","Conjunto de atributos" -"Attribute Set and Item Type","Conjunto de atributos y tipo de artículo" -"Attributes","Atributos" -"Attributes Mapping","Asignación de atributos" -"Attributes Set","Conjunto de atributos" -"AuthSub","AuthSub" -"Available Products","Productos disponibles" -"Base Currency should be set to %s for %s in system configuration. Otherwise item prices won't be correct in Google Base.","La divisa base debe definirse como %s para %s en la configuración del sistema. De lo contrario, los precios del artículo no serán correctos en Google Base." -"Cannot update Google Base Item for Store '%s'","No se puede actualizar el artículo Google Base para la tienda '%s'" -"Captcha confirmation error: %s","Error de confirmación de Captcha: %s" -"Captcha has been confirmed.","Se confirmó Captcha." -"Catalog","Catálogo" -"Clicks","Clicks" -"ClientLogin","Inicio de sesión del cliente" -"Confirm","Confirmar" -"Current Mapping will be reloaded. Continue?","Se volverá a cargar la asignación actual. ¿Desea continuar?" -"Custom attribute, no mapping","Atributo personalizado, sin asignación" -"Delete","Eliminar" -"Delete Mapping","Eliminar asignación" -"Edit Item Type","Editar tipo de artículo" -"Edit Item Type ""%s""","Editar tipo de artículo ""%s""" -"Error: %s","Error: %s" -"Expires","Vencimiento" -"Google","Google" -"Google Base","Google Base" -"Google Base Attribute","Atributo de Google Base" -"Google Base ID","ID de Google Base" -"Google Base Item Type","Tipo de artículo de Google Base" -"Google Base Item type","Tipo de artículo de Google Base" -"Google Base Items","Elementos de Google Base" -"Google base","Google Base" -"Hide","Ocultar" -"Hosted","Alojado" -"Hosted or Google","Alojado o de Google" -"Impr.","Impr." -"Invalid Product Model for Google Base Item","Modelo de producto no válido para artículo de Google Base" -"Item Type was deleted","Se eliminó el tipo de artículo" -"Item Types","Tipos de artículo" -"Item model is not specified to delete Google Base entry.","En el modelo de artículo no se especifica la eliminación de la entrada de Google Base." -"Items","Artículos." -"Manage Attribute Mapping","Administrar asignación de atributos" -"Manage Attributes","Administrar atributos" -"Manage Items","Gestionar Artículos" -"New Item Type","Nuevo tipo de artículo" -"New ItemType","Nuevo tipo de artículo" -"No","No" -"No items were deleted from Google Base","No se eliminaron artículos de Google Base" -"No items were published","No se publicaron artículos" -"No items were saved as inactive items","No se guardaron artículos como artículos inactivos" -"No products were added to Google Base","No se agregaron artículos a Google Base" -"Object model is not specified to save Google Base entry.","En el modelo de objeto no se especifica guardar la entrada de Google Base." -"Please, select Attribute Set and Google Item Type to load attributes","Seleccione Conjunto de atributos y Tipo de artículo de Google para cargar los atributos" -"Product Name","Nombre de Producto" -"Publish","Publique" -"Published","Publicado" -"Remove","Eliminar" -"Save Mapping","Guardar asignación" -"Session expired during export. Please revise exported products and repeat the process if necessary.","La sesión caducó durante la exportación. Controle los productos exportados y repita el proceso si es necesario." -"Synchronize","Sincronizar" -"Target Country","País de destino" -"The item type has been saved.","Se guardó el tipo de artículo" -"This action will update items statistics and remove the items which are not available in Google Base. Continue?","Esta acción actualizará las estadísticas de los artículos y eliminará los que no estén disponibles en Google Base. ¿Desea continuar?" -"Total of %d items(s) have been deleted; total of %d items(s) have been updated.","Se eliminó un total de %d artículos y se actualizó un total de %d artículos." -"Total of %d items(s) have been published.","Se publicó un total de %d artículos." -"Total of %d items(s) have been removed from Google Base.","Se eliminó un total de %d artículos de Google Base." -"Total of %d items(s) have been saved as inactive items.","Se guardó un total de %d artículos como artículos inactivos." -"Total of %d product(s) have been added to Google Base.","Se agregó un total de %d productos a Google Base." -"Unable to connect to Google Base. Please, check Account settings in configuration.","No se puede establecer conexión con Google Base. Controle la configuración de su cuenta en el área correspondiente." -"Unable to select a Store View.","No se puede seleccionar una vista de tienda." -"View Available Products","Ver productos disponibles" -"View Item in Google Base","Ver artículo en Google Base" -"Yes","Sí" diff --git a/app/locale/es_ES/Mage_GoogleCheckout.csv b/app/locale/es_ES/Mage_GoogleCheckout.csv deleted file mode 100644 index ad96d988f..000000000 --- a/app/locale/es_ES/Mage_GoogleCheckout.csv +++ /dev/null @@ -1,131 +0,0 @@ -"* Select shipping method","* Seleccionar método de transporte" -"2Day","Hoy" -"2nd Day Air","Segundo día por avión" -"2nd Day Air AM","2º Día A.M. por Aire" -"3 Day Select","3 días laborables" -"
    Warning: %s
    ","
    Atención: %s
    " -"Warning! This option disables the merchant calculated shipping. With this option, Google API ignores any attempt to affect shipping prices.","¡Atención! Esta opción deshabilita el calculo de los costes de envío y transporte. Con esta opción, el API de Google ignora cualquier intento de influir en los precios de envío." -"A virtual item to reflect the discount total","Un artículo virtual para reflejar el descuento total" -"A virtual item to reflect the tax total","Un artículo virtual para reflejar el total de impuestos" -"AVS Status: %s","Estado AVS: %s" -"Add Shipping Method","Añadir método de transporte" -"Allowed Methods","Métodos permitidos" -"Amount: %s","Cantidad: %s" -"Auto-generated from GoogleCheckout Charge","Generado automáticamente del cargo de Google Checkout" -"Buyer Account Age: %s days","La cuenta del comprador se creó hace: %s días" -"CC Partial: xxxx-%s","N° parcial de la TC: xxxx-%s" -"CID Status: %s","Estado de la Id. de confirmación: %s" -"Carrier Calculated Methods","Métodos calculados del proveedor" -"Cart Discount","Descuento del carro" -"Checkout Image Style","Estilo de la imagen de salida" -"Commercial","Comercial" -"Continue Shopping URL","Dirección URL para continuar comprando" -"Credit memo has been created automatically","La nota de crédito se ha creado de forma automática" -"Debug","Depurar" -"Default Package Height (in)","Altura por defecto del paquete (pulg.)" -"Default Package Length (in)","Largo por defecto del paquete (pulg.)" -"Default Package Width (in)","Ancho por defecto del paquete (pulg.)" -"Default Price for Methods","Precio por defecto para métodos" -"Default price:","Precio por defecto:" -"Delivery Address Category","Categoría de direcciones de entrega" -"Delivery Schedule","Horario de entrega" -"Description-based delivery","Descripción basada en la entrega" -"Disable Default Tax Tables","Desactivas tablas de impuestos por defecto" -"Discount Tax","Descontar impuestos" -"Eligible for Protection: %s","Apto para protección: %s" -"Email delivery","Envío de correo electrónico" -"Enable","Habilitar" -"Enable Carrier Calculated","Activar proveedor calculado" -"Enable Digital Delivery","Activar entrega digital" -"Enable Flat Rate","Activar tasa única" -"Enable Merchant Calculated","Activar comerciante calculado" -"Enable this if your checkout request is too big and being cut off.","Active esta opción si su solicitud para pasar por caja es demasiado grande y se está llegando al límite." -"Expiration: %s","Caducidad: %s" -"Express Mail","Correo urgente" -"Express Saver","Express Saver" -"FedEx","FedEx" -"Financial: %s -> %s","Financiero: %s -> %s" -"First Overnight","Primera Noche de Estancia" -"Free Shipping","Transporte gratuito" -"Fulfillment: %s -> %s","Cumplimiento: %s -> %s" -"Google API","Google API" -"Google Authorization:","Autorización de Google:" -"Google Buyer ID: %s","ID de Google del comprador: %s" -"Google Charge:","Cargo de Google:" -"Google Chargeback:","Devoluciones de cargo de Google:" -"Google Checkout","Google Checkout" -"Google Checkout Shipping - Carrier Calculated","Transporte y proveedor de Google Checkout calculado" -"Google Checkout Shipping - Digital Delivery","Transporte y entrega digital de Google Checkout" -"Google Checkout Shipping - Flat Rate","Transporte y tasa única de Google Checkout" -"Google Checkout Shipping - Merchant Calculated","Transporte y comerciante calculado de Google Ckeckout" -"Google Checkout: %s","Google Checkout: %s" -"Google Order Number: %s","Número de pedido de Google: %s" -"Google Order Status Change:","Cambio de estado del pedido de Google:" -"Google Refund:","Reembolso de Google:" -"Google Risk Information:","Información de riesgo de Google:" -"GoogleCheckout is not configured","GoogleCheckout no está configurado" -"Ground","Por tierra" -"Hide Cart Contents","Ocultar contenido del carro" -"Home Delivery","Entrega a domicilio" -"IP Address: %s","Dirección IP: %s" -"If enabled, cart contents will be hidden after clicking on the Google Checkout button in the shopping cart, and restored if ""Edit Cart"" link was activated.","Si está activado, los contenidos del carro se ocultarán tras hacer clic en el botón de caja de Google situado en el carro de compra, y se restaurarán si se activa el enlace ""Editar carro""." -"Inches","Centímetros" -"Invoice Auto-Created: %s","Factura creada automáticamente: %s" -"Is Buyer Willing to Receive Marketing Emails: %s","¿Desea el comprador recibir correos-e comerciales?: %s" -"Key/URL delivery","Clave/URL de entrega" -"Large - %s","Amplio - %s" -"Latest Charge: %s","Último cargo: %s" -"Latest Chargeback: %s","Últimas devoluciones de cargo: %s" -"Latest Refund: %s","Último reembolso: %s" -"Location","Localidad" -"Media Mail","Correo Media" -"Medium - %s","Medio - %s" -"Merchant ID","Id. del comerciante" -"Merchant Key","Clave de Comerciante" -"Method","Método" -"New Order Status","Nuevo estado de pedido" -"Next Day Air","Siguiente día por avión" -"Next Day Air Early AM","Siguiente día en avión a primera hora de la mañana" -"Next Day Air Saver","Ahorro siguiente día por avión" -"No","No" -"No Comment","Sin comentarios" -"No Reason","Sin razón" -"Optimistic","Optimista" -"Optional, leave empty for home page.","Opcional, déjese en blanco para página de inicio." -"Order creation error","Error al crear la orden" -"Parcel Post","Servicio de Paquetes Postales" -"Pessimistic","Pesimista" -"Priority Mail","Correo Prioritario" -"Priority Overnight","Prioritario al Día Siguiente" -"Rate 1 Amount","Tarifa 1 Cantidad" -"Rate 1 Ship To Applicable Countries","Tarifa 1 Transportar a los países pertinentes" -"Rate 1 Ship to Specific Countries","Tarifa 1 Transportar a países específicos" -"Rate 1 Title","Tarifa 1 Título" -"Rate 2 Amount","Tarifa 2 Cantidad" -"Rate 2 Ship To Applicable Countries","Tarifa 2 Transportar a los países pertinentes" -"Rate 2 Ship to Specific Countries","Tarifa 2 envíos a países específicos" -"Rate 2 Title","Tarifa 2 Título" -"Rate 3 Amount","Tarifa 3 cantidad" -"Rate 3 Ship To Applicable Countries","Tarifa 3 Transportar a los países pertinentes" -"Rate 3 Ship to Specific Countries","Tarifa 3 Transportar a países específicos" -"Rate 3 Title","Tarifa 3 título" -"Required for live Google Checkout transactions. Make sure that this option corresponds to Use Secure URLs in Frontend (""Web"" > ""Secure"").","Se necesita para transacciones en directo de Google Checkout. Asegúrese de que esta opción se corresponde con direcciones URL seguras en frontal (""Página web"" > ""Segura"")." -"Residential","Residencial" -"Sandbox","Recinto" -"Secure Callback URL","URL de devolución de llamada segura" -"Small - %s","Pequeño - %s" -"Standard Overnight","Siguiente mañana estándar" -"The tax amount has been applied based on the information received from Google Checkout, because tax amount received from Google Checkout is different from the calculated tax amount","El importe del impuesto se ha aplicado basándose en la información recibida de Google Checkout, porque la cantidad de impuestos indicada por Google Checkout es diferente del importe del impuesto calculado." -"Title","Título" -"Total Chargeback: %s","Total de Devolución: %s" -"Total Charged: %s","Cargo total: %s" -"Total Refunded: %s","Total reembolsado: %s" -"Transparent","Transparente" -"UPS","UPS" -"USPS","USPS" -"United Kingdom","Reino Unido" -"United States","Estados Unidos" -"Unknown Reason","Razón desconocida" -"White Background","Fondo blanco" -"Yes","Sí" -"You will be redirected to GoogleCheckout in a few seconds.","Volverá a Google Checkout en unos segundos." diff --git a/app/locale/es_ES/Mage_ImportExport.csv b/app/locale/es_ES/Mage_ImportExport.csv deleted file mode 100644 index 6fc1efd30..000000000 --- a/app/locale/es_ES/Mage_ImportExport.csv +++ /dev/null @@ -1,93 +0,0 @@ -"%s file does not exists or is not readable","El archivo %s no existe o no es legible" -"-- Please Select --","-- Por favor seleccione --" -"Adapter must be an instance of Mage_ImportExport_Model_Import_Adapter_Abstract","El adaptador debe ser una instancia de Mage_ImportExport_Model_Import_Adapter_Abstract" -"Adapter object must be an instance of %s","El objeto adaptador debe ser un ejemplo de %s" -"Adapter type must be a non empty string","El tipo de adaptador debe ser una cadena no vacía" -"Append Complex Data","Adjuntar Datos Complejos" -"Attribute Code","Código de Atributo" -"Attribute Label","Etiqueta de Atributo" -"Attribute does not has options, so filtering is impossible","El atributo no tiene opciones, por lo que el filtrado es imposible" -"Begin data validation","Inicie la validación de los datos." -"Begin export of %s","Comenzar la exportación de %s" -"Begin import of ""%s"" with ""%s"" behavior","Comenzar la importación de ""%s"" con comportamiento ""%s""" -"CSV","CSV" -"Can not determine attribute filter type","No se puede determinar el tipo de filtro de atributos" -"Can not find required columns: %s","No se pueden encontrar las columnas solicitadas: %s" -"Cannot get autoincrement value","No se puede obtener un incremento automático del valor" -"Check Data","Verificar los datos" -"Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d","Filas revisadas: %d, entidades revisadas: %d, filas inválidas: %d, errores totales: %d" -"Column names have duplicates","Los nombres de columna tienen duplicados" -"Column names is empty or is not an array","Nombres de columna está vacío o no es una matriz" -"Column names: ""%s"" are invalid","Nombres de comlumna: ""%s"" no son válidos" -"Customers","Clientes" -"Data is invalid or file is not uploaded","Los datos son incorrectos o el archivo no está cargado" -"Delete Entities","Borrar Entidades" -"Destination directory is not writable","No se puede escribir en el directorio de destino" -"Destination file is not writable","No se puede escribir en el archivo de destino" -"Destination file path must be a string","La ruta del archivo de destino debe ser una cadena" -"Done import data validation","Validación de los datos de importación completada" -"Duplicate Unique Attribute for '%s'","Atributo único duplicado para '%s'" -"Entity Type","Tipo de Entidad" -"Entity adapter obejct must be an instance of Mage_ImportExport_Model_Export_Entity_Abstract","El objeto adaptador de la entidad debe ser una copia virtual de Mage_ImportExport_Model_Export_Entity_Abstract" -"Entity adapter object must be an instance of Mage_ImportExport_Model_Import_Entity_Abstract","El objeto de adaptador de entidad debe ser una instancia de Mage_ImportExport_Model_Import_Entity_Abstract" -"Entity is unknown","Entidad desconocida" -"Entity type model must be an instance of Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract","El modelo de tipo de entidad debe ser una instancia de Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract" -"Entity type model must be an instance of Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract","El modelo de tipo de entidad debe ser una instancia de Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract" -"Error in data structure: behaviors are mixed","Error en la estructura de datos: hay conductas mezcladas" -"Error in data structure: entity codes are mixed","Error en la estructura de datos: hay códigos de entidad mezclados" -"Errors limit (%d) reached. Please fix errors and re-upload file","Límite de errores (%d) superado. Por favor, corrige los errores y vuelve a subir el archivo" -"Export","Exportar" -"Export File Format","Exportar el Formato de Archivo" -"Export Settings","Exportar la Configuración" -"Export has been done.","Se ha completado la exportación." -"Exported %s rows.","Se han exportado %s filas." -"File does not contain data.","El archivo no contiene datos." -"File does not contain data. Please upload another one","El archivo no contiene datos. Por favor cargue otro distinto" -"File format is unknown","Formato de archivo desconocido" -"File is partially valid, but import is not possible","El archivo es parcialmente válido, pero no es posible importar" -"File is totally invalid. Please fix errors and re-upload file","El archivo es totalmente inválido. Por favor corrija los errores y vuelva a cargar el archivo" -"File is valid! To start import process press ""Import"" button","El archivo no es correcto. Para empezar el proceso de importación pulse el botón ""Importar""" -"File is valid, but import is not possible","El archivo es válido, pero importar no es posible" -"File was not uploaded","No se ha cargado el archivo" -"Filter","Filtrar" -"From","Desde" -"Header column names already set","Nombres de los encabezados de las columnas ya fijados" -"Import","Importar" -"Import Behavior","Importar Comportamiento" -"Import Settings","Importar configuración" -"Import has been done successfuly.","Se ha completado correctamente la importación." -"Import successfully done.","Importación realizada con éxito." -"Import/Export","Importar/Exportar" -"Input entity code is not equal to entity adapter code","El código de la entidad de entrada no es igual al código adaptador de la entidad" -"Invalid entity","Entidad no válida" -"Invalid entity model","Modelo de entidad inválido" -"Invalid file format","Formato de archivo no válido" -"Invalid parameters","Parámetros no válidos" -"Invalid seek position","Posición de búsqueda no válida" -"Invalid value for '%s'","Valor inválido para '%s'" -"Invalid value for '%s' column","Valor inválido para la columna '% s'" -"No filter data provided","No se han proporcionado filtros de datos" -"No source specified","Ninguna fuente especificada" -"No valid data sent","Los datos enviados no son válidos" -"No writer specified","Ningún escritor especificado" -"Node does not has model token tag","El nodo no tiene una etiqueta de señal modelo" -"Not implemented yet","Aún no implementado" -"Please fix errors and re-upload file","Por favor, corrija los errores y vuelva a cargar el archivo" -"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Solucione los errores y vuelva a cargar el archivo, o pulse el botón ""Importar"" para omitir las filas con errores" -"Products","Productos" -"Replace Existing Complex Data","Reemplazar Datos Complejos Existentes" -"Select File to Import","Seleccione Archivo para Importar" -"Skip","Omitir" -"Source file moving failed","Fallo al mover el archivo de origen" -"Source file path must be a string","La ruta del archivo de origen debe ser una cadena" -"Source is not set","No se ha definido el origen" -"Status","Progreso" -"There are no product types available for export","No hay tipos de productos disponibles para la exportación" -"There is no data for export","No hay datos para exportar." -"To","A" -"Total size of uploadable files must not exceed %s","El tamaño total de los archivos a cargar no puede exceder %s" -"Unknown attribute filter type","Tipo de filtro de atributo desconocido" -"Uploaded file has no extension","El archivo cargado no tiene extensión" -"Validation finished successfully","La validación ha acabado correctamente." -"in rows","en filas" -"in rows:","en filas:" diff --git a/app/locale/es_ES/Mage_Index.csv b/app/locale/es_ES/Mage_Index.csv deleted file mode 100644 index 62d3c6b31..000000000 --- a/app/locale/es_ES/Mage_Index.csv +++ /dev/null @@ -1,47 +0,0 @@ -"%s Index process is working now. Please try run this process later.","Se esta haciendo el proceso de indexeado en estos momentos. Por favor intente ealizar este proceso más tarde." -"%s index was rebuilt.","Porcentaje indexeado fue reconstruido" -"'%s' Index Process Information","Información del proceso de indexación" -"Action","Acción" -"Cannot initialize the indexer process.","No se puede iniciar el proceso de indexación" -"Change Index Mode","Cambiar la modalidad de indexación" -"Click here to go to Cache Management and refresh cache types.","Haga clic aquí para ir a Administración de caché y actualizar los tipos de caché." -"Click here to go to Index Management and rebuild required indexes.","Haga clic aquí para ir a Administración de índices y reconstruir los índices necesarios." -"Delete","Eliminar" -"Description","Descripción" -"Disable","Desactivar" -"Enable","Habilitar" -"General","General" -"Index","Indice" -"Index Description","Descripción del indice" -"Index Management","Gestión de Índices" -"Index Mode","Modalidad de indice" -"Index Name","Nombre de indice" -"Index mode","Modo de índice" -"Indexer code is not defined.","Codigo de indexeado no especificado" -"Indexer model is not defined.","Modelo de indexeado no definido" -"Indexer model should extend Mage_Index_Model_Indexer_Abstract.","Modelo de indexeado debería extender Mage_Index_Model_Indexer_Abstract." -"Manual Update","Actualización manual" -"Mode","Modalidad" -"Never","Nunca" -"No","No" -"One or more of the Indexes are not up to date:","Uno o mas índices no estan actualizados" -"Please select Index(es)","Por favor seleccione indice(s)" -"Please select Indexes","Por favor seleccione indices" -"Process Information","Información de proceso" -"Processing","Procesando" -"Ready","Listo" -"Refresh","Actualizar" -"Reindex Data","Volver a indexear los datos" -"Reindex Required","Volver a indexear requerido" -"Revoke","Revocar" -"Status","Estado" -"System","Sistema" -"The index has been saved.","El indice se ha guardado" -"There was a problem with reindexing process.","Hubo un problema con el proceso de indexear de nuevo" -"There was a problem with saving process.","Hubo un problema mientras se guardaba" -"Total of %d index(es) have changed index mode.","El porcentage del total de los indices ha cambiado el modelo de indexeado." -"Total of %d index(es) have reindexed data.","El porcentage del total de los indices ha vuelto a indexear los datos" -"Update Required","Es necesaria la actualización." -"Update on Save","actualización guardada" -"Updated At","Actualizado En" -"Yes","Sí" diff --git a/app/locale/es_ES/Mage_Install.csv b/app/locale/es_ES/Mage_Install.csv deleted file mode 100644 index 524d31276..000000000 --- a/app/locale/es_ES/Mage_Install.csv +++ /dev/null @@ -1,125 +0,0 @@ -"(Make sure you keep it in a safe place.)","(Asegúrese de guardarlo en un lugar seguro.)" -"(Optional. Leave blank for no prefix)","(Opcional. Déjelo en blanco si no desea agregar un prefijo.)" -"(ver. %s)","(ver. %s)" -"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","Ruta adicional que se agrega después de la dirección URL básica para tener acceso al Panel de Administración (por ejemplo, administración, área técnica, control, etc.)." -"Admin Path","Ruta de administración" -"After successfull installation please click the button below.","Después de realizar correctamente la instalación, haga clic en el siguiente botón." -"All packages were installed, click 'OK' to continue with installation.","Se instalaron todos los paquetes. Haga clic en 'Aceptar' para continuar con la instalación." -"Alternatively you could try the 'Manual Downloads and Upgrades' method.","De forma alternativa, puede intentar utilizar el método 'Descargas y actualizaciones manuales'." -"Base URL","Dirección URL básica" -"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Antes de continuar con su tienda, tome nota de su clave de cifrado (Magento la utiliza para cifrar las contraseñas, las tarjetas de crédito y más)." -"Check out our","Descubra nuestro" -"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Marque esta casilla sólo si no es posible validar automáticamente las direcciones URL seguras, por ejemplo, si se necesita autenticación HTTP." -"Check this box only if it is not possible to automatically validate the Base URL.","Marque esta casilla sólo si no es posible validar automáticamente la dirección URL básica." -"Choose this if you would like to test frontend and backend functionality.","Elija esta opción si desea probar el funcionamiento de la interfaz del cliente y el área de administración." -"Configuration","Configuración" -"Confirm Password","Confirma Contraseña" -"Connection","Conexión" -"Continue","Continuar" -"Continue After Manual Download","Continuar después de la descarga manual" -"Continue Full Download / SVN Installation","Continuar la descarga completa/instalación de SVN" -"Create Admin Account","Crear cuenta de administración" -"Currently this is the most stable state available for Magento packages.","Actualmente éste es el estado más estable disponible para los paquetes de Magento." -"Database","Base de datos" -"Database Connection","Conexión a la base de datos" -"Database Name","Nombre de la base de datos" -"Database Name cannot be empty.","El nombre de la base de datos no puede estar vacío." -"Database Type","Tipo de base de datos" -"Database connection error.","Error de conexión de la base de datos." -"Database host","Host de base de datos" -"Database server does not support the InnoDB storage engine.","El servidor de la base de datos no es compatible el motor de almacenamiento InnoDB." -"Database user name","Nombre de usuario de la base de datos" -"Database user password","Contraseña de usuario de la base de datos" -"Default Currency","Moneda predeterminada" -"Download","Descargar" -"Download Magento Core Modules and Updates","Descargar los módulos básicos y las actualizaciones de Magento" -"Downloading and installing Magento, please wait...","Descargando e instalando Magento. Espere, por favor." -"Email","Correo electrónico" -"Email Address","Dirección de email" -"Enable Charts","Activar gráficos" -"Enable this option if you want the charts to be displayed on Dashboard.","Active esta opción si desea mostrar los cuadros en el Panel de Control." -"Enable this option only if you have SSL available.","Active esta opción sólo si tiene SSL disponible." -"Encryption Key","Clave de cifrado" -"File System","Sistema de archivos" -"First Name","Nombre" -"Full Download / SVN Installation","Descarga completa/instalación de SVN" -"Get ready to experience Open-Source eCommerce Evolved.","Prepárese para descubrir la evolución del comercio electrónico de código abierto." -"Go to Backend","Ir al área de administración" -"Go to Frontend","Ir a la interfaz del cliente" -"Having trouble installing Magento?","¿Tiene problemas con la instalación de Magento?" -"Help Us to Keep Magento Healthy","Ayúdenos a que Magento siga funcionando correctamente" -"Host","Host" -"I agree to the above terms and conditions.","Estoy de acuerdo con los términos y las condiciones que se establecen más arriba." -"If you are a developer and would like to have the latest public updates, choose this option.","Si es desarrollador y desea recibir las actualizaciones públicas más reciente, elija esta opción." -"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Si ejecuta PHP como CGI, sus procesos de PHP pueden ejecutarse con el mismo usuario que utilizó al cargar los archivos de Magento." -"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Si está ejecutando el asistente de instalación sobre una instalación de Magento descargada e instalada previamente, siga con este método." -"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Si no puede escribir en las carpetas de Magento para el proceso web, o no desea hacerlo, puede utilizar el ejecutable PEAR ubicado en la raíz de instalación de Magento." -"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","SI ha descargado el paquete completo o ha instalado Magento mediante SVN, debe omitir los pasos de instalación y validación de paquetes haciendo clic en el siguiente botón." -"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","SI desea administrar los paquetes de Magento mediante la interfaz de administración web, deberá aplicar permisos de escritura web a todas las carpetas y todos los archivos de Magento." -"If your server is running on MS Windows, most probably you will not need to change anything.","Si el servidor se ejecuta en MS Windows, es probable que no necesite hacer cambios." -"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","En otros casos, deberá establecer permiso de escritura en los archivos de Magento para el usuario bajo el cual se ejecute el proceso del servidor web." -"Installation","Instalación" -"Installation Guide","Guía de instalación" -"Installer does not exist for %s database type","No existe instalador para el tipo de base de datos %s" -"Last Name","Apellido" -"License Agreement","Acuerdo de licencia" -"Locale","Configuración regional" -"Locale settings","Configuración local" -"Localization","Localización" -"Login Information","Información de registro" -"Magento","Magento" -"Magento Connect Manager Deployment","Implementación del administrador de conexión de Magento" -"Magento Installation Wizard","Asistente de instalación de Magento" -"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento es una marca registrada de Magento Inc. Copyright © %s Magento Inc." -"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento usa esta clave para encriptar contraseñas, tarjetas de crédito y más. Si este campo se deja vacío, el sistema creará una clave cifrada para usted y se mostrará en la siguiente página." -"Manual Downloads and Upgrades","Descargas manuales y actualizaciones" -"No resource for %s DB model.","Ningún recurso para el modelo %s DB." -"One of PHP Extensions ""%s"" must be loaded.","Una de las extensiones PHP ""%s"" tiene que cargarse." -"PHP Extension '%s' loaded","Extensión PHP '%s' cargada" -"PHP Extensions ""%s"" must be loaded.","Se deben cargar las extensiones PHP ""%s""." -"PHP extension ""%s"" must be loaded.","La extensión PHP ""%s"" tiene que cargarse." -"Package Management through the Web","Administración de paquetes a través de la web" -"Password","Contraseña" -"Password Confirmation","Confirmación de contraseña" -"Path ""%s"" must be writable.","La ruta""%s"" tiene que poder escribirse." -"Personal Information","Información Personal" -"Please correct the user data and try again.","Por favor corrija los datos del usuario e inténtelo de nuevo." -"Please make sure that mod_rewrite is enabled in Apache configuration.","Por favor asegúrese de que mod_rewrite está activado en la configuración de Apache." -"Please note that it is much less stable than beta.","Por favor tenga en cuenta que es mucho menos estable que beta." -"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","Por favor tenga en cuenta que sólo extensiones UNIX, Linux y Mac OX X son soportadas actualmente. Para Windows use la opción '%s'" -"Please set all required settings before clicking Continue","Por favor establezca todas las configuraciones requeridas antes de hacer click en continuar" -"Preferred stability: %s","estabilidad preferida: %s" -"Proceed With Automatic Download (%s)","Proceda con descarga automática (%s)" -"Provide a complete base URL for SSL connection. For example: %s","Proporcione una completa URL base para conexión SSL. Por ejemplo: %s" -"Report All Bugs","Informar de todos los errores" -"Required Fields","Campos obligatorios" -"Response from server isn\'t valid.","La respuesta del servidor no es válida." -"Run admin interface with SSL","Ejecutar la interfaz de administración con SSL" -"Run this in your shell from Magento root folder:","Ejecute esto en su sistema desde la carpeta raíz de Magento:" -"Save Session Data In","Guardar datos de sesión en" -"Save Session Files In","Guardar archivos de sesión en" -"Secure Base URL","URL base segura" -"Session Storage Options","Opciones de almacenaje de sesión" -"Setting preferred state to: %s","Configurar estado preferido a: %s" -"Skip Base URL Validation Before the Next Step","Saltar validación de URL base antes del próximo paso" -"Skip Secure URL validation before next step","Saltar validación de URL segura antes del próximo paso" -"Tables Prefix","Prefijo de tablas" -"The URL ""%s"" is invalid.","El URL ""%s"" no es válido." -"The URL ""%s"" is not accessible.","No se puede acceder al URL ""%s""." -"The database server version doesn\'t match system requirements (required: %s, actual: %s).","La versión del servidor de la base de datos no se adecua a los requisitos del sistema (requeridos: %s, existentes: %s)." -"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","El prefijo de tabla solo debe contener letras (a-z), números (0-9) o el carácter de subrayado (_), el primer carácter debería ser una letra." -"There was a problem installing Magento packages. Please read the log, correct errors and try again.","Hubo un problema al instalar los paquetes de Magento. Por favor lea el registro, corrija los errores e inténtelo de nuevo." -"Time Zone","Zona Horaria" -"Use Secure URLs (SSL)","URLs segura (SSL) de usuario" -"Use Web Server (Apache) Rewrites","Use reescritura de servidor (Apache)" -"User Name","Nombre de Usuario" -"User Password","Contraseña de Usuario" -"Username","Nombre de usuario" -"Validation","Validación" -"Web access options","Opciones de acceso web" -"Welcome","Bienvenido" -"Welcome to Magento's Installation Wizard","Bienvenido al asistente de instalación de Magento" -"You can specify server port, ex.: localhost:3307
    If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","Puedes especificar el puerto de servidor, ej: localhost:3307
    Si no estás utilizando el socket UNIX predeterminado, puedes especificarlo aquí en vez del host, ej.: /var/run/mysqld/mysqld.sock" -"You could enable this option to use web server rewrites functionality for improved search engines optimization.","Usted puede activar esta opción para usar la función de reescritura del servidor para mejorar la optimización para motores de búsqueda." -"You're All Set","Usted está preparado" -"You're All Set!","Usted está preparado!" diff --git a/app/locale/es_ES/Mage_Log.csv b/app/locale/es_ES/Mage_Log.csv deleted file mode 100644 index b5cbd31a1..000000000 --- a/app/locale/es_ES/Mage_Log.csv +++ /dev/null @@ -1,9 +0,0 @@ -"Enable Log Cleaning","Activar limpieza de registros" -"Error Email Recipient","Error en el destinatario del mensaje" -"Error Email Sender","Error en el remitente del mensaje" -"Error Email Template","Error en la plantilla del mensaje" -"Frequency","Frecuencia" -"Log Cleaning","Limpieza de registros" -"Log cleanup Warnings","Advertencia de limpieza de registros" -"Save Log, Days","Guardar registro (días)" -"Start Time","Tiempo de inicio." diff --git a/app/locale/es_ES/Mage_Media.csv b/app/locale/es_ES/Mage_Media.csv deleted file mode 100644 index c779e04fa..000000000 --- a/app/locale/es_ES/Mage_Media.csv +++ /dev/null @@ -1,3 +0,0 @@ -"An error occurred while creating the image.","Se ha producido un error al crear la imagen." -"The image does not exist or is invalid.","La imagen no existe o no es válida." -"This content requires last version of Adobe Flash Player. Get Flash","Este contenido requiere la última versión de Adobe Flash Player. Obtener Flash" diff --git a/app/locale/es_ES/Mage_Newsletter.csv b/app/locale/es_ES/Mage_Newsletter.csv deleted file mode 100644 index b4ef7aafb..000000000 --- a/app/locale/es_ES/Mage_Newsletter.csv +++ /dev/null @@ -1,137 +0,0 @@ -" Copy","Copiar" -"Action","Acción" -"Add New Template","Agregar nueva plantilla" -"Add to Queue","Agregar a la cola" -"Allow Guest Subscription","Permitir suscripción de invitados" -"An error occurred while saving your subscription.","Se produjo un error al guardar su suscripción." -"Are you sure that you want to delete this template?","¿Está seguro de que quiere borrar esta plantilla?" -"Are you sure that you want to strip all tags?","¿Está seguro de que desea eliminar todas las etiquetas?" -"Back","Volver" -"Cancel","Cancelar" -"Cancelled","Cancelado" -"Cannot mark as received subscriber.","No se puede marcar como suscriptor recibido." -"Confirmation Email Sender","Remitente del correo electrónico de confirmación" -"Confirmation Email Template","Plantilla de correo electrónico de confimación" -"Confirmation request has been sent.","Se envió la solicitud de confirmación." -"Convert to Plain Text","Convertir a texto sin formato" -"Create Newsletter Template","Crear plantilla de boletín informativo" -"Customer","Cliente" -"Customer First Name","Nombre del cliente" -"Customer Last Name","Apellido del cliente" -"Customer My Account Newsletter Subscriptions","Suscripciones al boletín informativo Mi cuenta del cliente" -"Date Added","Añadido el día" -"Date Updated","Fecha de actualización" -"Delete","Eliminar" -"Delete Selected Problems","Eliminar problemas seleccionados" -"Delete Template","Eliminar plantilla" -"Do you really want to cancel the queue?","¿Realmente desea cancelar la cola?" -"Duplicate template code.","Código de plantilla duplicado." -"Edit Newsletter","Editar boletín informativo" -"Edit Newsletter Template","Editar plantilla de boletín informativo" -"Edit Queue","Editar cola" -"Edit Template","Editar plantilla" -"Email","Correo electrónico" -"Enter your email address","Introduce tu dirección de correo electrónico" -"Error Code","Código de error" -"Error Text","Texto de error" -"Follow this link to unsubscribe {{var subscriber.getUnsubscriptionLink()}}","Siga este enlace para anular su suscripción <!-- Esta etiqueta es para el enlace de anulación-->{{var subscriber.getUnsubscriptionLink()}}" -"Guest","Invitado" -"ID","ID" -"Invalid queue selected.","La cola seleccionada es inválida." -"Invalid subscription ID.","ID de suscripción no válido." -"Invalid subscription confirmation code.","Código de confirmación de suscripción inválido." -"Message","Mensaje" -"Need to Confirm","Debe Confirmar" -"New Newsletter Template","Plantilla de Boletín de Noticias Nueva" -"New Template","Nueva Plantilla" -"Newsletter","Boletín informativo" -"Newsletter Message Preview","Vista Previa del Mensaje del Boletín de Noticias" -"Newsletter Problem Reports","Informe de Problemas del Boletín de Noticias" -"Newsletter Queue","Cola de Boletín de Noticias" -"Newsletter Section","Sección del Boletín de Noticias" -"Newsletter Sign-up:","Inscripción en el boletín:" -"Newsletter Styles","Estilos del Boletín de Noticias" -"Newsletter Subscribers","Suscriptores de Boletín de Noticias" -"Newsletter Subscription","Suscripción al boletín de noticias" -"Newsletter Subscription Form Before","Formulario de suscripción al boletín antes" -"Newsletter Subscriptions","Suscripciones al Boletín de Noticias" -"Newsletter Templates","Plantillas de Boletín de Noticias" -"Newsletter subscription confirmation","Confirmación de suscripción al Boletín de Noticias" -"Newsletter subscription success","Suscripción al Boletín de Noticias finalizada con éxito" -"Newsletter unsubscription success","Cancelación de suscripción al Boletín de Noticias finalizada con éxito" -"No Templates Found","No se Encontraron Plantillas" -"No problems found.","No se Encontraron Problemas." -"No subscribers selected.","No se seleccionaron suscriptores." -"Not Activated","No Activado" -"Not Sent","No enviado" -"Pause","Pausa" -"Paused","En pausa" -"Please enter a valid email address.","Introduzca una dirección de correo electrónico válida." -"Please enter new template name","Introduzca un nombre de nueva plantilla" -"Please refer to exeption.log","Por favor vaya a exeption.log" -"Please select subscriber(s)","Seleccione suscriptor(es)" -"Preview","Vista Previa" -"Preview Template","Vista previa de plantilla" -"Processed","Procesado" -"Queue Date Start","Fecha de Inicio de la Cola" -"Queue Finish","Final de Cola" -"Queue Information","Información de Cola" -"Queue Newsletter...","Boletín de Noticias en Cola..." -"Queue Start","Inicio de Cola" -"Queue Subject","Asunto de Cola" -"Recipients","Destinatarios" -"Reset","Restablecer" -"Resume","Reanudar" -"Return HTML Version","Devolver Versión HTML" -"Save As","Guardar Como" -"Save Newsletter","Guardar Boletín de Noticias" -"Save Template","Guardar Plantilla" -"Save and Resume","Guardar y Reanudar" -"Selected problem subscribers have been unsubscribed.","Se ha cancelado la suscripción de los suscriptores con problemas." -"Selected problems have been deleted.","Se han borrado los problemas seleccionados." -"Sender","Remitente" -"Sender Email","E-mail del Remitente" -"Sender Name","Nombre del Remitente" -"Sending","Enviando" -"Sent","Enviada" -"Sign Up for Our Newsletter:","Suscríbase a Nuestro Boletín de Noticias:" -"Sign up for our newsletter","Suscríbase a nuestro boletín de noticias" -"Sorry, but administrator denied subscription for guests. Please register.","Lo sentimos pero el administrador denegó la suscripción para invitados. Por favor, register." -"Start","Comenzar" -"Status","Estado" -"Store","Tienda" -"Store View","Ver Tienda" -"Subject","Asunto" -"Submit","Enviar" -"Subscribe","Suscribirse" -"Subscribed","Suscrito" -"Subscriber","Suscriptor" -"Subscribers","Suscriptores" -"Subscribers From","Suscriptores De" -"Subscription Options","Opciones de Suscripción" -"Success Email Sender","Remitente de Correo Electrónico Finalizado con Éxito" -"Success Email Template","Plantilla de Correo Electrónico Finalizada con Éxito" -"Template Content","Contenido de la plantilla" -"Template Information","Información de la plantilla" -"Template Name","Nombre de Plantilla" -"Template Styles","Estilos de Plantilla" -"Template Subject","Tema de la plantilla" -"Template Type","Tipo de Plantilla" -"Thank you for your subscription.","Gracias por su suscripción." -"The subscription has been removed.","La suscripción ha sido eliminada." -"The subscription has been saved.","La suscripción se ha guardado." -"There was a problem with the subscription.","Hubo un problema con la suscripción." -"There was a problem with the subscription: %s","Hubo un problema con la suscripción: %s" -"There was a problem with the un-subscription.","Hubo un problema con la cancelación de la suscripción." -"This email address is already assigned to another user.","Esta dirección de correo ya se asignó a otro usuario." -"Type","Tipo" -"Unconfirmed","Sin confirmar" -"Unsubscribe","Cancelar suscripción" -"Unsubscribe Selected","Cancelar Suscripción Seleccionado" -"Unsubscribed","Suscripción cancelada" -"Unsubscription Email Sender","Remitente del Email de cancelación de suscripción" -"Unsubscription Email Template","Plantilla de Email de Cancelar Suscripción" -"View Newsletter","Ver boletín de noticias" -"Website","Sitio web" -"You have been unsubscribed.","Ha cancelado su subscripción." -"Your subscription has been confirmed.","Su suscripción ha sido confirmada." diff --git a/app/locale/es_ES/Mage_Oauth.csv b/app/locale/es_ES/Mage_Oauth.csv deleted file mode 100644 index b60348ceb..000000000 --- a/app/locale/es_ES/Mage_Oauth.csv +++ /dev/null @@ -1,118 +0,0 @@ -"%name% '%value%' is too long. It must has length %min% symbols.","%name% '%value%' es demasiado largo. Debe tener una longitud de %min% símbolos." -"%name% '%value%' is too short. It must has length %min% symbols.","%name% '%value%' es demasiado corto. Debe tener una longitud de %min% símbolos." -"* Required Fields","* Campos Requeridos" -"%s requests access to your account","%s solicitudes de acceso a tu cuenta" -"Admin","Administrar" -"After authorization application will have access to you account.","Después de la solicitud de autorización tendrás acceso a tu cuenta." -"An error occurred on confirm authorize.","Se produjo un error en la confirmación de autorización." -"An error occurred on delete action.","Se produjo un error en la acción de suprimido." -"An error occurred on delete application.","Se produjo un error al suprimir la aplicación." -"An error occurred on reject authorize.","Se produjo un error al rechazar la autorización." -"An error occurred on saving consumer data.","Se produjo un error al guardar la información del consumidor." -"An error occurred on update revoke status.","Se produjo un error al actualizar el estado de revocación." -"An error occurred while deleting the consumer.","Se produjo un error al suprimir el consumidor." -"An error occurred.","Se produjo un error." -"An error occurred. Your authorization request is invalid.","Se produjo un error. Tu solicitud de autorización no es válida." -"App Name","Nombre de la app" -"Application ""%s"" has been deleted.","La aplicación ""%s"" se ha suprimido." -"Application ""%s"" has been enabled.","La aplicación ""%s"" se ha habilitado." -"Application ""%s"" has been revoked.","La aplicación ""%s"" ha sido revocada." -"Application Name","Nombre de la aplicación" -"Application not found.","Aplicación no encontrada." -"Are you sure you want to delete this application?","¿Estás seguro de que quieres suprimir esta aplicación?" -"Are you sure you want to disable this application?","¿Estás seguro de que quieres deshabilitar esta aplicación?" -"Are you sure you want to enable this application?","¿Estás seguro de que quieres habilitar esta aplicación?" -"Authorization confirmed","Autorización confirmada" -"Authorization confirmed.","Autorización confirmada." -"Authorize","Autorizar" -"Authorize application","Autorizar aplicación" -"Authorized Tokens","Tokens autorizados" -"Callback URL","Llamada URL" -"Cleanup Probability","Probabilidad de limpieza" -"Cleanup Settings","Ajustes de limpieza" -"Close","Cerrar" -"Confirm OAuth token authorization","Confirmar autorización de token OAuth" -"Confirm token authorization Pop Up for admin","Confirmar símbolo de autorización Pop Up para administradores" -"Confirm token authorization for admin","Confirmar símbolo de autorización para administradores" -"Confirmation Of Authorization","Confirmación de autorización" -"Consumer Information","Información del cliente" -"Consumer Name","Nombre de cliente" -"Consumers","Consumidores" -"Created At","Creado en" -"Customer","Cliente" -"Customer My Account My OAuth Applications","Cliente Mi cuenta Mis Aplicaciones OAuth" -"Delete","Eliminar" -"Disable","Desactivar" -"Disabled","Deshabilitado" -"Edit","Editar" -"Edit Consumer","Editar cliente" -"Email","Correo electrónico" -"Email Address","Dirección de email" -"Enable","Habilitar" -"Enabled","Habilitado" -"Entry with ID #%s not found.","La entrada con Identificación #%s no se ha encontrado." -"Expiration Period","Periodo de expiración" -"Give the verifier code to application administrator","Proporcionar el código de verificación al administrador de la aplicación" -"ID","ID" -"Invalid Callback URL","Llamada URL inválida" -"Invalid ID parameter.","Parámetro de Identificación inválido." -"Invalid Rejected Callback URL","Llamada URL rechazada inválida" -"Invalid entry ID.","Entrada de Identificación inválida." -"Invalid revoke status.","Estado de revocación inválido." -"Key","Clave" -"Log In","Inicio de sesión" -"Log in as a customer","Iniciar sesión como cliente" -"Log in as admin","Iniciar sesión como administrador" -"Log in as customer","Iniciar sesión como cliente" -"Log in to use %s","Acceder para utilizar %s" -"Login","Iniciar sesión" -"My Applications","Mis aplicaciones" -"Name","Nombre" -"New Consumer","Nuevo Consumidor" -"OAuth","OAuth" -"OAuth Admin My Apps","Administrador OAuth Mis aplicaciones" -"OAuth Authorized Tokens","Tokens OAuth autorizados" -"OAuth Consumers","Consumidores de OAuth" -"OAuth authorization Pop Up for customer","Autorización OAuth emergente para el cliente" -"OAuth authorization for admin","Autorización de OAuth para administradores" -"OAuth authorization for customer","Autorización OAuth para el cliente" -"OAuth authorization simple for admin","Autorización simple de OAuth para administradores" -"Password","Contraseña" -"Permissions","Permisos" -"Please login to proceed authorization.","Inicia sesión para proceder con la autorización" -"Please select needed row(s).","Por favor, selecciona las fila(s) necesaria(s)." -"Please select revoke status.","Por favor, selecciona estado de revocación." -"REST - My Apps","REST - Mis aplicaciones" -"REST - OAuth Authorized Tokens","REST - Tokens OAuth autorizados" -"REST - OAuth Consumers","REST - Clientes OAuth" -"Reject","Rechazar" -"Reject OAuth token authorization","Rechazar autorización de token OAuth" -"Reject authorization","Rechazar autorización" -"Reject token authorization Pop Up for admin","Rechazar símbolo de autorización Pop Up para administradores" -"Reject token authorization for admin","Rechazar símbolo de autorización Pop Up" -"Rejected Callback URL","Llamada URL rechazada" -"Rejection Of Authorization","Rechazo de la autorización" -"Revoked","Revocada" -"Role Name","Nombre de la función" -"Save","Guardar" -"Save and Continue Edit","Guardar y continuar editando" -"Secret","Secreto" -"Selected entries enabled.","Entradas seleccionadas habilitadas." -"Selected entries has been deleted.","Las entradas seleccionadas han sido suprimidas." -"Selected entries revoked.","Entradas seleccionadas revocadas." -"Status","Estado" -"System","Sistema" -"The application access request is rejected.","La solicitud de acceso a la aplicación se ha rechazado." -"The consumer has been deleted.","El consumidor se ha suprimido." -"The consumer has been saved.","Se ha guardado el consumidor." -"Token Status Change","Cambio de estado de token" -"Token Status Change Email Template","Plantilla de correo electrónico de cambio de estado de token" -"Unable to find a consumer.","No se pudo encontrar un cliente." -"User ID","ID de Usuario" -"User Name","Nombre de Usuario" -"User Type","Tipo de usuario" -"Verifier code: %s","Código de verificación: %s" -"You have no applications.","No tienes aplicaciones." -"deleted","suprimida" -"enabled","habilitado" -"revoked","revocado" diff --git a/app/locale/es_ES/Mage_Page.csv b/app/locale/es_ES/Mage_Page.csv deleted file mode 100644 index 0553ce526..000000000 --- a/app/locale/es_ES/Mage_Page.csv +++ /dev/null @@ -1,82 +0,0 @@ -"%s Item(s)","%s artículo(s)" -"%s-%s of %s","%s-%s de %s" -"©","&copia; 2013 Magento Demo Store. All Rights Reserved." -"© 2012 Magento Demo Store. All Rights Reserved.","© Tienda de Demos de Magneto 2012. Reservados todos los derechos." -"© 2013 Magento Demo Store. All Rights Reserved.","© 2013 Magento Demo Store. All Rights Reserved." -"(Shift-)Click or drag to change value","Pulse (Shift-) o arrastre para modificar el valor" -"(ver. %s)","(ver. %s)" -"- Click on any of the time parts to increase it","- Pulse sobre cualquiera de los fragmentos de tiempo para aumentarlo" -"- Hold mouse button on any of the above buttons for faster selection.","- Mantenga pulsado el botón del ratón sobre cualquiera de los botones de arriba para obtener una selección más rápida." -"- Use the %s buttons to select month","- Utilice los botones %s para seleccionar el mes" -"- Use the %s, %s buttons to select year","- Utilice los botones %s, %s para seleccionar el año" -"- or Shift-click to decrease it","- o pulse Shift para disminuirlo" -"- or click and drag for faster selection.","- o pulse y arrastre para obtener una selección más rápida." -"-- Please Select --","-- Seleccionar, por favor --" -"1 column","1 columna" -"2 columns with left bar","2 columnas con barra a la izquierda" -"2 columns with right bar","2 columnas con barra a la derecha" -"3 columns","3 columnas" -"About the calendar","Sobre el calendario" -"Account","Cuenta" -"All Empty Layout Pages","Todas las páginas de diseño vacías" -"All One-Column Layout Pages","Todas las páginas de diseño con una columna" -"All Pages","Todas las páginas" -"All Pages (Print Version)","Todas las páginas (versión para imprimir)" -"All Three-Column Layout Pages","Todas las páginas de diseño con tres columnas" -"All Two-Column Layout Pages (Left Column)","Todas las páginas de diseño con dos columnas (columna a la izquierda)" -"All Two-Column Layout Pages (Right Column)","Todas las páginas de diseño con dos columnas (columna a la derecha)" -"Allow","Permitir" -"Breadcrumbs","Navegación" -"Click here if nothing has happened","Haga clic aquí si no ha ocurrido nada" -"Close","Cerrar" -"Close Window","Cerrar Ventana" -"DHTML Date/Time Selector","Selector de fecha/hora DHTML" -"Date selection:","Elección de la fecha:" -"Default Description","Descripción predeterminada" -"Default welcome msg!","¡Mensaje por defecto de bienvenida!" -"Display %s first","Mostrar %s primero" -"Distributed under GNU LGPL. See %s for details.","Distribuido según la LGPL de GNU. Para más información véase %s." -"Drag to move","Arrastrar para mover" -"Empty","Vacío(a)" -"For latest version visit: %s","Para la última versión, visitar: %s" -"Free Shipping on orders over 50$","Portes pagados para envíos de más de 50 dólares." -"Go Today","Ir a Hoy" -"Help Us to Keep Magento Healthy","Ayúdenos a que Magento siga funcionando correctamente" -"Interface Language","Idioma de interfaz" -"Items %s to %s of %s total","Elementos %s a %s de un total de %s" -"JavaScript seems to be disabled in your browser.","Puede que JavaScript esté deshabilitado en tu navegador." -"Left Column","Columna izquierda" -"Left Column First (shows above main column on smaller screens)","Columna izquierda primero (aparece sobre la columna principal en pantallas pequeñas)" -"Main Content Area","Área de contenido principal" -"Menu","Menú" -"Navigation Bar","Barra de navegación" -"Next","Siguiente" -"Next month (hold for menu)","Mes siguiente (mantenga presionado para ver menú)" -"Next year (hold for menu)","Año siguiente (mantenga presionado para ver menú)" -"Page Bottom","Parte inferior de la página" -"Page Footer","Pie de página" -"Page Header","Encabezado de página" -"Page Top","Parte superior de la página" -"Page:","Página:" -"Prev. month (hold for menu)","Mes anterior (mantenga presionado para ver el menú)" -"Prev. year (hold for menu)","Año anterior (mantenga presionado para ver el menú)" -"Previous","Anterior" -"Redirecting...","Redireccionando..." -"Report All Bugs","Informar de todos los errores" -"Results per page","Resultados por página" -"Right Column","Columna derecha" -"Search","Búsqueda" -"Select Store","Seleccionar tienda" -"Select Store:","Seleccionar tienda:" -"Select date","Seleccionar fecha" -"Show","Mostrar" -"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Esta es una tienda de demostración. Cualquier pedido realizado en esta tienda no será aceptado ni completado." -"This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our Privacy Policy page. To accept cookies from this site, please click the Allow button below.","Esta página necesita cookies para proporcionar todas sus características. Para más información sobre qué información se contiene en las cookies, por favor, visite nuestra Política de Privacidad. Para aceptar cookies de esta página, por favor, haga clic más abajo en el botón Permitir." -"Time selection:","Selección de tiempo:" -"Time:","Hora:" -"View All ","Ver todo" -"Welcome, %s!","¡Bienvenido, %s!" -"You must have JavaScript enabled in your browser to utilize the functionality of this website.","Tiene que activar el JavaScript del navegador para utilizar las funciones de este sitio web." -"Your Language","Su idioma" -"Your Language:","Su idioma:" -"per page","por página" diff --git a/app/locale/es_ES/Mage_PageCache.csv b/app/locale/es_ES/Mage_PageCache.csv deleted file mode 100644 index 80beb99a6..000000000 --- a/app/locale/es_ES/Mage_PageCache.csv +++ /dev/null @@ -1,12 +0,0 @@ -"An error occurred while clearing the external full page cache.","Ocurrió un error mientras se limpiaba la caché de página completa externa" -"Cookie Lifetime (seconds)","Duración de la Cookie (segundos)" -"Enable External Cache","Habilitar Caché Externa" -"External Cache Control","Control de Caché Externa" -"External Full Page Cache Settings","Configuración de la Caché de Página Completa Externa" -"External Page Cache","Caché de página externa" -"External full page cache.","Caché de página completa externa." -"Failed to load external cache control","Fallo al cargar el control de caché externa" -"Flush External Page Cache","Borrar Caché de Página Externa" -"If empty, default value will be used.","Si está vacío, se usará el valor por defecto." -"The external full page cache has been cleaned.","La caché de página completa externa se ha limpiado." -"Zend Full Page Cache","Caché de Página Completa Zend" diff --git a/app/locale/es_ES/Mage_Paygate.csv b/app/locale/es_ES/Mage_Paygate.csv deleted file mode 100644 index edcb0cf8a..000000000 --- a/app/locale/es_ES/Mage_Paygate.csv +++ /dev/null @@ -1,67 +0,0 @@ -"3D Secure","3D Secure" -"3D Secure Card Validation","Validación de Tarjeta 3D Secure" -"API Login ID","ID de inicio de sesión en API" -"Accepted Currency","Moneda aceptada" -"Allow Partial Authorization","Permitir Autorización Parcial" -"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","¿Está seguro de que desea cancelar su pago? Pinche en Aceptar para cancelar el pago y liberar la cantidad retenida. Pinche en ""Cancelar"" para introducir otra tarjeta de crédito y continuar con su pago." -"Authorize Only","Sólo autorizar" -"Authorize and Capture","Autorizar y capturar" -"Authorize.Net Transaction ID %s","Identificación de la Transacción %s Authorize.Net" -"Authorize.net","Authorize.net" -"Cancel","Cancelar" -"Centinel API URL","Centinel API URL" -"Credit Card Types","Tipos de tarjeta de crédito" -"Credit Card Verification","Verificación de tarjeta de crédito" -"Credit Card: xxxx-%s","Tarjeta de Crédito: xxxx-%s" -"Debug","Depurar" -"Email Customer","Enviar mensaje de correo electrónico al cliente" -"Enabled","Habilitado" -"Error in payment gateway.","Error en el proceso de pago." -"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","Las acciones de Gateway se han bloqueadas ya que gateway no puede completar una o varias transacciones. Por favor, inicie sesión manualmente en su cuenta Authorize.Net para resolver el/los problema/s." -"Gateway error: %s","Error de proceso: %s" -"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Al dejarlo en blanco, se utilizará un valor por defecto. Se puede proporcionar un URL personalizado por el acuerdo CardinalCommerce." -"Invalid amount for authorization.","Monto no válido para la autorización." -"Invalid amount for capture.","Cantidad para retención no válida." -"Invalid amount for partial authorization.","Cantidad de autorización parcial no válida." -"Invalid amount for refund.","Cantidad de reembolso no válida." -"Invalid split tenderId ID.","La identificación tenderId no se puede separar." -"Invalid transaction ID.","Indentificador de la operación incorrecto." -"Maximum Order Total","Total máximo de pedido" -"Merchant's Email","Correo electrónico del vendedor" -"Minimum Order Total","Total mínimo de pedido" -"New Order Status","Nuevo estado de pedido" -"Parent Authorize.Net transaction (ID %s) expired","La transacción principal de Authorize.Net (ID %s) ha caducado" -"Payment Action","Acción de pago" -"Payment authorization error.","Error de autorización de pago." -"Payment canceling error.","Error en el pago de cancelación." -"Payment capturing error.","Error en el pago de retención." -"Payment from Applicable Countries","Pago desde países aceptados" -"Payment from Specific Countries","Pago desde países específicos" -"Payment partial authorization error.","Error en el pago parcial de la autorización." -"Payment refunding error.","Error en el pago de reembolso." -"Payment updating error.","Error de actualización del pago." -"Payment voiding error.","Error en la anulación del pago." -"Processed Amount","Cantidad Procesada" -"Remaining Balance","Saldo Restante" -"Severe 3D Secure Card Validation","Validación de Tarjeta Severe 3D Secure" -"Severe Validation Removes Chargeback Liability on Merchant","La Validación Severe Suprime la Responsabilidad de Cancelación de Cargo del Comerciante" -"Shopping cart contents and/or address has been changed.","El contenido de la cesta de compra y/o la dirección han cambiado." -"Sort Order","Ordenar Pedido" -"Test Mode","Modo de prueba" -"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","No tiene suficiente dinero en su tarjeta de crédito para completar la compra. El dinero disponible ha sido retenido. Para completar la compra, pulse OK y especifique un número de tarjeta de crédito adicional. Para cancelar la compra y liberar el dinero retenido, pulse Cancelar." -"There was an error canceling transactions. Please contact us or try again later.","Ha habido un error en la cancelación de las transacciones. Por favor, póngase en contacto con nosotros o inténtelo más tarde de nuevo." -"Title","Título" -"Transaction Key","Clave de transacción" -"You have reached the maximum number of credit card allowed to be used for the payment.","Ha alcanzado el máximo permitido por su tarjeta de crédito para efectuar el pago." -"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","Ha alcanzado el número máximo de tarjetas de crédito que se pueden usar para un solo pago. El dinero disponible en todas las tarjetas usadas era insuficiente para completar el pago. El pago se ha cancelado y el dinero retenido se ha liberado." -"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","Su tarjeta de crédito se ha rechazado. Pulse OK para especificar otra tarjeta de crédito para completar la compra. Pulse Cancelar para liberar el dinero retenido y seleccionar otra forma de pago." -"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","Su orden no ha sido cursada, porque el contenido de la cesta de la compra y/o la dirección se han cambiado. El dinero autorizado en su pago previo, como adelanto, ahora lo tiene disponible. Por favor, revise el proceso de pago para su pedido reciente." -"Your payment has been cancelled. All authorized amounts have been released.","Su pago se ha cancelado. Dispone de todo el dinero que había avanzado." -"amount %s","dinero %s" -"authorize","autorizar" -"authorize and capture","autorizar y capturar" -"capture","capturar" -"failed","error" -"refund","reembolso" -"successful","exitoso" -"void","vacío" diff --git a/app/locale/es_ES/Mage_Payment.csv b/app/locale/es_ES/Mage_Payment.csv deleted file mode 100644 index 5f7ee1e10..000000000 --- a/app/locale/es_ES/Mage_Payment.csv +++ /dev/null @@ -1,142 +0,0 @@ -"%s %s cycle.","Ciclo %s %s." -"* Required Fields","*Información requerida" -"--Please Select--","--Seleccione--" -"3D Secure Card Validation","Validación segura 3D de tarjeta" -"3D Secure Credit Card Validation","Validación segura en 3D de la tarjeta de crédito" -" %s"," %s" -"A value is required for live mode. Refer to your CardinalCommerce agreement.","Se necesita un valor para el modo en vivo. Consulte el acuerdo de comercio cardinal." -"Allow Initial Fee Failure","Permitir fallo inicial en la suma" -"An internal reference ID is required to save the payment profile.","Se necesita una Id. de referencia interna para guardar el perfil de pago." -"Authorize action is not available.","La autorización no se encuentra disponible." -"Auto Bill on Next Cycle","Pasar la factura automáticamente en el próximo ciclo" -"Automatically Invoice All Items","Facturar automáticamente todos los artículos" -"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","Pasar automáticamente el saldo pendiente de la factura en el próximo ciclo de facturación (en caso de que se produzca un error en los pagos)." -"Bank Transfer Payment","Pago por transferencia bancaria" -"Billing Agreement status is not set.","No se ha establecido el estado del acuerdo de facturación." -"Billing Amount","Cantidad de facturación" -"Billing Frequency","Frecuencia de facturación" -"Billing Period","Período de facturación" -"Billing Period Unit","Unidad de período de facturación" -"Billing period unit is not defined or wrong.","La unidad del período de facturación no ha sido definida o no es correcta." -"Cannot retrieve the payment info model object.","No se puede recuperar el modelo con la información del pago." -"Cannot retrieve the payment information object instance.","No se puede encontrar la instancia del objeto de la información de pago." -"Cannot retrieve the payment method code.","No se puede encontrar el código del método de pago." -"Cannot retrieve the payment method model object.","No se puede recuperar el modelo del método de pago." -"Capture action is not available.","La captura no se encuentra disponible." -"Card Verification Number","Número de comprobación de la tarjeta" -"Cash On Delivery Payment","Pago contra reembolso" -"Centinel API URL","Dirección URL de Centinel API" -"Check / Money Order","Cheque / Orden de pago internacional" -"Credit Card Number","Número de la tarjeta de crédito" -"Credit Card Number: xxxx-%s","Número de Tarjeta de Crédito: xxxx-%s" -"Credit Card Type","Tipo de tarjeta de crédito" -"Credit Card Type: %s","Tipo de Tarjeta de Crédito: %s" -"Credit Card Types","Tipos de tarjeta de crédito" -"Credit card number mismatch with credit card type.","El número de la tarjeta de crédito no coincide con el típo de tarjeta." -"Credit card type is not allowed for this payment method.","Este tipo de tarjeta de crédito no está permitido para este método de pago." -"Currency","Divisa" -"Currency code is undefined.","El código de moneda no ha sido definido." -"Customer ID is not set.","No se ha establecido la Id. del cliente." -"Day","Día" -"Debug Mode","Modo Depuración" -"Enabled","Habilitado" -"Expiration Date","Fecha de Caducidad" -"Expiration Date: %s/%s","Fecha de caducidad: %s/%s" -"Full name of the person receiving the product or service paid for by the recurring payment.","Nombre completo de la persona que recibirá el producto o servicio pagado a través de la opción de pago recurrente." -"Incorrect credit card expiration date.","Fecha de caducidad de la tarjeta de crédito incorrecta" -"Initial Fee","Tarifa inicial" -"Initial non-recurring payment amount due immediately upon profile creation.","Pago no recurrente inicial debido inmediatamente después de la creación del perfil." -"Instructions","Instrucciones" -"Internal Reference ID","Id. de referencia interna" -"Invalid Credit Card Number","El número de tarjeta es inválido." -"Issue Number","Número de emisión" -"Make Check Payable to","Pagar el cheque a" -"Make Check payable to:","Pagar el cheque a:" -"Make Check payable to: %s","Pagar el cheque a: %s" -"Maximum Billing Cycles","Ciclos máximos de facturación" -"Maximum Order Total","Total máximo de pedido" -"Maximum Payment Failures","Fallos máximos de pago" -"Maximum Trial Billing Cycles","Ciclos de prueba máximos de facturación" -"Merchant ID","Identificación de Comerciante" -"Minimum Order Total","Total mínimo de pedido" -"Month","Mes" -"N/A","N/A" -"Name on Card","Nombre que aparece en la tarjeta" -"Name on the Card","Nombre de la tarjeta" -"Name on the Card: %s","Nombre en la Tarjeta: %s" -"New Order Status","Nuevo estado de pedido" -"Number of billing periods that make up one billing cycle.","Cantidad de períodos de facturación que componen un ciclo de facturación." -"Order action is not available.","La acción solicitada no está disponible." -"Overrides API URL that may be specified by a payment method.","Anula la dirección URL de API que puede especificarse en un método de pago." -"Password","Contraseña" -"Payment ID: %s","ID de pago: %s" -"Payment Method","Método de pago" -"Payment Methods","Métodos de pago" -"Payment Methods Section","Sección de métodos de pago" -"Payment Reference ID","ID de referencia de pago" -"Payment Services","Servicios de pago" -"Payment from Applicable Countries","Pago desde países aceptados" -"Payment from Specific Countries","Pago desde países específicos" -"Payment method code is not set.","No se estableció el código de método de pago." -"Payment method code is undefined.","No se definió el código de método de pago." -"Payment profile is invalid:\n%s","El perfil de pago no es válido:\n%s" -"Period frequency is wrong.","La frecuencia de período es incorrecta." -"Please enter a valid credit card verification number.","Por favor, introduzca el número de verificación de tarjeta válido." -"Processor ID","Nº identificación del procesador" -"Purchase Order","Orden de compra" -"Purchase Order Number","Número de la orden de compra" -"Purchase Order Number:","Número de la orden de compra:" -"Purchase Order Number: %s","Número de la orden de compra: %s" -"Recurring Profile Start Date","Fecha de Inicio del Perfil Repetitivo" -"Recurring profile start date has invalid format.","La fecha de inicio del perfil repetitivo tiene un formato no válido." -"Reference ID is not set.","No se estableció el ID de referencia." -"Refund action is not available.","Reembolso no disponible." -"Repeats %s time(s).","Se repite %s vez(veces)." -"Repeats until suspended or canceled.","Se repite hasta que se suspende o cancela" -"Request Card Security Code","Solicitar código de seguridad de la tarjeta de crédito" -"Saved CC","CC guardado" -"Schedule Description","Descripción de Programación" -"Schedule description must be not empty.","La descripción de programación no debe quedar vacía." -"Selected payment type is not allowed for billing country.","El tipo de pago seleccionado no está permitido para el país de facturación." -"Send Check to","Enviar Cheque a" -"Send Check to:","Enviar Cheque a:" -"Severe 3D Secure Card Validation","Validación estricta de tarjeta segura en 3D" -"Severe validation removes chargeback liability on merchant.","La validación estricta exime al comerciante de responsabilidad en caso de devoluciones de cargos" -"Shipping Amount","Importe del Envío" -"Short description of the recurring payment. By default equals to the product name.","Descripción corta del pago repetitivo. De forma predeterminada equivale al nombre del producto." -"Sort Order","Ordenar Pedido" -"Start Date","Fecha de Inicio" -"Start date has invalid format.","La fecha de inicio tiene un formato no válido." -"Start date is undefined.","La fecha de inicio no está definida." -"Subscriber Name","Nombre de Suscriptor" -"Switch/Solo/Maestro Issue Number","Número de expedición de Switch/Solo/Maestro" -"Switch/Solo/Maestro Only","Únicamente Switch/Solo/Maestro" -"Switch/Solo/Maestro Start Date","Fecha de Inicio de Switch/Solo/Maestro" -"Tax Amount","Importe de Impuestos" -"Test Mode","Modo de prueba" -"The date when billing for the profile begins.","La fecha de inicio de la facturación para el perfil" -"The number of billing cycles for payment period.","El número de ciclos de facturación por período de pago." -"The number of scheduled payments that can fail before the profile is automatically suspended.","El número de pagos programados que pueden fallar antes de que se suspenda automáticamente el perfil." -"The payment review action is unavailable.","La acción de revisión de pago no está disponible." -"The requested Payment Method is not available.","El Método de Pago solicitado no está disponible." -"Title","Título" -"Trial Billing Amount","Importe de Facturación de Prueba" -"Trial Billing Frequency","Frecuencia de Facturación de Prueba" -"Trial Billing Period Unit","Unidad del Período de Facturación de Prueba" -"Trial Period","Período de Prueba" -"Trial billing amount is wrong.","El importe de facturación de prueba es incorrecto." -"Trial billing period unit is wrong.","La unidad del período de facturación de prueba es incorrecta." -"Trial period frequency is wrong.","La frecuencia del período de prueba es incorrecta." -"Trial period max cycles is wrong.","Los ciclos máximos del período de prueba son incorrectos." -"Two Weeks","Dos Semanas" -"Unable to save Billing Agreement:","No se puede guardar el Contrato de Facturación:" -"Unit for billing during the subscription period.","Unidad de facturación durante el período de suscripción." -"Unsupported currency code: %s.","Código de divisa no compatible: %s." -"Void action is not available.","La anulación no se encuentra disponible." -"Week","Semana" -"What is this?","¿Qué es esto?" -"Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.","Opción de suspender el perfil de pago si falla el pago inicial o de agregarlo al saldo pendiente." -"Wrong %s specified.","Se especificó un/a %s incorrecto/a." -"Wrong or empty billing amount specified.","Se especificó un importe de facturación incorrecto o vacío." -"Year","Año" -"Zero Subtotal Checkout","El Subtotal de la Caja es Cero" diff --git a/app/locale/es_ES/Mage_Paypal.csv b/app/locale/es_ES/Mage_Paypal.csv deleted file mode 100644 index a8e9d1b81..000000000 --- a/app/locale/es_ES/Mage_Paypal.csv +++ /dev/null @@ -1,623 +0,0 @@ -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -"-OR-","-O-" -"120 x 240","120 x 240" -"120 x 600","120 x 600" -"120 x 90","120 x 90" -"190 x 100","190 x 100" -"2-pixel perimeter around the header space.","Perímetro de 2 píxeles alrededor del espacio de cabera." -"234 x 400","234 x 400" -"234 x 60","234 x 60" -"250 x 250","250 x 250" -"300 x 50","300 x 50" -"3D Secure","3D Seguro" -"3D Secure Card Validation","Validación segura 3D de tarjeta" -"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at http://www.paypal.com/amexupdate.","Para tarjetas Maestro se requiere validación 3D Secure. Para aceptar tarjetas American Express se requiere un acuerdo adicional. Obtenga más información en http://www.paypal.com/amexupdate." -"468 x 60","468 x 60" -"728 x 90","728 x 90" -"800 x 66","800 x 66" -"Start accepting payments via PayPal!","¡Empiece a aceptar pagos a través de PayPal!" -"A case that has been resolved and close requires a reimbursement.","Un caso que se ha resuelto y cerrado requiere un reembolso." -"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","Se ha producido una revocación en esta transacción a causa de un conflicto con un cliente que sospecha que se le ha engañado sin su autorización." -"A reversal has occurred on this transaction because you have given the customer a refund.","Se ha producido una revocación en esta transacción porque ha efectuado un reembolso al cliente." -"A reversal has occurred on this transaction due to a chargeback by your customer.","Se ha producido una revocación en esta transacción a causa de una cancelación de cargo por parte del cliente." -"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","Se ha producido una revocación en esta transacción a causa de una queja acerca de la misma por parte del cliente." -"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","Se ha producido una revocación en esta transacción a causa de que el cliente ha puesto en marcha la garantía de devolución del dinero." -"A value is required for live mode. Refer to your CardinalCommerce agreement.","Se necesita un valor para el modo en vivo. Consulte el acuerdo de comercio cardinal." -"ACH Deposit (Hold for Dispute or Other Investigation)","Depósito ACH (En Espera por Conflicto u Otra Investigación)" -"ACH Deposit (Reversal)","Depósito ACH (Revocación)" -"ACH Funding for Funds Recovery from Account Balance","Financiación ACH para Recuperación de Fondos desde el Balance de Cuenta" -"ACH Withdrawal","Retirada ACH" -"API Authentication Methods","Métodos de autenticación API" -"API Certificate","Certificdo API" -"API Password","Contraseña API" -"API Signature","Firma API" -"API Username","Nombre de Usuario API" -"API Uses Proxy","Proxy de Usos API" -"Ability for buyer to purchase without PayPal account.","Capacidad del comprador para comprar sin cuenta PayPal." -"Accept credit card and PayPal payments securely.","Acepte tarjetas de crédito y pagos con PayPal de forma segura." -"Accept credit cards, debit cards and PayPal payments securely.","Acepta tarjetas de crédito, tarjetas de débito y pagos PayPal de forma segura." -"Accept payments in your shopping cart. PayPal will process your card payments through the Payflow Gateway.","Acepta pagos en su carrito de compra. PayPal procesará sus pagos con tarjeta a través de la pasarela Payflow." -"Accept payments with a PCI compliant checkout that keeps customers on your site.","Acepte pagos según la normativa PCI en procesos de compra en línea con el objetivo de que sus cliente permanezcan en el sitio durante dicho proceso." -"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Acepte pagos según la normativa PCI en procesos de compra en línea con el objetivo de que los clientes permanezcan en su sitio durante dicho proceso." -"Accept payments with a completely customizable checkout page.","Acepta pagos con una página de procesos de compra en línea completamente personalizable." -"Accept payments with a completely customizable checkout.","Acepta pagos con un proceso de compra en línea completamente personalizable." -"Acceptance Mark","Señal de Aceptación" -"Acceptance Mark Image","Imagen de Señal de Aceptación" -"Account-to-Account Payment, initiated by PayPal","Pago Cuenta-a-Cuenta, iniciado por PayPal" -"Add PayPal as an additional payment method to your checkout page to increase your sales.","Añada PayPal como un método de pago adicional para su página de procesos de compra en línea con el objetivo de incrementar sus ventas." -"Add PayPal as an additional payment method to your checkout page.","Añada PayPal como método de pago adicional a su página de procesos de compra en línea." -"Add another payment method to your existing solution or as a stand-alone option.","Añada otro método de pago a sus actuales soluciones o como una opción independiente." -"Additional Options","Opciones Adicionales" -"Address","Dirección" -"Address Verification System Response","Respuesta del Sistema de Verificación de Dirección" -"Advanced Settings","Configuración avanzada" -"Advertise Bill Me Later","Publicitar Bill Me Later" -"All the address information matched","Coincide toda la información de dirección" -"Allow in Billing Agreement Wizard","Permitir el Asistente de Acuerdo de Facturación" -"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Valores admitidos: ""paypal"", ""primary"" (por defecto), su_valor_customizado (estílo de página de pago customizado de su perfil de cuenta comercial)." -"Allowed Credit Card Types","Tipos de Tarjetas de Crédito Permitidos" -"Also affects mini-shopping cart.","También afecta al mini-carro de la compra." -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","¿Está seguro de que desea abandonar esta página? Tendrá que realizar el pedido de nuevo." -"Ask Customer","Preguntar al Cliente" -"Attempted Authentication, Bad Result","Intento de Autenticación, Resultado Incorrecto" -"Attempted Authentication, Good Result","Intento de Autenticación, Resultado Correcto" -"Auction Payment other than through eBay","Pago por Subasta diferente de eBay" -"Authenticated, Bad Result","Autenticación, Resultado Incorrecto" -"Authenticated, Good Result","Autenticación, Resultado Correcto" -"Authorization","Autorización" -"Authorization Honor Period (days)","Período de autorización (días)" -"Authorization expired.","Autorización caducada." -"Authorization transaction is required to void.","Para anular se requiere la transacción de autorización." -"Authorization was voided by merchant.","El vendedor ha anulado la autorización." -"Authorized amount of %s.","Cantidad autorizada de %s." -"Authorizing amount of %s is pending approval on gateway.","La cantidad autorizada de %s está a la espera de ser aprobada en la pasarela de pago." -"Auto","Auto" -"AutoSweep","AutoBarrido" -"Available Balance","Balance Disponible" -"Balance Manager Account Bonus","Bono de Cuenta de Gestor de Balance" -"Basic Settings - PayPal Express Checkout","Ajustes básicos: Pago exprés de PayPal" -"Basic Settings - PayPal Integral Evolution","Ajustes básicos: evolución integral con PayPal" -"Basic Settings - PayPal Pasarela integral","Ajustes básicos: pasarela integral de PayPal" -"Basic Settings - PayPal Payflow Link","Ajustes básicos: enlace de PayPal Payflow" -"Basic Settings - PayPal Payflow Pro","Ajustes básicos: Payflow Pro de PayPal" -"Basic Settings - PayPal Payments Advanced","Ajustes básicos: Pagos avanzados con PayPal" -"Basic Settings - PayPal Payments Pro","Ajustes básicos: PayPal Payments Pro" -"Basic Settings - PayPal Payments Pro Hosted Solution","Ajustes básicos: solución alojada de Payments Pro de PayPal" -"Basic Settings - PayPal Payments Standard","Ajustes básicos: pagos estándar de PayPal" -"Basic Settings - PayPal Pro","Ajustes básicos: PayPal Pro" -"Basic Settings - PayPal Website Payments Plus","Ajustes básicos: Website Payments Plus con PayPal" -"Basic Settings - PayPal Website Payments Pro","Ajustes básicos: PayPal Website Payments Pro" -"Basic Settings - PayPal Website Payments Pro Hosted Solution","Ajustes básicos: solución alojada de Website Payments Pro de PayPal" -"Basic Settings - PayPal Website Payments Pro Payflow Edition","Ajustes básicos: Website Payments Pro Payflow Edition con PayPal" -"Basic Settings - PayPal Website Payments Standard","Ajustes básicos: pagos estándar de Website con PayPal" -"Billing Address","Dirección de facturación" -"Billing Agreement Signup","Firma de Acuerdo de Facturación" -"Billing Information","Información de facturación" -"Bonus for first ACH Use","Bono por el primer Uso de ACH" -"Both section above must be complete. ","Se tienen que completar las secciones anteriores." -"Buyer Credit Payment","Pago de Crédito de Comprador" -"Buyer claims that a possible duplicate payment was made to the merchant.","El comprador reclama que se ha efectuado un posible pago duplicado al minorista." -"Buyer claims that he did not receive goods or service.","El comprador reclama que no recibió los artículos o el servicio." -"Buyer claims that he/she did not authorize transaction.","El comprador reclama que no autorizó la transacción." -"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","El comprador reclama que los artículos o el servicio recibido difieren de la descripción proporcionada por el minorista de los artículos o del servicio." -"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","El comprador reclama que la mercancía que ha recibido es insatisfactoria, defectuosa o está dañada." -"Buyer\'s Tax ID","Número de identificación social del contribuyente del comprador\es" -"Buyer\'s Tax ID Type","Tipo de número de identificación social del contribuyente del comprador\es" -"By default it is ""reports.paypal.com"".","Por defecto es ""reports.paypal.com""." -"CNPJ","CNPJ" -"CPF","CPF" -"CVV Entry is Editable","La entrada de CVV es editable." -"CVV2 Check Result by PayPal","Resultado de Comprobación CVV2 por PayPal" -"Can not send new order email.","No se puede enviar correo-e de nuevo encargo." -"Cannot create target file for reading reports.","No se puede crear el archivo destino para leer informes." -"Catalog Category Page","Página de categorías del catálogo" -"Catalog Product Page","Página de productos del catálogo" -"Centinel API URL","URL de Api Centinela" -"Centinel Custom API URL","Centinel API URL customizado" -"Charge-off","Cancelar" -"Chargeback","Facturar" -"Checkout Cart Page","Página de pedidos de la cesta" -"Checkout with PayPal","Pago con PayPal" -"Checkout with PayPal Bill Me Later","Realizar el pedido con Bill Me Later de PayPal" -"Choose a secure bundled payment solution for your business.","Elija una solución de pago por lotes segura para su empresa." -"City","Ciudad" -"Click here if you are not redirected within 10 seconds...","Haz clic aquí si no se te redirige a la página web en 10 segundos..." -"Close","Cerrar" -"Company","Empresa" -"Complaint","Reclamación" -"Completion Date","Fecha de Finalización" -"Configure","Configurar" -"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Conecta su cuenta de minorista con una pasarela que cumple con la normativa PCI y que permite a los clientes pagar sin abandonar su sitio." -"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Conecte su cuenta de minorista con una pasarela completamente personalizable que permite a los clientes pagar sin tener que abandonar su sitio." -"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Conectándose al servidor SFTP de PayPal para recuperar nuevos informes.¿Estás seguro de querer continuar?" -"Continue","Continuar" -"Countries Payment Applicable From","Formulario Aplicable de Pago por Países" -"Country","País" -"Coupon Redemption","Reembolso de Cupón" -"Credit","Crédito" -"Credit Card Settings","Configuración de la Tarjeta de Crédito" -"Currency Conversion required to cover negative balance","Se requiere una Conversión de Divisas para cubrir el saldo negativo" -"Custom","Personalizado" -"Custom Endpoint Hostname or IP-Address","Dirección IP o nombre de Host de destino personalizado" -"Custom Path","Camino personalizado" -"Customer Information","Información del cliente" -"Customer did not include a confirmed address.","El cliente no incluyó una dirección confirmada." -"Customer failed to pay.","El cliente no pagó." -"Customer used non-confirmed address.","El cliente usó una dirección no confirmada." -"Daily","Diario" -"Debit","Débito" -"Debit Card Cash Back","Retirada de efectivo de tarjeta de débito" -"Debit Card Transaction","Transacción con tarjeta de débito" -"Debit or Credit","Débito o Crédito" -"Debug Mode","Modo Depuración" -"Direct Payment API","API de pago directo" -"Discount","Descuento" -"Display","Mostrar" -"Display Express Checkout in the Payment Information step","Mostrar Pago exprés en la pantalla de información del Pago" -"Displays on catalog pages and homepage.","Impresiones en páginas de catálogo y sitio web." -"Dispute","Conflicto" -"Don't have a PayPal account? Simply enter your email address.","No dispone de una cuenta PayPal? Introduzca su dirección de email." -"Dynamic","Dinámico" -"EFT Funding (German banking)","Transacción EFT (Bancos alemanes)" -"Edit","Editar" -"Edit Payment Information","Editar la información de pago" -"Edit Shopping Cart","Editar Carrito de la Compra" -"Email Address","Dirección de correo electrónico" -"Email Associated with PayPal Merchant Account","Email asociado con la cuenta de comerciante de Paypal" -"Email Associated with PayPal Merchant Account (Optional)","Correo electrónico asociado a la cuenta de minorista de PayPal (opcional)" -"Enable Automatic Fetching","Habilitar acceso automático" -"Enable Bill Me Later","Activar Bill Me Later" -"Enable Express Checkout","Activación del Pago exprés" -"Enable PayPal Guest Checkout","Habilitar Checkout de Invitado Paypal" -"Enable Payflow Link","Activar el enlace de Payflow" -"Enable SSL verification","Activar verificación SSL" -"Enable this Solution","Activación de esta solución" -"Enabled","Habilitado" -"Event","Evento" -"Event Code","Código de Evento" -"Every 10 days","Cada 10 días" -"Every 14 days","Cada 14 días" -"Every 3 days","Cada 3 días" -"Every 30 days","Cada 30 días" -"Every 40 days","Cada 40 días" -"Every 7 days","Cada 7 días" -"Exact Match. Address and Postal Code. International","Coincidencia exacta. Dirección y Código Postal. Internacional" -"Exact Match. Address and Postal Code. UK-specific","Coincidencia exacta. Dirección y Código Postal. Específico para Reino Unido" -"Exact Match. Address and nine-digit ZIP code","Coincidencia exacta. Dirección y código ZIP de 9 dígitos" -"Explanation: %s.","Explicación: %s." -"Express Checkout","Paso por Caja Express" -"Express Checkout APIs","APIs de Paso por Caja Express" -"Express Checkout and Order have been canceled.","El Pedido y la Salida Express se han cancelado." -"Express Checkout has been canceled.","La Salida Express se ha cancelado." -"Failed to fetch reports from '%s@%s'.","No se consiguió obtener los registros de '%s@%s'." -"Fax","Fax" -"Fee Amount","Importe de la Comisión" -"Fee Debit or Credit","Comisión Débito o Crédito" -"Fee Reversal","Retroceso de Comisiones" -"Fee: Foreign ACH Withdrawal","Comisión: Retirada ACH en el extranjero" -"Fee: Mass Pay Request","Comisión: Solicitud de Pago Masivo" -"Fee: Web Site Payments Pro Account Monthly","Comisión: cuenta Web Site Payments Pro mensual" -"Fee: WorldLink Check Withdrawal","Comisión: Retirada mediante cheque WorldLink" -"Fetch","Capturar" -"Fetch Updates","Nuevos resultados obtenidos" -"Fetched %s report rows from '%s@%s'.","Se obtuvieron %s filas de informe de '%s@%s'." -"For Virtual Quotes Only","Solo para presupuestos en línea" -"Frontend Experience Settings","Ajustes de la Experiencia con Fachada" -"Funding","Fondos" -"General (Authorization)","General (Autorización)" -"General (Dividend)","General (Dividendo)" -"General (Funds Transfer from PayPal Account to Another)","General (Transferencia de Fondos desde una Cuenta Paypal a Otra Cuenta)" -"General (Purchase with a credit card)","General (Compra con una tarjeta de crédito)" -"General Adjustment without businessrelated event","Ajuste General sin ningún acontecimiento relacionado con el negocio" -"General Currency Conversion","Conversión de Divisa General" -"General Funding of PayPal Account ","Fondos Generales de la Cuenta de PayPal" -"General Redemption","Amortización General" -"General Withdrawal from PayPal Account","Retirada de fondos General desde la Cuenta de PayPal" -"General. Product no longer supported","General. Este producto ya no está admitido" -"General: Use of PayPal account for purchasing as well as receiving payments","General: Uso de la cuenta PayPal tanto para comprar como para recibir pagos" -"General: Withdrawal from PayPal Account","General: Retirada de fondos desde la Cuenta de PayPal" -"General: Withdrawal to Non-Bank Entity","General: Retirada de fondos a una Entidad No Bancaria" -"General: adjustment of a type not belonging to the other T12xx categories","General: ajuste de una clase no perteneciente a las otras T12xx categorías" -"General: bonus of a type not belonging to the other T08xx categories","General: bonificación de una clase no perteneciente a las otras T08xx categorías" -"General: event not yet categorized","General: suceso no catalogado aún" -"General: non-payment fee of a type not belonging to the other T01xx categories","General: tarifa de impago de una clase no perteneciente a las otras T01xx categorías" -"General: received payment of a type not belonging to the other T00xx categories","General: pago recibido de una clase no perteneciente a las otras T00xx categorías" -"General: reversal of a type not belonging to the other T11xx categories","General: revocación de una clase no perteneciente a las otras T01xx categorías" -"General: temporary hold of a type not belonging to the other T15xx categories","General: cargo temporal de una clase no perteneciente a las otras T15xx categorías" -"Get Credentials from PayPal","Consiga sus Credenciales de PayPal" -"Get Publisher ID from PayPal","Usar la ID de editor de PayPal" -"Gift Certificate Payment: purchase of Gift Certificate","Pago de Cheque Regalo: compra de Cheque Regalo" -"Gift Certificate Redemption","Canjear Cheque Regalo" -"Gross Amount","Total Bruto" -"Header (center)","Cabecera (centro)" -"Header Background Color","Color del Fondo de la Cabecera" -"Header Border Color","Color del Borde de la Cabecera" -"Header Image URL","URL de la Imagen de la Cabecera" -"Help","Ayuda" -"Hidden Virtual PayPal Debit Card Transaction","Transacción Oculta de Tarjeta Virtual de Débito PayPal" -"Hold for Dispute Investigation","Manténgase a la Espera de la Investigación sobre la Disputa" -"Home Page","Página de inicio" -"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","Lo sentimos, pero no hemos podido finalizar su transacción. Por favor, póngase en contacto con nosotros si necesita ayuda." -"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","Lo sentimos, pero no hemos podido procesar su pago. Por favor, introduzca otro método de pago o póngase en contacto con nosotros si necesita ayuda." -"IPN ""%s"".","""%s"" IPN." -"IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""","IPN ""%s"". La cantidad de la transacción es %s. ID de la transacción: ""%s""" -"IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s.","IPN ""%s"". Se ha resuelto y cerrado un conflicto. %s Cantidad de la transacción %s." -"IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s","IPN ""%s"". Tipo de caso ""%s"". ID de caso ""%s"" %s" -"IPN verification ""%s"".","""%s"" de verificación de IPN." -"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Se utilizará un valor por defecto si se deja en blanco. Podrá proporcionarse una URL por encargo según acuerdo con Cardinal Commerce." -"If not specified, Default Country from General Config will be used","Si no se especifica, use el país por defecto de la configuración general." -"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","Si se activa esta opción, el cliente podrá cambiar la dirección y el método de envío desde el sitio de Internet de PayPal. La modalidad en vivo funciona sólo a través de protocolo HTTPS." -"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","Si no ha configurado diversos usuarios en su cuenta, vuelva a introducir el nombre de usuario del vendedor/minorista aquí." -"Impossible to issue a refund transaction because the capture transaction does not exist.","No es posible facilitar una transacción de reembolso porque no existe la transacción de captura." -"Incentive","Incentivo" -"Initiation Date","Fecha de Inicio" -"Integral Evolution","Evolución integral" -"Invoice ID","Identificación de la Factura" -"Issuer Liability","Responsabilidad del Emisor" -"It is recommended to set this value to ""Debit or Credit Card"" per store views.","Se recomienda fijar este valor en ""Tarjeta de débito o crédito"" por vistas de tienda." -"It is recommended to set this value to ""PayPal"" per store views.","Se recomienda fijar este valor en ""PayPal"" por vistas de tienda." -"Items in Your Shopping Cart","Artículos en Su Carro de la Compra" -"Last Correlation ID","Última Identificación de Correlación" -"Last Transaction ID","Última Identificación de Transacción" -"Learn More","Saber más" -"Login","Entrar" -"Mass Pay Payment","Pago Agrupado" -"Matched (CVV2)","Emparejado (CVV2)" -"Matched (CVV2CSC)","CVV2CSC coincidentes." -"Matched Address only (no ZIP)","Sólo dirección correspondiente (no CP)" -"Matched Address only (no ZIP). International","Sólo Encaja la Dirección (no el Código Postal). Internacional" -"Matched Postal Code only (no Address)","Sólo Encaja el Código Postal (no la Dirección)" -"Matched five-digit ZIP only (no Address)","Sólo Encaja el Código Postal de cinco dígitos (no la Dirección)" -"Matched whole nine-didgit ZIP (no Address)","Sólo Encaja el Código Postal de nueve dígitos (no la Dirección)" -"Merchant Account","Cuenta del comerciante" -"Merchant Country","País de envío" -"Merchant Liability","Responsabilidad del comerciante" -"Merchant Location","Ubicación del minorista" -"Merchant Protection Eligibility","Requisitos de protección de mercado" -"Merchant Referral Bonus","Bonificación de referencia del comerciante" -"Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","La cuenta del envío no tiene una opción de retirada de dinero. El recipiente debe aceptar o rechazar manualmente este pago de su resumen de cuentas." -"Merchant account is not verified.","La cuenta del comerciante no ha sido verificada." -"Merchant denied this pending payment.","El comerciante denegó este pago pendiente." -"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","El comerciante no posee una cuenta de EEUU ni tampoco un mecanismo de retirada de dinero." -"Merchant must upgrade account to Business or Premier status.","El comerciante debe actualizar su cuenta a la opción Business o Premier." -"Merchant reference ID format is not supported.","El formato de la Id. de referencia del comerciante no es compatible." -"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Los comerciantes necesitan registrarse en Paypal para activar la opción de acuerdos de facturación. No active esta opción hasta que Paypal confirme que los acuerdos de facturación han sido activados para su cuenta de comerciante." -"Mobile Payment (made via a mobile phone)","Pago móvil (realizado vía teléfono móvil)" -"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Problema de monedas múltiples. El comerciante debe aceptar o denegar manualmente este pago a través de la opción Vista general de la cuenta de Paypal." -"N/A","N/A" -"N/A. Address not checked, or acquirer had no response. Service not available","No disponible. No se ha comprobado la dirección o el usuario no obtuvo respuesta. Servicio no disponible." -"N/A. Global Unavailable","No disponible. Global no disponible." -"N/A. International Unavailable","No disponible. Internacional no disponible." -"N/A. Merchant has indicated that CVV2 is not present on card","No disponible. El comerciante ha notificado que su tarjeta no tiene CVV2." -"N/A. No response","No disponible. Sin respuesta." -"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. No disponible para transacciones MOTO (Internet/móvil)" -"N/A. Not processed","No disponible. No procesado." -"N/A. Retry","No disponible. Vuelva a intentar." -"N/A. Service not Supported","N/A. Servicio no disponible." -"N/A. Service not available","No disponible. Servicio no disponible." -"N/A. Service not supported","N/A. Servicio no operativo" -"N/A. The merchant did not provide AVS information","N/A. El comerciante no ha proporcionado la información AVS" -"N/A. The merchant has not implemented CVV2 code handling","No disponible. El comerciante no ha implementado la gestión del código CVV2." -"N/A. Unavailable","No disponible. No disponible." -"Near Bill Me Later checkout button","Cerca del botón de pedido de Bill Me Later" -"Negative Balance","No disponible. Saldo negativo" -"Never","Nunca" -"No","No" -"No Details matched","No ha habido coincidencias" -"No Details matched. International","Los detalles no coinciden. Internacional" -"No Liability Shift","No hay cambios de responsabilidad" -"No Logo","Sin logotipo" -"No match","No ha habido coincidencias" -"None of the address information matched","Ninguna información de la dirección coincide" -"Not sure what PayPal payment method to use? Click here to learn more.","¿No está seguro de que método de pago de PayPal usar? Hagla clic aquí para obtener más información." -"Note: %s","Nota: %s" -"Nothing to fetch because of an empty configuration.","No hay resultados debido a un vacío en la configuración." -"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Tenga en cuenta que PayPal puede gestionar hasta 10 opciones de envío. Por eso Magento solamente transferirá las primeras 10 opciones de envío más baratas si hay mas de 10 opciones disponibles." -"Notified customer about creditmemo #%s.","Cliente informado de la nota de abono #%s." -"Notified customer about invoice #%s.","Cliente informado de la factura #%s." -"Now accepting PayPal (150 X 40)","Se acepta PayPal (150 X 40)" -"Now accepting PayPal (150 X 60)","Ahora se acepta Paypal (150 X 60)" -"Number of Child Authorizations","Número de autorizaciones infantiles" -"Open Authorization","Abrir la autorización" -"Order","Encargar" -"Order ID","ID de Pedido" -"Order Valid Period (days)","Período válido del pedido (días)" -"Ordered amount of %s.","Cantidad pedida de %s." -"Ordering amount of %s is pending approval on gateway.","El pedido de la cantidad de %s está pendiente de aprobación en el portal." -"Page Background Color","Color del fondo de página" -"Page Style","Estilo de página" -"Part of the address information matched","Parte de la información de la dirección coincidió" -"Partner","Socio" -"Pasarela integral","Pasarela integral" -"Password","Contraseña" -"PayPal All-in-One Payment Solutions  Accept and process credit cards and PayPal payments.","Soluciones de pago multifunción de PayPal  Acepte y procese tarjetas de crédito y pagos con PayPal." -"PayPal Balance Manager function of PayPal account","Función del Gestor de saldo de PayPal de la cuenta de PayPal" -"PayPal Billing Agreement Settings","Configuración del acuerdo de facturación de PayPal" -"PayPal Buyer Warranty Bonus","Bonificación de garantía del comprador en PayPal" -"PayPal Debit Card Cash Advance","Adelanto de efectivo de una tarjeta de débito en PayPal" -"PayPal Debit Card Withdrawal from ATM","Retiro de dinero de tarjeta de débido de PayPal desde un cajero automático" -"PayPal Express Checkout","Pago exprés de PayPal" -"PayPal Express Checkout Shortcut Wrapper","Acceso directo al check-out exprés de PayPal" -"PayPal Express Checkout Token does not exist.","El símbolo para la Salida Express con Paypal no existe." -"PayPal Express Checkout is not enabled.","Se ha desactivado el Pago exprés de PayPal." -"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you. - You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®. - Learn More - ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you. - You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®. - Learn More" -"PayPal Express Order Review Form","Formulario de revisión de compra por PayPal Express" -"PayPal Fee Information","Información de tarifa de PayPal" -"PayPal Merchant Pages Style","Estilo de la página de la tienda en PayPal" -"PayPal Payment Gateways","Pasarela de pago PayPal" -"PayPal Payment Solutions","Soluciones de pago de PayPal" -"PayPal Pro","PayPal Pro" -"PayPal Product Logo","Logotipo del producto en PayPal" -"PayPal Protection Bonus","Bono de protección de PayPal" -"PayPal Reference ID","Id. de referencia de PayPal" -"PayPal Reference ID Type","Tipo de Id. de referencia de PayPal" -"PayPal Settlement Reports","Informes de liquidación de PayPal" -"PayPal certificate does not exist.","Certificado PayPal no existe." -"PayPal certificate file is empty.","Archivo de certificado PayPal está vacío." -"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal no admite el proceso de pedidos con importe cero. Para finalizar su compra, continúe con el proceso de caja estándar." -"PayPal gateway has rejected request. %s","La puerta de enlace de PayPal ha rechazado la solicitud. %s" -"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal recomienda que configure otro usuario en su cuenta en manager.paypal.com" -"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal recomienda que configure otro usuario en su cuenta en manager.paypal.com, en lugar de introducir su nombre de usuario de administrador y su contraseña aquí. Esto mejorará el grado de seguridad y evitará interrupciones del servicio si cambia la contraseña posteriormente. Si no desea configurar otro usuario, puede volver a introducir su nombre de usuario minorista aquí." -"PayPal response hasn't required fields.","La respuesta de PayPal no tiene campos obligatorios." -"PayPal retains reports for 45 days.","PayPal almacena los informes durante 45 días." -"PayPal/Centinel Electronic Commerce Indicator","Indicador de comercio electrónico de PayPal/Centinel" -"PayPal/Centinel Visa Payer Authentication Service Result","Resultado del servicio de autenticación del pagador con Visa a través de PayPal/Centinel" -"Payer Address ID","Id. de dirección del pagador" -"Payer Address Status","Estado de la dirección del comprador" -"Payer Email","Correo electrónico del pagador" -"Payer ID","Id. del pagador" -"Payer Status","Situación del comprador" -"Payer is not identified.","El pagador no se ha identificado." -"Payflow Link","Enlace de Payflow" -"Payflow Link (Includes Express Checkout)","Enlace de Payflow (incluido Pago exprés)" -"Payflow Pro","Payflow Pro" -"Payflow Pro (Includes Express Checkout)","Payflow Pro (incluido Pago exprés)" -"Payflow Pro and Express Checkout","Payflow Pro y Pago exprés" -"Payment Action","Acción de Pago" -"Payment Applicable From","Pago Aplicable Desde" -"Payment Method","Método de pago" -"Payment Refund initiated by merchant","Reembolso de Pago iniciado por el comerciante" -"Payment has been declined. Please try again.","El pago ha sido rechazado. Vuelva a intentarlo." -"Payment is being reviewed by PayPal for risk.","El pago está siendo revisado por PayPal por si hubiera algún riesgo." -"Payment transactions disallow storing objects.","Las operaciones de pago no permiten almacenar objetos." -"Payment was made to an email address that is not yet registered or confirmed.","El pago se ha realizado a una dirección electrónica que todavía no ha sido registrada o confirmada." -"Payments Advanced","Payments avanzado" -"Payments Advanced (Includes Express Checkout)","Payments avanzado (incluido Pago exprés)" -"Payments Pro (Includes Express Checkout)","Payments Pro (incluido Pago exprés)" -"Payments Pro Hosted Solution","Solución alojada de Payments Pro" -"Payments Pro and Express Checkout","Payments Pro y Pago exprés" -"Payments Standard","Pagos estándar" -"Payments by PayPal (150 X 40)","Pagos por PayPal (150 X 40)" -"Payments by PayPal (150 X 60)","Pagos por PayPal (150 X 60)" -"Pending PayPal","Pendiente de pago en PayPal" -"Place Order","Hacer pedido" -"Please agree to all the terms and conditions before placing the order.","Por favor, acepta todos los términos y condiciones antes de realizar el pedido." -"Please contact PayPal Customer Service.","Por favor, póngase en contacto con el Servicio de Atención al Cliente de PayPal." -"Please do not refresh the page until you complete payment.","No actualice la página hasta que complete el pago." -"Please re-enable the previously enabled payment solutions.","Vuelva a activar la solución de pagos previamente activada." -"Please select a shipping method...","Por favor, elija un método de envío..." -"Please select region, state or province","Por favor seleccione región, estado o provincia" -"Please update order data to get shipping methods and rates","Por favor, actualice los datos del pedido para obtener métodos de envío y tarifas" -"Points Incentive Redemption","Puntos de incentivo por cancelación" -"Position","Posición" -"Postage Payment to either USPS or UPS","Pago de los Gastos de Envío bien a USPS o a UPS" -"Preapproved Payment (BillUser API), either sent or received","Pagos previamente aprobados (BillUser API) enviados o recibidos" -"Preapproved Payment ID","Identificación del Pago Pre-autorizado" -"Price","Precio" -"Pro","Pro" -"Process payments using your own internet merchant account.","Procese pagos mediante su propia cuenta de minorista en internet." -"Product","Producto" -"Product Name","Nombre de Producto" -"Proxy Host","Servidor Proxy" -"Proxy Port","Puerto proxy" -"Publisher ID","ID de editor" -"Qty","Cantidad" -"Reauthorization","Reautorización" -"Reference Information","Información de Referencia" -"Reimbursement for a chargeback.","Devolución o reembolso." -"Reimbursement of Chargeback","Reembolso de una transacción devuelta" -"Report Date","Fecha del informe" -"Reports","Informes" -"Requested %s and configured %s merchant emails do not match.","Las direcciones del comerciante solicitada %s y configurada %s no se corresponden." -"Require CVV Entry","Requiere el código de seguridad de la tarjeta" -"Require Customer's Billing Address","Exija la dirección de facturación del cliente" -"Required PayPal Settings","Configuración obligatoria de PayPal" -"Required Settings","Ajustes obligatorios" -"Required to display a banner","Necesario para mostrar un banner" -"Reversal","Inversión" -"Reversal of General Account Hold","Revocación de Cargo General en Cuenta" -"Reversal of Points Usage","Inversión de los puntos de utilización" -"Reversal of an adjustment.","Revocación de un ajuste." -"Reversal of hold for Dispute Investigation","Reposición por la investigación de la disputa" -"Review Order","Revise su pedido" -"Reward Voucher Redemption","Realizar canje de vales" -"SFTP Credentials","Credenciales SFTP" -"Sale","Venta" -"Sales","Ventas" -"Same as shipping","Igual que el envío" -"Sandbox Credentials","Credenciales de Supervisión" -"Sandbox Mode","Modo de prueba" -"Schedule","Programa" -"Schedule description is too long.","La descripción de designaciones es demasiado larga." -"Scheduled Fetching","Compra programada" -"Select a Payment Solution","Seleccione una solución de pagos." -"Send Email Confirmation","Enviar confirmación por correo electrónico" -"Server Error. Please try again.","Error del servidor. Por favor, inténtelo de nuevo." -"Settlement Consolidation","Consolidación del Acuerdo" -"Settlement Report Settings","Ajustes del informe de liquidación" -"Settlement of a chargeback.","Liquidación de una transacción devuelta." -"Severe 3D Secure Card Validation","Validación estricta de tarjeta segura en 3D" -"Severe Validation Removes Chargeback Liability on Merchant","La Validación Severe Suprime la Responsabilidad de Cancelación de Cargo del Comerciante" -"Severe validation removes chargeback liability on merchant.","La validación estricta exime al comerciante de responsabilidad en caso de devoluciones de cargos" -"Shipping","Transporte" -"Shipping Address","Dirección de Envío" -"Shipping Information","Información de envío" -"Shipping Method","Método de envío" -"Shop now using (150 X 40)","Compre ahora usando (150 X 40)" -"Shop now using (150 X 60)","Compre ahora utilizando (150 X 60)" -"Shortcut","Acceso directo" -"Shortcut Buttons Flavor","Tipo de Botones de Atajo" -"Shortcut on Product View","Atajo para Vista de Producto" -"Shortcut on Shopping Cart","Atajo en el carro de la compra" -"Sidebar (right)","Barra lateral (derecha)" -"Sign a billing agreement to streamline further purchases with PayPal.","Firma un acuerdo de facturación para agilizar futuras compras con PayPal." -"Size","Tamaño" -"Skip Order Review Step","Saltar el paso de resumen del pedido" -"Solo","Solo" -"Some PayPal solutions conflict.","Algunos conflictos de soluciones PayPal" -"Sorry, no quotes are available for this order at this time.","Lamentamos informarle que en este momento no hay cotizaciones disponibles para este pedido." -"Sort Order","Orden de selección" -"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Especifica cuál es el período de autorización de la cuenta de PayPal del comerciante. Tiene que ser igual a la configuración de PayPal." -"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Especifica cuál es el período de validez del pedido de la cuenta de PayPal del comerciante. Tiene que ser igual a la configuración de PayPal." -"State/Province","Estado/Provincia" -"Static","Estático" -"Street Address","Dirección postal" -"Street Address %s","Calle %s" -"Submitting order information...","Enviando la información del pedido..." -"Subscriber name is too long.","El nombre de suscriptor es demasiado largo." -"Subscription ID","ID de Suscripción." -"Subscription Payment, either payment sent or payment received","Pago de suscripción, bien sea pago enviado o recibido." -"Subtotal","Subtotal" -"Summary Text for Aggregated Cart","Texto de Resumen para el Carro Añadido" -"Supporting of American Express cards require additional agreement. Learn more at http://www.paypal.com/amexupdate.","La admisión de tarjetas American Express requiere de un acuerdo adicional. Consulte los requisitios en http://www.paypal.com/amexupdate." -"Switch/Maestro","Cambiar/Maestro" -"Telephone","Teléfono" -"Test Mode","Modo de prueba" -"The background color for the checkout page around the header and payment form.","El color de fondo de la página de reembolso de la cabecera y formulario de pago." -"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","Color de fondo para la cabecera de la página de pago. Código ASCII de color hexadecimal HTML de seis caracteres sin diferencias mayúsculas o minúsculas." -"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","El número de autorizaciones infantiles por defecto de su cuenta de PayPal es 1. Para tener autorizaciones múltiples, póngase en contacto con PayPal para solicitar un aumento." -"The following error(s) occured:","Se han producido los siguientes errores:" -"The image at the top left of the checkout page. Max size is 750x90-pixel. https is highly encouraged.","Imagen en la parte superior izquierda de la página de pago. El tamaño máximo es 750x90 píxeles. Se recomienda encarecidamente el uso de https." -"The maximum number of child authorizations is reached.","Se ha alcanzado el número máximo de autorizaciones infantiles." -"The merchant account is not yet verified.","Todavía no se ha verificado la cuenta de vendedor." -"The payment curency does not match any of the merchant\'s balances currency.","La moneda de pago no coincide con ninguna de las monedas de saldo del vendedor." -"The payment eCheck is not yet cleared.","Todavía no se ha limpiado el eCheck de pago." -"The payment is authorized but not settled.","El pago se ha autorizado, pero no se ha realizado." -"The payment is pending because it was made to an email address that is not yet registered or confirmed.","El pago está pendiente porque se ha realizado a una dirección de mail que todavía no se ha registrado o confirmado." -"The payment is pending while it is being reviewed by PayPal for risk.","El pago está pendiente, PayPal lo está revisando para asegurarse." -"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","El pago se ha realizado mediante tarjeta de crédito. Para recibir los fondos el vendedor tiene que actualizar la cuenta a estado Business o Premier." -"There is already another PayPal solution enabled. Enable this solution instead?","Ya hayotra solución de PayPal activada. ¿Quiere activar esta solución en su lugar?" -"There was an error processing your order. Please contact us or try again later.","Se produjo un error en el proceso de su pedido. Contacte con nosotros o inténtelo más tarde." -"This feature needs be enabled first for the merchant account through PayPal technical support.","Esta característica necesita primero ser activada para la cuenta comercial a través del soporte técnico de PayPal." -"This operation requires an existing transaction object.","Esta operación requiere de una transacción ya existente." -"Time of Day","Hora del Día" -"Title","Título" -"To proceed to Checkout, please log in using your email address.","Por favor, inicie sesión con su dirección de correo electrónico para continuar su pedido." -"Transaction ID","Número de identificación de la transacción" -"Transaction ID must not be empty.","El número identificativo de la transacción debe completarse." -"Transaction Information","Información de Transacción" -"Transaction reversal by PayPal administrators.","Revocación de la transacción por parte de los administradores de PayPal." -"Transaction reversal due to fraud detected by PayPal administrators.","Los administradores de PayPal han revocado la transacción a causa de la detección de fraude." -"Transfer Cart Line Items","Transferir la línea de los artículos en el carrito" -"Transfer Shipping Options","Transferir las opciones de envío" -"Triggered Fraud Filters","Filtros de Fraude Desencadenados" -"URL method for Cancel URL and Return URL","Método de URL para URL de cancelación y URL de retorno" -"Unable to cancel Express Checkout.","No se ha podido cancelar la Salida Express." -"Unable to change status. Current status is not correspond to real status.","No se puede cambiar el estado. El estado actual no se corresponde con el estado real." -"Unable to communicate with the PayPal gateway.","No ha sido posible comunicarse con el gateway de PayPal." -"Unable to initialize Express Checkout review.","No se ha podido iniciar la revisión de Salida Express." -"Unable to initialize Express Checkout.","No ha sido posible inicializar el Pago Express." -"Unable to place the order.","No se puede efectuar el pedido." -"Unable to process Express Checkout approval.","No se ha podido procesar la aprobación de Salida Express." -"Unable to start Express Checkout.","No se ha podido iniciar la Salida Express." -"Unable to update Order data.","No es posible actualizar la información del pedido." -"Unable to update shipping method.","No se ha podido actualizar el método de envío." -"Unknown Error. Please try again later.","Error desconocido. Por favor inténtalo más tarde." -"Unknown reason. Please contact PayPal customer service.","Razones desconocidas. Por favor, contacte el servicio de atención al cliente de PayPal." -"Update Order Data","Actualizar información del pedido" -"Update Shipping Method","Actualizar modo de envío" -"Use Proxy","Utilizar Proxy" -"Use colon to specify port. For example: ""test.example.com:5224"".","Utilice dos puntos para especificar el puerto. Por ejemplo: ""prueba.ejemplo.com:5224""." -"User","Usuario" -"User-initiated Currency Conversion","Conversión de moneda iniciada por el usuario" -"Uses store frontend name by default.","De forma predeterminada utiliza el nombre de la tienda de interfaz de usuario" -"VAT Number","Número de IVA" -"Vendor","Vendedor" -"View","Ver" -"View Demo","Vea la demostración" -"View Transaction","Ver transacción" -"View Transaction Details","Ver Detalles de la Transacción" -"Virtual PayPal Debit Card Transaction","Transacción de Tarjeta de Débito de PayPal Virtual" -"Virtual Terminal Payment","Pago Terminal virtual" -"Void","Nulo" -"Waiting until Customer\'s eCheck will be cleared.","En espera hasta que se produzca la compensación del Cheque Electrónico del Cliente" -"We prefer PayPal (150 X 40)","Preferimos PayPal (150 X 40)" -"We prefer PayPal (150 X 60)","Preferimos PayPal (150 X 60)" -"Website Payments Plus","Pagos Web Plus" -"Website Payments Pro (Includes Express Checkout)","Website Payments Pro (incluido Pago exprés)" -"Website Payments Pro Hosted Solution","Solución Hospedada de Pagos Web Pro" -"Website Payments Pro Hosted Solution (Includes Express Checkout)","Solución alojada de Website Payments Pro (incluido Pago exprés)" -"Website Payments Pro Hosted Solution and Express Checkout","Solución alojada de Website Payments Pro y Pago exprés" -"Website Payments Pro Payflow Edition (Includes Express Checkout)","Website Payments Pro Payflow Edition (incluido Pago exprés)" -"Website Payments Pro Payflow Edition and Express Checkout","Website Payments Pro Payflow Edition y Pago exprés" -"Website Payments Pro and Express Checkout","Website Payments Pro y Pago Exprés" -"Website Payments Standard","Pago Estándar en el Sitio Web" -"Website Payments Standard Payment","Pago estándar de la página web" -"What is PayPal?","¿Qué es PayPal?" -"Whether to create a billing agreement, if there are no active billing agreements available.","Opción de creación de un contrato de facturación, si no hay contratos de facturación activos disponibles." -"Will appear as a payment option only for customers who have at least one active billing agreement.","Aparecerá como una opción de pago solamente para clientes que tengan al menos un contrato de facturación activo." -"WorldLink Withdrawal","Retirada de Fondos WorldLink" -"Would you like to sign a billing agreement to streamline further purchases with PayPal?","¿Le gustaría firmar un contrato de facturación para agilizar sus futuras compras con PayPal?" -"Wrong Order ID (%s) specified.","Se especificó un Identificador de Pedido Erróneo (%s)." -"Wrong PayPal Express Checkout Token specified.","Símbolo especificado de Salida Express con Paypal incorrecto." -"Yes","Sí" -"Yes. Matched Address and five-didgit ZIP","Sí. La Dirección y el Código Postal de cinco dígitos coinciden." -"You cannot void a verification transaction","No se puede anular una operación de comprobación" -"You will be redirected to the PayPal website in a few seconds.","Volverá a la página web de Paypal en unos segundos." -"You will be redirected to the PayPal website when you place an order.","Cuando realice el pedido se le devolverá a la página PayPal." -"You will be redirected to the PayPal website.","Se le redirigirá al sitio web de PayPal." -"You will be required to enter your payment details after you place an order.","Se le solicitará que introduzca los detalles del pago tras realizar el pedido." -"Zip/Postal Code","Código postal" -"chargeback reimbursed","Devolución del cargo reembolsada" -"chargeback settled","Devolución del cargo liquidada" -"customer complaint","reclamación de cliente" -"customer triggered a chargeback","El cliente ha solicitado un reembolso" -"customer triggered money-back guarantee","el cliente activó una garantía de devolución del dinero" -"eBay Auction Payment","Pago de Subasta de eBay" -"merchant refunded payment","el comerciante ha reembolsado el pago" -"no reason","No existen razones" -"reversal of an adjustment","revocación de un ajuste" -"unknown reason","Razones desconocidas" diff --git a/app/locale/es_ES/Mage_PaypalUk.csv b/app/locale/es_ES/Mage_PaypalUk.csv deleted file mode 100644 index d50b06868..000000000 --- a/app/locale/es_ES/Mage_PaypalUk.csv +++ /dev/null @@ -1,2 +0,0 @@ -"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","Contenedor de acceso directo a Pago Express de PayPal (Edición de Flujo de Pago)" -"PayPal Express Order Review Form","Formulario para revisar el pedido express de Paypal" diff --git a/app/locale/es_ES/Mage_Persistent.csv b/app/locale/es_ES/Mage_Persistent.csv deleted file mode 100644 index 0ac60d256..000000000 --- a/app/locale/es_ES/Mage_Persistent.csv +++ /dev/null @@ -1,74 +0,0 @@ -"""Remember Me"" Default Value","Valor predeterminado de ""Recordarme""" -"(Not %s?)","(¿No %s?)" -"* Required Fields","* Campos obligatorios" -"Address","Dirección" -"Address Information","Información de dirección" -"Already registered?","¿Ya registrado?" -"Back","Volver" -"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Al crear una cuenta con nuestra tienda, podrás moverte por el proceso de compra más rápido, almacenar varias direcciones de envío, ver y seguir tus pedidos en tu cuenta y más." -"Cannot load configuration from file %s.","No se puede cargar la configuración desde el archivo %s." -"Checkout as Guest","Paga como Invitado" -"Checkout as a Guest","Realizar un pedido como invitado" -"Checkout as a Guest or Register","Comprar como Invitado o Registrarse" -"City","Ciudad" -"Clear Persistence on Log Out","Persistencia transparente al cerrar sesión" -"Close","Cerrar" -"Company","Empresa" -"Confirm Password","Confirmar Contraseña" -"Continue","Continuar" -"Country","País" -"Create an Account","Crear una Cuenta" -"Easy access to your order history and status","Fácil acceso a tu estado e historial de pedidos" -"Email Address","Dirección de correo electrónico" -"Enable ""Remember Me""","Activar ""Recordarme""" -"Enable Persistence","Activar persistencia" -"Fast and easy check out","Rápido y sencillo proceso de compra" -"Faster checkout","Pedido más rápido" -"Fax","Fax" -"Forgot Your Password?","¿Olvidaste Tu Contraseña?" -"Forgot your password?","¿Olvidaste tu contraseña?" -"General Options","Opciones generales" -"If you have an account with us, please log in.","Si tiene usted una cuenta con nosotros, por favor, inicie sesión." -"Loading next step...","Cargando paso siguiente..." -"Login","Iniciar sesión" -"Login Information","Información de inicio de sesión" -"Login or Create an Account","Identifíquese o cree una cuenta" -"New Customers","Nuevos clientes" -"New Here?","¿Es nuevo aquí?" -"Password","Contraseña" -"Persist Shopping Cart","Hacer persistente la cesta de la compra" -"Persistence Lifetime (seconds)","Duración de la persistencia (segundos)" -"Persistent Shopping Cart","Cesta de la compra persistente" -"Personal Information","Información personal" -"Please enter the following information to create your account.","Introduzca la siguiente información para crear su cuenta." -"Please log in below:","Por favor indentifíquese abajo:" -"Please select region, state or province","Por favor seleccione región, estado o provincia" -"Register","Registrarse" -"Register and Checkout","Registrarse y realizar pedido" -"Register and save time!","¡Regístrese y ahorre tiempo!" -"Register to Create an Account","Registrarse para crear una cuenta" -"Register with us for future convenience:","Regístrese con nosotros para mayor comodidad en el futuro:" -"Registered Customers","Clientes registrados" -"Registration is free and easy!","¡Registrarse es gratis y sencillo!" -"Remember Me","Recordarme" -"Returning Customers","Clientes asiduos" -"Save in address book","Guardar en la libreta de direcciones" -"Save multiple shipping addresses","Guardar varias direcciones de envío" -"Select State/Province...","Seleccionar Estado/Provincia..." -"Select a billing address from your address book or enter a new address.","Seleccionar una dirección de facturación de su agenda o introducir una dirección nueva." -"Ship to different address","Enviar a una dirección diferente" -"Ship to this address","Enviar a esta dirección" -"Shopping cart has been updated with appropriate prices","El carrito de la compra se ha actualizado con precios apropiados" -"Sign Up for Newsletter","Suscribirse al boletín de noticias" -"Sign in to speed up your checkout process","Inicie sesión para realizar su pedido más rápidamente" -"State/Province","Estado/Provincia" -"Street Address","Dirección postal" -"Street Address %s","Calle %s" -"Submit","Enviar" -"Telephone","Teléfono" -"To proceed to Checkout, please log in using your email address.","Para proceder a la comprobación, por favor, inicie sesión con su dirección de correo electrónico." -"VAT Number","Número de IVA" -"View and track orders and more","Visualización y seguimiento de pedidos, etc." -"Welcome, %s!","¡Bienvenido, %s!" -"What\'s this?","¿Qué es esto?" -"Zip/Postal Code","Código postal" diff --git a/app/locale/es_ES/Mage_Poll.csv b/app/locale/es_ES/Mage_Poll.csv deleted file mode 100644 index f1bccfc5d..000000000 --- a/app/locale/es_ES/Mage_Poll.csv +++ /dev/null @@ -1,42 +0,0 @@ -"Actions","Acciones" -"Add Answer","Añadir respuesta" -"Add New Answer","Añadir nueva respuesta" -"Add New Poll","Añadir nueva encuesta" -"Answer Title","Título de la respuesta" -"Answer Title:","Título de la respuesta:" -"Answer with the same title in this poll","Respuesta con el mismo título en esta encuesta" -"Are you sure you want to delete it?","Está seguro de que desea borrarla?" -"Assigned Answers","Respuesta asignada" -"Closed","Cerrado" -"Community Poll","Encuesta de la comunidad" -"Date Closed","Fecha de cierre" -"Date Posted","Fecha de publicación" -"Delete","Eliminar" -"Delete Answer","Borrar respuesta" -"Delete Poll","Borrar encuesta" -"Disallow Voting in a Poll Multiple Times from Same IP-address","No permitir votar en una encuesta múltiples veces desde la misma dirección IP" -"Edit Answer '%s'","Editar respuesta '%s'" -"Edit Poll '%s'","Editar encuesta '%s'" -"Edit Poll Answer","Editar respuesta de la encuesta" -"ID","Identificación" -"Invalid Answer.","Respuesta inválida." -"New Poll","Nueva encuesta" -"Number of Responses","Número de respuestas" -"Open","Abrir" -"Poll Answers","Respuestas de la encuesta" -"Poll Information","Información de la encuesta" -"Poll Manager","Administrador de encuesta" -"Poll Question","Pregunta de encuesta" -"Poll information","Información sobre la encuesta" -"Poll with the same question","Encuesta con la misma pregunta" -"Polls","Encuestas" -"Save Answer","Guardar respuesta" -"Save Poll","Guardar encuesta" -"Status","Estado" -"The answer has been saved.","La respuesta ha sido guardada." -"The poll does not exist.","La encuesta no existe." -"Unable to find an answer to delete.","No se puede encontrar una respuesta para borrar" -"Visible In","Visible en" -"Vote","Votar" -"Votes Count","Número de votos" -"Votes Count:","Número de votos:" diff --git a/app/locale/es_ES/Mage_ProductAlert.csv b/app/locale/es_ES/Mage_ProductAlert.csv deleted file mode 100644 index 2e7986ee8..000000000 --- a/app/locale/es_ES/Mage_ProductAlert.csv +++ /dev/null @@ -1,35 +0,0 @@ -"Alert Email Sender","Alerta de correo electrónico del remitente" -"Alert subscription has been saved.","Alerta de suscripción guardada." -"Allow Alert When Product Comes Back in Stock","Avisar cuando el producto vuelva a estar en existencias." -"Allow Alert When Product Price Changes","Permitir aviso cuando el precio del producto cambie" -"Click here not to receive alerts for this product","Hacer click aquí para no recibir alertas para este producto" -"Error Email Recipient","Error en el destinatario del mensaje" -"Error Email Sender","Error en el remitente del mensaje" -"Error Email Template","Error en la plantilla del mensaje" -"Frequency","Frecuencia" -"Not enough parameters.","Parámetros insuficientes." -"Price Alert Email Template","Plantilla de correo eléctronico de alerta de precio" -"Price:","Precio:" -"Product Alerts","Alertas de Producto" -"Product Alerts Run Settings","Configuración de la función de alertas de producto" -"Product alerts Cron error","Error de cron de las alertas de producto" -"Product price alert","Alerta de precio del producto" -"Product stock alert","Alerta de producto en existencias" -"Regular Price:","Precio Habitual:" -"Sign up for price alert","Incribirse para alerta de precio" -"Sign up to get notified when this product is back in stock","Inscríbase para ser notificado cuando este producto vuelva a estar en existencias" -"Special price:","Precio especial:" -"Start Time","Tiempo de inicio." -"Stock Alert Email Template","Plantilla de correo electrónico de alerta de existencias" -"The alert subscription has been deleted.","La suscripción de alerta ha sido borrada." -"The alert subscription has been saved.","La suscripción de alerta ha sido guardada." -"The product is not found.","Producto no encontrado." -"The product was not found.","No se encontró el producto." -"Unable to update the alert subscription.","Imposible actualizar la suscripción de alerta." -"Unsubscribe from all price alerts","Darse de baja de todas las alertas de precio" -"Unsubscribe from all stock alerts","Darse de baja de todas las alertas de existencias" -"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","Usted está recibiendo esta notificación porque está suscrito para recibir alertas cuando los siguientes productos vuelvan a estar en existencias:" -"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","Usted está recibiendo esta notificación porque está suscrito para recibir alertas cuando los precios de los siguientes productos cambien:" -"You will no longer receive price alerts for this product.","Usted no recibirá más alertas de precio para este producto." -"You will no longer receive stock alerts for this product.","Usted no recibirá más alertas de existencias para este producto." -"You will no longer receive stock alerts.","Usted no recibirá más alertas de existencias." diff --git a/app/locale/es_ES/Mage_Rating.csv b/app/locale/es_ES/Mage_Rating.csv deleted file mode 100644 index b4dcf1cfd..000000000 --- a/app/locale/es_ES/Mage_Rating.csv +++ /dev/null @@ -1,29 +0,0 @@ -"1 star","1 estrella" -"2 stars","2 estrellas" -"3 stars","3 estrellas" -"4 stars","4 estrellas" -"5 stars","5 estrellas" -"Add New Rating","Agregar nueva puntuación" -"Assigned Options","Opciones asignadas" -"Be the first to review this product","Sea el primero en dejar una reseña para este producto" -"Default Value","Valor predeterminado" -"Delete Rating","Eliminar puntuación" -"Edit Rating","Editar puntuación" -"ID","ID" -"If you do not specify a rating title for a store, the default value will be used.","Si no especifica un título para la puntuación de una tienda, se utilizará el valor predeterminado." -"Manage Ratings","Administrar puntuaciones" -"New Rating","Nueva puntuación" -"Option Label","Etiqueta de opciones" -"Option Title","Título de opciones" -"Option Title:","Título de opciones:" -"Please select one of each ratings above","Seleccione una de las puntuaciones que aparecen más arriba" -"Rating Information","Información sobre la puntuación" -"Rating Name","Nombre de la puntuación" -"Rating Options","Opciones de puntuación" -"Rating Title","Visibilidad de la puntuación" -"Rating Visibility","Visibilidad de la puntuación" -"Rating isn't Available","La puntuación no está disponible" -"Rating with the same title","Puntuación con el mismo título" -"Save Rating","Guardar puntuación" -"Sort Order","Orden de selección" -"Visible In","Visible en" diff --git a/app/locale/es_ES/Mage_Reports.csv b/app/locale/es_ES/Mage_Reports.csv deleted file mode 100644 index 29203806b..000000000 --- a/app/locale/es_ES/Mage_Reports.csv +++ /dev/null @@ -1,174 +0,0 @@ -"Abandoned Carts","Carritos Dejados" -"Abandoned carts","Carros dejados" -"Action","Acción" -"Add to Cart","Añadir al Carrito" -"Add to Compare","Añadir para comparar." -"Add to Wishlist","Añadir a lista que quieres." -"Any","Cualquier" -"Applied Coupon","Descuento Aplicado" -"Applies to Any of the Specified Order Statuses","Se Aplica a Cualquiera de los Estados de Pedido Especificados" -"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","¿Está seguro de que desea actualizar las estadísticas? Podría producirse un fallo en el rendimiento durante dicha operación." -"Are you sure?","¿Está seguro?" -"Avg. Approved Rating","Índice Medio de Aprobados" -"Avg. Rating","Índice Medio" -"Bestsellers","Los más vendidos" -"Bought from wishlists","Comprado desde la lista de deseos" -"CSV","CSV" -"Carts","Carritos" -"Catalog Category (Without Subcategories)","Categoría del catálogo (sin subcategorías)" -"Compared Products Grid Template","Plantilla en Red de los Productos Comparados" -"Compared Products List Template","Plantilla en Lista de los Productos Comparados" -"Coupons","Cupones" -"Coupons Usage Report","Informe del Uso de Cupones" -"Created At","Creado en" -"Current Month Starts","Inicios del Mes Actual" -"Customer","Cliente" -"Customer Name","Nombre del Cliente" -"Customer Tags","Etiquetas del Cliente" -"Customers","Clientes" -"Customers Report","Informe de Clientes" -"Customers Reviews","Revisiones Personalizadas" -"Customers Tags","Etiquetas de Clientes" -"Customers by Number of Orders","Clientes por número de pedidos" -"Customers by Orders Total","Clientes por total de pedidos" -"Customers by number of orders","Clientes por número de pedidos" -"Customers by orders total","Total de clientes por pedidos" -"Customers that have wishlist: %s%","Clientes que tienen lista de deseos: %s%" -"Dashboard","Panel de control" -"Day","Día" -"Default Recently Compared Products Count","Recuento de Productos Comparados Recientemente por Defecto" -"Default Recently Viewed Products Count","Recuento de Productos Vistos Recientemente por Defecto" -"Description","Descripción" -"Detail","Detalles" -"Downloads","Descargas." -"Email","Correo electrónico" -"Empty Rows","Filas Vacías." -"Excel XML","Excel XML" -"Filter","Filtro." -"First Name","Nombre" -"From","De" -"Guest","Invitado" -"Hits","Visitas." -"ID","ID" -"IP Address","Dirección IP" -"Index model name must be defined","Debe definirse el nombre del modelo de índice" -"Invalid date specified.","Fecha especificada no válida." -"Invoiced","Facturado" -"Items in Cart","Artículos en el Carro" -"Last Name","Apellido" -"Last Review","Última Revisión" -"Link","Enlace" -"List of Products Recently Compared and Removed from the Compare List by Visitor","Lista de Productos Comparada y Eliminada Recientemente de la Lista de Comparación por el Visitante" -"List of Products Recently Viewed by Visitor","Lista de Productos Recientemente Examinados por el Visitante" -"Low Stock","Pocas existencias" -"Low stock","Pocas reservas" -"Match Period To","Ajustar el Período A" -"Month","Mes" -"Most Viewed","Los Más Vistos" -"Name","Nombre" -"New Accounts","Cuentas Nuevas" -"No","No" -"Number Added","Número Añadido" -"Number Fulfilled","Número Alcanzado" -"Number Of Reviews","Número de Reseñas" -"Number Purchased","Número de Adquisiciones" -"Number Viewed","Número Visto" -"Number of Items","Cantidad de artículos" -"Number of New Accounts","Número de Nuevas Cuentas" -"Number of Products to display","Número de Productos para exponer" -"Number of Reviews","Número de opiniones" -"Number of Times Deleted","Número de Veces Borrado" -"Number of Total Tags","Número Total de Etiquetas" -"Number of Unique Tags","Número de Etiquetas Únicas" -"Number of Views","Número de Visitas" -"Number of items bought from a wishlist: %s","Número de artículos comprados desde una lista de la compra: %s" -"Number of times wishlists have been shared (emailed): %s","Número de veces que se han compartido (enviado por correo electrónico) las listas de la compra: %s" -"Number of wishlist conversions: %s","Número de conversiones de lista de la compra: %s" -"Number of wishlist referrals: %s","Número de referencias de lista de la compra: %s" -"Number of wishlists: %s","Número de listas de la compra: %s" -"Order Status","Estado del pedido" -"Order Taxes Report Grouped by Tax Rate","Informe de Impuestos de Pedido Agrupados por Tasa Impositiva" -"Orders","Pedidos" -"Out of stock","Agotado" -"Period","Período" -"Poducts Report","Informe de Productos" -"Popular Tags","Etiquetas Populares" -"Popularity","Popularidad" -"Price","Precio" -"Product Name","Nombre de Producto" -"Product Reviews","Opiniones de Producto" -"Product SKU","Unidad de Mantenimiento de Existencias de Producto" -"Product Tags","Etiqueta de Producto" -"Products","Productos" -"Products Ordered","Productos Encargados" -"Products Report","Informe de Productos" -"Products Reviews","Opiniones de Productos" -"Products Tags","Etiquetas de Productos" -"Products in carts","Productos en carros de la compra" -"Purchases","Adquisiciones" -"Quantity Ordered","Cantidad Pedida" -"Quantity of Items","Cantidad de Artículos" -"Recently Compared","Comparados recientemente" -"Recently Compared Products","Productos recientemente comparados" -"Recently Viewed","Vistos recientemente" -"Recently Viewed Products","Productos vistos recientemente" -"Recently Viewed/Compared Products","Productos recientemente vistos/comparados" -"Refresh Lifetime Statistics","Actualiza estadísticas del ciclo total" -"Refresh Statistics","Actualiza estadísticas" -"Refresh Statistics for the Last Day","Actualiza estadísticas del último día" -"Refunds","Reembolsos" -"Report","Informe" -"Reports","Informes" -"Results","Resultados" -"Revenue","Ingresos" -"Review","Revisión" -"Reviews","Reseñas" -"Reviews for %s","Reajustes del %s" -"Sales","Ventas" -"Sales Report","Informe de ventas" -"Search Query","Query de Búsqueda" -"Search Terms","Términos de búsqueda" -"Select day of the month.","Selecciona día del mes" -"Shipping","Transporte" -"Shopping Cart","Cesta de la Compra" -"Shopping Cart Price Rule","Regla del precio del carrito de la compra." -"Show Actual Values","Muestra los valores actuales" -"Show Report","Muestra el informe" -"Show for Current","Muestra los actuales" -"Specified","Especificado" -"Statistics","Estadísticas" -"Stock Qty","Cantidad de existencias" -"Submitted In","Presentados en" -"Submitted On","Presentados a" -"Subtotal","Subtotal" -"Tag","Etiqueta" -"Tag ""%s"" details","Datos de la pestaña""%s""" -"Tag Detail","Detalle de etiqueta" -"Tag Name","Nombre de la etiqueta" -"Tag Use","Uso de etiqueta" -"Tags Submitted by %s","Etiquetas presentadas por %" -"Tags submitted to %s","Estiquetas presentadas a %" -"Tax","Impuestos" -"Title","Título" -"To","Para" -"Total","Total" -"Total Invoiced vs. Paid Report","Total facturado vs. Informe de pagos" -"Total Ordered Report","Informe del total solicitado" -"Total Refunded Report","Informe del total reembolsado" -"Total Shipped Report","Informe del total enviado" -"Total Tags","Total de etiquetas" -"Total invoiced","Total facturado" -"Total refunded","Total reembolsado" -"Updated At","Hora de actualización" -"Viewed Products Grid Template","Ver plantilla de cuadrícula de productos" -"Viewed Products List Template","Plantilla de lista de productos vistos" -"Visible In","Visible en" -"Wishlist Report","Informe de lista de deseos" -"Wishlist vs. Regular Order","Lista de deseos vs. Orden regular" -"Wishlists","Lista de deseos" -"Year","Año" -"Year-To-Date Starts","Arranques desde principios de año hasta la fecha" -"Yes","Sí" -"Your Recently Compared","Lo que ha comparado recientemente" -"Your Recently Viewed","Sus vistas recientes" -"undefined","Indefinido" diff --git a/app/locale/es_ES/Mage_Review.csv b/app/locale/es_ES/Mage_Review.csv deleted file mode 100644 index e165d8739..000000000 --- a/app/locale/es_ES/Mage_Review.csv +++ /dev/null @@ -1,104 +0,0 @@ -"%d Review(s)","%d Revisión(es)" -"%s Review(s)","%s Revisión(es)" -"(Posted on %s)","(Publicado en %s)" -"1 star","1 estrella" -"2 star","2 estrellas" -"2 stars","2 estrellas" -"3 star","3 estrellas" -"3 stars","3 estrellas" -"4 star","4 estrellas" -"4 stars","4 estrellas" -"5 star","5 estrellas" -"5 stars","5 estrellas" -"%2$s %3$s (%4$s)","%2$s %3$s (%4$s)" -"Add New Review","Añadir Nueva Revisión" -"Add Your Review","Añadir Tu Revisión" -"Administrator","Administrador" -"All Reviews","Todas las Revisiones" -"All Reviews of Customer `%s`","Todas las Revisiones del Clientes `%s`" -"All Reviews of Product `%s`","Todas las reseñas del producto `%s`" -"Allow Guests to Write Reviews","Permitir a los Invitados Escribir Revisiones" -"Approved","Aprobado" -"Are you sure you want to do this?","¿Estás seguro de querer hacer esto?" -"Are you sure?","¿Está seguro?" -"Average Customer Rating","Valoración Media de Clientes" -"Average Customer Rating:","Revisión Media de Clientes:" -"Back","Volver" -"Back to Main Product Info","Volver a Información Principal del Producto" -"Back to My Reviews","Volver a Mis Revisiones" -"Back to Product Reviews","Volver a Revisiones de Producto" -"Be the first to review this product","Sea el primero en dejar una reseña para este producto" -"Catalog Product Review View","Vista de Revisiones de Producto de Catálogo" -"Catalog Product Reviews List","Lista de Revisiones de Producto de Catálogo" -"Created On","Creado En" -"Customer","Cliente" -"Customer My Account Product Reviews","Revisiones de Producto de Mi Cuenta de Cliente" -"Customer My Account Review Details","Detalles de Revisión de Mi Cuenta de Cliente" -"Customer Reviews","Revisiones de Cliente" -"Customers Reviews","Reseñas de Clientes" -"Delete","Eliminar" -"Delete Review","Borrar Revisiones" -"Detailed Rating","Valoración Detallada" -"Edit Review '%s'","Editar Revisión '%s'" -"Guest","Invitado" -"How do you rate this product?","¿Cómo valoras este producto?" -"ID","Identificación" -"Let us know your thoughts","Háganos llegar su opinión" -"Manage Ratings","Administrar puntuaciones" -"My Product Reviews","Revisiones de Mi Producto" -"My Recent Reviews","Mis Revisiones Recientes" -"Name","Nombre" -"Name in Store","Nombre en la Tienda" -"New Review","Nueva Revisión" -"Nickname","Apodo" -"Nickname can\'t be empty","El apodo no puede estar vacío" -"Not Approved","No aprobado" -"Only registered users can write reviews. Please, log in or register","Sólo usuarios registrados pueden escribir sus opiniones. Conéctese o regístrese" -"Pending","Pendiente" -"Pending Reviews","Revisiones Pendientes" -"Pending Reviews of Customer `%s`","Revisiones Pendientes del Cliente `%s`" -"Please select a product","Por favor, selecciona un producto" -"Please select one of each of the ratings above","Por favor, selecciona una de cada una de las revisiones que aparecen encima" -"Posted By","Publicado Por" -"Price","Precio" -"Product","Producto" -"Product Name","Nombre de Producto" -"Product Rating","Valoración de Producto" -"Product Rating:","Valoración de Producto:" -"Product Review (submitted on %s):","Revisión de Producto (enviada en %s):" -"Product Reviews","Opiniones de Producto" -"Product SKU","Unidad de Mantenimiento de Existencias de Producto" -"Products Reviews","Reseñas de Productos" -"Qty","Cantidad" -"Rating:","Valoración:" -"Review","Revisión" -"Review (submitted on %s):","Revisión (enviada en %s):" -"Review Details","Detalles de Revisión" -"Review Form Fields Before","Revisar campos del formulario antes" -"Review by %s","Revisado por %s" -"Review by %s","Revisión por %s" -"Review can\'t be empty","La opinión no puede estar vacía" -"Review summary can\'t be empty","El resumen de la opinión no puede estar vacío" -"Reviews and Ratings","Revisiones y Valoraciones" -"SKU","Número de referencia" -"Save Review","Guardar Revisión" -"Status","Estado" -"Submit Review","Enviar Revisión" -"Summary Rating","Valoración Resum" -"Summary of Review","Resumen de Revisión" -"Summary of Your Review","Resumen de Tu Revisión" -"Title","Título" -"Type","Tipo" -"Unable to post the review.","No ha sido posible publicar la revisión." -"Update Status","Actualizar Estado" -"View All Reviews","Ver Todas las Revisiones" -"View Details","Ver detalles" -"Visible In","Visible en" -"Websites","Páginas web" -"What's your nickname?","¿Cuál es su alias?" -"Write Your Own Review","Escribir Tu Propia Revisión" -"You have submitted no reviews.","No has enviado ninguna revisión." -"You're reviewing:","Estás revisando:" -"Your Rating:","Tu Valoración:" -"Your Review (submitted on %s):","Tu Revisión (enviada en %s):" -"Your review has been accepted for moderation.","Tu revisión se ha aceptado para ser moderada." diff --git a/app/locale/es_ES/Mage_Rss.csv b/app/locale/es_ES/Mage_Rss.csv deleted file mode 100644 index e986036cb..000000000 --- a/app/locale/es_ES/Mage_Rss.csv +++ /dev/null @@ -1,56 +0,0 @@ -"%s - Discounts and Coupons","%s - Descuentos y cupones" -"%s - Special Products","%s - Productos especiales" -"%s RSS Feed","Fuente RSS de %s" -"%s has reached a quantity of %s.","%s ha alcanzado una cantidad de %s" -"%s\'s Wishlist","%s's Lista" -"Cannot retrieve the wishlist","No se puede recuperar la lista de regalos" -"Catalog","Catálogo" -"Category Feeds","Fuentes por categoría" -"Click for price","Clic para precio" -"Comment: %s
    ","Comentario: %s
    " -"Coupons/Discounts","Cupones/descuentos" -"Current Status: %s
    ","Estado actual: %s
    " -"Customer Name: %s","Estado actual: %s" -"Customer Order Status Notification","Notificación de estado de pedido del cliente" -"Details for %s #%s","Detalles para %s #%s" -"Discount","Descuento" -"Discount (%s)","Descuento (%s)" -"Enable RSS","Activar RSS" -"Error in processing xml. %s","Error al procesar xml. %s" -"From:","Desde:" -"Get Feed","Obtener fuente" -"Gift Message","Mensaje de Regalo" -"Grand Total","Suma total" -"Low Stock Products","Productos con baja cantidad en inventario" -"Message:","Mensaje:" -"Miscellaneous Feeds","Fuentes varias" -"New Orders","Nuevos pedidos" -"New Products","Nuevos productos" -"New Products from %s","Nuevos pedidos de %s" -"Notified Date: %s
    ","Fecha de notificación: %s
    " -"Order # %s Notification(s)","Notificaciones del pedido n.º %s" -"Order #%s created at %s","El pedido n.º %s se creó a las %s" -"Pending product review(s)","Reseñas pendientes para el producto" -"Product: ""%s"" review By: %s","Producto: valoración ""%s"" De: %s" -"Product: %s
    ","Producto: %s
    " -"Products tagged with %s","Productos etiquetados c %s" -"Purchased From: %s","Comprados a %s" -"RSS","RSS" -"RSS Feeds","Fuentes RSS" -"RSS Feeds List","Lista de fuentes RSS" -"RSS Feeds Section","Sección de fuentes RSS" -"Review: %s
    ","Reseña: %s
    " -"Rss Config","Configuración de RSS" -"Shipping & Handling","Envío y preparación" -"Special Products","Productos especiales" -"Store: %s
    ","Tienda: %s
    " -"Subtotal","Subtotal" -"Summary of review: %s
    ","Resumen de reseña: %s
    " -"Tags Products","Etiquetas de productos" -"Tax","Impuestos" -"There are no Rss Feeds","No hay fuentes RSS" -"To:","A:" -"Top Level Category","Categoría de nivel superior" -"Total: %s
    ","Total: %s
    " -"Wishlist","Lista de deseos" -"click here to view the review","haga clic aquí para ver la valoración" diff --git a/app/locale/es_ES/Mage_Rule.csv b/app/locale/es_ES/Mage_Rule.csv deleted file mode 100644 index 6b7e4fcdf..000000000 --- a/app/locale/es_ES/Mage_Rule.csv +++ /dev/null @@ -1,40 +0,0 @@ -"ALL","TODO" -"ANY","ALGUNOS" -"Add","Agregar" -"Apply","Solicitar" -"Conditions Combination","Combinación de condiciones" -"Customer Groups must be specified.","Se deben especificar los grupos de clientes." -"End Date must be greater than Start Date.","La fecha de cierre debe ser posterior a la fecha de comienzo." -"FALSE","FALSO" -"If %s of these conditions are %s:","Si %s de estas condiciones son %s:" -"Invalid discount amount.","La cantidad del descuento no es válida." -"Open Chooser","Abrir selector" -"Perform following actions","Realizar las siguientes acciones" -"Please choose a condition to add...","Por favor, elige una condición para añadir..." -"Please choose an action to add...","Elija una opción para añadir..." -"Remove","Eliminar" -"TRUE","VERDADERO" -"There is no information about associated entity type ""%s"".","No hay información acerca del tipo de entidad asociada ""%s""." -"Websites must be specified.","Se deben especificar las páginas web." -"by","por" -"contains","contiene" -"does not contain","no contiene" -"does not contains","no contiene" -"equals or greater than","igual o mayor que" -"equals or less than","igual o menor que" -"for","para" -"for greater than","para mayor que" -"for or greater than","para o mayor que" -"found","Encontrado." -"from","desde" -"greater than","mayor que" -"is","Es." -"is not","No es." -"is not one of","no es uno de" -"is one of","es uno de" -"less than","menor que" -"not found","No encontrado." -"not from","no desde" -"to","a" -"was","fue" -"was not","no fue" diff --git a/app/locale/es_ES/Mage_Sales.csv b/app/locale/es_ES/Mage_Sales.csv deleted file mode 100644 index 51a9432b4..000000000 --- a/app/locale/es_ES/Mage_Sales.csv +++ /dev/null @@ -1,882 +0,0 @@ -"""%s"" coupon code is not valid.","El código de cupón ""%s"" no es válido." -"%s","%s" -"%s / %s rate:","Tasa %s / %s:" -"%s for %s","%s por %s" -"%s order(s) cannot be canceled","El(los) pedido(s) no pueden cancelarse" -"%s order(s) have been canceled.","Se ha(n) cancelado %s pedidos." -"%s order(s) have been put on hold.","Se ha(n) puesto en espera %s pedido(s)." -"%s order(s) have been released from holding status.","%s pedido(s) se ha(n) liberado de su estado de espera." -"%s order(s) were not put on hold.","El(los) pedido(s) %s no se han puesto en espera." -"%s order(s) were not released from holding status.","El(los) pedido(s) %s no han sido liberados del estado de espera." -"* - Enter custom price excluding tax","* - Introduzca el precio a medida sin impuestos" -"* - Enter custom price including tax","* - Introduzca el precio a medida con impuestos" -"* Required Fields","* Campos obligatorios" -"-- Please Select --","-- Seleccionar, por favor --" -"-- Please Select Billing Agreement--","-- Por favor, Seleccione el Acuerdo de Facturación--" -"About This Order:","En Relación con Este Pedido:" -"About This Profile:","En Relación con Este Perfil:" -"About Your Invoice","Acerca de su factura" -"About Your Order","En Relación con Su Pedido" -"About Your Refund","Acerca de su devolución" -"About Your Shipment","Acerca de su envío" -"Accept Payment","Aceptar Pago" -"Accept or Deny Payment","Aceptar o Rechazar Pago" -"Account Information","Información de Cuenta" -"Action","Acción" -"Actions","Acciones" -"Activate","Activar" -"Active","Activo" -"Add","Agregar" -"Add New Address","Añadir Nueva Dirección" -"Add Order Comments","Añadir Comentarios al Pedido" -"Add Package","Añadir Paquete" -"Add Products","Añadir productos" -"Add Selected Product(s) to Option","Añadir el(los) Producto(s) Seleccionado(s) a la Opción" -"Add Selected Product(s) to Order","Añadir el(los) Producto(s) Seleccionado(s) al Pedido" -"Add Selected Product(s) to Package","Añadir Producto(s) Seleccionado(s) al Paquete" -"Add To Order","Añadir al Pedido" -"Add Tracking Number","Añadir Código de Seguimiento" -"Add comment to order","Añadir comentario al pedido" -"Add new comment to credit memo","Añadir un nuevo comentario al abono" -"Add new comment to shipment","Añadir un nuevo comentario al envío" -"Add new tracking number","Añadir un nuevo código de seguimiento" -"Add to Cart","Añadir al Carrito" -"Additional Product Info","Información adicional del producto" -"Address","Dirección" -"Address model is not defined.","No se ha definido el modelo de dirección." -"Adjustment Fee","Tarifa de Ajuste" -"Adjustment Refund","Reembolso de Ajuste" -"Agreement Information","Información del Acuerdo" -"Allow Reorder","Permitir Volver a Pedir" -"Amount","Importe" -"Amount: %s.","Cantidad: %s." -"An error occurred while assigning order status. Status has not been assigned.","Ha ocurrido un error al asignar el estado de su pedido. No se ha asignado estado." -"An error occurred while creating shipping label.","Se produjo un error al crear la etiqueta de envío." -"An error occurred while saving order status. The status has not been added.","Ha ocurrido un error al guardar el estado del pedido. No se ha añadido el estado." -"An error occurred while unassigning order status.","Ha ocurrido un error al desasignar el estado del pedido." -"An error occurred while updating the order address. The address has not been changed.","Ha ocurrido un error al actualizar la dirección del pedido. La dirección no se ha cambiado." -"An item option with code %s already exists.","Ya existe una opción de artículo con el código %s." -"Anchor Custom Title","Anclar Título Personalizado" -"Append Comments","Agregar Comentarios" -"Apply","Solicitar" -"Apply Coupon Code","Usar el Código del Cupón" -"Approved the payment online.","El pago ha sido aprobado a distancia." -"Are you sure you want to accept this payment?","¿Está seguro de que quiere aceptar este pago?" -"Are you sure you want to cancel this order?","¿Está seguro de que quiere cancelar este pedido?" -"Are you sure you want to delete all items from shopping cart?","¿Seguro que quiere borrar todos los artículos del carro de la compra?" -"Are you sure you want to deny this payment?","¿Está seguro de que quiere rechazar este pago?" -"Are you sure you want to do this?","¿Estás seguro de querer hacer esto?" -"Are you sure you want to send Creditmemo email to customer?","¿Está seguro de que quiere enviar al cliente un mensaje electrónico de nota de abono?" -"Are you sure you want to send Invoice email to customer?","¿Está seguro de que quiere enviar al cliente un mensaje electrónico de factura?" -"Are you sure you want to send Shipment email to customer?","¿Está seguro de que quiere enviar al cliente un mensaje electrónico de Envío?" -"Are you sure you want to send order email to customer?","¿Está seguro de que quiere enviar al cliente un mensaje electrónico de pedido?" -"Are you sure you want to void the payment?","¿Está seguro de que quiere invalidar el pago?" -"Are you sure?","¿Está seguro?" -"Are you sure? This order will be canceled and a new one will be created instead","¿Está seguro? Este pedido será cancelado y se creará uno nuevo en su lugar" -"Assign Order Status to State","Asignar estado de pedido a estado" -"Assign Status to State","Asignar estado a estado" -"Assignment Information","Información de asignación" -"At least a payment ID must be set.","Debe establecerse por lo menos un número de identificación de pago." -"Authorization","Autorización" -"Authorized amount of %s.","Cantidad autorizada de %s." -"Authorizing amount of %s is pending approval on gateway.","Cantidad autorizada de %s en espera de aprobación de la interfaz" -"Back","Volver" -"Back to Billing Agreements","Volver a los contratos de facturación" -"Back to My Orders","Volver a mis pedidos" -"Back to Recurring Profiles","Volver a los perfiles de suscripción" -"Backordered","Pendientes de entrega" -"Bestsellers","Los más vendidos" -"Bill to Name","Nombre de la factura" -"Billing","Facturación" -"Billing Address","Dirección de facturación" -"Billing Agreement","Acuerdo de facturación" -"Billing Agreement # %s","Contrato de facturación # %s" -"Billing Agreement #%s","Contrato de facturación # %s" -"Billing Agreement View","Ver contrato de facturación" -"Billing Agreements","Contratos de facturación" -"Billing Last Name","Apellido para Facturación" -"Billing ZIP Code","Código Postal para Facturación" -"Buy %s for price %s","Comprar %s por precio %s" -"CSV","CSV" -"Cancel","Cancelar" -"Cancel credit memo","Cancelar el abono" -"Cancel invoice","Cancelar la factura" -"Cancel order","Cancelar el pedido" -"Canceled","Cancelado" -"Canceled order offline.","Cancelar pedido offline." -"Canceled order online.","Cancelar pedido online." -"Cannot add order history.","No se puede añadir el historial de pedidos." -"Cannot create an empty shipment.","No se puede crear un pedido vacío." -"Cannot determine the field name.","No se puede determinar el nombre del campo." -"Cannot do invoice for order.","No se puede hacer factura para el pedido." -"Cannot do shipment for order.","No se puede hacer el envío para el pedido." -"Cannot get order instance","No se puede obtener instancia para el pedido." -"Cannot get the order instance.","No se puede obtener una instancia para el pedido." -"Cannot register an existing credit memo.","No se puede registrar la nota de crédito existente." -"Cannot register existing invoice","No se puede registrar la factura existente." -"Cannot register existing shipment","No se puede registrar el envío existente." -"Capture","Captura" -"Capture Amount","Captura de importe" -"Capture Offline","Captura offline" -"Capture Online","Captura online" -"Capture invoice","Captura de factura" -"Captured amount of %s online.","Captura de importe de %s online." -"Capturing amount of %s is pending approval on gateway.","La captura de importe de %s está pendiente de aprobación por la pasarela de pago." -"Carrier","Transportista" -"Carrier/Method","Compañía/Método" -"Change status, add comments","Cambiar estatus, añadir comentarío" -"Changing address information will not recalculate shipping, tax or other order amount.","Al cambiar la información de la dirección no se recalculan el envío, los impuestos ni el total del pedido." -"Checkout Totals Sort Order","Verificar los totales ordenados de los pedidos" -"City","Ciudad" -"Clear Shopping Cart","Vaciar carro de la compra" -"Click to change shipping method","Haz click aquí para cambiar el método de envío" -"Close","Cerrar" -"Closed","Cerrado" -"Comma-separated.","Separados por comas." -"Comment","Comentario" -"Comment Text","Comentar el texto" -"Comments","Comentarios" -"Comments History","Historial de comentarios" -"Company","Compañía" -"Complete","Completo" -"Configure","Configurar" -"Configure and Add to Order","Configurar y añadir a pedido" -"Contents","Contenido" -"Continue","Continuar" -"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","Controla si la IP del cliente se muestra en los pedidos, las facturas, los envíos y los abonos." -"Country","País" -"Coupons","Cupones" -"Create","Crear." -"Create New Customer","Crear un nuevo cliente" -"Create New Order","Crear un nuevo pedido" -"Create New Order Status","Crear nuevo estado de pedido" -"Create New Order for %s","Crea un nuevo pedido para %s" -"Create New Order for %s in %s","Crear un nuevo pedido para %s en %s" -"Create New Order for New Customer","Crear un nuevo pedido para un nuevo cliente" -"Create New Order for New Customer in %s","Crear un nuenvo pedido para un nuevo cliente en %s" -"Create New Status","Crear nuevo estado" -"Create Order","Crear pedido" -"Create Packages","Crear Paquetes" -"Create Shipment","Crear envío" -"Create Shipping Label","Crear Etiqueta de Envío" -"Create Shipping Label...","Crear Etiqueta de Envío..." -"Create new credit memo for order","Crear un nuevo abono para un pedido" -"Create new invoice for order","Crear nueva factura para el pedido" -"Create new shipment for order","Crear nuevo envío para el pedido" -"Create...","Crear..." -"Created At","Creado en" -"Created billing agreement #%s.","Crear contrato de facturación #%s." -"Created:","Creado:" -"Credit Memo","Factura rectificativa" -"Credit Memo #","Nota de Crédito #" -"Credit Memo # "," # de Credit Memo" -"Credit Memo #%1$s | %3$s | %2$s (%4$s)","Factura rectificativa nº %1$s | %3$s | %2$s (%4$s)" -"Credit Memo Comment Email Sender","Remitente del comentario por email de la factura rectificativa" -"Credit Memo Comment Email Template","Plantilla de comentario por email de la factura rectificativa" -"Credit Memo Comment Email Template for Guest","Plantilla de comentario por email de la factura rectificativa para invitados" -"Credit Memo Comments","Comentarios de la factura rectificativa" -"Credit Memo Email Sender","Remitente del email de la factura rectificativa" -"Credit Memo Email Template","Plantilla para el email de la factura rectificativa" -"Credit Memo Email Template for Guest","Plantilla para el email de la factura rectificativa para invitados" -"Credit Memo Update","Actualización de la factura rectificativa" -"Credit Memo Update for Guest","Actualización de la factura rectificativa para invitados" -"Credit Memos","Facturas rectificativas" -"Credit memo canceling problem.","Problema con la cancelación del abono." -"Credit memo cannot be canceled.","No se puede cancelar el abono." -"Credit memo has been created automatically","La nota de crédito se ha creado de forma automática" -"Custom Price","Precio personalizado" -"Custom Value","Valor personalizado" -"Customer","Cliente" -"Customer Can Define Start Date","El cliente puede fijar la fecha de inicio" -"Customer Email","Dirección de correo electrónico del cliente" -"Customer Group","Grupo de Clientes" -"Customer Last Name","Apellido del cliente" -"Customer My Account Order Creditmemo View","Vista de la factura rectificativa del pedido de «mi cuenta» del cliente" -"Customer My Account Order History","Historial de pedidos de «mi cuenta» del cliente" -"Customer My Account Order Invoice View","Vista de la factura del pedido de «mi cuenta» del cliente" -"Customer My Account Order Shipment View","Vista del envío del pedido de «mi cuenta» del cliente" -"Customer My Account Order View","Vista del pedido de «mi cuenta» del cliente" -"Customer Name","Nombre del Cliente" -"Customer\'s Current Activities","Actividades actuales del cliente" -"Customs Value","Valor en Aduana" -"Date","Fecha" -"Date Shipped","Fecha de Envío" -"Default Status","Estado por defecto" -"Default Template","Plantilla predeterminada" -"Default logo, will be used in PDF and HTML documents.
    (jpeg, tiff, png) If you see image distortion in PDF, try to use larger image","Se utilizará el logotipo por defecto en los documentos PDF y HTML.
    (jpeg, tiff, png) si ve la imagen distorsionada en PDF, utilice una imagen más grande" -"Delete","Eliminar" -"Delete Package","Eliminar Paquete" -"Denied the payment online.","Denegado el pago online." -"Deny Payment","Denegar el pago" -"Description Message","Mensaje de descripción" -"Discount","Descuento" -"Discount (%s)","Descuento (%s)" -"Discount Amount","Cantidad Descontada" -"Display Order ID in Header","Mostrar la ID del Pedido en el Encabezado" -"Edit","Editar" -"Edit Order #%s","Modificar el pedido nº %s" -"Edit Order %s %s Address","Editar la dirección del pedido %s %s" -"Edit Order Status","Editar estado de pedido" -"Email","Correo electrónico" -"Email Address","Dirección de correo electrónico" -"Email Copy of Credit Memo","Enviar una copia de la factura rectificativa por correo electrónico" -"Email Copy of Invoice","Enviar por Email Copia de Factura" -"Email Copy of Shipment","Enviar una copia del envío por correo electrónico" -"Email Order Confirmation","Enviar por Email Confirmación de Pedido" -"Enable","Habilitar" -"Enabled","Habilitado" -"Enter the billing last name and email/ZIP as in the order billing address","Introduce el apellido y correo electrónico/código postal para facturación como en la dirección de facturación del pedido" -"Entered data is incorrect. Please try again.","Los datos introducidos son incorrectos. Por favor, inténtalo de nuevo." -"Error to Show in Shopping Cart","Error a mostrar en la cesta de la compra" -"Excel XML","Excel XML" -"Excl. Tax","Sin impuestos" -"Expired","Caducado" -"Explanation","Explicación" -"Failed to cancel the billing agreement.","No se ha podido cancelar el acuerdo de facturación" -"Failed to create billing agreement for this order.","No se ha podido crear un acuerdo de facturación para este pedido." -"Failed to finish billing agreement wizard.","El asistente de acuerdos de facturación no ha podido finalizar." -"Failed to send the order email.","No se pudo enviar el email del pedido." -"Failed to start billing agreement wizard.","El asistente de acuerdos de facturación no ha podido iniciarse." -"Failed to update the payment.","No se pudo actualizar el pago." -"Failed to update the profile.","No se ha podido actualizar el perfil." -"Failed to void the payment.","No se pudo anular el pago." -"Fetch","Capturar" -"File extension not known or unsupported type in the following shipment: %s","Extensión de archivo desconocida o no se admite el tipo en el siguiente envío:% s" -"Find Order By:","Buscar Pedido Por:" -"First Name","Nombre" -"From","Desde" -"From Name","Por nombre" -"From:","De:" -"G.T. (Base)","G.T. (Base)" -"G.T. (Purchased)","G.T. (Comprado)" -"General","General" -"General Information","Información General" -"Get Payment Update","Recibir la actualización de pago" -"Get Update","Actualizar" -"Get shipping methods and rates","Obtener métodos de envío y tarifas" -"Gift Message","Mensaje regalo" -"Gift Message for This Order","Mensaje de regalo para este pedido" -"Gift Message for the Entire Order","Mensaje de Regalo por Todo el Pedido" -"Gift Message for this Order","Mensaje de regalo para este pedido" -"Gift Options","Opciones de regalo" -"Gift Wrapping for the Entire Order","Papel para regalo para el Pedido completo" -"Girth","Circunferencia" -"Go to Home Page","Go to Home Page" -"Grand Total","Suma total" -"Grand Total to be Charged","Importe total a cobrar" -"Guest","Invitado" -"Height","Altura" -"Hide Customer IP","Ocultar la IP del cliente" -"Hold","Espera" -"Hold action is not available.","La acción reservar no está disponible" -"Hold order","Reservar pedido" -"Home","Home" -"ID","ID" -"ID #","ID #" -"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"". Credit Memo has not been created. Please create offline Credit Memo.","IPN ""Reembolsado"". Reembolso expedido por el minorista. Notificación registrada sobre la cantidad reembolsada %s. ID de la transacción: ""%s"". No se ha creado una nota de crédito. Por favor, cree una nota de crédito fuera de línea." -"If empty, the default description above will be used.","Si está vacío, se utilizará la descripción predeterminada anterior." -"If empty, the default error above will be used.","Si está vacío, el error por defecto superior se utilizará." -"If the invoice was created offline, try creating an offline creditmemo.","Si la factura se creó fuera de línea, intente crear un creditmemo en línea." -"Incl. Tax","Impuestos incluidos" -"Information","Información" -"Initial Fee","Tarifa inicial" -"Initial Fees","Tarifas Iniciales" -"Initial period payment","Período inicial de pago." -"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","Información insuficiente para crear etiquetas de envío. Por favor, verifique su información y sus preferencias de envío." -"Invalid block: %s.","Bloque no válido: %s." -"Invalid carrier specified.","Empresa especificada no válida." -"Invalid draw line data. Please define ""lines"" array.","Datos de trazado de línea inválidos. Por favor, define la selección de ""líneas""." -"Invalid entity model","Modelo de entidad inválido" -"Invalid item option format.","Formato de opción de artículo no válido." -"Invalid qty to invoice item ""%s""","Cantidad inválida para facturar el artículo ""%s""" -"Invalid qty to refund item ""%s""","Cantidad inválida para reembolsar el artículo ""%s""" -"Invalid qty to ship for item ""%s""","Cantidad inválida para enviar el artículo ""%s""" -"Invalid renderer model","No válido el modelo renderer" -"Invalid request for adding product to quote.","Petición no válida para añadir el producto para presupuesto." -"Invalid value(s) for Qty to Ship","Valor(es) invalidos de Cantidad para Envio" -"Invoice","Factura" -"Invoice #","Factura #" -"Invoice # ","Invoice # " -"Invoice #%1$s | %2$s | %4$s (%3$s)","Factura #%1$s | %2$s | %4$s (%3$s)" -"Invoice #%s","Factura #%s" -"Invoice Comment Email Sender","Comentarios sobre la factura en el email del vendedor." -"Invoice Comment Email Template","Plantilla de email de comentario de factura." -"Invoice Comment Email Template for Guest","Plantilla de Email de Comentario de Factura para Huésped" -"Invoice Comments","Comentarios de factura" -"Invoice Date","Fecha de factura" -"Invoice Email Sender","Remitente de Email de Factura" -"Invoice Email Template","Plantilla de email de factura" -"Invoice Email Template for Guest","Plantilla de email de factura para cliente" -"Invoice Update","Actualización de factura" -"Invoice Update for Guest","Actualización de factura para el cliente" -"Invoice and Packing Slip Design","Diseño de Funda de Factura y Embalaje" -"Invoice and Ship","Factura y envío" -"Invoice canceling problem.","Problema de cancelación de factura." -"Invoice cannot be canceled.","La factura no puede cancelarse." -"Invoice cannot be captured.","La factura no puede ser capturada." -"Invoice cannot be voided.","La factura no se puede anular." -"Invoice capturing problem.","Problema de captura de factura." -"Invoice void problem","Problema de factura nula" -"Invoice will be created without communication with payment gateway.","Se creará la factura sin comunicación con la pasarela de pago." -"Invoiced","Facturado" -"Invoices","Facturas" -"Is Closed","Está cerrado" -"Item","Artículo" -"Item Status","Estado del artículo" -"Item object is not specified.","Objeto del artículo no especificado." -"Item options declaration error.","Error de declaración de opciones de artículo." -"Item ordered qty","Artículo pedido qty" -"Item qty declaration error.","Declaración de error del artículo qty" -"Items","Artículos" -"Items Invoiced","Artículos facturados." -"Items Ordered","Artículos Pedidos" -"Items Refunded","Artículos devueltos" -"Items Shipped","Artículos enviados" -"Items in the Package","Artículos en el Paquete" -"Items maximum quantity or price do not allow checkout.","Máxima cantidad de artículos o precio no permiten la compra." -"Items options declaration error.","Declaración de error de opciones de artículos" -"Items to Refund","Artículos para devolver" -"Items to Ship","Artículos a Enviar" -"Key","Clave" -"Last Name","Apellido" -"Last Ordered Items","Últimos Artículos Pedidos" -"Last status can\'t be unassigned from state.","El último estado no puede estar sin asignar desde estado." -"Length","Longitud" -"Link to the New Order","Enlace al Nuevo Pedido" -"Link to the Previous Order","Enlace al Pedido Anterior" -"Logo for HTML Print View","Logo para la Vista de Impresión HTML" -"Logo for HTML documents only. If empty, default will be used.
    (jpeg, gif, png)","Logotipo únicamente de documentos HTML. Si está vacío, se usará el logotipo por defecto.
    (jpeg, gif, png)" -"Logo for PDF Print-outs (200x50)","Logo para Impresiones PDF (200x500)" -"Make Check payable to:","Extender el cheque a nombre de:" -"Manage","Gestionar" -"Maximum amount available to refund is %s","La cantidad máxima disponible para reembolso es %s" -"Maximum shipping amount allowed to refund is: %s","La cantidad máxima de reembolso por envío permitida es: %s" -"Message","Mensaje" -"Message:","Mensaje:" -"Minimum Amount","Cantidad Mínima" -"Minimum Order Amount","Pedido mínimo" -"Mixed","Mixto" -"Most Viewed","Más visto" -"Most Viewed Products Report","Informe de productos más vistos" -"Move to Shopping Cart","Mover al Carro de la Compra" -"Move to Wishlist","Trasladar a la Lista de Deseos" -"Multi-address Description Message","Mensaje de Descripción Multi-dirección" -"Multi-address Error to Show in Shopping Cart","Error de Multi-dirección para Mostrar en Carro de Compra" -"My Orders","Mis pedidos" -"My Orders - Details","Mis Pedidos - Detalles" -"N/A","N/A" -"Name","Nombre" -"New","Nuevo" -"New Billing Agreement","Nuevo Acuerdo de Facturación" -"New Credit Memo","Nueva Factura de Abono" -"New Credit Memo for Guest","Nueva Nota de Crédito para Huésped" -"New Credit Memo for Invoice #%s","Nueva Nota de Crédito para Factura #%s" -"New Credit Memo for Order #%s","Nueva Nota de Crédito para Pedido #%s" -"New Invoice","Nueva Factura" -"New Invoice and Shipment for Order #%s","Nueva Factura y Envío de Pedido #%s" -"New Invoice for Guest","Nueva Factura para Cliente" -"New Invoice for Order #%s","Nueva Factura para el Pedido #%s" -"New Order","Nuevo Pedido" -"New Order Confirmation Email Sender","Nueva Confirmación de Pedido de correo electrónico del Remitente" -"New Order Confirmation Template","Plantilla de Confirmación de Nuevo Pedido" -"New Order Confirmation Template for Guest","Nueva Confirmación de Pedido de Plantilla para Cliente" -"New Order RSS","Nuevo Pedido RSS" -"New Order Status","Estado de los nuevos pedidos" -"New Order for Guest","Nuevo Pedido para Cliente" -"New Shipment","Nuevo Envío" -"New Shipment for Guest","Nuevo Envío para Cliente" -"New Shipment for Order #%s","Nuevo Envío del Pedido #%s" -"Newsletter Subscription","Suscripción al Newsletter" -"No","No" -"No Items","No hay Artículos" -"No Items To Refund","Sin Artículos que Reembolsar" -"No Payment Methods","Sin Formas de Pago" -"No detail for number ""%s""","Sin detalles del número ""%s""" -"No information available.","No hay información disponible." -"No items","No hay artículos" -"No order(s) were put on hold.","Ningún pedido fue puesto en suspenso." -"No order(s) were released from holding status.","Ningún pedido se ha liberado del estado de espera." -"No ordered items","No hay pedidos de artículos" -"No shipping information available","No hay disponible información sobre el envío" -"Nominal Items","Artículos Nominales" -"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","Los artículos nominales solo pueden ser adquiridos independientemente. Para proceder, por favor, elimina otros artículos del presupuesto." -"Nominal order registered.","Pedido nominal registrado." -"Not Capture","Sin Captura" -"Not Initialized","No Inicializado" -"Not Notified","No Notificado" -"Not enough valid data to save the parent transaction ID.","No existen datos suficientes para guardar la identificación de la transacción raíz." -"Notification Not Applicable","Notificación no Aplicable" -"Notified","Notificado" -"Notify Customer by Email","Notificar al cliente por correo electrónico" -"Number","Número" -"Number of Invoiced Orders","Número de Pedidos Facturados" -"Number of Orders","Número de pedidos" -"Number of Refunded Orders","Número de Pedidos Reembolsados" -"OK","Aceptar" -"Offline Refunded","Reembolsado Fuera de Línea" -"On Hold","En pausa" -"Online Refunded","Reembolsado online" -"Order","Pedido" -"Order #","Pedido #" -"Order # ","Orden #" -"Order # %s","Pedido # %s" -"Order # %s %s | %s","Pedido # %s %s | %s" -"Order #%s","Pedido #%s" -"Order #%s - %s","Pedido #%s - %s" -"Order API","API de Pedido" -"Order Address Information","Información de la Dirección del Pedido" -"Order Comment","Comentario del pedido" -"Order Comment Email Sender","Remitente del Email de Comentario de Pedido" -"Order Comment Email Template","Plantilla del Email del comentario del pedido" -"Order Comment Email Template for Guest","Plantilla del Email del comentario del pedido para invitado" -"Order Comments","Comentarios del pedido" -"Order Credit Memos","Pedido de Nota de Créditos" -"Order Currency:","Divisa del pedido" -"Order Date","Fecha del pedido" -"Order Date (%s)","Fecha del pedido (%s)" -"Order Date: ","Fecha del pedido:" -"Order Date: %s","Fecha del pedido: %s" -"Order Details","Detalles del pedido" -"Order Grand Total","Total del pedido" -"Order History","Historial del pedido" -"Order History Info","Información del Historial del Pedido" -"Order ID","Solicitar ID" -"Order Information","Información del pedido" -"Order Invoices","Facturas de Pedido" -"Order Shipments","Envíos del pedido" -"Order State","Estado del Pedido" -"Order Status","Estado del pedido" -"Order Status Information","Información del Estado del Pedido" -"Order Statuses","Estados de los Pedidos" -"Order Subtotal","Subtotal del pedido" -"Order Taxes Report Grouped by Tax Rates","Impuestos del pedido agrupados por tasas de impuestos" -"Order Total","Total del pedido" -"Order Totals","Solicitar totales" -"Order Update","Actualización del pedido" -"Order Update for Guest","Actualización del pedido para invitado" -"Order View","Vista del pedido" -"Order credit memo","Pedir un abono" -"Order does not allow to be canceled.","El pedido no puede cancelarse." -"Order invoice","Factura del pedido" -"Order is suspended as its authorizing amount %s is suspected to be fraudulent.","Se ha suspendido el pedido, ya que se sospecha que la cantidad autorizada %s pueda ser fraudulenta." -"Order is suspended as its capture amount %s is suspected to be fraudulent.","El pedido está suspendido porque se sospecha que su cantidad tomada %s puede ser fraudulenta." -"Order object is not specified.","Objeto del pedido no especificado" -"Order saving error: %s","Error de guardado del pedido: %s" -"Order shipments","Envíos de pedidos" -"Order status does not exist.","El estado del pedido no existe." -"Order status with the same status code already exist.","El estado del pedido con el mismo código de estado ya existe." -"Order was placed using %s","El pedido fue realizado usando %s" -"Ordered","Pedido realizado." -"Ordered amount of %s.","Cantidad pedida de %s." -"Ordering amount of %s is pending approval on gateway.","El pedido de la cantidad de %s está pendiente de aprobación en el portal." -"Orders","Pedidos" -"Orders and Returns","Pedidos y devoluciones" -"Orders and Returns Search Form","Impreso de pedidos y devoluciones" -"Original Price","Precio original" -"Original order item that recurring payment profile correspondss to.","Pedido original al que corresponde el perfil de pago periódico." -"PDF Credit Memos","Notas de cŕedito en PDF" -"PDF Invoices","Facturas en PDF" -"PDF Packingslips","Albaranes en PDF" -"PDF Print-outs","Impresos en PDF" -"PDF object is not specified.","Objeto en PDF no especificado." -"PDF page object is not specified.","Objeto de página en PDF no especificado." -"PDF total model should extend Mage_Sales_Model_Order_Pdf_Total_Default","Módelo total en PDF debería extenderse Gestionar_Ventas_Modelo_Pedido_PDF_Total_Defecto" -"Package","Paquete" -"Package types are disregarded for USPS domestic shipments.","Los tipos de paquetes no serán tenidos en cuenta por el servicio postal de USA para envíos nacionales." -"Packages","Paquetes" -"Packingslip # ","Albaranes #" -"Paid","Pagado" -"Paid Amount","Cantidad pagada" -"Parent Transaction ID","ID de Transacción Padre" -"Parent transaction ID must have a transaction ID.","ID de transacción principal debe tener una ID de transacción." -"Partial","Parcial" -"Payment Failed","Pago Fallido" -"Payment Information","Información de pago" -"Payment Method","Método de pago" -"Payment Method Name","Nombre del Método de Pago" -"Payment Method:","Método de pago:" -"Payment Review","Revisión del Pago" -"Payment disallow storing objects.","El pago no permite almacenar objetos." -"Payment transactions disallow storing objects.","Las operaciones de pago no permiten almacenar objetos." -"Payment type","Tipo de pago" -"Payment update has been made.","Se ha efectuado la actualización del pago," -"Pending","Pendiente" -"Pending Payment","Pago Pendiente" -"Period","Período" -"Place Order Using Billing Agreements","Hacer el Pedido Utilizando los Acuerdos de Facturación" -"Placed from IP","Realizado desde IP" -"Please Select Products to Add","Por favor, Selecciona Productos a Añadir" -"Please Select a Customer","Seleccione un Cliente" -"Please Select a Store","Seleccione una Tienda" -"Please check billing address information. %s","Por favor, compruebe la dirección de facturación. %s" -"Please check shipping address information. %s","Por favor, compruebe la dirección de envío. %s" -"Please define PDF object before using.","Antes de su utilización, defina un objeto PDF" -"Please enter positive number in this field.","Introduzca un número positivo en este campo." -"Please select a valid payment method.","Por favor, seleccione un modo de pago válido." -"Please specify a shipping method.","Por favor, especifique un modo de envío." -"Please specify a valid grid column alias name that exists in grid table.","Especifique un nombre de alias de columna de cuadrícula válido que exista en la tabla de cuadrícula." -"Price","Precio" -"Print","Imprimir" -"Print All","Imprimir todo" -"Print All Invoices","Imprimir Todas las Facturas" -"Print All Refunds","Imprimir Todos los Reembolsos" -"Print All Shipments","Imprimir Todos los Envíos" -"Print Credit Memos","Imprimir Todas las Facturas de Abono" -"Print Invoice","Imprimir Factura" -"Print Invoices","Imprimir Facturas" -"Print Order","Imprimir Pedido" -"Print Order # %s","Imprimir Pedido # %s" -"Print Packingslips","Imprimir Albaranes de Embalaje" -"Print Refund","Imprimir Reembolso" -"Print Shipment","Imprimir Envío" -"Print Shipping Label","Imprimir Etiqueta de Envío" -"Print Shipping Labels","Imprimir etiquetas de envío" -"Processing","Procesando" -"Product","Producto" -"Product Name","Nombre de Producto" -"Products","Productos" -"Products Bestsellers Report","Informe de Productos Más Vendidos" -"Products in Comparison List","Productos en la Lista de Comparación" -"Products should be added to package(s)","Los productos deberían ser añadidos al paquete(s)" -"Profile #%s","Perfil #%s" -"Profile Information","Información de perfil" -"Profile State","Estado del Perfil" -"Profit","Beneficio" -"Promotion Coupons Usage Report","Informe de Utilización de Cupones de Promoción" -"Proper payment object must be set.","Debe establecerse el apropiado objeto de pago." -"Purchase Order Number:","Número de pedido de compra:" -"Purchased From","Comprado de" -"Purchased From (Store)","Comprado En (Tienda)" -"Purchased Item","Artículo Comprado" -"Purchased On","Comprado en" -"Qty","Cantidad" -"Qty Invoiced","Cantidad Facturada" -"Qty Ordered","Cantidad Pedida" -"Qty Shipped","Cantidad Enviada" -"Qty To Add","Cantidad a Añadir" -"Qty to Add","Cantidad a Añadir" -"Qty to Invoice","Cantidad para Facturar" -"Qty to Refund","Cantidad para Reembolsar" -"Qty to Ship","Cantidad a Enviar" -"Quantity Ordered","Cantidad Pedida" -"Quote item id is not received.","El artículo indicado no se ha recibido." -"Quote item is not loaded.","El artículo indicado no está cargado." -"Rate","Tarifa" -"Recent Orders","Pedidos Recientes" -"Recently Compared Products","Productos recientemente comparados" -"Recently Viewed","Vistos recientemente" -"Recently Viewed Products","Productos vistos recientemente" -"Recurring Profile # %s","Perfil Repetitivo # %s" -"Recurring Profile Initial Fee","Tarifa Inicial de Perfil Repetitivo" -"Recurring Profiles","Perfiles Repetitivos" -"Recurring Profiles (beta)","Perfiles Repetitivos (beta)" -"Reference ID","ID de Referencia" -"Reference ID:","ID de Referencia:" -"Refresh","Actualizar" -"Refund","Reembolso" -"Refund #","Reembolso #" -"Refund #%s","Reembolso #%s" -"Refund Amount","Importe del Reembolso" -"Refund Offline","Reembolso Fuera de Línea" -"Refund Shipping","Reembolso del Envío" -"Refund Shipping (Excl. Tax)","Reembolso del Envío (Impuestos no incl.)" -"Refund Shipping (Incl. Tax)","Reembolso del Envío (Impuestos incl.)" -"Refund Totals","Totales de Reembolso" -"Refunded","Reembolsado" -"Refunded amount of %s offline.","Importe reembolsado de %s fuera de línea." -"Refunded amount of %s online.","Importe reembolsado de %s en línea." -"Refunds","Reembolsos" -"Registered a Void notification.","Registrada una información anulada." -"Registered notification about approved payment.","Notificación certificada sobre el pago aprobado." -"Registered notification about captured amount of %s.","Registrada notificación sobre una cantidad retenida de %s." -"Registered notification about denied payment.","Registrada notificación sobre un pago denegado." -"Registered notification about refunded amount of %s.","Notificación certificada sobre el reembolso de la cantidad de %s." -"Registered update about approved payment.","Registrada actualización sobre un pago aprobado." -"Registered update about denied payment.","Actualización registrada sobre pago denegado." -"Regular Payment","Pago ordinario" -"Related Orders","Pedidos relacionados" -"Remove","Eliminar" -"Remove Coupon Code","Eliminar Código de Cupón" -"Remove tracking number","Eliminar número de rastreo" -"Reorder","Volver a hacer el pedido" -"Retrieve credit memo info","Recuperar información de abono" -"Retrieve credit memo information","Recuperar la información del abono" -"Retrieve credit memo list","Recuperar lista de abonos" -"Retrieve invoice info","Recuperar información de factura" -"Retrieve invoice information","Recibir información de la factura" -"Retrieve list of credit memos by filters","Recuperar lista de abonos por filtros" -"Retrieve list of invoices by filters","Recibir lista de facturas por filtros" -"Retrieve list of orders by filters","Recibir lista de pedidos por filtros" -"Retrieve list of shipments by filters","Recuperar lista de envíos por filtros" -"Retrieve order information","Recibir información del pedido" -"Retrieve orders info","Recibir información de los pedidos" -"Retrieve shipment info","Recuperar información de envío" -"Retrieve shipment information","Recibir información del pedido" -"Return to Stock","Volver al Stock" -"Returned","Devuelto" -"Returns","Devoluciones" -"Revenue","Ingresos" -"Row Subtotal","Fila Subtotal" -"Row Total","Fila Total" -"SKU","Sku" -"Sales","Ventas" -"Sales Discount","Descuento de ventas" -"Sales Emails","Emails de Ventas" -"Sales Emails Section","Sección de Emails de ventas" -"Sales Invoice Print View","Vista de impresión de la factura de ventas" -"Sales Items","Artículos de ventas" -"Sales Order Print View","Vista de Impresión de Pedidos de Ventas" -"Sales Section","Sección de ventas" -"Sales Shipment Print View","Vista de Imprsión de envíos de Ventas" -"Sales Shipping","Envío de Ventas" -"Sales Tax","Impuesto sobre las ventas" -"Sales Total","Total de ventas" -"Same As Billing Address","La misma que la dirección de facturación" -"Save Order Address","Guardar dirección del pedido" -"Save Status","Guardar estado" -"Save Status Assignment","Guardar estado de la tarea" -"Save in address book","Guardar en libreta de direcciones" -"Schedule","Programa" -"Select","Seleccionar" -"Select All","Seleccionar todo" -"Select from existing customer addresses:","Seleccionar entre las direcciones del cliente existentes" -"Selected option(s) or their combination is not currently available.","La opción seleccionada, o su combinación, no está disponible actualmente." -"Send Credit Memo Comment Email Copy To","Enviar copia por email del comentario a la nota de crédito a:" -"Send Credit Memo Comments Email Copy Method","Enviar comentarios sobre la nota de crédito por correo electrónico" -"Send Credit Memo Email Copy Method","Enviar la nota de crédito por correo electrónico" -"Send Credit Memo Email Copy To","Enviar copia por email de la nota de crédito a:" -"Send Email","Envíar Correo electrónico" -"Send Invoice Comment Email Copy To","Enviar copia por email del comentario a la factura a:" -"Send Invoice Comments Email Copy Method","Enviar Factura Comentarios Email Copiar Método" -"Send Invoice Email Copy Method","Enviar Factura Email Copiar Método" -"Send Invoice Email Copy To","Enviar Copia de Email de Factura a" -"Send Order Comment Email Copy To","Enviar copia por email del comentario al pedido a:" -"Send Order Comments Email Copy Method","Enviar Pedido Comentarios Email Copiar Método" -"Send Order Email","Enviar correo del pedido" -"Send Order Email Copy Method","Método de envío de copia por email del pedido" -"Send Order Email Copy To","Enviar copia por email del pedido a:" -"Send Sales Emails","Enviar emails de ventas" -"Send Shipment Comment Email Copy To","Enviar Copia de Email de comentario de Envío a" -"Send Shipment Comments Email Copy Method","Enviar comentarios sobre el envío y transporte por correo electrónico" -"Send Shipment Email Copy Method","Enviar Envío Email Copiar Método" -"Send Shipment Email Copy To","Enviar Copia de Email de Envío a" -"Send Tracking Information","Enviar información de rastreo" -"Send shipment info","Enviar información de envío" -"Set order for existing transactions not allowed","Establecer orden para las transacciones existentes no permitido" -"Ship","Enviar" -"Ship To","Enviar a" -"Ship to Name","Enviar a nombre de" -"Ship to:","Enviar a:" -"Shipment","Envío" -"Shipment #","Envío #" -"Shipment #%1$s | %3$s (%2$s)","Envío #%1$s | %3$s (%2$s)" -"Shipment #%s","Envío #%s" -"Shipment Comment Email Sender","Email del remitente del comentario al envío" -"Shipment Comment Email Template","Plantilla para el email de comentario al envío" -"Shipment Comment Email Template for Guest","Plantilla para el email de comentario del invitado al envío" -"Shipment Comments","Comentarios de Envío" -"Shipment Email Sender","Email del remitente del envío" -"Shipment Email Template","Plantilla para el email del envío" -"Shipment Email Template for Guest","Plantilla para el email del envío para el invitado" -"Shipment Update","Actualizar Envío" -"Shipment Update for Guest","Actualización del envión para el invitado" -"Shipments","Envíos" -"Shipped","Enviado" -"Shipped By","Enviado por" -"Shipping","Transporte" -"Shipping & Handling","Manipulación y expedición" -"Shipping & Handling","Envío y preparación" -"Shipping & Handling Information","Envío & Información de Manipulación" -"Shipping Address","Dirección de Envío" -"Shipping Amount","Gastos de Envío" -"Shipping Information","Dirección de envío" -"Shipping Method","Método de Envío" -"Shipping Method:","Método de envío:" -"Shipping Refund","Reembolso de Envío" -"Shipping and Tracking Information","Información de envío y rastreo" -"Shopping Cart","Carro de la compra" -"Show Packages","Mostrar Paquetes" -"Signature Confirmation","Confirmación con Firma" -"Signed Up From","Inscrito de" -"Size","Tamaño" -"Sku","Sku (número de referencia)" -"Sold to:","Vendido a:" -"Some item options or their combination are not currently available.","Algunas opciones de artículo, o su combinación, no están disponibles actualmente." -"Some of the products below do not have all the required options.","Alguno de los siguientes productos no cumple con todas las opciones requeridas." -"Some of the selected options are not currently available.","Algunas de las opciones seleccionadas no están disponibles actualmente." -"Sorry, no quotes are available for this order at this time.","Lamentamos informarle que en este momento no hay cotizaciones disponibles para este pedido." -"Source object is not specified.","El objeto fuente no se ha especificado." -"Specified profile does not exist.","El perfil especificado no existe." -"State Code [State Title]","Código del estado [Título del estado]" -"State/Province","Estado/Provincia" -"Status","Estado" -"Status Code","Código de estado" -"Status Label","Etiqueta de estado" -"Status:","Situación:" -"Store Credit","Crédito de tienda" -"Store View Specific Labels","Etiquetas específicas de la vista del almacén" -"Street Address","Dirección postal" -"Submit Comment","Enviar comentario" -"Submit Credit Memo","Enviar Nota de Crédito" -"Submit Invoice","Enviar factura" -"Submit Invoice and Shipment","Enviar factura y gastos de envío" -"Submit Order","Enviar pedido" -"Submit Shipment","Enviar Envío" -"Subscribe to Newsletter","Suscribir al boletín informativo" -"Subscribe to Order Status","Suscribirse al Estado de Pedido" -"Subtotal","Subtotal" -"Subtotal after discount.","Subtotal después del descuento." -"Subtotal:","Subtotal:" -"Suspected Fraud","Sospecha de fraude" -"Suspend","Suspender" -"Suspended","Suspendido" -"Tax","Impuestos" -"Tax Amount","Importe del Impuesto" -"Tax Percent","Porcentaje de impuestos" -"Telephone","Teléfono" -"The Order State ""%s"" must not be set manually.","El estado del pedido ""%s"" no se debe establecer manualmente." -"The address total model should be extended from Mage_Sales_Model_Quote_Address_Total_Abstract.","El modelo de dirección total debería extenderse desde Mage_Sales_Model_Quote_Address_Total_Abstract." -"The billing agreement ""%s"" has been canceled.","El acuerdo de facturación ""%s"" se ha cancelado." -"The billing agreement ""%s"" has been created.","El acuerdo de facturación ""%s"" se ha creado." -"The coupon code has been accepted.","El código del cupón se ha aceptado" -"The message has been sent.","El mensaje ha sido enviado." -"The message was sent.","El mensaje se envió." -"The order address has been updated.","La dirección del pedido se ha actualizado." -"The order email has been sent.","El email del pedido se ha enviado." -"The order has been cancelled.","El pedido ha sido cancelado." -"The order has been created.","El pedido ha sido creado." -"The order has been put on hold.","El pedido ha sido puesto en espera." -"The order has been released from holding status.","El pedido ha sido sacado del estado de espera." -"The order has not been cancelled.","El pedido no ha sido cancelado." -"The order status has been assigned.","El estado del pedido se ha asignado." -"The order status has been saved.","El estado del pedido se ha guardado." -"The order status has been unassigned.","El estado del pedido no se ha asignado." -"The order was not put on hold.","El pedido no fue puesto en espera." -"The order was not unheld.","El pedido no fue confirmado." -"The order was placed using %s","El pedido fue realizado utilizando %s" -"The order(s) cannot be canceled","El/los pedido(s) no puede(n) ser cancelado(s)" -"The payment has been accepted.","El pago se ha aceptado." -"The payment has been denied.","El pago ha sido denegado." -"The payment has been voided.","El pago ha sido anulado." -"The profile has been updated.","El perfil ha sido actualizado." -"The profile has no changes.","El perfil no ha cambiado." -"The profile state has been updated.","El estado del perfil ha sido actualizado." -"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","La cantidad que desea añadir excede la cantidad total enviada de alguno de los productos seleccionados." -"The requested Payment Method is not available.","El método de pago solicitado no está disponible." -"The shipping label has been created.","Se ha creado la etiqueta de envío." -"The transaction ""%s"" (%s) is already closed.","La transacción ""%s"" (%s) ya está cerrada." -"The transaction ""%s"" cannot be captured yet.","La transacción ""%s"" no puede ser capturada todavía." -"The value that you entered is not valid.","El valor que ha introducido no es válido." -"There are no billing agreements yet.","No hay acuerdos de facturación todavía." -"There are no printable documents related to selected orders.","No hay documentos para imprimir relacionados con los pedidos seleccionados." -"There are no shipping labels related to selected orders.","No existen etiquetas de envío vinculadas a los pedidos seleccionados." -"There are no shipping labels related to selected shipments.","No existen etiquetas de envíos vinculadas a los envíos seleccionados." -"There is no need to approve this payment.","No hay necesidad de aprobar este pago." -"There is no need to deny this payment.","No hay necesidad de negar este pago." -"There is no update for the payment.","No hay actualizaciones para este pago." -"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","Este mensaje aparecerá en el carro de la compra cuando el subtotal tras el descuento sea menor que la cantidad mínima." -"This operation requires an existing transaction object.","Esta operación requiere la existencia de un artículo en transacción." -"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","Este pedido contiene (%s) artículos y por tanto no puede editarse mediante la interfaz de administración en este momento, si deseas continuar editando, los (%s) artículos se eliminarán, el pedido se cancelará y se creará un nuevo pedido." -"This order no longer exists.","Esta orden ya no existe." -"This product does not have any configurable options","Este productor no dispone de opciones de configuración" -"This profile state cannot be changed to ""%s"".","El estado del perfil no se puede cambiar a ""%s""." -"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","Esto creará un reembolso en línea. Para crear un reembolso en línea, abra una factura y cree una nota de crédito para ella. ¿Desea continuar?" -"Tier Pricing","Precio de nivel" -"Title","Título" -"To","Para" -"To Name","A nombre de" -"To:","A:" -"Total","Total" -"Total %d product(s)","%d producto(s) en total" -"Total (ex)","Total (ex)" -"Total (inc)","Total (inc)" -"Total Due","Total de deuda" -"Total Invoiced","Total facturado" -"Total Invoiced Paid","Total facturado pagado" -"Total Invoiced VS Paid Report","Total facturado VS Informe de pago" -"Total Invoiced not Paid","Total facturado no pagado" -"Total Ordered Report","Informe del total solicitado" -"Total Paid","Total pagado" -"Total Qty","Total cantidad" -"Total Refund","Reembolso Total" -"Total Refunded","Total reembolsado" -"Total Refunded Report","Informe del total reembolsado" -"Total Sales Shipping","Envío de Ventas Total" -"Total Shipped Report","Informe del total enviado" -"Total Shipping","Total de ventas" -"Total Shipping Charges","Total de gastos de envío" -"Total Tax","Impuesto Total" -"Total Weight","Peso total" -"Total model should be extended from Mage_Sales_Model_Order_Total_Abstract.","El modelo total debe anpliarse desde Mage_Sales_Model_Order_Total_Abstract" -"Track Order","Rastrear un Pedido" -"Track all shipment(s)","Siga su envío(s)" -"Track all shipments","Seguir todos los envíos" -"Track this shipment","Rastrear este envío" -"Track your order","Siga su pedido" -"Tracking","Seguimiento" -"Tracking Number","Número de Seguimiento" -"Tracking Number(s):","Número(s) de seguimiento(s)" -"Transaction ""%s"" was already processed.","La transacción""%s"" ya fue procesada." -"Transaction # %s | %s","Transacción # %s | %s" -"Transaction ID","Número de identificación de la transacción" -"Transaction ID must not be empty.","La identificación de la transacción no debe estar vacía." -"Transaction ID: ""%s"".","Código identificativo de la transacción: ""%s""." -"Transaction Type","Tipo de Transacción" -"Transactions","Transacciones" -"Trial ","Prueba" -"Trial Payment","Prueba de Pago" -"Trial Period","Periodo de Prueba" -"Trial period payment","Período de prueba de pago" -"Type","Tipo" -"Unassign","Sin asignar" -"Unhold","Recuperar" -"Unhold action is not available.","Acción de recuperación no disponible." -"Unhold order","Recuperar pedido" -"Unknown State","Estado desconocido" -"Unknown Status","Estados desconocidos" -"Unsupported transaction type ""%s"".","Tipo de transacción no admitida""%s""." -"Update Changes","Actualizar Cambios" -"Update Items and Qty\'s","Actualizar artículos y cantidades" -"Update Qty\'s","Actualizar Cantidad/es" -"Updated At","Hora de actualización" -"Updated:","Actualizado:" -"Use Aggregated Data (beta)","Utilizar datos agregados (beta)" -"Use Order Status As Default","Usar estado de pedido por defecto" -"Validate Each Address Separately in Multi-address Checkout","Validar cada dirección por separado en la salida de direcciones múltiples" -"Value","Valor" -"View","Ver" -"View All","Ver todos/as" -"View Another Order","Ver Otro Pedido" -"View Order","Ver Pedido" -"Visible on Frontend","Visible en el Panel Delantero" -"Void","Nulo" -"Void invoice","Factura inválida" -"Voided authorization.","Autorización anulada" -"Website","Sitio web" -"Weight","Peso" -"Whether buyer can define the date when billing for the profile begins.","Si el comprador puede definir la fecha en que la facturación comienza para el perfil." -"Width","Ancho" -"Wishlist","Lista de deseos" -"Wrong billing agreement ID specified.","La identificación del contrato de facturación es incorrecta." -"Wrong quote item id to update configuration.","Número identificativo del artículo incorrecto para actualizar la configuración." -"Wrong state: ""%s"".","Estado incorrecto: ""%s""." -"Yes","Sí" -"You can leave a box blank if you don\'t wish to add a gift message for whole order","Puedes dejar un campo en blanco si no deseas añadir un mensaje de regalo con el pedido" -"You don\'t have permissions to manage this order because of one or more products are not permitted for your website.","Usted no tiene permisos para administrat esta orden por que uno o mas de los productos no estan permitidos en si sitio web." -"You have placed no orders.","No has hecho ningún pedido." -"You will be redirected to the payment system website.","Usted será redirigido a la página web del sistema de pago." -"Your credit card will be charged for","Se cargará en tu tarjeta de crédito" -"ZIP/Post Code","Código postal" -"Zip/Postal Code","Código postal" -"cm","cm" -"in","en" -"kg","kg" -"lb","lb" -"the credit memo email is not sent","el email de nota de crédito no se ha enviado" -"the credit memo email was sent","El correo electrónico de la factura de abono fue enviado" -"the invoice email is not sent","El correo electrónico de la factura no se ha enviado" -"the invoice email was sent","El correo electrónico de la factura fue enviado" -"the order confirmation email is not sent","El correo electrónico de confirmación del pedido no se ha enviado" -"the order confirmation email was sent","El correo electrónico de confirmación del pedido fue enviado" -"the shipment email is not sent","el email de envío no se ha enviado" -"the shipment email was sent","El correo electrónico del envío fue enviado" diff --git a/app/locale/es_ES/Mage_SalesRule.csv b/app/locale/es_ES/Mage_SalesRule.csv deleted file mode 100644 index 2d54799d8..000000000 --- a/app/locale/es_ES/Mage_SalesRule.csv +++ /dev/null @@ -1,132 +0,0 @@ -"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","Se han desactivado las reglas de precio del carro de la compra %d basadas en el atributo ""%s""." -"%s Coupon(s) have been generated","se han generado un % de cupones" -"Actions","Acciones" -"Active","Activo" -"Add New Rule","Añadir nueva regla" -"Alphabetical","alfabético" -"Alphanumeric","Alfanumérico" -"An error occurred while generating coupons. Please review the log and try again.","Ocurrió un error mientras se generaban los cupones. Por favor vuelva a iniciar sesión e inténtelo de nuevo." -"Apply","Solicitar" -"Apply To","Aplicar a." -"Apply the rule only if the following conditions are met (leave blank for all products)","Aplíquese la regla sólo si se cumplen las siguientes condiciones (dejar en blanco para todos los productos)" -"Apply the rule only to cart items matching the following conditions (leave blank for all items)","Aplíquese la regla sólo a los artículos del carro que se ajusten a las siguientes condiciones (dejar en blanco para todos los artículos)" -"Apply the rule to cart items matching the following conditions","Aplíquese la regla a los artículos del carro que se ajusten a las siguientes condiciones" -"Apply to Shipping Amount","Aplíquese a la Cantidad de Envío" -"Are you sure you want to delete the selected coupon(s)?","¿Está seguro de que quiere eliminar el cupón/los cupones seleccionado(s)?" -"Auto","Auto" -"Auto Generated Specific Coupon Codes","Códigos de cupones específicos generados automáticamente" -"Buy X get Y free (discount amount is Y)","Compre X y llévese Y gratis (la cantidad descontada es Y)" -"By Fixed value","Por valor Fijo" -"By Percentage","Por Porcentaje" -"Can\'t acquire coupon.","No se puede adquirir el cupón." -"Cart Attribute","Atributos del Carro" -"Catalog","Catálogo" -"Code Format","Código de formato" -"Code Length","Código de longitud" -"Code Prefix","Código de prefijo" -"Code Suffix","Código de sufijo" -"Conditions","Condiciones" -"Conditions combination","Combinación de condiciones" -"Coupon","Cupón" -"Coupon Code","Código de cupón" -"Coupon Qty","Código de cantidad" -"Coupon with the same code","Cupón con el mismo código" -"Coupons Information","Información sobre cupones" -"Created On","Creado" -"Customer Groups","Grupos de Cliente" -"Dash Every X Characters","Guión cada ""X"" caracteres" -"Date Expire","Fecha de caducidad" -"Date Start","Fecha de inicio" -"Default Label","Etiqueta por Defecto" -"Default Rule Label for All Store Views","Etiqueta Normativa por Defecto para Todas las Vistas de la Tienda" -"Description","Descripción" -"Discount Amount","Cantidad Descontada" -"Discount Qty Step (Buy X)","Paso de Cantidad Descontada (Comprar X)" -"Edit Rule","Editar Regla" -"Edit Rule '%s'","Editar Regla '%s'" -"Excluding prefix, suffix and separators.","excluyendo prefijos, sufijos y separaciones" -"FOUND","ENCONTRADO" -"Fixed amount discount","Descuento de cantidad fija" -"Fixed amount discount for whole cart","Descuento de cantidad fija para el carro completo" -"For matching items only","Sólo para artículos correspondientes" -"For shipment with matching items","Para envíos con artículos correspondientes" -"Free Shipping","Transporte gratuito" -"From Date","A partir de la fecha" -"General Information","Información general" -"Generate","Generar" -"ID","ID" -"If %s %s %s for a subselection of items in cart matching %s of these conditions:","Si %s %s %s para una subselección de artículos en la cesta coincidiendo %s de estas condiciones:" -"If an item is %s in the cart with %s of these conditions true:","Si un artículo es %s en la cesta con %s de estas condiciones verdaderas:" -"If empty no separation.","Si está vacío no hay separación." -"If you select and save the rule you will be able to generate multiple coupon codes.","Si selecciona y guarda esta norma, podrá generar múltiples códigos de cupones." -"Inactive","Inactivo" -"Item totals are not set for rule.","No se han establecido totales de artículo para la regla." -"Labels","Etiquetas" -"Manage Coupon Codes","Administrar códigos de cupones" -"Maximum Qty Discount is Applied To","Se aplica la Máxima Cantidad Descontada" -"NOT FOUND","NO ENCONTRADO" -"NOT LOGGED IN","NO CONECTADO" -"New Rule","Nueva Regla" -"No","No" -"No Coupon","Sin cupón" -"Not valid data provided","Los datos proporcionados no son válidos" -"Number of Uses","Número de Usos" -"Numeric","Numérico" -"Payment Method","Método de pago" -"Percent of product price discount","Porcentaje de descuento en el precio del producto" -"Period","Período" -"Price in cart","Precio en el carrito" -"Priority","Prioridad" -"Product attribute combination","Combinación de atributos de producto" -"Products subselection","Subselección de productos" -"Promotions","Promociones" -"Public In RSS Feed","Publicar feed RSS" -"Quantity in cart","Cantidad en el carrito" -"Row total in cart","Total de filas en el carrito" -"Rule Information","Información sobre la Regla" -"Rule Name","Nombre de la Regla" -"Rule is not defined","Regla no definida" -"Sales Discount Amount","Importe de ventas con descuento" -"Sales Subtotal Amount","Importe subtotal de ventas" -"Sales Total Amount","Importe total de ventas" -"Save and Continue Edit","Guardar y continuar editando" -"Shipping Country","País de envío" -"Shipping Method","Método de envío" -"Shipping Postcode","Código Postal" -"Shipping Region","Región de envío" -"Shipping State/Province","Provincia/Estado de envío" -"Shopping Cart Price Rule","Regla del precio del carro de compra." -"Shopping Cart Price Rules","Reglas de Precio de Carro de Compra" -"Special Price","Precio especial" -"Specific Coupon","Cupón específico" -"Status","Estado" -"Stop Further Rules Processing","Detener el Procesamiento de Reglas adicionales" -"Store View Specific Labels","Etiquetas específicas de la vista de tienda" -"Subtotal","Subtotal" -"Subtotal Amount","Cantidad subtotal" -"The rule has been deleted.","La regla ha sido eliminada." -"The rule has been saved.","La regla ha sido guardada." -"This rule no longer exists.","Esta regla ya no existe." -"Times Used","Tiempos utilizados" -"To Date","Hasta la fecha" -"To Fixed Value","Para Valor Fijo" -"To Percentage","Para Porcentaje" -"Total","Total" -"Total Amount","Cantidad total." -"Total Items Quantity","Cantidad total de artículos" -"Total Weight","Peso total" -"Unable to create requested Coupon Qty. Please check settings and try again.","No se puede crear el cupón de cantidad solicitado. Por favor compruebe la configuración y vuelva a intentarlo." -"Unable to find a rule to delete.","No se puede encontrar una regla para eliminar." -"Update prices using the following information","Actualizar precios utilizando la siguiente información" -"Update product's %s %s: %s","Actualizar los productos de %s %s: %s" -"Update the Product","Actualizar el Producto" -"Use Auto Generation","Utilizar Generación Automática" -"Used","Utilizado" -"Uses per Coupon","Usos por cupón" -"Uses per Customer","Usos por cliente" -"Website","Página web" -"Websites","Páginas Web" -"Wrong rule specified.","Regla especificada incorrecta." -"Yes","Sí" -"total amount","Cantidad total" -"total quantity","Suma total" diff --git a/app/locale/es_ES/Mage_Sendfriend.csv b/app/locale/es_ES/Mage_Sendfriend.csv deleted file mode 100644 index 360c92142..000000000 --- a/app/locale/es_ES/Mage_Sendfriend.csv +++ /dev/null @@ -1,38 +0,0 @@ -"Add Recipient","Añadir Destinatario" -"Allow for Guests","Permitir invitados" -"An invalid email address for recipient was entered.","Un correo electrónico inválido como destinario fue introducido." -"At least one recipient must be specified.","Al menos un destinatario debe ser especificado." -"Back","Volver" -"Catalog Product Email to a Friend","Enviar Email a un amigo con el Catálogo de Productos" -"Email Address","Dirección de email" -"Email Address:","dirección de email:" -"Email Templates","Plantillas de correo electrónico" -"Email to a Friend","Escribir un Email a un amigo" -"Email:","Email:" -"Enabled","Habilitado" -"Invalid Sender Information","Información del remitente inválida" -"Invalid sender email.","Correo electrónico del remitente inválido" -"Limit Sending By","Límite de envío por" -"Max Products Sent in 1 Hour","Máximos productos enviados en 1 hora" -"Max Recipients","Máximos destinatarios." -"Maximum %d email addresses allowed.","Máximo %d direcciones de email permitidas" -"Message:","Mensaje:" -"Name","Nombre" -"Name:","Nombre:" -"No more than %d emails can be sent at a time.","No más de %d correos electrónicos pueden ser enviados a la vez" -"Please define a correct Cookie instance.","Por favor defina una correcta petición de cookie." -"Please define a correct Product instance.","Por favor defina una correcta petición de producto." -"Please define the correct Sender information.","Por favor defina la información correcta del remitente." -"Recipient:","Destinatario:" -"Remove Email","Eliminar E-mail" -"Select Email Template","Elegir plantilla de correo electrónico" -"Send Email","Envíar Correo electrónico" -"Send product to a friend","Envíar el producto a un amigo" -"Sender:","Remitente:" -"Some emails were not sent.","Algunos correos electrónicos no fueron enviados." -"The link to a friend was sent.","El enlace fue envíado a un amigo." -"The message cannot be empty.","El mensaje no puede estar vacío." -"The messages cannot be sent more than %d times in an hour","Los mensajes no pueden ser enviados más %d de veces en una hora" -"The sender name cannot be empty.","El nombre del remitente no puede estar vacío." -"There were some problems with the data.","Ha habido algunos problemas con los datos." -"You have exceeded limit of %d sends in an hour","Ha excedido el límite de %d enviados en una hora" diff --git a/app/locale/es_ES/Mage_Shipping.csv b/app/locale/es_ES/Mage_Shipping.csv deleted file mode 100644 index b5f875be4..000000000 --- a/app/locale/es_ES/Mage_Shipping.csv +++ /dev/null @@ -1,93 +0,0 @@ -" for more information or ","para más información o" -"# of Items (and above)","número de artículos (o más)" -"# of Items vs. Destination","número de artículos vs. destino" -"Allow Shipping to Multiple Addresses","Permitir envío a varias direcciones" -"An error occurred while import table rates.","Ha habido un error al importar los índices de las tablas." -"Calculate Handling Fee","Calcular el gastos de envío" -"Carrier:","Transportista:" -"City","Ciudad" -"Close Window","Cerrar Ventana" -"Condition","Condición" -"Country","País" -"Custom Value","Valor Personalizado" -"Date","Fecha" -"Delivered on:","Enviado el día:" -"Delivered to:","Enviado a:" -"Description","Descripción" -"Displayed Error Message","Mostrado mensaje de error" -"Divide to equal weight (one request)","Dividir al mismo peso (una petición)" -"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","Duplicar fila #%s (País ""%s"", Región/Estado ""%s"", Código Postal ""%s"" y Valor ""%s"")." -"Enabled","Habilitado" -"Error:","Error:" -"Export","Exportar" -"File has not been imported. See the following list of errors: %s","No se ha importado el fichero. Vea la siguiente lista de errores: %s" -"Fixed","Fijo" -"Flat Rate","Tarifa plana" -"Free Shipping","Transporte gratuito" -"Google Sitemap Section","Sección Mapa del Sitio Google" -"Handling Fee","Gastos de Tramitación" -"Import","Importar" -"Include Virtual Products in Price Calculation","Incluir Productos Virtuales en el cálculo del precio" -"Info:","Información:" -"Invalid %s ""%s"" in the Row #%s.","%s ""%s"" no válido en la fila #%s." -"Invalid Country ""%s"" in the Row #%s.","País no válido ""%s"" en la fila #%s." -"Invalid Region/State ""%s"" in the Row #%s.","Región/Estado ""%s"" no válido en la fila #%s." -"Invalid Shipping Price ""%s"" in the Row #%s.","Precio de envío ""%s"" no válido en la fila #%s." -"Invalid Table Rate code for type %s: %s","No válido: Tabla de Costes para tipo %s: %s" -"Invalid Table Rate code type: %s","No válido: tipo de código de Tabla de Coste %s" -"Invalid Table Rates File Format","No válido: formato de archivo de Tabla de Costes" -"Invalid Table Rates format in the Row #%s","Formato de Tarifas de Tabla inválida en la fila #%s" -"Local Time","Hora Local" -"Location","Localidad" -"Maximum Qty Allowed for Shipping to Multiple Addresses","Cantidad máxima permitida para el envío a varias direcciones" -"Method Name","Nombre de Método" -"Minimum Order Amount","Pedido mínimo" -"N/A","N/A" -"None","Nada" -"Options","Opciones" -"Order Subtotal (and above)","Subtotal del Pedido" -"Origin","Origen" -"Per Order","Por Pedido" -"Per Package","Por Paquete" -"Percent","Porcentaje" -"Price","Precio" -"Price vs. Destination","Precio vs. Destino" -"Region/State","Región/Provincia" -"Service Type:","Tipo de Servicio:" -"Ship to Applicable Countries","Enviar a los países aplicables" -"Ship to Specific Countries","Enviar a países específicos" -"Shipment #","Envío #" -"Shipment Tracking Popup","Popup de Seguimiento del Envío" -"Shipped or billed on:","Enviado o facturado el día:" -"Shipping Methods","Métodos de envío" -"Shipping Methods Section","Sección de Métodos de Envío" -"Shipping Settings","Ajustes de Envío" -"Shipping Settings Section","Sección de Ajustes de Envío" -"Show Method if Not Applicable","Mostrar el método si no se aplica" -"Signed by:","Firmado por:" -"Sort Order","Ordenar Pedido" -"Status:","Situación:" -"Store Pickup","Recogida en tienda" -"Street Address","Dirección postal" -"Street Address Line 2","Línea 2 de dirección postal" -"Table Rates","Tabla de Costes" -"The shipping module is not available for selected delivery country.","El módulo de envío no está disponible en el país seleccionado" -"The shipping module is not available.","El módulo de envío no está disponible" -"There is no tracking available for this shipment.","No se dispone de seguimiento para este envío" -"There is no tracking available.","No hay seguimiento disponible" -"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","Este método de envío actualmente no está disponible. Si desearía usar este método para sus envíos, póngase en contacto con nosotros." -"This shipping method is not available, please specify ZIP-code","Este método de envío no está disponible, por favor especifique un código postal." -"Title","Título" -"Track:","Seguir:" -"Tracking Information","Información de seguimiento" -"Tracking Number:","Número de seguimiento:" -"Tracking information is currently not available. Please ","La información de seguimiento actualmente no está disponible. Por favor" -"Tracking information is currently unavailable.","La información de seguimiento actualmente no está disponible." -"Type","Tipo" -"Use origin weight (few requests)","Utilizar peso original (pocas peticiones)" -"Weight (and above)","Peso (o más)" -"Weight vs. Destination","Peso vs Destino" -"Weight:","Peso:" -"ZIP/Postal Code","Código Postal" -"contact us","contáctenos" -"email us at ","envíenos un email a:" diff --git a/app/locale/es_ES/Mage_Sitemap.csv b/app/locale/es_ES/Mage_Sitemap.csv deleted file mode 100644 index db52418fc..000000000 --- a/app/locale/es_ES/Mage_Sitemap.csv +++ /dev/null @@ -1,46 +0,0 @@ -"Action","Acción" -"Add Sitemap","Añadir mapa del sito web" -"Always","siempre" -"CMS Pages Options","Opciones de páginas de CMS (sistema de gestion de contenidos)" -"Categories Options","Opciones de categorias" -"Daily","Diario" -"Edit Sitemap","Editar mapa del sitio web" -"Enabled","Habilitado" -"Error Email Recipient","Error en el destinatario del mensaje" -"Error Email Sender","Error en el remitente del mensaje" -"Error Email Template","Error en la plantilla del mensaje" -"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","No se puede guardar el archivo ""%s"". Por favor, cerciórese de que el directorio ""%s"" permite la escritura mediante el servidor web." -"Filename","Nombre del archivo" -"Frequency","Frecuencia" -"Generate","Generar" -"Generation Settings","Ajuste generacinal" -"Google Sitemap","Google Sitemap [[It's used the same way in Spanish]]" -"Hourly","Cada hora" -"ID","Identificación" -"Last Time Generated","Última vez que se generó" -"Link for Google","Enlace para Google" -"Monthly","Mensualmente" -"Never","Nunca" -"New Sitemap","Nuevo mapa del sitio web" -"Path","Camino" -"Please create the specified folder ""%s"" before saving the sitemap.","Por favor, cree el archivo ""%s"" especificado antes de guardar el mapa del sitio." -"Please define correct path","Por favor defina la trayectoria correcta" -"Please make sure that ""%s"" is writable by web-server.","Por favor, cerciórese de que ""%s"" permite la escritura mediante el servidor web." -"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","Por favor use solamente las letras (a-z o A-Z), números (0-9) o guón bajo (_) en el nombre del archivo. Ni espacios ni otros carácteres están permitidos" -"Priority","Prioridad" -"Products Options","Opciones de productos" -"Sitemap","Mapa de sitio" -"Sitemap generate Warnings","El mapa del sitio web genera avisos" -"Start Time","Tiempo de inicio." -"Store View","Ver Tienda" -"The priority must be between 0 and 1.","La prioridad debe de estar entre 0 y 1" -"The sitemap ""%s"" has been generated.","Se ha generado el mapa del sitio ""%s""." -"The sitemap has been deleted.","El mapa del sitio web ha sido borrado" -"The sitemap has been saved.","El mapa del sitio web se ha guardado" -"This sitemap no longer exists.","Este mapa del sitio web ya no existe" -"Unable to find a sitemap to delete.","No se puede encontrar el mapa del sitio web para borrarlo" -"Unable to find a sitemap to generate.","No se puede encontrar un mapa del sitio web para ser generado" -"Unable to generate the sitemap.","No se puede generar el mapa del sitio web" -"Valid values range: from 0.0 to 1.0.","Rango de los valores admitidos: desde 0.0 hasta 1.0." -"Weekly","Semanalmente" -"Yearly","Anualmente" diff --git a/app/locale/es_ES/Mage_Tag.csv b/app/locale/es_ES/Mage_Tag.csv deleted file mode 100644 index 8cb3702f5..000000000 --- a/app/locale/es_ES/Mage_Tag.csv +++ /dev/null @@ -1,101 +0,0 @@ -"# of Uses","# de Usos" -"%s tag(s) have been accepted for moderation.","%s etiqueta(s) se ha(n) aceptado para ser moderada(s)." -"Tag Name: %s","Nombre de Etiqueta: %s" -"Action","Acción" -"Add","Añadir" -"Add New Tag","Añadir Nueva Etiqueta" -"Add Tags","Añadir Etiquetas" -"Add Your Tags:","Añadir Tus Etiquetas:" -"Add tag(s) to product","Añadir etiqueta(s) a producto" -"Add to Cart","Añadir al Carrito" -"Add to Wishlist","Añadir a lista que quieres." -"All Tags","Todas la Etiquetas" -"Approved","Aprobado" -"Are you sure you want to delete this tag?","¿Estás seguro de querer borrar esta etiqueta?" -"Are you sure you want to do this?","¿Estás seguro de querer hacer esto?" -"Are you sure?","¿Está seguro?" -"Back","Volver" -"Back to Tags List","Volver a la Lista de Etiquetas" -"Base Popularity","Popularidad Base" -"Block Information","Información de bloque" -"CSV","CSV" -"Catalog Product View","Vista del catálogo de productos" -"Change status","Cambiar estado" -"Click on a tag to view your corresponding products.","Pincha en una etiqueta para ver tus productos correspondientes." -"Country","País" -"Customer My Account My Tags List","Lista de Mis Etiquetas de Mi Cuenta de Cliente" -"Customer My Account Tag View","Vista de Etiqueta de Mi Cuenta de Cliente" -"Customer Since","Cliente desde" -"Customers","Clientes" -"Customers Submitted this Tag","Clientes que han Enviado esta Etiqueta" -"Customers Tagged '%s'","Clientes que han Etiquetado '%s'" -"Delete","Eliminar" -"Delete Tag","Borrar Etiqueta" -"Disabled","Deshabilitado" -"Edit Tag '%s'","Editar Etiqueta '%s'" -"Email","Correo electrónico" -"First Name","Nombre" -"General Information","Información general" -"Grid","Parrilla" -"ID","ID" -"Info","Información" -"Last Name","Apellido" -"List","Lista" -"Manage Tags","Gestionar Etiquetas" -"My Recent Tags","Mis Etiquetas Recientes" -"My Tags","Mis Etiquetas" -"Name","Nombre" -"New Tag","Nueva Etiqueta" -"No matches found.","No se han encontrado coincidencias." -"Other people marked this product with these tags:","Otras personas han destacado este producto con estas etiquetas:" -"Pending","Pendiente" -"Pending Tags","Etiquetas Pendientes" -"Popular","Popular" -"Popular Tags","Etiquetas Populares" -"Price","Precio" -"Product Name","Nombre de Producto" -"Product SKU","Unidad de Mantenimiento de Existencias de Producto" -"Product Tag API","API de la Etiqueta de Producto" -"Product Tags","Etiqueta de Producto" -"Products","Productos" -"Products Tagged by Administrators","Productos Etiquetados por los Administradores" -"Products Tagged by Customers","Productos Etiquetados por los Clientes" -"Products Tagged with '%s'","Productos Etiquetados con '%s'" -"Products tagged with '%s'","Productos etiquetados con '%s'" -"Rebuild Tag aggregation data","Reconstruir datos de agregación de Etiqueta" -"Remove","Borrar" -"Remove product tag","Quitar etiqueta de producto" -"Retrieve list of tags by product","Recuperar lista de etiquetas por producto" -"Retrieve product tag info","Recuperar información de la etiqueta de producto" -"SKU","SKU" -"Save Tag","Guardar Etiqueta" -"Save and Continue Edit","Guardar y continuar editando" -"Status","Estado" -"Store View","Ver Tienda" -"Tag","Etiqueta" -"Tag ""%s"" has already been added to the product.","Ya se ha añadido la etiqueta ""%s"" al producto." -"Tag ""%s"" has been added to the product.","Se ha añadido la etiqueta ""%s"" al producto." -"Tag ""%s"" has been rejected by administrator.","La etiqueta ""%s"" ha sido rechazada por el administrador." -"Tag Aggregation Data","Datos de Agregación de Etiqueta" -"Tag Name","Nombre de la etiqueta" -"Tagged Products List","Lista de Productos Etiquetados" -"Tags","Etiquetas" -"Tags List (All Available)","Lista de Etiquetas (Todas Disponibles)" -"Tags List Before","Lista de etiquetas antes de" -"Tags:","Etiquetas:" -"Telephone","Teléfono" -"The tag has been deleted.","Se ha borrado la etiqueta." -"There are no tags available.","No hay etiquetas disponibles." -"Unable to find any products tagged with '%s' in the current store","No ha sido posible encontrar ningún producto etiquetado con '%s' en la tienda actual" -"Unable to remove tag. Please, try again later.","No ha sido posible eliminar la etiqueta. Por favor, inténtalo más tarde." -"Unable to save tag(s).","No ha sido posible guardar la(s) etiqueta(s)." -"Update","Actualizar" -"Update product tag","Actualizar etiqueta de producto" -"Use spaces to separate tags. Use single quotes (') for phrases.","Utiliza espacios para separar las etiquetas. Usa comillas simples (') para expresiones." -"View All Tags","Ver Todas las Etiquetas" -"View Customers","Ver Clientes" -"View Products","Ver Productos" -"XML","XML" -"You have not tagged any products yet.","Todavía no has etiquetado ningún producto." -"ZIP/Post Code","Código postal" -"[STORE VIEW]","[VER TIENDA]" diff --git a/app/locale/es_ES/Mage_Tax.csv b/app/locale/es_ES/Mage_Tax.csv deleted file mode 100644 index d45fc0a54..000000000 --- a/app/locale/es_ES/Mage_Tax.csv +++ /dev/null @@ -1,163 +0,0 @@ -"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - corresponde a cualquiera; 'xyz*' - corresponde a cualquiera que comience por 'xyz' y no sea más larga de % d" -"-- Please Select --","-- Seleccionar, por favor --" -"Add New Class","Anadir Nueva Categoría" -"Add New Tax Rate","Añadir Nueva Tasa Impositiva" -"Add New Tax Rule","Añadir Nueva Norma Impositiva" -"After Discount","Después de Descuento" -"An error occurred while deleting this rate.","Ha ocurrido un error al eliminar esta la tasa" -"An error occurred while deleting this rate. Incorrect rate ID.","Ha ocurrido un error al eliminar esta tasa. ID de tasa incorrecto." -"An error occurred while deleting this tax class.","Ha ocurrido un error al eliminar esta categoría de tasas" -"An error occurred while deleting this tax rule.","Ha ocurrido un error al eliminar esta norma impositiva" -"An error occurred while saving this tax class.","Ha ocurrido un error al guardar ésta categoría de índice" -"An error occurred while saving this tax class. A class with the same name","Ha ocurrido un error al guardar esta clase de impuesto. Una clase con el mismo nombre" -"Apply Customer Tax","Aplicar Tasa de Cliente" -"Apply Discount On Prices","Aplicar Descuento en Precios" -"Apply Tax On","Aplicar Impuesto" -"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Aplicar descuento al precio incluidos impuestos se calcula basándose en el impuesto de reserva, si se selecciona ""Aplicar impuesto tras descuento""." -"Are you sure you want to do this?","¿Estás seguro de querer hacer esto?" -"Back","Volver" -"Before Discount","Antes de Descuento" -"CSV","CSV" -"Calculate off subtotal only","Calcular solo el subtotal" -"Calculation Settings","Ajustes de Cálculo" -"Catalog Prices","Precios de Catálogo" -"Class Name","Nombre de Categoría" -"Click here to go to Tax configuration and change your settings.","Pulse aquí para ir a Configuración de impuestos y cambiar la configuración." -"Code","Código" -"Country","País" -"Custom price if available","Impoorte de aranceles si es aplicable" -"Customer Tax Class","Clase impositiva del cliente" -"Customer Tax Class Information","Información de clase de impuestos del cliente" -"Customer Tax Classes","Tipos de impuestos del cliente" -"Default Country","País predeterminado" -"Default Post Code","Código Postal por defecto" -"Default State","Estado por defecto" -"Default Tax Destination Calculation","Cálculo de Impuestos de Destino Predeterminado" -"Delete Class","Eliminar Categoría" -"Delete Rate","Eliminar índice" -"Delete Rule","Eliminar Regla" -"Display Full Tax Summary","Monstrar Reumen de Tasas Completo" -"Display Prices","Mostrar Precios" -"Display Product Prices In Catalog","Mostrar Precios de los Productos en Catálogo" -"Display Shipping Amount","Mostrar Importe de Envío" -"Display Shipping Prices","Mostrar Precios de Envío" -"Display Subtotal","Mostrar Subtotal" -"Display Zero Tax Subtotal","Mostrar Subtotal con Tasa Cero" -"Edit Class","Editar Categoría" -"Edit Class '%s'","Editar Categoría '%s'" -"Edit Rule","Editar Regla" -"Edit Tax Rate","Editar indicador de impuesto" -"Enable Cross Border Trade","Permitir operaciones transfronterizas" -"Excel XML","Excel XML" -"Excl. Tax","Impuestos no incluidos" -"Excl. Tax:","Impuestos no Incluídos:" -"Excluding Tax","Impuestos no Incluídos" -"Export Tax Rates","Tasas de Impuestos a la Exportación" -"Grand Total (Excl. Tax)","Total (Impuestos no Incluídos)" -"Grand Total (Excl.Tax)","Total (Impuestos no Incluídos)" -"Grand Total (Incl. Tax)","Total (Impuestos Incluídos)" -"Grand Total (Incl.Tax)","Total (Impuestos Incluídos)" -"Grand Total Excl. Tax","Total sin Incluir Impuestos" -"Grand Total Incl. Tax","Total Incluyendo Impuestos" -"Ignore this notification","Ignorar esta notificación" -"Import / Export Tax Rates","Tasas de Impuestos de Importación / Exportación" -"Import Tax Rates","Tasas de Impuestos de Importación" -"Inc. Tax","Impuestos Incluídos" -"Incl. Tax","Impuestos incluidos" -"Incl. Tax:","Impuestos Incluídos:" -"Include Tax In Grand Total","Impuestos Incluídos en el Total" -"Including Tax","Impuestos Incluídos" -"Including and Excluding Tax","Inclusión y Exclusión de Impuestos" -"Invalid file format upload attempt","Intento de subida de un formato de archivo no válido" -"Invalid file upload attempt","Intento de subida de un archivo no válido" -"Manage Customer Tax Classes","Gestión de impuestos sobre los tipos de clientes" -"Manage Product Tax Classes","Gestión de impuestos sobre los tipos de productos" -"Manage Tax Rates","Gestión de las Tasas de Impuestos" -"Manage Tax Rules","Gestión de las normas fiscales" -"Manage Tax Zones & Rates","Gestión de las Zonas de Impuestos y Precios" -"Maximum zip code length is 9.","La longitud máximo del código zip es de 9." -"Name","Nombre" -"New Class","Nueva Clase" -"New Rule","Nueva Regla" -"New Tax Rate","Nueva Tarifa de Impuesto" -"No","No" -"None","Nada" -"One of the country has invalid code.","Uno de los países tiene un código no válido." -"Orders, Invoices, Credit Memos Display Settings","Ajustes de visualización de Pedidos, Facturas, Notas de crédito" -"Original price only","Sólo precio original" -"Please fill all required fields with valid information.","Por favor, rellena todos los campos requeridos con información válida." -"Please see source for more details.","Vaya a source para ver más detalles." -"Price Display Settings","Precio de Configuración de Pantalla" -"Priority","Prioridad" -"Product Tax Class","Clase de impuesto del producto" -"Product Tax Class Information","Información de clase impositiva del producto" -"Product Tax Classes","Tipos de Impuestos de Productos" -"Range From","Intervalo Desde" -"Range To","Intervalo Hasta" -"Range To should be equal or greater than Range From.","El rango superior debe ser igual o superior al rango inferior." -"Rate","Tarifa" -"Rate Percent","Tasa de Porcentaje" -"Rate Percent should be a positive number.","El porcentaje del precio debe ser un número positivo." -"Reset","Restablecer" -"Row Total","Fila Total" -"Sales","Ventas" -"Save Class","Guardar Clase" -"Save Rate","Guardar Tarifa" -"Save Rule","Guardar Regla" -"Save and Continue Edit","Guardar y continuar editando" -"Shipping & Handling (Excl.Tax)","Envío y Servicio (Impuestos no Incluídos)" -"Shipping & Handling (Incl.Tax)","Envío y Servicio (Impuestos Incluídos)" -"Shipping & Handling Tax","Impuestos de envío y manipulación" -"Shipping (Excl. Tax)","Envío (Impuestos no Incluídos)" -"Shipping (Incl. Tax)","Envío (Impuestos Incluídos)" -"Shipping Excl. Tax (%s)","Impuestos de Envío no Incluídos (%s)" -"Shipping Incl. Tax (%s)","Impuestos de Envío Incluídos (%s)" -"Shipping Prices","Precios de Envío" -"Shopping Cart Display Settings","Configuraciones de Visualización del Carrito de Compra" -"Sort Order","Ordenar Pedido" -"State","Estado" -"State/Region","Estado/Región" -"Subtotal (Excl. Tax)","Subtotal (Excl. Impuestos)" -"Subtotal (Excl.Tax)","Subtotal (Excl. Impuestos)" -"Subtotal (Incl. Tax)","Subtotal (Incl. Impuestos)" -"Subtotal (Incl.Tax)","Subtotal (Incl. Impuestos)" -"Subtotal only","Solo subtotal" -"Tax","Impuestos" -"Tax Calculation Based On","Cálculo Tributario Basado En" -"Tax Calculation Method Based On","Método de Cálculo Tributario Basado En" -"Tax Class for Shipping","Clase de Impuestos para Envíos" -"Tax Classes","Clases de Impuestos" -"Tax Identifier","Identificador Tributario" -"Tax Rate","Tarifa de Impuestos" -"Tax Rate Information","Información sobre Tarifas de Impuestos" -"Tax Rule Information","Información sobre Reglas Tributarias" -"Tax Rules","Reglas de Impuestos" -"Tax Section","Sección de Impuestos" -"Tax Titles","Títulos Tributarias" -"Tax rate cannot be removed. It exists in tax rule","El índice de impuestos no se puede eliminar. Existe en la regla de impuestos." -"Tax rates at the same priority are added, others are compounded.","Las tarifas tributarias con la misma prioridad son añadidas, las demás son compuestas." -"The tax class has been deleted.","Esta clase de impuestos ha sido eliminada." -"The tax class has been saved.","Esta clase de impuestos ha sido guardada." -"The tax rate has been deleted.","Esta tarifa tributaria ha sido eliminada." -"The tax rate has been imported.","Esta tarifa tributaria ha sido importada." -"The tax rate has been saved.","Esta tarifa tributaria se ha guardado." -"The tax rule has been deleted.","Esta regla tributaria ha sido eliminada." -"This class no longer exists","Esta clase ya no existe." -"This rule no longer exists","Esta regla ya no existe" -"This rule no longer exists.","Esta regla ya no existe." -"Total","Total" -"Unit Price","Precio por unidad" -"Warning tax configuration can result in rounding errors","Una configuración de impuestos errónea puede causar errores de redondeo" -"Warning tax configuration can result in unexpected FPT prices on applicable devices","Precaucion: la configuracion de impuestos puede resultar en precios FPT inesperados en dispositivos aplicables" -"Warning tax discount configuration might result in different discounts than a customer might expect","Advertencia: la configuración del descuento de impuestos puede dar como resultado un descuento distinto al que el cliente piensa" -"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","Cuando los precios del catálogo incluyan impuestos, esta función fijará el precio independientemente de la tasa de impuestos del cliente." -"Whether catalog prices entered by admin include tax.","Si los precios de catálogo introducidos por el administrador incluyen impuestos." -"Whether shipping amounts entered by admin or obtained from gateways include tax.","Si las gastos de envío introducidos por el administrador u obtenidos a través de puertas de enlace incluyen impuestos." -"Yes","Sí" -"You cannot delete this tax class as it is used for %d customer groups.","No puede eliminar esta clase de impuestos ya que está siendo utilizada por %d grupos de clientes." -"You cannot delete this tax class as it is used for %d products.","No puede eliminar esta clase de impuestos ya que está siendo utilizada por productos &d." -"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","No puede eliminar esta clase de impuestos ya que está siendo utilizada en las Reglas Tributarias (Tax Rules). Debe eliminar las reglas que está utilizando primero." -"Zip code should not contain characters other than digits.","El código postal no debería contener caracteres que no sean números." -"Zip/Post Code","CP/Código Postal" -"Zip/Post is Range","Código Postal es Rango" -"for store(s)","Para tienda(s)" diff --git a/app/locale/es_ES/Mage_Usa.csv b/app/locale/es_ES/Mage_Usa.csv deleted file mode 100644 index 5166cf251..000000000 --- a/app/locale/es_ES/Mage_Usa.csv +++ /dev/null @@ -1,381 +0,0 @@ -" was not delivered nor scanned","no ha sido entregado ni escaneado" -"""Per Order"" allows single handling fee for entire order. ""Per Package"" allows individual handling fee for each package.","""Por Pedido"" permite una única tarifa de gastos de manipulación para todo el pedido. ""Por Paquete"" permite una tarifa de gastos de gestión individual para cada paquete." -"1 Day Freight","Envío en 1 día" -"2 Day","Día 2" -"2 Day AM","Día 2 AM" -"2 Day Freight","Envío en 2 días" -"2Day","2 días" -"2nd Day Air","2º día en avión" -"2nd Day Air AM","2º día en avión por la mañana" -"2nd Day Air AM Letter","2º día por correo aéreo por la mañana" -"2nd Day Air Letter","2º día por correo aéreo" -"3 Day Freight","Envío en 3 días" -"3 Day Select","Seleccione 3 días" -"Access ID","Acceso usuario" -"Access License Number","Número de licencia de acceso" -"Account ID","Cuenta usuario" -"Account Number","Número de cuenta" -"Additional Protection Configuration Value","Valor de configuración de protección adicional" -"Additional Protection Enabled","Protección adicional habilitada" -"Additional Protection Min Subtotal","Mínimo subtotal protección adicional" -"Additional Protection Value","Valor de protección adicional" -"Additional Protection Value Rounding Method","Método de redondeo del valor de protección adicional" -"Adult","Adulto" -"Adult Signature Required","Se Requiere Firma de Adulto" -"Allowed Methods","Métodos permitidos" -"Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges.","Permite dividir el peso del pedido total en piezas pequeñas si sobrepasa los %s %s para asegurar un cálculo exacto de los gastos de envío." -"Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","Permite dividir el peso del pedido total en piezas pequeñas si sobrepasa los 70 kg para asegurar un cálculo exacto de los gastos de envío." -"Bound Printed Matter","Asunto impreso limitado" -"Break bulk economy","Fraccionar economía a granel" -"Break bulk express","Fraccionar envío urgente a granel" -"Business Service Center","Centro de servicios" -"Calculate Handling Fee","Calcular el gastos de envío" -"Canada Standard","Canadá Estándar" -"Cannot identify measure unit for %s","No se puede identificar la unidad de medida para %s" -"Cannot identify weight unit for %s","No se puede identificar la unidad de peso para %s" -"Cannot retrieve shipping rates","Imposible recuperar las tarifas de transporte" -"Centimeters","Centímetros" -"Commercial","Comercial" -"Configuration","Configuración" -"Container","Container" -"Content Type","Tipo de Contenido" -"Customer Packaging","Embalado por el cliente" -"Customer Supplied Package","Paquete Suministrado por el Cliente" -"Customer services","Atención al cliente" -"DHL","DHL" -"DHL (Deprecated)","DHL (Rechazado)" -"DHL service is not available at %s date","DHL service is not available at %s date" -"Debug","Depurar" -"Default Package Height","Altura del paquete por defecto" -"Default Package Length","Longitud del paquete por defecto" -"Default Package Width","Anchura del paquete por defecto" -"Delivered","Entregado" -"Delivery Confirmation","Confirmación de Envío" -"Depth","Anchura" -"Destination Type","Tipo de destino" -"Destination facility code is empty","El código de la instalación de destino está vacío" -"Development","Nueva situación" -"Direct","Directo" -"Displayed Error Message","Mostrado mensaje de error" -"Divide Order Weight","Dividir el Peso del Pedido" -"Documents","Documentos" -"Domestic Shipment Days","Días para envíos nacionales" -"Domestic economy select","Selección de economía doméstica" -"Domestic express","Envío urgente doméstico" -"Drop Box","Buzón" -"Dropoff","De entrega" -"Easy shop","Compra fácil" -"Economy select","Selección de economía" -"Empty response","Respuesta vacía" -"Enable Negotiated Rates","Habilitar tarifas negociadas" -"Enabled for Checkout","Habilitado para Cobro" -"Enables/Disables SSL verification of Magento server by UPS.","Activa/desactiva la verificación SSL del servidor Magento por UPS" -"Error #%s : %s","Error #%s : %s" -"Error #%s : %s (%s)","Error #%s : %s (%s)" -"Error #%s: %s","Error #%s: %s" -"Europack","Europack" -"Europe First Priority","Primera Prioridad Europa" -"Exchange rate %s (Base Currency) -> %s not found. DHL method %s skipped","Tipo de cambio %s (Moneda Base) -> %s no encontrado. Método DHL %s omitido" -"Express","Express" -"Express 10:30","Envío urgente 10:30" -"Express 10:30 AM","Express 10:30 AM" -"Express 12:00","Envío urgente 12:00" -"Express 9:00","Envío urgente 9:00" -"Express Mail","Correo Express" -"Express Saturday","Express Sábado" -"Express Saver","Express de Ahorro" -"Express easy","Envío urgente fácil" -"Express envelope","Sobre urgente" -"Express worldwide","Envío urgente internacional" -"Failed to parse xml document: %s","Fallo en la conversión del documento xml: %s" -"FedEx","FedEx" -"FedEx 10kg Box","Caja de 10 Kg. de FedEx" -"FedEx 25kg Box","Caja de 25 Kg. de FedEx" -"FedEx Box","Caja de FedEx" -"FedEx Envelope","Sobre de FedEx" -"FedEx Pak","Paquete de FedEx" -"FedEx Tube","Tubo de FedEx" -"First Overnight","El Primero Nocturno" -"First-Class","Primera Clase" -"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope" -"First-Class Mail International Letter","First-Class Mail International Letter" -"First-Class Mail International Postcard","First-Class Mail International Postcard" -"First-Class Mail Large Envelope","First-Class Mail Large Envelope" -"First-Class Mail Large Postcards","First-Class Mail Large Postcards" -"First-Class Mail Letter","First-Class Mail Letter" -"First-Class Mail Parcel","First-Class Mail Parcel" -"First-Class Mail Postcards","First-Class Mail Postcards" -"First-Class Package International Service","First-Class Package International Service" -"First-Class Package Service","First-Class Package Service" -"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup" -"Flat","Fijo" -"Flat-Rate Box","Caja de Tarifa Plana" -"Flat-Rate Envelope","Sobre de Tarifa Plana" -"Free Method","Método Gratuito" -"Free Shipping with Minimum Order Amount","Envío Gratuito con Cantidad Mínima de Pedido" -"Freight","Mercancías" -"Freight worldwide","Transporte internacional" -"Gateway URL","URL de la pasarela" -"Gateway XML URL","Pasarela XML URL" -"Gift","Regalo" -"Girth","Circunferencia" -"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)" -"Global Express Guaranteed Document","Global Express Guaranteed Document" -"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular" -"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular" -"Globalmail business","Negocio de correo global" -"Ground","Rutina" -"Ground Commercial","Rutina Comercial" -"Ground Residential","Rutina Residencial" -"Handling Applied","Portes Aplicados" -"Handling Fee","Gastos de Tramitación" -"Height","Altura" -"Height, width and length should be equal or greater than %s","Altura, anchura y longitud deberían ser iguales o mayores que %s" -"Home Delivery","Entrega a Domicilio" -"Hub ID","ID de hub" -"Inches","Centímetros" -"Indirect","Indirecto" -"International Economy","Internacional Económico" -"International Express","Internacional Rápido" -"International First","Internacional Primera" -"International Ground","Suelo Internacional" -"International Priority","Internacional Prioritario" -"International Shipment Days","Días de Envio Internacional" -"Intl Economy Freight","Transporte Internacional Económico" -"Intl Priority Freight","Transporte Internacional Prioritario" -"Jetline","Jetline" -"Jumbo box","Buzón Jumbo" -"Key","Clave" -"Kilograms","Kilogramos" -"Large","Grande" -"Large Express Box","Gran Paquete Urgente" -"Length","Longitud" -"Letter","Carta" -"Library","Biblioteca" -"Library Mail","Library Mail" -"Live","Vivo" -"Machinable","Manufacturable" -"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Peso Máximo de Paquete (Por favor, consulte el peso máximo admitido para envíos con su empresa de transportes)" -"Media Mail","Correo de medios de comunicación" -"Medical express","Envío médico urgente" -"Medium Express Box","Paquete Mediano Urgente" -"Merchandise","Mercancía" -"Meter Number","Número de Contador" -"Minimum Order Amount for Free Shipping","Cantidad Mínima de Pedido para Envíos Gratuitos" -"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","Peso Mínimo de Paquete (Por favor, consulte el peso mínimo admitido para envíos con su empresa de transportes)" -"Mode","Modalidad" -"National Freight","Mercancía nacional" -"Next Afternoon","Mañana por la Tarde" -"Next Day Air","Transporte Aéreo al Día Siguiente" -"Next Day Air Early AM","Transporte Aéreo al Día Siguiente a Primera Hora de la Mañana" -"Next Day Air Early AM Letter","Carta por Transporte Aéreo al Día Siguiente a Primera Hora de la Mañana" -"Next Day Air Intra (Puerto Rico)","Transporte Aéreo Interno al Día Siguiente (Puerto Rico)" -"Next Day Air Letter","Carta por Transporte Aéreo al Día Siguiente" -"Next Day Air Saver","Transporte Aéreo al Día Siguiente con Ahorro" -"Next Day Air Saver Letter","Carta por Transporte Aéreo al Día Siguiente con Ahorro" -"No","No" -"No packages for request","No hay paquetes que solicitar" -"Non Documents","No documentos" -"Non documents","No documentos" -"Non-rectangular","No rectangular" -"None","Ninguno" -"Not Required","No requerido" -"Order","Encargar" -"Order #%s","Pedido #%s" -"Origin of the Shipment","Origen del envío" -"Origin serviceAreaCode is missing","Falta el código de área del servicio de origen" -"Other","Otra" -"Others","Otros" -"PAK","PAK" -"Package","Paquete" -"Package Description","Descripción del paquete" -"Package content is missing","Falta el contenido del empaquetado" -"Packages Request Type","Tipo de Solicitud de Paquetes" -"Packaging","Embalaje" -"Pallet","Palé" -"Parcel","Paquete" -"Parcel Post","Servicio de paquetes postales" -"Password","Contraseña" -"Pickup Method","Método de recogida" -"Piece Id barcode is missing","Falta el código de barras de identificación de la pieza" -"Piece number information is missing","Falta la información del número de la pieza" -"Please make sure to use only digits here. No dashes are allowed.","Por favor, asegúrese de introducir solamente dígitos. No se pueden utilizar guiones." -"Please, specify origin country","Por favor, indicar país de origen" -"Pounds","Libras" -"Priority Mail","Correo urgente" -"Priority Mail Express","Priority Mail Express" -"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes" -"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup" -"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope" -"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup" -"Priority Mail Express International","Priority Mail Express International" -"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes" -"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope" -"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope" -"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope" -"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope" -"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope" -"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery" -"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes" -"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope" -"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope" -"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope" -"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope" -"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup" -"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope" -"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup" -"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup" -"Priority Mail International","Priority Mail International" -"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box" -"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope" -"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope" -"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box" -"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box" -"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope" -"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box" -"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope" -"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box" -"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope" -"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope" -"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box" -"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup" -"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope" -"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup" -"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box" -"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup" -"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope" -"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup" -"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A" -"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup" -"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B" -"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup" -"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C" -"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup" -"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box" -"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup" -"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope" -"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup" -"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope" -"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup" -"Priority Overnight","Prioridad durante la noche" -"Product content code is invalid","El código de contenido del producto no es válido" -"Product name is missing","Falta el nombre del producto" -"Receiver","Destinatario" -"Rectangular","Rectangular" -"Reference code is missing","Falta el código de referencia" -"Regular","Ordinario" -"Regular Pickup","Recogida ordinaria" -"Request Courier","Solicitar servicio de mensajería" -"Required","Requerido" -"Required for negotiated rates; 6-character UPS.","Requerido para tarifas negociadas; UPS de 6 caracteres." -"Residential","Residencial" -"Residential Delivery","Entrega residencial" -"Response is in the wrong format","La respuesta está en el formato equivocado" -"Return","Devolución" -"Round","Redondo" -"Routing barcode is missing","Falta el código de barras de enrutamiento" -"Same day","El mismo día" -"Sample","Ejemplo" -"Sandbox Mode","Modo de prueba" -"Second Day Service","Servicio de segundo día" -"Secure Gateway URL","URL de Gateway Seguro" -"Secureline","Secureline" -"Sender","Remitente" -"Sender city info is missing","Falta la información de la ciudad del remitente" -"Sender contact name is missing","Falta el nombre de contacto del remitente" -"Sender country info is missing","Falta la información del país del remitente" -"Service type does not match","El tipo de servicio no coincide" -"Ship to Applicable Countries","Enviar a los países aplicables" -"Ship to Specific Countries","Enviar a países específicos" -"Shipment Contains Hazardous Materials","El envío contiene materiales peligrosos" -"Shipment Dutiable","Envío sujeto a derechos de aduana" -"Shipment Duty Payment Type","Tipo de pago de impuestos de envío" -"Shipment Type","Tipo de envío" -"Shipment is not available.","El envío no está disponible" -"Shipment picked up","Envío recogido" -"Shipper Number","Número de expedidor" -"Shipping Accept XML URL","URL XML de admisión del envío" -"Shipping Confirm XML URL","URL XML de confirmación del envío" -"Shipping Key","Clave de envío" -"Shipping Key (International)","Clave de envío (internacional)" -"Show Method if Not Applicable","Mostrar el método si no se aplica" -"Signature Required","Firma requerida" -"Size","Tamaño" -"Small Express Box","Caja express pequeña" -"Smart Post","Smart Post" -"Sort Order","Ordenar Pedido" -"Specific","Específico" -"Sprintline","Sprintline" -"Standard Overnight","Estándar de un día para otro" -"Standard Post","Envío estándar" -"Station","Central" -"Subtotal","Subtotal" -"Subtotal With Discount","Subtotal con descuento" -"The field is applicable if the Smart Post method is selected.","El campo es aplicable si se selecciona el método de Publicación Inteligente." -"The response is in wrong format.","La respuesta tiene un formato incorrecto." -"There is no available method for selected shipping address.","No existe un método disponible para la dirección de envío seleccionada." -"There is no items in this order","No hay artículos en este pedido" -"Third Party","Terceras Partes" -"Title","Título" -"To Lower","Al Inferior" -"To Upper","Al Superior" -"Tracking XML URL","Seguimiento de URL XML" -"UPS","UPS" -"UPS Expedited","UPS Urgente" -"UPS Express","UPS Express" -"UPS Express Box","UPS Express Box" -"UPS Express Early A.M.","UPS Express A Primera Hora de la Mañana" -"UPS Express Plus","UPS Express Plus" -"UPS Ground","UPS Ground" -"UPS Letter Envelope","UPS Sobre de Carta" -"UPS Next Day Air","UPS Aéreo Entrega Al Día Siguiente" -"UPS Next Day Air Early A.M.","UPS Aéreo Entrega Al Día Siguiente A Primera Hora de la Mañana" -"UPS Next Day Air Saver","UPS Saver Aéreo Entrega Al Día Siguiente" -"UPS Saver","UPS Saver" -"UPS Second Day Air","UPS Aéreo Entrega Al Final del Segundo Día Laborable" -"UPS Second Day Air A.M.","UPS Aéreo Entrega En La Mañana del Segundo Día Laborable" -"UPS Standard","UPS Standard" -"UPS Three-Day Select","UPS Entrega Al Final Del Tercer Día Laborable" -"UPS Today Dedicated Courrier","UPS Entrega En el Día por Mensajería Dedicada" -"UPS Today Express","UPS Entrega En el Día En Una Hora" -"UPS Today Express Saver","UPS Entrega En el Día En Dos Horas y Media" -"UPS Today Intercity","UPS Entrega En el Día Interurbana" -"UPS Today Standard","UPS Entrega En el Día A Última Hora" -"UPS Tube","UPS Tube" -"UPS Type","Tipo de UPS" -"UPS Worldwide 10 kilo","UPS Internacional 10 kilos" -"UPS Worldwide 25 kilo","UPS Internacional 25 kilos" -"UPS Worldwide Expedited","UPS Internacional Expedited" -"UPS Worldwide Express","UPS Internacional Express" -"UPS Worldwide Express Plus","UPS Internacional Express Plus" -"UPS Worldwide Express PlusSM","UPS Internacional Express PlusSM" -"UPS Worldwide Saver","UPS Ahorro Internacional" -"USPS","USPS" -"USPS GXG Envelopes","USPS GXG Envelopes" -"Unable to retrieve tracking","No se puede recuperar el seguimiento." -"United Parcel Service","United Parcel Service" -"United Parcel Service XML","XML de United Parcel Service" -"Unknown error","Error desconocido" -"Used only when ""Additional Protection Value"" is set to ""Configuration"". Can contain only numeric amount.","Se usa sólo cuando el ""Valor de protección adicional"" está establecido en ""Configuración"". Sólo puede contener cantidades numéricas. " -"User ID","ID de Usuario" -"Variable","Variable" -"Waybill barcode information is missing","Falta la información de albarán del código de barras" -"Weight Unit","Unidad de Peso" -"Weight unit is invalid","La unidad de peso no es válida" -"Width","Ancho" -"Worldwide Expedited","Internacional Expedited" -"Worldwide Express","Internacional Express" -"Worldwide Express Letter","Carta Internacional Express" -"Worldwide Express Plus","Internacional Express Plus" -"Worldwide Express Plus Letter","Carta Internacional Express Plus" -"Worldwide Express Saver","Internacional Express Saver" -"Wrong Content Type.","Tipo de Contenido Incorrecto." -"Wrong Region.","Región Incorrecta." -"Yes","Sí" -"Your Packaging","Su Embalaje" -"Zero shipping charge for '%s'","Cero gastos de envío para '%s'" -"cm","cm" -"inch","pulgada" diff --git a/app/locale/es_ES/Mage_Weee.csv b/app/locale/es_ES/Mage_Weee.csv deleted file mode 100644 index 9af1e3d7d..000000000 --- a/app/locale/es_ES/Mage_Weee.csv +++ /dev/null @@ -1,25 +0,0 @@ -"All Websites","Todos los Sitios Web" -"Apply Discounts To FPT","Aplicar descuento a FPT" -"Apply Tax To FPT","Aplicar impuestos a FPT" -"Display Prices In Emails","Mostrar precios en el correo electrónico" -"Display Prices In Product Lists","Mostrar precios en la lista de productos" -"Display Prices In Sales Modules","Mostrar precios en los módulos de ventas" -"Display Prices On Product View Page","Mostrar precios en la página de vista preliminar del producto" -"Enable FPT","Activar FPT" -"Excluding FPT","FPT no incluido" -"Excluding FPT, FPT description, final price","Excluido FPT, descripción FPT, precio final" -"FPT Tax Configuration","Configuracion de Impuestos FPT " -"Fixed Product Tax","Impuesto fijo del producto" -"Fixed Product Taxes","Impuesto fijo del producto" -"Include FPT In Subtotal","Inlcuir impuestos en el subtotal" -"Including FPT and FPT description","Inlcuir impuestos y descripción de los impuestos" -"Including FPT and FPT description [incl. FPT VAT]","Inlcuir impuestos y descripción de los impuestos [incl.IVA]" -"Including FPT only","Incluir sólo FPT" -"Loaded and Displayed with Tax","Cargado y mostrado con Impuestos" -"Not Taxed","Sin Impuesto" -"Taxed","Con Impuesto" -"Total","Total" -"Total Incl. Tax","Total con impuestos incluidos" -"Total excl. tax","Total impuestos excl." -"Total incl. tax","Total con impuestos incluidos" -"Total:","Total:" diff --git a/app/locale/es_ES/Mage_Widget.csv b/app/locale/es_ES/Mage_Widget.csv deleted file mode 100644 index 1edb75b66..000000000 --- a/app/locale/es_ES/Mage_Widget.csv +++ /dev/null @@ -1,75 +0,0 @@ -"%s","%s" -"-- Please Select --","-- Seleccionar, por favor --" -"Actions","Acciones" -"Add Layout Update","Agregar actualización de diseño" -"Add New Widget Instance","Agregar nueva instancia de aplicación" -"All","Todo" -"All Pages","Todas las páginas" -"All Product Types","Todos los tipos de productos" -"An error occurred during saving a widget: %s","Se ha producido un error al guardar el widget: %s" -"Anchor Categories","Categorías de ancla" -"Apply","Confirmar" -"Assign to Store Views","Asignar a vistas de tienda" -"Big Image","Imagen grande" -"Block Reference","Referencia de bloque" -"CMS","CMS" -"Categories","Categorías" -"Choose...","Elegir..." -"Close","Cerrar" -"Continue","Continuar" -"Default Template","Plantilla por Defecto" -"Delete","Eliminar" -"Design Package/Theme","Diseñar paquete/tema" -"Export to:","Exportar a:" -"Frontend Properties","Propiedades del frontend" -"Generic Pages","Páginas genéricas" -"Images","Imágenes" -"Insert Widget","Insertar aplicación" -"Insert Widget...","Insertar aplicación..." -"Layout Updates","Actualizaciones de diseño" -"Manage Widget Instances","Administrar instancias de aplicación" -"New Instance","Nueva instancia" -"New Widget Instance","Nueva instancia de aplicación" -"Next page","Página siguiente" -"Non-Anchor Categories","Categorías no de ancla" -"Not Selected","No seleccionado" -"Open Chooser","Abrir el buscador" -"Page","Página" -"Please Select Block Reference First","Seleccione primero la referencia de bloque" -"Previous page","Página anterior" -"Products","Productos" -"Remove Layout Update","Eliminar actualización de diseño" -"Save and Continue Edit","Guardar y continuar editando" -"Select All","Seleccionar Todo" -"Select Visible","Seleccionar Visible" -"Settings","Configuración" -"Sort Order","Ordenar Pedido" -"Sort Order of widget instances in the same block reference","Establecer orden de instancias de aplicación en la misma referencia de bloque" -"Specific %s","%s específico" -"Specified Page","Página especificada" -"Template","Plantilla" -"The information in this tab has been changed.","Se ha cambiado la información de esta etiqueta." -"The widget instance has been deleted.","Se eliminó la instancia de aplicación." -"The widget instance has been saved.","Se guardó la instancia de aplicación." -"This tab contains invalid data. Please solve the problem before saving.","Esta etiqueta contiene datos no válidos. Por favor, resuelva el problema antes de guardar." -"Thumbnail","Miniatura" -"Total %d records found","Se ha encontrado un total de %d registros" -"Type","Tipo" -"Unselect All","Deseleccionar Todo" -"Unselect Visible","Deseleccionar lo Visible" -"View","Ver" -"Widget","Aplicación" -"Widget ""%s""","Widget ""%s""" -"Widget ID","ID de aplicación" -"Widget Insertion","Inserción del widget" -"Widget Instance","Instancia de aplicación" -"Widget Instance Title","Título de instancia de aplicación" -"Widget Options","Opciones de aplicación" -"Widget Type","Tipo de aplicación" -"Widget Type is not specified","No se especificó el tipo de aplicación" -"Widget instance is not full complete to create.","La instancia de aplicación no está completa para crear." -"Widgets","Aplicaciones" -"Wrong widget instance specified.","La instancia de widget especificada es errónea." -"items selected","Artículos elegidos" -"of %s pages","de %s páginas" -"per page","por página" diff --git a/app/locale/es_ES/Mage_Wishlist.csv b/app/locale/es_ES/Mage_Wishlist.csv deleted file mode 100644 index 2fb3a9685..000000000 --- a/app/locale/es_ES/Mage_Wishlist.csv +++ /dev/null @@ -1,100 +0,0 @@ -"%1$s has been updated in your wishlist.","Se ha actualizado %1$s en su lista de la compra." -"%d product(s) have been added to shopping cart: %s.","%d artículo(s) se ha(n) añadido a la cesta de la compra: %s." -"%s for ""%s"".","%s por ""%s""." -"%s has been moved to wishlist %s","%s se ha movido a la lista de favoritos %s" -"%s's Wishlist","%s's Lista" -"* Required Fields","* Campos Requeridos" -"Add All to Cart","Añadir Todo al Carrito" -"Add to Cart","Añadir al Carrito" -"Add to Compare","Agregar para comparar" -"Add to Wishlist","Añadir a lista que quieres." -"Added From","Agregar desde" -"An error occurred while adding item to wishlist.","Se ha producido un error al añadir el artículo a la lista." -"An error occurred while adding item to wishlist: %s","Se ha producido un error al añadir el artículo a la lista: %s" -"An error occurred while deleting the item from wishlist.","Se ha producido un error al cancelar el artículo de la lista." -"An error occurred while deleting the item from wishlist: %s","Se ha producido un error al cancelar el artículo de la lista: %s" -"An error occurred while updating wishlist.","Ocurrió un error mientras se actualizaba la lista de la compra." -"Are you sure you want to remove this product from your wishlist?","¿Está seguro que desea retirar este producto de su lista de deseos?" -"Are you sure you would like to remove this item from the wishlist?","¿Está seguro de querer eliminar este artículo de su lista?" -"Back","Volver" -"Can\'t delete item from wishlist","No se puede eliminar el artículo de la lista de la compra" -"Can\'t save description %s","Imposible guardar la descripción %s" -"Can\'t update wishlist","Imposible actualizar la lista" -"Cannot add item to shopping cart","No se pudo añadir el artículo al carrito de compra" -"Cannot add the following product(s) to shopping cart: %s.","No se pueden añadir el (los) siguiente(s) producto(s) a la cesta de la compra: %s." -"Cannot add the item to shopping cart.","Imposible añadir el artículo a la cesta de la compra." -"Cannot configure product","No se puede configurar el producto" -"Cannot load wishlist item","No se puede cargar el artículo de la lista de la compra" -"Cannot move item to wishlist","No se puede mover el artículo a la lista de favoritos" -"Cannot specify product.","No se pudo especificar producto." -"Cannot specify wishlist item.","No se puede especificar el artículo de la lista de la compra." -"Cannot specify wishlist.","Imposible especificar Favoritos" -"Cannot update wishlist","Imposible actualizar la lista" -"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Marque esta casilla si desea añadir a su lista un enlace a una fuente RSS." -"Click for price","Clic para precio" -"Comment","Comentario" -"Comment:","Comentarios:" -"Configure Wishlist Item","Configurar artículo de la lista de la compra" -"Configured Price:","Precio configurado:" -"Could not find such wishlist","No se pudo encontrar tal lista de favoritos" -"Could not find wishlist","No se pudo encontrar la lista de favoritos" -"Customer My Account My Wishlist","Cliente Mi Cuenta Mis favoritos" -"Customer My Account Wishlist Sharing Form","Cliente Mi Cuenta Formulario para compartir Favoritos" -"Customer Shared Wishlist View","Vista de Favoritos compartidos por el cliente" -"Date Added","Fecha de subida" -"Days in Wishlist","Días en la lista de la compra" -"Display Wishlist Summary","Mostrar resumen de la lista de la compra" -"Edit","Editar" -"Email Sender","Remitente del email" -"Email Template","Plantilla de email" -"Email address can\'t be empty.","El campo Dirección de correo electrónico no puede estar vacío." -"Email addresses, separated by commas","Direcciones de correo electrónico, separadas por comas" -"Enabled","Habilitado" -"General Options","Opciones Generales" -"Go to Wishlist","Ir a Favoritos" -"Helper for wishlist options rendering doesn't implement required interface.","El asistente para el renderizado de las opciones de la lista de la compra no implementa la interfaz necesaria." -"In stock","En existencias" -"Last Added Items","Últimos elementos añadidos" -"Message","Mensaje" -"My Wishlist","Mi Lista de Deseos:" -"My Wishlist (%d item)","Mis Favoritos (%d elemento)" -"My Wishlist (%d items)","Mis Favoritos (%d elemento)" -"My Wishlist (%d)","Mis Favoritos (%d)" -"My Wishlist Link","Enlace a mi lista de la compra" -"Options Details","Detalles de las opciones" -"Out of stock","Agotado" -"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Por favor, introduzca una o más direcciones válidas de correo electrónico, separadas por comas. Ejemplo johndoe@domain.com, johnsmith@domain.com." -"Please input a valid email address.","Por favor, introducir una dirección de email válida." -"Please, enter your comments...","Por favor, introduzca sus comentarios..." -"Price","Precio" -"Product","Producto" -"Product Details and Comment","Detalles del producto y comentarios" -"Product(s) %s have required options. Each of them can be added to cart separately only.","Los productos cumplen los requisitos necesarios. Sólo pueden ser añadidos a la cesta cada uno por separado." -"Product(s) %s have required options. Each product can only be added individually.","El (los) producto(s) %s requieren opciones. Cada producto solo se puede añadir de manera individual." -"Quantity","Cantidad" -"RSS Feed","Fuente RSS" -"RSS link to %s's wishlist","Enlace RSS a %s's favoritos" -"Remove Item","Eliminar elemento" -"Remove This Item","Eliminar Este Artículo" -"Remove item","Eliminar artículo" -"Requested cart item doesn't exist","El artículo solicitado de la cesta no existe" -"Requested wishlist doesn't exist","No existe la lista de favoritos solicitada" -"Share Options","Opciones para compartir" -"Share Wishlist","Compartir Lista de Deseos" -"Share Your Wishlist","Comparte tus Favoritos" -"Sharing Information","Compartiendo Información" -"This Wishlist has no Items","Esta lista de deseos no tiene elementos" -"This product(s) is currently out of stock","Este artículo(s) está agotado actualmente" -"Unable to add the following product(s) to shopping cart: %s.","Imposible añadir el siguiente producto(s) a la cesta de la compra: %s." -"Update Wishlist","Actualizar la lista de peticiones" -"User Description","Descripción del usuario" -"View Details","Ver detalles" -"View Product","Vista del producto" -"What's this?","¿Qué es esto?" -"Wishlist","Lista de deseos" -"Wishlist Section","Sección Favoritos" -"Wishlist Sharing","Compartir Favoritos" -"Wishlist could not be created.","No se pudo crear la lista de favoritos." -"Wishlist is empty now.","Favoritos está vacío." -"You have no items in your wishlist.","No tiene artículos en su lista de peticiones." -"Your Wishlist has been shared.","Sus Favoritos han sido compartidos." diff --git a/app/locale/es_ES/Mage_XmlConnect.csv b/app/locale/es_ES/Mage_XmlConnect.csv deleted file mode 100644 index de2bbdd2b..000000000 --- a/app/locale/es_ES/Mage_XmlConnect.csv +++ /dev/null @@ -1,1200 +0,0 @@ -" But cart has some errors.","Der Einkaufswagen jedoch weist Fehler auf." -" Note: Image size affects the performance of your app."," Note: Image size affects the performance of your app." -"""Description"" is more than %d characters long","""Beschreibung"" überschreitet die erlaubten %d Zeichen" -"""Title"" is more than %d characters long","""Titel"" überschreitet die erlaubten %d Zeichen" -"""id"" attribute is required for a ""%s"" field.","Se requiere el atributo id para el campo ""%s""." -"""line_count"" attribute is required for ""multiline"" element.","Se requiere el atributo ""line_count"" para el elemento multilínea." -"""message"" attribute is required for ""%s"" validator rule.","Se requiere el atributo ""message"" para la validación validator rule ""%s""." -"%1$s has been added to your wishlist.","%1$s wurde auf Ihren Wunschzettel geschrieben." -"%1$s incl tax.","%1$s inkl. MwSt." -"%@ is not correct","%@ is not correct" -"%s API Key required.","%s API-Key benötigt." -"%s Application ID required.","%s Anwendungsidentifikation benötigt." -"%s Secret Key required.","%s Geheimschlüssel benötigt." -"%s attribute is required.","Se requiere el atributo %s." -"%s fields is required","%s fields is required" -"%s has been added to your cart.","%s wurde in Ihren Einkaufswagen gelegt." -"%s id:","%s id:" -"%s was updated in your shopping cart.","%s was updated in your shopping cart." -"(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)","(Dazu gehören weitere Ländern außer den genannten. Als Eigentümer der Anwendung sind sie für die Einhaltung der Rechtsvorschriften ihres Landes hinsichtlich der Verbreitung oder dem Verkauf ihrer Anwendung in jeweiligem Land, einschließlich ihrem Heimatland, selbst verantwortlich.)" -"* - field is required","* - field is required" -"*Subject to change","Sujeto a cambios." -"1. Please select type of the action:","1. Please select type of the action:" -"10:40 AM","10:40 Uhr" -"2. Please select a page","2. Please select a page" -"2. Type Category Name","2. Type Category Name" -"2. Type Product Name","2. Type Product Name" -"80px x 80px","80px x 80px" -"80x80 px","80x80 px" -"Login to Urabn Airship.","Login para Urban Airship." -"Login to Urban Airship.","Login to Urban Airship." -"A Catalog Only App will not support functions such as add to cart, add to wishlist, or login.","Eine Catalog Only App unterstützt Funktionen wie Zum Warenkorb Hinzufügen, Auf den Wunschzettel oder Login nicht." -"A new password has been sent.","Ein neues Passwort wurde gesendet." -"About","About" -"Access forbidden","Access forbidden" -"Account","Konto" -"Account Information","Account Information" -"Account Settings","Account Settings" -"Account confirmation is required. Please check your email for the confirmation link.","Kontoinformation benötigt. Überprüfen Sie bitte für den Bestätigungslink Ihren Posteingang." -"Account information has been saved.","Kontoinformation wurde gespeichert." -"Action","Aktion" -"Action type does\'t recognized","Action type does\'t recognized" -"Action type does\'t recognized.","Action type does\'t recognized." -"Action type doesn\'t recognized.","Action type doesn\'t recognized." -"Activate","Aktivieren" -"Activate PayPal Checkout","PayPal Checkout aktivieren" -"Activate PayPal MECL","Activar MECL de PayPal." -"Activation Key","Aktivierungsschlüssel" -"Add","Add" -"Add Action","Add Action" -"Add Address from Contacts","Add Address from Contacts" -"Add App","Neue App" -"Add Custom","Add Custom" -"Add New Address","Add New Address" -"Add New Template","Neue Vorlage" -"Add Page","Neue Seite" -"Add To Wishlist","Add To Wishlist" -"Add a billing address","Add a billing address" -"Add a shipping address","Add a shipping address" -"Add to Cart","Zum Warenkorb hinzufügen" -"Add to Wishlist","Zur Wunschliste hinzufügen" -"Adding Product to Cart...","Adding Product to Cart..." -"Adding Product to WishList...","Adding Product to WishList..." -"Additional Address","Zusätzliche Anschrift" -"Additional Info","Additional Info" -"Address","Adresse" -"Address 2","Anschrift 2" -"Address Book","Address Book" -"Address Book Updated","Address Book Updated" -"Address Info","Address Info" -"Address book is empty","Address book is empty" -"Address data not specified.","Keine Anschriftsdaten angegeben." -"Address does not belong to this customer.","Die Anschrift gehört nicht zu diesem Kunden." -"Address has been deleted.","Anschrift wurde gelöscht." -"Address has been saved.","Anschrift wurde gespeichert." -"Admin Application Settings","Admin Application Settings" -"Admin Mobile Application","Admin Mobile Application" -"Admin application has not been enabled","Admin application has not been enabled" -"Administrative contact for this app and for app submission issues.","Administrativer Ansprechpartner für diese App und für Probleme mit dem App-Angebot." -"Advanced Settings","Erweiterte Einstellungen" -"After submitting the App to Magento, please contact %1$s to receive the Application Key, Application Secret and Application Master Secret.","Tras solicitar el app a Magento, por favor póngase en contacto con %1$s para recibir la clave de la aplicación, la Application Secret y la Application Master Secret." -"AirMail Message Queue","AirMail Nachrichtenschlange" -"AirMail Messages Queue","AirMail Nachrichtenschlange" -"AirMail Template Preview","AirMail Template Vorschau" -"AirMail message","AirMail Nachricht" -"AirMail templates","AirMail Vorlagen" -"All Allowed Countries","Todos los países permitidos." -"All Images","All Images" -"All locations","Alle Orte" -"Amount","Amount" -"Amount in %@","Amount in %@" -"Amounts","Amounts" -"An account with this email address already exists.","Ein Account mit dieser E-Mail Adresse ist bereits vorhanden." -"An error occurred while adding item to wishlist.","Beim Hinzufügen dieses Artikels zur Wunschliste ist ein Fehler aufgetreten." -"An error occurred while deleting the address.","Beim Löschen der Anschrift ist ein Fehler aufgetreten." -"An error occurred while loading categories.","Ha ocurrido un error tratando de cargar las categorías." -"An error occurred while loading category filters.","Beim Laden der Kategoriefilter ist ein Fehler aufgetreten." -"An error occurred while loading configuration.","An error occurred while loading configuration." -"An error occurred while loading localization.","An error occurred while loading localization." -"An error occurred while loading login form.","An error occurred while loading login form." -"An error occurred while loading wishlist.","Ha ocurrido un error mientras se cargaba Mis Favoritos." -"An error occurred while processing your order. Please contact us or try again later.","Beim Bearbeiten Ihrer Bestellung ist ein Fehler aufgetreten. Bitte kontaktieren Sie uns oder versuchen Sie es später noch einmal." -"An error occurred while processing your request.","Bei der Bearbeitung Ihrer Anfrage ist ein Fehler aufgetreten." -"An error occurred while removing item from wishlist.","Beim Löschen des Artikels von der Wunschliste ist ein Fehler aufgetreten." -"An error occurred while removing items from wishlist.","Beim Löschen der Artikel aus der Wunschliste ist ein Fehler aufgetreten." -"Analytics","Analytik" -"Android","Android" -"Android doesn\'t support AirMail message type.","Android no soporta el programa de correo AirMail." -"App Background","App Hintergrund" -"App Background (landscape mode)","App Background (landscape mode)" -"App Background (landscape mode).","App Hintergrund (Querformat)." -"App Background (portrait mode)","App Background (portrait mode)" -"App Background (portrait mode).","App Hintergrund (Hochformat)." -"App Background
    (landscape mode)","App Hintergrund
    (Querformat)" -"App Background
    (portrait mode)","App Hintergrund
    (Hochformat)" -"App Background image missing.","App Hintergrundbild fehlt." -"App Code","App Code" -"App Information","App Information" -"App Name","App Name" -"App Stores","App Stores" -"App Submission History","App Einsendungshistorie" -"App Title","App Titel" -"App code","App code" -"App code required.","App Code erforderlich" -"App does not exist.","App existiert nicht." -"App has been deleted.","App wurde gelöscht." -"App has been saved.","App wurde gespeichert." -"App has been submitted.","App wurde abgesendet." -"App model not loaded.","App-Modell nicht geladen." -"App with specified code does not exist.","Eine App mit dem eingegebenen Code existiert nicht." -"Appears in the info section of your app (example: Copyright 2010 – Your Company, Inc.)","Wird im Info-Abschnitt Ihrer App angezeigt (Beispiel: Copyright 2010 - Ihr Unternehmen, Inc.)" -"Application","Anwendung" -"Application Key","Anwendungsschlüssel" -"Application Master Secret","Application Master Secret" -"Application Name","Applikationsname" -"Application Secret","Application Secret" -"Application doesn\'t exist.","Application doesn\'t exist." -"Apply","Apply" -"Applying Coupon Code","Applying Coupon Code" -"Applying Gift Card %@","Applying Gift Card %@" -"Are you sure you want to cancel a message?","Are you sure you want to cancel a message?" -"Are you sure you want to cancel selected records?","Are you sure you want to cancel selected records?" -"Are you sure you want to delete a message?","Are you sure you want to delete a message?" -"Are you sure you want to delete selected records?","Are you sure you want to delete selected records?" -"Are you sure you want to delete this theme? This change will affect all applications.","¿Está seguro de que quiere eliminar este tema? Este cambio afectará al resto de aplicaciones." -"Are you sure you want to do this?","¿Está seguro de que quiere hacer esto?" -"Are you sure you want to remove this item?","Are you sure you want to remove this item?" -"Are you sure you whant to cancel a message?","Sind Sie sicher, dass Sie die Nachricht abbrechen möchten?" -"Are you sure you whant to delete a message?","Sind Sie sicher, dass Sie die Nachricht löschen möchten?" -"Are you sure you what to cancel selected records?","Sind Sie sicher, dass Sie die ausgewählten Einträge löschen möchten?" -"Are you sure you what to delete selected records?","Sind Sie sicher, dass Sie die ausgewählten Einträge löschen möchten?" -"As Low As","As Low As" -"As Low Excl. Tax","As Low Excl. Tax" -"As Low Incl. Tax","As Low Incl. Tax" -"As a Magento customer, Urban Airship is offering you unlimited Push Notifications and Rich Push for $100/year* along with a 60 day free trial.","Como cliente de Magento, Urban Airship le ofrece notificaciones Push ilimitadas y notificaciones Push premium por 100 $/anuales junto con una versión de prueba gratuita de 60 días." -"As low as","As low as" -"As low as excl. tax","As low as excl. tax" -"As low as incl. tax","As low as incl. tax" -"At last one application has to be created.","Deberá crearse al menos una aplicación." -"At least one option should be selected","At least one option should be selected" -"Authentication complete.","Authentifikation abgeschlossen." -"Authentication to %@ did failed...","Authentication to %@ did failed..." -"Average Order Amount","Average Order Amount" -"Average Orders","Average Orders" -"Average Rating","Average Rating" -"Back","Zurück" -"Back to App Edit","Zurück zur App-Bearbeitung" -"Background Color","Hintergrundfarbe" -"Balance","Saldo" -"Balance Change","Modificación de saldo." -"Balance History","Historial de saldo." -"Banner on Home Screen","Banner auf dem Startbildschirm" -"Banner on Home Screen (landscape mode)","Banner on Home Screen (landscape mode)" -"Banner on Home Screen (landscape mode) image missing.","Falta la imagen del banner en la página de inicio (modo horizontal)." -"Banner on Home Screen (portrait mode)","Banner on Home Screen (portrait mode)" -"Banner on Home Screen (portrait mode) image missing.","Falta la imagen del banner en la página de inicio (modo vertical)." -"Banner on Home Screen
    (landscape mode)","Banner en la página de inicio
    (modo horizontal)" -"Banner on Home Screen
    (portrait mode)","Banner en la página de inicio
    (modo vertical)" -"Banner on Home Screen image missing.","Banner für Startbildschirm fehlt." -"Banners on Home Screen","Banners on Home Screen" -"Best Sellers","Best Sellers" -"Billing","Billing" -"Billing Address","Dirección de Facturación" -"Billing address","Billing address" -"Billing address has been set.","Rechnungsadresse wurde festgelegt." -"Bundle Products","Bundle Products" -"Buy %1$s for %2$s","Kaufen Sie %1$s für %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Kaufen Sie %1$s für jeweils %2$s (%3$s inkl. Steuern)" -"Buy %1$s for %2$s each","Kaufen Sie %1$s für jeweils %2$s" -"Buy %1$s with %2$s discount each","Compra %1$s con %2$s de descuento cada uno." -"Buy More & Save","Buy More & Save" -"Buyer country is not allowed by store.","Sie können aus diesem Land nicht einkaufen." -"CMS Page","CMS Page" -"CMS Pages haven\'t been found.","CMS Pages haven\'t been found." -"Cache Lifetime (seconds)","Cache-Lebenszeit (Sekunden)" -"Cache Management","Cache-Verwaltung" -"Can\'t add item to shopping cart.","Artikel kann nicht zum Einkaufswagen hinzugefügt werden." -"Can\'t apply the coupon code.","Couponcode kann nicht verwendet werden." -"Can\'t copy file ""%s"" to ""%s"".","Datei ""%s"" kann nicht nach ""%s"" kopiert werden." -"Can\'t create wishlist.","Wunschzettel kann nicht erstellt werden." -"Can\'t delete ""%s"" theme.","No se puede eliminar el tema ""%s""." -"Can\'t load XML.","XML kann nicht geladen werden." -"Can\'t load admin application settings.","Can\'t load admin application settings." -"Can\'t load application with id ""%s""","No se puede cargar la aplicación con el identificador ""%s""." -"Can\'t load cart info.","No se puede cargar la información de Mi Compra." -"Can\'t load cart.","No se puede mostrar Mi compra." -"Can\'t load customer form.","No se puede mostrar el formulario del cliente." -"Can\'t load default themes.","No se pueden cargar los temas predeterminados." -"Can\'t load selected theme. Please check your media folder permissions.","No se puede mostrar el tema seleccionado. Por favor, compruebe sus permisos de carpetas compartidas." -"Can\'t load template with id ""%s""","Can\'t load template with id ""%s""" -"Can\'t open submission form.","Anmeldeformular kann nicht geöffnet werden." -"Can\'t read file ""%s"".","Datei ""%s"" kann nicht gelesen werden." -"Can\'t remove the item.","Artikel kann nicht entfernt werden." -"Can\'t reset theme.","Thema kann nicht zurückgesetzt werden." -"Can\'t save address.","Adresse kann nicht gespeichert werden." -"Can\'t save the customer.","Kunde kann nicht gespeichert werden." -"Can\'t save theme.","Thema kann nicht gespeichert werden." -"Can\'t show configuration.","Konfiguration kann nicht angezeigt werden." -"Can\'t specify product.","Produkt kann nicht spezifiziert werden." -"Can\'t submit application.","Anwendung kann nicht aktiviert werden." -"Can\'t update cart.","Warenkorb kann nicht aktualisiert werden." -"Can\'t write to file ""%s"".","In die Datei ""%s"" kann nicht geschrieben werden." -"Cancel","Abbrechen" -"Canceled","Gelöscht" -"Canceling PayPal ...","Canceling PayPal ..." -"Cancelled","Gelöscht" -"Cannot apply gift card.","No se le puede aplicar la tarjeta de regalo." -"Cannot configure product.","Cannot configure product." -"Cannot load theme ""%s"".","Thema ""%s"" kann nicht geladen werden." -"Cannot redeem Gift Card.","No se puede canjear la tarjeta regalo." -"Cannot remove gift card.","No se puede eliminar la tarjeta regalo." -"Cannot save theme ""%s"". Incorrect data received","Thema ""%s"" kann nicht gespeichert werden. Falsche Dateneingabe" -"Cannot update the item.","Cannot update the item." -"Card Verification Number","Kreditkartenprüfnummer" -"Card verification number is wrong","Verifizierungsnummer der Karte ist falsch" -"Carrier","Carrier" -"Cart","Einkaufswagen" -"Cart Updated","Cart Updated" -"Cart has been updated.","Warenkorb wurde aktualisiert." -"Cart has some errors.","Warenkorb enthält einige Fehler." -"Cart is empty.","Warenkorb ist leer." -"Catalog Only App?","Nur Katalog-App?" -"Category","Category" -"Category Button Color","Farbe des Kategoriebuttons" -"Category Item Background Color","Hintergrundfarbe des Kategorieartikels" -"Cc:","Cc:" -"Chairs","Stühle" -"Change Orientation","Ausrichtung ändern" -"Change Password","Passwort ändern" -"Changes have been saved to theme.","Änderungen zum Thema wurden gespeichert." -"Check","Check" -"Check Gift Card","Check Gift Card" -"Check Gift Card Promo Redeemed","Check Gift Card Promo Redeemed" -"Checking Gift Card %@","Checking Gift Card %@" -"Checkout","Checkout" -"Checkout Page Registration","Checkout Page Registration" -"Checkout as Guest","Checkout as Guest" -"Checkout as Guest or Register","Checkout as Guest or Register" -"Checkout has been initialized.","Zahlungsvorgang wurde eingeleitet." -"Checkout initialization...","Checkout initialization..." -"Checkout initialized!","Checkout initialized!" -"Choose Store View","Choose Store View" -"Choose amount","Choose amount" -"Choose file","Choose file" -"City","Stadt" -"Clear","Clear" -"Close","Close" -"Color Themes","Farbschemata" -"Colors","Farben" -"Commiting updates...","Commiting updates..." -"Company","Unternehmen" -"Completed","Fertiggestellt" -"Configuration data have been saved","Configuration data have been saved" -"Configure Cart Item","Configure Cart Item" -"Confirm New Password","Neues Passwort bestätigen" -"Confirm Password","Passwort bestätigen" -"Connecting","Connecting" -"Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate.","Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate." -"Contact Email","Kontakt-E-Mail-Adresse" -"Contact Information","Kontaktinformationen" -"ContactsAreEmpty","ContactsAreEmpty" -"Container is not defined.","El contenedor no está definido." -"Content","Inhalt" -"Continue","Continue" -"Copyright","Copyright" -"Copyright Page Logo","Logo auf der Copyright-Seite" -"Copyright Page Logo (iPhone 4 retina)","Copyright Page Logo (iPhone 4 retina)" -"Copyright Page Logo
    (iPhone 4 retina)","Logo auf der Copyright-Seite
    (iPhone 4 Retina)" -"Copyright: Magento (c) 2010","Copyright: Magento (c) 2010" -"Countries","Countries" -"Countries Payment Applicable From","Países desde los que es posible el pago" -"Country","Land" -"Country options don\'t recognized for ""%s"".","Länderoptionen nicht erkannt für ""%s""." -"Coupon code %s is not valid.","Couponcode %s ist nicht gültig." -"Coupon code %s was applied.","Couponcode %s wurde hinzugefügt." -"Coupon code is empty.","Gutscheincode ist leer." -"Coupon code was canceled.","Gutscheincode wurde annuliert." -"Create Account","Create Account" -"Create an Account","Create an Account" -"Creating a Template is allowed only for applications which have device type iPhone.","Das Erstellen einer Vorlage ist nur für Anwendungen mit dem Gerätetyp iPhone erlaubt." -"Credit Card","Tarjeta de crédito." -"Credit Card %s","%s de la tarjeta de crédito" -"Credit Card Number","Kreditkartennummer" -"Credit Card Type","Kreditkartentyp" -"Credit card number does not match credit card type.","Kreditkartennummer entspricht nicht dem Kreditkartentyp." -"Cross Sells","Cross Sells" -"Current Balance: %s","Balance actual: %s" -"Current Password","Derzeitiges Passwort" -"Currently, PayPal MEP is not available for the Android application","Im Augenblick ist PayPal MEP nicht für die Android-Anwendung verfügbar" -"Currently, the system does not support the viewing of the order detail.","Currently, the system does not support the viewing of the order detail." -"Custom App Icon","Benutzerspezifisches App-Symbol" -"Custom App Icon (iPhone 4 retina)","Custom App Icon (iPhone 4 retina)" -"Custom App Icon
    (iPhone 4 retina)","Benutzerspezifisches App-Symbol
    (iPhone 4 retina)" -"Custom Colors","Benutzerdefinierte Farben" -"Custom amount","Custom amount" -"Customer","Customer" -"Customer Name","Customer Name" -"Customer authentication problem.","Problem bei der Benutzerauthentifizierung." -"Customer balance available in enterprise version of Magento only.","El saldo para clientes solo está disponible en la versión para empresas de Magento." -"Customer balance is disabled for current store","El saldo para clientes está deshabilitado en la tienda actual" -"Customer email not specified.","Keine E-Mail-Adresse des Benutzers festgelegt." -"Customer logout problem.","Abmeldeproblem des Benutzers." -"Customer not logged in.","Benutzer nicht angemeldet." -"Customers","Customers" -"DD","DD" -"Date","Fecha" -"Date Created","Fecha de creación" -"Date Submitted","Abschickdatum" -"Date Updated","Aktualisierungsdatum" -"Date:","Date:" -"Day","Día" -"Deeper Messaging and Engagement with Rich Push.","Envío de mensajes más completos y atractivos con Rich Push." -"Default Billing Address","Standardrechnungsadresse" -"Default Shipping Address","Dirección de envío predeterminada" -"Default Theme","Standardthema" -"Default themes are missed.","Default themes are missed." -"Delete","Löschen" -"Delete Action","Delete Action" -"Delete theme","Borrar tema" -"Deleted","Gelöscht" -"Description","Descripción" -"Description that appears in Android Market. %s chars maximum. ","Beschreibung, die im Android Market erscheint. %s Zeichen-Maximum." -"Description that appears in the iTunes App Store. %s chars maximum. ","Descripción que aparece en el App Store de iTunes. %s caracteres como máximo." -"Deselect All","Alle abwählen" -"Design","Design" -"Device","Gerät" -"Device Information","Geräteangaben" -"Device Type","Tipo de dispositivo" -"Device doesn\'t recognized","Device doesn\'t recognized" -"Device doesn\'t recognized. Unable to load a template.","Gerät wird nicht erkannt. Vorlage kann nicht geladen werden." -"Device doesn\'t recognized: ""%s"". Unable to load a helper.","Gerät wird nicht erkannt: ""%s"". Hilfe kann nicht geladen werden." -"Device doesn\'t recognized: ""%s"". Unable to load preview model.","Gerät wird nicht erkannt: ""%s"". Vorschaumodell kann nicht geladen werden." -"Device type doesn\'t recognized.","Device type doesn\'t recognized." -"Discount code is empty","Discount code is empty" -"Discount:","Discount:" -"Done","Done" -"Downloadable Products Updated","Downloadable Products Updated" -"Downloads limit:","Downloads limit:" -"E-mail","E-mail" -"Edit","Bearbeiten" -"Edit Action","Edit Action" -"Edit Address","Edit Address" -"Edit AirMail Message","AirMail-Nachricht bearbeiten." -"Edit AirMail Message Queue #%s","Editar cola de mensajes de AirMail #%s" -"Edit App ""%s""","App %s bearbeiten" -"Edit Filter","Filter bearbeiten" -"Edit Image","Edit Image" -"Edit Mail List","Edit Mail List" -"Edit Template ""%s""","Editar plantilla ""%s""" -"Edit filter","Edit filter" -"Edit note","Edit note" -"Either remote URL or application code was not set. Please make sure you filled all the values and try again.","Either remote URL or application code was not set. Please make sure you filled all the values and try again." -"Element with id %s already exists","Elemento con id %s ya existe" -"Email","E-Mail" -"Email Address","E-Mail-Adresse" -"Email address you provided is not valid. Please provide a valid one.","Email address you provided is not valid. Please provide a valid one." -"Email is not correct","Email is not correct" -"Email is not specified","Email is not specified" -"Enable Admin Application","Enable Admin Application" -"Enable AirMail Message Push notification","Habilitar notificación automática de mensajes de AirMail" -"Enable Facebook","Habilitar Facebook" -"Enable Flurry Analytics","Flurry Analytics aktivieren" -"Enable Flurry Analytics for the merchant.","Flurry Analytics aktivieren für Händler" -"Enable LinkedIn","Habilitar LinkedIn" -"Enable Standard Checkout","Übliche Zahlungsweise aktivieren" -"Enable Twitter","Twitter aktivieren" -"Enter Name","Enter Name" -"Enter discount code first.","Enter discount code first." -"Enter discount code if any","Enter discount code if any" -"Enter e-mail","Enter e-mail" -"Enter giftcard promo code here","Enter giftcard promo code here" -"Enter text","Enter text" -"Enter the gift card code","Enter the gift card code" -"Error","Error" -"Error Loading Configuration Format","Error Loading Configuration Format" -"Error during shortening url","Error during shortening url" -"Error message text is missed.","Error message text is missed." -"Error while processing file ""%s"".","Fehler beim Verarbeiten von Datei ""%s""." -"Error while reading data from Payment Bridge. Please, try again.","Fehler beim Einlesen der Daten von Payment Bridge. Bitte versuchen sie es später noch einmal." -"Error while reading remote data","Error while reading remote data" -"Error while uploading file ""%s"".","Fehler beim Laden der Datei ""%s""." -"Error while uploading file ""%s"". Disallowed file type. Only ""jpg"", ""jpeg"", ""gif"", ""png"" are allowed.","Error al cargar el fichero ""%s"". Tipo de fichero no permitido. Solo están permitidos ""jpg"", ""jpeg"", ""gif"" y ""png""." -"Error.","Fehler." -"Excl. Tax","Excl. Tax" -"Expiration Date - Month","Gültig bis - Monat" -"Expiration Date - Year","Gültig bis - Jahr" -"Expires: %s","Caduca: %s" -"Extend the life of your app with Urban Airship Push Notifications.","Aumente la vida de su aplicación con Notificaciones «Push» de Urban Airship." -"Extensions","Erweiterungen" -"FILTERS APPLIED","FILTER ANGEWENDET" -"Facebook","Facebook" -"Facebook API","Facbook API" -"Facebook Application ID","Facebook Application ID" -"Facebook post failed...","Facebook post failed..." -"Fax","Fax" -"File can\'t be uploaded.","Datei kann nicht hochgeladen werden." -"File doesn\'t exist ""%s"".","Datei existiert nicht ""%s""." -"Filter","Filter" -"Filters","Filters" -"First Name","Nombre" -"Fixed amounts","Fixed amounts" -"Flurry API Code","Flurry API Code" -"Flurry Analytics","Flurry Analytics" -"Flurry Analytics Site","Flurry Analytics Seite" -"Fonts","Fuentes" -"Forgot Password","Forgot Password" -"Forgot Password?","Forgot Password?" -"Forgot your password?","Forgot your password?" -"Form","Form" -"Free","Gratis" -"From","From" -"From Excl. Tax","From Excl. Tax" -"From Incl. Tax","From Incl. Tax" -"From excl. tax","From excl. tax" -"From incl. tax","From incl. tax" -"Full Description","Full Description" -"Funk Leaf","Funk Leaf" -"Gallery","Gallery" -"General","Allgemein" -"Generate Offline Catalog","Generate Offline Catalog" -"Get Content from CMS Page","Holen sie sich Inhalte von der CMS-Seite." -"Gift Card ""%s"" was added.","Se agregó la tarjeta de regalo""%s""." -"Gift Card ""%s"" was redeemed.","Se canjeó la tarjeta de regalo""%s""." -"Gift Card ""%s"" was removed.","Se eliminó la tarjeta de regalo""%s""." -"Gift Card (%s)","Tarjeta regalo." -"Gift Card amount applied to order: %s","Tarjeta de regalo aplicada en el pedido: %s" -"Gift Card code is empty.","El código de la tarjeta de regalo está vacío." -"Gift Card: %s","Tarjeta regalo: %s" -"Gift card account available in enterprise version of Magento only.","Cuenta de tarjeta de regalo disponible solo en la versión para empresas de Magento." -"Giftcard promo code","Giftcard promo code" -"Grand Total","Grand Total" -"Grand Total (Excl. Tax)","Endsumme (ohne Mwst.)" -"Grand Total (Incl. Tax)","Endsumme (mit Mwst.)" -"Guest","Gast" -"Header Background Color","Color de Fondo de Cabecera" -"Header Font Color","Color de Fuente de Cabecera" -"High Resolution Application Icon","Hochauflösendes Applikations-Icon" -"Home","Startseite" -"Hot Red","Knallrot" -"How do you rate this product?","¿Qué valoración le da a este producto?" -"How to incorporate Urban Airship within your application:","Cómo incorporar Urban Airship en su aplicación:" -"I Agree","I Agree" -"I agree to the Terms and Conditions","I agree to the Terms and Conditions" -"ID","ID" -"Icon that will appear on the user\'s device after they download your app.","Icon that will appear on the user\'s device after they download your app." -"Icon that will appear on the user\'s device after they download your app. Recommended size: 48px x 48px.","Icono que aparecerá en el dispositivo del usuario después de descargar la aplicación. Tamaño recomendado: 48px x 48px." -"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 72px x 72px.","Das Icon wird auf dem Gerät des Nutzers erscheinen, nachdem sie die App heruntergeladen haben. Sie müssen keinen Verlauf oder runde Ecken einfügen (dies wird automatisch von Apple gemacht). Empfohlene Größe: 72px x 72px." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 114px x 114px.","Icono que aparecerá en el teléfono del usuario después de descargar la aplicación. No necesita aplicar un gradiente o redondear los bordes (esto lo hace Apple automáticamente). Tamaño recomendado: 114px x 114px." -"Icon that will appear on the user’s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 57px x 57px at 72 dpi.","Das Icon wird auf dem Gerät des Nutzers erscheinen, nachdem die App heruntergeladen wurde. Sie müssen keinen Verlauf oder runde Ecken einfügen (dies wird automatisch von Apple gemacht). Empfohlene Größe: 57px x 57px bei 72 dpi." -"Icons","Icons" -"If leave this field empty, the message will be sent immediately","Si deja vacío este campo, el mensaje se enviará inmediatamente" -"If you want to disable the cache on the application side, leave the field empty. Warning! When disabling cache, the application will take time to load each page.","Wenn Sie den Cache auf Seiten der Applikation deaktivieren möchten, müssen Sie dieses Feld frei lassen. Vorsicht! Wenn Sie den Cache deaktivieren, benötigt die Applikation mehr Zeit, um jede Seite zu laden." -"Image %s is required.","Image %s is required." -"Image action has been saved.","Image action has been saved." -"Image does not exist. Please reload this page.","Image does not exist. Please reload this page." -"Image file was not found.","No se ha encontrado el fichero de imagen." -"Image has been deleted.","Image has been deleted." -"Image id is required.","Image id is required." -"Image limits don\'t recognized for ""%s"" image type","Image limits don\'t recognized for ""%s"" image type" -"Image that appears on first screen while your app is loading.","Image that appears on first screen while your app is loading." -"Image that appears on first screen while your app is loading. Required size: 1024px x 768px.","Imagen que aparece en la primera pantalla cuando se está cargando la aplicación. Tamaño necesario: 1024px x 768px." -"Image that appears on first screen while your app is loading. Required size: 320px x 455px.","Bild, das zuerst auf dem Bildschirm erscheint, wenn die App lädt. Benötigte Größe: 320px x 455px." -"Image that appears on first screen while your app is loading. Required size: 320px x 460px.","Imagen que aparece en la primera pantalla cuando se está cargando la aplicación. Tamaño necesario: 320px x 460px." -"Image that appears on first screen while your app is loading. Required size: 640px x 920px.","Bild, das zuerst auf dem Bildschirm erscheint, wenn die App lädt. Benötigte Größe: 640px x 920px." -"Image that appears on first screen while your app is loading. Required size: 768px x 1024px.","Bild, das zuerst auf dem Bildschirm erscheint, wenn die App lädt. Benötigte Größe: 768px x 1024px." -"Image type doesn\'t recognized: ""%s"".","Image type doesn\'t recognized: ""%s""." -"Image type is required.","Image type is required." -"Images","Bilder" -"Images order has been updated.","Images order has been updated." -"In Queue","In der Warteschlange" -"In Stock","Vorrätig" -"In addition, click here to review Urban Airship\'s Terms of Service: click here.","Además, haz clic aquí para revisar los términos del servicio: clic aquí." -"In order to resubmit your app, you need to first purchase a %s from MagentoCommerce","Um Ihre App erneut senden zu können, müssen Sie zunächst einen %s von MagentoCommerce kaufen." -"In order to submit your app, you need to first purchase a %s from MagentoCommerce","Um Ihre App einreichen zu können, müssen Sie zunächst einen %s von MagentoCommerce kaufen." -"Inactive Tabs","Inaktive Tabs" -"Incl. Tax","Incl. Tax" -"Incl. tax","Incl. tax" -"Initialization PayPal ...","Initialization PayPal ..." -"Initialization of the PayPal checkout failed!","Initialization of the PayPal checkout failed!" -"Invalid XML.","Ungültiges XML." -"Invalid current password.","Ungültiges aktuelles Passwort." -"Invalid customer data.","Ungültige Kundendaten." -"Invalid data.","Ungültige Daten." -"Invalid email address.","Ungültige E-Mail-Adresse." -"Invalid item or wishlist.","Artículo o lista de deseos no válida." -"Invalid login or password.","Ungültiger Login oder ungültiges Passwort" -"Invalid shipping method.","Método de compra no válido." -"Issue Number","Ausstellnummer" -"It\'s not allowed to delete submitted application.","Das Löschen einer eingereichten Applikation ist nicht möglich." -"Item","Item" -"Item Options","Item Options" -"Item has been added to cart.","Artikel wurde zum Einkaufswagen hinzugefügt." -"Item has been deleted from cart.","Artikel wurde aus dem Einkaufswagen gelöscht." -"Item has been removed from wishlist.","Se ha eliminado el artículo de la lista de deseos." -"Items","Items" -"Items were updated. But can\'t update wishlist.","Artikel aktualisiert. Wunschzettel konnte jedoch nicht aktualisiert werden." -"Keep your image size below %s KB for optimal performance.","Keep your image size below %s KB for optimal performance." -"Key","Schlüssel" -"Keywords","Schlüsselwörter" -"Label","Label" -"Landscape app Background","Landscape app Background" -"Landscape banners on Home Screen","Landscape banners on Home Screen" -"Large iTunes Icon","Icono grande de iTunes" -"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.","Großes Icon, das im iTunes App-Store erscheint. Sie müssen keinen Verlauf oder runde Ecken einfügen (dies wird automatisch von Apple gemacht). Benötigte Größe: 512px x 512px." -"Last 5 Orders","Last 5 Orders" -"Last 5 Search Terms","Last 5 Search Terms" -"Last Name","Letzter Name" -"Last update: %@","Last update: %@" -"Lifetime Sales","Lifetime Sales" -"LindedIn","LindedIn" -"Link:","Link:" -"LinkedIn","LinkedIn" -"LinkedIn API","LinkedIn-API" -"LinkedIn API Key","LinkedIn-API-Schlüssel" -"LinkedIn Authorization","LinkedIn Authorization" -"LinkedIn Autorization","LinkedIn Autorization" -"LinkedIn Secret Key","Geheimschlüssel für LinkedIn" -"Linkedin post failed...","Linkedin post failed..." -"List of downloadable products is empty","List of downloadable products is empty" -"Load more items","Load more items" -"Loader Splash Screen","Ladeprogramm für Splash Screen" -"Loader Splash Screen (iPhone 4 retina)","Loader Splash Screen (iPhone 4 retina)" -"Loader Splash Screen (landscape mode)","Loader Splash Screen (landscape mode)" -"Loader Splash Screen (portrait mode)","Loader Splash Screen (portrait mode)" -"Loader Splash Screen
    (iPhone 4 retina)","Ladeprogramm für Splash Screen
    (iPhone 4 Retina Display)" -"Loader Splash Screen
    (landscape mode)","Ladeprogramm für Splash Screen
    (Querformat)" -"Loader Splash Screen
    (portrait mode)","Ladeprogramm für Splash Screen
    (Hochformat)" -"Loading %@...","Loading %@..." -"Loading Account Form...","Loading Account Form..." -"Loading Address Book...","Loading Address Book..." -"Loading Address Form...","Loading Address Form..." -"Loading CMS page ...","Loading CMS page ..." -"Loading Cart...","Loading Cart..." -"Loading Gallery...","Loading Gallery..." -"Loading Login Form...","Loading Login Form..." -"Loading My Downloadable Products...","Loading My Downloadable Products..." -"Loading Order Details","Loading Order Details" -"Loading Orders List...","Loading Orders List..." -"Loading Preview...","Cargando la vista previa..." -"Loading Product Options...","Loading Product Options..." -"Loading Products...","Loading Products..." -"Loading Registration Form...","Loading Registration Form..." -"Loading Restore Password Form...","Loading Restore Password Form..." -"Loading Store Credit...","Loading Store Credit..." -"Loading WishList...","Loading WishList..." -"Loading Write Review Form...","Loading Write Review Form..." -"Loading category ...","Loading category ..." -"Loading more items...","Loading more items..." -"Loading product ...","Loading product ..." -"Loading shipping methods ...","Loading shipping methods ..." -"Loading...","Loading..." -"Locations","Standorte" -"Log In","Login" -"Log Out","Log Out" -"Log in to Admin Panel","Log in to Admin Panel" -"Log into Account","Log into Account" -"Log into your account","Log into your account" -"Log out Account","Log out Account" -"LogInMessageTitle","LogInMessageTitle" -"Login and password are required.","Login und Passwort werden benötigt." -"Logo in Header","Logo in der Kopfzeile" -"Logo in Header image missing.","Falta Logo en la imagen de Encabezado." -"Logout complete.","Logout abgeschlossen." -"M.I.","Más información" -"MEP is PayPal\'s native checkout experience for the iPhone. You can choose to use MEP alongside standard checkout, or use it as your only checkout method for Magento mobile. PayPal MEP requires a PayPal business account","El pago exprés móvil es el pago nativo de PayPal para iPhone. Puedes elegir usar el pago exprés móvil además del pago estándar, o usarlo como método único de pafo para Magento mobile. El pago exprés móvil de PayPal requiere una cuenta business de PayPal" -"MM","Multimedia" -"Mailbox title","Titel für das Postfach" -"Main Tabs","Haupt-Tabs" -"Make Inactive","Inaktiv machen" -"Make this app available in the following territories","Die App in den folgenden Gebieten zur Verfügung stellen" -"Manage Apps","Gestionar Aplicaciones" -"Manage Mobile App","Mobile App verwalten" -"Maximum length is 140","Maximale Länge beträgt 140" -"Maximum length is 255","Maximale Länge beträgt 255" -"Maximum size: %s KB.","Maximum size: %s KB." -"Maximum: %.2f","Maximum: %.2f" -"Merchant Label","Händlermarke" -"Merge","Merge" -"Message","Message" -"Message Queue","Nachrichten-Warteschlange" -"Message Settings","Nachrichten-Einstellungen" -"Message Templates","Nachrichtenvorlagen" -"Message Title","Título de mensaje" -"Message Type","Tipo de mensaje" -"Message can be edited when status of the message is ""In Queue"" only.","El mensaje sólo puede editarse cuando su estado sea ""en cola""." -"Message content","Contenido del mensaje" -"Message text is missed.","Message text is missed." -"Message title","Nachricht Titel" -"Message too long, please use 140 symbols","Message too long, please use 140 symbols" -"Message type doesn\'t recognized","Message type doesn\'t recognized" -"Minimize","Minimize" -"Minimum %@, maximum %@","Minimum %@, maximum %@" -"Minimum: %.2f","Minimum: %.2f" -"Mobile","Mobil" -"Mobile Express Checkout has been canceled.","El pago Mobile Express se ha cancelado." -"Mobile Express Checkout processed successfully.","Pago Mobile Express tramitado satisfactoriamente." -"Month","Mes" -"More","Mehr" -"More Info","Más información" -"More Tabs","Mehr Tabs" -"Most Viewed Products","Most Viewed Products" -"My Account","My Account" -"My Downloadable Products","My Downloadable Products" -"My Orders","My Orders" -"My Wishlist","My Wishlist" -"Name","Name" -"Name on Card","Name des Inhabers" -"Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize. %s chars max.","Name, der unter Ihrer App angezeigt werden, wenn der Anwender diese auf sein Gerät installiert. Wir empfehlen, einen 10-12 stelligen Namen zu wählen, den Ihre Kunden wiedererkennen. Max. %s Zeichen." -"New AirMail Message","Neue AirMail Nachricht" -"New AirMail Message Queue","Neue AirMail Nachricht in Warteschlange" -"New App","Nueva Aplicación" -"New Customers","New Customers" -"New Password","Neues Passwort" -"New Template","Neue Vorlage" -"New to Our Store?","New to Our Store?" -"Nickname","Nickname" -"No","No" -"No Payment Information Required","No se necesita información de pago" -"No Ratings","No Ratings" -"No internet connection. Retry later ...","No internet connection. Retry later ..." -"No items were specifed to update.","Es wurden keine zu aktualisierenden Elemente angegeben." -"No items were updated.","Es wurden keine Elemente aktualisiert." -"No product selected.","Es wurde kein Produkt ausgewählt." -"No products found. Please retry with other term","No products found. Please retry with other term" -"No shipping method required.","No es necesario un método de envío." -"No such file ""%s"".","Datei ""%s"" existiert nicht." -"Not Submitted","Nicht abgesendet" -"Note: Image size affects the performance of your app.","Note: Image size affects the performance of your app." -"Notice","Aviso" -"Number of Orders","Number of Orders" -"Number of Uses","Number of Uses" -"OK","OK" -"OR, Pay with Standard Checkout","OR, Pay with Standard Checkout" -"Offline Catalog","Offline Catalog" -"Offline cart stored on server","Offline cart stored on server" -"Offline catalog export complete.","Offline catalog export complete." -"Offline catalog export failed.","Offline catalog export failed." -"One or more keywords that describe your app. Keywords are matched to users\' searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum.","Ein oder mehrere Keywords, die Ihre App beschreiben. Keyword werden mit den Suchanfragen der Anwender im App Store verglichen und helfen dabei, genauere Suchergebnisse zu erzielen. Trennen Sie die einzelnen Keywords durch Kommata. Max. 100 Zeichen." -"Onepage checkout is disabled.","""Checkout-Übersicht auf einer Seite"" ist deaktiviert." -"Only custom theme can be deleted","Sólo se podrá eliminar un tema personalizado." -"Only default theme can be reset","Solo se puede resetear el tema por defecto" -"Only free apps are allowed in this version.","In dieser Version sind nur kostenlose Apps zulässig." -"Only registered users can write reviews. Please, log in or register.","Nur registrierte Anwender können Bewertungen verfassen. Bitte melden Sie sich an oder registrieren Sie sich." -"Open","Open" -"Options","Options" -"Options menu items","Optionsmenü-Elemente" -"Order","Order" -"Order #","Order #" -"Order #%s - %s","Pedido #%s - %s" -"Order Date: %s","Fecha del pedido: %s" -"Order Details Updated","Order Details Updated" -"Order ID","Order ID" -"Order ID:","Order ID:" -"Order Info","Order Info" -"Order List Updated","Order List Updated" -"Order Number","Order Number" -"Order Review","Order Review" -"Order canceled","Order canceled" -"Order failed","Order failed" -"Order id is not specified.","La identificación del pedido no está especificado." -"Order is not available.","El pedido no está disponible." -"Ordered","Pedido realizado." -"Ordered Items","Ordered Items" -"Orders","Orders" -"Other amount","Other amount" -"Out of Stock","Out of Stock" -"Output format is not specified. Please, specify ""format"" key in constructor, or set it using setFormat().","No se ha especificado el formato de salida. Por favor especifica la tecla ""formato"", o selecciónalo usando setFormat()." -"Overall Activity","Overall Activity" -"POST data is not valid.","POST-Daten sind nicht gültig." -"Pages","Seiten" -"Password","Contraseña" -"Password fields cannot be empty.","Passwortfelder dürfen nicht leer sein." -"Password is not specified","Password is not specified" -"Password:","Password:" -"PayPal","PayPal" -"PayPal Checkout","PayPal Checkout" -"PayPal MECL is the mobile version of PayPal\'s Express Checkout service. You can choose to use MECL alongside standard checkout, or use it as your only checkout method for Magento Mobile.","PayPal MECL es la versión móvil del servicio de PayPal pago exprés. Puedes elegir usar MECL junto al pago estándar, o usar como método único de pago para Magento mobile." -"PayPal MEP","Código MEP (PayPal)" -"PayPal Mobile Embedded Payment (MEP)","PayPal Mobile Embedded Payment (MEP)" -"PayPal Mobile Express Checkout","Pago Mobile Express de PayPal." -"PayPal Mobile Express Checkout Library (MECL)","Librería de Pago Mobile Express de PayPal (MECL)." -"PayPal Mobile Express Checkout Token does not exist.","El pago Mobile Express de PayPal mediante vale no está disponible." -"Payer Email: %s","Correo electrónico del pagador; %s" -"Payment Applicable From","Pago posible desde" -"Payment Bridge module unavailable.","Das Modul zur Zahlungsüberbrückung ist nicht verfügbar." -"Payment Information","Payment Information" -"Payment Method","Método de pago" -"Payment Method has been set.","Bezahlungsmethode wurde festgelegt." -"Payment Methods","Bezahlungsmethoden" -"Payment method","Payment method" -"Payment method was successfully set.","Bezahlungsmethode wurde erfolgreich festgelegt." -"Paypal MEP doesn\'t support checkout with any discount.","La MEP de PayPal no permite el pago sin ningún descuento." -"Place Order","Place Order" -"Placing order ...","Placing order ..." -"Please click here to see how to setup and retrieve API credentials.","Por favor, pulse aquí para ver cómo configurar y recuperar las credenciales API." -"Please Select Application","Bitte Applikation auswählen" -"Please Select Device Type","Bitte Gerätetyp auswählen" -"Please agree to all the terms and conditions before placing the order.","Bitte stimmen Sie den Allgemeinen Geschäftsbedingungen zu, bevor Sie die Bestellung aufgeben." -"Please create and save an application first.","Por favor, cree y guarde la aplicación antes." -"Please enter ""App Title"".","Por favor, introduce el ""Título de la Aplicación""" -"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Por favor, introduzca una URL válida. Es necesario el protocolo (http://, https:// or ftp://)" -"Please enter a valid date.","Por favor introduce una fecha correcta." -"Please enter a valid email address. For example johndoe@domain.com.","Por favor, introduzca una dirección de e-mail válida. Por ejemplo: anónimo@dominio.com." -"Please enter at least one email recipient","Please enter at least one email recipient" -"Please enter issue number or start date for switch/solo card type.","Bitte geben Sie Ihre Ausgabenummer oder das Erstellungsdatum Ihrer EC-/Debitkarte an." -"Please enter the Activation Key.","Bitte geben Sie den Aktivierungsschlüssel ein." -"Please enter the Copyright.","Bitte geben Sie den Copyright-Text ein." -"Please enter the Description.","Por favor, introduce la Descripción" -"Please enter the Price.","Bitte geben Sie den Preis ein." -"Please enter the Resubmission Key.","Bitte geben Sie den Wiedervorlageschlüssel ein." -"Please enter the Title.","Bitte geben Sie den Titel ein." -"Please make sure your passwords match.","Bitte stellen Sie sicher, dass die Passwörter übereinstimmen." -"Please save application first.","Please save application first." -"Please select an option.","Por favor selecciona una opción." -"Please select at least one country.","Bitte wählen Sie mindestens ein Land aus." -"Please select payment method to cover a quote","Please select payment method to cover a quote" -"Please set email","Please set email" -"Please specify payment method","Please specify payment method" -"Please specify shipping method","Please specify shipping method" -"Please upload an image for ""App Background (landscape mode)"" field from Design Tab.","Bitte laden Sie ein Bild für das Feld ""App-Hintergrund (Landschaftsmodus)"" im Design-Tab hoch." -"Please upload an image for ""App Background (portrait mode)"" field from Design Tab.","Bitte laden Sie ein Bild für das Feld ""App-Hintergrund (Porträtmodus)"" im Design-Tab hoch." -"Please upload an image for ""App Background"" field from Design Tab.","Bitte laden Sie ein Bild für das Feld ""App-Hintergrund"" im Design-Tab hoch." -"Please upload an image for ""Banner on Home Screen (landscape mode)"" field from Design Tab.","Por favor, suba una imagen en el campo ""Banner en la página de inicio (formato horizontal)"" de la pestaña de diseño." -"Please upload an image for ""Banner on Home Screen (portrait mode)"" field from Design Tab.","Por favor, suba una imagen en el campo ""Banner en la página de inicio (formato vertical)"" de la pestaña de diseño." -"Please upload an image for ""Banner on Home Screen"" field from Design Tab.","Por favor, cargue una imagen en el campo ""Banner en pantalla de inicio"" de la Pestaña de diseño." -"Please upload an image for ""Logo in Header"" field from Design Tab.","Bitte laden Sie ein Bild für das Feld ""Logo im Kopffeld"" aus dem Design Tab hoch." -"Please use letters only (a-z or A-Z) in this field.","Por favor, use sólo letras (a-z o A-Z) en este campo." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","En este campo sólo se pueden escribir números. Evite los espacios en blanco u otros caracteres, como los puntos o las comas, por ejemplo." -"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Por favor, utilice solo letras (a-z o A-Z) o números (0-9) solo en este campo. No están permitidos los espacios u otros caracteres." -"Please wait...","Please wait..." -"Please, specify gift card amount!","Please, specify gift card amount!" -"Portrait app Background","Portrait app Background" -"Portrait banners on Home Screen","Portrait banners on Home Screen" -"Post data is empty.","Post data is empty." -"Post this product to your wall","Post this product to your wall" -"Posting to e-mails","Posting to e-mails" -"Preferred size: %spx x %spx.","Preferred size: %spx x %spx." -"Prefix","Prefijo" -"Preset Theme","Aktuelles Theme" -"Preview","Vista previa" -"Price","Preis" -"Price Font Color","Color de fuente del precio" -"Price excluding tax","Price excluding tax" -"Price including tax","Price including tax" -"Primary Color","Primärfarbe" -"Primary Font Color","Primärschriftfarbe" -"Problem changing or sending password.","Problema en cambio o envío de contraseña." -"Proceed to Checkout","Proceed to Checkout" -"Product","Product" -"Product Added to Cart","Product Added to Cart" -"Product Added to Wishlist","Product Added to Wishlist" -"Product Gallery Updated","Product Gallery Updated" -"Product Name3 ","Produktname3" -"Product Name3 1","Produktname3 1" -"Product Name3 2","Produktname3 2" -"Product Options Updated","Product Options Updated" -"Product Removed From Wishlist","Product Removed From Wishlist" -"Product Reviews Updated","Product Reviews Updated" -"Product SKU","Product SKU" -"Product Updated","Product Updated" -"Product added","Product added" -"Product is out of stock","Product is out of stock" -"Product is unavailable.","Produkt nicht verfürbar." -"Product only available on the website.","Product only available on the website." -"Product succesfully added to cart","Product succesfully added to cart" -"Product was not specified.","Producto no especificado." -"Product(s) currently out of stock.","Produkt(e) momentan nicht lagernd." -"Products","Products" -"Pull Down To Update..","Pull Down To Update.." -"Purchase Order Number","Bestellungsnummer des Kaufs." -"Push Notification","Notificación automatizada" -"Push Notifications allow you to send messages directly to the people who have installed your app on their device. Send messages to your full audience even when your app is closed. Push Notifications are one of the best ways to keep your app active by delivering valuable content directly to your customers. Learn more about Push Notifications - %1$s","Las notificaciones Push le permiten enviar mensajes directos a la gente que tiene instalada su aplicación en su dispositivo. Envíe mensajes a todoel mundo incluso cuando la aplicación está cerrada. Las notificaciones Push son una de las mejores maneras de mantener su aplicación activa enviado contenido valioso directamente a sus clientes. Infórmese más de las notificaciones Push - %1$s" -"Push Title","Push-Titel" -"Push message","Mensaje automatizado" -"Push title","Push-Titel" -"Qty","Qty" -"Qty:","Qty:" -"Quantity","Quantity" -"Quantity:","Quantity:" -"Queue Date","Datum der Schlange" -"Queue Message","Mensaje en cola" -"Queue does not exist.","Schlange existiert nicht." -"Queue is allowed only for applications with enabled Push Notification.","La función cola sólo funciona con las aplicaciones con las notificaciones Push activadas." -"Quote instance is required.","Quotenexemplar nötig." -"Quote item is not found.","Quote item is not found." -"Range param doesn\'t recognized","Range param doesn\'t recognized" -"Ratings and Reviews","Ratings and Reviews" -"Read the Terms and Conditions","Read the Terms and Conditions" -"Recent Activity","Recent Activity" -"Recipient Information","Empfängerinformation" -"Recommended size %spx x %spx.","Recommended size %spx x %spx." -"Recommended size 1024px x 344px. Note: Image size affects the performance of your app.","Tamaño recomendado 1024px x 344px. Nota: El tamaño de la imagen afecta al funcionamiento de su aplicación." -"Recommended size 1024px x 704px. Note: Image size affects the performance of your app.","Empfohlene Größe: 1024 x 704 Pixel. Hinweis: Die Bildgröße hat Einfluss auf die Leistung ihrer App." -"Recommended size 320px x 230px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Empfohlene Größe: 320 x 230 Pixel. Hinweis: Die Bildgröße hat Einfluss auf die Leistung ihrer App. Für eine optimale Anzeige sollte ihr Bild kleiner als 50 KB sein." -"Recommended size 320px x 258px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Empfohlene Größe: 320 x 258 Pixel. Hinweis: Die Bildgröße hat Einfluss auf die Leistung ihrer App. Für eine optimale Anzeige sollte ihr Bild kleiner als 50 KB sein." -"Recommended size 320px x 367px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.","Empfohlene Größe: 320 x 367 Pixel. Hinweis: Die Bildgröße hat Einfluss auf die Leistung ihrer App. Für eine optimale Anzeige sollte ihr Bild kleiner als 75 KB sein." -"Recommended size 35px x 35px.","Empfohlene Größe: 35 x 35 Pixel." -"Recommended size 768px x 294px. Note: Image size affects the performance of your app.","Empfohlene Größe: 768 x 294 Pixel. Hinweis: Die Bildgröße hat Einfluss auf die Leistung ihrer App." -"Recommended size 768px x 960px. Note: Image size affects the performance of your app.","Empfohlene Größe: 768 x 960 Pixel. Hinweis: Die Bildgröße hat Einfluss auf die Leistung ihrer App." -"Recommended size: %spx x %spx at %s dpi.","Recommended size: %spx x %spx at %s dpi." -"Recommended size: %spx x %spx.","Recommended size: %spx x %spx." -"Recover","Recover" -"Redeem","Redeem" -"Redeeming Gift Card %@","Redeeming Gift Card %@" -"Redemption functionality is disabled.","La funcionalidad de cancelación está desactivada." -"Refunded","Reembolsado." -"Regions","Regions" -"Register","Register" -"Registering cart ...","Registering cart ..." -"Registering user ...","Registering user ..." -"Regular","Regular" -"Regular and confirmation passwords must be equal","Alter Passwort und Passwortbestätigung müssen identisch sein" -"Related Product Background Color","Hintergrundfarbe Verwandtes Produkt" -"Release To Update...","Release To Update..." -"Relevance","Relevance" -"Remaining downloads","Remaining downloads" -"Remove","Remove" -"Remove Address...","Remove Address..." -"Removing %@...","Removing %@..." -"Removing Coupon...","Removing Coupon..." -"Removing Gift Card...","Removing Gift Card..." -"Removing Product from WishList...","Removing Product from WishList..." -"Removing Store Credit...","Removing Store Credit..." -"Request internal error.","Resulto: error interno." -"Request param %s is missed","Request param %s is missed" -"Required size: %spx x %spx.","Required size: %spx x %spx." -"Reset theme to default","Auf Standard-Theme zurücksetzen" -"Resubmission Key","Wiedervorlageschlüssel" -"Resubmit App","App erneut abschicken" -"Resubmit App failure. %s","Resubmit App failure. %s" -"Results","Results" -"Revenue","Revenue" -"Revert","Revert" -"Revert Discount","Revert Discount" -"Review","Überprüfen" -"Rich Push allows you to create and send engaging experiences by adding HTML and other rich media components to your push notifications. Moving beyond alerts and badge updates, Rich Push takes users into the app while displaying content in a customizable WebKit view. Create branded messages that engage your users with new content and information, all without having to update your app. Learn more about Rich Push - %1$s","Las notificaciones Push premium le permiten crear y enviar experiencias atractivas añadiendo HTML y otros contenidos multimedia a sus notificaciones Push. Junto a las alertas y actualizaciones del navegador, la notificación Push premium permite el uso de la aplicación mientras se muestra el contenido con una vista personalizada WebKit. Cree mensajes personalizados ofreciendo a sus clientes nuevo contenido e información, y todo ello sin tener que actualizar la aplicación. Conozca más sobre las notificaciones Push premium- %1$s" -"SORT BY:","ORDENAR POR:" -"Sample","Sample" -"Samples","Samples" -"Save","Speichern" -"Save As","Guardar como" -"Save Theme","Theme Speichern" -"Save and Continue Edit","Speichern und weiter bearbeiten" -"Save and Submit App","Speichern und abschicken" -"Save in address book","Im Adressbuch speichern" -"Saving Address...","Saving Address..." -"Saving changes ...","Saving changes ..." -"Saving shipping address ...","Saving shipping address ..." -"Saving shipping methods ...","Saving shipping methods ..." -"Screen resolution is not supported","Screen resolution is not supported" -"Screens:","Pantallas:" -"Scroll Background Color","Hintergrundfarbe durchblättern" -"Search","Suche" -"Search Term","Search Term" -"Search Updated","Search Updated" -"Searching for %@...","Searching for %@..." -"Secondary Color","Zweitfarbe" -"Secondary Font Color","Color de la fuente secundaria" -"See all","See all" -"Select %@","Select %@" -"Select All","Seleccionar todo" -"Select Chart","Select Chart" -"Select Links","Select Links" -"Select Options","Select Options" -"Select Payment Method","Select Payment Method" -"Select Range","Select Range" -"Select a","Select a" -"Select a Billing Address","Select a Billing Address" -"Select a Shipping Address","Select a Shipping Address" -"Select from Address Book","Select from Address Book" -"Select shipping method","Select shipping method" -"Selected product is unavailable.","Das ausgewählte Produkt ist nicht verfügbar." -"Send","Send" -"Sender Information","Absenderangaben" -"Sending e-mail failed...","Sending e-mail failed..." -"Set","Set" -"Settings","Einstellungen" -"Shake device to reset the filter","Shake device to reset the filter" -"Share","Share" -"Share on LinkedIn","Share on LinkedIn" -"Share on Twitter","Share on Twitter" -"Ship method","Ship method" -"Shipped","Enviado" -"Shipping","Shipping" -"Shipping Address","Dirección de Envío" -"Shipping Method","Método de Envío" -"Shipping address","Shipping address" -"Shipping address has been set.","Die Versandadresse wurde gespeichert." -"Shipping method","Shipping method" -"Shipping method has been set.","Se ha establecido el método de envío." -"Shipping method is required","Es obligatorio indicar el método de envío." -"Shipping method successfully updated","Modo de envío actualizado con éxito." -"Shipping to this address is not possible.","El envío a esta dirección no es posible." -"Shop","Shop" -"Shop All","Shop All" -"Shop Updated","Shop Updated" -"Shopping Cart","Shopping Cart" -"Shopping cart is empty.","Der Einkaufswagen ist leer." -"Show Password","Show Password" -"Sign In","Sign In" -"Signing In...","Signing In..." -"Signing Out ...","Signing Out ..." -"Sky Blue","Sky Blue" -"Social Networking","Redes sociales" -"Some emails were not sent.","Einige Mails wurden nicht gesendet." -"Sorry, no payment options are available for this order at this time.","Tut uns leid, aber momentan sind einige Zahlungsarten für diese Bestellung nicht verfügbar." -"Sorry, no quotes are available for this order at this time.","Tut uns leid, aber momentan sind für diese Bestellung keine Kostenvoranschläge verfügbar." -"Sorry, there are no items in this category.","Sorry, there are no items in this category." -"Special","Special" -"Special Excl. Tax","Special Excl. Tax" -"Special Incl. Tax","Special Incl. Tax" -"Specific Countries","Especifique países." -"Specified address does not exist.","Die eingegebene Anschrift existiert nicht." -"Specified invalid app code.","Der eingegebene App-Code ist ungültig." -"Specified invalid data.","Die eingegebenen Daten sind ungültig." -"Specified item does not exist in wishlist.","Der angegebene Artikel steht nicht auf der Wunschliste." -"Standard Checkout","Übliche Zahlungsweise" -"Standard Checkout uses the checkout methods provided by Magento. Only inline payment methods are supported. (e.g PayPal Direct, Authorize.Net, etc.)","Die übliche Zahlungsweise funktioniert nur mit den Zahlungsarten von Magento. Es werden nur Online-Zahlungen akzeptiert (z.B. PayPal Direct, Authorize.Net, etc.)" -"Start Date","Startdatum" -"Start Date - Month","Fecha de inicio - Mes" -"Start Date - Year","Anfangsdatum - Jahr" -"Starting At","Starting At" -"Starting At Excl. Tax","Starting At Excl. Tax" -"Starting At Incl. Tax","Starting At Incl. Tax" -"Starting at excl. tax","Starting at excl. tax" -"Starting at incl. tax","Starting at incl. tax" -"State/Province","Staat/Bezirk" -"Status","Status" -"Storage of offline cart on server failed. Please retry later","Storage of offline cart on server failed. Please retry later" -"Store Credit Info Updated","Store Credit Info Updated" -"Store Credit payment is not being used in your shopping cart.","El pago mediante tarjeta de crédito no aparece en su Mi compra." -"Store View","Vista de la tienda" -"Store credit","Store credit" -"Store logo that is displayed on copyright page of app.","Store logo that is displayed on copyright page of app." -"Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.","El logo de la tienda que se muestra en la página de copyright de la aplicación. Tamaño preferido: 100px x 100px." -"Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px.","Das Ladenloge wird auf der Copyright-Seite der App angezeigt. Beste Auflösung: 200x200 Pixel." -"Store switcher hasn\'t been defined","Store switcher hasn\'t been defined" -"Street Address","Anschrift (Straße, Hausnummer, PLZ)" -"Street Address 2","Dirección postal 2" -"Subject:","Subject:" -"Submission","Abschicken" -"Submission Fields","Campos de Envío" -"Submission History","Bisherige Eingaben" -"Submit App","Enviar Aplicación" -"Submit App ""%s""","App abschicken ""%s""" -"Submit App failure. %s","App wurde nicht übermittelt. %s" -"Submit App failure. Invalid activation key provided","App wurde nicht übermittelt. Ungültiger Aktivierungsschlüssel angegeben." -"Submit Review","Submit Review" -"Submitted","Enviado" -"Submitting Review...","Submitting Review..." -"Subtotal","Subtotal" -"Subtotal (Excl. Tax)","Zwischensumme (ohne Mwst.)" -"Subtotal (Incl. Tax)","Zwischensumme (mit Mwst.)" -"Subtotal Excl. Tax","Subtotal Excl. Tax" -"Subtotal Incl. Tax","Subtotal Incl. Tax" -"Subtotal excluding tax","Subtotal excluding tax" -"Subtotal incl. tax:","Subtotal incl. tax:" -"Subtotal including tax","Subtotal including tax" -"Subtotal:","Subtotal:" -"Success","Success" -"Successfully posted to Facebook","Successfully posted to Facebook" -"Successfully posted to Linkedin","Successfully posted to Linkedin" -"Suffix","Sufijo" -"Summary of Your Review","Übersicht ihrer Bewertung" -"Swipe a product to reveal more options","Swipe a product to reveal more options" -"T-Shirts","T-Shirts" -"Tabs","Registerkarten" -"Tax","Impuestos" -"Telephone","Telefon" -"Tell a Friend","Weiterempfehlen" -"Tell a Friend is disabled.","Cuéntaselo a un amigo está deshabilitado." -"Tell a Friend link has been sent.","Weiterempfehlen- Link wurde verschickt." -"Template","Vorlage" -"Template Content","Inhalt der Vorlage" -"Template Name","Nombre de Plantilla" -"Template does not exist.","Vorlage existiert nicht." -"Template for new AirMail Message does not exist.","Vorlage für neue AirMail-Nachricht existiert nicht." -"Template has been deleted.","Die Vorlage wurde gelöscht." -"Terms And Conditions","Terms And Conditions" -"Text length does not satisfy specified max text range.","El texto es más largo de lo permitido." -"Text length does not satisfy specified min text range.","El texto es demasiado corto." -"Thank you for registering!","Danke für Ihre Registrierung!" -"Thank you for your purchase! ","Vielen Dank für Ihren Einkauf!" -"The %s field should be filled.","The %s field should be filled." -"The Mailbox title will be shown in the More Info tab. To understand more about the title, please click here","Der Titel des Postfachs wird in dem Tab ""Mehr Informationen"" angezeigt. Für mehr Informationen zum Titel, klicken Sie bitte hier." -"The application is currently inactive.\nPlease try again later.","The application is currently inactive.\nPlease try again later." -"The cart is empty","The cart is empty" -"The custom amount value should be higher than 0.","The custom amount value should be higher than 0." -"The custom amount value should not be higher than %s.","The custom amount value should not be higher than %s." -"The custom amount value should not be lower than %s.","The custom amount value should not be lower than %s." -"The following email(s) are either mistyped or have incorrect format. Check them and try again:\n","The following email(s) are either mistyped or have incorrect format. Check them and try again:\n" -"The icon that appears in the Android Market.","The icon that appears in the Android Market." -"The icon that appears in the Android Market. Recommended size: 512px x 512px. Maximum size: 1024 KB.","Das Icon erscheint im Android Market. Empfohlene Größe: 512px x 512px. Maximale Größe: 1024 KB." -"The length of the text in the %s field is too big. Please shorten the text.","The length of the text in the %s field is too big. Please shorten the text." -"The max length of the field ""%@"" is %d!","The max length of the field ""%@"" is %d!" -"The minimum password length is 6","The minimum password length is 6" -"The server responded with invalid data.","The server responded with invalid data." -"The shortening service returned status code %d indicating a client side error.","The shortening service returned status code %d indicating a client side error." -"The shortening service returned status code %d indicating a server side error.","The shortening service returned status code %d indicating a server side error." -"The store credit payment has been removed from shopping cart.","El pago mediante tarjeta de crédito se ha eliminado de su Mi compra." -"The value is too big!","The value is too big!" -"The value should not be greater than %.2f!","The value should not be greater than %.2f!" -"The value should not be less than %.2f!","The value should not be less than %.2f!" -"Theme configurations are successfully reset.","Themenkonfigurationen wurden erfolgreich zurückgesetzt." -"Theme has been created.","Se ha creado el tema." -"Theme has been delete.","El tema ha sido borrado." -"Theme label can\'t be empty","La pestaña de temas no se puede vaciar." -"Theme label:","Pestaña de temas:" -"Theme name is not set.","Kein Themenname festgelegt." -"There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?","There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?" -"There are no items here","There are no items here" -"There are no items in your cart","There are no items in your cart" -"There is an error in loading an app\'s configuration","There is an error in loading an app\'s configuration" -"There is an error in retrieving the data. Please try again later","There is an error in retrieving the data. Please try again later" -"There is no addresses for this contact","There is no addresses for this contact" -"There is no store credit history!","There is no store credit history!" -"There were some problems with the data.","Es sind Probleme mit den Daten aufgetreten." -"This email address was not found in our records.","Die E-Mail-Adresse konnte in unseren Aufzeichnungen nicht gefunden werden." -"This functionality disabled in offline mode","This functionality disabled in offline mode" -"This is a required field.","Este es un campo obligatorio." -"This product has no images.","This product has no images." -"Title","Titel" -"Title bar","Titelleiste" -"To","To" -"To Excl. Tax","To Excl. Tax" -"To Incl. Tax","To Incl. Tax" -"To activate PayPal MEP payment method activate Express checkout first. ","Para activar el método de pago PayPal MEP tiene que activar el Express checkout primero." -"To excl. tax","To excl. tax" -"To incl. tax","To incl. tax" -"To preview the newly uploaded images, please save your application first.","To preview the newly uploaded images, please save your application first." -"To:","To:" -"Token has not been set.","No se ha establecido el vale." -"Too many recipients have been set. Max amount of recipients is:","Too many recipients have been set. Max amount of recipients is:" -"Top Search Terms","Top Search Terms" -"Total","Total" -"Total Order Amount","Total Order Amount" -"Total incl. Tax: %1$s","Gesamtsumme inkl. Steuern: %1$s" -"Total incl. tax","Total incl. tax" -"Totals","Totals" -"Touch and hold a product to delete from shopping cart","Touch and hold a product to delete from shopping cart" -"Touch and hold a product to reveal more options","Touch and hold a product to reveal more options" -"Try Again","Try Again" -"Twitter","Twitter" -"Twitter API","Twitter-API" -"Twitter API Key","Twitter-API-Schlüssel" -"Twitter Authorization","Twitter Authorization" -"Twitter Autorization","Twitter Autorization" -"Twitter Secret Key","Twitter-Geheimschlüssel" -"Twitter post failed...","Twitter post failed..." -"Type","Type" -"Type and data is required","Type and data is required" -"URL","URL" -"Unable to cancel Mobile Express Checkout.","No es posible cancelar el pago exprés móvil." -"Unable to cancel queue.","Schlange kann nicht abgebrochen werden." -"Unable to collect cart totals.","Einkaufswagen-Gesamtmenge kann nicht berechnet werden." -"Unable to delete queue.","No se puede eliminar la cola." -"Unable to find an app to delete.","Es kann keine löschbare App gefunden werden." -"Unable to find template to delete.","Es kann keine löschbare Vorlage gefunden werden." -"Unable to get shipping methods list.","No se puede obtener la lista de formas de envío." -"Unable to initialize MEP Checkout.","MEP-Checkout kann nicht initialisiert werden." -"Unable to initialize PayPal Mobile Express Checkout.","No es posible inicializar el pago exprés móvil PayPal." -"Unable to initialize express checkout review.","Imposible inicializar la crítica del pago exprés." -"Unable to initialize express checkout shipping method list.","No se puede inicializar la lista de métodos de envío por pago exprés." -"Unable to initialize return action.","No es posible inicializar la acción retorno." -"Unable to load addresses.","No es posible cargar direcciones." -"Unable to load application form.","Antragsformular kann nicht geladen werden." -"Unable to load banners.","Unable to load banners." -"Unable to load billing address form.","No es posible cargar el impreso de la dirección de facturación." -"Unable to load billing address.","No es posible cargar la dirección de facturación." -"Unable to load categories.","No es posible cargar las categorías." -"Unable to load checkout.","No es posible cargar el pago." -"Unable to load localization.","Unable to load localization." -"Unable to load order list.","No se puede cargar la lista del pedido." -"Unable to load order review.","No se ha podido cargar la confirmación del pedido." -"Unable to load product gallery.","No es posible cargar la galería de productos." -"Unable to load product info.","No se puede cargar la información del producto." -"Unable to load product options.","No se han podido cargar las opciones del producto." -"Unable to load product review.","No es posible cargar la reseña de productos." -"Unable to load product reviews.","No es posible cargar las reseñas de productos." -"Unable to load review form.","No se ha podido cargar el formulario de confirmación." -"Unable to load search.","No es posible cargar la búsqueda." -"Unable to load shipping address form.","No se ha podido cargar el formulario de la dirección de envío." -"Unable to place the order.","Bestellung konnte nicht aufgegeben werden." -"Unable to post the review.","Bewertung konnte nicht abgesendet werden." -"Unable to process preview.","No se puede procesar la vista previa." -"Unable to render a gift card account.","No se ha podido generar una cuenta de tarjeta de regalo." -"Unable to render an order.","No es posible efectuar el pedido." -"Unable to render downloadable products.","Unable to render downloadable products." -"Unable to render the store credits.","No es posible hacer entrega del saldo a crédito en la tienda." -"Unable to save app.","App konnte nicht gespeichert werden." -"Unable to save message.","No se puede guardar el mensaje." -"Unable to save shipping address.","Lieferadresse konnte nicht gespeichert werden." -"Unable to save shipping method.","Versandmethode konnte nicht gespeichert werden." -"Unable to save template.","Vorlage konnte nicht gespeichert werden." -"Unable to start MEP Checkout.","MEP Checkout konnte nicht gestartet werden." -"Unable to start Mobile Express Checkout.","No es posible comenzar el pago exprés móvil." -"Unable to update shipping method.","No se ha podido actualizar el método de envío." -"Undefined","Undefiniert" -"Unit Price","Unit Price" -"Unit Price:","Unit Price:" -"Unknown Error","Error desconocido" -"Unknown Error.","Unbekannter Fehler." -"Unknown Payment Bridge Error","Unknown Payment Bridge Error" -"Unknown error ocured. Please retry later","Unknown error ocured. Please retry later" -"Unsupported character in path: ""%s""","Carácter no soportado en la ruta: «%s»" -"Unsupported value type received","El tipo de valor recibido no es admitido." -"Update Comment Error","Update Comment Error" -"Update Preview","Actualizar vista previa" -"Updating ...","Updating ..." -"Updating Cart...","Updating Cart..." -"Upon receiving these credentials, please fill in the corresponding fields.","Luego de recibir estas credenciales, por favor rellena los campos correspondientes." -"Urban Airship Push Notification","Urban Airship Push-Nachricht" -"Use Billing Address","Use Billing Address" -"Use Store Credit (%s available)","Usar crédito de la tienda (%s disponibles)" -"Use as my default billing address","Als meine Standard-Rechnungsadresse verwenden" -"Use as my default shipping address","Als meine Standardlieferadresse verwenden" -"Use billing address for shipping","Use billing address for shipping" -"User Name:","User Name:" -"User session is expired","User session is expired" -"Version","Version" -"View Cart","View Cart" -"View Details","Details anzeigen" -"View Gallery","Ver galería" -"View Wishlist","View Wishlist" -"Warning: All related AirMail messages will be deleted!","Advertencia: ¡Se eliminarán todos los mensajes relacionados con AirMail!" -"Website is offline","Website is offline" -"Website is offline.","Die Website ist offline." -"WishList Updated","WishList Updated" -"Wishlist has been cleared.","Wunschliste wurde gelöscht." -"Wishlist has been updated.","Wunschliste wurde aktualisiert." -"Wishlist has been updated. But there are accrued some errors while updating some items.","Wunschliste wurde aktualisiert. Bei der Aktualisierung einiger Artikel sind jedoch Fehler aufgetreten." -"Wishlist is empty.","Wishlist is empty." -"Write a Review","Write a Review" -"Write a review","Write a review" -"Wrong Ipad background image orientation has been specified: ""%s"".","Falsche Ausrichtung für Ipad-Hintergrundbild angegeben: ""%s""." -"Wrong PayPal Mobile Express Checkout Token specified.","El vale de pago exprés móvil de PayPal especificado no es erróneo." -"Wrong device type.","Falscher Gerätetyp." -"Wrong email format","Formato de correo electrónico incorrecto" -"Wrong or expired Gift Card Code.","Código de tarjeta regalo incorrecto o caducado." -"Wrong theme format.","Formato de plantilla incorrecto." -"YYYY","YYYY" -"Year","Año" -"Yes","Yes" -"You are already logged in.","Ya está conectado." -"You are not logged in","You are not logged in" -"You can watch statistics here.","Sie können sich hier die Statistiken anschauen." -"You canceled your order. Touch ""Pay with PayPal"" to try again.","You canceled your order. Touch ""Pay with PayPal"" to try again." -"You have entered an incorrect decimal value in the custom amount field. Provide a valid value.","You have entered an incorrect decimal value in the custom amount field. Provide a valid value." -"You have placed no orders.","You have placed no orders." -"You have uncommitted actions. Commit?","You have uncommitted actions. Commit?" -"You may also like","You may also like" -"You must login first","You must login first" -"You must read and agree to the Terms and Conditions before placing your order.","You must read and agree to the Terms and Conditions before placing your order." -"You need to enable PayPal Express Checkout first from the Payment configuration before enabling PayPal MECL.","Es necesario activar primero el pago exprés móvil PayPal en la configuración de pago antes de activar PayPal MECL" -"You will receive an order confirmation email with details of your order and a link to track its progress.","Sie erhalten eine Bestellbestätigungs-E-Mail mit den Details zu Ihrer Bestellung und einem Link, um den Verlauf zu verfolgen." -"Your current balance is:","Tu balance actual es:" -"Your order # is: %s. ","Ihre Bestell # ist: %s." -"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it." -"Your order failed. Touch ""Pay with PayPal"" to try again.","Your order failed. Touch ""Pay with PayPal"" to try again." -"Your review has been accepted for moderation.","Ihre Bewertung wurde für die Moderation akzeptiert." -"Your tweet has been sent. Thanks for sharing this product on Twitter","Your tweet has been sent. Thanks for sharing this product on Twitter" -"Zip/Postal Code","Postleitzahl" -"\'%s\' exceeds the allowed file size: %d (bytes)","\'%s\' excede el tamaño máximo aceptado para archivos: %d (bytes)" -"\'%s\' height exceeds allowed value of %d px","La altura de \'%s\' supera el valor permitido de %d píxeles" -"\'%s\' is not a valid file extension. Allowed extensions: %s","\'%s\' no es una extensión de archivo válida. Extensiones permitidas: %s" -"\'%s\' width exceeds allowed value of %d px","\'%s\' ancho excede el valor aceptado de %d px" -"and","und" -"as Guest","as Guest" -"each","cada" -"field is required","field is required" -"iPad","iPad" -"iPhone","iPhone" -"image_id is required","image_id is required" -"not set","not set" -"required","required" -"save","Speichern" -"ver. %s","ver. %s" diff --git a/app/locale/es_ES/Phoenix_Moneybookers.csv b/app/locale/es_ES/Phoenix_Moneybookers.csv deleted file mode 100644 index 705cd18c7..000000000 --- a/app/locale/es_ES/Phoenix_Moneybookers.csv +++ /dev/null @@ -1,42 +0,0 @@ -"All Credit Cards / Visa, Mastercard, AMEX, JCB, Diners (powered by Moneybookers) - International","Todas las Tarjetas de Crédito / Visa, Mastercard, AMEX, JCB, Diners (gestionadas por Moneybookers) - Internacional" -"CartaSi (powered by Moneybookers) - Italy","CartaSi (gestionada por Moneybookers) - Italia" -"Carte Bleue (powered by Moneybookers) - France","Carte Bleue (gestionada por Moneybookers) - Francia" -"Customer ID","ID del cliente" -"Dankort (powered by Moneybookers) - Denmark","Dankort (gestionada por Moneybookers) - Dinamarca" -"EPS Online-Überweisung (powered by Moneybookers) - Austria","EPS Online-Überweisung (gestionada por Moneybookers) - Austria" -"Enabled","Habilitado" -"Find out more about Online Bank Transfer","Descubra más sobre Online Bank Transfer" -"Giropay (powered by Moneybookers) - Germany","Giropay (gestionada por Moneybookers) - Alemania" -"Laser (powered by Moneybookers) - Ireland","Laser (gestionada por Moneybookers) - Irlanda" -"Lastschrift (ELV) (powered by Moneybookers) - Germany","Lastschrift (ELV) (gestionada por Moneybookers) - Alemania" -"Loading secure payment page (SSL)","Cargando página de pago seguro (SSL)" -"Maestro (powered by Moneybookers) - United Kingdom, Austria, Spain","Maestro (promovido por Moneybookers) - Reino Unido, Austria, España" -"Moneybookers","Moneybookers" -"Moneybookers Settings","Configuración de Moneybookers" -"Moneybookers Transaction ID: %s","ID de Transacción de Moneybookers: %s" -"Moneybookers eWallet","eWallet de Moneybookers" -"More information about Moneybookers","Más información acerca de Moneybookers" -"Nordea Solo (powered by Moneybookers) - Finland","Nordea Solo (gestionada por Moneybookers) - Finlandia" -"Nordea Solo (powered by Moneybookers) - Sweden","Nordea Solo (gestionada por Moneybookers) - Suecia" -"Online Bank Transfer (powered by Moneybookers)","Online Bank Transfer (promovido por Moneybookers)" -"Order ID","ID de Pedido" -"POLi (powered by Moneybookers) - Australia","POLi (gestionada por Moneybookers) - Australia" -"Payment failed.","Ha fallado el pago." -"Payment from Applicable Countries","Pago desde países aplicables" -"Payment from Specific Countries","Pago desde países específicos" -"Payment has not been processed yet.","El pago todavía no ha sido procesado." -"Payment was canceled.","Se ha cancelado el pago." -"Pending bank transfer created.","Se ha creado una transferencia pendiente del banco." -"Please pay your order now","Por favor, pague su pedido ahora" -"Postepay (powered by Moneybookers) - Italy","Postepay (gestionada por Moneybookers) - Italia" -"Powered by Moneybookers","Con la tecnología de Moneybookers" -"Przelewy24 (powered by Moneybookers) - Poland","Przelewy24 (gestionada por Moneybookers) - Polonia" -"Sofortüberweisung (powered by Moneybookers) - Germany","Sofortüberweisung (gestionada por Moneybookers) - Alemania" -"Sort Order","Orden de selección" -"The amount has been authorized and captured by Moneybookers.","La cantidad ha sido autorizada y retenida por Moneybookers." -"The customer was redirected to Moneybookers.","Se ha reenviado al cliente a Moneybookers." -"The order has been canceled.","Se ha cancelado el pedido." -"Title","Título" -"You will be redirected to our secure payment page when you place an order.","Se le redigirá a nuestra página segura de pago cuando realice un pedido." -"eNETS (powered by Moneybookers) - Singapore","eNETS (gestionada por Moneybookers) - Singapur" -"iDeal (powered by Moneybookers) - Netherlands","iDeal (gestionada por Moneybookers) - Holanda" diff --git a/app/locale/es_ES/template/email/account_new.html b/app/locale/es_ES/template/email/account_new.html deleted file mode 100644 index 426d6ba5f..000000000 --- a/app/locale/es_ES/template/email/account_new.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}}
    -

    Estimado/a, {{htmlescape var=$customer.name}},

    -

    Bienvenido/a a {{var store.getFrontendName()}}. Para iniciar sesión al visitar nuestra web, sólo tiene que hacer clic en Iniciar sesión o en Mi cuenta en la parte superior de cada página e introducir su dirección de correo electrónico y contraseña.

    -

    - Use los siguientes valores cuando se le pida iniciar sesión:
    - Correo electrónico: {{var customer.email}}
    - Contraseña: {{htmlescape var=$customer.password}}

    -

    Cuando inicie sesión con su cuenta, podrá hacer lo siguiente:

    -
      -
    • – Pasar por caja más rápido al realizar una compra
      • -
    • – Comprobar el estado de los pedidos
      • -
    • – Ver pedidos anteriores
      • -
    • – Realizar cambios en la información de su cuenta
      • -
    • – Cambiar su contraseña
      • -
    • – Guardar direcciones alternativas (¡para envíos a diferentes familiares y amigos!)
      • -
    -

    Si tiene alguna duda sobre su cuenta o alguna otra cuestión, no deje de ponerse en contacto con nosotros en {{config path='trans_email/ident_support/email'}} o por teléfono en el {{config path='general/store_information/phone'}}.

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/account_new_confirmation.html b/app/locale/es_ES/template/email/account_new_confirmation.html deleted file mode 100644 index b1ff2fa2f..000000000 --- a/app/locale/es_ES/template/email/account_new_confirmation.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Estimado/a, {{htmlescape var=$customer.name}},

    -

    Deberá confirmar su dirección de correo electrónico {{var customer.email}} antes de poder usarlo para iniciar sesión en nuestra tienda.

    -

    Para confirmar la dirección de correo electrónico e iniciar sesión de forma instantánea, use este enlace de confirmación. Dicho enlace sólo podrá usarse una vez.

    -

    - Use los siguientes valores cuando se le pida iniciar sesión:
    - Correo electrónico: {{var customer.email}}
    - Contraseña: {{htmlescape var=$customer.password}}

    -

    Si tiene alguna duda sobre su cuenta o alguna otra cuestión, no deje de ponerse en contacto con nosotros en {{config path='trans_email/ident_support/email'}} o por teléfono en el {{config path='general/store_information/phone'}}.

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/account_new_confirmed.html b/app/locale/es_ES/template/email/account_new_confirmed.html deleted file mode 100644 index 527093b1e..000000000 --- a/app/locale/es_ES/template/email/account_new_confirmed.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Estimado/a, {{htmlescape var=$customer.name}},

    -

    Bienvenido/a a la tienda de demostración. Para iniciar sesión al visitar nuestra web, sólo tiene que hacer clic en Iniciar sesión o en Mi cuenta en la parte superior de cada página e introducir su dirección de correo electrónico y contraseña.

    -

    Cuando inicie sesión con su cuenta, podrá hacer lo siguiente:

    -
      -
    • – Pasar por caja más rápido al realizar una compra
      • -
    • – Comprobar el estado de los pedidos
      • -
    • – Ver pedidos anteriores
      • -
    • – Realizar cambios en la información de su cuenta
      • -
    • – Cambiar su contraseña
      • -
    • – Guardar direcciones alternativas (¡para envíos a diferentes familiares y amigos!)
      • -
    -

    Si tiene alguna duda sobre su cuenta o alguna otra cuestión, no deje de ponerse en contacto con nosotros en {{config path='trans_email/ident_support/email'}} o por teléfono en el {{config path='general/store_information/phone'}}.

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/account_password_reset_confirmation.html b/app/locale/es_ES/template/email/account_password_reset_confirmation.html deleted file mode 100644 index 5efe341f5..000000000 --- a/app/locale/es_ES/template/email/account_password_reset_confirmation.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Estimado {{htmlescape var=$customer.name}},

    -

    Ha habido una solicitud para cambiar la contraseña de su cuenta.

    -

    Si solicitó este cambio de contraseña, por favor abra el siguiente enlace para restablecer su contraseña: {{store url="customer/account/resetpassword/" _query_id=$customer.id _query_token=$customer.rp_token}}

    -

    Si el enlace no funciona, por favor copie y pegue la URL en su navegador.

    -
    -

    Si no ha realizado esta petición puede ignorar este mensaje y su contraseña seguirá siendo la misma.

    -

    Gracias, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/es_ES/template/email/admin_password_new.html b/app/locale/es_ES/template/email/admin_password_new.html deleted file mode 100644 index 180052d2a..000000000 --- a/app/locale/es_ES/template/email/admin_password_new.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Estimado/a, {{htmlescape var=$user.name}},

    -

    Su nueva contraseña es: {{htmlescape var=$password}}

    -

    Puede cambiar su contraseña en cualquier momento al iniciar sesión en su cuenta.

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/admin_password_reset_confirmation.html b/app/locale/es_ES/template/email/admin_password_reset_confirmation.html deleted file mode 100644 index ed4e8caeb..000000000 --- a/app/locale/es_ES/template/email/admin_password_reset_confirmation.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Estimado {{htmlescape var=$user.name}},

    -

    Ha habido una solicitud para cambiar la contraseña de su cuenta.

    -

    Si solicitó este cambio de contraseña, por favor abra el siguiente enlace para restablecer su contraseña: {{store url="adminhtml/index/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}

    -

    Si el enlace no funciona, por favor copie y pegue la URL en su navegador.

    -
    -

    Si no ha realizado esta petición puede ignorar este mensaje y su contraseña seguirá siendo la misma.

    -

    Gracias, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/es_ES/template/email/amazonpayments_asp_notification_error.html b/app/locale/es_ES/template/email/amazonpayments_asp_notification_error.html deleted file mode 100644 index 9b19ada4a..000000000 --- a/app/locale/es_ES/template/email/amazonpayments_asp_notification_error.html +++ /dev/null @@ -1,12 +0,0 @@ - - -
    -
    __('Amazon Simple Pay notification message')__
    -
    __('Request')__:
    -
    {{var request}}
    -
    __('Error')__:
    -
    {{var error}}
    -
    \ No newline at end of file diff --git a/app/locale/es_ES/template/email/contact_form.html b/app/locale/es_ES/template/email/contact_form.html deleted file mode 100644 index fa9ac3205..000000000 --- a/app/locale/es_ES/template/email/contact_form.html +++ /dev/null @@ -1,12 +0,0 @@ - - -Nombre: {{var data.name}} -Correo electrónico: {{var data.email}} -Teléfono: {{var data.telephone}} - -Comentario: {{var data.comment}} \ No newline at end of file diff --git a/app/locale/es_ES/template/email/currency_update_warning.html b/app/locale/es_ES/template/email/currency_update_warning.html deleted file mode 100644 index c0f4a9faf..000000000 --- a/app/locale/es_ES/template/email/currency_update_warning.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Avisos de actualización de divisas: - - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/es_ES/template/email/log_clean_warning.html b/app/locale/es_ES/template/email/log_clean_warning.html deleted file mode 100644 index 51824b01c..000000000 --- a/app/locale/es_ES/template/email/log_clean_warning.html +++ /dev/null @@ -1,7 +0,0 @@ - - -Avisos de limpieza de registros: - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/es_ES/template/email/moneybookers_activateemail.html b/app/locale/es_ES/template/email/moneybookers_activateemail.html deleted file mode 100644 index dbb8bd05a..000000000 --- a/app/locale/es_ES/template/email/moneybookers_activateemail.html +++ /dev/null @@ -1,6 +0,0 @@ - -{{var store.getFrontendName()}}
    -Correo electrónico de Moneybookers: {{var email_addr}}
    -Identificación del cliente de Moneybookers: {{var customer_id}}
    -URL: {{var url}}
    -Idioma: {{var language}}
    diff --git a/app/locale/es_ES/template/email/newsletter_subscr_confirm.html b/app/locale/es_ES/template/email/newsletter_subscr_confirm.html deleted file mode 100644 index 69023ea9a..000000000 --- a/app/locale/es_ES/template/email/newsletter_subscr_confirm.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Gracias por suscribirse a nuestro boletín.

    -

    Para empezar a recibir el boletín, primero debe confirmar su suscripción haciendo clic en el siguiente enlace:
    - {{var subscriber.getConfirmationLink()}}

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/newsletter_subscr_success.html b/app/locale/es_ES/template/email/newsletter_subscr_success.html deleted file mode 100644 index a69f47627..000000000 --- a/app/locale/es_ES/template/email/newsletter_subscr_success.html +++ /dev/null @@ -1,2 +0,0 @@ - -Suscripción al boletín completada con éxito \ No newline at end of file diff --git a/app/locale/es_ES/template/email/newsletter_unsub_success.html b/app/locale/es_ES/template/email/newsletter_unsub_success.html deleted file mode 100644 index ed5841d75..000000000 --- a/app/locale/es_ES/template/email/newsletter_unsub_success.html +++ /dev/null @@ -1,2 +0,0 @@ - -Anulación de suscripción al boletín completada con éxito \ No newline at end of file diff --git a/app/locale/es_ES/template/email/password_new.html b/app/locale/es_ES/template/email/password_new.html deleted file mode 100644 index fd63cf136..000000000 --- a/app/locale/es_ES/template/email/password_new.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Estimado/a, {{htmlescape var=$customer.name}},

    -

    Su nueva contraseña es: {{htmlescape var=$customer.password}}

    -

    Puede cambiar su contraseña en cualquier momento al iniciar sesión en su cuenta.

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/es_ES/template/email/payment_failed.html b/app/locale/es_ES/template/email/payment_failed.html deleted file mode 100644 index 007bb481c..000000000 --- a/app/locale/es_ES/template/email/payment_failed.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - -
    Habido un fallo en la transacción de pago.
    -

    - Razón
    - {{var reason}} -

    -

    - Tipo de caja
    - {{var checkoutType}} -

    -

    - Cliente:
    - {{var customer}} <{{var customerEmail}}> -

    -

    - Artículos
    - {{var items}} -

    -

    - Total:
    - {{var total}} -

    -

    - Dirección de facturación:
    - {{var billingAddress.format('html')}} -

    -

    - Dirección de envío:
    - {{var shippingAddress.format('html')}} -

    -

    - Método de envío:
    - {{var shippingMethod}} -

    -

    - Método de pago:
    - {{var paymentMethod}} -

    -

    - Fecha y hora:
    - {{var dateAndTime}} -

    -
    \ No newline at end of file diff --git a/app/locale/es_ES/template/email/product_alert_cron_error.html b/app/locale/es_ES/template/email/product_alert_cron_error.html deleted file mode 100644 index 685853c5e..000000000 --- a/app/locale/es_ES/template/email/product_alert_cron_error.html +++ /dev/null @@ -1,7 +0,0 @@ - - -Avisos cron para alertas de productos: - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/es_ES/template/email/product_price_alert.html b/app/locale/es_ES/template/email/product_price_alert.html deleted file mode 100644 index 2ea1535dd..000000000 --- a/app/locale/es_ES/template/email/product_price_alert.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Hola, {{var customerName}}, - -{{var alertGrid}} \ No newline at end of file diff --git a/app/locale/es_ES/template/email/product_share.html b/app/locale/es_ES/template/email/product_share.html deleted file mode 100644 index bfc30b4ff..000000000 --- a/app/locale/es_ES/template/email/product_share.html +++ /dev/null @@ -1,13 +0,0 @@ - - - -Bienvenido/a, {{htmlescape var=$name}}

    No se pierda {{var product_name}}

    Aquí tiene un mensaje:
    {{var message}}

    \ No newline at end of file diff --git a/app/locale/es_ES/template/email/product_stock_alert.html b/app/locale/es_ES/template/email/product_stock_alert.html deleted file mode 100644 index 2ce2f9c20..000000000 --- a/app/locale/es_ES/template/email/product_stock_alert.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Hola, {{var customerName}}, - -{{var alertGrid}} \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/creditmemo_new.html b/app/locale/es_ES/template/email/sales/creditmemo_new.html deleted file mode 100644 index 7f49791cd..000000000 --- a/app/locale/es_ES/template/email/sales/creditmemo_new.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hola, {{htmlescape var=$order.getCustomerName()}}

    -

    - Gracias por comprar en {{var store.getFrontendName()}}. - Puede comprobar el estado de su pedido al iniciar sesión en su cuenta. - Si tiene alguna duda respecto a su pedido, no deje de ponerse en contacto con nosotros en {{config path='trans_email/ident_support/email'}} o llámenos al {{config path='general/store_information/phone'}} de lunes a viernes, de 8 a. m. a 5 p. m., hora estándar del Pacífico. -

    -
    -

    Su recordatorio de crédito #{{var creditmemo.increment_id}} para el pedido #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Información de facturación:Método de pago:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Información de envío:Método de envío:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} -

    {{var comment}}

    -

    Gracias, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/creditmemo_new_guest.html b/app/locale/es_ES/template/email/sales/creditmemo_new_guest.html deleted file mode 100644 index 6192291d0..000000000 --- a/app/locale/es_ES/template/email/sales/creditmemo_new_guest.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hola, {{htmlescape var=$billing.getName()}}

    -

    - Gracias por comprar en {{var store.getFrontendName()}}. - Si tiene alguna duda respecto a su pedido, no deje de ponerse en contacto con nosotros en {{config path='trans_email/ident_support/email'}} o llámenos al {{config path='general/store_information/phone'}} de lunes a viernes, de 8 a. m. a 5 p. m., hora estándar del Pacífico. -

    -
    -

    Su recordatorio de crédito #{{var creditmemo.increment_id}} para el pedido #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Información de facturación:Método de pago:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Información de envío:Método de envío:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} -

    {{var comment}}

    -

    Gracias, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/creditmemo_update.html b/app/locale/es_ES/template/email/sales/creditmemo_update.html deleted file mode 100644 index b34c67eca..000000000 --- a/app/locale/es_ES/template/email/sales/creditmemo_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Estimado/a, {{htmlescape var=$order.getCustomerName()}},

    -

    - Su pedido # {{var order.increment_id}} se ha
    - {{var order.getStatusLabel()}}. -

    -

    Puede comprobar el estado de su pedido al iniciar sesión en su cuenta.

    -

    {{var comment}}

    -

    - Si tiene alguna duda, no deje de ponerse en contacto con nosotros en - {{config path='trans_email/ident_support/email'}} - o por teléfono en el {{config path='general/store_information/phone'}}. -

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/creditmemo_update_guest.html b/app/locale/es_ES/template/email/sales/creditmemo_update_guest.html deleted file mode 100644 index 934bd5688..000000000 --- a/app/locale/es_ES/template/email/sales/creditmemo_update_guest.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Estimado/a, {{htmlescape var=$billing.getName()}},

    -

    - Su pedido # {{var order.increment_id}} se ha
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Si tiene alguna duda, no deje de ponerse en contacto con nosotros en - {{config path='trans_email/ident_support/email'}} - o por teléfono en el {{config path='general/store_information/phone'}}. -

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/invoice_new.html b/app/locale/es_ES/template/email/sales/invoice_new.html deleted file mode 100644 index 85adffeac..000000000 --- a/app/locale/es_ES/template/email/sales/invoice_new.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hola, {{htmlescape var=$order.getCustomerName()}}

    -

    - Gracias por comprar en {{var store.getFrontendName()}}. - Puede comprobar el estado de su pedido al iniciar sesión en su cuenta. - Si tiene alguna duda respecto a su pedido, no deje de ponerse en contacto con nosotros en {{config path='trans_email/ident_support/email'}} o llámenos al {{config path='general/store_information/phone'}} de lunes a viernes, de 8 a. m. a 5 p. m., hora estándar del Pacífico. -

    -
    -

    Su factura #{{var invoice.increment_id}} para el pedido #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Información de facturación:Método de pago:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Información de envío:Método de envío:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}}  -
    -
    - {{/depend}} - {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} -

    {{var comment}}

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/invoice_new_guest.html b/app/locale/es_ES/template/email/sales/invoice_new_guest.html deleted file mode 100644 index a37425df0..000000000 --- a/app/locale/es_ES/template/email/sales/invoice_new_guest.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hola, {{htmlescape var=$billing.getName()}}

    -

    - Gracias por comprar en {{var store.getFrontendName()}}. - Si tiene alguna duda respecto a su pedido, no deje de ponerse en contacto con nosotros en {{config path='trans_email/ident_support/email'}} o llámenos al {{config path='general/store_information/phone'}} de lunes a viernes, de 8 a. m. a 5 p. m., hora estándar del Pacífico. -

    -
    -

    Su factura #{{var invoice.increment_id}} para el pedido #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Información de facturación:Método de pago:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Información de envío:Método de envío:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} -

    {{var comment}}

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/invoice_update.html b/app/locale/es_ES/template/email/sales/invoice_update.html deleted file mode 100644 index f7d7a1b3c..000000000 --- a/app/locale/es_ES/template/email/sales/invoice_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Estimado/a, {{htmlescape var=$order.getCustomerName()}},

    -

    - Su pedido # {{var order.increment_id}} se ha
    - {{var order.getStatusLabel()}}. -

    -

    Puede comprobar el estado de su pedido al iniciar sesión en su cuenta.

    -

    {{var comment}}

    -

    - Si tiene alguna duda, no deje de ponerse en contacto con nosotros en - {{config path='trans_email/ident_support/email'}} - o por teléfono en el {{config path='general/store_information/phone'}}. -

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/invoice_update_guest.html b/app/locale/es_ES/template/email/sales/invoice_update_guest.html deleted file mode 100644 index 32b35be1c..000000000 --- a/app/locale/es_ES/template/email/sales/invoice_update_guest.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Estimado {{htmlescape var=$billing.getName()}},

    -

    - __('Your order # {{var order.increment_id}} has been')__
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Si tiene alguna pregunta, por favor no dude en contactarnos en - {{config path='trans_email/ident_support/email'}} - o por teléfono en el {{config path='general/store_information/phone'}}. -

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/order_new.html b/app/locale/es_ES/template/email/sales/order_new.html deleted file mode 100644 index ac018d8b1..000000000 --- a/app/locale/es_ES/template/email/sales/order_new.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hola, {{htmlescape var=$order.getCustomerName()}}

    -

    - Gracias por comprar en {{var store.getFrontendName()}}. - Una vez enviado su paquete, le mandaremos un correo electrónico con un enlace para el seguimiento de su pedido. - Puede comprobar el estado de su pedido al iniciar sesión en su cuenta. - Si tiene alguna duda respecto a su pedido, no deje de ponerse en contacto con nosotros en {{config path='trans_email/ident_support/email'}} o llámenos al {{config path='general/store_information/phone'}} de lunes a viernes, de 8 a. m. a 5 p. m., hora estándar del Pacífico. -

    -

    Más abajo, encontrará la confirmación de su pedido. Gracias de nuevo por preferirnos.

    -
    -

    Su pedido #{{var order.increment_id}} (realizado el {{var order.getCreatedAtFormated('long')}})

    -
    - - - - - - - - - - - - - - - -
    Información de facturación:Método de pago:
    - {{var order.getBillingAddress().format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Información de envío:Método de envío:
    - {{var order.getShippingAddress().format('html')}} -   -   - {{var order.getShippingDescription()}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_items" order=$order}} -

    {{var order.getEmailCustomerNote()}}

    -

    Gracias, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/order_new_guest.html b/app/locale/es_ES/template/email/sales/order_new_guest.html deleted file mode 100644 index b4a08e132..000000000 --- a/app/locale/es_ES/template/email/sales/order_new_guest.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hola, {{htmlescape var=$order.getBillingAddress().getName()}}

    -

    - Gracias por comprar en {{var store.getFrontendName()}}. - Una vez enviado su paquete, le mandaremos un correo electrónico con un enlace para el seguimiento de su pedido. - Si tiene alguna duda respecto a su pedido, no deje de ponerse en contacto con nosotros en {{config path='trans_email/ident_support/email'}} o llámenos al {{config path='general/store_information/phone'}} de lunes a viernes, de 8 a. m. a 5 p. m., hora estándar del Pacífico. -

    -

    Más abajo, encontrará la confirmación de su pedido. Gracias de nuevo por preferirnos.

    -
    -

    Su pedido #{{var order.increment_id}} (realizado el {{var order.getCreatedAtFormated('long')}})

    -
    - - - - - - - - - - - - - - - -
    Información de facturación:Método de pago:
    - {{var order.getBillingAddress().format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Información de envío:Método de envío:
    - {{var order.getShippingAddress().format('html')}} -   -   - {{var order.getShippingDescription()}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_items" order=$order}} -

    {{var order.getEmailCustomerNote()}}

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/order_update.html b/app/locale/es_ES/template/email/sales/order_update.html deleted file mode 100644 index caca29642..000000000 --- a/app/locale/es_ES/template/email/sales/order_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Estimado/a, {{htmlescape var=$order.getCustomerName()}},

    -

    - Su pedido # {{var order.increment_id}} se ha
    - {{var order.getStatusLabel()}}. -

    -

    Puede comprobar el estado de su pedido al iniciar sesión en su cuenta.

    -

    {{var comment}}

    -

    - Si tiene alguna duda, no deje de ponerse en contacto con nosotros en - {{config path='trans_email/ident_support/email'}} - o por teléfono en el {{config path='general/store_information/phone'}}. -

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/order_update_guest.html b/app/locale/es_ES/template/email/sales/order_update_guest.html deleted file mode 100644 index ab8058625..000000000 --- a/app/locale/es_ES/template/email/sales/order_update_guest.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Estimado/a, {{htmlescape var=$billing.getName()}},

    -

    - Su pedido # {{var order.increment_id}} se ha
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Si tiene alguna duda, no deje de ponerse en contacto con nosotros en - {{config path='trans_email/ident_support/email'}} - o por teléfono en el {{config path='general/store_information/phone'}}. -

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/shipment_new.html b/app/locale/es_ES/template/email/sales/shipment_new.html deleted file mode 100644 index e7a5fa701..000000000 --- a/app/locale/es_ES/template/email/sales/shipment_new.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hola, {{htmlescape var=$order.getCustomerName()}}

    -

    - Gracias por comprar en {{var store.getFrontendName()}}. - Puede comprobar el estado de su pedido al iniciar sesión en su cuenta. - Si tiene alguna duda respecto a su pedido, no deje de ponerse en contacto con nosotros en {{config path='trans_email/ident_support/email'}} o llámenos al {{config path='general/store_information/phone'}} de lunes a viernes, de 8 a. m. a 5 p. m., hora estándar del Pacífico. -

    -

    - Más abajo, encontrará la confirmación de su envío. Gracias de nuevo por preferirnos. -

    -
    -

    Su envío #{{var shipment.increment_id}} para el pedido #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Información de facturación:Método de pago:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - - - - - - - - - - - - - - - -
    Información de envío:Método de envío:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -

    {{var comment}}

    -

    Gracias, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/shipment_new_guest.html b/app/locale/es_ES/template/email/sales/shipment_new_guest.html deleted file mode 100644 index 5bf39243a..000000000 --- a/app/locale/es_ES/template/email/sales/shipment_new_guest.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hola, {{htmlescape var=$billing.getName()}}

    -

    - Gracias por comprar en {{var store.getFrontendName()}}. - Si tiene alguna duda respecto a su pedido, no deje de ponerse en contacto con nosotros en {{config path='trans_email/ident_support/email'}} o llámenos al {{config path='general/store_information/phone'}} de lunes a viernes, de 8 a. m. a 5 p. m., hora estándar del Pacífico. -

    -

    - Más abajo, encontrará la confirmación de su envío. Gracias de nuevo por preferirnos. -

    -
    -

    Su envío #{{var shipment.increment_id}} para el pedido #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Información de facturación:Método de pago:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - - - - - - - - - - - - - - - -
    Información de envío:Método de envío:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -

    {{var comment}}

    -

    Gracias, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/shipment_update.html b/app/locale/es_ES/template/email/sales/shipment_update.html deleted file mode 100644 index 6f3854095..000000000 --- a/app/locale/es_ES/template/email/sales/shipment_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Estimado/a, {{htmlescape var=$order.getCustomerName()}},

    -

    - Su pedido # {{var order.increment_id}} se ha
    - {{var order.getStatusLabel()}}. -

    -

    Puede comprobar el estado de su pedido al iniciar sesión en su cuenta.

    -

    {{var comment}}

    -

    - Si tiene alguna duda, no deje de ponerse en contacto con nosotros en - {{config path='trans_email/ident_support/email'}} - o por teléfono en el {{config path='general/store_information/phone'}}. -

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sales/shipment_update_guest.html b/app/locale/es_ES/template/email/sales/shipment_update_guest.html deleted file mode 100644 index 54740d185..000000000 --- a/app/locale/es_ES/template/email/sales/shipment_update_guest.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Estimado/a, {{htmlescape var=$billing.getName()}},

    -

    - Su pedido # {{var order.increment_id}} se ha
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Si tiene alguna duda, no deje de ponerse en contacto con nosotros en - {{config path='trans_email/ident_support/email'}} - o por teléfono en el {{config path='general/store_information/phone'}}. -

    -

    Gracias de nuevo, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/es_ES/template/email/sitemap_generate_warning.html b/app/locale/es_ES/template/email/sitemap_generate_warning.html deleted file mode 100644 index 6892d70bc..000000000 --- a/app/locale/es_ES/template/email/sitemap_generate_warning.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Avisos generados por el mapa del sitio: - - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/es_ES/template/email/token.html b/app/locale/es_ES/template/email/token.html deleted file mode 100644 index b4346c838..000000000 --- a/app/locale/es_ES/template/email/token.html +++ /dev/null @@ -1,9 +0,0 @@ - - - -Hola, {{htmlescape var=$userName}}

    -Tu autorización a {{htmlescape var=$applicationName}} ha sido modificada {{htmlescape var=$status}} por el equipo administrativo.

    diff --git a/app/locale/es_ES/template/email/wishlist_share.html b/app/locale/es_ES/template/email/wishlist_share.html deleted file mode 100644 index 3d1cea362..000000000 --- a/app/locale/es_ES/template/email/wishlist_share.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Hola,
    Echa un vistazo a mi lista de deseos para la tienda de demostración.

    -

    {{var message}}

    - {{var items}} -
    - {{depend salable}}

    Añadir todos los artículos al carro de compra |{{/depend}} Ver todos los artículos de la lista de deseos

    -

    Gracias, {{htmlescape var=$customer.name}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/Mage_AdminNotification.csv b/app/locale/fr_FR/Mage_AdminNotification.csv deleted file mode 100644 index 6cf1e4a4b..000000000 --- a/app/locale/fr_FR/Mage_AdminNotification.csv +++ /dev/null @@ -1,31 +0,0 @@ -"Actions","Action" -"An error occurred while marking notification as read.","Une erreur est survenue lors du marquage de la notification comme lue." -"An error occurred while marking the messages as read.","Une erreur est survenue lors du marquage du message comme lu." -"An error occurred while removing messages.","Une erreur est survenue lors de la suppression des messages." -"An error occurred while removing the message.","Une erreur est survenue lors de la suppression du message." -"Are you sure?","Etes-vous sûr ?" -"Date Added","Date ajoutée" -"Last Update","Dernière mise à jour" -"Mark as Read","Marquer comme lu" -"Mark as read","Marqué comme lu" -"Message","Message" -"Messages Inbox","Boite de réception" -"Notifications","Notification" -"Please select messages.","Veuillez sélectionner les messages" -"Read Details","Lire les détails" -"Remove","Supprimer" -"Severity","Gravité" -"Show List","Afficher liste" -"Show Toolbar","Afficher toolbar" -"The message has been marked as read.","Le message a été marqué comme lu." -"The message has been removed.","Le message a été supprimé." -"Total of %d record(s) have been marked as read.","Total de %d message(s) ont été marqués comme lus." -"Total of %d record(s) have been removed.","Total de %d message(s) ont été supprimés." -"Unable to proceed. Please, try again.","Impossible de continuer. S'il vous plait, essayez encore." -"Update Frequency","Fréquence de mise à jour" -"Use HTTPS to Get Feed","Utilisez HTTPS pour récupérer le feed" -"Wrong message type","Mauvais type de message" -"critical","critique" -"major","majeur" -"minor","mineur" -"notice","notice" diff --git a/app/locale/fr_FR/Mage_Adminhtml.csv b/app/locale/fr_FR/Mage_Adminhtml.csv deleted file mode 100644 index 8592344b7..000000000 --- a/app/locale/fr_FR/Mage_Adminhtml.csv +++ /dev/null @@ -1,1215 +0,0 @@ -" The customer does not exist in the system anymore.","Le client n'existe plus dans le système." -" [deleted]","[supprimé]" -" and "," et " -"%s (Default Template from Locale)","%s (Modèle par Défaut de la Configuration Locale)" -"%s cache type(s) disabled.","Type(s) de cache %s désactivé(s)" -"%s cache type(s) enabled.","Type(s) de cache %s activé(s)" -"%s cache type(s) refreshed.","Type(s) de cache %s rafraîchi(s)." -"(For Type ""Local Server"" need to use relative path to Magento install var/export or var/import, e.g. var/export, var/import, var/export/some/dir, var/import/some/dir)","(pour le type ""Serveur local"", nécessaire d'utiliser le chemin relatif vers l'installation de Magento var/export ou var/import, e.g. var/export, var/import, var/export/some/dir, var/import/some/dir)" -"(For US 2-letter state names)","(Pour noms d'Etats US à 2 lettres)" -"(If left empty will be auto-generated)","(si laissé vide, sera généré automatiquement)" -"(Leave empty for first spreadsheet)","(Laisser vide pour premier tableur)" -"(Products will be added/updated to this store if 'store' column is blank or missing in the import file.)","(Les produits seront ajoutés/actualisés à cette boutique si la colonne ""boutique"" est vide ou fait défaut dans le fichier d'importation.)" -"(Shift-)Click or drag to change value","Cliquez + SHIFT ou faites glisser pour modifier la valeur" -"(Starting with)","(Commençant par)" -"(When 'No', only mapped fields will be imported. When mapping, use 'column1', 'column2', etc.)","(Lorsque ""Non"", seuls les champs taggés seront importés. Lors du tag, utilisez ""colonne1"", colonne2"", etc)" -"(You have to increase php memory_limit before changing this value)","(Vous devez augmenter la limite de mémoire php avant de modifier cette valeur)" -"(\\t for tab)","(\t pour tabulation)" -"* - If indexing is in progress, it will be killed and new indexing process will start.","* - Si l'indexation est en cours, elle sera annulée et une nouvelle indexation commencera." -"* Required Fields","* Champs requis" -"- Click on any of the time parts to increase it","- Cliquez sur n'importe quelle partie de l'heure pour l'augmenter" -"- Hold mouse button on any of the above buttons for faster selection.","- Maintenez le bouton de la souris enfoncé sur n'importe lequel des boutons ci-dessus pour accélérer la sélection." -"- Use the %s buttons to select month","- Utilisez les boutons %s pour sélectionner le mois" -"- Use the %s, %s buttons to select year","- Utilisez les boutons %s, %s pour sélectionner l'année" -"- or Shift-click to decrease it","- ou Cliquez + SHIFT pour la diminuer" -"- or click and drag for faster selection.","- ou cliquez et faites glisser pour accélérer la sélection." -"-- Not Selected --","-- Non Sélectionné --" -"-- Please Select --","-- Sélectionnez --" -"-- Please Select Billing Agreement--","-- Veuillez sélectionner un accord de facturation--" -"-- Please Select a Category --","-- Sélectionnez une catégorie --" -"-- Please select --","-- Veuillez sélectionner --" -"--Please Select--","--Veuillez sélectionner--" -"1 Hour","1 Heure" -"12 Hours","12 Heures" -"12h AM/PM","12h AM/PM" -"2 Hours","2 Heures" -"24 Hours","24 Heures" -"24h","24h" -"2YTD","Jusqu'à ce jour" -"6 Hours","6 Heures" -"

    404 Error

    Page not found.

    ","

    404 Error

    Page not found.

    " -"%s requests access to your account","%s demandes d'accès à votre compte" -"Attention: Captcha is case sensitive.","Attention:Captcha est sensible à la casse." -"A user with the same user name or email aleady exists.","Un utilisateur avec le même nom d'utilisateur ou le même email existe déjà." -"API Key","Clé API" -"API Key Confirmation","Confirmation Clé API" -"ASCII","ASCII" -"Abandoned Carts","Paniers abandonnés" -"About the calendar","Au sujet du calendrier" -"Access Denied","Accès refusé" -"Access denied","Accès refusé" -"Access denied.","Accès refusé." -"Account Created in:","Compte créé dans:" -"Account Created on (%s):","Compte créé sur (%s):" -"Account Created on:","Compte créé sur:" -"Account Information","Informations du compte" -"Account Status","Statut Compte" -"Account status","Statut du compte" -"Action","Action" -"Actions","Action" -"Actions XML","Actions XML" -"Active","Actif" -"Add","Ajouter" -"Add Exception","Ajouter Exception" -"Add Field Mapping","Ajouter Mappage Champ" -"Add Field with URL:","Ajouter Champ avec URL:" -"Add New","Ajouter nouveau" -"Add New Image","Ajouter Nouvelle Image" -"Add New Profile","Ajouter Nouveau Profil" -"Add New Role","Ajouter Nouveau Rôle" -"Add New Template","Ajouter un nouveau modèle" -"Add New URL Rewrite","Ajouter Réécriture Nouvelle URL" -"Add New User","Ajouter Nouvel Utilisateur" -"Add New Variable","Ajouter Nouvelle Variable" -"Add Products","Ajouter produits" -"Add URL Rewrite","Ajouter Réécriture URL" -"Add URL Rewrite for a Category","Ajouter Réécriture URL pour une Catégorie" -"Add URL Rewrite for a Product","Ajouter Réécriture URL pour un Produit" -"Add after","Ajouter après" -"Additional Cache Management","Gestion Cache Additionnel" -"Address Type:","Type d'Adresse:" -"Admin","Admin" -"Advanced Admin Section","Section Avancée Administrateur" -"Advanced Profiles","Profils Avancés" -"Advanced Section","Section Avancée" -"After authorization application will have access to you account.","Après autorisation, l'application aura accès à votre compte." -"All","Tous" -"All Allowed Countries","Tous les Pays Possibles" -"All Cache","Tout le Cache" -"All Files","Tous les Fichiers" -"All Reviews","Tous les avis" -"All Store Views","Toutes les vues de la boutique" -"All Tags","Tous les tags" -"All Websites","Tous les sites web" -"All countries","Tous les pays" -"All fields","Tous les champs" -"All possible rates were fetched, please click on ""Save"" to apply","Tous les taux possibles ont été estimés, veuillez cliquer sur ""Enregistrer"" pour appliquer" -"All rates were fetched, please click on ""Save"" to apply","Tous les taux ont été estimés, cliquez sur ""Enregistrer"" pour appliquer" -"All valid rates have been saved.","Tous les taux valides ont été sauvegardés." -"Always (during development)","Toujours (durant le développement)" -"Amounts","Montants" -"An error has occured while syncronizing media storages.","Une erreur est survenue lors de la synchronisation." -"An error occurred while clearing the JavaScript/CSS cache.","Une erreur s'est produite lors de la suppression du cache JavaScript/CSS." -"An error occurred while clearing the image cache.","Une erreur s'est produite lors de la suppression du cache de l'image." -"An error occurred while deleting URL Rewrite.","Un erreur s'est produite lors de l'effacement de URL de réécriture." -"An error occurred while deleting email template data. Please review log and try again.","Une erreur s'est produite lors de la suppression des données du modèle d'email. Consultez le journal des erreurs et réessayez." -"An error occurred while deleting record(s).","Une erreur s'est produite lors de l'effacement des enregistrements." -"An error occurred while deleting this role.","Une erreur s'est produite lors de la suppression de ce rôle." -"An error occurred while deleting this set.","Une erreur s'est produite lors de la suppression de ce jeu." -"An error occurred while deleting this template.","Une erreur s'est produite lors de la suppression de ce modèle." -"An error occurred while finishing process. Please refresh the cache","Une erreur s'est produite lors de la finalisation du processus. Rafraîchissez le cache" -"An error occurred while rebuilding the CatalogInventory Stock Status.","Une erreur s'est produite lors de la reconstitution du Statut de l'Inventaire du Stock du Catalogue." -"An error occurred while rebuilding the catalog index.","Une erreur s'est produite lors de la la reconstitution de l'indexation du catalogue." -"An error occurred while rebuilding the flat catalog category.","Une erreur s'est produite lors de la reconstitution de la catégorie du flat catalog" -"An error occurred while rebuilding the flat product catalog.","Une erreur s'est produite lors de la reconstitution du flat catalog produit." -"An error occurred while rebuilding the search index.","Une erreur s'est produite lors de la reconstitution de l'index de recherche." -"An error occurred while refreshing the Catalog Rewrites.","Une erreur s'est produite lors du rafraîchissement des réécritures catalogue." -"An error occurred while refreshing the Layered Navigation indices.","Une erreur s'est produite lors du rafraîchissement des indices de navigation multicouches." -"An error occurred while refreshing the catalog rewrites.","Une erreur est survenue lors de l'actualisation des catalogues." -"An error occurred while refreshing the layered navigation indices.","Une erreur est survenue lors de l'actualisation des indices de navigation;" -"An error occurred while saving URL Rewrite.","Une erreur s'est produite lors de la sauvegarde de l'URL de réécriture." -"An error occurred while saving account.","Une erreur s'est produite lors de la sauvegarde du compte." -"An error occurred while saving review.","Une erreur s'est produite lors de la sauvegarde de la vérification." -"An error occurred while saving the customer.","Une erreur s'est produite lors de la sauvegarde du client." -"An error occurred while saving this configuration:","Une erreur s'est produite lors de la sauvegarde de cette configuration:" -"An error occurred while saving this role.","Une erreur s'est produite lors de la sauvegarde de ce rôle." -"An error occurred while saving this template.","Une erreur s'est produite lors de la sauvegarde de ce modèle." -"An error occurred while updating the selected review(s).","Une erreur s'est produite lors de l'actualisation des commentaires sélectionnés." -"Any","Indifférent" -"Any Attribute Set","N'importe quel jeu d'attributs." -"Any Group","N'importe quel groupe." -"Any Status","N'importe quel Statut" -"Any Store","N'importe quelle Boutique" -"Any Type","N'importe quel Type" -"Any Visibility","N'importe quelle Visibilité" -"Any data created since the backup was made will be lost including admin users, customers and orders.","Toutes les données crées depuis la sauvegarde seront perdues, y compris les utilisateurs-administrateurs, les clients et les commandes." -"Archive file name:","Nom du fichier d'archive:" -"Are you sure that you want to delete this template?","Voulez-vous vraiment supprimer ce modèle ?" -"Are you sure that you want to strip tags?","Êtes-vous sûr de vouloir enlever les tags?" -"Are you sure you want to do this?","Êtes-vous sûrs de vouloir faire celà?" -"Are you sure you want to proceed?","Etes-vous certain(e) de vouloir continuer?" -"Area","Zone" -"As low as:","Aussi bas que :" -"Assigned","Assigné" -"Associated Tags","Tags associés" -"Attribute Set Name:","Nom du jeu d'attributs:" -"Attributes","Attributs" -"Authorization confirmed","Autorisation confirmée" -"Authorize","Autoriser" -"Authorize application","Autoriser l'application" -"Authorized OAuth Tokens","Autoriser les jetons OAuth" -"Automatic (equalize price ranges)","Automatique (égaliser les gammes de prix)" -"Automatic (equalize product counts)","Automatique (égaliser les comptes de produits)" -"Average Order Amount","Montant Moyen des Commandes" -"Average Orders","Commandes moyennes" -"BINARY","BINAIRE" -"Back","Retour" -"Back to Login","Retour à la connexion" -"Backup","Sauvegarde" -"Backup Name","Nom de la sauvegarde" -"Backup options","Options de sauvegarde" -"Backups","Sauvegardes" -"Base currency","Monnaie de base" -"Bcc","Liste des destinataires cachée." -"Bestsellers","Meilleures ventes" -"Billing Address","Adresse de facturation" -"Billing Address: ","Adresse de facturation :" -"Billing Agreement","Accord de facturation" -"Billing Agreements","Accords de facturation" -"Block Information","Bloquer l'information" -"Both (without and with tax)","Les deux (avec et sans les taxes)" -"Both IPN and PDT","IPN et PDT" -"Browse Files...","Parcourir..." -"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","Les ensembles comprenant une tarification dynamique ne peuvent pas comprendre d'option personnalisée. Les options ne seront pas enregistrées." -"CMS","CMS" -"CRITICAL","critique" -"CSV","CSV (valeurs séparées par des virgules)" -"CSV / Tab separated","CSV / Séparé par onglets" -"Cache Control","Cache-control" -"Cache Control (beta)","Cache-control (beta)" -"Cache Management","Gestion du cache" -"Cache Type","Type de cache" -"Cancel","Annuler" -"Cannot add new comment.","Impossible d'ajouter un nouveau commentaire." -"Cannot add tracking number.","Impossible d'ajouter un numéro de suivi." -"Cannot create an invoice without products.","Impossible de créer une facture sans produit." -"Cannot create credit memo for the order.","Impossible de créer la note de crédit pour la commande." -"Cannot delete the design change.","Impossible de supprimer la modification du design." -"Cannot delete tracking number.","Impossible de supprimer le numéro de suivi." -"Cannot do shipment for the order separately from invoice.","Impossible d'effectuer l'envoi et la facture de la commande séparément." -"Cannot do shipment for the order.","Impossible d'effectuer l'envoi pour la commande." -"Cannot initialize shipment for adding tracking number.","Impossible d'initialiser l'envoi pour ajouter un numéro de suivi." -"Cannot initialize shipment for delete tracking number.","Impossible d'initialiser l'envoi pour supprimer un numéro de suivi." -"Cannot load track with retrieving identifier.","Ne peut pas récupérer l'identifiant pour charger le suivi" -"Cannot retrieve tracking number detail.","Impossible de récupérer le détail du numéro de suivi." -"Cannot save shipment.","Impossible d'enregistrer l'envoi." -"Cannot save the credit memo.","Impossible d'enregistrer la note de crédit." -"Cannot send shipment information.","Impossible d'envoyer les informations sur l'envoi." -"Cannot update item quantity.","Impossible de mettre à jour la quantité d'articles." -"Cannot update the item\'s quantity.","Impossible de mettre à jour la quantité de cet article." -"Card Verification Number","Numéro de vérification de la carte" -"Catalog","Catalogue" -"Catalog Price Rules","Règles de prix du catalogue" -"Catalog Rewrites","Réécritures catalogue" -"Categories","Catégories" -"Category","Catégorie" -"Category:","Catégorie :" -"Chart is disabled. If you want to enable chart, click here.","Graphique désactivé. Si vous souhaitez l'activer, cliquez ici." -"Checkbox","Case à cocher" -"Child Transactions","Transactions enfant" -"Choose Store View:","Sélectionner la vue de la boutique :" -"Choose an attribute","Choisir un attribut" -"Chosen category does not associated with any website, so url rewrite is not possible.","La catégorie choisie n'est associée à aucun site Web, la réécriture de l'URL n'est donc pas possible." -"Chosen product does not associated with any website, so url rewrite is not possible.","Le produit choisi n'est associé à aucun site Web, la réécriture de l'URL n'est donc pas possible." -"Clear","Effacer" -"Close","fermer" -"Code","Code" -"Comment text field cannot be empty.","Le champ de texte du commentaire ne peut pas être vide." -"Complete","Terminer" -"Config form fieldset clone model required to be able to clone fields","Formulaire de configuration modèle clone fieldset requis pour pouvoir cloner des champs" -"Configuration","Configuration" -"Confirm New Password","Confirmer le nouveau mot de passe" -"Confirm token authorization Pop Up for admin","Confirmer la fenêtre Pop Up de jeton d'autorisation pour l'administrateur" -"Confirm token authorization for admin","Confirmer le jeton d'authentification pour l'administrateur" -"Confirmation Of Authorization","Confirmation de l'autorisation" -"Confirmed email:","E-mail confirmé :" -"Connect with the Magento Community","Connexion avec Magento Community" -"Continue","Continuer" -"Convert to Plain Text","Convertir en texte intégral" -"Cookie (unsafe)","Cookie (dangereux)" -"Country","Pays" -"Country:","Pays :" -"Coupons","Coupons" -"Create","Créer" -"Create DB Backup","Créer une sauvegarde de la base de données" -"Create New Attribute","Créer un nouvel attribut" -"Create URL Rewrite:","Créer une réécriture d'URL :" -"Created At","Créé à" -"Credit Card %s","Carte bancaire %s" -"Credit Card Number","Numéro de carte de crédit" -"Credit Card Number: xxxx-%s","Numéro de carte de crédit : xxxx-%s" -"Credit Card Type","Type de carte de crédit" -"Credit Card Type: %s","Type de carte de crédit : %s" -"Credit Memo History","Historique des notes de crédit" -"Credit Memo Totals","Total des notes de crédit" -"Credit Memos","Avoirs" -"Credit memo #%s comment added","Commentaire ajouté à la note de crédit #%s" -"Credit memo #%s created","Note de crédit #%s créée" -"Credit memo\'s total must be positive.","Le total des notes de crédit doit être positif." -"Currency","Monnaie" -"Currency ""%s"" is used as %s in %s.","La monnaie ""%s"" est utilisée comme %s dans %s." -"Currency Information","Informations sur la devise" -"Currency Setup Section","Section d'installation de devises" -"Current Configuration Scope:","Portée actuelle des options :" -"Current Month","Mois actuel" -"Custom","Personnalisé" -"Custom Variable ""%s""","Variable personnalisée ""%s""" -"Custom Variables","Variables sur mesure" -"Customer","Client" -"Customer Group:","Groupe de clients :" -"Customer Groups","Groupes de clients" -"Customer Name","Nom du client" -"Customer Reviews","Avis du client" -"Customer Shopping Carts","Panier du client" -"Customer Since:","Client depuis :" -"Customer Tax Classes","Classes de taxe client" -"Customer with the same email already exists.","Un client avec le même e-mail existe déjà." -"Customers","Clients" -"Customers by Number of Orders","Clients par nombre de commandes" -"Customers by Orders Total","Clients par total des commandes" -"DHTML Date/Time Selector","Sélecteur de date/heure DHTML" -"Dashboard","Tableau de bord" -"Data Format","Format des données" -"Data transfer:","Transfert de données :" -"Database","Base de données" -"Dataflow - Advanced Profiles","Dataflow - Profils avancés" -"Dataflow - Profiles","Dataflow - Profils" -"Date","Date" -"Date & Time","Date & Heure" -"Date Added","Date ajoutée" -"Date Updated","Date de mise à jour" -"Date selection:","Sélection de la date :" -"Date selector","Sélecteur de date" -"Day","Jour" -"Decimal separator:","Séparateur de décimales :" -"Default (Admin) Values","Valeurs par défaut (Admin)" -"Default Billing Address","Adresse de facturation par défaut" -"Default Config","Config par défaut" -"Default Template from Locale","Modèle par défaut de Locale" -"Default Values","Valeurs par défaut" -"Default display currency ""%s"" is not available in allowed currencies.","Monnaie d'affichage apr défaut ""%s"" ne fait pas partie des monnaies autorisées." -"Default scope","Portée par défaut" -"Delete","Supprimer" -"Delete %s","Supprimer %s" -"Delete %s '%s'","Supprimer %s '%s'" -"Delete File","Supprimer fichier" -"Delete Image","Supprimer l'image" -"Delete Profile","Supprimer profil" -"Delete Role","Supprimer modèle" -"Delete Store","Supprimer le magasin" -"Delete Store View","Supprimer la vue du magasin" -"Delete Template","Supprimer le modèle" -"Delete User","Supprimer utilisateur" -"Delete Website","Supprimer le site" -"Description","Description" -"Design","Design" -"Design Section","Section de design" -"Details","Détails" -"Developer Section","Section développeur" -"Direction:","Direction :" -"Disable","Désactiver" -"Disabled","Désactivé" -"Display %s first","Afficher %s en premier" -"Display default currency","Afficher la devise par défaut" -"Distributed under GNU LGPL. See %s for details.","Distribué sous la licence GNU LGPL. Voir %s pour plus de détails." -"Do you really want to KILL parallel process and start new indexing process?","Voulez-vous vraiment ARRÊTER les processus parallèles et commencer un nouveau processus d'indexation ?" -"Do you really want to proceed?","Voulez-vous vraiment continuer?" -"Download","Téléchargement" -"Downloads","Téléchargements" -"Drag to move","Faire glisser pour déplacer" -"Drop-down","Menu déroulant" -"Edit","Modifier" -"Edit Design Change","Éditer les changements de design" -"Edit Email Template","Modifier le modèle d'e-mail" -"Edit Order","Modifier la commande" -"Edit Poll","Modifier le sondage d'opinion" -"Edit Queue","Modifier la file d'attente" -"Edit Review","Modifier le rapport" -"Edit Role","Modifier modèle" -"Edit Store View","Éditer la vue du magasin" -"Edit System Template","Modifier modèle système" -"Edit Template","Modifier le modèle" -"Edit URL Rewrite","Modifier la réécriture d'URL" -"Edit User","Modifier l'utilisateur" -"Edit User '%s'","Modifier l'utilisateur '%s'" -"Edit Website","Éditer le site web" -"Email","Email" -"Email Address:","Adresse e-mail:" -"Email Preview","Prévisualisation de l'e-mail" -"Email to a Friend","Envoyer à un ami par email" -"Email:","Email :" -"Enable","Activer" -"Enabled","Actif" -"Enclose Values In:","Joindre les valeurs dans :" -"Entity Attributes","Attributs de l'entité" -"Entity Type","Type d'entité" -"Entity type:","Type d'entité :" -"Error","Erreur" -"Excel XML","Excel XML" -"Excl. Tax","Taxe non comprise" -"Exclude media folder from backup","Exclure les fichiers médias de la sauvegarde" -"Expiration Date","Date d'expiration" -"Expiration Date: %s/%s","Date d'expiration : %s/%s" -"Export","Exporter" -"Export CSV","Exporter en CSV" -"Export Filters","Filtres d'exportation" -"Export to:","Exporter vers" -"Export:","Exporter:" -"FTP Host","Hôte FTP" -"FTP Host[:Port]","Hôte FTP [:Port]" -"FTP Login","Connexion FTP" -"FTP Password","Mot de passe FTP" -"FTP credentials","Certificats FTP" -"Failed","Échec" -"Failed to add a product to cart by id ""%s"".","Echec de l'ajout du produit au panier ""%s""" -"Failed to cancel the billing agreement.","L'annulation du tarif précédemment accepté a échoué." -"Failed to clear the JavaScript/CSS cache.","Échec de l'effacement du cache JavaScript/CSS." -"Failed to delete the billing agreement.","L'effacement du tarif précédemment accepté a échoué." -"Failed to update the profile.","Échec de la mise à jour du profil." -"Field","Champ" -"Field Mapping","Mappage de champ" -"File","Fichier" -"File Information","Informations du fichier" -"File System","Système de fichier" -"File mode","Mode de fichier" -"File name:","Nom de fichier :" -"File size should be more than 0 bytes","La taille du fichier doit dépasser 0 bytes." -"Finished profile execution.","Exécution du profil terminée." -"First Invoice Created Date","Date de création de la première facture" -"First Name","Prénom" -"First Name is required field.","Il est obligatoire de remplir le champ du prénom." -"First Name:","Prénom :" -"Fixed","Fixé" -"Flush Catalog Images Cache","Effacer le cache image du catalogue" -"Flush JavaScript/CSS Cache","Effacer le cache JavaScript/CSS" -"For category","Pour la catégorie" -"For latest version visit: %s","Pour la version de la dernière visite: %s" -"For product","Pour le produit" -"Forgot Admin Password","Mot de passe administrateur oublié" -"Forgot your password?","Mot de passe oublié ?" -"Forgot your user name or password?","Mot de passe ou nom d'utilisateur oublié ?" -"From","de" -"GLOBAL","GLOBAL" -"Gb","La G.B." -"General Information","Informations générales" -"General Section","Section générale" -"Get Image Base64","Encoder les images en base 64" -"Get help for this page","Obtenir de l'aide pour cette page" -"Give the verifier code to application administrator","Donner le code de vérification à l'administrateur de l'application" -"Global Attribute","Attribut global" -"Global Record Search","Enregistrement global des recherches" -"Global Search","Recherche globale" -"Go Today","Aller à aujourd'hui" -"Go to messages inbox","Aller à la boite de réception" -"Go to notifications","Aller aux notifications" -"Google Base","Google Base" -"Google Content","Contenu Google" -"Google Sitemaps","Google Sitemaps" -"Grand Total","Total final" -"Grid (default) / List","Grille (par défaut) / Liste" -"Grid Only","Grille uniquement" -"Group:","Groupe :" -"Guest","Invité" -"HTTP (unsecure)","HTTP (non-sécurisé)" -"HTTPS (SSL)","HTTPS (SSL) (Secure Socket Layer: confidentialité, intégrité, authentification)" -"Help Us Keep Magento Healthy - Report All Bugs","Aidez-nous à maintenir le bon fonctionnement de Magento: signalez tout dysfonctionnement." -"Helper attributes should not be used in custom layout updates.","Les attributs helper ne doivent pas être utilisés dans les mises à jour des dispositions personnalisées." -"Helper for options rendering doesn't implement required interface.","Helper pour le rendu des options n'implante pas l'interface requise." -"Home","Accueil" -"ID","ID" -"ID Path","ID du chemin" -"IP Address","Adresse IP" -"IPN (Instant Payment Notification) Only","NPI (Notification de Paiement Instantanée) seulement" -"Id","Id" -"If there is an account associated with %s you will receive an email with a link to reset your password.","S'il y a un compte associé à %s, vous recevrez un courriel contenant un lien pour réinitialiser votre mot de passe." -"If this message persists, please contact the store owner.","Si ce message persiste, veuillez contacter le propriétaire de la boutique." -"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Si vous ne précisez pas de valeur d'option pour un aperçu d'un point de vente particulier, alors c'est la valeur par défaut (Admin) qui sera utilisée." -"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)" -"Images Cache","Cache d'image" -"Import","Importer" -"Import Service","Service d'importation" -"Import and Export","Importation et exportation" -"Import and Export Tax Rates","Taux d'imposition des importations et des exportations." -"Import/Export","Import/Export" -"Import/Export Advanced","Importation/exportation avancée" -"Import/Export Profile","Profil Import/Export" -"Important: ","Important :" -"Imported %s records","Enregistrements %s importés" -"In","Dans" -"In Database:","Dans la base de données :" -"In File:","Dans le fichier:" -"Inactive","Désactivé" -"Incl. Tax","Taxe comprise" -"Incoming Message","Message entrant" -"Insert Variable...","Insérez une variable" -"Interactive","Interactif" -"Interface Locale: %s","Interface locale: %s" -"Invalid Form Key. Please refresh the page.","Forme de clé invalide. Veuillez rafraîchir la page." -"Invalid Import Service Specified","Le service d'importation spécifié est invalide" -"Invalid POST data (please check post_max_size and upload_max_filesize settings in your php.ini file).","POST data invalide (veuillez vérifier les réglages post_max_size et upload_max_filesize dans votre fichier php.ini)." -"Invalid Secret Key. Please refresh the page.","Clé secrète invalide. Veuillez rafraîchir la page." -"Invalid User Name or Password.","Nom d'utilisateur ou mot de passe invalide." -"Invalid directory: %s","Répertoire invalide: %s" -"Invalid email address ""%s"".","Adresse email invalide ""%s""" -"Invalid email address.","Adresse email invalide." -"Invalid file: %s","Fichier invalide : %s" -"Invalid input data for %s => %s rate","Données entrées invalides pour %s => %s du tarif" -"Invalid parent block for this block","Bloc parent invalide pour ce bloc" -"Invalid parent block for this block.","Bloc parent invalide pour ce bloc." -"Invalid password reset token.","Preuve de réinitialisation de mot de passe invalide." -"Invalid sender name ""%s"". Please use only visible characters and spaces.","Nom de l'expéditeur invalide ""%s"". Veuillez n'utiliser que des caractères visibles et des espaces" -"Invalid timezone","Fuseau horaire invalide" -"Invalidated","Invalidé" -"Inventory Stock Status","Statut de l'inventaire des stocks" -"Invoice #%s comment added","Ajout d'un commentaire sur la facture #%s" -"Invoice #%s created","La facture #%s a été créée." -"Invoice History","Historique des factures" -"Invoice Totals","Totaux de facture" -"Invoice canceling error.","Erreur d'annulation de la facture." -"Invoice capturing error.","Erreur de capture de la facture." -"Invoice voiding error.","Erreur d'annulation de la facture." -"Invoices","Factures" -"Is Closed","Est fermé" -"Is Default","Est la valeur par défaut" -"Issue Number","Numéro de livraison" -"Items","Articles" -"JavaScript seems to be disabled in your browser.","Le JavaScript semble être désactivé sur votre navigateur." -"JavaScript/CSS","JavaScript/CSS" -"JavaScript/CSS Cache","Cache JavaScript/CSS" -"Kb","Kb" -"Last 24 Hours","Dernières 24 Heures" -"Last 5 Orders","5 Dernières Commandes" -"Last 5 Search Terms","5 Derniers Termes de Recherche" -"Last 7 Days","Ces 7 derniers jours" -"Last Credit Memo Created Date","Date du dernier avoir créé" -"Last Invoice Created Date","Date de la dernière facture créée" -"Last Logged In (%s):","Dernière connexion (%s):" -"Last Logged In:","Dernière connexion en:" -"Last Name","Nom" -"Last Name is required field.","Le nom de famille est un champ obligatoire." -"Last Name:","Nom de Famille:" -"Last updated: %s. To refresh last day\'s statistics, click here.","Dernière mise à jour : ""%s"" Pour mettre à jour les statistiques du dernier jour, cliquez ici." -"Latest Message:","Dernier message:" -"Layered Navigation Indices","Indice de navigation par niveaux" -"Layered Navigation Indices were refreshed.","Les indices de navigation par couches ont été rafraîchis." -"Leave empty to use tax identifier","Laisser vide pour utiliser l'identifiant taxe" -"Lifetime Sales","Ventes totales" -"Lifetime statistics have been updated.","Les statistiques de durée de vie ont été mises à jour." -"Links","Liens" -"Links with associated products will retain only after saving current product.","Les liens avec les produits associés seront retenus seulement après la sauvegarde du produit actuel." -"List (default) / Grid","Liste (par défaut) / Grille" -"List Only","Liste seule" -"Load Template","Charger le modèle" -"Load default template","Télécharger le formulaire -type par défaut" -"Loading...","Chargement..." -"Local Server","Serveur local" -"Local/Remote Server","Serveur Local/Distant" -"Locale","Paramètres régionaux" -"Log In","Connexion" -"Log Out","Se déconnecter" -"Log in to Admin Panel","Se connecter en administrateur" -"Log in to use %s","Connectez-vous pour utiliser %s" -"Log into Magento Admin Page","Se connecter à la page Administration de Magento" -"Logged in as %s","Connecté en tant que %s" -"Login","Connexion" -"Low Stock","Stock bas" -"MAJOR","majeur" -"MINOR","MINEUR" -"MS Excel XML","MS Excel XML" -"Magento Admin","Administrateur de Magento" -"Magento Commerce - Administrative Panel","Commerce Magento - Membres Administratifs" -"Magento Connect","Magento Connect" -"Magento Connect Manager","Magento Connect Manager" -"Magento Logo","Logo de Magento" -"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento est une marque de Magento Inc. Copyright © %s Magento Inc." -"Magento root directory","Répertoire racine Magento" -"Magento ver. %s","Magento ver. %s" -"Magento™ is a trademark of Magento Inc.
    Copyright © %s Magento Inc.","Magento™ est une marque déposée de Magento Inc.
    Copyright © %s Magento Inc." -"Make sure that data encoding in the file is consistent and saved in one of supported encodings (UTF-8 or ANSI).","Assurez vous que les données d'encodage de ce fichier sont cohérentes et enrigistrées dans un des types d'encodage supportés (UTF-8 ou ANSI)." -"Manage Attribute Sets","Gérer les jeux d'attributs" -"Manage Attributes","Gérer attributs" -"Manage Categories","Gérer les catégories" -"Manage Content","Gérer le contenu" -"Manage Currency Rates","Gérer les taux de devises" -"Manage Currency Symbols","Gérer les symboles de devises" -"Manage Customers","Gérer les utilisateurs" -"Manage Options (values of your attribute)","Gérer les options (valeurs de votre attribut)" -"Manage Ratings","Gérer les Notes" -"Manage Stores","Gérer boutiques" -"Manage Tax Rules","Gérer les règles d'imposition" -"Manage Tax Zones and Rates","Gérer les taxes et les taux par zone" -"Manage Titles (Size, Color, etc.)","Gérer les titres (taille, couleur, etc.)" -"Manual","Manuel" -"Matched Expression","Expression correspondante" -"Maximum sender name length is 255. Please correct your settings.","La longueur maximum du nom de l'envoyeur est 255. Veuillez corriger vos paramètres." -"Mb","Mo" -"Media (.avi, .flv, .swf)","Media (.avi, .flv, .swf)" -"Media storages synchronization has completed!","La synchronisation des média est terminée !" -"Messages Inbox","Boîtes des messages entrants" -"Month","Mois" -"Most Viewed","Les plus vus" -"Most Viewed Products","Produits les plus regardés" -"Multiple Select","Choix multiple" -"My Account","Mon compte" -"My Applications","Mes applications" -"N/A","non applicable" -"NOTICE","notice" -"Name","Nom" -"Name on Card","Nom sur la carte" -"Name on the Card: %s","Nom sur la carte : %s" -"Name:","Nom :" -"Never (production)","Jamais (production)" -"New ","Nouveau" -"New API Key","Nouvelle Clé API" -"New Accounts","Nouveaux comptes" -"New Attribute","Nouvel attribut" -"New Block","Nouveau bloc" -"New Category","Nouvelle catégorie" -"New Class","Nouvelle classe" -"New Condition","Nouvelle Condition" -"New Custom Variable","Nouvelle variable personnalisable" -"New Customer","Nouvel utilisateur" -"New Customers","Nouveaux utilisateurs" -"New Design Change","Changement de nouveau dessin" -"New Email Template","Nouveau formulaire-type de courriel." -"New Group","Nouveau groupe" -"New Invoice","Nouvelle facture" -"New Item Type","Type de nouvel article" -"New Memo","Nouveau mémo" -"New Memo for #%s","Nouveau mémo pour #%s" -"New Page","Nouvelle page" -"New Password","Nouveau mot de passe" -"New Poll","Nouveau Sondage" -"New Profile","Nouveau profil" -"New Rate","Nouveau taux" -"New Rating","Nouvelle note" -"New Review","Nouvel avis" -"New Role","Nouveau rôle" -"New Rule","Nouvelle règle" -"New Search","Nouvelle recherche" -"New Set","Nouvelle configuration" -"New Shipment","Nouvelle livraison" -"New Sitemap","Nouveau plan du site" -"New Store View","Vue nouvelle boutique" -"New System Template","Nouveau modèle de livraison" -"New Tag","Nouveau tag" -"New Template","Nouveau modèle" -"New User","Nouvel utilisateur" -"New Variable","Nouvelle variable" -"New Website","Nouveau site Internet" -"New attribute set mapping","Définition d'un nouveau jeux d'attributs" -"New password field cannot be empty.","Le champ nouveau mot de passe ne peut pas être vide." -"Newsletter","Bulletin d'information" -"Newsletter Problems","Erreurs dans le bulletin d'information" -"Newsletter Queue","Fille d'attente de la newsletter" -"Newsletter Subscribers","Abonnés à la newsletter" -"Newsletter Templates","Modèles de newsletter" -"Next month (hold for menu)","Nouveau mois (maintenez la pression pour revenir au menu)" -"Next year (hold for menu)","Année prochaine (patienter pour le menu)" -"No","Non" -"No (price without tax)","Non (tarifs hors taxes)" -"No Data","Pas de données" -"No Data Found","Pas de données trouvées" -"No Templates Found","Aucun modèle trouvé" -"No change","Pas de modification" -"No customer id defined.","Pas d'identifiant utilisateur défini." -"No information available.","Aucune information disponible." -"No profile loaded...","Aucun profil téléchargé" -"No records found for this period.","Pas d'enregistrement pour cette période." -"No records found.","Aucun enregistrement trouvé." -"No report code specified.","Aucun code de rapport indiqué." -"No search keywords.","Aucun mot clé de recherche." -"No search modules were registered","Aucun module de recherche n'a été enregistré" -"No wishlist item id defined.","Par d'identifiant d'objet liste de souhaits défini." -"None","Aucun" -"Note:","Note :" -"Notes","Notes" -"Notifications","Notifications" -"Number of Orders","Nombre de commandes" -"Number of Uses","Nombre d'utilisations" -"Number of Views","Nombre de vues" -"Number of records:","Nombre d'enregistrements :" -"OAuth Consumers","Consommateurs OAuth" -"OAuth authorization for admin","Autorisation Oauth pour administrateur" -"OAuth authorization simple for admin","Autorisation OAuth simple pour administrateur" -"OK","OK" -"Old rate:","Ancien taux :" -"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Une fois que vous êtes connecté à votre compte PayPal Advanced, rendez-vous dans les Paramètres Service - Pages de paiement hébergées - Menu de configuration, et réglez les options décrites ci-dessous" -"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Une fois connecté à votre compte PayPal Payflow Link, rendez-vous dans le menu Paramètres Service - Pages de paiement hébergées - Configuration et réglez les options décrites ci-dessous" -"One or more media files failed to be synchronized during the media storages syncronization process. Refer to the log file for details.","Un ou plusieurs fichiers n'ont pas pu être synchronisées durant le processus. Référez-vous au fichier log pour plus de détails." -"One or more of the Cache Types are invalidated:","Un ou plusieurs type(s) de cache sont invalidés :" -"Online Customers","Utilisateurs en ligne" -"Only Once (version upgrade)","Une seule fois (mise à niveau de la version)" -"Only attributes with scope ""Global"", input type ""Dropdown"" and Use To Create Configurable Product ""Yes"" are available.","Seuls les attributs concernant ""Global"", entrée de type ""Dropdown"", et utilisés pour créer des produits configurables ""Oui"" sont disponibles<" -"Only mapped fields","Champs mappés uniquement" -"Optional","En supplément" -"Options","Options" -"Options is required","Option requise" -"Order","Commande" -"Order #%s","Commande #%s" -"Order #%s (%s)","Commande N°%s (%s)" -"Order Created Date","Date de création de la commande" -"Order ID","ID de la commande" -"Order Totals","Total commandes" -"Order Updated Date","Date de mise à jour de la commande" -"Order Updated Date report is real-time, does not need statistics refreshing.","La date de mise à jour de la commande est temps réel, il n'y a pas besoin de rafraîchir les statistiques." -"Orders","Commandes" -"Original Magento attribute names in first row:","Nom d'attributs originaaux Magento dans la première ligne :" -"Out of stock","Epuisé" -"PDT (Payment Data Transfer) Only","TDP (Transfer des données de paiement) seulement" -"Package Extensions","Extensions du paquet" -"Pages","Pages" -"Parent Product Thumbnail","Miniature du produit parent" -"Parent Transaction ID","Identifiant de la transaction parente" -"Passive mode","Mode passif" -"Password","Mot de passe" -"Password Confirmation","Confirmation du mot de passe" -"Password confirmation must be same as password.","Le mot de passe de confirmation doit être le même que le mot de passe initial." -"Password must be at least of %d characters.","Le mot de passe doit être d'au moins %d caractères." -"Password must include both numeric and alphabetic characters.","Le mot de passe doit contenir des caractères numériques et alphabétiques." -"Password:","Mot de passe:" -"Path:","Chemin:" -"Payment method instance is not available.","La méthode de paiement n'est pas disponible." -"Payment method is not available.","La méthode de paiement n'est pas disponible." -"Payment method must be specified.","Le mode de paiement doit être précisé." -"Pending Reviews","Avis en attente" -"Pending Tags","Tags en attente" -"Per Item","Par article" -"Per Order","Par commande" -"Percent","pour cent" -"Performed At","Fait à" -"Period","Période" -"Permanent (301)","Permanent (301)" -"Permissions","Autorisations" -"Personal Information","Information personnelle" -"Phone:","Téléphone :" -"Please Select","Veuillez sélectionner" -"Please confirm site switching. All data that hasn\'t been saved will be lost.","Veuillez confirmer le changement de site. Toutes les données qui n'ont pas été sauvegardées seront perdues." -"Please enter 6 or more characters.","Veuillez entrer 6 caractères ou plus." -"Please enter a number greater than 0 in this field.","Veuillez entrer un nombre plus grand que 0 dans ce champ." -"Please enter a valid $ amount. For example $100.00.","Veuillez entrer un montant en $ valide. Par exemple 100 $." -"Please enter a valid URL. For example http://www.example.com or www.example.com","Veuillez entrer un URL valide. Par exemple http://www.exemple.com ou www.exemple.com" -"Please enter a valid URL. http:// is required","Veuillez entrer un URL valide. http:// est requis" -"Please enter a valid credit card number.","Veuillez taper un numéro de carte de crédit valide." -"Please enter a valid date.","Veuillez entrer une date valide." -"Please enter a valid email address. For example johndoe@domain.com.","Veuillez entrer une adresse courriel valide. Par exemple pierremaistre@domaine.com." -"Please enter a valid email.","Veuillez taper une adresse e-mail valide." -"Please enter a valid number in this field.","Veuillez entrer un numéro valide dans ce champ." -"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Veuillez entrer un numéro de téléphone valide. Par exemple (123) 456-7890 ou 123-456-7890." -"Please enter a valid social security number. For example 123-45-6789.","Veuillez entrer un numéro de sécurité sociale valide. Par exemple 123-54-6789." -"Please enter a valid value from list","Veuillez entrer une valeur valide à partir de la liste" -"Please enter a valid value, ex: 10,20,30","Veuillez entrer une valeur valide, ex : 10,20,30" -"Please enter a valid zip code.","Veuillez taper un code postal valide." -"Please enter a valid zip code. For example 90602 or 90602-1234.","Veuillez entrer un code postal valide. Par exemple 90602 ou 90602-1234." -"Please enter another credit card number to complete your purchase.","Veuillez entrer un autre numéro de carte bancaire pour compléter votre commande." -"Please enter password","Veuillez taper votre mot de passe" -"Please enter password to confirm rollback.","Veuillez taper votre mot de passe pour confirmer la restauration." -"Please enter valid password.","Veuillez entrer un mot de passe valide." -"Please make sure that all global admin search modules are installed and activated.","Veuillez vous assurer que tous les modules de recherche globale sont installés et activés." -"Please make sure that your changes were saved before running the profile.","Veuillez vous assurer que vos modifications ont été sauvegardées avant d'exécuter le profil." -"Please make sure your passwords match.","Veuillez vérifier que votre mot de passe fonctionne." -"Please select State/Province.","Veuillez choisir l'état/la province." -"Please select a customer.","Veuillez sélectionner un utilisateur." -"Please select a store.","Veuillez sélectionner une boutique." -"Please select an option.","Veuillez sélectionner une option." -"Please select catalog searches.","Veuillez sélectionner des recherches du catalogue." -"Please select customer(s).","Veuillez sélectionner le(s) client(s)." -"Please select message(s).","Veuillez sélectionner des messages." -"Please select one of the above options.","Veuillez sélectionner l'un des choix ci-dessus." -"Please select one of the options.","Veuillez sélectionner l'une des options." -"Please select review(s).","Veuillez sélectionner les avis." -"Please select tag(s).","Veuillez sélectionner une/des étiquette(s)." -"Please specify backup creation options","Veuillez préciser les options de création de la sauvegarde" -"Please specify the admin custom URL.","Veuillez préciser la nouvelle URL d'aminnistration." -"Please try to logout and sign in again.","Veuillez essayer de vous déconnecter, puis de vous connecter à nouveau." -"Please type the letters from the image:","Veuillez taper les lettres de l'image:" -"Please use in this field only ""a-z,0-9,_"".","Veuillez n'utiliser que ""a-z,0-9,_"". dans ce champ." -"Please use letters only (a-z) in this field.","Veuillez n'utiliser que des lettres (de ""a"" à ""z"") dans ce champ." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Veuillez n'utiliser que des chiffres dans ce champ. Evitez les espaces et autres caractères tels que des points ou des virgules." -"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","Veuillez n'utiliser que des lettres (a-z ou A-Z), chiffres (0-9) ou espaces dans ce champs." -"Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Veuillez n'utiliser que des lettres (de ""a"" à ""z"") ou des chiffres (de ""0"" à ""9"") dans ce champ. Aucun espace ou autre caractère n'est autorisé." -"Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.","Veuillez utiliser seulement des lettres (a-z) ou des chiffres (0-9) ou des espaces et # dans ce champ." -"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Veuillez utiliser ce format de date: dd/mm/yyyy. Par exemple 29/04/1960 pour le 29th of April, 1960." -"Please wait while the indexes are being refreshed.","Veuillez patienter durant l'actualisation des index." -"Please wait, loading...","En cours de chargement, veuillez patienter..." -"Please wait...","Veuillez patienter..." -"Please, add some answers to this poll first.","S'il vous plait, répondez à quelques questions de ce sondage d'abord." -"Please, select ""Visible in Stores"" for this poll first.","Veuillez d'abord sélectionner ""Visible en boutiques"" pour ce sondage." -"Poll Manager","Gestionnaire de Sondage" -"Polls","Sondages d'opinion" -"Popular","Populaire" -"Position","Position" -"Position of Watermark for %s","Position du filigrane pour %s" -"Pregenerated product images files.","Fichiers images produit pré-générées" -"Prev. month (hold for menu)","Mois préc. (maintenez la pression pour revenir au menu)" -"Prev. year (hold for menu)","Année préc. (patienter pour le menu)" -"Preview","Aperçu" -"Preview Template","Prévisualiser le modèle" -"Price","Prix" -"Price alert subscription was saved.","La souscription à l'alerte de prix a été enregistrée." -"Price:","Prix:" -"Processed %s%% %s/%d records","Enregistrements %s%% %s/%d traités" -"Product","Produit" -"Product Name","Nom du produit" -"Product Reviews","Avis sur le produit" -"Product Tax Classes","Classes des produits pour les taxes" -"Product Thumbnail Itself","Cliqué réduit du produit lui-même" -"Product is not loaded.","Le produit n'est pas chargé." -"Product:","Produit:" -"Products","Produits" -"Products Bestsellers Report","Rapport des meilleures ventes" -"Products Most Viewed Report","Rapport concernant les produits les plus vus" -"Products Ordered","Produits commandés" -"Products in Carts","Produits dans le panier." -"Profile Action","Action de profil" -"Profile Actions XML","Actions XML du profil" -"Profile Direction","Direction du produit" -"Profile History","Historique du profil" -"Profile Information","Information sur le profil" -"Profile Name","Nom du profil" -"Profile Payments","Paiements du profil" -"Profile Schedule","Calendrier du profil" -"Profile Wizard","Assistant du profil" -"Profiles","Profils" -"Promo","Promo" -"Promotions","Promotions" -"Purchased Item","Article acheté" -"Put store on the maintenance mode while backup creation","Mettre le magasin en mode de maintenance pendant la création de la sauvegarde" -"Put store on the maintenance mode while rollback processing","Placer le magasin en mode maitenance pendant que la restauration s'effectue." -"Quantity","Quantité" -"Queue Refresh","Rafraîchissement de la liste d'attente" -"Queued... Cancel","En liste d'attente ... Annuler." -"REST Roles","Rôles REST" -"Radio Buttons","Boutons radios" -"Rates","Taux" -"Read details","Lire détails" -"Rebuild","Reconstruire" -"Rebuild Catalog Index","Reconstruire l'index du catalogue" -"Rebuild Flat Catalog Category","Reconstruire les catégories du catalogue" -"Rebuild Flat Catalog Product","Reconstruire les produits du catalogue" -"Recent Orders","Commandes récentes" -"Recent statistics have been updated.","Les statistiques récentes on été sauvegardées." -"Recurring Profile View","Consultations multiples de ce profil." -"Recursive Dir","Répertoire récursif" -"Redirect","Rediriger" -"Reference","Référence" -"Reference ID","Identifiant Référence" -"Refresh","Rafraîchir" -"Refresh Now*","Actualiser maintenant*" -"Refresh Statistics","Rafraîchir les statistiques" -"Region/State","Région/État" -"Regular Price:","Prix habituel:" -"Reject","Rejeter" -"Reject token authorization Pop Up for admin","Rejet de la fenêtre Pop Up du jeton d'autorisation pour l'administrateur" -"Reject token authorization for admin","Rejeter le jeton d'authentification pour l'administrateur" -"Rejection Of Authorization","Rejet de l'autorisation" -"Release","Sortie" -"Release Stability","Sortir stable" -"Release Version","Version récente" -"Reload captcha","Téléarger à nouveau Captcha" -"Remote FTP","FTP à distance" -"Remove","Supprimer" -"Reports","Rapports" -"Request Path","Chemin demandé" -"Required","Requis" -"Reset","Réinitialiser" -"Reset Filter","Mettre à zéro le filtre" -"Reset Password","Réinitialiser le mot de passe" -"Reset a Password","Réinitialiser un mot de passe" -"Resize","Redimensionner" -"Resource Access","Accès aux ressources" -"Resources","Ressources" -"Results","Résultats" -"Retrieve Password","Récupérer votre mot de passe" -"Return Html Version","Retourner à la version HTML" -"Revenue","Revenu" -"Reviews","Commentaires" -"Reviews and Ratings","Avis et évaluations" -"Rewrite Rules","Réécrire les règles" -"Role ID","Identité du rôle" -"Role Info","Infos sur le rôle" -"Role Information","Informations du rôle" -"Role Name","Nom du rôle" -"Role Resources","Ressources du rôle" -"Role Users","Utilisateurs rôles" -"Roles","Rôles" -"Roles Resources","Ressources du rôle" -"Root Category","Root Category" -"Rotate CCW","Tourner CCW" -"Rotate CW","Tourner CW" -"Run","Exécuter" -"Run Profile","Exécuter profil" -"Run Profile Inside This Window","Exécuter le profil dans cette fenêtre" -"Run Profile in Popup","Exécuter le profil dans une pop-up" -"Running... Kill","En cours d'exécution... Arrêter" -"SKU","UGS" -"SKU:","UGS:" -"SSL Error: Invalid or self-signed certificate","Erreur SSL : certificat invalide" -"Sales","Ventes" -"Sales Report","Rapport de ventes" -"Samples","Échantillons" -"Save","Enregistrer" -"Save & Generate","Sauvegarder et générer" -"Save Account","Sauvegarder le compte" -"Save Cache Settings","Sauvegarder les options du cache" -"Save Config","Sauvegarder la configuration" -"Save Currency Rates","Sauvegarder les taux de conversion des monnaies" -"Save Profile","Sauvegarder le profil" -"Save Role","Sauvegarder le rôle" -"Save Template","Sauvegarder le formulaire-type" -"Save User","Sauvegarder l'utilisateur" -"Save and Continue Edit","Sauvegarder et continuer l'édition" -"Search","Rechercher" -"Search Index","Rechercher l'index" -"Search Term","Terme de recherche" -"Search Terms","Rechercher les conditions" -"Select","Sélectionner" -"Select All","Sélectionner tout" -"Select Category","Sélectionner catégorie" -"Select Date","Sélectionner la date" -"Select Range","Sélectionner la portée" -"Select date","Sélectionner date" -"Selected allowed currency ""%s"" is not available in installed currencies.","La monnaie autorisée sélectionnée ""%s"" n'est pas disponible dans les monnaies installées." -"Selected base currency is not available in installed currencies.","La devise de base sélectionnée n'est pas disponible parmi les devises inscrites dans le système." -"Selected default display currency is not available in allowed currencies.","La monnaie d'affichage par défaut sélectionnée n'est pas disponible dans les monnaies installées." -"Selected default display currency is not available in installed currencies.","L'affichage dans la devise choisie par défaut n'est pas disponible parmi les devises inscrites dans le système." -"Self-assigned roles cannot be deleted.","Les rôles attribués par soi-même ne peuvent être effacés." -"Sender","Expéditeur" -"Separate Email","Email séparée" -"Shipment #%s comment added","Commentaire ajouté sur l'expédition #%s" -"Shipment #%s created","Expédition #%s crée" -"Shipment Comments","Commentaires sur l'expédition" -"Shipment History","Historique de l'expédition" -"Shipments","Expéditions" -"Shipping","Expédition" -"Shipping Address","Adresse d'expédition" -"Shipping Address: ","Adresse d'expédition:" -"Shipping Origin","Origine de l'expédition" -"Shipping Price","Frais de port:" -"Shipping address selection is not applicable","L'adresse d'expédition sélectionnée n'est pas disponible" -"Shipping method must be specified.","Le mode d'expédition doit être précisé." -"Shipping method selection is not applicable","Le mode d'expédition choisi est impossible dans ce cas." -"Shopping Cart","Panier" -"Shopping Cart Price Rules","Règles s'appliquant aux paniers" -"Shopping Cart from %s","Panier de %s" -"Show By","Montrer par" -"Show Report For:","Afficher le rapport pour :" -"Show Reviews","Montrer les avis" -"Sitemap Information","Plan du site" -"Size for %s","Taille de %s" -"Skip Category Selection","Passer la sélection de catégorie" -"Some items in this order have different invoice and shipment types. You can create shipment only after the invoice is created.","Certains éléments dans cette commande ont des types de facture et d'expédition différents. Vous pouvez créer l'expédition seulement après avoir créé la facture." -"Some of the ordered items do not exist in the catalog anymore and will be removed if you try to edit the order.","Certains des articles commandés n'existent plus dans le catalogue et seront supprimés si vous voulez bien modifier la commande." -"Sorry, this feature is coming soon...","Désolé, cette fonction arrive bientôt..." -"Special Price:","Prix spécial:" -"Specific Countries","Pays spécifiques" -"Specified","Spécifié" -"Specified profile does not exist.","Le profil indiqué n'existe pas." -"Spreadsheet Name:","Nom du la feuille de calcul" -"Start Date","Date de début" -"Starting profile execution, please wait...","Démarrage de l'exécution de profil, veuillez patienter..." -"State/Province:","État/Région" -"Static Blocks","Blocs statiques" -"Status","Statut" -"Status:","Statut" -"Stock Quantity:","Quantité en stock :" -"Stock notification was saved.","La notification du stock a été sauvegardée." -"Store","Magasin" -"Store Email Addresses Section","Rubrique contenant les adresses e-mail des magasins" -"Store View","Vue du magasin" -"Store:","Magasin:" -"Stores","Boutiques" -"Subject","Sujet" -"Submit","Soumettre" -"Subpackage cannot be conflicting.","Le subpackage ne peut pas être contradictoire." -"Subtotal","Sous-total" -"Switch/Solo card issue number: %s","Numéro d'émission carte Switch/Solo : %s" -"Switch/Solo card start Date: %s/%s","Date d'émission carte Switch/Solo : %s/%s" -"Switch/Solo/Maestro Only","Switch/Solo/Maestro seulement" -"Switch/Solo/Maestro(UK Domestic) Only","Switch/Solo/Maestro(National RU) uniquement" -"Switch/Solo/Maestro(UK Domestic) card issue number: %s","Switch/Solo/Maestro(National RU) numéro de livraison de carte : %s" -"Switch/Solo/Maestro(UK Domestic) card start Date: %s/%s","Switch/Solo/Maestro(National RU) date d'effet de la carte : %s%s" -"Symbol","Symbole" -"Synchronization is required.","La synchronisation est nécessaire." -"Synchronization of media storages has been successfully completed.","La synchronisation du staockage médias a été effectuée avec succès." -"Synchronize","Synchroniser" -"Synchronizing %s to %s","Synchronisation de %s et %s" -"Synchronizing...","Synchronisation en cours...." -"System","Système" -"System Section","Section système" -"System busy","Le système est occupé" -"Tags","Étiquettes" -"Target Path","Chemin cible" -"Tax","Taxe" -"Tb","Tb" -"Template","Modèle visuel" -"Template Content","Contenu du modèle" -"Template Information","Formulaire-type d'information" -"Template Name","Nom du template" -"Template Styles","Styles de modèle" -"Template Subject","Sujet du modèle" -"Template Type","Type de modèle" -"Temporary (302)","Temporaire (302)" -"Terms and Conditions","Termes et conditions" -"Text","Texte" -"The Catalog Rewrites were refreshed.","Les réécritures du catalogue ont été actualisées." -"The CatalogInventory Stock Status has been rebuilt.","Le statut du stock de l'inventaire-catalogue a été repensé." -"The Comment Text field cannot be empty.","Le champ de commentaire doit être rempli." -"The Flat Catalog Product was rebuilt","Le produit fixe du catalogue a été reconstruit." -"The JavaScript/CSS cache has been cleaned.","Le cache JavaScript/CSS a été effacé." -"The JavaScript/CSS cache has been cleared.","Le cache JavaScript/CSS a été enlevé." -"The Layered Navigation indexing has been queued.","L'index de la navigation par niveaux a été mis en queue." -"The Layered Navigation indexing queue has been canceled.","La mise en queue de l'index de la navigation par niveaux a été annulée." -"The Layered Navigation indices were refreshed.","Les index sous-jacents de la navigation ont été rafraîchis." -"The Layered Navigation process has been queued to be killed.","La réalisation de la navigation par niveaux a été mise en queue pour être annulée." -"The Magento cache storage has been flushed.","Le stockage du cache Magento a été purgé." -"The URL Rewrite has been deleted.","La réécriture d'URL a été supprimée." -"The URL Rewrite has been saved.","La réécriture d'URL a été enregistrée." -"The account has been saved.","Le compte a été enregistré." -"The archive can be uncompressed with %s on Windows systems","Les archives peuvent être décompressées par le biais de %s sur les système Windows" -"The attribute set has been removed.","L'ensemble d'attributs a été supprimé." -"The backup's creation process will take time.","La création de la sauvegarde va prendre du temps." -"The billing agreement has been canceled.","L'accord de facturation a été annulé." -"The billing agreement has been deleted.","L'accord de facturation a été supprimé." -"The cache storage has been flushed.","Le stockage du cache a été vidé." -"The carrier needs to be specified.","Le transporteur doit être spécifié." -"The catalog index has been rebuilt.","L'index du catalogue a été reconstruit." -"The catalog rewrites have been refreshed.","Les réécritures du catalogue ont été réactualisées." -"The configuration has been saved.","La configuration a été enregistrée." -"The credit memo has been canceled.","L'avoir a été annulé." -"The credit memo has been created.","L'avoir a été créé." -"The credit memo has been voided.","Le mémo de crédit a été vidé." -"The custom variable has been deleted.","La variable courante a été supprimée." -"The custom variable has been saved.","La variable personnelle a été sauvegardée." -"The customer has been deleted.","Le client a été supprimé." -"The customer has been saved.","Le client a été sauvegardé." -"The design change has been deleted.","Le changement de forme a été supprimé." -"The design change has been saved.","Le changement de forme a été enregistré." -"The email address is empty.","L'adresse email est vide." -"The email template has been deleted.","Le formulaire-type du courriel a été effacé." -"The email template has been saved.","Le modèle d'email a été enregistré." -"The flat catalog category has been rebuilt.","La catégorie du catalogue neutre a été réparée." -"The group node name must be specified with field node name.","Le nom du noeud du groupe doit être défini dans le champ nom du noeud." -"The image cache was cleaned.","L'image cache a été nettoyée." -"The image cache was cleared.","L'image cache a été vidée." -"The invoice and shipment have been created.","La facture et l'envoi ont été créés." -"The invoice and the shipment have been created. The shipping label cannot be created at the moment.","La facture et l'expédition ont été créés. Le label d'expédition ne peut pas être créé à ce moment." -"The invoice has been canceled.","La facture a été annulée." -"The invoice has been captured.","La facture a été capturée." -"The invoice has been created.","La facture a été créée." -"The invoice has been voided.","La facture a été annulée." -"The invoice no longer exists.","La facture n'existe plus." -"The item %s (SKU %s) does not exist in the catalog anymore.","L'objet %s (SKU %s) n'existe plus dans la catalogue." -"The order does not allow creating an invoice.","La commande n'autorise pas la création de facture." -"The order no longer exists.","La commande a disparu." -"The poll has been deleted.","Le sondage a été supprimé." -"The poll has been saved.","Le sondage d'opinion a été sauvegardé." -"The profile has been deleted.","Le profil a été supprimé." -"The profile has been saved.","Le profil a été sauvegardé." -"The profile has been updated.","Le profil a été mis à jour." -"The profile has no changes.","Le profil ne comporte aucune modification." -"The profile you are trying to save no longer exists","Le profil que vous essayez d'enregistrer n'existe plus" -"The rating has been deleted.","L'évaluation a été effacée." -"The rating has been saved.","L'évaluation a été enregistrée." -"The role has been deleted.","Le modèle a été supprimé." -"The role has been saved.","Le modèle a été enregistré." -"The role has been successfully saved.","Le modèle a été enregistré avec succès." -"The search index has been rebuilt.","L'index de recherche a été refait." -"The shipment has been created.","L'envoi a été créé." -"The shipment has been sent.","La commande a été expédiée." -"The shipping label has been created.","L'étiquette d'expédition a été créée." -"The tag has been deleted.","L'étiquette a été supprimée" -"The tag has been saved.","L'étiquette a été sauvegardée." -"The transaction details have been updated.","Les détails de la transaction ont été mis a jour." -"The user has been deleted.","L'utilisateur a été supprimé." -"The user has been saved.","L'utilisateur a été sauvegardé." -"Themes JavaScript and CSS files combined to one file.","Themes JavaScript et fichiers CSS combinés en un fichier." -"There is an error in one of the option rows.","Il y a un erreur dans les rangées des choix." -"This Account is","Le compte est" -"This Email template no longer exists.","Ce modèle d'email n'existe plus." -"This Role no longer exists","Ce rôle n'existe plus." -"This Role no longer exists.","Ce rôle n'existe plus." -"This account is","Ce compte est" -"This account is inactive.","Ce compte est inactif." -"This action cannot be undone.","Cette action ne peut être annulée." -"This attribute set does not have attributes which we can use for configurable product","Ce jeu d'attributs n'a pas d'attributs que nous pouvons utiliser pour un produit paramétrable" -"This attribute shares the same value in all the stores","Cet attribut a la même valeur dans tous les magasins" -"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Il ne s'agit que d'un magasin de démonstration. Toute commande passée par l'intermédiaire de ce magasin ne sera pas honorée ou satisfaite." -"This is a required field.","Ceci est un champ requis." -"This product is currently disabled.","Ce produit est pour l'instant désactivé." -"This report depends on timezone configuration. Once timezone is changed, the lifetime statistics need to be refreshed.","Ce rapport dépend de la configuration du fuseau horaire. Une fois le fuseau horaire modifié, les statistiques de durée de vie nécessiteront une réactualisation." -"This section is not allowed.","Cette rubrique est interdite." -"This user no longer exists.","Cet utilisateur n'existe plus." -"Time","Heure" -"Time selection:","Sélection de l'heure:" -"Time:","Heure:" -"Timeout limit for response from synchronize process was reached.","La limite de délai d'attente pour la réponse du processus de synchronisation a été atteinte." -"To","A" -"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","Pour annuler les autorisations en attente et libérer les montants qui ont déjà été traités au cours de ce paiement, cliquez sur Annuler." -"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","Pour utiliser le système PayPal Payflow Link, il vous faut configurer votre compte PayPal Payflow Link sur le site de PayPal." -"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","Pour utiliser le système PayPal Payments Advanced, il vous faut configurer votre compte PayPal Payments Advanced sur le site de PayPal." -"Toggle Editor","Editeur de bouton" -"Tools","Outils" -"Top 5 Search Terms","5 termes les plus recherchés" -"Total","Total" -"Total Invoiced","Total facturé" -"Total Order Amount","Somme totale de la commande" -"Total Refunded","Total remboursé" -"Total of %d record(s) have been deleted.","Un total de %d entrée(s) ont été supprimées." -"Total of %d record(s) have been updated.","Un total de %d article(s) a/ont été mis à jour." -"Total of %d record(s) were canceled.","Au total, %d enregistrement(s) ont été annulés." -"Total of %d record(s) were deleted","Un total de %d enregistrements ont été supprimés." -"Total of %d record(s) were deleted.","Un total de %d enregistrements ont été supprimés." -"Total of %d record(s) were updated","Un total de %d enregistrements ont été mis à jour." -"Total of %d record(s) were updated.","Un total de %d enregistrements ont été mis à jour." -"Track Order","Suivre la commande" -"Track this shipment","Suivre cette expédition" -"Tracking number %s for %s assigned","Numéro de suivi %s attribué %s pour" -"Tracking number cannot be empty.","Le numéro de suivi ne peut pas être vide." -"Transaction Data","Données de transaction" -"Transaction Details","Détails de la transaction" -"Transaction ID","ID de la transaction" -"Transaction Type","Type de transaction" -"Transactional Emails","Emails de transaction" -"Transactions","Transactions" -"Try Magento Go for Free","Essayer Magento gratuitement" -"Type","Type" -"Type:","Type:" -"URL Rewrite","Réécriture URL" -"URL Rewrite Information","Informations de réécriture d'URL" -"URL Rewrite Management","Gestion de la réécriture URL" -"Unable to cancel the credit memo.","Impossible d'annuler l'avoir." -"Unable to find a Email Template to delete.","Impossible de trouver un modèle d'email à supprimer." -"Unable to find a poll to delete.","Impossible de trouver un sondage à supprimer." -"Unable to find a tag to delete.","Impossible de trouver une étiquette à supprimer." -"Unable to find a user to delete.","Impossible de trouver un utilisateur à effacer." -"Unable to initialize import model","Impossible d'initialiser le modèle importé" -"Unable to refresh lifetime statistics.","Impossible de réactualiser les statistiques de durée de vie" -"Unable to refresh recent statistics.","Impossible de réactualiser les statistiques récentes." -"Unable to save Cron expression","Impossible de sauvegarder l'expression Cron" -"Unable to save the cron expression.","Impossible de sauvegarder l'expression cron." -"Unable to save the invoice.","Impossible d'enregistrer la facture." -"Unable to send the invoice email.","Impossible d'envoyer la facture électronique." -"Unable to send the shipment email.","Impossible d'envoyer le courriel d'expédition." -"Unable to update transaction details.","Impossible de mettre à jour les détails de transactions." -"Unable to void the credit memo.","Impossible d'annuler l'avoir." -"Unknown","Inconnu" -"Unlimited","Illimité" -"Update","Mettre à jour" -"Updated At","Mis à jour à" -"Upload File","Télécharger le fichier" -"Upload Files","Envoyer des fichiers" -"Upload HTTP Error","Télécharger l'erreur HTTP" -"Upload I/O Error","Erreur d'envoi E/S (Entrée/Sortie)" -"Upload Security Error","Télécharger l'erreur de sécurité" -"Upload import file","Envoyer un fichier d'importation" -"Uploaded file is larger than %.2f kilobytes allowed by server","Le fichier téléchargé est plus volumineux que les %.2f kilobytes autorisés par le serveur" -"Use All Available Attributes","Utiliser tous les attributs disponibles" -"Use Config Settings","Utiliser les Paramètres de Configuration" -"Use Default","Utiliser par défaut." -"Use Default Value","Utiliser la Valeur par Défaut" -"Use Default Variable Values","Utiliser les valeurs variables par défaut" -"Use FTP Connection","Utilisez la connexion FTP" -"Use Website","Utiliser le site web" -"Used Currently For","Actuellement utilisé pour" -"Used as Default For","Utilisé par défaut pour" -"User Email","Adresse E-mail de l'utilisateur" -"User ID","ID utilisateur" -"User Info","Info sur l'utilisateur" -"User Information","Informations sur les utilisateurs" -"User Name","Nom d'utilisateur" -"User Name is required field.","Le nom d'utilisateur est requis" -"User Name:","Nom d'utilisateur :" -"User Password","Mot de passe utilisateur" -"User Role","Modèle d'utilisateur" -"User Roles","Modèles d'utilisateur" -"User Roles Information","Information sur les modèles utilisateur" -"User Type Resources","Ressources types d'utilisateur" -"User name","Nom d'utilisateur" -"Users","Utilisateurs" -"VAT Number is Invalid","Le numéro de TVA est invalide" -"VAT Number is Valid","Le numéro de TVA est valide" -"Validation Results","Résultats validation" -"Value","Valeur" -"Value Delimiter:","Délimiteur de valeur :" -"Variable","Variable" -"Variable Code","Code variable" -"Variable HTML Value","Valeur HTML variable" -"Variable ID","Identité changeante" -"Variable Name","Nom de la variable" -"Variable Plain Value","Valeur simple de la variable" -"Verifier code: %s","Vérifier code : %s" -"View Actions XML","Voir les actions XML" -"View Full Size","Voir en taille réelle" -"View Memo","Voir la note" -"View Memo for #%s","Voir le mémo #%s" -"View Shipment","Voir l'envoi" -"View Statistics For:","Voir les statistiques pour:" -"Visibility:","Visibilité :" -"Warning","Avertissement" -"Warning! Empty value can cause problems with CSV format.","Attention! Une valeur vide peut causer des problèmes avec le format CSV." -"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Attention!\r\n Cette action défera cet utilisateur de son rôle déjà assigné\r\nEtes-vous sûr ?" -"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Attention!\r\n Cette action supprimera les rôles ont déjà été attribués aux utilisateurs concernés\r\nÊtes-vous certain(e) de vouloir continuer?" -"Warning: Please do not close the window during importing/exporting data","Attention: Veuillez ne pas fermer la fenêtre pendant l'importation ou l'exportation de données" -"Watermark File for %s","Fichier Filigrane pour %s" -"We appreciate our merchants\' feedback, please take our survey to provide insight on the features you would like included in Magento. Remove this notification","Nous apprécions les remarques de nos revendeurs\', ainsi veuillez avoir l'obligeance de remplir notre enquête afin de nous faire connaître les améliorations que vous souhaiteriez voir apportées à Magento.Supprimer ce message" -"We\'re in our typing table, coding away more features for Magento. Thank you for your patience.","Nous sommes devant notre bureau, programmant de nouvelles fonctions pour Magento. Merci pour votre patience." -"Web Section","Section Web" -"Web Services","Services Web" -"Web services","Services web" -"Website","Site" -"What is this?","Qu'est-ce que c'est ?" -"Wishlist Report","Rapport de liste cadeaux" -"Wishlist item is not loaded.","L'article désiré n'a pas été chargé." -"Wrong account specified.","Le compte indiqué est erroné." -"Wrong billing agreement ID specified.","Le numéro indiqué de la facturation acceptée est erroné." -"Wrong column format.","Mauvais format de colonne." -"Wrong newsletter template.","Mauvais modèle de lettre de diffusion" -"Wrong quote item.","Mauvais objet" -"Wrong tab configuration.","L'onglet de configuration est erroné." -"Wrong tag was specified.","Une mauvaise étiquette a été définie." -"Wrong transaction ID specified.","Mauvais identifiant transaction défini." -"XML","XML" -"XML data is invalid.","Données XML invalides" -"XML object is not instance of ""Varien_Simplexml_Element"".","L'objet XML n'est pas une instance de ""Varien_Simplexml_Element""" -"YTD","Année en cours" -"Year","Année" -"Yes","Oui" -"Yes (301 Moved Permanently)","Oui (301 déplacé de façon permanente)" -"Yes (302 Found)","Oui (302 trouvé)" -"Yes (only price with tax)","Oui (tarifs TTC uniquement)" -"You cannot delete your own account.","Vous ne pouvez pas effacer votre propre compte." -"You have %s unread message(s).","Vous avez %s message(s) non lu(s)." -"You have %s unread message(s). Go to messages inbox.","Vous avez %s messages non lus. Aller à la boite de réception." -"You have %s, %s and %s unread messages. Go to messages inbox.","Vous avez %s, %s et %s messages non lus. Aller à la boite de réception." -"You have logged out.","Vous vous êtes déconnecté(e)." -"You have not enough permissions to use this functionality.","Vous n'avez pas les permissions suffisantes pour utiliser cette fonctionnalité." -"You must have JavaScript enabled in your browser to utilize the functionality of this website.","Vous devez avoir activé le JavaScript dans votre navigateur pour utiliser les fonctionnalités de ce site web." -"You need to specify order items.","Vous devez spécifier les articles de la commande." -"You will need to wait when the action ends.","Vous devrez attendre jusqu'à la fin de l'action." -"Your answers contain duplicates.","Vous avez des réponses en double." -"Your password has been updated.","Votre mot de passe a été mis à jour." -"Your password reset link has expired.","Votre lien de réinitialisation de mot de passe a expiré." -"Your server PHP settings allow you to upload files not more than %s at a time. Please modify post_max_size (currently is %s) and upload_max_filesize (currently is %s) values in php.ini if you want to upload larger files.","Les paramètres de votre serveur PHP ne vous permettent pas de télécharger plus de %s fichiers à la fois sur le serveur. Modifiez les valeurs post_max_size (actuellement %s) et upload_max_filesize (actuellement %s) dans php.ini si vous voulez télécharger des fichiers plus volumineux sur le serveur." -"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Votre serveur web n'est pas configuré correctement. Par conséquent, les fichiers de configuration contenant des informations sensibles sont accessibles de l'extérieur. Veuillez contacter votre hébergeur." -"Zip/Postal Code","Code postal" -"Zip/Postal Code:","Code postal:" -"[ deleted ]","[ supprimé ]" -"[GLOBAL]","[GLOBAL]" -"[STORE VIEW]","[ VUE BOUTIQUE ]" -"[WEBSITE]","[SITE WEB]" -"b","o" -"close","fermer" -"critical","critique" -"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","exemple: ""sitemap/"" ou ""/"" pour le répertoire de base (doit être accessible en écriture)" -"example: sitemap.xml","Exemple: sitemap.xml" -"failed","échoué" -"from","de" -"major","majeur" -"minor","mineur" -"notice","notice" -"store(%s) scope","périmètre boutique (%s)" -"successful","réussi" -"to","à" -"website(%s) scope","périmètre site internet (%s)" -"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento configuration.","{{base_url}} n'est pas recommandé pour déclarer Base Unsecure URL / Base Secure URL dans un environnement de production. Il est fortement recommandé de changer cette valeur dans votre configuration de Magento." diff --git a/app/locale/fr_FR/Mage_AmazonPayments.csv b/app/locale/fr_FR/Mage_AmazonPayments.csv deleted file mode 100644 index 9a5dcf2a3..000000000 --- a/app/locale/fr_FR/Mage_AmazonPayments.csv +++ /dev/null @@ -1,101 +0,0 @@ -" Select Shipping Method","Sélectionner la méthode d'expédition" -"
    Trace confirmation request:
    %s","
    Requête de suivi de confirmation :
    %s" -"Access Key","Clé d'accès" -"Access Key ID","Identifiant de la clé d'accès" -"Amazon Simple Pay","Amazon Simple Pay" -"Amazon Simple Pay notification error","Erreur de notification Amazon Simple Pay" -"Amazon Simple Pay service capture confirmation error: confirmation request amount is not equal to the amount of order.","Erreur de confirmation de saisie du service Amazon Simple Pay : le montant de la demande de confirmation n'est pas égal au montant de la commande." -"Amazon Simple Pay service capture confirmation error: the amount in the existing invoice does not match the amount in the confirmation request.","Erreur de confirmation de saisie du service Amazon Simple Pay : le montant de la commande existante ne correspond pas au montant de la demande de confirmation." -"Amazon Simple Pay service capture confirmation error: the existing transaction ID does not match the transaction ID in the confirmation request.","Erreur de confirmation de saisie du service Amazon Simple Pay : l'identifiant de transaction existant ne correspond pas à l'identifiant de transaction de la requête de confirmation." -"Amazon Simple Pay service capture confirmation. The invoice was captured automatically.","Confirmation de saisie du service Amazon Simple Pay. La facture a été saisie automatiquement." -"Amazon Simple Pay service confirmation error: order states sequence violation.","Erreur de confirmation du service Amazon Simple Pay : violation de la séquence des états de commande." -"Amazon Simple Pay service confirmation error: the order currency does not match the currency of the IPN request.","Erreur de confirmation du service Amazon Simple Pay : la devise de la commande ne correspond pas à la devise de la requête IPN." -"Amazon Simple Pay service confirmation error: the order specified in the IPN request cannot be found.","Erreur de confirmation du service Amazon Simple Pay : la commande indiquée dans la requête IPN est introuvable." -"Amazon Simple Pay service confirmation error: the payment method in the order is not Amazon Simple Pay.","Erreur de confirmation du service Amazon Simple Pay : la méthode de paiement de la commande n'est pas Amazon Simple Pay." -"Amazon Simple Pay service confirmed capture for invoice %s.","Le service Amazon Simple Pay a confirmé la saisie pour la facture %s." -"Amazon Simple Pay service confirmed refund for credit memo %s.","Le service Amazon Simple Pay a confirmé le remboursement pour la note de crédit %s." -"Amazon Simple Pay service has confirmed amount authorization.","Le service Amazon Simple Pay a confirmé l'autorisation du montant." -"Amazon Simple Pay service has confirmed cancelation.","Le service Amazon Simple Pay a confirmé l'annulation." -"Amazon Simple Pay service has confirmed capture for invoice %s. The invoice was automatically captured.","Le service Amazon Simple Pay a confirmé la saisie pour la facture %s. La facture a été saisie automatiquement." -"Amazon Simple Pay service has confirmed capture initiation.","Le service Amazon Simple Pay a confirmé le lancement de la saisie." -"Amazon Simple Pay service has confirmed capture.","Le service Amazon Simple Pay a confirmé la saisie." -"Amazon Simple Pay service has confirmed payment capture. Invoice %s was automatically created after confirmation.","Le service Amazon Simple Pay a confirmé la saisie du paiement. La facture %s a été créée automatiquement après la confirmation." -"Amazon Simple Pay service has confirmed payment capture. Invoice was created automatically.","Le service Amazon Simple Pay a confirmé la saisie du paiement. La facture a été créée automatiquement." -"Amazon Simple Pay service has confirmed payment refund. Credit memo %s was automatically created after confirmation.","Le service Amazon Simple Pay a confirmé le remboursement du paiement. La note de crédit %s a été créée automatiquement après la confirmation." -"Amazon Simple Pay service has confirmed payment refund. Credit memo was created automatically.","Le service Amazon Simple Pay a confirmé le remboursement du paiement. La note de crédit a été créée automatiquement." -"Amazon Simple Pay service has confirmed payment refund. The credit memo was created automatically.","Le service Amazon Simple Pay a confirmé le remboursement du paiement. La note de crédit a été créée automatiquement." -"Amazon Simple Pay service has confirmed refund.","Le service Amazon Simple Pay a confirmé le remboursement." -"Amazon Simple Pay service has confirmed refund. The credit memo was processed automatically.","Le service Amazon Simple Pay a confirmé le remboursement. La note de crédit a été traitée automatiquement." -"Amazon Simple Pay service has confirmed refunded credit memo %s. The credit memo was processed automatically.","Le service Amazon Simple Pay a confirmé le remboursement de la note de crédit %s. La note de crédit a été traitée automatiquement." -"Amazon Simple Pay service is not available. Payment was not processed.","Le service Amazon Simple Pay n'est pas disponible. Le paiement n'a pas été effectué." -"Amazon Simple Pay service payment confirmation has failed.","La confirmation de paiement du service Amazon Simple Pay a échoué." -"Amazon Simple Pay service refund confirmation error: the amount in the existing creditmemo does not match the amount in the confirmation request.","Erreur de confirmation de remboursement du service Amazon Simple Pay : le montant de la note de crédit existante ne correspond pas au montant de la demande de confirmation." -"Amazon Simple Pay service refund confirmation error: the confirmation request amount does not match the order amount.","Erreur de confirmation de remboursement du service Amazon Simple Pay : le montant de la demande de confirmation ne correspond pas au montant de la commande." -"Amazon Simple Pay service refund confirmation error: the transaction ID in the existing creditmemo does not match the transaction ID in the confirmation request.","Erreur de confirmation de remboursement du service Amazon Simple Pay : l'identifiant de transaction de la note de crédit existante ne correspond pas à l'identifiant de transaction de la demande de confirmation." -"Authorize Only","Autoriser uniquement" -"Authorize and Capture","Autoriser et enregistrer" -"Cancel Description","Annuler la description" -"Cancel Order Notification received from Checkout by Amazon service.","Notification d'annulation de commande reçue du service Checkout by Amazon." -"Checkout by Amazon","Checkout by Amazon" -"Continue Shopping","Continuer les achats" -"Customer was redirected to Amazon Simple Pay site","Le client a été redirigé vers le site Amazon Simple Pay." -"Debug","Déboguer" -"Debug Log","Compte-rendu de débogage" -"Email Sender","Envoyez courriel à l'expéditeur" -"Enable","Activer" -"Error Log","Compte-rendu d'erreur" -"FPS Sandbox Service URI","URI service sandbox FPS" -"FPS Service URI","URI service FPS" -"Immediate Return","Retour immédiat" -"Invalid action code.","Code d'action non valide." -"Invalid request.","Demande non valide." -"Invoice was created with Checkout by Amazon.","La facture a été créée avec Checkout by Amazon." -"Merchant ID","ID commerçant" -"Merchant Login","Connexion marchand" -"Merchant Name","Nom du marchand" -"Merchant Password","Mot de passe marchand" -"Merchant Token","Jeton marchand" -"Method Choice Checkout Message","Choix de méthode du message de règlement" -"New Order Notification received from Checkout by Amazon service.","Nouvelle notification de commande reçue du service Checkout by Amazon." -"New Order Status","Nouveau statut commande" -"Notification Error Transactional Email","E-mail transactionnel d'erreur de notification" -"Order Ready To Ship Notification received form Checkout by Amazon service.","Notification de commande prête à être expédiée reçue du service Checkout by Amazon." -"Order was canceled with Checkout by Amazon.","La commande a été annulée avec Checkout by Amazon." -"Payment Action","Action de paiement" -"Payment Description","Description du paiement" -"Payment Sandbox Service URI","URI service sandbox pour le paiement" -"Payment Service URI","URI service de paiement" -"Payment authorization canceled with Amazon Simple Pay service.","Autorisation de paiement annulée avec le service Amazon Simple Pay." -"Pending Amazon Simple Pay","En attente d'Amazon Simple Pay" -"Redirect Message","Message de redirection" -"Refund Description","Description du remboursement" -"Refund was created with Checkout by Amazon.","Le remboursement a été créé avec Checkout by Amazon." -"Report Email","Signaler un e-mail" -"Report Error to Email","Signaler une erreur dans un e-mail" -"Response body is not a valid FPS response.","Le corps de la réponse ne constitue pas une réponse FPS valide." -"SUCCESS","RÉUSSITE" -"Sandbox","Protection" -"Secret Key","Clé secrète" -"Secret Key ID","Identifiant de clé secrète" -"Shipment was created with Checkout by Amazon.","L'expédition a été créée avec Checkout by Amazon." -"Thank you for your purchase!","Merci de votre commande !" -"The customer has canceled payment and successfully returned from Amazon Simple Pay site","Le client a annulé le paiement puis est revenu du site Amazon Simple Pay avec succès" -"The customer has successfully returned from Amazon Simple Pay site","Le client est revenu du site Amazon Simple Pay avec succès" -"The invoice was created (online capture). Waiting for capture confirmation from Amazon Simple Pay service.","La facture a été créée (saisie en ligne). Attente de la confirmation de la saisie par le service Amazon Simple Pay." -"The invoice was not refunded. Amazon Simple Pay service error: [%s] %s","La facture n'a pas été remboursée. Erreur du service Amazon Simple Pay : [%s] %s" -"The item specified in callback request XML was not found in quote.","L'article indiqué dans la requête XML de rappel n'a pas été trouvé dans le devis." -"The order was not canceled. Amazon Simple Pay service error: [%s] %s","La commande n'a pas été annulée. Erreur du service Amazon Simple Pay : [%s] %s" -"The order was not captured online. Authorization confirmation is required.","La commande n'a pas été saisie en ligne. La confirmation de l'autorisation est nécessaire." -"The order was not captured. Amazon Simple Pay service error: [%s] %s","La commande n'a pas été saisie. Erreur du service Amazon Simple Pay : [%s] %s" -"The payment was captured online with Amazon Simple Pay service. The invoice was created. Waiting for capture confirmation from the payment service.","Le paiement a été saisi en ligne avec le service Amazon Simple Pay. La facture a été créée. Attente de la confirmation de la saisie par le service de paiement." -"The payment was refunded online with Amazon Simple Pay service. The credit memo was created. Waiting for refund confirmation from Amazon Simple Pay service.","Le paiement a été remboursé en ligne avec le service Amazon Simple Pay. La note de crédit a été créée. Attente de la confirmation du remboursement par le service Amazon Simple Pay." -"The payment was refunded online. Waiting for refund confirmation from Amazon Simple Pay service.","Le paiement a été remboursé en ligne. Attente de la confirmation du remboursement par le service Amazon Simple Pay." -"The request is not a valid IPN request.","La requête n'est pas une requête IPN valide." -"The request was signed incorrectly or the signature is missing.","La demande n'a pas été signée correctement ou la signature est manquante." -"Title","Titre" -"Use Callback API","Utiliser l'API de rappel" -"You will be redirected to Checkout by Amazon in a few seconds.","Vous serez redirigé vers Checkout by Amazon dans quelques secondes." -"You will receive an order confirmation email with details of your order and a link to track its progress.","Vous recevrez un email de confirmation de commande avec les détails de votre commande et un lien pour sa progression." -"You will receive an order confirmation email with details of your order and a link to track its progress.
    ","Vous allez recevoir un e-mail de confirmation de commande avec les détails de votre commande et un lien pour suivre son avancement.
    " -"Your billing address will be ignored and you will be redirected to Checkout by Amazon website.","Votre adresse de facturation va être ignorée et vous allez être redirigé vers le site Checkout by Amazon." -"Your order has been received.","Votre commande a bien été reçue." diff --git a/app/locale/fr_FR/Mage_Api.csv b/app/locale/fr_FR/Mage_Api.csv deleted file mode 100644 index 1d97d698d..000000000 --- a/app/locale/fr_FR/Mage_Api.csv +++ /dev/null @@ -1,18 +0,0 @@ -"Access denied.","Accès refusé." -"Can not find webservice adapter.","Impossible de trouver l'adaptateur du service web." -"Client Session Timeout (sec.)","Expiration de la session client (secondes)" -"Default Response Charset","Table de caractères de la réponse par défaut" -"Email","Email" -"Enable WSDL Cache","Activer le cache WSDL" -"General Settings","Réglages généraux" -"Invalid webservice adapter specified.","Adaptateur de service web invalide." -"Invalid webservice handler specified.","Gérant de service web invalide." -"Magento Core API","Magento Core API" -"Magento Core API Section","Magento Core API Section" -"SOAP/XML-RPC - Roles","SOAP/XML-RPC - Rôles" -"SOAP/XML-RPC - Users","SOAP/XML-RPC - Utilisateurs" -"Unable to login.","Connexion impossible." -"User Name","Nom d'utilisateur" -"WS-I Compliance","Conforme à WS-I" -"Web Services","Services Web" -"Your account has been deactivated.","Votre compte a été désactivé." diff --git a/app/locale/fr_FR/Mage_Api2.csv b/app/locale/fr_FR/Mage_Api2.csv deleted file mode 100644 index 5616f48a6..000000000 --- a/app/locale/fr_FR/Mage_Api2.csv +++ /dev/null @@ -1,238 +0,0 @@ -"%s","%s" -"%s role is a special one and can\'t be changed.","Le rôle %s est spécial et ne peut pas être modifié." -"%s role is a special one and can\'t be deleted.","Le rôle %s est spécial et ne peut pas être supprimé." -"%s role is protected.","Le rôle %s est protégé." -"ACL Attribute Rules","Règles de l'attribut ACL" -"ACL Attributes Information","Informations sur les attributs ACL" -"Add","Ajouter" -"Add Admin Role","Ajouter rôle d'admin" -"Add New Role","Ajouter Nouveau Rôle" -"Address Type","Type d'adresse" -"Admin","Admin" -"Allow","Autoriser" -"An error occurred while deleting the role.","Une erreur s'est produite pendant la suppression du rôle." -"An error occurred while saving attribute rules.","Une erreur s'est produite pendant la sauvegarde des règles d'attribut." -"An error occurred while saving role.","Une erreur s'est produite pendant la sauvegarde du rôle." -"Api Rules Information","Informations sur les règles Api" -"Assigned","Assigné" -"Associate to Website","Associer au site web" -"Attribute Rules Information","Informations sur les règles de l'attribut" -"Attribute Set","Ensemble d'attributs" -"Attributes","Attributs" -"Automatically Return Credit Memo Item to Stock","Retournez automatiquement un article d'Avoir dans le stock" -"Back","Retour" -"Backorders","Commandes en rupture de stock" -"Base Currency","Devise de base" -"Base Customer Balance","Solde de base client" -"Base Discount","Réduction de base" -"Base Discount Amount","Montant de la réduction de base" -"Base Item Subtotal","Sous-total de l'article de base" -"Base Item Subtotal Including Tax","Sous-total de l'article de base taxe comprise" -"Base Original Price","Prix d'origine de base" -"Base Price","Prix de base" -"Base Price Including Tax","Prix de base taxe comprise" -"Base Shipping","Expédition de base" -"Base Shipping Discount","Réduction de base sur l'expédition" -"Base Shipping Tax","Taxe d'expédition de base" -"Base Subtotal","Sous-total de base" -"Base Subtotal Including Tax","Sous-total de base taxe comprise" -"Base Tax Amount","Montant de la taxe de base" -"Base Total Due","Total de base à régler" -"Base Total Paid","Total de base réglé" -"Base Total Refunded","Total de base remboursé" -"Buy Now URL","URL d'achat immédiat" -"Can Be Divided into Multiple Boxes for Shipping","Peut être réparti dans plusieurs paquets pour l'expédition" -"Canceled Qty","Qté annulée" -"Catalog","Catalogue" -"Catalog Product","Catalogue de produits" -"CatalogInventory","InventaireCatalogue" -"Category ID","Identification catégorie" -"City","Ville" -"Company","Compagnie" -"Country","Pays" -"Coupon Code","Code coupon" -"Create","Créer" -"Create Permanent Redirect for old URL","Créer une redirection permanente pour une vieille URL" -"Created From","Créé depuis" -"Customer","Client" -"Customer Address","Adresse client" -"Customer Address ID","Identifiant de l'adresse du client" -"Customer Balance","Solde du client" -"Customer First Name","Prénom du client" -"Customer ID","Identifiant utilisateur" -"Customer Last Name","Nom du client" -"Customer Middle Name","Second prénom client" -"Customer Prefix","Préfixe client" -"Customer Suffix","Suffixe client" -"Default Image","Image par défaut" -"Delete","Supprimer" -"Deny","Refuser" -"Disable automatic group change based on VAT ID","Désactiver le changement automatique de groupe en fonction de l'identifiant TVA" -"Discount","Discount" -"Discount Amount","Montant de la remise" -"Discount Description","Description de la remise" -"Edit","Éditer" -"Edit %s ACL attribute rules","Modifier les rôles de l'attribut ACL %s" -"Edit Role","Modifier modèle" -"Edit attribute rules for %s Role","Modifier les rôles de l'attribut pour le rôle %s" -"Email","Email" -"Enable Qty Increments","Activer incréments de la Qté" -"Exclude","Exclure" -"File Content","Contenu de fichier" -"File MIME Type","Type MIME du fichier" -"File Name","Nom du fichier" -"Final Price With Tax","Prix final taxe comprise" -"Final Price Without Tax","Prix final hors taxe" -"First Name","Prénom" -"Gift Message","Message du cadeau" -"Grand Total","Total final" -"Grand Total to Be Charged","Total général à facturer" -"Group","Groupe" -"Guest","Invité" -"Has Custom Options","A des options personnalisables" -"ID","ID" -"Inventory Data","Données d'inventaire" -"Invoiced Qty","Qté facturée" -"Is Confirmed","Est confirmé" -"Is Default Billing Address","Est l'adresse de facturation par défaut" -"Is Default Shipping Address","Est l'adresse de livraison par défaut" -"Item ID","Identifiant article" -"Item Subtotal","Sous-total de l'article" -"Item Subtotal Including Tax","Sous-total de l'article taxe comprise" -"Label","Étiquette" -"Last Logged In","Dernière connexion" -"Last Name","Nom de famille" -"Low Stock Date","Date de stock faible" -"Manage Stock","Gérer le stock" -"Maximum Qty Allowed in Shopping Cart","Qté maximum permise dans le caddy" -"Minimum Qty Allowed in Shopping Cart","Qté minimum permise dans le caddy" -"New Role","Nouveau rôle" -"Notify for Quantity Below","Avertir pour quantité ci-dessous" -"OAuth","OAuth" -"Order","Commande" -"Order Addresses","Adresses de commande" -"Order Comments","Commentaires Commande" -"Order Currency","Devise de commande" -"Order Date","Date de la Commande" -"Order ID","Identifiant commande" -"Order ID (internal)","Identifiant commande (interne)" -"Order Item ID","Identifiant de l'article de la commande" -"Order Items","Articles de la commande" -"Order Status","Statut de la Commande" -"Ordered Qty","Qté commandée" -"Orders","Commandes" -"Original Price","Prix d'origine" -"Parent Order Item ID","Identifiant d'objet commande parent" -"Payment Method","Méthode de Paiement" -"Phone Number","Numéro de téléphone" -"Placed from IP","Placé depuis l'IP" -"Please enter a valid number in ""max_sale_qty"" field","Veuillez entrer un numéro valide dans le champ ""max_sale_qty""" -"Please enter a valid number in ""min_qty"" field","Veuillez entrer un numéro valide dans le champ ""min_qty""" -"Please enter a valid number in ""min_sale_qty"" field","Veuillez entrer un numéro valide dans le champ ""min_sale_qty""" -"Please enter a valid number in ""notify_stock_qty"" field","Veuillez entrer un numéro valide dans le champ ""notify_stock_qty""" -"Please use numbers only in ""category_id"" field.","Veuillez utiliser des chiffres seulement dans le champ « category_id »." -"Please use numbers only in ""qty_increments"" field. Please avoid spaces or other characters such as dots or commas.","Veuillez utiliser des chiffres seulement dans le champ « qty_increments ». Veuillez éviter les espaces et d'autres caractères tels que les points et les virgules." -"Position","Position" -"Price","Prix" -"Price Including Tax","Prix TTC" -"Product","Produit" -"Product Category","Catégorie du produit" -"Product ID","Identifiant du produit" -"Product Image","Image du produit" -"Product Type","Type de Produit" -"Product URL","URL du produit" -"Product Website","Site web du produit" -"Product and Custom Options Name","Produit et nom des options personnalisables" -"Qty","Qté" -"Qty Increments","Incréments de quantité" -"Qty Uses Decimals","La quantité utilise des décimales" -"Qty for Item's Status to Become Out of Stock","Qté pour que le statut de l'article devienne épuisé" -"REST - Attributes","REST - Attributs" -"REST - Roles","REST - Rôles" -"REST ACL Attributes","Attributs ACL REST" -"REST Attributes","Attributs REST" -"REST Role","Rôle REST" -"REST Roles","Rôles REST" -"REST Roles Information","Informations sur les rôles REST" -"Read","Lire" -"Refunded Qty","Qté remboursée" -"Regular Price With Tax","Prix standard TTC" -"Regular Price Without Tax","Prix standard HT" -"Rest Roles","Roles Rest" -"Retrieve","Retirer" -"Role ""%s"" no longer exists","Rôle « %s » n'existe plus" -"Role ""%s"" not found.","Rôle « %s » introuvable." -"Role API Resources","Ressources API du rôle" -"Role Info","Infos sur le rôle" -"Role Information","Informations du rôle" -"Role Name","Nom du rôle" -"Role Users","Utilisateurs rôles" -"Role has been deleted.","Le rôle a été supprimé." -"Roles","Rôles" -"SKU","UGS" -"Salability Status","Statut de l'attrait commercial" -"Sales","Ventes" -"Save","Enregistrer" -"Shipped Qty","Qté livrée" -"Shipping Amount","Montant de la livraison" -"Shipping Discount","Remise de livraison" -"Shipping Including Tax","Frais de port incluant taxes" -"Shipping Method","Méthode d'expédition" -"Shipping Tax","Taxe de livraison" -"State","État" -"Stock Availability","Disponibilité du Stock" -"Stock ID","Identifiant du stock" -"Stock Item","Article du stock" -"Stock Status","État de stock" -"Store Currency to Order Currency Rate","Stocker la devise pour commander un taux de devise" -"Store Name","Nom du magasin" -"Street","Rue" -"Subtotal","Sous-total" -"Subtotal Including Tax","Sous-total taxes incluses" -"System","Système" -"Tax Amount","Montant de la taxe" -"Tax Name","Nom de la taxe" -"Tax Percent","Pourcentage de taxe" -"Tax Rate","Taux d'imposition" -"The ""enable_qty_increments"" field must be set to 0 or 1.","Le champ « enable_qty_increments » doit être paramétré sur 0 ou 1." -"The ""is_decimal_divided"" field must be set to 0 or 1.","Le champ « is_decimal_divided » doit être paramétré sur 0 ou 1." -"The ""is_in_stock"" field must be set to 0 or 1.","Le champ « is_in_stock » doit être paramétré sur 0 ou 1." -"The ""is_qty_decimal"" field must be set to 0 or 1.","Le champ « is_qty_decimal » doit être paramétré sur 0 ou 1." -"The ""is_qty_decimal"" field must be set to 0, 1, or 2.","Le champ « is_qty_decimal » doit être paramétré sur 0, 1 ou 2." -"The ""manage_stock"" field must be set to 0 or 1.","Le champ « manage_stock"" » doit être paramétré sur 0 ou 1." -"The ""stock_status_changed_auto"" field must be set to 0 or 1.","Le champ « stock_status_changed_auto » doit être paramétré sur 0 ou 1." -"The ""use_config_backorders"" field must be set to 0 or 1.","Le champ « use_config_backorders » doit être paramétré sur 0 ou 1." -"The ""use_config_enable_qty_inc"" field must be set to 0 or 1.","Le champ « use_config_enable_qty_inc » doit être paramétré sur 0 ou 1." -"The ""use_config_manage_stock"" field must be set to 0 or 1.","Le champ « use_config_manage_stock » doit être paramétré sur 0 ou 1." -"The ""use_config_max_sale_qty"" field must be set to 0 or 1.","Le champ « use_config_max_sale_qty » doit être paramétré sur 0 ou 1." -"The ""use_config_min_qty"" field must be set to 0 or 1.","Le champ « use_config_min_qty » doit être paramétré sur 0 ou 1." -"The ""use_config_min_sale_qty"" field must be set to 0 or 1.","Le champ « use_config_min_sale_qty » doit être paramétré sur 0 ou 1." -"The ""use_config_notify_stock_qty"" field must be set to 0 or 1.","Le champ « use_config_notify_stock_qty » doit être paramétré sur 0 ou 1." -"The ""use_config_qty_increments"" field must be set to 0 or 1.","Le champ « use_config_qty_increments » doit être paramétré sur 0 ou 1." -"The attribute rules were saved.","Règles d'attribution sauvegardées." -"The role has been saved.","Le modèle a été enregistré." -"The role is a special one and not for assigning it to admin users.","Le rôle est spécial et ne peut pas être assigné aux utilisateurs d'administration." -"Total Due","Total dû" -"Total Paid","Total payé" -"Total Refunded","Total remboursé" -"Total Reviews Count","Nombre total d'évaluations" -"Type","Type" -"URL","URL" -"Update","Mettre à jour" -"Use Config Settings for Allow Gift Message","Utiliser les paramètres de configuration pour autoriser un message avec le cadeau" -"Use Config Settings for Allow Gift Wrapping","Utiliser les paramètres de configuration pour autoriser l'emballage des cadeaux" -"Use Config Settings for Backorders","Utiliser les paramètres de configuration pour les commandes en attente" -"Use Config Settings for Enable Qty Increments","Utiliser les paramètres de configuration pour activer les augmentations de qté" -"Use Config Settings for Manage Stock","Utiliser paramètres de configuration pour gestion du stock" -"Use Config Settings for Maximum Qty Allowed in Shopping Cart","Utiliser les paramètres de configuration pour la qté maximum autorisée dans le panier" -"Use Config Settings for Minimum Qty Allowed in Shopping Cart","Utiliser les paramètres de configuration pour la qté minimum autorisée dans le panier" -"Use Config Settings for Notify for Quantity Below","Utiliser les paramètres de configuration pour notifier la quantité ci-dessous" -"Use Config Settings for Qty Increments","Utiliser les paramètres de configuration pour les augmentations de qté" -"Use Config Settings for Qty for Item's Status to Become Out of Stock","Utiliser les paramètres de configuration de qté pour passer le statut de l'article en rupture de stock" -"User Type","Type d'utilisateur" -"User type ""%s"" no longer exists","Type d'utilisateur ""%s"" n'existe plus" -"User type ""%s"" not found.","Type d'utilisateur ""%s"" non trouvé." -"Web Services","Services Web" -"Web services","Services web" -"Write","Ecrire" -"ZIP/Postal Code","Code postal" diff --git a/app/locale/fr_FR/Mage_Authorizenet.csv b/app/locale/fr_FR/Mage_Authorizenet.csv deleted file mode 100644 index 3ef2303d8..000000000 --- a/app/locale/fr_FR/Mage_Authorizenet.csv +++ /dev/null @@ -1,41 +0,0 @@ -"--Please Select--","--Veuillez choisir--" -"API Login ID","ID de connexion de l'API" -"Accepted Currency","Devise acceptée" -"Amount of %s approved by payment gateway. Transaction ID: ""%s"".","Montant de % approuvé par point d'accès de paiement. ID de transaction: «%»." -"Authorize.net Direct Post","Enregistrement direct Authorize.net" -"Card Verification Number","Numéro de vérification de la carte" -"Card Verification Number Visual Reference","Référence visuelle du numéro de vérification de la carte" -"Close","Fermer" -"Credit Card Information","Renseignements sur la carte de crédit" -"Credit Card Number","Numéro de carte de crédit" -"Credit Card Type","Type de carte de crédit" -"Credit Card Types","Types de cartes de crédit" -"Credit Card Verification","Vérification de la carte de crédit" -"Debug","Déboguer" -"Email Customer","Envoyer un courriel au client" -"Enabled","Actif" -"Expiration Date","Date d'expiration" -"Gateway URL","URL passerelle" -"Maximum Order Total","Total maximal de la commande" -"Merchant MD5","MD5 du commerçant" -"Merchant's Email","Courriel du commerçant" -"Minimum Order Total","Total minimal de la commande" -"New Order Status","Nouveau statut commande" -"Order saving error: %s","Erreur enregistrement commande : %s" -"Payment Action","Action de paiement" -"Payment authorization error.","Erreur autorisation de paiement." -"Payment authorization error. Transacion id is empty.","Erreur d'autorisation de paiement. L'id de transaction est vide." -"Payment error. Order was not found.","Erreur de paiement. La commande n'a pas été trouvée." -"Payment error. Paid amount doesn\'t match the order amount.","Erreur de paiement. Le montant payé ne correspond pas au montant de la commande." -"Payment from Applicable Countries","Paiement depuis les pays applicables" -"Payment from Specific Countries","Paiement depuis les pays spécifiques" -"Please, choose payment method","Veuillez choisir une méthode de paiement" -"Response hash validation failed. Transaction declined.","Réponse la validation de hachage a échoué. Transaction refusée." -"Sort Order","Trier la commande" -"Test Mode","Mode test" -"The order has been created.","La commande a été créée." -"There was an error processing your order. Please contact us or try again later.","Il y a eu une erreur dans le traitement de votre commande. Veuillez nous contacter ou réessayez plus tard." -"Title","Titre" -"Transaction Key","Clé de transaction" -"What is this?","Qu'est-ce que c'est ?" -"You will be required to enter your payment details before you place an order.","Il vous sera demandé de renseigner vos détails de paiement avant de passer une commande." diff --git a/app/locale/fr_FR/Mage_Backup.csv b/app/locale/fr_FR/Mage_Backup.csv deleted file mode 100644 index c4d163c55..000000000 --- a/app/locale/fr_FR/Mage_Backup.csv +++ /dev/null @@ -1,55 +0,0 @@ -"Action","Action" -"An error occurred while creating the backup.","Une erreur est survenue lors de la création de la copie de sauvegarde" -"An error occurred while writing to the backup file ""%s"".","Une erreur est survenue lors du message au fichier de sauvegarde ""%s""." -"Are you sure you want to delete the selected backup(s)?","êtes-vous sûrs de vouloir supprimer la/les copie(s) de sauvegarde sélectionnée(s) ?" -"Backup Type","Type de sauvegarde" -"Backup file ""%s"" cannot be read from or written to.","Le fichier de sauvegarde ""%s"" ne peut être lu et ne peut recevoir de message." -"Backup file ""%s"" does not exist.","Le fichier de sauvegarde ""%s"" n'existe pas." -"Backup file does not exist.","Le fichier de sauvegarde n'existe pas." -"Backup file handler was unspecified.","Le propriétaire du fichier de sauvegarde n'a pas été spécifié." -"Backup file not found","Fichier de sauvegarde non trouvé" -"Backup file path was not specified.","Le répertoire du fichier de sauvegarde n'a pas été spécifié." -"Backups","Sauvegardes" -"Cannot read backup file.","Ne peut pas lire le fichier de sauvegarde." -"Create Backup","Créer sauvegarde" -"Database","Base de données" -"Database Backup","Sauvegarde de la base de données" -"Database and Media","Base de données et médias" -"Database and Media Backup","Sauvegarde de la base de données et des médias" -"Database was successfuly backed up.","La base de données a été sauvegardée avec succès." -"Download","Téléchargement" -"Enable Scheduled Backup","Activer la sauvegarde programmée" -"Failed to connect to FTP","Échec de la connexion au FTP" -"Failed to delete one or several backups.","Échec de la suppression d'une ou plusieurs copies de sauvegarde." -"Failed to rollback","Échec de la réduction" -"Failed to validate FTP","Échec de la validation du FTP" -"Frequency","Fréquence" -"Invalid Password.","Mot de passe non valable." -"Maintenance Mode","Mode maintenance" -"Name","Nom" -"Not enough free space to create backup.","Espace libre insuffisant pour la création d'une copie de sauvegarde." -"Not enough permissions to create backup.","Autorisations insuffisantes pour la création d'une copie de sauvegarde." -"Not enough permissions to perform rollback","Autorisations insuffisantes pour effectuer une réduction" -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup.""","Veuillez soit décocher la case ""Mettre le magasin en mode maintenance"", soit mettre à jour vos permissions pour continuer la sauvegarde." -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback.""","Veuillez soit décocher la case ""Mettre le magasin en mode maintenance"", soit mettre à jour vos permissions pour continuer le retour arrière." -"Put store on the maintenance mode while backup's creation","Mettre une réserve sur le mode de maintenance lors de la création de la copie de sauvegarde" -"Rollback","Réduction" -"Scheduled Backup Settings","Paramètres de la sauvegarde programmée" -"Size, Bytes","Taille, Bytes" -"Start Time","Date de début" -"System","Système" -"System (excluding Media)","Système (excluant les médias)" -"System Backup","Sauvegarde du système" -"System couldn't put store on the maintenance mode","Le système n'a pas pu mettre de réserves sur le mode maintenance" -"The database and media backup has been created.","La copie de sauvegarde de la base de données et des médias a été créée." -"The database backup has been created.","La copie de sauvegarde de la base de données a été créée." -"The file was compressed with Zlib, but this extension is not installed on server.","Le fichier a été compressé avec Zlib, mais cette extension n'est pas installée sur le serveur." -"The selected backup(s) has been deleted.","La copie de sauvegarde sélectionnée a été supprimée." -"The system (excluding Media) backup has been created.","La sauvegarde de système (excluant les médias) a été créée." -"The system backup has been created.","La copie de sauvegarde du système a été créée." -"Time","Temps" -"Type","Type" -"Unable to create backup. Please, try again later.","Impossible de créer la sauvegarde. Veuillez réessayer plus tard." -"Unable to save the cron expression.","Impossible de sauvegarder l'expression cron." -"Wrong order of creation for new backup.","Mauvais ordre de création de la nouvelle sauvegarde." -"You do not have sufficient permissions to enable Maintenance Mode during this operation.","Vous n'avez pas les droits nécessaires pour activer le module de maintenance pendant cette opération." diff --git a/app/locale/fr_FR/Mage_Bundle.csv b/app/locale/fr_FR/Mage_Bundle.csv deleted file mode 100644 index 65582ef56..000000000 --- a/app/locale/fr_FR/Mage_Bundle.csv +++ /dev/null @@ -1,71 +0,0 @@ -"%1$s incl tax.","%1$s incl tax." -"* Required Fields","* Champs requis" -"-- Select --","-- Sélectionner --" -"Add New Option","Ajouter nouvelle option" -"Add Selection","Ajouter la sélection" -"As Low as","aussi petit que" -"As low as","Aussi bas que" -"Bundle Items","Grouper les objets" -"Bundle Product","Grouper les produits" -"Bundle Product View Summary","Résumé vue de produit" -"Buy %1$s","Buy %1$s" -"Buy %1$s for","Buy %1$s for" -"Buy %1$s for %2$s","Buy %1$s for %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Buy %1$s for %2$s (%3$s incl. tax) each" -"Buy %1$s for %2$s each","Buy %1$s for %2$s each" -"Buy %1$s with %2$s discount each","Acheter %1$s pour %2$s chacun" -"Catalog Product View (Bundle)","Vue groupée du catalogue de produits" -"Checkbox","Case à cocher" -"Choose a selection...","Choisir une sélection..." -"Click for price","Click for price" -"Close","Fermer" -"Default","Défaut" -"Default Qty","Qté par défaut" -"Default Title","Titre par défaut" -"Drop-down","Menu déroulant" -"Dynamic","Dynamique" -"Excl. Tax","Taxe non comprise" -"Excl. Tax:","Excl. Tax:" -"Fixed","Fixé" -"From","De" -"From:","De :" -"Gift Message","Message cadeau" -"Incl. Tax","Taxe comprise" -"Incl. Tax:","Incl. Tax:" -"Input Type","Entrer le type" -"Is Required","Est requis" -"Message:","Message :" -"Multiple Select","Choix multiple" -"N/A","non applicable" -"No options of this product are available.","Il n'y a pas d'options disponibles pour ce produit" -"None","aucun" -"Percent","pour cent" -"Percent Discount","pourcentage de réduction" -"Please Select Products to Add","Sélectionner les produits à acheter" -"Please enter a number greater 0 in this field.","Veuillez saisir un chiffre supérieur à 0 dans ce champ." -"Please enter search conditions to view products.","Entrez les conditions de recherche pour voir les produits" -"Please select options for product.","Sélectionner des options pour le produit." -"Please specify product option(s).","Spécifier les options de produit." -"Position","Position" -"Price Range","Intervalle de prix" -"Price Type","Type de prix" -"Price as configured","Prix configuré" -"Qty:","Qté:" -"Radio Buttons","Boutons radios" -"Required options are not selected.","Les options requises ne sont pas sélectionnées." -"Selected required options are not available.","Les options requises sélectionnées ne sont pas disponibles." -"Separately","Séparément" -"Ship Bundle Items","Envoyer le groupe d'objets" -"Shipment","Envoi" -"Store View Title","Titre de la vue du magasin" -"There is no defined renderer for ""%s"" option type.","Il n'y a pas de moteur de rendu défini pour le type d'option ""%s""." -"This product is also part of bundle(s)","Ce produit fait aussi partie d'un groupe." -"To","A" -"To:","A :" -"Together","ensemble" -"Total incl. Tax: %1$s","Total incl. Tax: %1$s" -"Use Default Value","Utiliser la valeur par défaut" -"User Defined Qty","Quantité définie par l'utilisateur" -"and","and" -"each","each" -"save","save" diff --git a/app/locale/fr_FR/Mage_Captcha.csv b/app/locale/fr_FR/Mage_Captcha.csv deleted file mode 100644 index 839609c9f..000000000 --- a/app/locale/fr_FR/Mage_Captcha.csv +++ /dev/null @@ -1,22 +0,0 @@ -"Attention: Captcha is case sensitive.","Attention:Captcha est sensible à la casse." -"After number of attempts to login","Après un nombre de tentatives de connexion" -"Always","Toujours" -"CAPTCHA","CAPTCHA" -"CAPTCHA Timeout (minutes)","Pause du CAPTCHA (minutes)" -"CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen","Les formulaires « Créer un compte utilisateur » et « Mot de passe oublié » contiendront toujours un CAPTCHA si cette option est sélectionnée" -"Case Sensitive","Sensible à la casse" -"Displaying Mode","Mode d'affichage" -"Enable CAPTCHA in Admin","Activer le CAPTCHA en Admin" -"Enable CAPTCHA on Frontend","Activer le CAPTCHA sur l'interface utilisateur" -"Font","Police de caractères" -"Forms","Formulaires" -"If 0 is specified, CAPTCHA on the Login form will be always available.","Si 0 est sélectionné, le CAPTCHA s'affichera toujours sur le formulaire de connexion." -"Incorrect CAPTCHA.","CAPTCHA incorrect." -"Number of Symbols","Nombre de symboles" -"Number of Unsuccessful Attempts to Login","Nombre de tentatives de connexion ratées" -"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Veuillez indiquer 8 symboles maximum. Les séries sont autorisées (3-5 par exemple)" -"Please type the letters below","Veuillez saisir les lettres ci-dessous" -"Please type the letters from the image:","Veuillez taper les lettres de l'image:" -"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.
    Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Veuillez saisir uniquement des lettres (a-z ou A-Z) ou des chiffres (0-9) dans ce champ. Les espaces et les autres caractères ne sont pas autorisés.
    Les caractères d'apparence similaire (par exemple « i », « l » ou « 1 ») réduisent les chances d'être identifié correctement par le client." -"Reload captcha","Téléarger à nouveau Captcha" -"Symbols Used in CAPTCHA","Symboles utilisés dans le CAPTCHA" diff --git a/app/locale/fr_FR/Mage_Catalog.csv b/app/locale/fr_FR/Mage_Catalog.csv deleted file mode 100644 index 42c2754c0..000000000 --- a/app/locale/fr_FR/Mage_Catalog.csv +++ /dev/null @@ -1,848 +0,0 @@ -"# of Use","Utilisation numéro #" -"%1$s incl tax.","%1$s TTC" -"%s - %s","%s - %s" -"%s Item(s)","%s article(s)" -"%s and above","%s et au dessus" -"%s-%s of %s","%s-%s de %s" -"(%d)","(%d)" -"(Copy data from: %s)","(Copier les données à partir de: %s)" -"* Required Fields","* Champs obligatoires" -"-- Please Select --","-- Veuillez sélectionner --" -"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","86400 par défaut, si non défini. Pour réactualiser instantanément, Vider le cache des Blocs HTML de sortie." -"Warning! Applying MAP by default will hide all product prices on the frontend.","Avertissement ! Appliquer MAP par défaut masquera tous les prix de produits." -"A group with the same name already exists.","Un group avec le même nom existe déjà." -"A name is required","Un nom est nécessaire" -"A product type is not defined for the indexer.","Un type de produit n'est pas défini dans l'index." -"ALL GROUPS","TOUS LES GROUPES" -"AM","Avant midi" -"Action","Action" -"Actual Price","Prix" -"Add","Ajouter" -"Add Attribute","Ajouter un Attribut" -"Add Design Change","Ajouter une modification de design" -"Add Group","Ajouter un groupe" -"Add Group Price","Ajouter un prix de groupe" -"Add New","Ajouter un nouveau" -"Add New Attribute","Ajouter un nouvel attribut" -"Add New Attribute Set","Ajouter un nouveau jeu d'attributs" -"Add New Group","Ajouter un nouveau groupe" -"Add New Images","Ajouter de nouvelles images" -"Add New Option","Ajouter nouvelle option" -"Add New Row","Ajouter nouvelle ligne" -"Add New Search Term","Ajouter un nouveau terme de recherche" -"Add New Set","Ajouter une nouvelle série" -"Add Product","Ajouter un produit" -"Add Product To Websites","Ajouter un produits aux sites Internet" -"Add Root Category","Ajouter une catégorie racine" -"Add Subcategory","Ajouter une sous-catégorie" -"Add Tax","Ajouter une taxe" -"Add Tier","Ajouter un niveau" -"Add attribute into attribute set","Ajouter l'attribut à l'ensemble d'attributs" -"Add group into attribute set","Ajouter le groupe à l'ensemble d'attributs" -"Add new custom option into product","Ajouter une nouvelle option personnalisée dans le produit" -"Add new values into custom option","Ajouter de nouvelles valeurs dans l'option personnalisée" -"Add option","Ajouter une option" -"Add to Cart","Ajouter au panier" -"Add to Compare","Ajouter au comparateur" -"Add to Wishlist","Ajouter à la liste de cadeaux" -"Additional Information","Informations supplémentaires" -"Alert Urls","Alertes Urls" -"All","Tous" -"All Product Types","Tous les types de produits" -"All Websites","Tous les sites web" -"All products","Tous les produits" -"All products - recently added products, New products - products marked as new","Tous les produits - produits récemment ajoutés, Nouveau produits - produits indiqués comme nouveaux" -"All products of this set will be deleted! Are you sure you want to delete this attribute set?","Tous les produits de cette série seront effacés ! Etes-vous sur de vouloir supprimer cette série d'attributs ?" -"Allow All Products per Page","Autoriser tous les produits par page" -"Allow Dynamic Media URLs in Products and Categories","Autoriser les URLs de medias dynamiques dans les Produits et les Catégories" -"Allow HTML Tags on Frontend","Autoriser les marqueurs HTML sur le frontal" -"Allowed File Extensions","Extensions de fichiers autorisées" -"Allowed file extensions to upload","Extensions de fichiers autorisées pour le téléchargement montant" -"Amount","Montant" -"An error occurred while adding products to websites.","Une erreur est survenue pendant l'ajout de produits sur les sites Internet." -"An error occurred while clearing comparison list.","Une erreur est survenue pendant la suppression de la list de comparaison." -"An error occurred while deleting this review.","Une erreur est survenue en effaçant ce commentaire" -"An error occurred while removing products from websites.","Une erreur est survenue pendant le retrait de produits des sites Internet." -"An error occurred while saving the URL rewrite","Une erreur est survenue lors de l'enregistrement de la réécriture de l'URL" -"An error occurred while saving the attribute set.","Une erreur est survenue pendant la sauvegarde de la série d'attributs." -"An error occurred while saving the collection, aborting. Error message: %s","Une erreur est survenue lors de la sauvegarde de la collection. qui a échoué. Message d'erreur : %s" -"An error occurred while saving the product. ","Une erreur est survenue pendant la sauvegarde du produit." -"An error occurred while saving the search query.","Une erreur est survenue pendant la sauvegarde de la demande de recherche." -"An error occurred while saving this group.","Une erreur est survenue pendant la sauvegarde de ce groupe." -"An error occurred while saving this review.","Une erreur est survenue en enregistrant ce commentaire" -"An error occurred while trying to delete the category.","Une erreur est survenue en essayant de supprimer cette catégorie." -"An error occurred while updating the product(s) attributes.","Une erreur est survenue pendant la mise à jour des attributs du/des produit(s)." -"An error occurred while updating the product(s) status.","Une erreur est survenue pendant la mise à jour du statut du/des produit(s)." -"An invalid group ID is specified, skipping the record.","Identifiant de groupe invalide, ignorer." -"An invalid option ID is specified for %s (%s), skipping the record.","Un identifiant d'option invalide est spécifié pour %s (%s), ignorer." -"An invalid store was specified.","Un stockage invalide a été défini." -"Anchor Custom Text","Fixer texte personnalisé" -"Anchor Custom Title","Fixer titre personnalisé" -"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","Applicable aux produits et aux catégories du catalogue seulement. Tout contenu media sera inséré dans l'éditeur comme une URL statique. Cela n'est pas mis à jour si l'URL de base de la configuration système est modifiée." -"Apply MAP (Default Value)","Appliquer MAP (Valeur par défaut" -"Apply To","Appliquer à" -"Approved","Approuvé" -"Are you sure you want to delete this category?","Etes-vous sur de vouloir supprimer cette catégorie ?" -"Are you sure you would like to remove all products from your comparison?","Etes-vous sur de vouloir enlever tous les produits de votre comparaison ?" -"Are you sure you would like to remove this item from the compare products?","Etes-vous sur de vouloir enlever cet article des produits comparés ?" -"Are you sure?","Etes-vous sûr ?" -"As low as:","Aussi bas que:" -"Assign","Attribuer" -"Assign product link","Attribuer le lien du produit" -"Assign product to category","Attribuer le produit à la catégorie" -"Assigned Products","Produits Attribués" -"Associated Products","Produits Associés" -"Attrib. Set Name","Attib. Nom de la Série" -"Attribute ""%s"" is invalid.","Attribut ""%s"" invalide." -"Attribute ""%s"" is required.","Attribut ""%s"" requis." -"Attribute Information","Informations sur l'attribut" -"Attribute Model","Modèle de l'attribut" -"Attribute Name:","Nom de l'attribut:" -"Attribute Set","Ensemble d'attributs" -"Attribute Sets","Ensembles d'attributs" -"Attribute add","Attribut ajouter" -"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Le code d'attribut est invalide. Veuillez n'utiliser que des lettres (a-z), chiffres (0-9) ou underscores (_) dans ce champ, le premier caractère devant être une lettre." -"Attribute group with the \"/name/\" name already exists","Le groupe attribut du nom \"/name/\" existe déjà" -"Attribute group with the \/name/\ name already exists","Groupe d'attribut avec le nom \/name/\ existe déjà" -"Attribute remove","Attribut effacer" -"Attribute with the same code already exists","Un attribut avec le même code existe déjà" -"Attributes","Attributs" -"Attrribute names can be specified per store.","Les noms des attributs peuvent être définis par magasin" -"Autogenerate","Générer automatiquement" -"Availability:","Disponibilité:" -"Back","Retour" -"Backend Model","Modèle d'interface" -"Backend Table","Tableau d'interface" -"Backend Table Title","Titre du tableau d'interface" -"Backorders","Ruptures de stock" -"Based On","Basé sur" -"Before Order Confirmation","Avant la confirmation de commande" -"Best Value","Meilleure valeur" -"Block after Info Column","Bloc après Colonne Info" -"Bottom Block Options Wrapper","Bloc Inférieur Options d'Emballage" -"Bottom/Left","Inférieur/Gauche" -"Bottom/Right","Inférieur/ Droite" -"Browse By","Parcourir par" -"Bundle Items","Lot d'objets" -"Buy %1$s","Acheter %1$s" -"Buy %1$s for","Acheter %1$s pour" -"Buy %1$s for %2$s","Acheter %1$s pour %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Acheter %1$s pour %2$s (%3$s TTC) chacun" -"Buy %1$s for %2$s each","Acheter %1$s pour %2$s chacun" -"Cache Lifetime (Seconds)","Durée de vie du Cache (Secondes)" -"Cache refresh needed.","Réactualisation du Cache nécessaire" -"Can be Divided into Multiple Boxes for Shipping","Peut être divisé en plusieurs boîtes pour le transport" -"Can be used only with catalog input type Dropdown","Ne peut être utilisé qu'avec un type d'entrée catalogue Menu Déroulant" -"Can be used only with catalog input type Dropdown, Multiple Select and Price","Ne peut être utilisé qu'avec un type d'entrée catalogue Menu Déroulant, Sélection Multiple et Prix" -"Can\'t create image.","Ne peut pas créer l'image." -"Cancel","Annuler" -"Cannot create image.","Ne peut pas créer l'image." -"Cannot create writeable directory '%s'.","Ne peut pas créer un répertoire enregistrable '%s'." -"Cart Item Attribute","Attribut de l'article du panier" -"Catalog","Catalogue" -"Catalog Category (Anchor)","Catégorie Catalogue (Attaché)" -"Catalog Category (Non-Anchor)","Catégorie Catalogue (Non-Attaché)" -"Catalog Category (Without Subcategories)","Catégorie de catalogue (sans sous-catégories)" -"Catalog Category Link","Lien de la Catégorie Catalogue" -"Catalog New Products List","List des Nouveaux Produits du Catalogue" -"Catalog Price Scope","Etendue des Prix du Catalogue" -"Catalog Product Compare List","Liste de Comparaison des Produits du Catalogue" -"Catalog Product Email to a Friend","Envoyer le catalogue de produits par email à un ami" -"Catalog Product Image Gallery Popup","Popup Galerie d'Images du Produit du Catalogue" -"Catalog Product Link","Lien du Produit Catalogue" -"Catalog Product View (Any)","Affichage du Produit Catalogue (Tous)" -"Catalog Product View (Configurable)","Affichage du Produit Catalogue (Configurable)" -"Catalog Product View (Grouped)","Affichage du Produit Catalogue (Groupé)" -"Catalog Product View (Simple)","Affichage du Produit Catalogue (Simple)" -"Catalog Product View (Virtual)","Affichage du Produit Catalogue (Virtuel)" -"Catalog Section","Section Catalogue" -"Catalog Seo Sitemap (Category List)","Catalogue SEO Plan du Site (Liste des catégories)" -"Catalog Seo Sitemap (Category Tree)","Catalogue SEO Plan du Site (Arbre des catégories)" -"Catalog Seo Sitemap (Common)","Catalogue SEO Plan du Site (Courant)" -"Catalog Seo Sitemap (Product List)","Catalogue SEO Plan du Site (Liste des Produits)" -"Catalog URL Rewrites","Catalogue Réécritures URL" -"Catalog product custom option values API","Interface de Programmation Applicative (API) des valeurs de l'option personnalisée des produits du catalogue" -"Catalog product custom options API","Interface de Programmation Applicative (API) des options personnalisées des produits du catalogue" -"Catalog, Search","Catalogue, Recherche" -"Categories","catégories" -"Categories Sitemap","Catégories Plan du Site" -"Category","Catégorie" -"Category API","Catégorie API" -"Category Data","Données de la Catégorie" -"Category Flat Data","Données Fixes de la Catégorie" -"Category Link Block Template","Bloc Modèle du Lien de la Catégorie" -"Category Link Inline Template","Modèle Préféré du Lien de la Catégorie" -"Category Products","Produits de la Catégorie" -"Category Top Navigation","Haut de la Catégorie Navigation" -"Category URL Suffix","Suffixe de l'URL de la Catégorie" -"Category attributes API","Attributs API de la Catégorie" -"Category move error","Erreur de déplacement de catégorie" -"Category move error %s","Erreur %s de déplacement de catégorie" -"Category move operation is not possible: parent category is equal to child category.","L'opération de déplacement de catégorie n'est pas possible : la catégorie parent est la même que la catégorie enfant." -"Category move operation is not possible: the current category was not found.","L'opération de déplacement de catégorie n'est pas possible : la catégorie actuelle n'a pas été trouvée." -"Category move operation is not possible: the new parent category was not found.","L'opération de déplacement de la catégorie n'est pas possible: la nouvelle catégorie mère n'a pas été trouvée." -"Category must be an instance of Mage_Catalog_Model_Category.","La catégorie doit être un exemple de Mage_Catalogue_Modèle_Catégorie." -"Center","Centrer" -"Change","Changer" -"Change or Retrieve attribute store view","Modifier ou récupérer des attributs de la vue de la boutique" -"Change status","Changer le satut" -"Check items to add to the cart or","Cocher les articles à ajouter au panier ou" -"Choose an Option...","Choisir une option..." -"Clear All","Tout effacer" -"Clear Price","Réinitialiser le prix" -"Click for price","Cliquez pour le prix" -"Close Window","Fermer la fenêtre" -"Collapse All","Afficher tout" -"Comma-separated.","Séparé(es) par des virgules." -"Comparable","Comparable" -"Comparable on Front-end","Comparable depuis l'interface" -"Comparable on the Frontend","Comparable depuis l'interface" -"Compare","Comparer" -"Compare Products","Comparer des produits" -"Conditions Combination","Combinaison de conditions" -"Configurable Product","Produit configurable" -"Configurable Product Settings","Réglages du produit configurable" -"Configure Product","Configurer produit" -"Continue","Continuer" -"Copy From Configurable","Copier depuis configurable" -"Country/State","Pays/État" -"Create","Créer" -"Create (Upload)","Créer (envoyer)" -"Create Empty","Créer vide" -"Create Permanent Redirect for URLs if URL Key Changed","Créer une Redirection Permanente pour les URL si la Combinaison URL a changé" -"Create Permanent Redirect for old URL","Créer une redirection permanente pour une vieille URL" -"Create Product Settings","Créer les réglages du produits" -"Create Simple Associated Product","Créer des produits simples associés" -"Create attribute set based on another set","Créer un ensemble d'attributs basé sur un autre ensemble" -"Create new attribute","Créer un nouvel attribut" -"Create new category","Créer une nouvelle catégorie" -"Create new product","Créer un nouveau produit" -"Cross-sells","Ventes liées" -"Currently Shopping by:","Shopping actuel par :" -"Custom Design","Dessin sur mesure" -"Custom Options","Personnaliser les options" -"Custom options","Options personnalisées" -"Customer Group","Groupe du client" -"Customers Reviews","Avis des clients" -"Customers Tagged Product","Les acheteurs ont étiqueté le produit" -"Data Type for Saving in Database","Type de données pour enregistrement dans la base de données" -"Date & Time Custom Options","Options de date et d'heure personnalisées" -"Date Fields Order","Ordre des champs de date" -"Date Subscribed","Date d'abonnement" -"Datetime","Date et heure" -"Decimal","Décimal" -"Declare attribute value saving scope","Déclarer la valeur d'économies" -"Default ""What's This"" Text Message","Message texte par défaut ""Qu'est-ce""" -"Default Popup Text Message","Message text pop-up par défaut" -"Default Price","Prix par défaut" -"Default Price Navigation Step","Prix par défaut pour la navigation" -"Default Qty","Qté par défaut" -"Default Values","Valeurs par défaut" -"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","Définit l'étendue de base des monnaies (""Monnaies"" > ""Options des monnaies"" > ""Monnaies de base"")" -"Delete","Supprimer" -"Delete Attribute","Supprimer l'attribut" -"Delete Attribute Set","Supprimer l'ensemble d'attributs" -"Delete Category","Supprimer catégorie" -"Delete Group Price","Supprimer le prix de groupe" -"Delete Option","Supprimer option" -"Delete Row","Supprimer ligne" -"Delete Search","Supprimer recherche" -"Delete Selected Group","Supprimer le groupe sélectionné" -"Delete Tier","Supprimer le niveau" -"Delete attribute","Supprimer l'attribut" -"Delete category","Supprimer catégorie" -"Delete product","Supprimer produit" -"Depends on design theme","Dépend du thème visuel" -"Design","Design" -"Details","Détails" -"Disabled","Désactivé" -"Disallowed file type.","Type de fichier non autorisé." -"Display Actual Price","Afficher le prix réel" -"Display Page Control","Afficher la page de commande" -"Display Price Interval as One Price","Afficher l'intervalle de prix comme Un Prix" -"Display Product Count","Afficher le nombre de produits" -"Display Type","Type d'affichage" -"Display in Suggested Terms","Afficher dans les termes suggérés." -"Double click on a group to rename it","Double cliquez sur un groupe pour le renommer" -"Double click on above image to view full picture","Double cliquez sur une image pour taille réelle" -"Downloadable Information","Informations téléchargeables" -"Duplicate","Copier" -"Duplicate amount found.","Montant copié trouvé." -"Duplicate website group price customer group.","Copier le site internet prix de groupe clientèle." -"Duplicate website tier price customer group and quantity.","Dupliquer le prix de groupe client du site et la quantité." -"Duplicate website, country and state tax found.","Copie du site web, du pays et de la région trouvée." -"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}.Des chemins dynamiques ont un impact sur les performances du catalogue." -"Edit","Éditer" -"Edit Attribute Set '%s'","Modifier le jeu d'attributs : '%s'" -"Edit Product Attribute","Modifier l'attribut du produit" -"Edit Product Attribute ""%s""","Modifier attribut de produit ""%s""" -"Edit Search","Modifier la recherche" -"Edit Search '%s'","Modifier la recherche '%s'" -"Edit Set Name","Modifier le nom défini" -"Email","Email" -"Email to a Friend","Envoyer à un ami par email" -"Empty","Vide" -"Enable MAP","Activer MAP" -"Enable Qty Increments","Activer quantité" -"Enable WYSIWYG","Permettre WYSIWYG" -"Enable for reindexing a big number of SKUs.","Activer pour réindexer un grand nombre d'UGS" -"Enabled","Activé" -"Error during retrieval of option value: %s","Erreur lors de la récupération de la valeur de l'option:% s" -"Exclude","Exclure" -"Expand All","Tout développer" -"Failed","Echoué" -"Failed to copy file %s. Please, delete media with non-existing images and try again.","Echec de la copie du fichier %s. Veuillez supprimer les fichiers avec des images non existantes, et réessayer." -"Failed to move file: %s","Impossible de déplacer le fichier: %s" -"Feature Products","Produits à l'affiche" -"Field is not complete","Le champ n'est pas complet" -"File options format is not valid.","Le format des options du fichier n'est pas valide." -"File upload failed","L'envoi du fichier a échoué." -"Filter","Filtrer" -"Filter model name must be declared.","Un nom de modèle de filtre doit être précisé." -"Filter must be an object. Please set correct filter.","Le filtre doit être un objet. Veuillez définir un filtre correct." -"Filterable (no results)","Filtrable (pas de résultat)" -"Filterable (with results)","Filtrable (avec résultats)" -"First Name","Prénom" -"Fixed","Fixé" -"For internal use.","Pour usage interne." -"For the last time placed.","Placé pour la dernière fois." -"Frontend","Interface" -"Frontend Model","Modèle d'interface" -"Frontend Properties","Propriétés front-end" -"Gallery","Galerie" -"General Information","Informations générales" -"Get full information about attribute with list of options","Obtenez toutes les informations des attributs avec une liste des options" -"Get full information about custom option in product","Obtenez des renseignements complets sur l'option personnalisée dans le produit" -"Get list of available custom option types","Obtenez la liste des types d'options personnalisées disponibles" -"Get list of non-default attributes by product type and attributes set","Obtenez une liste des attributs, autres que celui par défaut, par type de produits et ensemble d'attributs" -"Get list of possible attribute types","Obtenir la liste des types d'attributs possibles" -"Get special price","Obtenez un prix spécial" -"Global","Global" -"Globally Editable","Globalement modifiable" -"Go to Home Page","Aller à la page d'accueil" -"Grid","Grille" -"Group add","Groupe ajouter" -"Group remove","Suppression de groupe" -"Grouped Product","Produits groupés" -"Groups","Groupes" -"Home","Accueil" -"ID","ID" -"ID: %s","Identifiant : %s" -"If empty, the Category Name will be used","Si vide, la catégorie Nom sera utilisé." -"If empty, the Product Name will be used","Si vide, le nom du produit sera utilisé" -"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Si vous ne précisez pas une valeur d'option pour une vue spécifique de boutique alors la valeur par défaut sera utilisée." -"Image","Image" -"Image content is not valid base64 data.","Le contenu de l'image n'est pas valide à base64." -"Image does not exist.","L'image n'existe pas." -"Image file was not found.","Fichier image introuvable." -"Image type and information need to be specified for each store view.","Le type d'image et les informations doivent être précisés pour chaque vue de la boutique." -"In Cart","Dans le panier" -"In Stock","En stock." -"In stock","En stock" -"Incl. Tax","TTC" -"Index product and categories URL rewrites","Réécriture de l'index des produits et catégories" -"Index product attributes for layered navigation building","Attributs de la navigation par couches de l'index des produits" -"Index product prices","Prix de l'index des produits" -"Indexed category/products association","Catégorie indexée/association de produits" -"Info","Détails" -"Info Column Options Wrapper","Colonne infos options enrouler" -"Input Type","Entrer le type" -"Integer","Entier" -"Interval Division Limit","Limite de la division d'intervalle" -"Invalid Tier Prices","Prix invalides" -"Invalid attribute %s","Attribut %s invalide" -"Invalid attribute option specified for attribute %s (%s), skipping the record.","Option d'attribut invalide spécifiée pour l'attribut %s (%s), enregistrement sauté." -"Invalid attribute set specified, skipping the record.","Attribut de l'ensemble spécifié non-valide, passer le dossier." -"Invalid block: %s.","Bloc invalide : %s." -"Invalid category IDs.","Identifiants de catégorie invalides." -"Invalid category.","Catégorie non-valide." -"Invalid image file type.","Type de fichier image invalide." -"Invalid image type.","Type d'image non-valide." -"Invalid option ID specified for %s (%s), skipping the record.","Identifiant de l'option invalide pour %s (%s), ignorer." -"Invalid product type specified, skipping the record.","Le type de produit spécifié n'est pas valide, passer le dossier." -"Invalid store specified","Boutique spécifiée invalide" -"Invalid store specified, skipping the record.","Magasin spécifié invalide, enregistrement sauté." -"Invalid tier prices. The product is not associated to the requested website.","Niveau de prix non-valide. Le produit n'est pas associé au site demandé." -"Inventory","Inventaire" -"Is Default","Est par défaut" -"Is Required","Est requis" -"Items %s to %s of %s total","Éléments %s à %s sur un total de %s" -"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Les éléments que vous ne souhaitez pas afficher dans les résultats de recherche ou dans le catalogue devrait avoir le statut ""Désactivé"" dans le magasin souhaité." -"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Objets que vous ne voulez pas afficher dans le catalogue ou les résultats de recherche doivent avoir le statut ""Désactivé"" dans la boutique en question." -"Keep your eyes open for our special Back to School items and save A LOT!","Gardez vos yeux ouverts pour nos articles spécialement destinés à la rentrée scolaire et économisez UN MAX !" -"Label","Label" -"Last Name","Nom de famille" -"Last Notification","Dernière notification" -"Layered Navigation","Navigation par couches" -"Learn More","En savoir plus" -"Line %d, Email: %s","Ligne %d, email : %s" -"Line %d, SKU: %s","Ligne %d, SKU : %s" -"Link (Related, Up sell, Cross sell)","Lien (lié, vente)" -"Link product does not exist.","Le lien du produit n'existe pas." -"Link to a Specified Category","Lien vers une catégorie précise" -"Link to a Specified Product","Lien vers un produit déterminé" -"List","Liste" -"List Mode","Mode liste" -"List of Products that are set as New","Liste de produits nouveaux" -"List of types","Liste de types" -"Manage Attribute Sets","Gérer les jeux d'attributs" -"Manage Attributes","Gérer attributs" -"Manage Catalog Categories","Gérer les catégories de catalogue" -"Manage Categories","Gérer les catégories" -"Manage Label / Options","Gérer les labels/options" -"Manage Options (values of your attribute)","Gérer les options (valeurs de l'attribut)" -"Manage Product Attributes","Gérer les attributs de produit" -"Manage Product Sets","Gérer les jeux de produits" -"Manage Products","Gérer les produits" -"Manage Stock","Gérer le stock" -"Manage Titles (Size, Color, etc.)","Gérer les titres (taille, couleur, etc)" -"Max Characters","Caractères max." -"Maximal Depth","Profondeur maximale" -"Maximum Image Size","Taille maximum de l'image" -"Maximum Number of Price Intervals","Nombre maximal d'intervalles de prix" -"Maximum Qty Allowed in Shopping Cart","Quantité maximum autorisée dans le panier" -"Maximum allowed image size for '%s' is %sx%s px.","La taille d'image maximale autorisée pour '%s' est %sx%sp px." -"Maximum image height","Hauteur maximale de l'image" -"Maximum image width","Largeur maximale de l'image" -"Maximum number of characters:","Nombre de caractères maximum :" -"Maximum number of price intervals is 100","Le nombre maximal d'intervalles de prix est de 100" -"Media Image","Image media" -"Minimum Advertised Price","Prix minimum annoncés" -"Minimum Lines per Page","Lignes minimum par page" -"Minimum Qty Allowed in Shopping Cart","Quantité minimum autorisée dans le panier" -"Minimum Qty for Item\'s Status to be Out of Stock","Quantité minimum pour que le statut de l'article soit ""Rupture de stock""" -"Missing SKU, skipping the record.","SKU manquant, le dossier est sauté." -"More Views","Plus de vues" -"Move","Déplacer" -"Move category in tree","Déplacez la catégorie dans l'arbre" -"Multi update product","Produit à plusieurs mises à jour" -"Must be in the allowed values list.","Doit être dans la liste des valeurs autorisées." -"My Account","Mon compte" -"N/A","N/A" -"Name","Nom" -"Name in %s","Nom dans %s" -"New Product","Nouveau produit" -"New Product Attribute","Nouvel attribut de produit" -"New Products","Nouveaux produits" -"New Products Grid Template","Modèle de grille nouveaux produits" -"New Products List Template","Modèle de liste nouveaux produits" -"New Root Category","Nouvelle catégorie principale" -"New Search","Nouvelle recherche" -"New Set Name","Nouveau nom d'ensemble" -"New Subcategory","Nouvelle sous-catégorie" -"New products","Nouveaux produits" -"Next","Suivant" -"No","Non" -"No image","Pas d'image" -"No layout updates","Aucune mise à jour de mise en page" -"No options of this product are available.","Il n'y a pas d'options disponibles pour ce produit" -"No product collections found.","Pas de collection de produits trouvée." -"None","aucun" -"Not Visible Individually","Pas visibles individuellement" -"Notify Low Stock RSS","Notifier le faible stock dans le RSS" -"Notify for Quantity Below","Notifier pour les quantités en dessous de" -"Number of Products per Page","Nombre de produits par page" -"Number of Products to Display","Nombre de produits à afficher" -"Number of Uses","Nombre d'utilisations" -"Number of results","Nombre de résultats" -"Number of results (For the last time placed)","Nombre de résultats (pour la dernière fois)" -"OK","OK" -"OR","OU" -"Old Price:","Ancien prix :" -"On Gesture","Par geste" -"Option validation failed to add product to cart.","Échec de l'ajout de la validation de l'option au panier." -"Option values","Valeurs d'option" -"Option:","Option:" -"Options","Options" -"Options Control","Contrôle de l'option" -"Options is required","Option requise" -"Our customer service is available 24/7. Call us at (555) 555-0123.","Notre service client est disponible 24 heures sur 24, 7 jours sur 7. Appelez-nous au (555) 555-0123." -"Out of Stock","En rupture de stock" -"Out of stock","Epuisé" -"PM","PM" -"Page Title Separator","Séparateur titre de la page" -"Parent Category","Catégorie parent" -"Pending","En cours" -"Pending Reviews RSS","RSS des avis en attente" -"Percentage","Pourcentage" -"Please add rows to option.","Veuillez ajouter des lignes à l'option." -"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","Veuillez faire attention : une fois que vous cliquez sur la ligne, les données du paquet sélectionné se chargeront et toutes les données non-enregistrées seront perdues." -"Please click on the Close Window button if it is not closed automatically.","Veuillez cliquer sur le bouton Fermer la fenêtre si celle-ci n'est pas fermée automatiquement." -"Please enter a new group name","Veuillez entrer un nouveau nom de groupe" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Veuillez rafraîchir ""Réécritures de l'URL du catalogue"" et ""Attributs du produit"" dans l' Index Management du système" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Veuillez actualiser""URL de réécriture du catalogue"" et ""Attributs de produits"" dans Système -> Gestion de l'Index" -"Please refresh ""Product Attributes"" in System -> Index Management","Veuillez rafraîchir ""Attributs du produit"" dans l' Index Management du système" -"Please select a static block ...","Veuillez sélectionner un bloc statique..." -"Please select items.","Veuillez sélectionner des articles." -"Please select one or more attributes.","Veuillez sélectionner un ou plusieurs attribut(s)." -"Please select product(s).","Veuillez sélectionner le(s) produit(s)." -"Please select products for attributes update","Veuillez sélectionner des produits pour la mise à jour des attributs" -"Please set up merge date/time","Veuillez définir la fusion date/heure" -"Please set up merge date/time later then present date","Veuillez mettre en place une fusion date/heure ultérieure à la date actuelle" -"Please specify date required option(s).","Veuillez spécifier l'(les) option(s) requise(s) pour la date." -"Please specify the number of products, that will not be divided into subintervals.","Veuillez spécifier le nombre de produits qui ne seront pas divisés en sous-intervalles." -"Please specify the product required option(s)","Veuillez spécifier l'option/ les options requise(s) pour le produit" -"Please specify the product required option(s).","Veuillez spécifier l'option/les options requise(s) pour le produit." -"Please specify the product\'s option(s).","Veuillez spécifier les options du produit." -"Please specify the product\'s required option(s).","Veuillez spécifier l'option/les options requise(s) du produit." -"Please specify the quantity of product(s).","Veuillez spécifier la quantité de produit(s)." -"Please specify time required option(s).","Veuillez spécifier les options dépendant du temps." -"Please wait...","Veuillez patienter..." -"Position","Position" -"Position in Layered Navigation","Position dans la navigation par niveau" -"Position of attribute in layered navigation block","Position de l'attribut dans le bloc navigation par niveaux" -"Prev","Préc" -"Previous","Précédent" -"Price","Prix" -"Price Navigation Step Calculation","Calcul Prix Etape de Navigation" -"Price Type","Type de prix" -"Price is not available","Le prix n'est pas disponible" -"Price values for options should be specified in system base currency.","Les valeurs des prix pour les options devraient être définies dans une devise de base du système" -"Price:","Prix:" -"Price: %s","Prix : %s" -"Print This Page","Imprimer cette page" -"Product","Produit" -"Product API","Produit API" -"Product Alerts","Alertes produit" -"Product Attribute","Attribut de produit" -"Product Attributes","Attributs Produit" -"Product Categories","Catégories Produit" -"Product Description","Description du produit" -"Product Extra Info","Informations supplémentaires sur le produit" -"Product Flat Data","Données fixes du produit" -"Product ID","ID produit" -"Product Image Placeholders","Paramètres Image du Produit" -"Product Image Watermarks","Filigranes Image du Produit" -"Product Images","Images du Produit" -"Product Images API","Images API du Produit" -"Product In Websites","Produit dans les Sites Internet" -"Product Info Column","Colonne d'informations du Produit" -"Product Information","Information produit" -"Product Link Block Template","Produit Lien Modèle Bloc" -"Product Link Inline Template","Produit Lien Modèle Conforme" -"Product Listing Sort by","Liste des Produits triés par" -"Product Name","Nom du produit" -"Product Prices","Prix des Produits" -"Product Reviews","Avis sur le produit" -"Product Tags","Étiquettes des produits" -"Product Tier Price API","Produit Niveau de Prix API" -"Product Type","Type de Produit" -"Product URL Suffix","Suffixe URL du produit" -"Product View Extra Hint","Vue par produit trace supplémentaire" -"Product attribute sets API","Jeux d'attributs Produit API" -"Product attributes API","Attributs API du produit" -"Product collection expected.","Collection du produit attendu." -"Product is not loaded","Le produit n'est pas chargé" -"Product links API (related, cross sells, up sells)","API de liens de produits (liés, ventes croisées ...)" -"Product types API","Types API du produit" -"Product with this combination of attributes already associated to configurable.","Les produits avec cette combinaison d'attributs sont déjà associés à configurable." -"Products","Produits" -"Products Comparison List","Liste de comparaison des produits" -"Products Information","Information des produits" -"Products Reviews","Avis sur les produits" -"Products Sitemap","Plan du site produits" -"Products only","Produits seulement" -"Products per Page on Grid Allowed Values","Produits par page sur les valeurs autorisées des lignes" -"Products per Page on Grid Default Value","Produits par page sur les valeurs par défaut des lignes" -"Products per Page on List Allowed Values","Produit par page sur les valeurs autorisées des listes" -"Products per Page on List Default Value","Produits par page sur la valeur par défaut de la liste" -"Properties","Propriétés" -"Qty","Qté" -"Qty Increments","Augmentation de la quantité" -"Qty Uses Decimals","La quantité utilise des décimales" -"Qty for Item\'s Status to Become Out of Stock","Nombre de statuts de produits bientôt épuisés" -"Qty:","Qté:" -"Quantity","Quantité" -"Quick Create","Création Rapide" -"Quick Overview","Vue générale rapide" -"Quick simple product creation","Création de produit rapide et simple" -"Records for ""%s"" store found.","Enregistrements trouvés pour ""%s"" boutique." -"Redirect","Redirection" -"Redirect URL","Rediriger l'adresse URL" -"Regular Price:","Prix normal" -"Related Products","Produits apparentés" -"Remove","Supprimer" -"Remove Product From Websites","Supprimer le produit des sites web" -"Remove This Item","Retirer cet article" -"Remove attribute from attribute set","Supprimer un attribut de l'ensemble des attributs" -"Remove attribute set","Supprimer un ensemble d'attributs" -"Remove custom option","Supprimer l'option personnalisée" -"Remove group from attribute set","Supprimer un groupe de l'ensemble des attributs" -"Remove option","Retirer l'option" -"Remove product assignment","Supprimer l'affectation du produit" -"Remove product image","Enlever l'image du produit" -"Remove product link","Supprimer le lien du produit" -"Remove value from custom option","Retirer la valeur de l'option personnalisée" -"Rename existing group","Renommer un groupe existant" -"Rename group","Renommer un groupe" -"Reorganize EAV category structure to flat structure","Réorganiser la structure de la catégorie EAV en structure plate" -"Reorganize EAV product structure to flat structure","Réorganiser la structure du produit EAV en structure plate" -"Reset","Réinitialiser" -"Results","Résultats" -"Results per page","Résultats par page" -"Retrieve attribute data","Récupérer les données d'attributs" -"Retrieve attribute list","Extraire la liste de l'attribut" -"Retrieve attribute options","Extraire les options de l'attribut" -"Retrieve categories tree","Récupérer l'arbre des catégories" -"Retrieve category attributes","Extraire les attributs de la catégorie" -"Retrieve category data","Extraire les données de la catégorie" -"Retrieve hierarchical tree","Extraire l'arborescence hiérarchique" -"Retrieve linked products","Extraire les produits apparentés" -"Retrieve list of assigned products","Extraire la liste des produits affectés" -"Retrieve list of option values","Récupérer la liste des valeurs d'option" -"Retrieve list of product custom options","Récupérer la liste des options personnalisées de produit" -"Retrieve one level of categories by website/store view/parent category","Extraire un niveau de catégorie par site web/magasin/catégorie apparentée" -"Retrieve option value info","Récupérer les informations sur la valeur optionnelle" -"Retrieve product","Extraire le produit" -"Retrieve product attribute sets","Récupérer les ensembles d'attributs du produit" -"Retrieve product image","Extraire l'image du produit" -"Retrieve product image list","Récupérer la liste image du produit" -"Retrieve product image types","Extraire les types d'images du produit" -"Retrieve product link type attributes","Extraire les attributs du type de lien du produit" -"Retrieve product link types","Extraire les types de lien du produit" -"Retrieve product tier prices","Extraire les niveaux de prix du produit" -"Retrieve product types","Extraire les types de produit" -"Retrieve products data","Récupérer les données produits" -"Retrieve products list by filters","Extraire la liste des produits par filtrage" -"Reviews","Commentaires" -"Roll Over for preview","Passez votre souris par-dessus pour la prévisualisation" -"Root","Racine" -"SKU","UGS" -"SKU length should be %s characters maximum.","La longueur de l'UGS doit être de %s caractères maximum." -"Save","Sauvegarder" -"Save Attribute","Sauvegarder Attribut" -"Save Attribute Set","Enregistrer l'ensemble d'attributs" -"Save Category","Sauvegarder catégorie" -"Save Search","Sauvegarder recherche" -"Save and Continue Edit","Sauvegarder et continuer l'édition" -"Saved %d record(s)","Sauvegardé %d enregistrement(s)" -"Scope","Portée" -"Scope must not be changed, because the attribute is used in configurable products.","Le champ ne doit pas être changé, car l'attribut est utilisé dans des produits configurables." -"Search","Rechercher" -"Search Engine Optimizations","Optimisations du Moteur de Recherche" -"Search Information","Informations de recherche" -"Search Query","Demande de recherche" -"Search Term with such search query already exists.","Le terme recherché avec la même interrogation existe déjà." -"Search Weight","Recherche de poids" -"Searchable","Consultable" -"See price before order confirmation.","Voir le prix avant la confirmation de commande." -"Select Category...","Sélectionner Catégorie" -"Select Configurable Attributes ","Sélectionner les attributs configurables" -"Select Product...","Sélectionner Produit..." -"Select type of option","Sélectionner le type d'option" -"Select type options required values rows.","La sélection du type d'options a requis des rangs de valeurs." -"Selected Product Types","Types de Produits Sélectionnés" -"Send Count","Envoyer Compte" -"Set Ascending Direction","Par ordre croissant" -"Set Descending Direction","Définir Direction Descendante" -"Set Name","Définir le nom" -"Set Root Category for Store","Sélectionner Catégorie d'Origine pour Boutique" -"Set root category for this store in the configuration","Définir une catégorie source pour ce magasin dans la configuration" -"Set special price","Définir prix spécial" -"Set/Get current store view","Réglez/Obtenez la vue actuelle du magasin" -"Settings","Options" -"Share Facebook","Partager Facebook" -"Share on Facebook","Partager sur Facebook" -"Share on Twitter","Partager sur Twitter" -"Shop By","Acheter par" -"Shopping Options","Options d'Achat" -"Show","Afficher" -"Show Details","Afficher les détails" -"Show Tags","Afficher Tags" -"Simple Product","Produit Simple" -"Site Map","Plan du Site" -"Sitemap","Plan du site" -"Skip import row, is not valid value ""%s"" for field ""%s""","Sauter la ligne d'importation, ""%s"" n'est une valeur valable pour le champ ""%s""" -"Skip import row, required field ""%s"" for the new customer is not defined.","Sauter la ligne importation, le champ requis ""%s"" pour le nouveau client n'est pas défini." -"Skip import row, the value ""%s"" is invalid for field ""%s""","Sauter la ligne d'importation, la valeur ""%s"" n'est pas valable pour le champ ""%s""" -"Skipping import row, required field ""%s"" for new products is not defined.","Saut de la ligne importation en cours, le champ ""%s"", requis pour les nouveaux produits, n'est pas défini." -"Skipping import row, required field ""%s"" is not defined.","Sauter la ligne d'importation, le champ requis ""%s"" n'est pas défini." -"Skipping import row, store ""%s"" field does not exist.","Sauter la ligne d'importation, le champ point de vente ""%s"" n'existe pas." -"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Sauter la ligne d'importation, la valeur ""%s"" est invalide pour le champ ""%s""." -"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Certains des produits traités n'ont pas de valeur UGS définie. Veuillez la saisir avant d'effectuer des opérations sur ces produits." -"Some of the selected item options are not currently available.","Certaines des options d'article sélectionnées ne sont actuellement pas disponibles." -"Sort By","Trier par" -"Sort Order","Trier la commande" -"Source Model","Modèle source" -"Special Expires On: %s","Spécial expire le : %s" -"Special Price:","Prix Spécial:" -"Special Price: %s","Prix spécial : %s" -"Starting at:","Dès:" -"Static","Statique" -"Static block and products","Bloc statique et produits" -"Static block only","Bloc statique uniquement" -"Status","Statut" -"Stock Availability","Disponibilité du Stock" -"Store","Magasin" -"Store View","Vue du magasin" -"Stretch","Étirer" -"Subscribe to RSS Feed","S'abonner au flux RSS" -"Super product attributes configuration","Configuration attributs super produit" -"Synonym For","Synonyme de" -"System Properties","Propriétés Système" -"Tag Name","Nom de l'étiquette" -"Tax","Taxe" -"Template","Modèle visuel" -"Text","Texte" -"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","La module du Catalogue fixe a une limite de %2\$d attributs filtrables et/ou triables. Il y en a actuellement %1\$d. Veuillez réduire le nombre d'attributs filtrables/triables afin d'utiliser ce module." -"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value." -"The attribute code \'%s\' is reserved by system. Please try another attribute code","Le code d'attribut \'%s\' est réservé par le système. Veuillez essayer un autre code" -"The attribute model is not defined","Le modèle d'attribut n'est pas défini." -"The attribute set has been saved.","L'ensemble d'attributs a été enregistré." -"The base directory to upload file is not specified.","Le répertoire de base pour télécharger le fichier n'est pas spécifié." -"The category has been deleted.","La catégorie a été supprimée." -"The category has been saved.","La catégorie a été sauvegardée." -"The comparison list was cleared.","La liste de comparative a été vidée." -"The file '%s' for '%s' has an invalid extension","Le fichier '%s' pour '%s' a une extension invalide" -"The file '%s' you uploaded is larger than %s Megabytes allowed by server","Le fichier '%s' que vous ave envoyé est plus gros que les %s Mb autorisés par le serveur" -"The file you uploaded is larger than %s Megabytes allowed by server","Le fichier que vous avez téléchargé est supérieur aux %s Mb autorisés par le serveur" -"The filters must be an array.","Les filtres doivent être une matrice." -"The image contents is not valid base64 data.","Le contenu de l'image n'est pas valide en données de base64." -"The image is not specified.","L'image n'est pas spécifiée." -"The model collection resource name is not defined.","Le nom de la ressource du modèle collection n'est pas défini." -"The product %s has been added to comparison list.","Le produit %s a été ajouté à la liste comparative." -"The product %s has been removed from comparison list.","Le produit %s a été retiré de la liste comparative." -"The product attribute has been deleted.","L'attribut produit a été supprimé." -"The product attribute has been saved.","L'attribut produit a été sauvegardé." -"The product has been created.","Le produit a été créé." -"The product has been deleted.","Le produit a été supprimé." -"The product has been duplicated.","Le produit a été dupliqué." -"The product has been saved.","Le produit a été sauvegardé." -"The product has required options","Le produit a des options obligatoires." -"The review has been deleted","Le rapport a été supprimé" -"The review has been saved.","Le rapport a été enregistré." -"The review was removed by another user or does not exist.","Le rapport a été supprimé par un autre utilisateur ou n'existe pas." -"The search was deleted.","La recherche a été supprimée." -"The text is too long","Le texte est trop long" -"There are no %s available.","Il n'y a pas de %s disponible." -"There are no customers for this alert","Il n'y a pas de client pour cette alerte." -"There are no customers for this alert.","Il n'y a pas de client pour cette alerte." -"There are no products matching the selection.","Aucun produit ne correspond à la sélection." -"There was an error while request processing.","Une erreur s'est produite lors du traitement de votre demande." -"This Attribute no longer exists","Cet attribut n'existe plus" -"This attribute cannot be deleted.","L'attribut ne peut pas être supprimé." -"This attribute cannot be edited.","Cet attribut ne peut pas être modifié." -"This attribute cannot be updated.","L'attribut ne peut pas être mis à jour." -"This attribute is used in configurable products.","Cet attribut est utilisé dans les produits configurables." -"This attribute is used in configurable products. You cannot remove it from the attribute set.","L'attribut est utilisé dans des produits paramétrables. Vous ne pouvez pas le retirer de la série d'attributs." -"This attribute no longer exists","Cet attribut n'existe plus" -"This attribute set no longer exists.","La série d'attributs n'existe plus." -"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","Le groupe contient des attributs, utilisés dans des produits paramétrables. Veuillez déplacer ces attributs vers un autre groupe et réessayer." -"This group contains system attributes. Please move system attributes to another group and try again.","Le groupe contient des attributs système. Veuillez déplacer les attributs système vers un autre groupe et réessayer." -"This is a required option","Cette option est requise" -"This product no longer exists.","Ce produit n'existe plus." -"This search no longer exists.","Cette recherche n'existe plus." -"This setting will be applied when all prices in the specific price interval are equal.","Ce paramètre sera appliqué lorsque tous les prix dans l'intervalle de prix spécifique sont égaux." -"Tier Pricing","Catégorie de prix" -"Tile","Carreau" -"Time Format","Format horaire" -"Title","Titre" -"To reindex the enabled product(s), the store or product must be specified","Pour réindexer les produits activés, la boutique ou le produit doit être spécifié" -"To see product price, add this item to your cart. You can always remove it later.","Pour voir le prix du produit, ajoutez ce produit à votre panier. Vous pourrez toujours le supprimer plus tard." -"Top/Left","Supérieur/Gauche" -"Top/Right","Haut / Droite" -"Total Qty Base Items","Qté Totale d'articles de base" -"Total Qty Content Items","Qté totale des articles contenus" -"Total incl. Tax: %1$s","Total, TVA incl. : %1s" -"Total of %d record(s) have been deleted.","Un total de %d entrée(s) ont été supprimées." -"Total of %d record(s) have been updated.","Un total de %d entrée(s) ont été mises à jour." -"Total of %d record(s) were updated","Un total de %d enregistrements ont été mis à jour." -"Type","Type" -"URL Rewrite Management","Gestion de réécriture d'URL" -"Unable to complete this request.","Impossible de répondre à la demande." -"Unable to find a search term to delete.","Impossible de trouver un terme de recherche à supprimer." -"Unable to find an attribute to delete.","Impossible de trouver un attribut à supprimer." -"Unable to get the product ID.","Impossible d'obtenir l'ID produit." -"Unassigned Attributes","Attributs non assignés" -"Unknown EAV indexer type ""%s"".","Type d’indexer EAV inconnu ""%s""." -"Unknown attribute: %s.","Attribut inconnu: %s." -"Unsupported product type ""%s"".","Type de produit ""%s"" non pris en charge." -"Up-sells","Ventes additionnelles" -"Update","Mise à jour" -"Update Attributes","Mettre à jour les attributs" -"Update Tier Price","Mettre à jour le niveau de prix" -"Update assigned product","Mettre à jour le produit assigné" -"Update attribute","Mettre à jour l'attribut" -"Update attributes","Attributs de la mise à jour" -"Update category","Mettre à jour la catégorie" -"Update custom option of product","Mettre à jour l'option personnalisée du produit" -"Update product","Mettre à jour le produit" -"Update product image","Mettre à jour l'image du produit" -"Update product link","Mettre à jour le lien du produit" -"Update product tier prices","Mettre à jour le niveau des prix du produit" -"Update value of custom option","Mettre à jour la valeur de l'option personnalisée" -"Upload new product image ","Charger une nouvelle image produit" -"Use Canonical Link Meta Tag For Categories","Utiliser les méta-données du lien canonique pour les catégories" -"Use Canonical Link Meta Tag For Products","Utiliser Canonical Link Meta Tag pour les produits" -"Use Categories Path for Product URLs","Utiliser le Chemin des Catégories pour les URL de Produits" -"Use Config Settings","Utiliser les Paramètres de Configuration" -"Use Default Value","Utiliser la valeur par défaut" -"Use Flat Catalog Category","Utiliser la Catégorie des Catalogues à Plat" -"Use Flat Catalog Product","Utiliser un Produit de Catalogue à Plat" -"Use In Layered Navigation","Utiliser en Navigation par Couches" -"Use In Search Results Layered Navigation","Utilisez la page de résultats de navigation en couches" -"Use JavaScript Calendar","Utiliser le Calendrier JavaScript" -"Use Static URLs for Media Content in WYSIWYG for Catalog","Utilisez des URL statiques pour le contenu multimédia en mode WYSIWYG pour le catalogue" -"Use To Create Configurable Product","Permet de créer des produits configurables" -"Use Tree Like Category Sitemap","Utiliser la carte du site sous forme de hiérarchie" -"Use config","Utiliser config" -"Use default","Utiliser le défaut" -"Use for Promo Rule Conditions","Utiliser pour les conditions de la promotion" -"Use four-digit year format.","Utiliser un format de date sur quatre caractères" -"Use in Advanced Search","Utiliser en recherche avancée" -"Use in Layered Navigation","Utiliser dans la navigation en couches" -"Use in Layered Navigation
    (Can be used only with catalog input type 'Dropdown')","Utiliser en Navigation par Couches
    (Utilisable seulement avec le type d'entrée catalogue 'Liste déroulante')" -"Use in Quick Search","Utilisation dans la recherche rapide" -"Used for Sorting in Product Listing","Utilisé pour Trier dans une Liste de Produits" -"Used in Product Listing","Utilisé dans une Liste de Produits" -"Value for ""%s"" is invalid.","La valeur pour ""%s"" est invalide." -"Value for ""%s"" is invalid: %s","La valeur pour ""%s"" est invalide : %s" -"Varchar","Varchar" -"View Details","Afficher détails" -"View as","Visualiser comme" -"Virtual Product","Produit virtuel" -"Visibility","Visibilité" -"Visible","Visible" -"Visible on Catalog Pages on Front-end","Visible sur les Pages Catalogue dans l'interface utilisateur" -"Visible on Product View Page on Front-end","Visible sur la Page Vue Produit dans l'interface utilisateur" -"WYSIWYG Editor","Éditeur WYSIWYG" -"Watermark","Filigrane" -"Watermark Default Size","Taille par Défaut du Filigrane" -"Watermark Opacity, Percent","Opacité du Filigrane, en Pourcentage" -"Watermark Position","Position du Filigrane" -"We Also Recommend","Nous conseillons aussi" -"Website","Site" -"Website Item Must be checked","L'élément de Site Web doit être vérifié" -"Website Store Must be checked","Le site web du magasin doit être vérifié" -"Websites","Site web" -"What's this?","Qu'est-ce ?" -"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Afficher ""Toutes"" les options dans la liste déroulante ""Afficher x par page""." -"Will make search for the query above return results for this search.","Effectuera une recherche pour la question ci-dessus et reviendra aux résultats de cette recherche." -"Wrong BuyRequest instance in options group.","Mauvaise instance de Buyrequest dans le groupe d'options." -"Wrong configuration item instance in options group.","Configuration de l'instance d'objet incorrecte dans les options de groupe" -"Wrong configuration item option instance in options group.","Configuration de l'instance d'objet incorrecte dans les options de groupe" -"Wrong option instance type in options group.","Mauvaise instance d'options dans le groupe d'options." -"Wrong option type to get group instance.","Mauvais type d'option pour obtenir l'instance du groupe." -"Wrong product instance type in options group.","Mauvais type de produit d'exemple dans le groupe d'options." -"Wrong product type filter specified","Mauvais filtre de type de produit spécifié" -"Wrong product type to extract configurable options.","Mauvais type de produit pour extraire des options configurables." -"Year Range","Années" -"Yes","Oui" -"You cannot remove system attribute from this set.","Vous ne pouvez pas retirer d'attribut système de cet ensemble." -"You have no items to compare.","Vous n'avez pas d'articles à comparer." -"You may also be interested in the following product(s)","Vous pourriez aussi être intéressé(e) par le(s) produit(s) suivant(s)" -"Zoom In","Zoom avant" -"Zoom Out","Zoom Arrière" -"and","et" -"and above","et ci-dessus" -"categories","catégories" -"each","chaque" -"ex. http://domain.com","ex. http://domain.com" -"leave blank if its not an image","laisser vide si ce n'est pas une image" -"per page","par page" -"products","produits" -"px.","px." -"save","enregistrer" -"select all","sélectionner tous" -"unselect all","désélectionner tous" -"x","x" diff --git a/app/locale/fr_FR/Mage_CatalogInventory.csv b/app/locale/fr_FR/Mage_CatalogInventory.csv deleted file mode 100644 index d5cee65dd..000000000 --- a/app/locale/fr_FR/Mage_CatalogInventory.csv +++ /dev/null @@ -1,62 +0,0 @@ -"""%s"" is not available in the requested quantity. %s of the items will be backordered.","""% s"" n'est pas disponible dans la quantité demandée. %s des articles seront différés." -"%s is available for purchase in increments of %s only.","%s est disponible pour achat par incréments de %s seulement." -"%s is not a correct comparsion method.","%s n'est pas une méthode de comparaison correcte." -"Note that these settings are applicable to cart line items, not the whole cart.","Notez que ces paramètres sont applicables aux articles de lignes du caddy, non pas au caddy tout entier." -"Add Minimum Qty","Ajoutez une Qté minimum" -"Allow Qty Below 0","Permettre une quantité inférieure à 0" -"Allow Qty Below 0 and Notify Customer","Ajouter Qté inférieure à 0 et avertir le client" -"Automatically Return Credit Memo Item to Stock","Retournez automatiquement un article d'Avoir dans le stock" -"Backorders","Commandes en rupture de stock" -"By Fixed value","Par valeur fixée" -"By Percentage","Par pourcentage" -"Cannot specify product identifier for the order item.","Ne peut spécifier l'identifiant du produit pour l'article de la commande." -"Catalog Inventory","Inventaire de catalogue" -"Decrease Stock When Order is Placed","Diminuer le stock quand la commande est passée" -"Display Out of Stock Products","Afficher les produits en rupture de stock" -"Display products availability in stock in the frontend","Afficher la disponibilité des produits en stock dans le début" -"Enable Qty Increments","Activer incréments de la Qté" -"In Stock","En stock" -"Index Product Stock Status","Indexe état du stock de produit" -"Inventory","Inventaire" -"Inventory API","Inventaire API" -"Inventory Section","Section de l'inventaire" -"Manage Stock","Gérer le stock" -"Maximum Qty Allowed in Shopping Cart","Qté maximum permise dans le caddy" -"Minimum Qty","Qté minimum" -"Minimum Qty Allowed in Shopping Cart","Qté minimum permise dans le caddy" -"Multi update product stock data","Plusieurs mises à jour des données du stock du produit" -"No Backorders","Pas de commande en rupture de stock" -"Not all products are available in the requested quantity","Tous les produits ne sont pas disponibles dans la quantité requise" -"Notify for Quantity Below","Avertir pour quantité ci-dessous" -"Only %s left","Seuls %s restants" -"Only X left Threshold","Seul X a quitté le seuil" -"Out of Stock","Pas en stock" -"Product Name","Nom du produit" -"Product Stock Options","Options du stock de produit" -"Products will still be shown by direct product URLs.","Les produits seront encore affichés par des URL directes vers le produit." -"Qty","Qté" -"Qty Increments","Incréments de quantité" -"Qty for Item's Status to Become Out of Stock","Qté pour que le statut de l'article devienne épuisé" -"Retrieve stock data","Extrait données de stock" -"Retrieve stock data by product ids","Extrait données de stock par identifiants produit" -"Rule price","Dirige prix" -"Set Items' Status to be In Stock When Order is Cancelled","Met l'état de l'article comme étant en stock lorsque la commande est annulée" -"Some of the products are currently out of stock.","Certains des produits ne sont plus en stock." -"Some of the products cannot be ordered in requested quantity.","Certains des produits ne peuvent pas être commandés dans la quantité souhaitée." -"Some of the products cannot be ordered in the requested quantity.","Certains des produits ne peuvent être commandés dans la quantité requise." -"Stock Options","Options de stock" -"Stock Status","État de stock" -"The maximum quantity allowed for purchase is %s.","La quantité maximale autorisée pour la commande est %s." -"The minimum quantity allowed for purchase is %s.","La quantité minimale autorisée pour la commande est %s." -"The requested quantity for ""%s"" is not available.","La quantité demandée pour « % s » n'est pas disponible." -"The stock item for Product in option is not valid.","L'article de stock pour produit en option n'est pas valide." -"The stock item for Product is not valid.","L'article de stock pour produit n'est pas valide." -"This product is available for purchase in increments of %s only.","Le produit est disponible pour achat seulement en incréments de %s." -"This product is currently out of stock.","Ce produit est actuellement épuisé." -"This product is not available in the requested quantity. %s of the items will be backordered.","Ce produit n'est pas disponible dans la quantité demandée. %s des articles seront livrés ultérieurement" -"To Fixed Value","A valeur fixée" -"To Percentage","Au pourcentage" -"Undefined product type.","Type de produit indéfini." -"Update","Mise à jour" -"Update product stock data","Mise à jour des données du stock de produit" -"Update the Product","Mise à jour produit" diff --git a/app/locale/fr_FR/Mage_CatalogRule.csv b/app/locale/fr_FR/Mage_CatalogRule.csv deleted file mode 100644 index 38b3969c5..000000000 --- a/app/locale/fr_FR/Mage_CatalogRule.csv +++ /dev/null @@ -1,65 +0,0 @@ -"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","Les règles des prix du catalogue %d basées sur l'attribut ""%s"" ont été désactivées. -" -"Actions","Action" -"Active","Actif" -"Add New Rule","Ajouter nouvelle règle" -"An error occurred while deleting the rule. Please review the log and try again.","Une erreur s'est produite à la suppression de la règle. Réessayez après avoir lu le message d'erreur." -"An error occurred while saving the rule data. Please review the log and try again.","Une erreur s'est produite à la sauvegarde des données de la règle. Réessayez après avoir lu le message d'erreur." -"Apply","Appliquer" -"Apply Rules","Appliquer les règles" -"Attribute Set","Ensemble d'attributs" -"By Fixed Amount","Par quantité fixée" -"By Percentage of the Original Price","Par pourcentage du prix d'origine" -"Catalog","Catalogue" -"Catalog Price Rule","Règle de prix du catalogue" -"Catalog Price Rules","Règles de prix du catalogue" -"Category","Catégorie" -"Conditions","Conditions" -"Conditions (leave blank for all products)","Conditions (laisser vide pour tous les produits)" -"Conditions Combination","Combinaison de conditions" -"Customer Groups","Groupes de clients" -"Date Expire","Date d'expiration" -"Date From","Date de création" -"Date Start","Date de début" -"Date To","Date de fin" -"Description","Description" -"Discount Amount","Montant de réduction" -"Edit Rule","Éditer la règle" -"Edit Rule '%s'","Éditer la règle '%s'" -"Enable Discount to Subproducts","Autoriser les réductions sur les sous-produits" -"Expiration Date","Date d'expiration" -"From Date","Depuis" -"General Information","Informations générales" -"ID","ID" -"Inactive","Inactif" -"New Rule","Nouvelle règle" -"No","Non" -"Options","Options" -"Priority","Priorité" -"Product Attribute","Attribut de produit" -"Promotions","Promotions" -"Rule Information","Information de règle" -"Rule Name","Nom de règle" -"Save and Apply","Enregistrer et appliquer" -"Save and Continue Edit","Sauvegarder et continuer l'édition" -"Start Date","Date de début" -"Status","Statut" -"Stop Further Rules Processing","Ne pas aller plus loin dans le traitement des règles" -"The rule has been deleted.","La règle a été supprimée." -"The rule has been saved.","La règle a été sauvée." -"The rules have been applied.","Les règles ont été appliquées." -"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","Certaines règles ont été modifiées sans être appliquées. Seuls les utilisateurs bénéficiant d'un accès exclusif peuvent appliquer les règles." -"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Il y a des règles qui ont été changées mais pas appliquées. Cliquez sur ""Appliquer les règles"" pour un effet immédiat sur le catalogue." -"This rule no longer exists.","Cette règle n'existe plus." -"To Date","Date de fin" -"To Fixed Amount","Sur montant fixé" -"To Percentage of the Original Price","Sur pourcentage du prix d'origine" -"Type","Type" -"Unable to apply rules.","Impossible d'appliquer les règles" -"Unable to find a rule to delete.","Aucune règle à supprimer" -"Update Prices Using the Following Information","Mettre à jour les prix à l'aide des informations suivantes" -"Update product's %s %s: %s","Mettre à jour le %s %s du produit: %s" -"Website","Site web" -"Websites","Site web" -"Wrong rule specified.","Une mauvaise règle a été spécifiée." -"Yes","oui" diff --git a/app/locale/fr_FR/Mage_CatalogSearch.csv b/app/locale/fr_FR/Mage_CatalogSearch.csv deleted file mode 100644 index 46cbe1787..000000000 --- a/app/locale/fr_FR/Mage_CatalogSearch.csv +++ /dev/null @@ -1,49 +0,0 @@ -"%s and greater","%s et supérieur" -"%d item(s) were found using the following search criteria","%d objet(s) ont été trouvés en utilisant les critères de recherche suivants" -"Advanced Search","Recherche avancée" -"Advanced Search Form","Formulaire de recherche avancée" -"Advanced Search Result","Résultats de recherche avancée" -"All","Tous" -"Applies for ""Like"" search type only.","S'applique uniquement aux recherches de type ""Like""." -"Apply Layered Navigation if Search Results are Less Than","Appliquer la navigation par couches si les résultats sont moins de" -"Attribute setting change related with Search Index. Please run Rebuild Search Index process.","Options d'attribut lié à la recherche de l'index. Veuillez lancer le processus de récréation de l'index de recherche process." -"Autogenerated Site Map","Carte du site générée automatiquement" -"Catalog Advanced Search","Recherche avancée du catalogue" -"Catalog Search","Index du catalogue" -"Catalog Search Index","Recherche de l'index du catalogue" -"Don't see what you're looking for?","Vous ne trouvez pas ce que vous cherchez ?" -"Enter ""0"" to enable layered navigation for any number of results.","Entrez ""0"" pour activer la navigation par couche quel que soit le nombre de résultats." -"Go","Démarrer" -"Go to Home Page","Aller à la page d'accueil" -"Grid","Grille" -"Home","Accueil" -"List","Liste" -"Maximum Query Length","Longueur maximale de la recherche" -"Maximum Query Words Count","Nombre maximal de mots dans la recherche" -"Maximum Search query length is %s. Your query was cut.","La longueur maximale des termes de recherche est de %s. Votre requête a été raccourcie." -"Maximum words count is %1$s. In your search query was cut next part: %2$s.","Le nombre maximum de mots est %1$s. La partie suivante de votre recherche a été coupée : %2$s." -"Minimal Query Length","Longueur minimale de la recherche" -"Minimum Search query length is %s","La longueur minimale de la recherche est %s" -"Modify your search","Modifier votre recherche" -"No","Non" -"No items were found using the following search criteria.","Aucun objet n'a été trouvé en utilisant les critères de recherche suivants." -"Please specify at least one search term.","Veuillez spécifier au moins un terme de recherche." -"Popular Search Terms","Termes souvent recherchés" -"Quick Search Form","Formulaire de recherche rapide" -"Rebuild Catalog product fulltext search index","Reconstruire le catalogue à partir de l'index de recherche" -"Relevance","Pertinence" -"Results","Résultats" -"Search","Rechercher" -"Search Settings","Options de recherche" -"Search Terms","Termes de recherche" -"Search Type","Type de recherche" -"Search entire store here...","Rechercher la boutique entière" -"Search results for '%s'","Résultats de recherche pour '%s'" -"Search results for: '%s'","Résultats de recherche pour : '%s'" -"Search:","Recherche :" -"Specified date is invalid.","La date spécifiée est invalide." -"Subscribe to Feed","Souscrire au feed" -"There are no search terms available.","Il n'y a pas de termes de recherche disponibles." -"Yes","oui" -"Your search returns no results.","Votre recherche ne renvoie aucun résultat." -"up to %s","jusqu'à %s" diff --git a/app/locale/fr_FR/Mage_Centinel.csv b/app/locale/fr_FR/Mage_Centinel.csv deleted file mode 100644 index 343d17e21..000000000 --- a/app/locale/fr_FR/Mage_Centinel.csv +++ /dev/null @@ -1,33 +0,0 @@ -"3D Secure CAVV","CAVV 3D sécurisé" -"3D Secure Card Validation","Validation carte 3D sécurisée" -"3D Secure Cardholder Validation","Validation porteur de carte 3D sécurisée" -"3D Secure Electronic Commerce Indicator","Indicateur commerce électronique 3D sécurisé" -"3D Secure Verification Result","Résultat vérification 3D sécurisé" -"3D Secure XID","XID 3D sécurisé" -"Card Issuer Liability","Responsabilité de l'émetteur de la carte" -"Card Verification","Vérification carte" -"Enrolled","Enrôlé" -"Enrolled but Authentication Unavailable","Enrôlé mais authentification non disponible" -"Failed","Échec" -"MasterCard SecureCode","Code sûr MasterCard" -"Merchant Liability","Responsabilité du commerçant" -"Not Enrolled","Non enrôlé" -"Order cannot be placed.","Commande ne peut être placée." -"Payment information error. Please start over.","Erreur d'infos de paiement. Veuillez recommencer." -"Please continue with placing order.","Veuillez continuer à faire la commande." -"Please verify the card with the issuer bank before placing the order.","Veuillez vérifier la carte avec la banque émettrice avant de passer la commande." -"Please verify the card with the issuer bank:","Veuillez vérifier la carte avec la banque émettrice" -"Start/Reset Validation...","Démarrer/réinitialiser validation..." -"Successful","Réussi" -"Successful attempt","Tentative réussie" -"The card has failed verification with the issuer bank.","La carte n'a pas réussie sa vérification avec la banque émettrice." -"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Une mauvaise information de paiement a été soumise ou le temps imparti s'est achevé. Veuillez réessayer." -"There has been wrong payment information submitted or time limit has expired. Please, try again.","Une mauvaise information de paiement a été soumise ou temps imparti est achevé. Veuillez réessayer." -"This card has failed validation and cannot be used.","La carte n'a pu être validée et ne peut être utilisée." -"To ensure the security of your transactions","Pour assurer la sécurité de vos transactions" -"Unable to complete","Ne peut compléter" -"Validation failed.","Validation a échouée." -"Verification Failed","Vérification a échouée" -"Verification Successful","Vérification réussie" -"Verification cannot be processed","Vérification ne peut être traitée" -"Verified by Visa","Vérifié par Visa" diff --git a/app/locale/fr_FR/Mage_Checkout.csv b/app/locale/fr_FR/Mage_Checkout.csv deleted file mode 100644 index 84ae89907..000000000 --- a/app/locale/fr_FR/Mage_Checkout.csv +++ /dev/null @@ -1,360 +0,0 @@ -"%s was added to your shopping cart.","%s a été ajouté à votre panier." -"%s was updated in your shopping cart.","%s a été ajouté à votre panier." -"* Required Fields","* Champs obligatoires" -"Add New Address","Ajouter une nouvelle adresse" -"Add New Condition","Ajouter nouvelle condition" -"Add coupon code for shopping cart","Ajouter un code de réduction pour le panier" -"Add gift messages to shopping cart","Ajouter des messages cadeaux au panier" -"Add product to shopping cart","Ajouter un produit au panier" -"Add product(s) to shopping cart","Ajouter des produits au panier" -"Add to Cart","Ajouter au panier" -"Add to Compare","Ajouter au comparateur" -"Add to Wishlist","Ajouter à la liste de cadeaux" -"Additional Product Info","Informations supplémentaires sur le produit" -"Address","Adresse" -"Address %s of %s","Adresse %s de %s" -"After Adding a Product Redirect to Shopping Cart","Après l'ajout d'un produit, rediriger vers le panier" -"Allow Guest Checkout","Autoriser le paiement invité" -"Already registered?","Déjà enregistré ?" -"An error occurred in the process of payment","Une erreur est survenue lors du paiement" -"An error occurred while deleting this condition.","Une erreur est survenue lors de la suppression de la condition." -"An error occurred while saving this condition.","Une erreur est survenue lors de l'enregistrement de la condition." -"Apply","Appliquer" -"Apply Coupon","Utiliser le coupon" -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","Voulez-vous vraiment quitter cette page ? Vous devrez repasser par toutes les étapes de paiement." -"Are you sure you would like to remove this item from the shopping cart?","Etes-vous sûr de vouloir supprimer cet objet de votre panier ?" -"Back","Retour" -"Back to Billing Information","Retour vers les informations de facturation" -"Back to Select Addresses","Retour à la sélection des adresses" -"Back to Shipping Information","Retour aux informations d'expédition" -"Back to Shopping Cart","Retour au panier" -"Based on your selection, you may be interested in the following items:","D'après votre sélection, vous serez probablement intéressé par :" -"Billing Address","Adresse de facturation" -"Billing Information","Informations de facturation" -"Billing Information - %s","Informations de facturation - %s" -"Can not remove the item.","Impossible de supprimer l'article." -"Can not save item.","Impossible d'enregistrer l'article." -"Cancel","Annuler" -"Cancel Coupon","Annuler le coupon" -"Cannot add item to the shopping cart.","Ne peut pas ajouter d'objets au panier." -"Cannot add the item to shopping cart","Ne peut pas ajouter cet objet au panier." -"Cannot add the item to shopping cart.","Ne peut pas ajouter cet objet au panier." -"Cannot apply the coupon code.","Ne peut pas utiliser le code de réduction." -"Cannot configure product.","N'a pas pu configurer le produit" -"Cannot open the overview page","Ne peut pas ouvrir la page de vue d'ensemble." -"Cannot process the item.","Ne peut pas continuer avec l'objet" -"Cannot remove the item.","Ne peut pas supprimer l'objet." -"Cannot update shopping cart.","Ne peut pas mettre à jour le panier." -"Cannot update the item.","N'a pas pu mettre à jour l'objet" -"Card Verification Number Visual Reference","Numéro de vérification de la carte" -"Cart","Panier" -"Cart Product API","API produit" -"Cart Subtotal:","Sous-total du panier" -"Change","Changer" -"Change Billing Address","Changer l'adresse de facturation" -"Checkbox Text","Texte de vérification" -"Checkout","Paiement" -"Checkout Conditions","Conditions de paiement" -"Checkout Forms Extra","Extra formulaires caisse" -"Checkout Method","Méthode de paiement" -"Checkout Options","Options de paiement" -"Checkout Progress Wrapper","Processus de paiement" -"Checkout Section","Section de paiement" -"Checkout Terms and Conditions","Termes et conditions du paiement" -"Checkout as Guest","Payer en tant qu'invité" -"Checkout as a Guest or Register","Payer en tant qu'invité ou s'enregistrer" -"Checkout with Multiple Addresses","Paiement avec des adresses multiples" -"City","Ville" -"Clear Shopping Cart","Vider le panier" -"Click here to print a copy of your order confirmation.","Cliquez ici pour imprimer une copie de votre confirmation de commande." -"Click here to continue shopping.","Cliquez ici pour continuer vos achats" -"Close","Fermer" -"Company","Société" -"Condition Name","Nom de la condition" -"Configurable Product Image","Image de produit configurable" -"Configure Cart Item","Configurer les objets du panier" -"Confirm Password","Confirmez le mot de passe" -"Content","Contenu" -"Content Height","Hauteur du contenu" -"Content Height (css)","Hauteur du contenu (css)" -"Continue","Continuer" -"Continue Shopping","Continuer les achats" -"Continue to Billing Information","Continuer vers les informations de facturation" -"Continue to Review Your Order","Continuer vers la vérification de la commande" -"Continue to Shipping Information","Continuer vers les informations d'expédition" -"Country","Pays" -"Coupon code ""%s"" is not valid.","Le code de réduction ""%s"" n'est pas valide." -"Coupon code ""%s"" was applied.","Le code de réduction ""%s"" a été appliqué." -"Coupon code was canceled.","Le code de réduction a été annulé." -"Create Billing Address","Créer une adresse de facturation" -"Create Shipping Address","Créer une adresse d'expédition" -"Create an order from shopping cart","Créez une commande depuis le panier." -"Create shopping cart","Créer un panier" -"Customer Address is not valid.","L'adresse client n'est pas valide." -"Customer Information","Informations du client" -"Customer's information","Informations du client" -"Data saving problem","Problème d'enregistrement de données" -"Default Billing","Facturation par défaut" -"Default Shipping","Expédition par défaut" -"Delete Condition","Supprimer condition" -"Details","Détails" -"Disabled","Désactivé" -"Discount Codes","Codes de réduction" -"Display Cart Summary","Afficher le résumé du panier" -"Display Shopping Cart Sidebar","Afficher la barre d'outils du panier" -"Display item quantities","Afficher les quantités d'objets" -"Display number of items in cart","Afficher le nombre d'objets dans le panier" -"Display number of items in wishlist","Affiche le nombre d'objets dans la liste des souhaits" -"Easy access to your order history and status","Accès facile à votre historique de commandes et statut" -"Edit","Modifier" -"Edit Address","Éditer l'adresse" -"Edit Billing Address","Modifier l'adresse de facturation" -"Edit Condition","Conditions de modification" -"Edit Items","Modifier l'adresse d'expédition" -"Edit Shipping Address","Modifier l'adresse d'expédition" -"Edit Terms and Conditions","Modifier termes et conditions" -"Edit Your Cart","Modifier votre panier" -"Edit item","Modifier l'objet" -"Edit item parameters","Modifier les paramètres de l'objet" -"Email Address","Adresse email" -"Empty Cart","Vider le panier" -"Empty Shopping Cart Content Before","Vider le contenu du panier avant" -"Enable Onepage Checkout","Activer le paiement en une seule page" -"Enable Terms and Conditions","Activer les termes et conditions" -"Enabled","Activé" -"Enter a New Address","Entrer une nouvelle adresse" -"Enter your coupon code if you have one.","Entrez votre code de réduction si vous en avez un." -"Enter your destination to get a shipping estimate.","Entrez votre destination pour obtenir une estimation des frais de port." -"Estimate","Devis" -"Estimate Shipping and Tax","Estimation du port et des taxes." -"Excl. Tax","Taxe non comprise" -"Fast and easy check out","Paiement rapide et facile." -"Fax","Fax" -"Forgot an Item?","Oublié un objet ?" -"Forgot your password?","Oublié votre mot de passe ?" -"Get a Quote","Obtenir une estimation" -"Get list of available payment methods","Obtenir une liste des méthodes de paiement disponibles" -"Get list of available shipping methods","Obtenir une liste des méthodes d'expédition disponibles" -"Get list of products in shopping cart","Obtenir la liste des produits dans le panier" -"Get terms and conditions","Obtenir les conditions" -"Get total prices for shopping cart","Obtenir le prix total du panier" -"Gift Message","Message du cadeau" -"Grand Total:","Total :" -"Grouped Product Image","Image groupée du produit" -"HTML","HTML" -"ID","ID" -"Incl. Tax","Taxe comprise" -"Invalid checkout type.","Type de paiement invalide" -"Invalid data.","Données invalides." -"Invalid email address ""%s""","Adresse mail ""%s"" invalide" -"Invalid method: %s","Méthode invalide : %s" -"Invalid shipping method.","Méthode d'expédition invalide." -"Item not found or already ordered","Objets non trouvés ou déjà commandés" -"Item was removed successfully.","Article supprimé avec succès." -"Item was updated successfully.","Article actualisé avec succès." -"Items","Articles" -"Items After","Articles après" -"Items Before","Articles avant" -"Load customer quote error","Charger erreur devis client" -"Loading next step...","Chargement étape suivante..." -"Login","Identifiant" -"Login/Registration Before","Connexion/Inscription avant" -"Manage Terms and Conditions","Gérer les conditions générales" -"Maximum Display Recently Added Item(s)","Affichage maximum article(s) récemment ajouté(s)" -"Maximum qty allowed for Shipping to multiple addresses is %s","Qté maximum permise pour expédition à multiples adresses est %s" -"Mini-cart promotion block","Bloc promotionnel mini-panier" -"Minimum order amount is %s","Le montant minimum de la commande est de %s" -"Move","Déplacer" -"Move to Wishlist","Mettre dans la liste d'idées cadeaux" -"Move to wishlist","Déplacer dans la liste de souhaits" -"Multishipping Checkout","Sortie caisse différentes expéditions" -"Multishipping Checkout Address (Any) Form","Formulaire sortie caisse différentes expéditions (toutes)" -"Multishipping Checkout Billing Address Creation","Création adresse facturation sortie caisse multiples expéditions" -"Multishipping Checkout Billing Address Edit Form","Modification formulaire adresse facturation sortie caisse multiples expéditions" -"Multishipping Checkout Billing Address Selection","Sélection adresse facturation sortie caisse multiples expéditions" -"Multishipping Checkout Billing Information Step","Étape information facturation sortie caisse multiples expéditions" -"Multishipping Checkout Customer Address Edit Form","Modifier formulaire adresse client sortie caisse multiples expéditions" -"Multishipping Checkout Overview","Vue générale sortie caisse multiples expéditions" -"Multishipping Checkout Shipping Address Creation","Création adresse expédition sortie caisse multiples expéditions" -"Multishipping Checkout Shipping Address Edit Form","Modifier formulaire adresse expédition sortie caisse multiples expéditions" -"Multishipping Checkout Shipping Address Selection","Sélection adresse expédition sortie caisse multiples expédition" -"Multishipping Checkout Shipping Information Step","Étape information expédition sortie caisse multiples expéditions" -"Multishipping Checkout Success","Sortie caisse multiples expéditions réussie" -"My Cart","Mon caddy" -"My Cart (%s item)","Mon caddy (%s ar" -"My Cart (%s items)","Mon caddy (%s articles)" -"My Cart Extra Actions","Actions supplémentaires mon panier" -"My Cart Link","Lien vers Mon caddy" -"New Address","Nouvelle adresse" -"New Condition","Nouvelle Condition" -"New Terms and Conditions","Nouvelles conditions générales" -"No Payment Methods","Aucun mode de paiement" -"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","LA COMMANDE TOTALE S'AFFICHERA AVANT QUE VOUS LA SOUMETTIEZ" -"One Page Checkout","Paiement en une page" -"One Page Checkout Failure","Échec de règlement une page" -"One Page Checkout Overview","Aperçu caisse de sortie en une page" -"One Page Checkout Success","Succès de règlement une page" -"One item of products do not have identifier or sku","Un objet n'a pas d'identifiant ou sku" -"One item of products is not belong any of quote item","Un objet ne correspond à aucune estimation" -"Order #","Commande n°" -"Order Review","Révision de la commande" -"Order Success","Succès commande" -"Order place error.","Erreur passage commande." -"Other Items in Your Order","Autres articles dans votre panier" -"Overview Items After","Aperçu articles après" -"Password","Mot de passe" -"Payment Failed Email Reciever","Destinataire de l'e-mail en cas d'échec de paiement" -"Payment Failed Email Sender","Échec paiement expéditeur courriel" -"Payment Failed Emails","Échec paiement courriels" -"Payment Failed Template","Modèle Échec paiement" -"Payment Information","Information paiement" -"Payment Method","Méthode de paiement" -"Payment Methods After","Modes de paiements après" -"Payment Methods After Checkout Button","Méthodes paiement après bouton règlement" -"Payment Methods Before","Modes de paiements avant" -"Payment Methods Before Checkout Button","Méthodes de paiement avant le bouton de validation" -"Payment method information","Renseignements méthode de paiement" -"Payment method is not defined","La méthode de paiement n'est pas définie" -"Payment methods in shopping cart","Méthodes de paiement dans le panier" -"Payment profile # %s: ""%s"".","Profil de paiement # %s: ""%s""." -"Place Order","Passer la commande" -"Please agree to all Terms and Conditions before placing the order.","Veuillez agréer à tous les termes et conditions avant de passer commande." -"Please agree to all Terms and Conditions before placing the orders.","Veuillez agréer à tous les termes et conditions avant de passer les commandes." -"Please agree to all the terms and conditions before placing the order.","Veuillez agréer à tous les termes et conditions avant de passer commande." -"Please check billing address information.","Veuillez vérifier l'adresse de facturation." -"Please check shipping address information.","Veuillez vérifier l'adresse d'expédition." -"Please check shipping addresses information.","Veuillez vérifier les adresses d'expédition." -"Please choose to register or to checkout as a guest","Veuillez choisir de vous enregistrer ou de passer à la caisse en tant qu'invité" -"Please log in below:","Veuillez vous connecter ci-dessous :" -"Please select region, state or province","Veuillez sélectionner la région, l'état et le pays" -"Please select shipping address for applicable items","Veuillez sélectionner l'adresse d'expédition" -"Please select shipping methods for all addresses","Veuillez sélectionner une méthode d'expédition pour toutes les adresses" -"Please select valid payment method.","Veuillez sélectionner une méthode de paiement valide." -"Please specify payment method.","Veuillez préciser une méthode de paiement." -"Please specify shipping method.","Veuillez spécifier la méthode d'expédition." -"Please specify shipping methods for all addresses.","Veuillez spécifier des méthodes d'expédition pour toutes les addresses." -"Price","Prix" -"Proceed to Checkout","Continuer le paiement" -"Product","Produit" -"Product Name","Nom du produit" -"Products","Produits" -"Qty","Qté" -"Qty:","Quantité :" -"Quantity was recalculated from %d to %d","La quantité a été recalculée de %d à %d" -"Quote Lifetime (days)","Estimation" -"Quote item does not exist.","L'article évalué n'existe pas." -"Quote item is not found.","L'article évalué n'a pas été trouvé." -"Recently added item(s)","Objets ajoutés récemment" -"Register","S'inscrire" -"Register and save time!","S'enregistre et gagner du temps !" -"Register to Create an Account","Inscrivez-vous pour créer un compte" -"Register with us for future convenience:","S'enregistrer pour plus de pratique" -"Remove Item","Supprimer objet" -"Remove This Item","Supprimer cet objet" -"Remove coupon code from shopping cart","Retirer le code coupon du panier" -"Remove item","Supprimer l'objet" -"Remove product from shopping cart","Retirer le produit du panier" -"Remove product(s) from shopping cart","Retirer le(s) produit(s) du panier" -"Require Customer To Be Logged In To Checkout","Exige du client qu'il soit connecté pour passer à la caisse" -"Retrieve information about shopping cart","Récupérer les informations relatives au panier" -"Review Order","Vérification de la commande" -"Review Order - %s","Vérification de la commande - %s" -"SKU","Unités gestion de stock" -"Sales","Ventes" -"Save Condition","Enregistrer la situation" -"Save in address book","Sauvegarder dans le carnet d'adresses" -"See price before order confirmation.","Voir le prix avant la confirmation de commande." -"Select Address","Sélectionner l'Adresse" -"Select Addresses","Sélectionner adresses" -"Select Shipping Method","Sélectionner la Méthode de Livraison" -"Select State/Province...","Sélectionner état/pays" -"Select a billing address from your address book or enter a new address.","Choisir une adresse de facturation depuis votre carnet d'adresses ou entrer une nouvelle adresse." -"Select a shipping address from your address book or enter a new address.","Choisir une adresse de facturation depuis votre carnet d'adresses ou entrer une nouvelle adresse." -"Send Payment Failed Email Copy Method","Méthode d'envoi des mails de notification d'échec de paiement" -"Send Payment Failed Email Copy To","Envoyer les mails de notification d'échec de paiement à" -"Send To","Envoyer A" -"Separate by "","".","Séparer par des "",""." -"Set customer for shopping cart","Définir le client pour le panier" -"Set customer's addresses in shopping cart","Fixer les adresses de clients dans le panier" -"Set payment method","Déterminer la méthode de paiement" -"Set shipping method","Déterminer la méthode d'expédition" -"Ship to Multiple Addresses","Expédier à des Adresses Multiples" -"Ship to different address","Envoyer à une différente adresse" -"Ship to this address","Envoyer à cette adresse" -"Shipping Address","Adresse d'expédition" -"Shipping Information","Informations d'expédition" -"Shipping Method","Méthode d'expédition" -"Shipping Methods","Modes d'expédition" -"Shipping To","Expédition à" -"Shipping information","Informations d'expédition" -"Shipping method has not been selected yet","Méthode d'expédition non sélectionnée" -"Shipping methods in shopping cart","Méthodes d'expédition dans le panier" -"Shipping selection is not applicable.","Méthode d'expédition non disponible." -"Shopping Cart","Panier" -"Shopping Cart Form Before","Panier précédent" -"Shopping Cart Items After","Articles du panier après" -"Shopping Cart Items Before","Articles du panier avant" -"Shopping Cart Sidebar","Barre d'outils du panier" -"Shopping Cart Sidebar Extra Actions","Shopping Cart Sidebar Extra Actions" -"Shopping Cart is Empty","Le panier est vide" -"Shopping cart ability to set coupon code","Possibilité d'utiliser des codes de réduction" -"Show Content as","Afficher le contenu comme" -"Some of the requested products are not available in the desired quantity.","Certains des produits demandés ne sont pas disponibles dans les quantités demandées." -"Some of the requested products are unavailable.","Certains produits sélectionnés ne sont pas disponibles." -"Some products quantities were recalculated because of quantity increment mismatch","Certaines quantités de produits ont été recalculées en raison d'incompatibilités." -"Sorry, guest checkout is not enabled. Please try again or contact store owner.","Désolé, le passage à la caisse des invités n'est pas activé. Veuillez réessayez ou contactez le propriétaire du magasin." -"Sorry, no quotes are available for this order at this time.","Désolé, aucune estimation n'est actuellement disponible pour cette commande." -"State/Province","Etat/pays" -"Status","Statut" -"Store View","Vue du magasin" -"Street Address","Rue" -"Street Address %s","Adresse municipale %s" -"Submitting order information...","Envoi des informations de la commande ...." -"Subtotal","Sous-total" -"Subtotal must exceed minimum order amount","Le montant partiel doit dépasser le montant minimum de la commande" -"Telephone","Téléphone" -"Terms and Conditions","Conditions d'utilisation" -"Terms and Conditions Information","Information des conditions d'utilisation" -"Terms and conditions","Conditions d'utilisation" -"Text","Texte" -"Thank you for your purchase!","Merci pour votre achat !" -"The condition has been deleted","La condition a été supprimée" -"The condition has been saved.","La condition a été enregistrée" -"The onepage checkout is disabled.","L'encart pour passer la commande est désactivé." -"The product could not be found.","Le produit n'a pas pu être trouvé." -"The product does not exist.","Le produit n'existe pas." -"There are %s items in your cart.","Il y a %s objets dans votre panier." -"There is 1 item in your cart.","1 objet dans votre panier" -"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","Il y a déjà un client enregistré utilisant cette adresse de courriel. Veuillez vous connecter en utilisant cette adresse de courriel ou entrer une adresse de courriel différente pour enregistrer votre compte." -"There was an error processing your order. Please contact us or try again later.","Il y a une erreur lors de la confirmation de votre commande. Veuillez nous contacter ou réessayer plus tard." -"This condition no longer exists.","Cette condition n'existe plus." -"Total","Total" -"Total for this address","Total pour cette adresse" -"Unable to set Payment Method.","Impossible de définir la méthode de paiement" -"Unit Price","Prix unitaire" -"Update","Actualiser" -"Update Cart","Mettre à jour le panier" -"Update Qty & Addresses","Mettre à jour la quantité" -"Update Shopping Cart","Mettre à jour le panier" -"Update Total","Mettre à jour le total" -"Update product quantities in shopping cart","Mettre à jour les quantités de produit dans le panier" -"Update product(s) quantities in shopping cart","Mettre à jour les quantités de produits dans le panier" -"Use Billing Address","Utiliser l'adresse de facturation" -"VAT Number","Numéro TVA" -"View Shopping Cart","Afficher panier" -"Visible items in minicart","Articles visibles dans mini-panier" -"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","Nous sommes en train de prendre en compte votre commande et vous recevrez rapidement un email. Une fois la commande expédiée, vous recevrez un autre email avec un lien vers le suivi." -"What's this?","Qu'est-ce que c'est ?" -"What's this?","Qu'est-ce ?" -"You have no items in your shopping cart.","Il n'y a aucun objet dans votre panier." -"You will receive an order confirmation email with details of your order and a link to track its progress.","Vous recevrez un mail de confirmation de commande, puis un second mail vous permettant d'accéder au suivi du colis." -"Your Checkout Progress","Progression du paiement" -"Your billing agreement # is: %s.","Votre accord de facturation # est : %s." -"Your order # is: %s.","Votre commande # est %s." -"Your order cannot be completed at this time as there is no payment methods available for it.","Votre commande ne peut être terminée pour l’heure, car aucun moyen de paiement n’est disponible pour elle." -"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Votre commande ne peut pas être réalisée pour le moment étant donné qu'aucune méthode de livraison n'est disponible. Veuillez apporter les modifications nécessaires à votre adresse de livraison." -"Your order has been received.","Votre commande a bien été reçue." -"Your order number is ","Votre numéro de commande est" -"Your recurring payment profiles:","Vos profils de paiement récurrents :" -"Zip/Postal Code","Code postal" -"ok","ok" diff --git a/app/locale/fr_FR/Mage_Cms.csv b/app/locale/fr_FR/Mage_Cms.csv deleted file mode 100644 index 7d023b99a..000000000 --- a/app/locale/fr_FR/Mage_Cms.csv +++ /dev/null @@ -1,123 +0,0 @@ -"A block identifier with the same properties already exists in the selected store.","Un identificateur de blocs existe déjà avec la même boutique sélectionnée." -"A directory with the same name already exists. Please try another folder name.","Un répertoire avec le même nom existe déjà. Veuillez essayer un autre nom de dossier." -"A page URL key for specified store already exists.","Une clé d'URL de la page pour la boutique spécifiée existe déjà." -"Action","Action" -"Add New Block","Ajouter nouveau bloc" -"Add New Page","Ajouter nouvelle page" -"All Countries","Tous les pays" -"An error occurred while saving the page.","Une erreur est survenue lors de l'enregistrement de la page" -"Anchor Custom Text","Fixer texte personnalisé" -"Anchor Custom Title","Fixer titre personnalisé" -"Are you sure you want to delete current folder?","Etes-vous sûr de vouloir supprimer le dossier actuel ?" -"Are you sure you want to delete the selected file?","Etes-vous sûr de vouloir supprimer le fichier sélectionné ?" -"Block","Bloc" -"Block Information","Bloquer l'information" -"Block Title","Titre du bloc" -"CMS","CMS" -"CMS Content Wrapper","CMS Content Wrapper" -"CMS Home Page","Page d'accueil du CMS" -"CMS No Cookies Page","Page sans cookies du CMS" -"CMS No Route Page","Page sans tracage du CMS" -"CMS No-Route Page","Page sans tracage du CMS" -"CMS Page","Page du CMS" -"CMS Page Link","Lien de la page du CMS" -"CMS Page Link Block Template","Modèle de lien vers la page de CMS" -"CMS Page Link Inline Template","Modèle de la ligne du lien vers la page du CMS" -"CMS Pages (All)","Toutes les pages du CMS" -"CMS Static Block","Bloc statique du CMS" -"CMS Static Block Default Template","Modèle de bloc statique par défaut du CMS" -"Cannot create new directory.","Ne peut pas créer le nouveau répertoire." -"Cannot delete directory %s.","Ne peut pas supprimer le répertoire %s." -"Cannot delete root directory %s.","Ne peut pas supprimer le répertoire racine %s." -"Cannot upload file.","Ne peut pas envoyer le fichier." -"Collapse All","Afficher tout" -"Content","Contenu" -"Content Heading","Titre du contenu" -"Content Management","Gestion du contenu" -"Contents of a Static Block","Contenu des blocs statiques" -"Create Folder...","Créer dossier ..." -"Custom Design","Dessin sur mesure" -"Custom Design From","Design personnalisé de" -"Custom Design To","Design personnalisé à" -"Custom Layout","Disposition personnalisée" -"Custom Layout Update XML","Mise à jour XML de la disposition personnalisée" -"Custom Theme","Thème personnalisé" -"Customer Tax Class Information","Information sur la classe de taxe client" -"Date Created","Date de création" -"Delete Block","Supprimer bloc" -"Delete File","Supprimer fichier" -"Delete Folder","Supprimer dossier" -"Delete Page","Supprimer page" -"Description","Description" -"Design","Design" -"Disabled","Désactivé" -"Disabled Completely","Entièrement désactivé" -"Disabled by Default","Désactivé par défaut" -"Edit Block","Modifier bloc" -"Edit Block '%s'","Modifier Block '%s'" -"Edit Page","Modifier page" -"Edit Page '%s'","Modifier page '%s'" -"Enable WYSIWYG Editor","Activer l'éditeur WYSIWYG" -"Enabled","Activé" -"Enabled by Default","Activé par défaut" -"Expand All","Tout afficher" -"General Information","Informations générales" -"Go to Home Page","Aller à la page d'accueil" -"Home","Accueil" -"ID","ID" -"Identifier","Identificateur" -"If empty, the Page Title will be used","Si vide, le titre de la page sera utilisé" -"Images (%s)","Images (%s)" -"Insert File","Insérer un fichier" -"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","Nom de dossier invalide. Veuillez n'utilisez que des caractères alphanumériques et des tirets." -"Keywords","Mots clés" -"Last Modified","Modifié pour la dernière fois" -"Layout","Disposition" -"Layout Update XML","Mise à jour XML de la disposition" -"Link to a CMS Page","Lien vers une page CMS" -"Manage Pages","Gérer les pages" -"Media Gallery","Media Gallery" -"Media Storage","Stockage des médias" -"Meta Data","méta-données" -"Meta Description","Méta-description" -"Meta Keywords","Méta-mots clés" -"New Block","Nouveau bloc" -"New Folder Name:","Nouveau nom de dossier :" -"New Page","Nouvelle page" -"No files found","Aucun fichier trouvé" -"Page Information","Informations de la page" -"Page Layout","Disposition de la page" -"Page Status","Statut de la page" -"Page Title","Titre de la page" -"Pages","Pages" -"Product Tax Class Information","Information sur la catégorie de taxe sur les produits" -"Redirect to CMS-page if Cookies are Disabled","Rediriger vers une page du CMS si les cookies sont désactivés" -"Relative to Website Base URL","Dépend de l'URL de base du site web" -"Save Block","Sauvegarder le bloc" -"Save Page","Sauvegarder la page" -"Save Process","Sauvegarder le processus" -"Select Block...","Sélectionner le bloc ..." -"Select Page...","Sélectionner la page ...." -"Show Breadcrumbs for CMS Pages","Afficher les miettes pour les pages du CMS" -"Show Notice if JavaScript is Disabled","Afficher l'avertissement si le Javascript est désactivé" -"Static Blocks","Blocs statiques" -"Status","Statut" -"Storage Root","Racine du stockage" -"Store View","Vue du magasin" -"Template","Modèle visuel" -"The block has been deleted.","Le bloc a été supprimé." -"The block has been saved.","Le bloc a été sauvegardé." -"The directory %s is not writable by server.","Le répertoire %s n'est pas accessible en écriture." -"The page URL key cannot consist only of numbers.","La clé de l'URL de la page ne peut pas contenir uniquement des chiffres." -"The page URL key contains capital letters or disallowed symbols.","L'URL de la page contient des lettres capitales ou des symboles non autorisés." -"The page has been deleted.","La page a été supprimée." -"The page has been saved.","La page a été sauvegardée." -"The static block content cannot contain directive with its self.","Le bloc statique ne peut pas comporter une instruction avec lui-même. " -"This block no longer exists.","Ce bloc n'existe plus." -"This page no longer exists.","Cette page n'existe plus." -"Title","Titre" -"URL Key","Clé de l'URL" -"Unable to find a block to delete.","Impossible de trouver un bloc à supprimer" -"Unable to find a page to delete.","Impossible de trouver une page à supprimer." -"WYSIWYG Options","Options WYSIWYG" -"px.","px." diff --git a/app/locale/fr_FR/Mage_Compiler.csv b/app/locale/fr_FR/Mage_Compiler.csv deleted file mode 100644 index 277340106..000000000 --- a/app/locale/fr_FR/Mage_Compiler.csv +++ /dev/null @@ -1,21 +0,0 @@ -"Collected Files Count","Compte de fichiers collectés" -"Compilation","Compilation" -"Compilation State","État compilation" -"Compilation error","Erreur compilation" -"Compiled","Compilé" -"Compiled Scopes Count","Compte ampleurs compilé" -"Compiler Status","État compilation" -"Compiler include path is disabled.","Chemin vers compilation est désactivé" -"Compiler include path is enabled.","Chemin vers compilation est activé." -"Directory ""%s"" must be writeable","L'annuaire ""%s"" doit être inscriptible" -"Disable","Désactive" -"Disabled","Désactivé" -"Enable","Active" -"Enabled","Activé" -"File ""%s"" must be writeable","Le fichier ""%s"" doit être inscriptible" -"Not Compiled","Non compilé" -"Run Compilation Process","Lancer traitement compilation" -"Scopes Compilation Settings","Paramètres compilation ampleurs" -"System","Système" -"The compilation has completed.","La compilation est terminée" -"Tools","Outils" diff --git a/app/locale/fr_FR/Mage_Connect.csv b/app/locale/fr_FR/Mage_Connect.csv deleted file mode 100644 index f4dcc7fa8..000000000 --- a/app/locale/fr_FR/Mage_Connect.csv +++ /dev/null @@ -1,58 +0,0 @@ -"1.5.0.0 & later","1.5.0.0 et suivantes" -"Action","Action" -"Add Author","Ajouter un auteur" -"Add Contents Path","Ajouter un chemin vers des contenus" -"Add PHP Extension dependency","Ajouter dépendances PHP" -"Add Package dependency","Ajouter dépendances" -"Add files","Ajouter des fichiers" -"Authors","Auteurs" -"Channel","Canal" -"Contents","Contenus" -"Create Extension Package","Créer un paquet d'extension" -"Dependencies","Dépendances" -"Description","Description" -"Edit Extension","Éditer l'extension" -"Email","Email" -"Extension","Extension" -"Extensions","Extensions" -"Failed to create the package.","Échec de la création du paquet" -"Failed to load the package data.","Échec du chargement des données du paquet" -"Failed to save the package.","Échec de la sauvegarde du paquet." -"Files","Fichiers" -"Folder","Dossier" -"Ignore","Ignorer" -"Include","Inclure" -"License","Licence" -"License URI","URI de la licence" -"Load Local Package","Charger le paquet local" -"Load local Package","Charger le forfait local" -"Magento Connect","Magento Connect" -"Magento Connect Manager","Magento Connect Manager" -"Max","Max" -"Maximum","Maximum" -"Min","Min" -"Minimum","Minimum" -"Name","Nom" -"New Extension","Nouvelle extension" -"PHP Version","Version PHP" -"Package","Colis" -"Package Extensions","Extensions du paquet" -"Package File Name","Nom de fichier du paquet" -"Package Info","Info du paquet" -"Packages","Paquets" -"Path","Chemin" -"Pre-1.5.0.0","Antérieures à 1.5.0.0" -"Release Info","Info sur la release" -"Remove","Supprimer" -"Save As...","Enregistrer sous..." -"Save Data and Create Package","Enregistrer les données et créer un paquet" -"Save package with custom package file name","Enregistrer le paquet avec un nom de fichier personnalisé" -"Summary","Résumé" -"Supported releases","Versions supportées" -"System","Système" -"Target","Cible" -"The package %s data has been loaded.","Les données paquet %s ont été chargées." -"The package data has been saved.","Les données du paquet ont été sauvegardées" -"There was a problem saving package data","Il y a eu un problème lors de la sauvegarde des données du paquet" -"Type","Type" -"User","Utilisateur" diff --git a/app/locale/fr_FR/Mage_Contacts.csv b/app/locale/fr_FR/Mage_Contacts.csv deleted file mode 100644 index 4f6960fbb..000000000 --- a/app/locale/fr_FR/Mage_Contacts.csv +++ /dev/null @@ -1,19 +0,0 @@ -"* Required Fields","* Champs obligatoires" -"Comment","Commenter" -"Contact Form","Formulaire de contact" -"Contact Information","Informations de contact" -"Contact Us","Nous contacter" -"Contact Us Form","Formulaire de contact" -"Contacts","Contacts" -"Contacts Section","Section de contacts" -"Email","Email" -"Email Options","Options d'email" -"Email Sender","Expéditeur de l'email" -"Email Template","Modèle d'email" -"Enable Contact Us","Activer contatez-nous" -"Name","Nom" -"Send Emails To","Envoyer emails à" -"Submit","Soumettre" -"Telephone","Téléphone" -"Unable to submit your request. Please, try again later","Impossible de soumettre votre requête. Veuillez réessayer plus tard." -"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","Votre requête a été envoyée et nous y répondrons aussi vite que possible. Merci de nous avoir contactés." diff --git a/app/locale/fr_FR/Mage_Core.csv b/app/locale/fr_FR/Mage_Core.csv deleted file mode 100644 index 69e6bb555..000000000 --- a/app/locale/fr_FR/Mage_Core.csv +++ /dev/null @@ -1,394 +0,0 @@ -"%s","%s" -"%s already exist.","%s existe déjà." -"%s already exists.","%s existe déjà." -"-- Please Select --","-- Veuillez sélectionner --" -"Warning! When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","Attention ! Lorsque vous utilisez CDN, dans certains cas JavaScript peut ne pas fonctionner correctement si CDN n'est pas votre sous-domaine" -"Warning! When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).","¡Peligro! Cuando emplee Store Code en direcciones URL, puede que en algunos casos el sistema no funcione correctamente si se especifican direcciones URL sin Store Code en el servicio de terceros (por ejemplo, PayPal, etc.)." -"A category object is required for determining the product request path.","Un objet de catégorie est requis pour déterminer le chemin de requête du produit." -"Add Block Names to Hints","Ajouter des noms de bloc aux conseils" -"Add Secret Key to URLs","Ajouter clé secrète aux URLs" -"Add Store Code to Urls","Ajouter code boutique aux Urls" -"Admin","Admin" -"Admin Base URL","Admin URL base" -"Admin User Emails","Admin courriels utilisateur" -"Advanced","Avancé(e)" -"After selecting a new media storage location, press the Synchronize button - to transfer all media to that location. Media will not be available in the new - location until the synchronization process is complete.","Après avoir sélectionn un nouveau lieu de stockage des médias, appuyez sur le bouton Synchroniser pour transférer tous les médias vers cet emplacement. Les médias ne seront disponibles dans le nouvel emplacement que lorsque la processus sera terminé." -"Allow Countries","Permettre pays" -"Allow Magento Backend to run in frame","Autoriser Magento Backend à fonctionner dans le cadre" -"Allow Magento Frontend to run in frame","Autoriser Magento Frontend à fonctionner dans le cadre" -"Allow Symlinks","Autoriser les Symlinks" -"Allowed IPs (comma separated)","IPs permis (séparés par virgule)" -"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Types de fichiers autorisés : ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Tous les navigateurs ne supportent pas tous ces formats !" -"Allows customers to stay logged in when switching between different stores.","Permettre aux clients de rester connectés lorsqu'ils passent d'une boutique à l'autre." -"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Texte alternatif pour lien suivant dans pagination menu. Si vide, une image par défaut de flèche sera utilisée." -"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Texte alternatif pour lien précédent dans pagination menu. Si vide, une image par défaut de flèche sera utilisée." -"An error occurred while saving. Please review the error log.","Une erreur est survenue durant sauvegarde. Veuillez consulter le journal de bord des erreurs." -"Anchor Text for Next","Ancrer texte pour suivant" -"Anchor Text for Previous","Ancrer texte pour précédent" -"Anchor symbol (#) is not supported in request path","Le symbolr d'ancrage (#) n'est pas pris en charge dans la demande de chemin d'accès" -"Anchor symbol (#) is not supported in url rewrite suffix","Le symbole d'ancrage (#) n'est pas pris en charge dans le suffixe de réécriture de l'url" -"Are you sure?","Etes-vous sûr ?" -"Auto-redirect to Base URL","Redirige automatiquement vers base URL" -"Back","Retour" -"Backup Options","Options sauvegarde" -"Base JavaScript URL","JavaScript base URL" -"Base Link URL","Lien base URL" -"Base Media URL","Média base URL" -"Base Secure URL","URL de base sécurisée" -"Base Skin URL","Habillage base URL" -"Base URL","URL de base" -"Base Unsecure URL","URL de base non sécurisée" -"Before modifying the store view code please make sure that it is not used in index.php.","Avant de modifier le code de vue de boutique, vérifiez qu'il n'est pas utilisé dans index.php." -"Before modifying the website code please make sure that it is not used in index.php.","Avant de modifier le code du site internet, vérifiez qu'il n'est pas utilisé dans index.php." -"Block with name ""%s"" already exists","Un bloc avec le nom ""%s"" existe déjà" -"Browser Capabilities Detection","Détection capacités navigateur" -"CSS Settings","Paramètres CSS" -"Cache Storage Management","Gestion magasin de la cache" -"Cache storage may contain additional data. Are you sure that you want flush it?","La mémoire cache peut contenir d'autres données. Êtes-vous sûr de vouloir la supprimer ?" -"Can not create invoice. Order was not found.","Impossible de créer la facture. La commande est introuvable." -"Can't retrieve request object","Ne peut extraire objet de requête" -"Can\'t retrieve entity config: %s","Ne peut pas récupérer la configuration de l'entité : %s" -"Cancel","Annuler" -"Cannot complete this operation from non-admin area.","Ne peut compléter cette opération depuis une zone non-admin." -"Card type does not match credit card number.","Le type de la carte ne correspond pas au numéro de la carte de crédit." -"Code","Code" -"Controller file was loaded but class does not exist","Fichier de contrôle a été chargé mais la classe n'existe pas" -"Cookie Domain","Cookie domaine" -"Cookie Lifetime","Cookie durée de vie" -"Cookie Path","Cookie chemin" -"Cookie Restriction Mode","Mode restriction des cookies" -"Copyright","Copyright" -"Core","Cœur" -"Countries Options","Options pays" -"Country","Pays" -"Create Store","Créer boutique" -"Create Store View","Créer vue boutique" -"Create Website","Créer site internet" -"Credit card number does not match credit card type.","Le numéro de la carte de crédit ne correspond pas au type de la carte de crédit." -"Current Package Name","Nom de paquet actuel" -"Custom Admin Path","Chemin administrateur personnalisé" -"Custom Admin URL","URL d'administration personnalisé" -"Custom Design","Dessin sur mesure" -"Custom Email 1","Courriel 1 sur mesure" -"Custom Email 2","Courriel 2 sur mesure" -"Custom Variables","Variables sur mesure" -"Custom1 Contact Email","Courriel de contact du client1" -"Custom1 Contact Name","Nom de contact du client1" -"Custom2 Contact Email","Courriel de contact du client2" -"Custom2 Contact Name","Nom de contact du client2" -"Customer Support","Aide clientèle" -"Dashboard","Tableau de bord" -"Date From","Date de création" -"Date To","Date de fin" -"Date/time format ""%s"" is not supported.","Le format date/heure ""%s"" n'est pas pris en charge." -"Debug","Déboguer" -"Default","Défaut" -"Default Country","Pays par défaut" -"Default Description","Description par défaut" -"Default Keywords","Mots clés par défaut" -"Default No-route URL","URL pas de route par défaut" -"Default Pages","Pages par défaut" -"Default Robots","Robots par défaut" -"Default Store","Magasin par défaut" -"Default Store View","Vue boutique par défaut" -"Default Title","Titre par défaut" -"Default Web URL","URL internet par défaut" -"Delete","Supprimer" -"Delete Store","Supprimer le magasin" -"Delete Store View","Supprimer la vue du magasin" -"Delete Website","Supprimer le site" -"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","Supprimer un %1$s ne supprimera pas les informations associées (comme les catégories, les produits, etc.) ; le %1$s ne pourra pas être restauré. Nous vous recommandons de créer une sauvegarde de la base de données avant de supprimer le %1$s." -"Design","Design" -"Design Change","Changement de design" -"Developer","Développeur" -"Developer Client Restrictions","Restrictions client développeur" -"Disable Email Communications","Désactiver les communications par email" -"Disable Modules Output","Désactiver les sorties des modules." -"Display Demo Store Notice","Afficher l'avis de magasin de démonstration." -"Duplicate Of Template Name","Dupliquer le nom du modèle." -"Edit Design Change","Éditer les changements de design" -"Edit Store","Éditer le magasin" -"Edit Store View","Éditer la vue du magasin" -"Edit Website","Éditer le site web" -"Empty identifier field name","Nom du champ identifiant vide" -"Empty main table name","Nom du tableau principal vide" -"Enable Charts","Activer les graphiques" -"Enabled","Activé" -"Enabled for Admin","Activé pour l'administrateur" -"Enabled for Frontend","Activer pour le frontend." -"Environment Update Time","Heure de mise à jour de l'environnement" -"Error in file: ""%s"" - %s","Erreur dans le fichier : ""%s"" - %s" -"European Union Countries","Pays de l'Union Européenne" -"Exceptions Log File Name","Nom du fichier de journalisation des exceptions." -"Favicon Icon","Icône favicon" -"File %s does not exist","Le fichier %s n'existe pas" -"File %s is not readable","Le fichier %s est illisible" -"File not found","Impossible de trouver le fichier" -"File system","Système de fichiers" -"File with an extension ""%value%"" is protected and cannot be uploaded","Le fichier avec une ""%valeur%"" d'extension est protégé et ne peut être téléchargé." -"First Day of Week","Premier jour de la semaine" -"Flush Cache Storage","Vider le cache" -"Flush Magento Cache","Vider le cache Magento" -"Footer","Pied de page" -"Forgot Password Email Sender","Mot de passe oublié ? Le recevoir par e-mail" -"Forgot Password Email Template","Oubli du mot de passe du modèle du mail" -"General","Général" -"General Contact","Contact général" -"General Contact Email","Courriel de contact général" -"General Contact Name","Nom de contact général" -"General Settings","Réglages généraux" -"Get info about current Magento installation","Consiga información acerca de la instalación actual de Magneto" -"Global","Mondial" -"HTML Head","En-tête HTML" -"HTML tags are not allowed","Les balises HTML ne sont pas autorisées" -"Header","En-tête" -"Host","Hôte" -"How many links to display at once.","Combien de liens afficher en une fois?" -"ID Path for Specified Store","ID Path pour le magasin spécifié." -"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","Si la position du cadre courant ne couvre pas les pages extrêmes, un lien vers la position courante plus ou moins cette valeur sera rendu." -"Incorrect credit card expiration date.","Date d'expiration de la carte incorrecte." -"Input type ""%value%"" not found in the input types list.","Le type d'entrée ""%value%"" introuvable dans la liste des types d'entrée." -"Invalid URL '%value%'.","Dirección URL no válida '%value%'." -"Invalid base url type","Type d'url de base invalide." -"Invalid block name to set child %s: %s","Nom de bloc invalide pour l'ensemble fille %s : %s" -"Invalid block type: %s","Type de bloc non valable : %s" -"Invalid block: %s","Bloc invalide: %s" -"Invalid connection","Connexion invalide" -"Invalid date","Invalid date" -"Invalid layout update handle","Gérer la mise à jour invalide de disposition" -"Invalid messages storage ""%s"" for layout messages initialization","Messages invalides mémoire ""%s"" pour l'initialisation des messages de mise en page" -"Invalid query","Requête invalide" -"Invalid transactional email code: %s","Código del correo transaccional no válido: %" -"Invalid website\'s configuration path: %s","Chemin de configuration du site invalide: %s" -"JavaScript Settings","Réglages javascript" -"Layout","Disposition" -"Leave empty for access from any location.","Laisser vide pour accéder depuis n'importe où" -"List of stores","Liste des magasins" -"Locale","Paramètres régionaux" -"Locale Options","Options régionales" -"Log Settings","Réglages de journalisation" -"Logging from Mage::log(). File is located in {{base_dir}}/var/log","En cours de journalisation de Mage::log(). Le fichier est situé à {{base_dir}}/var/log" -"Logging from Mage::logException(). File is located in {{base_dir}}/var/log","En cours de journalisation de Mage::logException(). Le fichier est situé à {{base_dir}}/var/log." -"Login is Case Sensitive","Le login est sensible à la casse." -"Logo Image","Image du logo" -"Logo Image Alt","Image logo alt" -"Logo Image Src","Src image logo" -"Magento info","Información de Magneto" -"Magento info API","Información API de Magneto" -"Mail Sending Settings","Paramètres envoi courriel" -"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Vérifiez que URL base finit avec '/' (barre oblique), ex. http://votredomaine/magento/" -"Manage Stores","Gérer boutiques" -"Match expressions in the same order as displayed in the configuration.","Accorder expressions dans le même ordre qu'affichées dans la configuration." -"Media Storage","Support de stockage" -"Merge CSS Files","Fusionner fichiers CSS" -"Merge JavaScript Files","Fusionner fichiers JavaScript" -"Miscellaneous HTML","HTML divers" -"Miscellaneous Scripts","Scripts en tous genres" -"Model collection resource name is not defined.","Nom de ressource du modèle de collection n'est pas défini." -"Module ""%1$s"" cannot depend on ""%2$s"".","Le module ""%$1s"" ne peut dépendre de ""%2$s""." -"Module ""%1$s"" requires module ""%2$s"".","Le module ""%$1s"" nécessite le module ""%2$s""." -"Name","Nom" -"New Design Change","Nouvelle modification de conception" -"New Store","Nouveau magasin" -"New Store View","Vue nouvelle boutique" -"New Website","Nouveau site internet" -"No","Non" -"Offloader header","Entête du transcodeur" -"PHP SOAP extension is required.","L'extension PHP SOAP est nécessaire." -"Package","Colis" -"Pagination","Pagination" -"Pagination Frame","Cadre pagination" -"Pagination Frame Skip","Sauter cadre pagination" -"Parent directory does not exist: %s","Le répertoire parental n'existe pas : %s" -"Path ""%value%"" is not available and cannot be used.","Le chemin ""%value%"" est indisponible et ne peut être utilisé." -"Path ""%value%"" is protected and cannot be used.","Le chemin ""%value%"" est protégé et ne peut pas être utilisé." -"Path ""%value%"" may not include parent directory traversal (""../"", ""..\\).""","Il se peut que le chemin ""%value%"" ne contienne pas de traversée de répertoire parent (""../"", ""..\").""" -"Please define flag code.","Veuillez définir le code drapeau." -"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Veuillez entrer 6 caractères ou plus. Des espaces en début ou en fin seront ignorés." -"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Veuillez entrer 7 caractères ou plus. Le mot de passe doit contenir des lettres et des chiffres." -"Please enter a number 0 or greater in this field.","Veuillez entrer un nombre égal ou supérieur à 0 dans ce champ." -"Please enter a number 1 or greater in this field.","Veuillez saisir un nombre supérieur ou égal à 1 dans ce champ." -"Please enter a number greater than 0 in this field.","Veuillez entrer un nombre plus grand que 0 dans ce champ." -"Please enter a number lower than 100.","Veuillez entrer un nombre inférieur à 100." -"Please enter a valid $ amount. For example $100.00.","Veuillez entrer un montant en $ valide. Par exemple 100 $." -"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Veuillez entrer une clé d'URL valide. Par exemple, ""page-exemple"", ""page-exemple.html"" ou ""autreniveau/page-exemple""." -"Please enter a valid URL. For example http://www.example.com or www.example.com","Veuillez saisir une adresse Internet valide. Par exemple http://www.exemple.com ou www.exemple.com" -"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Veuillez entrer une URL valide. Le protocole est nécessaire (http://, https:// ou ftp://)" -"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Veuillez entrer un identifiant XML valide. Par exemple, objet_1, bloc5, id-4." -"Please enter a valid credit card number.","Veuillez entrer un numéro de carte de crédit valide." -"Please enter a valid credit card verification number.","Veuillez entrer un numéro de vérification de carte de crédit valide." -"Please enter a valid date between %s and %s","Veuillez entrer une date valide entre %s et %s" -"Please enter a valid date equal to or greater than %s","Veuillez entrer une date valide également ou supérieure à %s" -"Please enter a valid date less than or equal to %s","Veuillez entrer une date valide inférieure ou égale à %s" -"Please enter a valid date.","Veuillez entrer une date valide." -"Please enter a valid day (1-%d).","Veuillez entrer un jour valide (1-%d)." -"Please enter a valid email address. For example johndoe@domain.com.","Veuillez entrer une adresse courriel valide. Par exemple pierremaistre@domaine.com." -"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Veuillez entrer un numéro de fax valide. Par exemple (123) 456-7890 ou 123-456-7890." -"Please enter a valid full date","Veuillez entrer une date complète valide" -"Please enter a valid month (1-12).","Veuillez entrer un mois valide (1-12)." -"Please enter a valid number in this field.","Veuillez entrer un numéro valide dans ce champ." -"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Veuillez entrer un numéro de téléphone valide. Par exemple (123) 456-7890 ou 123-456-7890." -"Please enter a valid social security number. For example 123-45-6789.","Veuillez entrer un numéro de sécurité sociale valide. Par exemple 123-54-6789." -"Please enter a valid year (1900-%d).","Veuillez entrer une année valide (1900-%d)." -"Please enter a valid zip code.","Veuillez entrer un code postal valide." -"Please enter a valid zip code. For example 90602 or 90602-1234.","Veuillez entrer un code postal valide. Par exemple 90602 ou 90602-1234." -"Please enter issue number or start date for switch/solo card type.","Veuillez entrer le numéro de problème ou la date de début pour le type de carte Switch/Solo." -"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Veuillez entrer une longueur CSS valide. Par exemple, 00 px ou 77 pt ou 20 em ou 0,5 ex ou 50 %." -"Please make sure your passwords match.","Veuillez vérifier que votre mot de passe fonctionne." -"Please select State/Province.","Veuillez choisir l'état/la province." -"Please select a file","Veuillez sélectionner un fichier" -"Please select an option.","Veuillez sélectionner une option." -"Please select one of the above options.","Veuillez sélectionner l'un des choix ci-dessus." -"Please select one of the options.","Veuillez sélectionner l'une des options." -"Please set available and/or protected paths list(s) before validation.","Veuillez définir la/les liste(s) de chemins disponibles et/ou protégés avant la validation." -"Please specify either a category or a product, or both.","Veuillez spécifier une catégorie ou un produit, ou les deux." -"Please use letters only (a-z or A-Z) in this field.","Veuillez n'utiliser que des lettres (a-z ou A-Z) dans ce champ." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Veuillez n'utiliser que des chiffres dans ce champ. Evitez les espaces et autres caractères tels que des points ou des virgules." -"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Veuillez uniquement utiliser des lettres (a-z ou A-Z) ou des chiffres (0-9) dans ce champ. Aucune espace ou aucun autre caractère n'est autorisé." -"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Veuillez uniquement utiliser des lettres (a-z ou A-Z) ou des chiffres (0-9) ou des espaces et # uniquement dans ce champ." -"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Veuillez n'utiliser que des lettres (a-z ou A-Z), des nombres (0-9) ou le trait pour souligner (_) dans ce champ, le premier caractère devant être obligatoirement une lettre." -"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Veuillez utiliser seulement des lettres (a-z), des chiffres (0-9) ou le tiret bas (_) dans ce champ, le premier caractère doit être une lettre." -"Please use only visible characters and spaces.","Veuillez uniquement utiliser des espaces et des caractères visibles." -"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Veuillez utiliser ce format de date: dd/mm/yyyy. Par exemple 29/04/1960 pour le 29th of April, 1960." -"Please wait, loading...","En cours de chargement, veuillez patienter..." -"Polls","Sondages" -"Port (25)","Port (25)" -"Profiler","Profiler" -"Recovery Link Expiration Period (days)","Délai d'expiration du lien de récupération (jours)" -"Request Path for Specified Store","Demander le chemin pour un magasin spécifique" -"Request path length exceeds allowed %s symbols.","La longitud de la ruta de la solicitud excede el número de símbolos % permitidos." -"Requested file may not include parent directory traversal (""../"", ""..\\ notation)""","Il se peut que le fichier demandé ne contienne pas de traversée de répertoire parent (notation ""../"", ""..\")""" -"Requested invalid store ""%s""","Magasin demandé non valide ""%s""" -"Resource is not set.","La ressource n'est pas réglée." -"Retrieve info about current Magento installation","Recupere información sobre la instalación actual de Magneto" -"Retrieve store data","Récupérer les données du magasin" -"Retrieve store list","Récupérer la liste du magasin" -"Return-Path Email","Email de retour" -"Root Category","Catégorie racine" -"Sales Representative","Représentant des ventes" -"Sales Representative Contact Email","Courriel de contact du représentant commercial" -"Sales Representative Contact Name","Nom de contact du représentant commercial" -"Save","Enregistrer" -"Save Store","Enregistrer le magasin" -"Save Store View","Enregistrer la vue du magasin" -"Save Website","Enregistrer le site" -"Search Engines Optimization","Enregistrer les optimisations des moteurs" -"Secure","Sécurisé" -"Security","Sécurité" -"Select Date","Sélectionner la date" -"Select Media Database","Sélectionner base de données" -"Sender Email","Expéditeur de l'e-mail" -"Sender Name","Nom de l'expéditeur" -"Services","Services" -"Session Cookie Management","Gestion des cookies de sessions" -"Session Lifetime (seconds)","Durée de la session (secondes)" -"Session Validation Settings","Paramètres de validation de la session" -"Set Return-Path","Configurer Return-Path" -"Set as Default","Choisir par défaut" -"Skin (Images / CSS)","Skin (Images / CSS)" -"Small Logo Image Src","Petite image logo Src" -"Sort Order","Trier la commande" -"Specified date/time ""%1$s"" do not match format ""%2$s"".","L'heure spécifiée ""%1$s"" ne correspond pas au formatt ""%2$s""." -"Start date cannot be greater than end date.","La date de début ne peut pas être après la date de fin." -"Startup Page","Page de démarrage." -"Status","Statut" -"Storage Configuration for Media","Configuration du stockage pour les média" -"Store","Magasin" -"Store API","Interface de programmation (API) du magasin" -"Store Contact Address","Adresse de contact du magasin" -"Store Contact Information","Informations de contact du magasin" -"Store Contact Telephone","Téléphone du magasin" -"Store Email Addresses","Adresse mail du magasin" -"Store Information","Informations du magasin" -"Store Name","Nom du magasin" -"Store View","Vue du magasin" -"Store View Information","Information de la vue du magasin" -"Store View Name","Nom de visualisation du magasin" -"Store view doesn't exist","La vue du magasin n'existe pas" -"Store with the same code","Enregistrer avec le même code" -"System","Système" -"System Log File Name","Nom de fichier de journalisation système" -"Template Path Hints","Astuces relatives au chemin du modèle" -"Template Settings","Options du modèle" -"Template Variables","Variables du modèle" -"Templates","Modèles" -"Text length does not satisfy specified text range.","La longueur du texte ne correspond pas aux attentes spécifiées." -"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","Le %s saisi est invalide. Assurez vous qu'il suit le format ""http://domain.com/""." -"The From Date value should be less than or equal to the To Date value.","El valor Desde la fecha debe ser inferior o igual al valor Hasta la fecha." -"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Le code du magasin ne peut contenir que des lettres (a-z), nombres (0-9) ou blanc souligné (_) ; le premier caractère doit être une lettre." -"The store does not exist","Le magasin n'existe pas" -"The store has been deleted.","Le magasin a été supprimé." -"The store has been saved.","Le magasin a été enregistré." -"The store view has been deleted.","La vue du magasin a été supprimée." -"The store view has been saved","La vue du magasin a été sauvegardée." -"The template Name must not be empty.","Le nom de modèle ne doit pas être vide." -"The value is not within the specified range.","Cette valeur ne fait pas partie de la marge acceptée." -"The website does not exist.","Le site internet n'existe pas." -"The website has been deleted.","Le site internet a été effacé." -"The website has been saved.","Le site Internet a été enregistré." -"Themes","Thèmes" -"This category and all its child elements","Cette catégorie et tous ces éléments dépendants" -"This category and its child categories only","Cette catégorie et ces catégories dépendantes seulement" -"This category and its products only","Cette catégorie et ses produits uniquement" -"This category only","Cette catégorie uniquement" -"This date is a required value.","Cette date est une valeur requise." -"This is a required field.","Ceci est un champ obligatoire." -"This store cannot be deleted.","Cette boutique ne peut être effacée." -"This store view cannot be deleted.","Cette vue de boutique ne peut être effacée." -"This website cannot be deleted.","Ce site Internet ne peut pas être supprimé." -"This will be displayed just before body closing tag.","Ceci sera affiché juste avant l'étiquette de fermeture de corps." -"This will be included before head closing tag in page HTML.","Cela sera inclus avant la balise de fermeture de l'entête de la page HTML." -"Timezone","Fuseau horaire" -"Title Prefix","Préfixe titre" -"Title Suffix","Suffixe du titre" -"Transactional Emails","Emails de transaction" -"Translate Inline","Traduire en file" -"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Traductions, blocks et autres sorties doivent être désactivés pour la gestion administrateur et utilisateur en ligne." -"Translations","Traductions" -"Two and more slashes together are not permitted in request path","Deux slashs ou plus ne sont pas autorisés ensemble dans le répertoire" -"Two and more slashes together are not permitted in url rewrite suffix","Deux slashs ou plus ne sont pas autorisés dans le suffixe de réécriture de l'URL" -"Unable to create directory: %s","Impossible de créer le répertoire : %s" -"Unable to delete store view. Please, try again later.","Incapable d'effacer la vue de boutique. Veuillez réessayer plus tard." -"Unable to delete store. Please, try again later.","Impossible de supprimer le magasin. Veuillez réessayer plus tard." -"Unable to delete website. Please, try again later.","Incapable d'effacer le site internet. Veuillez réessayer plus tard." -"Unable to proceed. Please, try again","Action impossible. Veuillez réessayer plus tard" -"Unable to proceed. Please, try again.","Impossible de continuer. S'il vous plait, essayez encore." -"Unable to save file ""%s"" at ""%s""","Impossible de sauvegarder le fichier ""%s"" à ""%s""" -"Unable to save file: %s","Impossible d'enregistrer le fichier : %s" -"Unknown old style column type definition: {$definition}.","Définition du type de colonne de l'ancien style inconnue : {$definition}." -"Unknown scope ""%s"".","Inconnu ""%s""" -"Unsecure","Non sûre." -"Url Options","Options Url" -"Use Custom Admin Path","Utiliser un répertoire administrateur personnalisé" -"Use Custom Admin URL","Utiliser l'URL d'administration personnalisé" -"Use HTTP Only","Utiliser HTTP seulement" -"Use SID on Frontend","Utiliser SID côté public" -"Use Secure URLs in Admin","Utiliser URLs sûrs dans admin" -"Use Secure URLs in Frontend","Utiliser URLs sûrs côté public" -"Use Web Server Rewrites","Utiliser les réécritures du serveur Internet" -"VAT Number","Numéro TVA" -"Validate HTTP_USER_AGENT","Valider HTTP_USER_AGENT" -"Validate HTTP_VIA","Valider HTTP_VIA" -"Validate HTTP_X_FORWARDED_FOR","Valider HTTP_X_FAIT SUIVRE_POUR" -"Validate REMOTE_ADDR","Valider REMOTE_ADDR" -"Validation has failed.","Validation a échouée" -"Values less than 60 are ignored. Note that changes will apply after logout.","Les valeurs inférieures à 60 sont ignorées. Veuillez noter que des modifications seront appliquées après la déconnexion." -"Variable Code must be unique.","La variable code doit être unique." -"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Attention ! L'activation de cette fonction n'est pas recommandée pour les environnements de production car elle représente un risque de sécurité." -"Web","Internet" -"Website","Site" -"Website Information","Information site internet" -"Website Name","Nom site internet" -"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Le code du site Internet ne peut contenir que des lettres (a-z), des chiffres (0-9) ou un tiret bas (_). Le premier caractère doit être une lettre" -"Website with the same code","Site internet avec le même code" -"Weekend Days","Jours du week-end" -"Welcome Text","Texte de bienvenue" -"Wrong file info format","Informations du format de fichiers incorrectes" -"Wrong number of arguments for %s","Nombre d'arguments incorrect pour %s" -"Wrong old style column type definition: {$definition}.","La définition de l'ancien style de colonne est incorrecte : {$definition}." -"Yes","oui" -"You will have to log in after you save your custom admin path.","Vous devrez vous connecter après avoir enregistré votre répertoire administrateur personnalisé." -"Your design change for the specified store intersects with another one, please specify another date range.","Votre changement de dessin pour la boutique spécifiée se mélange à une autre, veuillez spécifier une autre fourchette de dates." -"database ""%s""","base de données ""%s""" diff --git a/app/locale/fr_FR/Mage_Cron.csv b/app/locale/fr_FR/Mage_Cron.csv deleted file mode 100644 index 1cc2a89d3..000000000 --- a/app/locale/fr_FR/Mage_Cron.csv +++ /dev/null @@ -1,24 +0,0 @@ -"10 minutes","10 minutes" -"15 minutes","15 minutes" -"20 minutes","20 minutes" -"30 minutes","30 minutes" -"5 minutes","5 minutes" -"Cron (Scheduled Tasks) - all the times are in minutes","Cron (tâches planifiées) - tous les temps sont en minutes" -"Daily","Tous les jours" -"Failure History Lifetime","Historique des échecs" -"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","Pour générer des URLs correctes avec cron, veuillez vous assurer que Web > URLs de base sécurisées et non sécurisées sont définies explicitement." -"Generate Schedules Every","Générer les horaires tous les" -"History Cleanup Every","Nettoyer l'historique tous les" -"Hourly","Toutes les heures" -"Invalid callback: %s::%s does not exist","Rappel invalide : %s::%s n'existe pas" -"Invalid model/method definition, expecting ""model/class::method"".","Définition modèle/méthode invalide. ""Modèle/classe :: méthode"" nécessaire. " -"Minute Intervals","Intervalles d'une minute" -"Missed if Not Run Within","Raté si non exécuté dans" -"Monthly","Tous les mois" -"No callbacks found","Aucun rappel trouvé" -"Schedule Ahead for","Calendrier à venir pour" -"Success History Lifetime","Historique des réussites" -"Too late for the schedule.","Trop tard pour la planification" -"Unable to delete the cron task.","Impossible de supprimer la tâche cron." -"Unable to save the cron expression.","Impossible de sauvegarder l'expression cron." -"Weekly","Toutes les semaines" diff --git a/app/locale/fr_FR/Mage_CurrencySymbol.csv b/app/locale/fr_FR/Mage_CurrencySymbol.csv deleted file mode 100644 index c0deba56b..000000000 --- a/app/locale/fr_FR/Mage_CurrencySymbol.csv +++ /dev/null @@ -1,10 +0,0 @@ -"Currency","Monnaie" -"Custom currency symbols were applied successfully.","Les symboles des devises ont été chargés avec succès." -"Manage Currency","Gérer les devises" -"Manage Currency Rates","Gérer le taux des devises" -"Rates","Taux" -"Save Currency Symbols","Enregistrer les symboles des devises" -"Symbol","Symbole" -"Symbols","Symboles" -"System","Système" -"Use Standard","Utiliser la valeur standard" diff --git a/app/locale/fr_FR/Mage_Customer.csv b/app/locale/fr_FR/Mage_Customer.csv deleted file mode 100644 index 855cf3b20..000000000 --- a/app/locale/fr_FR/Mage_Customer.csv +++ /dev/null @@ -1,469 +0,0 @@ -" or ","ou" -"'%value%' appears to be a DNS hostname but cannot extract TLD part","""%s"" semble être un nom de DNS, mais il est impossible d'en extraire TLD" -"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' semble être un nom de DNS, mais il est impossible de trouver une correspondance dans la liste TLD" -"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' semble être un nom de DNS, mais impossible de trouver une correspondance avec le schéma TLD" -"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' semble être un nom de DNS, mais contient un / à un emplacement invalide." -"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' semble être un nom de DNS mais la notation ne peut être décodée" -"'%value%' appears to be a local network name but local network names are not allowed","'%value%' semble être le nom d'un réseau local, mais les noms de réseaux locaux ne sont pas autorisés." -"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' semble être une adresse IP, mais les adresses IP ne sont pas autorisées." -"'%value%' does not appear to be a valid local network name","'%value%' ne semble pas être un nom de réseau local valide" -"* Required Fields","* Champs obligatoires" -"ALL GROUPS","TOUS LES GROUPES" -"Account Dashboard","Espace de travail du compte" -"Account Information","Informations du compte" -"Account Sharing Options","Options de partage du compte" -"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please click here.","Confirmation du compte requise. Veuillez vérifier vos emails pour le lien de confirmation. Pour renvoyer l'email de confirmation, veuillez cliquer ici." -"Action","Action" -"Add New Address","Ajouter une nouvelle adresse" -"Add New Customer","Ajouter un nouvel utilisateur" -"Add New Customer Group","Ajouter un nouveau groupe d'utilisateurs" -"Added From","Ajouté depuis" -"Additional Address Entries","Adresses supplémentaires" -"Address","Adresse" -"Address Book","Carnet d'adresses" -"Address Books","Carnets d'adresses" -"Address Information","Informations de l'adresse" -"Address Templates","Modèles d'adresses" -"Addresses","Adresses" -"Admin","Admin" -"All","Tous" -"All Store Views","Toutes les vues de la boutique" -"All countries","Tous les pays" -"Always optional.","Toujours optionnel" -"Amount","Montant" -"An error occurred while deleting the address.","Une erreur est survenue lors de la suppression de l'adresse." -"An error occurred while retrieving the option value: %s.","Une erreur est survenue lors de la récupération de la valeur de l'option : %s." -"An error occurred while saving the collection, aborting. Error: %s","Une erreur est survenue lors de l'enregistrement de la collection, annulation. Erreur : %s." -"An invalid option ID is specified for %s (%s), skipping the record.","Un identifiant d'option invalide est spécifié pour %s (%s), ignorer." -"Approved","Approuvé" -"Are you sure that you want to remove this item?","Etes-vous sûr de vouloir supprimer cet objet ?" -"Are you sure you want to cancel adding of this address?","Etes-vous sûr de vouloir annuler l'ajout de cette adresse ?" -"Are you sure you want to delete this address?","Etes-vous sûr de vouloir supprimer cette adresse ?" -"Are you sure?","Etes-vous sûr ?" -"Array of Entity collections is expected.","Un tableau des entités de collections est attendu." -"Assign a Customer Group","Assigner un nouveau groupe d'utilisateurs" -"Average Sale","Vente moyenne" -"Back","Retour" -"Back - link to the previously viewed page","Retour - lien vers la page visionnée précédemment" -"Back to Login","Retour à la connexion" -"Bad request.","Requête invalide." -"Based on the VAT ID, the customer would belong to the Customer Group %s.","D'après le numéro de TVA, le client appartiendrait au Groupe de clients %s." -"Bill to Name","Facture au nom" -"Bought From","Acheté à" -"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","En créant un compte avec notre boutique, vous serez capable de procéder aux achats plus rapidement, d'ajouter plusieurs adresses d'expédition, de voir et suivre vos commandes sur votre compte et plus encore." -"CSV","CSV" -"Cancel","Annuler" -"Cannot save a new password.","Impossible d'enregistrer un nouveau mot de passe." -"Cannot save address.","Impossible d'enregistrer l'adresse." -"Cannot save the customer.","Impossible d'enregistrer le client." -"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Impossible de partager les comptes des clients globalement car certains comptes avec les mêmes adresses e-mail existent sur plusieurs sites Web et ne peuvent pas être fusionnés." -"Change Account Password","Modifier le mot de passe du compte" -"Change Billing Address","Changer l'adresse de facturation" -"Change Password","Modifier le mot de passe" -"Change Shipping Address","Modifier l'adresse d'expédition" -"City","Ville" -"Company","Société" -"Config","Config" -"Configure","Configurer" -"Confirm New Password","Confirmer le nouveau mot de passe" -"Confirm Password","Confirmez le mot de passe" -"Confirmation Link Email","E-mail de confirmation" -"Confirmed","Confirmé" -"Contact Information","Informations de contact" -"Continue Shopping","Continuer les achats" -"Country","Pays" -"Create","Créer" -"Create New Account Options","Créer Nouveau Compte Options" -"Create New Customer Account","Créer un nouveau compte client" -"Create Order","Créer une commande" -"Create an Account","Créer un compte" -"Create customer","Créer un client" -"Create customer address","Créer l'adresse du client" -"Current Password","Mot de passe actuel" -"Customer","Client" -"Customer API","API utilisateur" -"Customer Account Edit Form","Formulaire de modification du compte client" -"Customer Account Login Form","Formulaire de connexion client" -"Customer Account Logout Success","Déconnexion du client effectuée" -"Customer Account Registration Form","Formulaire d'inscription compte client" -"Customer Addresses","Adresses du client" -"Customer Configuration","Configuration client" -"Customer Forgot Password Form","Formulaire d'oubli de mot de passe client" -"Customer Group","Groupe du client" -"Customer Groups","Groupes de clients" -"Customer Information","Information sur le client" -"Customer Login","Login du client" -"Customer My Account (All Pages)","Mon compte client (toutes les pages)" -"Customer My Account Address Book","Mon compte client carnet d'adresses" -"Customer My Account Address Edit Form","Mon compte client formulaire de modification d'adresse" -"Customer My Account Dashboard","Mon compte client tableau de bord" -"Customer Since","Client depuis" -"Customer View","Voir le client" -"Customer collection expected.","La collection du client est attendue." -"Customer email is required","L'adresse courriel du client est nécessaire" -"Customer website ID must be specified when using the website scope","L'identification du client sur le site web doit être indiqué lors de l'utilisation du site" -"Customer will stay on the current page if ""No"" is selected.","Les utilisateurs resteront sur la page actuelle si ""Non"" est sélectionné" -"Customers","Clients" -"Customers Only","Clients seulement" -"Customers Section","Section clients" -"DD","DD" -"Date","Date" -"Date Added","Date ajoutée" -"Date of Birth","Date de naissance" -"Day","Jour" -"Days in Wishlist","Jours dans la liste de cadeaux" -"Default Addresses","Adresses par défaut" -"Default Billing Address","Adresse de facturation par défaut" -"Default Email Domain","Domaine de l'e-mail par défaut" -"Default Group","Groupe par défaut" -"Default Shipping Address","Adresse d'expédition par défaut" -"Default Value for Disable Automatic Group Changes Based on VAT ID","Valeur par défaut de désactivation des modifications automatiques de groupe selon le numéro de TVA" -"Default Welcome Email","E-mail de bienvenue par défaut" -"Delete","Supprimer" -"Delete Address","Supprimer l'adresse" -"Delete Customer","Supprimer le client" -"Delete Customer Group","Supprimer le groupe de client" -"Delete customer","Supprimer l'utilisateur" -"Delete customer address","Supprimer l'adresse du client" -"Deleted Stores","Magasins supprimés" -"Details","Détails" -"Disabled","Désactivé" -"Edit","Modifier" -"Edit Account Info","Éditer les informations du compte" -"Edit Account Information","Éditer les informations du compte" -"Edit Address","Éditer l'adresse" -"Edit Address Entry","Éditer l'entrée adresse" -"Edit Customer Group ""%s""","Modifier le groupe utilisateur ""%s""" -"Edit Customer Groups","Éditer les groupes de clients" -"Edit Customer's Address","Éditer l'adresse du client" -"Edit Group","Éditer le groupe" -"Edit Newsletters","Éditer les newsletters" -"Email","Email" -"Email Address","Adresse email" -"Email Sender","Expéditeur de l'email" -"Email:","Email :" -"Enable Automatic Assignment to Customer Group","Activer l'affectation automatique à un Groupe de clients" -"Entity collection is expected.","Une collection d'entité est attendue" -"Excel XML","Excel XML" -"Failed to confirm customer account.","Échec de la confirmation du compte client." -"Fax","Fax" -"First Name","Prénom" -"Forgot Email Template","Modèle du mail oublié" -"Forgot Password","Mot de passe oublié" -"Forgot Your Password","Mot de passe oublié" -"Forgot Your Password?","Mot de passe oublié?" -"Forgot and Remind Email Sender","Envoyer un e-mail de rappel en cas d'oubli" -"Form Fields Before","Champs des formulaires avant" -"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","Vous pouvez avoir un aperçu de votre activité récente dans le tableau de bord de votre compte. Vous pouvez également mettre à jour les informations de votre compte. Sélectionner un lien ci-dessous pour voir ou éditer vos informations." -"Gender","Genre" -"Gender is required.","Le genre est requis." -"General Subscription","Abonnement général" -"Generate Human-Friendly Customer ID","Générer un ID client intelligible" -"Global","Global" -"Group","Groupe" -"Group Information","Informations sur le groupe" -"Group Name","Nom du groupe" -"Group for Invalid VAT ID","Groupe pour numéro de TVA non valide" -"Group for Valid VAT ID - Domestic","Groupe pour numéro de TVA valide - National" -"Group for Valid VAT ID - Intra-Union","Groupe pour numéro de TVA valide - Intra-Union" -"Guest","Invité" -"HTML","HTML" -"Hello, %s!","Bonjour %s!" -"ID","ID" -"IP Address","Adresse IP" -"If you believe this is an error, please contact us at %s","Si vous pensez qu'il s'agit d'une erreur, veuillez nous contacter au %s" -"If you have an account with us, please log in.","Si vous avez un compte chez nous, identifiez-vous." -"Invalid attribute option specified for attribute %s (%s), skipping the record.","Option d'attribut invalide spécifiée pour l'attribut %s (%s), enregistrement sauté." -"Invalid attribute set specified, skipping the record.","Ensemble d'attributs spécifiés invalide, enregistrement sauté." -"Invalid billing address for (%s)","Adresse de facturation non valide pour (%s)" -"Invalid current password","Mot de passe invalide" -"Invalid customer data","Données client invalides" -"Invalid email address ""%s"".","Adresse email invalide ""%s""" -"Invalid email address.","Adresse mail invalide" -"Invalid login or password.","Login ou mot de passe invalide" -"Invalid password reset token.","Preuve de réinitialisation de mot de passe invalide." -"Invalid shipping address for (%s)","Adresse de livraison non valide pour (%s)" -"Invalid store specified, skipping the record.","Magasin spécifié invalide, enregistrement sauté." -"Invalid website, skipping the record, line: %s","Site Internet non valide, enregistrement ignoré, ligne : %s" -"Last Activity","Dernière activité" -"Last Date Subscribed","Dernière date d'inscription" -"Last Date Unsubscribed","Dernière date de désinscription" -"Last Name","Nom" -"Last URL","Dernier lien" -"Leave empty for default (15 minutes).","Laisser vide par défaut (15 minutes)" -"Leave empty for default (2). Valid range: 1-4","Laisser vide par défaut (2). Valeurs valides de 1 à 4." -"Lifetime Sales","Ventes à vie" -"Log In","Connexion" -"Log Out","Déconnexion" -"Login","Identifiant" -"Login Information","Information de connexion" -"Login Options","Options d'identification" -"Login and password are required.","Le nom d'utilisateur et le mot de passe sont requis." -"Login or Create an Account","Connectez-vous ou créez un compte" -"MM","MM" -"Manage Addresses","Gérer les adresses" -"Manage Customers","Gérer les utilisateurs" -"Maximum length must be less then %s symbols","La longueur maximale doit être inférieure à %s symboles" -"Missing email, skipping the record, line: %s","Adresse e-mail manquante, enregistrement ignoré, ligne : %s" -"Missing email, skipping the record.","Adresses manquante, ignorer." -"Missing first name, skipping the record, line: %s","Prénom manquant, enregistrement ignoré, ligne : %s" -"Missing firstname, skipping the record.","Prénom manquant, ignorer." -"Missing last name, skipping the record, line: %s","Nom manquant, enregistrement ignoré, ligne : %s" -"Missing lastname, skipping the record.","Nom de famille manquant, ignorer." -"Missing website, skipping the record, line: %s","Site Internet manquant, enregistrement ignoré, ligne : %s" -"Month","Mois" -"My Account","Mon compte" -"My Account Wrapper","Mon compte" -"My Dashboard","Mon espace de travail" -"My Orders","Mes commades" -"Name","Nom" -"Name and Address Options","Options du nom et de l'adresse" -"Never","Jamais" -"New Address","Nouvelle adresse" -"New Address Entry","Nouvelle entrée d'adresse" -"New Customer","Nouvel utilisateur" -"New Customer Address","Nouvelle adresse utilisateur" -"New Customer Group","Nouveau groupe d'utilisateurs" -"New Customer Groups","Nouveaux groupes d'utilistateurs" -"New Customers","Nouveaux utilisateurs" -"New Group","Nouveau groupe" -"New Password","Nouveau mot de passe" -"New account","Nouveau compte" -"New account confirmation key","Nouvelle clé de confirmation du compte" -"New account confirmed","Nouveau compte confirmé" -"New password field cannot be empty.","Le champ nouveau mot de passe ne peut pas être vide." -"Newsletter","Newsletter" -"Newsletter Finish","Fin de la lettre d'informations" -"Newsletter Information","Information de la lettre" -"Newsletter Received","Lettre d'informations reçue" -"Newsletter Start","Début de la lettre d'information" -"Newsletter Subscription","Abonnement à la newsletter" -"Newsletters","Lettres d'information" -"No Items Found","Pas d'objet trouvé" -"No Newsletter Found","Aucune lettre d'information trouvée" -"No customer collections found","Aucune collection d'utilisateur" -"No item specified.","Pas d'objet spécifié" -"Not Sent","Non envoyé" -"Not confirmed, can login","Non confirmé, peut se connecter" -"Not confirmed, cannot login","Non confirmé, ne peut pas se connecter" -"Number of Lines in a Street Address ","Nombre de lignes dans l'adresse" -"Offline","Hors ligne" -"Online","En ligne" -"Online Customers","Utilisateurs en ligne" -"Online Customers Options","Options des utilisateurs en ligne" -"Online Minutes Interval","Intervalle des minutes en ligne" -"Order #","Commande n°" -"Order Total","Total de la commande" -"Orders","Commandes" -"PDF","PDF" -"Password","Mot de passe" -"Password Management","Gestion du mot de passe" -"Password Options","Option du mot de passe" -"Password forgotten","Mot de passe oublié" -"Password:","Mot de passe :" -"Paused","En pause" -"Pending","En cours" -"Per Website","Par site web" -"Personal Information","Information personnelle" -"Please enter a number 1 or greater in this field.","Veuillez saisir un nombre supérieur ou égal à 1 dans ce champ." -"Please enter a valid date between %s and %s at %s.","Veuillez saisir une date valide entre le %s et le %s à la ligne %s." -"Please enter a valid date equal to or greater than %s at %s.","Veuillez saisir une date valide supérieure ou égale au %s à la ligne %s." -"Please enter a valid date less than or equal to %s at %s.","Veuillez saisir une date valide inférieure ou égale au %s à la ligne %s." -"Please enter the city.","Veuillez saisir la ville." -"Please enter the country.","Veuillez saisir le pays." -"Please enter the first name.","Veuillez saisir le prénom." -"Please enter the last name.","Veuillez saisir le nom de famille." -"Please enter the state/province.","Veuillez entrer l'état/la région." -"Please enter the street.","Veuillez saisir la ville." -"Please enter the telephone number.","Veuillez saisir le numéro de téléphone." -"Please enter the zip/postal code.","Veuillez saisir le code postal." -"Please enter your email address below. You will receive a link to reset your password.","Veuillez entrer votre adresse e-mail ci dessous. Vous allez recevoir un lien pour réinitialiser votre mot de passe." -"Please enter your email below and we\'ll send you confirmation link for it.","Veuillez entrer votre adresse email ci-dessous et nous vous enverrons un lien de confirmation." -"Please enter your email.","Veuillez entrer votre adresse email." -"Please make sure your passwords match.","Veillez à ce que vos mots de passe correspondent." -"Please select a website which contains store view","Veuillez sélectionner un site Internet contenant une vue du magasin" -"Please select region, state or province","Veuillez sélectionner la région, l'état et le pays" -"Please, check your email for confirmation key.","Veuillez vérifier vos emails pour la clé de confirmation." -"Prefix Dropdown Options","Options de préfixe" -"Price","Prix" -"Product","Produit" -"Product ID","Identifiant du produit" -"Product Name","Nom du produit" -"Product Reviews","Avis sur le produit" -"Product Tags","Étiquettes des produits" -"Purchase On","Commander via" -"Purchased On","Acheté sur" -"Qty","Qté" -"Recent Orders","Commandes récentes" -"Records for %s store found.","Enregistrements pour %s boutiques trouvés." -"Recovery Link Expiration Period (days)","Délai d'expiration du lien de récupération (jours)" -"Redirect Customer to Account Dashboard after Logging in","Rediriger l'utilisateur vers son tableau de bord après la connexioin" -"Refunded","Remboursé" -"Register","S'inscrire" -"Registered Customers","Utilisateurs enregistrés" -"Remind Email Template","Modèle d'e-mail de rappel" -"Remind Password","Rappeler le mot de passe" -"Remove","Supprimer" -"Require Emails Confirmation","Nécessaire confirmation par email" -"Reset a Password","Réinitialiser un mot de passe" -"Retrieve address data","Récupérer les données de l'adresse" -"Retrieve address info","Récupérer les informations de l'adresse" -"Retrieve customer addresses","Récupérer les adresses des utilisateurs" -"Retrieve customer data","Récupérer les données de l'utilisateur" -"Retrieve customer groups","Récupérer les groupes utilisateurs" -"Retrieve customer info","Récupérer les infos de l'utilisateur" -"Retrieve customers","Récupérer les utilisateurs" -"Retrieve your confirmation link here","Récupérer votre lien de confirmation ici" -"Retrieve your password here","Récupérer votre mot de passe ici" -"SKU","SKU" -"Sales Statistics","Statistiques de vente" -"Save","Enregistrer" -"Save Address","Enregister l'adresse" -"Save Customer","Enregistrer le client" -"Save Customer Group","Enregistrer le groupe de clients" -"Save Password","Enregistrer le mot de passe" -"Save and Continue Edit","Sauvegarder et continuer l'édition" -"Saved %d record(s)","Sauvegardé %d enregistrement(s)" -"Semicolon (;) separated values.
    Put semicolon in the beginning for empty first option.
    Leave empty for open text field.","Valeurs séparées par des points-virgules (;).
    Mettre le point-virgule au début pour que la première option soit vide.
    Laisser vide pour que le champ de texte soit ouvert." -"Send Auto-Generated Password","Envoyer mot de passe généré automatiquement" -"Send From","Envoyer depuis" -"Send Welcome Email","Envoyer l'e-mail de bienvenue" -"Send Welcome Email after Confirmation","Envoyer l'e-mail de bienvenue après confirmation" -"Send confirmation link","Envoyer le lien de confirmation" -"Sending","Envoi" -"Sent","Envoyé" -"Session Start Time","Heure de début de session" -"Set as Default Billing Address","Définir comme adresse de facturation par défaut" -"Set as Default Shipping Address","Définir comme adresse d'expédition par défaut" -"Share Customer Accounts","Partager les comptes client" -"Shipped to First Name","Expédié à Prénom" -"Shipped to Last Name","Expédié à Nom de famille" -"Shipped to Name","Expédié à Nom" -"Shopping Cart","Panier" -"Shopping Cart - %d item(s)","Panier - %d article(s)" -"Shopping Cart of %1$s - %2$d item(s)","Panier de %1$s - %2$d objet(s)" -"Show Date of Birth","Montrer la date de naissance" -"Show Gender","Montrer le genre" -"Show Middle Name (initial)","Montrer le deuxième prénom (initial)" -"Show Prefix","Montrer le préfixe" -"Show Suffix","Montrer le suffixe" -"Show Tax/VAT Number","Montrer le numéro de taxe/TVA" -"Show VAT Number on Frontend","Afficher le numéro TVA à l'avant" -"Sign Up for Newsletter","S'inscrire à la newsletter" -"Skipping import row, required field ""%s"" is not defined.","Sauter la ligne d'importation, le champ requis ""%s"" n'est pas défini." -"Skipping import row, website ""%s"" field does not exist.","Ignorer la ligne importation, le champ site web ""%s"" n'existe pas." -"State/Province","Etat/pays" -"Status","Statut" -"Store","Magasin" -"Store View","Vue du magasin" -"Street Address","Adresse postale" -"Street Address %s","Rue %s" -"Subject","Sujet" -"Submit","Soumettre" -"Subscribe to Newsletter","S'inscrire à la newsletter" -"Subscribed to Newsletter?","Inscrit à la newsletter ?" -"Suffix Dropdown Options","Option de la liste déroulante de suffixe" -"Tag Name","Nom de l'étiquette" -"Tax Calculation Based On","Calcul des taxes selon" -"Tax Class","Classe d'impôt" -"Tax/VAT number","Numéro TVA" -"Telephone","Téléphone" -"Text","Texte" -"Text One Line","Texte une ligne" -"Thank you for registering with %s.","Merci de vous être inscrit à %s." -"The Date of Birth is required.","La date de naissance est requise." -"The TAX/VAT number is required.","Le numéro TAX/VAT est requis." -"The VAT ID entered (%s) is not a valid VAT ID.","Le numéro de TVA saisi (%s) n'est pas un numéro de TVA valide." -"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","Le numéro de TVA saisi (%s) n'est pas un numéro de TVA valide. Le client appartiendrait au Groupe de clients %s." -"The VAT ID is valid. The current Customer Group will be used.","Le numéro de TVA est valide. Le Groupe de clients en cours va être utilisé." -"The account information has been saved.","Les informations du compte ont été sauvegardées." -"The address does not belong to this customer.","Cette adresse n'appartient pas à cet utilisateur." -"The address has been deleted.","Cette adresse a été supprimée." -"The address has been saved.","L'adresse a été enregistrée." -"The customer ID and email did not match, skipping the record, line: %s","L'identifiant client et l'e-mail ne correspondent pas, enregistrement ignoré, ligne : %s" -"The customer does not have default billing address.","L'utilisateur ne dispose pas d'une adresse de facturation par défaut." -"The customer email (%s) already exists, skipping the record, line: %s","L'adresse e-mail du client existe déjà, enregistrement ignoré, ligne : %s" -"The customer group has been deleted.","Le groupe d'utilisateurs a été supprimé." -"The customer group has been saved.","Le groupe d'utilisateurs a été enregistré." -"The customer is currently assigned to Customer Group %s.","Le client appartient actuellement au Groupe de clients %s." -"The first name cannot be empty.","Le prénom ne peut être vide." -"The group ""%s"" cannot be deleted","Le groupe ""%s"" ne peut pas être supprimé" -"The last name cannot be empty.","Le nom de famille ne peut être vide." -"The minimum password length is %s","La longueur minimale du mot de passe est %s" -"The password cannot be empty.","Le mot de passe ne peut être vide." -"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","Le mot de passe doit contenir au moins 6 caractères. Les espaces seront ignorés." -"The suffix that goes after name (Jr., Sr., etc.)","Le suffixe suivant le nom (Jr, Sr, etc)" -"The title that goes before name (Mr., Mrs., etc.)","Le titre qui va avant le nom (M, Mme, Mlle, etc)" -"There are no items in customer's wishlist at the moment","Il n'y a pas d'objets dans la liste de voeux de l'utilisateur" -"There are no items in customer\'s shopping cart at the moment","Il n'y a pas d'objets dans le panier d'utilisateur" -"There is already an account with this email address. If you are sure that it is your email address, click here to get your password and access your account.","Il y a déjà un compte avec cette adresse email. Si vous êtes sûr qu'il s'agit de votre adresse email, cliquez ici pour obtenir votre mot de passe et accéder à votre compte." -"There was an error validating the VAT ID.","Une erreur est apparue lors de la validation du numéro de TVA." -"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","Une erreur est apparue lors de la validation du numéro de TVA. Le client appartiendrait au Groupe de clients %s." -"This account is not confirmed.","Ce compte n'est pas confirmé." -"This customer email already exists","Cette adresse d'utilisateur existe déjà." -"This customer has no saved addresses.","Cet utilisateur n'a aucune adresse enregistrée." -"This email does not require confirmation.","Cet email ne nécessite pas de confirmation." -"This email will be sent instead of default welcome email, after account confirmation.","Cet email sera envoyé au lieu du message de bienvenue par défaut, après la confirmation du compte." -"This is My Default %s Address","Il s'agit de mon adresse par défaut %s" -"To Cart","Vers le panier" -"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","Pour afficher le numéro TVA à l'avant, régler sur Oui l'option d'affichage du numéro de TVA à l'avant." -"Total","Total" -"Type","Type" -"Unable to save the customer.","Impossible d'enregistrer l'utilisateur." -"Unknown","Inconnu" -"Unsubscribe from Newsletter","Se désinscrire de la lettre d'informations" -"Update","Mise à jour" -"Update customer address data","Mettre à jour l'adresse de l'utilisateur" -"Update customer data","Mettre à jour les données de l'utilisateur" -"Use as My Default %s Address","Utiliser comme mon adresse par défaut %s" -"Use as My Default Billing Address","Utiliser comme mon adresse de facturation par défaut" -"Use as My Default Shipping Address","Utiliser comme mon adresse d'expédition par défaut" -"Use as my default billing address","Utiliser comme mon adresse de facturation par défaut." -"Use as my default shipping address","À utiliser comme mon adresse de livraison par défaut" -"VAT Number","Numéro TVA" -"VAT Request Date","Date de demande de la TVA" -"VAT Request Identifier","Identifiant de demande de la TVA" -"Validate VAT Number","Valider le numéro de TVA" -"Validate on Each Transaction","Valider chaque transaction" -"Validation Error Group","Groupe d'erreur de validation" -"View","Vue" -"View Order","Voir la commande" -"Visitor","Visiteur" -"Visitors Only","Visiteurs uniquement" -"Website","Site" -"Welcome Email","Email de bienvenue" -"Wishlist","Liste de cadeaux" -"Wishlist - %d item(s)","Liste de voeux - %d objets" -"Would you like to change the Customer Group for this order?","Souhaitez-vous modifier le Groupe de clients pour cette commande ?" -"Wrong confirmation key.","Clé de confirmation erronée." -"Wrong customer account specified.","Mauvais compte utilisateur." -"Wrong email.","Mauvaise adresse email." -"Wrong transactional account email type","Mauvais type d'email pour le compte de transaction" -"YYYY","AAAA" -"Year","Année" -"You are currently not subscribed to any newsletter.","Vous n'êtes actuellement abonné à aucune lettre d'informations." -"You are currently not subscribed to our newsletter.","Vous n'êtes pas actuellement abonné à notre lettre d'informations." -"You are currently subscribed to 'General Subscription'.","Vous êtes actuellement abonné à no ""Souscription générale""" -"You are currently subscribed to our newsletter.","Vous êtes actuellement abonné à notre lettre d'informations." -"You are now logged out","Vous êtes maintenant déconnecté." -"You have logged out and will be redirected to our homepage in 5 seconds.","Vous êtes déconnecté et serez redirigé vers notre page d'accueil dans 5 secondes." -"You have no additional address entries in your address book.","Vous n'avez pas d'entrées supplémentaires dans votre carnet d'adresses." -"You have no additional entries in your address book.","Vous n'avez pas d'entrées supplémentaires dans votre carnet d'adresses." -"You have no default billing address in your address book.","Vous n'avez pas d'adresse de facturation par défaut dans votre carnet d'adresses." -"You have no default entries in your address book.","Vous n'avez pas d'adresses par défaut dans votre carnet d'adresses." -"You have no default shipping address in your address book.","Vous n'avez pas d'adresse d'expédition par défaut dans votre carnet d'adresses." -"You have not set a default billing address.","Vous n'avez pas défini d'adresse de facturation par défaut." -"You have not set a default shipping address.","Vous n'avez pas défini d'adresse de facturation par défaut." -"You have placed no orders yet.","Vous n'avez placé aucune commande." -"You have placed no products yet.","Vous n'avez placé aucun produit." -"You will be charged tax.","Vous devrez payer des taxes." -"You will not be charged tax.","Vous n'aurez pas de taxe à payer." -"Your Tax ID cannot be validated.","Votre numéro d'identification fiscale ne peut pas être validé." -"Your VAT ID was successfully validated.","Votre numéro de TVA a bien été validé." -"Your account balance is: %s","La balance de votre compte est : %s" -"ZIP","ZIP" -"ZIP/Post Code","Code postal" -"Zip/Postal Code","Code postal" -"n/a","n/a" -"or","ou" -"register","s'enregistrer" diff --git a/app/locale/fr_FR/Mage_Dataflow.csv b/app/locale/fr_FR/Mage_Dataflow.csv deleted file mode 100644 index bbb597c8b..000000000 --- a/app/locale/fr_FR/Mage_Dataflow.csv +++ /dev/null @@ -1,32 +0,0 @@ -"Link","Lien" -"Actions XML is not valid.","Le XML actions n'est pas valable." -"An error occurred while opening file: ""%s"".","Une erreur est survenue en ouvrant le fichier ""%s""" -"Could not load file: ""%s"".","N'a pas pu charger le fichier" -"Could not save file: %s.","N'a pas pu sauvegarder le fichier : """"%s""""." -"Declared adapter %s was not found.","L'adaptateur spécifiqué %s n'a pas été trouvé." -"Destination folder ""%s"" is not a directory.","Le dossier de destination ""%s"" n'est pas un répertoire" -"Destination folder ""%s"" is not writable.","Le dossier de destination ""%s"" n'est pas accessible en écriture" -"Done","Terminé" -"Dry run set, stopping execution.","Lancement d'essai effectué, arrêt de l'exécution." -"ETA: %s","Temps estimé : %s" -"Error in field mapping: field list for mapping is not defined.","Erreur lors de la liaison des champs : la liste des champs n'est pas définie." -"File ""%s"" does not exist.","Le fichier ""%s"" n'existe pas." -"Found %d rows.","A trouvé %d lignes." -"Less than a minute","Moins d'une minute." -"Loaded successfully: ""%s"".","Chargement avec succès : ""%s""" -"Memory Used: %s","Mémoire utilisée : %s" -"Method ""%s"" not defined in adapter %s.","La méthode ""%s"" n'est pas définie dans l'adaptateur %s" -"Method ""%s"" was not defined in adapter %s.","La méthode ""%s"" n'était pas définie dans l'adaptateur %s" -"Please declare ""adapter"" and ""method"" nodes first.","Veuillez déclarer ""adaptateur"" et ""méthodes"" avant." -"Processed records: %s","Dossiers traités : %s" -"Profile with the same name already exists.","Un profil avec le même nom existe déjà." -"Saved successfully: ""%s"" [%d byte(s)].","Enregistrement avec succès : ""%s"" [%d byte(s)]." -"Sheet 1","Feuille 1" -"Skip undefined row.","Passer la ligne non définie." -"Starting %s :: %s","Lancement %s :: %s" -"The destination folder ""%s"" does not exist or there is no access to create it.","Le fichier de destination ""%s"" n'existe pas, et il n'y a pas d'accès pour le créer." -"Total records: %s","Total des dossiers : %s" -"hour","heure" -"hours","heures" -"minute","minute" -"minutes","minutes" diff --git a/app/locale/fr_FR/Mage_Directory.csv b/app/locale/fr_FR/Mage_Directory.csv deleted file mode 100644 index f415a4008..000000000 --- a/app/locale/fr_FR/Mage_Directory.csv +++ /dev/null @@ -1,49 +0,0 @@ -"-- Please select --","-- Veuillez sélectionner --" -"Allowed Currencies","Devises autorisées" -"Base Currency","Devise de base" -"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","La monnaie de base est utilisée pour tous les paiements en ligne. Le champ est défini par l'étendue des prix du catalogue" -"Can\'t convert rate from ""%s-%s"".","Impossible de convertir le taux depuis « %s-%s ». " -"Cannot retrieve rate from %s.","Ne peut extraire taux du %s." -"Connection Timeout in Seconds","Interruption connexion en secondes" -"Continue »","Continue »" -"Country","Pays" -"Country API","API Pays" -"Country and Format Type combination should be unique","Pays et combinaison de type de format devrait être unique" -"Currency","Devise" -"Currency Options","Options devise" -"Currency Setup","Mise en place devise" -"Currency Update Warnings","Mises en garde mise à jour devise" -"Default Display Currency","Devise affichée par défaut" -"Directory","Répertoire" -"Display not required State","Etat non requis" -"Enabled","Activé" -"Error Email Recipient","Erreur de destinataire courriel" -"Error Email Sender","Erreur d'expéditeur courriel" -"Error Email Template","Erreur de modèle de courriel" -"FATAL ERROR:","ERREUR FATALE:" -"Frequency","Fréquence" -"Installed Currencies","Devises en place" -"Invalid Import Service specified.","Service d'import invalide spécifié." -"Invalid country code: %s","Mauvais code pays: %s" -"Invalid rates received","Taux invalides reçus" -"Invalid target currency.","Devise cible invalide." -"List of countries","Liste de pays" -"List of regions in specified country","Liste de régions dans le pays spécifié" -"Postal Code is Optional for the following countries","Code postal optionnel pour les pays suivants" -"Region","Région" -"Region API","API Région" -"Scheduled Import Settings","Paramètres import programmé" -"Select Your Currency","Sélectionnez votre devise" -"Service","Service" -"Start Time","Heure commencement" -"State is required for","L'Etat est requis pour" -"State/Province","État/province" -"States Options","Options d'Etat" -"Strikeiron Email Update Warnings","Avertissements d'e-mails de mises à jour de Strikeiron" -"Unable to initialize the import model.","Ne peut initialiser le modèle d'import." -"Undefined rate from ""%s-%s"".","Taux non défini de ""%s-%s""." -"WARNING:","AVERTISSEMENT:" -"Webservicex","Webservicex" -"Your Currency","Votre devise" -"Your Currency:","Votre devise :" -"Your current currency is: %s","Votre devise actuelle est: %s" diff --git a/app/locale/fr_FR/Mage_Downloadable.csv b/app/locale/fr_FR/Mage_Downloadable.csv deleted file mode 100644 index 8f29f4734..000000000 --- a/app/locale/fr_FR/Mage_Downloadable.csv +++ /dev/null @@ -1,95 +0,0 @@ -"Add","Ajouter" -"Add New Row","Ajouter nouvelle ligne" -"Add links and samples to downloadable product","Ajouter des liens et des échantillons au produit téléchargeable" -"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.","Il est recommandé de n'utiliser que des lettres, des chiffres, le tiret (-) et le blanc souligné (_) pour les noms de fichiers. Les caractères invalides seront remplacés par '_'." -"An error occurred while getting the requested content.","Une erreur s'est produite en accédant au contenu demandé." -"An error occurred while getting the requested content. Please contact the store owner.","Un erreur s'est produite en accédant au contenu demandé. Contactez le propriétaire du site." -"An error occurred while saving the file(s).","Une erreur s'est produite en sauvegardant les fichiers." -"Availability:","Disponibilité:" -"Back","Retour" -"Canceled","Annulé" -"Cannot connect to remote host, error: %s.","Impossible de se connecter à l'hôte distant, erreur: %s" -"Catalog Product View (Downloadable)","Vue de produit du catalogue (téléchargeable)" -"Category API","API catégorie" -"Customer My Account Downloadable Items","Objets téléchargeables dans le compte client" -"Date","Date" -"Default Link Title","Lien du titre par défaut" -"Default Maximum Number of Downloads","Nombre de téléchargements maximum par défaut" -"Default Sample Title","Titre exemple par défaut" -"Delete","Supprimer" -"Disable Guest Checkout if Cart Contains Downloadable Items","Désactiver le paiement en statut invité si le panier contient des objets téléchargeables" -"Downloadable Information","Information téléchargeables" -"Downloadable Product","Produit téléchargeable" -"Downloadable Product Options","Options de produit téléchargeable" -"Downloadable Product Section","Section produit téléchargeable" -"Edit","Éditer" -"Edit item parameters","Modifier les paramètres de l'objet" -"Excl. Tax","Taxe non comprise" -"File","Fichier" -"From:","De :" -"Gift Message","Message cadeau" -"Go to My Downloadable Products","Aller à Mes produits téléchargeables" -"Guest checkout will only work with shareable.","Le paiement par invité ne marchera qu'en partagé." -"In stock","En stock." -"Incl. Tax","Taxe comprise" -"Invalid download URL host.","Hôte de l'URL de téléchargement invalide" -"Invalid download URL scheme.","Schéma de l'URL de téléchargement invalide" -"Invalid download link type.","Type de lien de téléchargement invalide" -"Invoiced","Facturé" -"Links can be purchased separately","Les liens peuvent être achetés séparément." -"List","Liste" -"Max. Downloads","Téléchargements maximum" -"Message:","Message :" -"Move","Déplacer" -"Move to wishlist","Déplacer dans la liste de souhaits" -"My Downloadable Products","Mes produits téléchargeables" -"Open Links in New Window","Ouvrir les liens dans une nouvelle fenêtre" -"Order #","Commande n°" -"Order Item Status to Enable Downloads","Statut des objets en commande pour activer les téléchargements" -"Order id cannot be null","L'identifiant de commande ne peut être nul" -"Order item id cannot be null","L'identifiant de commande ne peut être nul" -"Ordered","Commandé" -"Out of stock","Épuisé" -"Pending","En cours" -"Please log in to download your product or purchase %s.","Veuillez vous connecter pour télécharger votre produit ou acheter %s." -"Please log in to download your product.","Identifiez-vous pour télécharger votre produit." -"Please set resource file and link type.","Choisissez un fichier ressource et un type de lien." -"Please specify product link(s).","Spécifier un/des lien(s) vers le produit" -"Price","Prix" -"Product downloadable links","Liens produit téléchargeable" -"Qty","Qté" -"Refunded","Remboursé" -"Remaining Downloads","Téléchargements restants" -"Remove","Supprimer" -"Remove Item","Supprimer l'objet" -"Remove links and samples from downloadable product","Supprimer les liens et les échantillons du produit téléchargeable" -"Requested link does not exist.","Le lien demandé n'existe pas" -"Retrieve links and samples list from downloadable product","Récupérer la liste de liens et d'échantillons du produit téléchargeable" -"SKU","Unités gestion de stock" -"Sample","échantillon" -"See price before order confirmation.","Voir le prix avant la confirmation de commande." -"Shareable","Partageable" -"Shipped","Envoyé" -"Sorry, there was an error getting requested content. Please contact the store owner.","Désolé, une erreur s'est produite pendant la requête de contenu. Veuillez contacter le propriétaire du magasin." -"Sort Order","Trier les widgets" -"Start Download","Commencer le téléchargement" -"Status","Statut" -"Subtotal","Sous-total" -"The file does not exist.","Le fichier n'existe pas" -"The link has expired.","Le lien a expiré." -"The link is not available.","Le lien n'est pas disponible." -"There are files that were selected but not uploaded yet. Please upload or remove them first","Certains fichiers sélectionnés n'ont toujours pas été envoyés. Veuillez d'abord les envoyer ou les supprimer" -"Title","Titre" -"To:","A :" -"U","U" -"Unlimited","Illimité" -"Update","Actualiser" -"Use Content-Disposition","Utiliser la disposition du contenu" -"Use Default Value","Utiliser la valeur par défaut" -"View Order","Voir la commande" -"What's this?","Qu'est-ce ?" -"You have not purchased any downloadable products yet.","Vous n'avez pas acheté d'objets téléchargeables." -"attachment","pièce jointe" -"download","télécharger" -"inline","en cours" -"sample","aperçu" diff --git a/app/locale/fr_FR/Mage_Eav.csv b/app/locale/fr_FR/Mage_Eav.csv deleted file mode 100644 index ba4b27c2f..000000000 --- a/app/locale/fr_FR/Mage_Eav.csv +++ /dev/null @@ -1,124 +0,0 @@ -"""%s"" contains not only digit characters.","""%s"" ne contient pas que des chiffres." -"""%s"" does not fit the entered date format.","""%s"" ne correspond pas au format de date entré." -"""%s"" exceeds the allowed file size.","""%s"" dépasse la taille maximale autorisée." -"""%s"" exceeds the allowed length.","""%s"" dépasse la longueur autorisée." -"""%s"" has not only alphabetic and digit characters.","""%s"" ne contient pas que des lettres et des chiffres" -"""%s"" has not only alphabetic characters.","""%s"" n'a pas que des lettres" -"""%s"" height exceeds allowed value of %s px.","La hauteur de ""%s"" dépasse la valeur autorisée de %s pixels." -"""%s"" invalid type entered.","Type ""%s"" invalide entré" -"""%s"" is a required value.","""%s"" est une valeur requise." -"""%s"" is an empty string.","""%s"" est vide." -"""%s"" is not a valid URL.","""%s"" n'est pas une URL valide" -"""%s"" is not a valid date.","""%s"" n'est pas une date valide" -"""%s"" is not a valid email address.","""%s"" n'est pas une adresse email valide" -"""%s"" is not a valid file","""%s"" n'est pas un fichier valide" -"""%s"" is not a valid file extension.","""%s"" n'est pas une extension de fichier valide" -"""%s"" is not a valid file.","""%s"" n'est pas un fichier valide" -"""%s"" is not a valid hostname.","""%s"" n'est pas un nom valide" -"""%s"" is not a valid image format","""%s"" n'est pas un format d'image valide" -"""%s"" length must be equal or greater than %s characters.","""%s"" doit comporter %s caractères au minimum." -"""%s"" length must be equal or less than %s characters.","""%s"" doit comporter %s caractères au maximum." -"""%s"" width exceeds allowed value of %s px.","La largeur de ""%s"" dépasse la valeur autorisée de %s pixels." -"'%value%' appears to be a DNS hostname but cannot extract TLD part","""%s"" semble être un nom de DNS, mais il est impossible d'en extraire TLD" -"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' semble être un nom de DNS, mais il est impossible de trouver une correspondance dans la liste TLD" -"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' semble être un nom de DNS, mais impossible de trouver une correspondance avec le schéma TLD" -"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' semble être un nom de DNS, mais contient un / à un emplacement invalide." -"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' semble être un nom de DNS mais la notation ne peut être décodée" -"'%value%' appears to be a local network name but local network names are not allowed","'%value%' semble être le nom d'un réseau local, mais les noms de réseaux locaux ne sont pas autorisés." -"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' semble être une adresse IP, mais les adresses IP ne sont pas autorisées." -"'%value%' does not appear to be a valid URI hostname","'%value%' ne semble pas être une URL valide" -"'%value%' does not appear to be a valid local network name","'%value%' ne semble pas être un nom de réseau local valide" -"'%value%' does not match the expected structure for a DNS hostname","'%value%' ne correspond pas à la structure attendue pour un nom de DNS" -"A joint field with this alias (%s) is already declared","Un champ joint avec l'alias (%s) est déjà déclaré." -"Add Option","Ajouter option" -"An error occurred while loading a record, aborting. Error: %s","Une erreur est survenue lors du chargement d'un enregistrement. Erreur : %s" -"An error occurred while loading the collection, aborting. Error: %s","Une erreur est survenue lors du chargement de la collection. Erreur : %s" -"An error occurred while saving a record, aborting. Error: ","Une erreur est survenue lors de la sauvegarde d'un enregistrement. Erreur :" -"Attempt to add an invalid object","Tentative d'ajout d'un objet invalide" -"Attribute '%s' used in configurable products","L'attribut ""%s"" est utilisé dans les produits configurables" -"Attribute Code","Code d'attribut" -"Attribute Label","Label d'attribut" -"Attribute Properties","Propriétés d'attribut" -"Attribute object is undefined","L'attribut de l'objet n'est pas défini" -"Attribute set with the ""%s"" name already exists.","Un attribut avec le nom ""%s"" existe déjà." -"Attribute with the same code","Attribut avec le même code" -"Can\'t create table: %s","Ne peut pas créer la table : %s" -"Catalog Input Type for Store Owner","Type d'entrée de catalogue pour le propriétaire de la boutique" -"Current module EAV entity is undefined","L'entité de module actuelle EAV n'est pas définie" -"Current module pathname is undefined","Le nom du répertoire du module actuel n'est pas défini" -"Data integrity: No header row found for attribute","Intégrité des données : pas de ligne d'en-tête trouvée pour l'attribut" -"Date","Date" -"Decimal Number","Nombre décimal" -"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","Trier la liste de produits par défaut par n'existe pas dans Trier la liste de produits disponibles." -"Default Value","Valeur par Défaut" -"Default option value is not defined","Valeur d'option par défaut non définie" -"Delete","Supprimer" -"Dropdown","Liste déroulante" -"Email","Email" -"Entity collection expected.","Une collecte d'entité est attendue." -"Entity collections expected.","Collectes d'entités attendues." -"Entity instance is not defined","Instance de l'entité non définie" -"Entity is not initialized","Entité non initialisée" -"Entity object is undefined","Objet de l'entité non défini" -"Failed to load node %s from config","Echec du chargement de %s depuis la configuration" -"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","Pour usage interne. Doit être unique, sans espaces. La longueur maximale du code des attributs doit être inférieure à %s symboles" -"Form Element with the same attribute","Élément de formulaire avec le même attribut" -"Form Fieldset with the same code","Formulaire de champ avec le même code" -"Form Type with the same code","Type de formulaire avec le même code" -"Form code is not defined","Code formulaire non défini" -"Frontend label is not defined","Étiquette front-end non définie" -"Input Validation for Store Owner","Validation de l'entrée pour le propriétaire de la boutique" -"Integer Number","Nombre entier" -"Invalid EAV attribute.","Attribut EAV invalide." -"Invalid alias, already exists in joint attributes","Pseudonyme invalide, existe déjà dans des attributs conjoints" -"Invalid attribute name: %s","Nom d'attribut invalide : %s" -"Invalid attribute requested: %s","Attribut requis invalide : %s" -"Invalid attribute type","Type d'attribut invalide" -"Invalid character encountered in increment ID: %s","Caractère invalide trouvé dans l'ID d'incrément : %s" -"Invalid date","Date invalide" -"Invalid default date","Date par défaut invalide" -"Invalid default decimal value","Valeur décimale par défaut invalide" -"Invalid entity specified","Entité spécifiée invalide" -"Invalid entity supplied.","Entité fournie invalide." -"Invalid entity supplied: %s","Entité fournie invalide : %s" -"Invalid entity type","Type d'entité invalide" -"Invalid entity_id, skipping the record.","ID de l'entité invalide, enregistrement sauté." -"Invalid entity_type specified: %s","Type d'entité spécifiée invalide : %s" -"Invalid foreign key","Clé étrangère invalide" -"Invalid form type.","Type de formulaire invalide." -"Invalid joint fields","Champs joints invalides" -"Invalid store specified","Boutique spécifiée invalide" -"Invalid type given. String expected","Type donné invalide." -"Joined field with this alias is already declared","Un champ joint avec cet alias est déjà déclaré" -"Joint field or attribute expression with this alias is already declared","Champ joint ou expression d'attribut avec cet alias déjà déclaré" -"Letters","Lettres" -"Letters (a-z, A-Z) or Numbers (0-9)","Lettres (a-z, A-Z) ou chiffres (0-9)" -"Loaded %d records","%d enregistrements chargés" -"Maximum length of attribute code must be less then %s symbols","La longueur maximale du code d'attribut doit être moins de %s symboles" -"Multiple Select","Choix multiple" -"No","Non" -"No options found in config node %s","Aucune option trouvée dans le nœud de config %s" -"None","aucun" -"Not shared with other products","Non partagé avec d'autres produits" -"Problem loading the collection, aborting. Error: %s","Problème lors du chargement de la collection, annulation. Erreur : %s" -"Problem saving the collection, aborting. Error: %s","Problème lors de l'enregistrement de la collection, annulation. Erreur : %s" -"Required","Requis" -"Saved %d record(s).","%d enregistrements enregistré(s)." -"Source model ""%s"" not found for attribute ""%s""","Source modèle ""%s"" non trouvé pour l'attribut ""%s""" -"System","Système" -"Text Area","Zone de texte" -"Text Field","Champ de texte" -"The value of attribute ""%s"" must be unique","La valeur de l'attribut ""%s"" doit être unique" -"The value of attribute ""%s"" must be unique.","La valeur de l'attribut ""%s"" doit être unique." -"This attribute is used in configurable products","Cet attribut est utilisé pour des produits configurables" -"URL","URL" -"Unique Value","Valeur unique" -"Unique Value (not shared with other products)","Valeur unique (non partagée avec d'autres produits)" -"Unknown parameter","Paramètre inconnu" -"Values Required","Valeur requises" -"Wrong attribute group ID","Identifiant du groupe attribut incorrect" -"Wrong attribute set ID","Jeu d'attribut identifiant incorrect" -"Wrong entity ID","Identifiant de l'entité incorrect" -"Wrong type definition for %s","Type de définition incorrect pour %s" -"Yes","oui" -"Yes/No","Oui/Non" diff --git a/app/locale/fr_FR/Mage_GiftMessage.csv b/app/locale/fr_FR/Mage_GiftMessage.csv deleted file mode 100644 index 7b56d83db..000000000 --- a/app/locale/fr_FR/Mage_GiftMessage.csv +++ /dev/null @@ -1,38 +0,0 @@ -"Add","Ajouter" -"Add gift message for shopping cart","Ajouter un message de cadeau au panier d'achat" -"Add gift messages for quote item of shopping cart","Ajouter des messages de cadeau pour l/les élément(s) cité(s) du panier d'achat" -"Add gift messages to products of shopping cart","Ajouter des messages de cadeau aux produits du panier d'achat" -"Add gift options","Ajouter des options de cadeau" -"Add gift options for Individual Items","Ajouter des options de cadeau pour des objets individuels" -"Add gift options for the Entire Order","Ajouter des options de cadeau pour l'ensemble de la commande" -"Add gift options.","Ajouter des options de cadeau." -"Allow Gift Messages for Order Items","Autoriser les messages cadeaux pour les commandes d'objets" -"Allow Gift Messages on Order Level","Autoriser les messages cadeaux au niveau de la commande" -"An error occurred while saving the gift message.","Une erreur est survenue lors de l'enregistrement du message cadeau." -"Are you sure?","Etes-vous sûr ?" -"Cancel","Annuler" -"Do you have any gift items in your order?","Avez-vous des messages cadeaux dans votre commande ?" -"Edit","Modifier" -"From","De" -"Gift Message","Message du cadeau" -"Gift Message API","Message de cadeau interface de programmation" -"Gift Options","Options de cadeau" -"Gift Options for","Options de cadeau pour" -"Gift Options for Individual Items","Options de cadeau pour des objets individuels" -"Gift Options for the Entire Order.","Options de cadeau pour l'ensemble de la commande" -"Gift Options for this address.","Options de cadeau pour cette adresse." -"Item %d of %d","Objet %d de %d" -"Message","Message" -"No","Non" -"OK","OK" -"Save Gift Message","Sauvegarder le message cadeau" -"The gift message has been removed","Le message cadeau a été supprimé" -"The gift message has been saved","Le message cadeau a été enregistré." -"The gift message has been saved.","Le message cadeau a été enregistré." -"To","A" -"Unknown entity type","Type d'entité inconnu" -"Use config","Utiliser la configuration" -"Yes","oui" -"You can leave this box blank if you do not wish to add a gift message for the item.","Vous pouvez laisser cette case vide si vous ne souhaitez pas ajouter de message cadeau pour cet objet." -"You can leave this box blank if you do not wish to add a gift message for this address.","Vous pouvez laisser cette case vide si vous ne souhaitez pas ajouter de message cadeau pour cette adresse." -"You can leave this box blank if you do not wish to add a gift message for whole order.","Vous pouvez laisser cette case vide si vous ne souhaitez pas ajouter de message cadeau pour cette commande." diff --git a/app/locale/fr_FR/Mage_GoogleAnalytics.csv b/app/locale/fr_FR/Mage_GoogleAnalytics.csv deleted file mode 100644 index 1aaafce12..000000000 --- a/app/locale/fr_FR/Mage_GoogleAnalytics.csv +++ /dev/null @@ -1,5 +0,0 @@ -"Account Number","Numéro de compte" -"Enable","Activer" -"Enable IP anonymization","Activer l'anonymat de l'IP" -"Google API","Google API" -"Google Analytics","Google Analytics" diff --git a/app/locale/fr_FR/Mage_GoogleBase.csv b/app/locale/fr_FR/Mage_GoogleBase.csv deleted file mode 100644 index 32c3b473a..000000000 --- a/app/locale/fr_FR/Mage_GoogleBase.csv +++ /dev/null @@ -1,78 +0,0 @@ -"Active","Actif" -"Add Attribute Mapping","Ajouter l'attribut recensement" -"Add New Attribute","Ajouter un nouvel attribut" -"Add to Google Base","Ajouter à la base Google" -"Are you sure?","Etes-vous sûr ?" -"Attribute","Attribut" -"Attribute Set","Ensemble d'attributs" -"Attribute Set and Item Type","Jeu d'attribut et type d'article" -"Attributes","Attributs" -"Attributes Mapping","Attributs recensement" -"Attributes Set","Jeu attributs" -"AuthSub","AuthSub" -"Available Products","Produits disponibles" -"Base Currency should be set to %s for %s in system configuration. Otherwise item prices won't be correct in Google Base.","La monnaie de base devrait être fixée à %s pour %s dans les options du système. Sinon, les prix des objets ne seront pas corrects dans Google Base." -"Cannot update Google Base Item for Store '%s'","Impossible de mettre à jour l'article Google Base pour la boutique '%s' " -"Captcha confirmation error: %s","Confirmation erreur Captcha: %s" -"Captcha has been confirmed.","Captcha a été confirmé." -"Catalog","Catalogue" -"Clicks","Clics" -"ClientLogin","ConnexionClient" -"Confirm","Confirmer" -"Current Mapping will be reloaded. Continue?","Recensement actuel va être rechargé. Continuer?" -"Custom attribute, no mapping","Attribut sur mesure, pas de recensement" -"Delete","Supprimer" -"Delete Mapping","Effacer recensement" -"Edit Item Type","Modifier type d'article" -"Edit Item Type ""%s""","Modifier le type d'objet ""%s""" -"Error: %s","Erreur: %s" -"Expires","Expire" -"Google","Google" -"Google Base","Base Google" -"Google Base Attribute","Attribut base Google" -"Google Base ID","Identification base Google" -"Google Base Item Type","Type d'article base Google" -"Google Base Item type","Type d'objet Google Base" -"Google Base Items","Articles base Google" -"Google base","Google base" -"Hide","Cacher" -"Hosted","Hébergé" -"Hosted or Google","Hébergé ou Google" -"Impr.","Impr." -"Invalid Product Model for Google Base Item","Modèle de produit invalide pour article de base Google" -"Item Type was deleted","Type d'article a été effacé" -"Item Types","Types d'article" -"Item model is not specified to delete Google Base entry.","Modèle d'article n'est pas spécifié pour effacer entrée base Google." -"Items","Articles" -"Manage Attribute Mapping","Gérer recensement attribut" -"Manage Attributes","Gérer attributs" -"Manage Items","Gérer articles" -"New Item Type","Type de nouvel article" -"New ItemType","Type de nouvel article" -"No","Non" -"No items were deleted from Google Base","Aucun article n'a été effacé de la base Google" -"No items were published","Aucun article n'a été publié" -"No items were saved as inactive items","Aucun article n'a été sauvegardé comme articles inactifs" -"No products were added to Google Base","Aucun produits n'ont été ajoutés à la base Google" -"Object model is not specified to save Google Base entry.","Modèle d'objet n'est pas spécifié pour sauver entrée base Google." -"Please, select Attribute Set and Google Item Type to load attributes","S'il vous plaît, sélectionnez le jeu d'attribut et le type d'article Google pour charger les attributs" -"Product Name","Nom produit" -"Publish","Publier" -"Published","Publié" -"Remove","Supprimer" -"Save Mapping","Sauvegarder recensement" -"Session expired during export. Please revise exported products and repeat the process if necessary.","La session a expirée pendant l'export. Veuillez revoir les produits exportés et répéter le processus si nécessaire." -"Synchronize","Synchroniser" -"Target Country","Pays cible" -"The item type has been saved.","Le type d'article a été sauvegardé." -"This action will update items statistics and remove the items which are not available in Google Base. Continue?","Cette action va mettre à jour les statistiques d'articles et enlever les articles qui ne sont pas disponibles dans la base Google. Continuer?" -"Total of %d items(s) have been deleted; total of %d items(s) have been updated.","Un total de %d article()s a été effacé; un total de %d article(s) a été mis à jour." -"Total of %d items(s) have been published.","Un total de %d article(s) a été publié." -"Total of %d items(s) have been removed from Google Base.","Un total de %d article(s) ont été effacés de la base Google." -"Total of %d items(s) have been saved as inactive items.","Un total de %d article(s) a été sauvegardé comme articles inactifs." -"Total of %d product(s) have been added to Google Base.","Un total de %d produit(s) a été ajouté à la base Google." -"Unable to connect to Google Base. Please, check Account settings in configuration.","Ne peut connecter à la base Google. Veuillez vérifier les paramètres du compte dans la configuration." -"Unable to select a Store View.","Ne peut sélectionner une vue de boutique." -"View Available Products","Voir les produits disponibles" -"View Item in Google Base","Voir l'article dans la base Google" -"Yes","oui" diff --git a/app/locale/fr_FR/Mage_GoogleCheckout.csv b/app/locale/fr_FR/Mage_GoogleCheckout.csv deleted file mode 100644 index 3e31b067a..000000000 --- a/app/locale/fr_FR/Mage_GoogleCheckout.csv +++ /dev/null @@ -1,131 +0,0 @@ -"* Select shipping method","Sélectionner le type de livraison" -"2Day","2Day" -"2nd Day Air","2nd Day Air" -"2nd Day Air AM","2nd Day Air AM" -"3 Day Select","3 Day Select" -"
    Warning: %s
    ","
    Avertissement: %s
    " -"Warning! This option disables the merchant calculated shipping. With this option, Google API ignores any attempt to affect shipping prices.","Avertissement ! Cette option désactive l'expédition calculée par la marchant. Avec cette option, Google API ignore toute tentative d'affecter les prix d'expédition." -"A virtual item to reflect the discount total","Un article virtuel pour refléter la remise totale" -"A virtual item to reflect the tax total","Un article virtuel pour refléter la taxe totale" -"AVS Status: %s","Statut AVS : %s" -"Add Shipping Method","Ajouter une méthode de livraison" -"Allowed Methods","Méthodes autorisées" -"Amount: %s","Montant : %s" -"Auto-generated from GoogleCheckout Charge","Frais générés automatiquement à partir de GoogleCheckout" -"Buyer Account Age: %s days","Age du compte de l'acheteur : %s jours" -"CC Partial: xxxx-%s","CC Partiel : xxxx-%s" -"CID Status: %s","Statut CID : %s" -"Carrier Calculated Methods","Méthodes de transport calculées" -"Cart Discount","Remise sur le panier" -"Checkout Image Style","Vérification du style d'image" -"Commercial","Commercial" -"Continue Shopping URL","Continuer les achats URL" -"Credit memo has been created automatically","Mémo de crédit a été créé automatiquement." -"Debug","Déboguer" -"Default Package Height (in)","Hauteur du paquet (pouces)" -"Default Package Length (in)","Longueur du paquet (pouces)" -"Default Package Width (in)","Largeur du paquet (pouces)" -"Default Price for Methods","Prix par défaut pour les méthodes" -"Default price:","Prix par défaut :" -"Delivery Address Category","Catégorie d'adresse de livraison" -"Delivery Schedule","Horaire de livraison" -"Description-based delivery","Livraison basée sur la description" -"Disable Default Tax Tables","Désactiver les tableaux de taxes par défaut" -"Discount Tax","Taxe sur la remise" -"Eligible for Protection: %s","Admissible à la protection: %s" -"Email delivery","Livraison email" -"Enable","Activer" -"Enable Carrier Calculated","Activer le calcul par transporteur" -"Enable Digital Delivery","Activer la distribution digitale" -"Enable Flat Rate","Activer le taux fixe" -"Enable Merchant Calculated","Activer le calcul par le vendeur" -"Enable this if your checkout request is too big and being cut off.","Activer cela si votre demande de règlement est trop grosse ou découpée" -"Expiration: %s","Expiration : %s" -"Express Mail","Express Mail" -"Express Saver","Express Saver" -"FedEx","FedEx" -"Financial: %s -> %s","Financier : %s -> %s" -"First Overnight","First Overnight" -"Free Shipping","Expédition gratuite" -"Fulfillment: %s -> %s","Accomplissement : %s -> %s" -"Google API","Google API" -"Google Authorization:","Autorisation de Google" -"Google Buyer ID: %s","ID Acheteur Google : %s" -"Google Charge:","Frais de Google :" -"Google Chargeback:","Remboursement Google :" -"Google Checkout","Règlement Google" -"Google Checkout Shipping - Carrier Calculated","Livraison par Google Checkout - Calcul par le transporteur" -"Google Checkout Shipping - Digital Delivery","Livraison par Google Checkout - Distribution digitale" -"Google Checkout Shipping - Flat Rate","Livraison par Google Checkout - Taux fixe" -"Google Checkout Shipping - Merchant Calculated","Livraison par Google Checkout - Calcul par le vendeur" -"Google Checkout: %s","Google Checkout : %s" -"Google Order Number: %s","Numéro de commande Google : %s" -"Google Order Status Change:","Changement de statut de commande Google :" -"Google Refund:","Remboursement de Google :" -"Google Risk Information:","Information sur les risques liés à Google" -"GoogleCheckout is not configured","Google Checkout n'est pas configuré" -"Ground","Terre" -"Hide Cart Contents","Masquer le contenu du panier." -"Home Delivery","Livraison à domicile" -"IP Address: %s","Adresse IP : %s" -"If enabled, cart contents will be hidden after clicking on the Google Checkout button in the shopping cart, and restored if ""Edit Cart"" link was activated.","S'il est opérationnel, le contenu du panier sera caché après avoir cliqué sur le bouton Google Checkout dans le panier d'achat, et rétabli si le lien ""Modifier le panier"" a été activé." -"Inches","Pouces" -"Invoice Auto-Created: %s","Facture créée automatiquement : %s" -"Is Buyer Willing to Receive Marketing Emails: %s","Si l'acheteur accepte des recevoir des mails marketing : %s" -"Key/URL delivery","Livraison clé/URL :" -"Large - %s","Large - %s" -"Latest Charge: %s","Dernier paiement : %s" -"Latest Chargeback: %s","Dernier remboursement : %s" -"Latest Refund: %s","Dernier remboursement : %s" -"Location","Emplacement" -"Media Mail","Media Mail" -"Medium - %s","Moyen - %s" -"Merchant ID","Identifiant du marchand" -"Merchant Key","Clé du marchand" -"Method","Méthode" -"New Order Status","Nouveau statut de la commande" -"Next Day Air","Next Day Air" -"Next Day Air Early AM","Next Day Air Early AM" -"Next Day Air Saver","Next Day Air Saver" -"No","Non" -"No Comment","Pas de commentaire" -"No Reason","Pas de raison" -"Optimistic","Optimiste" -"Optional, leave empty for home page.","Optionnel, laissez vide pour la page d'accueil." -"Order creation error","Erreur de création de commande" -"Parcel Post","Parcel Post" -"Pessimistic","Pessimiste" -"Priority Mail","Priority Mail" -"Priority Overnight","Priority Overnight" -"Rate 1 Amount","Taux 1 montant" -"Rate 1 Ship To Applicable Countries","Taux 1 envoi aux pays disponibles" -"Rate 1 Ship to Specific Countries","Taux 1 envoi à des pays spécifiques" -"Rate 1 Title","Taux 1 titre" -"Rate 2 Amount","Taux 2 montant" -"Rate 2 Ship To Applicable Countries","Taux 2 envoi aux pays disponibles" -"Rate 2 Ship to Specific Countries","Tarif 2 Transport vers des Pays Spécifiques" -"Rate 2 Title","Taux 2 titre" -"Rate 3 Amount","Tarif 3 Montant" -"Rate 3 Ship To Applicable Countries","Taux 3 envoi aux pays disponibles" -"Rate 3 Ship to Specific Countries","Taux 3 envoi à des pays spécifiques" -"Rate 3 Title","Tarif 3 Titre" -"Required for live Google Checkout transactions. Make sure that this option corresponds to Use Secure URLs in Frontend (""Web"" > ""Secure"").","Nécessaire pour les transactions en direct de Google Checkout. Assurez-vous que cette option correspond à Utiliser des URL sécurisées dans Frontend (""Web"" > ""Sécuriser"")." -"Residential","Résidentiel" -"Sandbox","Protection" -"Secure Callback URL","URL de Rappel Sécurisée" -"Small - %s","Petit - %s" -"Standard Overnight","Standard Overnight" -"The tax amount has been applied based on the information received from Google Checkout, because tax amount received from Google Checkout is different from the calculated tax amount","Le montant des taxes a été appliqué d'après les informations reçues de Google Checkout, car le montant des taxes reçu de Google Checkout est différent de celui calculé." -"Title","Titre" -"Total Chargeback: %s","Remboursement total : %s" -"Total Charged: %s","Montant total : %s" -"Total Refunded: %s","Remboursement Total : %s" -"Transparent","Transparant" -"UPS","UPS" -"USPS","USPS" -"United Kingdom","Royaume-Uni" -"United States","États-Unis" -"Unknown Reason","Raison inconnue" -"White Background","Fond Blanc" -"Yes","oui" -"You will be redirected to GoogleCheckout in a few seconds.","Vous serez redirigé vers Google Checkout dans quelques secondes." diff --git a/app/locale/fr_FR/Mage_ImportExport.csv b/app/locale/fr_FR/Mage_ImportExport.csv deleted file mode 100644 index 17df9e35c..000000000 --- a/app/locale/fr_FR/Mage_ImportExport.csv +++ /dev/null @@ -1,93 +0,0 @@ -"%s file does not exists or is not readable","Le fichier %s n'existe pas ou n'est pas lisible" -"-- Please Select --","-- Veuillez sélectionner --" -"Adapter must be an instance of Mage_ImportExport_Model_Import_Adapter_Abstract","L'adaptateur doit être une instance de Mage_ImportExport_Model_Import_Adapter_Abstract" -"Adapter object must be an instance of %s","L'objet adaptateur doit être une instance de %s" -"Adapter type must be a non empty string","Le type d'adaptateur doit être une variable non vide" -"Append Complex Data","Données complexes" -"Attribute Code","Code attribut" -"Attribute Label","Attribuer label" -"Attribute does not has options, so filtering is impossible","L'attribut n'a pas d'options, donc le filtrage est impossible" -"Begin data validation","Commencer la validation des données" -"Begin export of %s","Commencer l'exportation de %s" -"Begin import of ""%s"" with ""%s"" behavior","Commencer l'importation de ""%s"" avec le comportement ""%s""" -"CSV","CSV" -"Can not determine attribute filter type","N'a pas pu déterminer le type de filtre d'attribut" -"Can not find required columns: %s","Impossible de trouver les colonnes requises : %s" -"Cannot get autoincrement value","Impossible d'obtenir la valeur d'auto-incrémentation" -"Check Data","Vérifier données" -"Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d","Lignes vérifiées : %d, entités vérifiées : %d, lignes invalides : %d, total des erreurs : %d" -"Column names have duplicates","Il y a des noms de colonne en double" -"Column names is empty or is not an array","Le nom de la colonne est vide, ou invalide" -"Column names: ""%s"" are invalid","Noms des colonnes : ""%s"" est invalide" -"Customers","Clients" -"Data is invalid or file is not uploaded","Donnée invalide ou fichier non soumis;" -"Delete Entities","Supprime les entrées" -"Destination directory is not writable","Le répertoire de destination n'est pas accessible en écriture" -"Destination file is not writable","Le fichier de destination n'est pas accessible en écriture" -"Destination file path must be a string","Le répertoire de destination du fichier doit être une variable" -"Done import data validation","Validation de l'importation des données terminée" -"Duplicate Unique Attribute for '%s'","Dupliquer l'attribut unique pour '%s'" -"Entity Type","Type d'entité" -"Entity adapter obejct must be an instance of Mage_ImportExport_Model_Export_Entity_Abstract","L'objet d'adapteur de l'entité doit être une instance de Mage_ImportExport_Model_Export_Entity_Abstract" -"Entity adapter object must be an instance of Mage_ImportExport_Model_Import_Entity_Abstract","L'objet adaptateur doit être une isntance de Mage_ImportExport_Model_Import_Entity_Abstract" -"Entity is unknown","Entitée inconnue" -"Entity type model must be an instance of Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract","Le type de modèle de l'entité doit être une instance de Mage_ImportExport_Model_Import_Entity_Abstract" -"Entity type model must be an instance of Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract","Le type de modèle de l'entité doit être une instance de Mage_ImportExport_Model_Import_Entity_Abstract" -"Error in data structure: behaviors are mixed","Erreur dans la structure des données : les comportements sont mélangés" -"Error in data structure: entity codes are mixed","Erreur dans la structure des données : les codes d'entité sont mélangés" -"Errors limit (%d) reached. Please fix errors and re-upload file","Nombre limite d'erreurs (%d) atteint. Veuillez fixer les erreurs, puis renvoyer le fichier" -"Export","Exporter" -"Export File Format","Exporter format du fichier" -"Export Settings","Exporter options" -"Export has been done.","Exportation terminée." -"Exported %s rows.","Lignes %s exportées." -"File does not contain data.","Le fichier ne contient pas de données." -"File does not contain data. Please upload another one","Le fichier ne contient pas de donné. Veuillez en soumettre un nouveau" -"File format is unknown","Format de fichier inconnu" -"File is partially valid, but import is not possible","Le fichier est partiellement valide, mais l'importation est impossible" -"File is totally invalid. Please fix errors and re-upload file","Le fichier est totalement invalide. Veuillez corriger les erreurs et soumettre à nouveau le fichier" -"File is valid! To start import process press ""Import"" button","Fichier valide ! Pour lancer le processus d'importation, appuyez sur le bouton ""Importer""" -"File is valid, but import is not possible","Le fichier est valide, mais l'importation n'est pas possible" -"File was not uploaded","Le fichier n'a pas été envoyé" -"Filter","Filtre" -"From","De" -"Header column names already set","Noms de colonnes déjà fixés" -"Import","Importation" -"Import Behavior","Importer comportement" -"Import Settings","Importer options" -"Import has been done successfuly.","L'importation est terminée avec succès." -"Import successfully done.","Importation effectuée avec succès" -"Import/Export","Importer / Exporter" -"Input entity code is not equal to entity adapter code","Le code d'entité ne correspond pas au code d'entité adaptateur" -"Invalid entity","Entité invalide" -"Invalid entity model","Modèle d'entité invalide" -"Invalid file format","Format de fichier invalide" -"Invalid parameters","Paramètres invalides" -"Invalid seek position","Position de recherche invalide" -"Invalid value for '%s'","Valeur invalide pour '%s'" -"Invalid value for '%s' column","Valeur invalide pour la colonne '%s'" -"No filter data provided","Pas de filtre de données fourni" -"No source specified","Pas de source spécifiée" -"No valid data sent","Pas de donnée valide envoyée" -"No writer specified","Pas d'auteur spécifié" -"Node does not has model token tag","Le voyant n'a pas de tag modèle" -"Not implemented yet","Pas encore implémenté" -"Please fix errors and re-upload file","Veuillez corriger les erreurs et soumettre à nouveau le fichier" -"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Veuillez corriger les erreurs et retélécharger le fichier ou appuyez simplement sur le bouton ""Importer"" pour sauter les lignes avec des erreurs" -"Products","Produits" -"Replace Existing Complex Data","Remplacer des données complexes existantes" -"Select File to Import","Sélectionnez le fichier à importer" -"Skip","Passer" -"Source file moving failed","Le déplacement du fichier source a échoué" -"Source file path must be a string","Le chemin d'accès du fichier source doit être une chaîne" -"Source is not set","La source n'est pas définie" -"Status","Statut" -"There are no product types available for export","Il n'y a aucun type de produit disponible pour l'exportation" -"There is no data for export","Il n'y a pas de données pour exportation" -"To","A" -"Total size of uploadable files must not exceed %s","La taille totale des fichirs ne doit pas dépasser %s" -"Unknown attribute filter type","Type de filtre d'attributs inconnu" -"Uploaded file has no extension","Le fichier téléchargé n'a pas d'extension" -"Validation finished successfully","Validation terminée avec succès" -"in rows","dans les lignes" -"in rows:","dans les lignes :" diff --git a/app/locale/fr_FR/Mage_Index.csv b/app/locale/fr_FR/Mage_Index.csv deleted file mode 100644 index d36c7fb68..000000000 --- a/app/locale/fr_FR/Mage_Index.csv +++ /dev/null @@ -1,47 +0,0 @@ -"%s Index process is working now. Please try run this process later.","%s traitement index est actuellement actif. Veuillez essayer de lancer ce traitement plus tard." -"%s index was rebuilt.","%s de l'index a été reconstruit." -"'%s' Index Process Information","'%s information traitement index" -"Action","Action" -"Cannot initialize the indexer process.","Ne peut initialiser le traitement de l'indexage" -"Change Index Mode","Change mode index" -"Click here to go to Cache Management and refresh cache types.","Cliquez ici pour accéder à la Gestion de cache et rafraîchir le type de cache." -"Click here to go to Index Management and rebuild required indexes.","Cliquez ici pour aller à la Gestion des index et reconstruire les index requis." -"Delete","Supprimer" -"Description","Description" -"Disable","Désactive" -"Enable","Active" -"General","Général" -"Index","Index" -"Index Description","Description index" -"Index Management","Gestion index" -"Index Mode","Mode index" -"Index Name","Nom index" -"Index mode","Mode index" -"Indexer code is not defined.","Code indexage non défini." -"Indexer model is not defined.","Modèle indexage non défini." -"Indexer model should extend Mage_Index_Model_Indexer_Abstract.","Modèle indexage devrait s'étendre Mage_index_modèle_indexage_extrait." -"Manual Update","Mise à jour manuelle" -"Mode","Mode" -"Never","Jamais" -"No","Non" -"One or more of the Indexes are not up to date:","Un des index ou plus n'est pas à jour:" -"Please select Index(es)","Veuillez sélectionner un ou plusieurs index" -"Please select Indexes","Veuillez sélectionner des index" -"Process Information","Traiter infos" -"Processing","Traitement" -"Ready","Prêt" -"Refresh","Rafraîchir" -"Reindex Data","Ré-indexer données" -"Reindex Required","Ré-indexage requis" -"Revoke","Révoquer" -"Status","État" -"System","Système" -"The index has been saved.","L'index a été sauvegardé." -"There was a problem with reindexing process.","Il y a eu un problème avec le traitement de ré-indexage." -"There was a problem with saving process.","Il y a eu un problème avec le traitement de sauvegarde." -"Total of %d index(es) have changed index mode.","Total de %d index a(ont) changé le mode d'index." -"Total of %d index(es) have reindexed data.","Total de %d index a(ont) ré-indexé les données." -"Update Required","Mise à jour nécessaire" -"Update on Save","Mise à jour lors de la sauvegarde" -"Updated At","mis à jour à" -"Yes","Oui" diff --git a/app/locale/fr_FR/Mage_Install.csv b/app/locale/fr_FR/Mage_Install.csv deleted file mode 100644 index a08c17356..000000000 --- a/app/locale/fr_FR/Mage_Install.csv +++ /dev/null @@ -1,125 +0,0 @@ -"(Make sure you keep it in a safe place.)","(Assurez-vous que vous le conservez dans un lieu sûr.)" -"(Optional. Leave blank for no prefix)","(Optionnel. Laissez vide s'il n'y a pas de préfixe)" -"(ver. %s)","(ver. %s)" -"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","Chemin supplémentaire ajouté après l'URL de base pour accéder à votre panel d'administration (admin, gestion, contrôle, etc.)" -"Admin Path","Répertoire administrateur" -"After successfull installation please click the button below.","Après installation, veuillez cliquer sur le bouton ci-dessous." -"All packages were installed, click 'OK' to continue with installation.","Tous les logiciels ont été installés, cliquer sur ""OK"" pour continuer l'installation." -"Alternatively you could try the 'Manual Downloads and Upgrades' method.","Vous pourriez aussi essayer la méthode de ""Téléchargement et mise à jour manuels""." -"Base URL","URL de base" -"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Avant de continuer vers notre boutique, veuillez noter votre clé encryptage (Magento l'utilise pour encrypter les mots de passe, cartes crédit, etc.)" -"Check out our","Paiement ou" -"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Cochez cette case uniquement s'il n'est pas possible de valider automatiquement l'URL sécurisée, par exemple si une authentification HTTP est nécessaire." -"Check this box only if it is not possible to automatically validate the Base URL.","Cochez cette case uniquement s'il n'est pas possible de valider automatiquement l'URL de base." -"Choose this if you would like to test frontend and backend functionality.","Choisissez ceci si vous désirez tester les fonctionnalités d'interface et de technique." -"Configuration","Configuration" -"Confirm Password","Confirmez le mot de passe" -"Connection","Connexion" -"Continue","Continuer" -"Continue After Manual Download","Continuer après le téléchargement manuel" -"Continue Full Download / SVN Installation","Continuer le téléchargement complet / l'installation d'SVN" -"Create Admin Account","Créer un compte administrateur" -"Currently this is the most stable state available for Magento packages.","Il s'agit actuellement de l'état le plus stable disponible pour les logiciels Magento." -"Database","Base de données" -"Database Connection","Connexion à la base de données" -"Database Name","Nom de la base de données" -"Database Name cannot be empty.","Le nom de la base de données ne peut pas être vide." -"Database Type","Type de base de données" -"Database connection error.","Erreur de connexion à la base de données." -"Database host","Hébergeur de la base de données" -"Database server does not support the InnoDB storage engine.","Le serveur de base de données ne prend pas en charge le moteur de stockage InnoDB." -"Database user name","Nom d'utilisateur de la base de données" -"Database user password","Mot de passe utilisateur de la base de données" -"Default Currency","Monnaie par défaut" -"Download","Téléchargement" -"Download Magento Core Modules and Updates","Télécharger les modules de base de Magento ainsi que les mises à jour" -"Downloading and installing Magento, please wait...","Téléchargement et installation de Magento, veuillez patienter ..." -"Email","Email" -"Email Address","Adresse email" -"Enable Charts","Activer les graphiques" -"Enable this option if you want the charts to be displayed on Dashboard.","Activez cette option si vous voulez que les graphiques soit affichés sur l'espace de travail." -"Enable this option only if you have SSL available.","Choisissez cette option si seul le SSL est disponible." -"Encryption Key","Clé d'encryptage" -"File System","Système de fichiers" -"First Name","Prénom" -"Full Download / SVN Installation","Téléchargement complet / Installation d'SVN" -"Get ready to experience Open-Source eCommerce Evolved.","Préparez-vous à découvrir le commerce électronique open-source évolué." -"Go to Backend","Allez à la partie technique" -"Go to Frontend","Allez à l'interface visuel" -"Having trouble installing Magento?","Problèmes d'installation de Magento ?" -"Help Us to Keep Magento Healthy","Aidez-nous à garder Magento bon pour la santé" -"Host","Hôte" -"I agree to the above terms and conditions.","Je suis d'accord avec les conditions d'utilisations." -"If you are a developer and would like to have the latest public updates, choose this option.","Si vous êtes un développeur et que vous aimeriez bénéficier des dernières mises à jour disponibles, choisissez cette option." -"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Si vous utilisez PHP comme CGI, votre processus PHP doit utiliser le même nom d'utilisateur que pour l'envoi des fichiers Magento." -"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Si vous lancez une installation alors qu'une autre version de Magento est déjà installée, continuez avec cette méthode." -"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Si vous ne souhaitez pas ou ne pouvez pas rendre les dossiers de Magento accessibles en écriture pour le processus web, vous pouvez utiliser l'exécutable PEAR situé à la racine de l'installation Magento." -"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","Si vous avez installé l'ensemble des logiciels ou installé Magento via SVN, vous devriez sauter l'installation et la validation des librairies en cliquant le bouton ci-dessous." -"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","Si vous souhaitez gérer les fichiers de Magento via l'interface web, vous aurez besoin d'avoir les permissions d'écritures web appliquées à tous les dossiers et fichiers Magento." -"If your server is running on MS Windows, most probably you will not need to change anything.","Si votre serveur utilise MS Windows, vous n'aurez probablement pas besoin de changer quoique ce soit." -"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","Sinon vous aurez à rendre les fichiers Magento accessibles en écriture pour l'utilisateur sous lequel le processus web tourne." -"Installation","Installation" -"Installation Guide","Guide d'installation" -"Installer does not exist for %s database type","Il n'y a pas d'installateur pour le type de base de données suivant : %s" -"Last Name","Nom" -"License Agreement","Accord de license" -"Locale","Paramètres régionaux" -"Locale settings","Réglages des paramètres régionaux" -"Localization","Paramètres régionaux" -"Login Information","Information de connexion" -"Magento","Magento" -"Magento Connect Manager Deployment","Déploiement du Magento Connect Manager" -"Magento Installation Wizard","Assistant d'installation Magento" -"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento est une marque de Magento Inc. Copyright © %s Magento Inc." -"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento utilise cette clé pour crypter les mots de passe, numéros de cartes de crédit et plus encore. Si ce champ est laissé vide le système créera une clé de cryptage pour vous et l'affichera sur la page suivante." -"Manual Downloads and Upgrades","Téléchargement de mode d'emploi et mises à niveau" -"No resource for %s DB model.","Aucune ressource pour le modèle DB %s" -"One of PHP Extensions ""%s"" must be loaded.","Une des extensions PHP ""%s"" doit être ajoutée." -"PHP Extension '%s' loaded","L'extension PHP '%s' est chargée" -"PHP Extensions ""%s"" must be loaded.","L'extension PHP « %s » doit être chargée." -"PHP extension ""%s"" must be loaded.","L'extension PHP ""%s"" doit être ajoutée." -"Package Management through the Web","Gestion de paquet via le web" -"Password","Mot de passe" -"Password Confirmation","Confirmation du mot de passe" -"Path ""%s"" must be writable.","Le chemin d'accès ""%s"" doit être accessible en écriture." -"Personal Information","Information personnelle" -"Please correct the user data and try again.","Veuillez corriger les données utilisateur et réessayer." -"Please make sure that mod_rewrite is enabled in Apache configuration.","Veuillez vous assurer que mod_rewrite est activé dans la configuration Apache." -"Please note that it is much less stable than beta.","Veuillez noter que ceci est bien moins stable qu'une beta." -"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","Veuillez noter que seuls les shells de UNIX, Linux et Mac OS X sont actuellement supportés. Pour Windows, utilisez l'option '%s'." -"Please set all required settings before clicking Continue","Veuillez définir tous les réglages nécessaires avant de cliquer sur Continuer" -"Preferred stability: %s","Stabilité préférée: %s" -"Proceed With Automatic Download (%s)","Procéder avec le téléchargement automatique (%s)" -"Provide a complete base URL for SSL connection. For example: %s","Fournir une base complète d'URL pour une connexion SSL. Par exemple : %s" -"Report All Bugs","Rapporter tous les bugs" -"Required Fields","Champs requis" -"Response from server isn\'t valid.","La réponse du serveur n'est pas valide." -"Run admin interface with SSL","Exécuter l'interface admin avec SSL" -"Run this in your shell from Magento root folder:","Exécuter ceci dans votre shell depuis le dossier racine de Magento :" -"Save Session Data In","Enregistrer les données de la session dans" -"Save Session Files In","Enregistrer les fichiers de la session dans" -"Secure Base URL","Base d'url sécurisée" -"Session Storage Options","Option de stockage de la session" -"Setting preferred state to: %s","Régler l'état préféré sur: %s" -"Skip Base URL Validation Before the Next Step","Sauter la validation de l'URL de base avant l'étape suivante." -"Skip Secure URL validation before next step","Passer la validation d'URL sécurisée avant la prochaine étape" -"Tables Prefix","Préfixe de tables" -"The URL ""%s"" is invalid.","L'URL ""%s"" n'est pas valide." -"The URL ""%s"" is not accessible.","L'URL ""%s"" n'est pas accessible." -"The database server version doesn\'t match system requirements (required: %s, actual: %s).","La version du serveur de base de données ne correspond pas aux conditions du système (requis : %s, présent : %s)." -"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","Le préfixe du tableau ne doit contenir que des lettres (a-z), des chiffres (0-9) ou des tirets bas (_), et le premier caractère doit être une lettre." -"There was a problem installing Magento packages. Please read the log, correct errors and try again.","Un problème est survenu lors de l'installation des paquets Magento. Veuillez lire le journal, corriger les erreurs et réessayer." -"Time Zone","Fuseau horaire" -"Use Secure URLs (SSL)","Utiliser des URLs sécurisées (SSL)" -"Use Web Server (Apache) Rewrites","Utiliser les réécritures du serveur web (Apache)" -"User Name","Nom d'utilisateur" -"User Password","Mot de passe utilisateur" -"Username","Nom d'utilisateur" -"Validation","Validation" -"Web access options","Options d'accès Internet" -"Welcome","Bienvenue" -"Welcome to Magento's Installation Wizard","Bienvenue dans l'assistant d'installation Magento" -"You can specify server port, ex.: localhost:3307
    If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","Vous pouvez spécifier un port de serveur, par exemple : localhost:3307
    Si vous n'utilisez pas de socket UNIX par défaut, vous pouvez le préciser ici à la place de l'hôte, par exemple : /var/run/mysqld/mysqld.sock" -"You could enable this option to use web server rewrites functionality for improved search engines optimization.","Vous pouvez activer cette option pour utiliser la fonctionnalité de réécriture du serveur web pour optimiser les moteurs de recherche." -"You're All Set","Vous êtes prêt" -"You're All Set!","Vous êtes prêt !" diff --git a/app/locale/fr_FR/Mage_Log.csv b/app/locale/fr_FR/Mage_Log.csv deleted file mode 100644 index b0cf3d49f..000000000 --- a/app/locale/fr_FR/Mage_Log.csv +++ /dev/null @@ -1,9 +0,0 @@ -"Enable Log Cleaning","Activer l'effacement des logs" -"Error Email Recipient","Erreur dans le destinataire du mail" -"Error Email Sender","Erreur dans l'expéditeur du mail" -"Error Email Template","Erreur dans le modèle du mail" -"Frequency","Fréquence" -"Log Cleaning","Effacement des logs" -"Log cleanup Warnings","Avertissements d'effacement des logs" -"Save Log, Days","Enregistrer logs, jours" -"Start Time","Heure de début" diff --git a/app/locale/fr_FR/Mage_Media.csv b/app/locale/fr_FR/Mage_Media.csv deleted file mode 100644 index 23845f271..000000000 --- a/app/locale/fr_FR/Mage_Media.csv +++ /dev/null @@ -1,3 +0,0 @@ -"An error occurred while creating the image.","Une erreur est survenue lors de la création de l'image." -"The image does not exist or is invalid.","L'image n'existe pas ou est invalide." -"This content requires last version of Adobe Flash Player. Get Flash","Ce contenu requiert la dernière version d’Adobe Flash Player. Télécharger Flash" diff --git a/app/locale/fr_FR/Mage_Newsletter.csv b/app/locale/fr_FR/Mage_Newsletter.csv deleted file mode 100644 index 416fd90d5..000000000 --- a/app/locale/fr_FR/Mage_Newsletter.csv +++ /dev/null @@ -1,137 +0,0 @@ -" Copy","Copier" -"Action","Action" -"Add New Template","Ajouter un nouveau modèle" -"Add to Queue","Ajouter à la file d'attente" -"Allow Guest Subscription","Autoriser l'abonnement d'invités" -"An error occurred while saving your subscription.","Une erreur est survenue lors de l'enregistrement de vous abonnement." -"Are you sure that you want to delete this template?","Voulez-vous vraiment supprimer ce modèle ?" -"Are you sure that you want to strip all tags?","Voulez-vous vraiment enlever tous les tags ?" -"Back","Retour" -"Cancel","Annuler" -"Cancelled","Annulé" -"Cannot mark as received subscriber.","Impossible de marquer comme abonné reçu." -"Confirmation Email Sender","Expéditeur de l'e-mail de confirmation" -"Confirmation Email Template","Modèle de l'e-mail de confirmation" -"Confirmation request has been sent.","La demande de confirmation a été envoyée." -"Convert to Plain Text","Convertir en texte intégral" -"Create Newsletter Template","Créer un modèle de newsletter" -"Customer","Client" -"Customer First Name","Prénom du client" -"Customer Last Name","Nom du client" -"Customer My Account Newsletter Subscriptions","Client Mon Compte Abonnements à la newsletter" -"Date Added","Date ajoutée" -"Date Updated","Date de mise à jour" -"Delete","Supprimer" -"Delete Selected Problems","Supprimer les problèmes sélectionnés." -"Delete Template","Supprimer le modèle" -"Do you really want to cancel the queue?","Voulez-vous vraiment effacer la fille d'attente ?" -"Duplicate template code.","Dupliquer le code du modèle." -"Edit Newsletter","Modifier la newsletter" -"Edit Newsletter Template","Modifier le modèle de la newsletter" -"Edit Queue","Modifier la file d'attente" -"Edit Template","Modifier le modèle" -"Email","Email" -"Enter your email address","Renseignez votre adresse e-mail" -"Error Code","Erreur code" -"Error Text","Erreur texte" -"Follow this link to unsubscribe {{var subscriber.getUnsubscriptionLink()}}","Cliquez sur ce lien pour vous désabonner <!-- This tag is for unsubscribe link -->{{var subscriber.getUnsubscriptionLink()}}" -"Guest","Invité" -"ID","ID" -"Invalid queue selected.","La file d'attente sélectionnée est invalide." -"Invalid subscription ID.","L'ID de souscription est invalide." -"Invalid subscription confirmation code.","Le code de confirmation de l'abonnement est invalide." -"Message","Message" -"Need to Confirm","Besoin de confirmation" -"New Newsletter Template","Nouveau modèle de newsletter" -"New Template","Nouveau modèle" -"Newsletter","Newsletter" -"Newsletter Message Preview","Prévisualisation du message de la newsletter" -"Newsletter Problem Reports","Rapport des problèmes de la newsletter" -"Newsletter Queue","Fille d'attente de la newsletter" -"Newsletter Section","Section newsletter" -"Newsletter Sign-up:","Inscription à la newsletter :" -"Newsletter Styles","Styles de newsletter" -"Newsletter Subscribers","Abonnés à la newsletter" -"Newsletter Subscription","Abonnement à la newsletter" -"Newsletter Subscription Form Before","Formulaire d'abonnement à la lettre d'information avant" -"Newsletter Subscriptions","Abonnements à la newsletter" -"Newsletter Templates","Modèles de newsletter" -"Newsletter subscription confirmation","Confirmation de l'abonnement à la newsletter" -"Newsletter subscription success","Abonnement à la newsletter effectué" -"Newsletter unsubscription success","Désabonnement à la newsletter effectué" -"No Templates Found","Aucun modèle trouvé" -"No problems found.","Aucun problème trouvé." -"No subscribers selected.","Aucun abonné sélectionné." -"Not Activated","Non activé" -"Not Sent","Non envoyé" -"Pause","Pause" -"Paused","En pause" -"Please enter a valid email address.","Veuillez entrer une adresse e-mail valide." -"Please enter new template name","Veuillez entrer le nom du nouveau modèle" -"Please refer to exeption.log","Veuillez vous reporter à exeption.log" -"Please select subscriber(s)","Veuillez sélectionner un (ou plusieurs) abonné(s)" -"Preview","Prévisualisation" -"Preview Template","Voir un aperçu du modèle" -"Processed","Traité" -"Queue Date Start","Date de départ de la file d'attente" -"Queue Finish","Fin de la file d'attente" -"Queue Information","Information sur la file d'attente" -"Queue Newsletter...","File d'attente de la newsletter..." -"Queue Start","Départ de la file d'attente" -"Queue Subject","Sujet de la file d'attente" -"Recipients","Destinataires" -"Reset","Réinitialiser" -"Resume","Reprendre" -"Return HTML Version","Renvoyer la version HTML" -"Save As","Enregistrer sous" -"Save Newsletter","Enregistrer la newsletter" -"Save Template","Enregistrer le modèle" -"Save and Resume","Enregistrer et reprendre" -"Selected problem subscribers have been unsubscribed.","Les abonnés à problèmes ont été désabonnés." -"Selected problems have been deleted.","Les problèmes sélectionnés ont été supprimés." -"Sender","Expéditeur" -"Sender Email","Expéditeur de l'e-mail" -"Sender Name","Nom de l'expéditeur" -"Sending","Envoi" -"Sent","Envoyé" -"Sign Up for Our Newsletter:","Inscrivez-vous à notre newsletter" -"Sign up for our newsletter","Inscrivez-vous à notre newsletter" -"Sorry, but administrator denied subscription for guests. Please register.","Désolé, mais l'administrateur n'a pas autorisé l'abonnement des invités. Veuillez vous inscrire." -"Start","Début" -"Status","Statut" -"Store","Magasin" -"Store View","Vue du magasin" -"Subject","Sujet" -"Submit","Soumettre" -"Subscribe","S'inscrire" -"Subscribed","Inscrit" -"Subscriber","Abonné" -"Subscribers","Abonnés" -"Subscribers From","Abonnés de" -"Subscription Options","Options d'abonnement" -"Success Email Sender","Expéditeur de l'email de succès" -"Success Email Template","Modèle d'email de succès" -"Template Content","Contenu du modèle" -"Template Information","Information du modèle" -"Template Name","Nom du formulaire" -"Template Styles","Styles de modèle" -"Template Subject","Sujet du modèle" -"Template Type","Type de modèle" -"Thank you for your subscription.","Merci de vous être inscrit" -"The subscription has been removed.","L'inscription a été annulée" -"The subscription has been saved.","L'abonnement a été sauvegardé." -"There was a problem with the subscription.","Il y a eu un problème dans l'inscription." -"There was a problem with the subscription: %s","Un problème est survenu avec l'abonnement : %s" -"There was a problem with the un-subscription.","Il y a eu un problème dans la désinscription." -"This email address is already assigned to another user.","Cette adresse de courrier électronique a déjà été attribuée à un autre utilisateur." -"Type","Type" -"Unconfirmed","Non confirmé" -"Unsubscribe","Se désinscrire" -"Unsubscribe Selected","Désabonnement sélectionné" -"Unsubscribed","Désinscrit" -"Unsubscription Email Sender","Expéditeur du mail de désinscription" -"Unsubscription Email Template","Modèle d'e-mail de désabonnement" -"View Newsletter","Voir la newsletter" -"Website","Site" -"You have been unsubscribed.","Votre demande de désinscription a été prise en compte." -"Your subscription has been confirmed.","Votre inscription a été confirmée." diff --git a/app/locale/fr_FR/Mage_Oauth.csv b/app/locale/fr_FR/Mage_Oauth.csv deleted file mode 100644 index c7ce455c4..000000000 --- a/app/locale/fr_FR/Mage_Oauth.csv +++ /dev/null @@ -1,118 +0,0 @@ -"%name% '%value%' is too long. It must has length %min% symbols.","Le %name% '%value%' est trop long. Il doit comporter %min% caractères." -"%name% '%value%' is too short. It must has length %min% symbols.","Le %name% '%value%' est trop court. Il doit comporter %min% caractères." -"* Required Fields","* Champs requis" -"%s requests access to your account","%s demandes d'accès à votre compte" -"Admin","Admin" -"After authorization application will have access to you account.","Après autorisation, l'application aura accès à votre compte." -"An error occurred on confirm authorize.","Une erreur est survenue lors de la confirmation de l'autorisation." -"An error occurred on delete action.","Une erreur est survenue lors de la suppression de l'action." -"An error occurred on delete application.","Une erreur est survenue lors de la suppression de l'application." -"An error occurred on reject authorize.","Une erreur est survenue lors du rejet de l'autorisation." -"An error occurred on saving consumer data.","Une erreur est survenue lors de l'enregistrement des données consommateur." -"An error occurred on update revoke status.","Une erreur est survenue lors de la mise à jour du statut de révocation." -"An error occurred while deleting the consumer.","Une erreur est survenue lors de la suppression du consommateur." -"An error occurred.","Une erreur est survenue." -"An error occurred. Your authorization request is invalid.","Une erreur est survenue. Votre demande d'autorisation n'est pas valide." -"App Name","Nom de l'application" -"Application ""%s"" has been deleted.","L'application ""%s"" a été supprimée." -"Application ""%s"" has been enabled.","L'application ""%s"" a été activée." -"Application ""%s"" has been revoked.","L'application ""%s"" a été révoquée." -"Application Name","Nom de l'application" -"Application not found.","Application introuvable." -"Are you sure you want to delete this application?","Êtes-vous sûr de vouloir supprimer cette application ?" -"Are you sure you want to disable this application?","Êtes-vous sûr de vouloir désactiver cette application ?" -"Are you sure you want to enable this application?","Êtes-vous sûr de vouloir activer cette application ?" -"Authorization confirmed","Autorisation confirmée" -"Authorization confirmed.","Autorisation confirmée." -"Authorize","Autoriser" -"Authorize application","Autoriser l'application" -"Authorized Tokens","Jetons autorisés" -"Callback URL","URL de rappel" -"Cleanup Probability","Probabilité de nettoyage" -"Cleanup Settings","Paramètres de nettoyage" -"Close","Fermer" -"Confirm OAuth token authorization","Confirmer l'autorisation du jeton OAuth" -"Confirm token authorization Pop Up for admin","Confirmer la fenêtre Pop Up de jeton d'autorisation pour l'administrateur" -"Confirm token authorization for admin","Confirmer le jeton d'authentification pour l'administrateur" -"Confirmation Of Authorization","Confirmation de l'autorisation" -"Consumer Information","Information consommateur" -"Consumer Name","Nom consommateur" -"Consumers","Consommateurs" -"Created At","Créé à" -"Customer","Client" -"Customer My Account My OAuth Applications","Client Mon compte Mes applications OAuth" -"Delete","Supprimer" -"Disable","Désactive" -"Disabled","Désactivé" -"Edit","Éditer" -"Edit Consumer","Éditer consommateur" -"Email","Email" -"Email Address","Adresse email" -"Enable","Activer" -"Enabled","Actif" -"Entry with ID #%s not found.","Entrée avec identifiant #%s introuvable." -"Expiration Period","Période d'expiration" -"Give the verifier code to application administrator","Donner le code de vérification à l'administrateur de l'application" -"ID","ID" -"Invalid Callback URL","URL de rappel non valide" -"Invalid ID parameter.","Paramètre identifiant non valide." -"Invalid Rejected Callback URL","URL de rappel rejetée non valide" -"Invalid entry ID.","Identifiant d'entrée non valide." -"Invalid revoke status.","Statut de révocation non valide." -"Key","Clé" -"Log In","Connexion" -"Log in as a customer","Se connecter en tant que client" -"Log in as admin","Se connecter en tant qu'administrateur" -"Log in as customer","Se connecter en tant que client" -"Log in to use %s","Connectez-vous pour utiliser %s" -"Login","Connexion" -"My Applications","Mes applications" -"Name","Nom" -"New Consumer","Nouveau consommateur" -"OAuth","OAuth" -"OAuth Admin My Apps","Administrateur OAuth Mes applications" -"OAuth Authorized Tokens","Jetons OAuth autorisés" -"OAuth Consumers","Consommateurs OAuth" -"OAuth authorization Pop Up for customer","Fenêtre d'autorisation OAuth pour client" -"OAuth authorization for admin","Autorisation Oauth pour administrateur" -"OAuth authorization for customer","Autorisation OAuth pour client" -"OAuth authorization simple for admin","Autorisation OAuth simple pour administrateur" -"Password","Mot de passe" -"Permissions","Autorisations" -"Please login to proceed authorization.","Veuillez vous connecter pour procéder à l'autorisation." -"Please select needed row(s).","Veuillez sélectionner la/les ligne(s) souhaitée(s)." -"Please select revoke status.","Veuillez sélectionner le statut de révocation." -"REST - My Apps","REST - Mes applications" -"REST - OAuth Authorized Tokens","REST - Jetons OAuth autorisés" -"REST - OAuth Consumers","REST - Consommateurs OAuth" -"Reject","Rejeter" -"Reject OAuth token authorization","Rejeter l'autorisation du jeton OAuth" -"Reject authorization","Autorisation de rejet" -"Reject token authorization Pop Up for admin","Rejet de la fenêtre Pop Up du jeton d'autorisation pour l'administrateur" -"Reject token authorization for admin","Rejeter le jeton d'authentification pour l'administrateur" -"Rejected Callback URL","URL de rappel rejetée" -"Rejection Of Authorization","Rejet de l'autorisation" -"Revoked","Révoqué" -"Role Name","Nom du rôle" -"Save","Enregistrer" -"Save and Continue Edit","Enregistrer et continuer la modification" -"Secret","Secret" -"Selected entries enabled.","Entrées sélectionnées activées." -"Selected entries has been deleted.","Les entrées sélectionnées ont été supprimées." -"Selected entries revoked.","Entrées sélectionnées révoquées." -"Status","Statut" -"System","Système" -"The application access request is rejected.","La demande d'accès à l'application est rejetée." -"The consumer has been deleted.","Le consommateur a été supprimé." -"The consumer has been saved.","Le consommateur a été enregistré." -"Token Status Change","Modification de l'état du jeton" -"Token Status Change Email Template","Modèle d'e-mail de modification de l'état du jeton" -"Unable to find a consumer.","Impossible de trouver un consommateur." -"User ID","Identifiant de l'utilisateur" -"User Name","Nom d'utilisateur" -"User Type","Type d'utilisateur" -"Verifier code: %s","Vérifier code : %s" -"You have no applications.","Vous n'avez pas d'applications." -"deleted","supprimé" -"enabled","activé" -"revoked","révoqué" diff --git a/app/locale/fr_FR/Mage_Page.csv b/app/locale/fr_FR/Mage_Page.csv deleted file mode 100644 index 02358bb6f..000000000 --- a/app/locale/fr_FR/Mage_Page.csv +++ /dev/null @@ -1,81 +0,0 @@ -"%s Item(s)","%s article(s)" -"%s-%s of %s","%s-%s de %s" -"© 2012 Magento Demo Store. All Rights Reserved.","© 2012 Magento Demo Store. Tous droits réservés." -"© 2013 Magento Demo Store. All Rights Reserved.","© 2013 Magento Demo Store. Tous droits réservés." -"(Shift-)Click or drag to change value","(SHIFT+) Cliquez ou faites glisser pour changer de valeur." -"(ver. %s)","(ver. %s)" -"- Click on any of the time parts to increase it","- Cliquez sur n'importe quelle partie de l'heure pour l'augmenter" -"- Hold mouse button on any of the above buttons for faster selection.","Maintenez le bouton de la souris enfoncé sur n'importe quel des boutons ci-dessus pour sélectionner plus rapidement" -"- Use the %s buttons to select month","Utilisez les boutons %s pour sélectionner le mois" -"- Use the %s, %s buttons to select year","- Utilisez les boutons %s, %s pour sélectionner l'année" -"- or Shift-click to decrease it","- - ou appuyez sur SHIFT en cliquant pour la diminuer" -"- or click and drag for faster selection.","- ou cliquez et faites glisser pour sélectionner plus rapidement" -"-- Please Select --","-- Merci de Sélectionner --" -"1 column","1 colonne" -"2 columns with left bar","2 colonnes avec barre gauche" -"2 columns with right bar","2 colonnes avec barre droite" -"3 columns","3 colonnes" -"About the calendar","Au sujet du Calendrier" -"Account","Compte" -"All Empty Layout Pages","Toutes les Pages vides" -"All One-Column Layout Pages","Toutes les Pages à une Seule Colonne" -"All Pages","Toutes les Pages" -"All Pages (Print Version)","Toutes les Pages (Version Imprimable)" -"All Three-Column Layout Pages","Toutes les Pages à Trois Colonnes" -"All Two-Column Layout Pages (Left Column)","Toutes les Pages à Deux Colonnes (Colonne de Gauche)" -"All Two-Column Layout Pages (Right Column)","Toutes les Pages à Deux colonnes (Colonne de Droite)" -"Allow","Autoriser" -"Breadcrumbs","Breadcrumbs" -"Click here if nothing has happened","Cliquez ici si rien ne s'est produit" -"Close","Fermer" -"Close Window","Fermer fenêtre" -"DHTML Date/Time Selector","Sélecteur DHTML Date/Heure" -"Date selection:","Sélection de la date:" -"Default Description","Description par défaut" -"Default welcome msg!","Message de bienvenue par défaut!" -"Display %s first","Afficher %s en premier" -"Distributed under GNU LGPL. See %s for details.","Distribué sous GNU LGPL. Voir %s pour plus de détails." -"Drag to move","Faire glisser" -"Empty","Vide" -"For latest version visit: %s","Pour visiter la dernière version: %s" -"Free Shipping on orders over 50$","Frais de port gratuits pour les commandes supérieures à 50 $." -"Go Today","Aller aujourd'hui" -"Help Us to Keep Magento Healthy","Aidez-nous à maintenir Magento en forme" -"Interface Language","Langue de l'Interface" -"Items %s to %s of %s total","Total des articles %s à %s de %s" -"JavaScript seems to be disabled in your browser.","Le JavaScript semble être désactivé sur votre navigateur." -"Left Column","Colonne de Gauche" -"Left Column First (shows above main column on smaller screens)","Colonne de gauche en premier (affiche colonne principale au-dessus sur des écrans plus petits)" -"Main Content Area","Zone Principale" -"Menu","Menu" -"Navigation Bar","Barre de navigation" -"Next","Suivant" -"Next month (hold for menu)","Mois suivant (maintenez pour menu)" -"Next year (hold for menu)","Année Suivante (maintenez pour menu)" -"Page Bottom","Bas de la page" -"Page Footer","Pied de page" -"Page Header","En-tête" -"Page Top","Haut de la page" -"Page:","Page:" -"Prev. month (hold for menu)","Mois précédent (maintenez pour menu)" -"Prev. year (hold for menu)","Année précédente (maintenez pour menu)" -"Previous","Précédent" -"Redirecting...","En cours de redirection..." -"Report All Bugs","Rapporter tous les bugs" -"Results per page","Résultats par page" -"Right Column","Colonne de Droite" -"Search","Rechercher" -"Select Store","Sélectionnez Boutique" -"Select Store:","Sélectionnez la boutique:" -"Select date","Sélectionnez la date" -"Show","Montrer" -"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Ceci est une boutique démo. Toutes les commandes passées via cette boutique ne pourront êtres satisfaites." -"This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our Privacy Policy page. To accept cookies from this site, please click the Allow button below.","Ce site Internet requiert des cookies pour assurer l'ensemble de ses fonctions. Pour plus d'informations sur les données contenues dans les cookies, veuillez consulter notre page « Politique de confidentialité ». Pour accepter les cookies de ce site, veuillez cliquer sur le bouton Autoriser ci-dessous." -"Time selection:","Sélection de l'heure:" -"Time:","Heure:" -"View All ","Tout afficher" -"Welcome, %s!","Bienvenue, %s!" -"You must have JavaScript enabled in your browser to utilize the functionality of this website.","Javascript doit être activé dans votre navigateur pour que vous puissiez utiliser les fonctionnalités de ce site internet." -"Your Language","Votre Langue" -"Your Language:","Votre Langue:" -"per page","par page" diff --git a/app/locale/fr_FR/Mage_PageCache.csv b/app/locale/fr_FR/Mage_PageCache.csv deleted file mode 100644 index 020da3bab..000000000 --- a/app/locale/fr_FR/Mage_PageCache.csv +++ /dev/null @@ -1,12 +0,0 @@ -"An error occurred while clearing the external full page cache.","Une erreur s'est produite pendant le vidage du cache externe de l'ensemble de la page." -"Cookie Lifetime (seconds)","Durée de vie du cookie (secondes)" -"Enable External Cache","Activer le cache externe" -"External Cache Control","Contrôle du cache externe" -"External Full Page Cache Settings","Paramètres du cache externe de l'ensemble de la page" -"External Page Cache","Mémoire cache de page externe" -"External full page cache.","Cache externe de l'ensemble de la page." -"Failed to load external cache control","Impossible de lancer le contrôle du cache externe" -"Flush External Page Cache","Vider le cache externe de la page" -"If empty, default value will be used.","Si le champ est vide, la valeur par défaut sera utilisée." -"The external full page cache has been cleaned.","Le cache externe de l'ensemble de la page a été vidé." -"Zend Full Page Cache","Cache Avestan de l'ensemble de la page" diff --git a/app/locale/fr_FR/Mage_Paygate.csv b/app/locale/fr_FR/Mage_Paygate.csv deleted file mode 100644 index e57483897..000000000 --- a/app/locale/fr_FR/Mage_Paygate.csv +++ /dev/null @@ -1,67 +0,0 @@ -"3D Secure","Sécurité 3D" -"3D Secure Card Validation","Validation de carte sécurité 3D" -"API Login ID","Identifiant de l'API" -"Accepted Currency","Monnaie acceptée" -"Allow Partial Authorization","Permettre autorisation partielle" -"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","Etes-vous sûr de vouloir annuler votre paiement ? Cliquez sur OK pour annuler le paiement et débloquer le montant en attente. Cliquez sur Quitter pour entrer une autre carte bancaire et continuer le paiemetn." -"Authorize Only","Autoriser uniquement" -"Authorize and Capture","Autoriser et enregistrer" -"Authorize.Net Transaction ID %s","Identifiant de transaction %s Authorize.Net" -"Authorize.net","Authorize.net" -"Cancel","Annuler" -"Centinel API URL","URP API Centinel" -"Credit Card Types","Types de cartes de crédit" -"Credit Card Verification","Vérification de la carte de crédit" -"Credit Card: xxxx-%s","Carte de crédit : xxxx-%s" -"Debug","Déboguer" -"Email Customer","Envoyer un email au client" -"Enabled","Activé" -"Error in payment gateway.","Erreur dans le transfert du paiement." -"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","Les actions de passerelle sont verouillées car la passerelle ne peut pas compléter une ou plusieurs transactions. Veuillez vous connecter à Authorize.net pour résoudre manuellement le problème." -"Gateway error: %s","Erreur de la passerelle : %s" -"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Si vide, une valeur par défaut sera utilisée. Une URL personnalisée peut être fournie par CardinalCommerce." -"Invalid amount for authorization.","Montant invalide pour autorisation." -"Invalid amount for capture.","Montant invalide" -"Invalid amount for partial authorization.","Montant invalide pour l'autorisation partielle" -"Invalid amount for refund.","Montant invalide pour un remboursement" -"Invalid split tenderId ID.","Identifiant invalide" -"Invalid transaction ID.","Identifiant de transaction invalide." -"Maximum Order Total","Montant total maximum" -"Merchant's Email","Email du marchand" -"Minimum Order Total","Montant total minimum" -"New Order Status","Nouveau statut de la commande" -"Parent Authorize.Net transaction (ID %s) expired","Transaction parente de Authorize.Net expirée (Id. %s)" -"Payment Action","Paiement" -"Payment authorization error.","Erreur d'autorisation du paiement." -"Payment canceling error.","Erreur dans l'annulation du paiement." -"Payment capturing error.","Erreur lors de la saisie du paiement" -"Payment from Applicable Countries","Paiement depuis les pays disponibles." -"Payment from Specific Countries","Paiement depuis les pays spécifiques" -"Payment partial authorization error.","Erreur de l'autorisation partielle du paiement" -"Payment refunding error.","Erreur de remboursement du paiement" -"Payment updating error.","Erreur lors de la mise à jour du paiement." -"Payment voiding error.","Erreur annulant le paiement" -"Processed Amount","Montant réalisé" -"Remaining Balance","Balance restante" -"Severe 3D Secure Card Validation","Validation de carte sécurité 3D sévère" -"Severe Validation Removes Chargeback Liability on Merchant","Validation sévère supprime le risque de remboursement pour le vendeur" -"Shopping cart contents and/or address has been changed.","Le contenu du panier et/ou l'adresse ont été changés." -"Sort Order","Trier les widgets" -"Test Mode","Mode test." -"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","Le montant disponible sur votre carte de crédit est insuffisant pour pouvoir finaliser votre commande. Le montant disponible a été mis en attente. Pour finaliser votre commande, cliquez sur OK et indiquez le numéro d'une autre carte de crédit. Pour annuler la commande et débloquer le montant mis en attente, cliquez sur Annuler." -"There was an error canceling transactions. Please contact us or try again later.","Une erreur s'est produite lors de l'annulation de transactions. Veuillez nous contacter ou réessayer ultérieurement." -"Title","Titre" -"Transaction Key","Clé de la transaction" -"You have reached the maximum number of credit card allowed to be used for the payment.","Vous avez atteint le nombre maximum autorisé de cartes de crédit à utiliser pour le paiement." -"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","Vous avez atteint le nombre maximum autorisé de cartes de crédits à utiliser pour un paiement. Les montants disponibles sur l'ensemble des cartes de crédit étaient insuffisants pour finaliser le paiement. Le paiement a été annulé et les montants mis en attente débloqués." -"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","Votre carte de crédit a été refusée. Cliquez sur OK pour indiquer une autre carte de crédit pour finaliser votre paiement. Cliquez sur Annuler pour débloquer le montant mis attente et sélectionner un autre moyen de paiement." -"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","Votre commande n'a pas été enregistrée car les contenus du panier et/ou de l'adresse ont été modifiés. Les montants autorisés en attente de votre paiement précédent sont désormais débloqués. Veuillez procéder au paiement pour les contenus de votre dernier panier." -"Your payment has been cancelled. All authorized amounts have been released.","Votre paiement a été annulé. Tous les montants autorisés ont été débloqués." -"amount %s","Montant %s" -"authorize","autoriser" -"authorize and capture","autoriser et saisir" -"capture","saisir" -"failed","échoué" -"refund","remboursement" -"successful","réussi" -"void","vide" diff --git a/app/locale/fr_FR/Mage_Payment.csv b/app/locale/fr_FR/Mage_Payment.csv deleted file mode 100644 index d29df97fd..000000000 --- a/app/locale/fr_FR/Mage_Payment.csv +++ /dev/null @@ -1,142 +0,0 @@ -"%s %s cycle.","Cycle %s %s." -"* Required Fields","* Champs obligatoires" -"--Please Select--","--Veuillez sélectionner--" -"3D Secure Card Validation","Validation de la carte par 3D Secure" -"3D Secure Credit Card Validation","Validation de la carte de crédit par 3D Secure" -" %s"," %s" -"A value is required for live mode. Refer to your CardinalCommerce agreement.","Une valeur est requise pour le mode en direct. Référez-vous à votre contrat CardinalCommerce." -"Allow Initial Fee Failure","Autoriser un échec des frais initiaux." -"An internal reference ID is required to save the payment profile.","Un ID de référence interne est requis pour enregistrer le profil de paiement." -"Authorize action is not available.","L'action autoriser n'est pas disponible." -"Auto Bill on Next Cycle","Facturer automatiquement lors du prochain cycle." -"Automatically Invoice All Items","Facturer automatiquement tous les objets." -"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","Facturer automatiquement le montant restant dans le cycle suivant (si des paiements ont échoué)" -"Bank Transfer Payment","Paiement par virement bancaire" -"Billing Agreement status is not set.","Le statut du contrat de facturation n'est pas réglé." -"Billing Amount","Montant de la facturation." -"Billing Frequency","Fréquence de facturation." -"Billing Period","Période de facturation." -"Billing Period Unit","Unité de période de facturation." -"Billing period unit is not defined or wrong.","L'unité de période de facturation n'est pas définie ou est fausse." -"Cannot retrieve the payment info model object.","Impossible de récupérer l'objet modèle d'informations de paiement." -"Cannot retrieve the payment information object instance.","Impossible de récupérer les informations de paiement." -"Cannot retrieve the payment method code.","Impossible de récupérer le code de la méthode de paiement." -"Cannot retrieve the payment method model object.","Impossible de récupérer l'objet modèle de méthode de paiement." -"Capture action is not available.","L'action capturer n'est pas disponible." -"Card Verification Number","Numéro de vérification de carte." -"Cash On Delivery Payment","Paiement en liquide à la livraison" -"Centinel API URL","URL de l'API Centinel" -"Check / Money Order","Chèque / Mandat" -"Credit Card Number","Numéro de carte de crédit" -"Credit Card Number: xxxx-%s","Numéro de carte de crédit : xxxx-%s" -"Credit Card Type","Type de carte de crédit" -"Credit Card Type: %s","Type de carte de crédit : %s" -"Credit Card Types","Types de cartes de crédit" -"Credit card number mismatch with credit card type.","Le numéro de carte de crédit ne correspond pas au type de carte." -"Credit card type is not allowed for this payment method.","Ce type de carte de crédit n'est pas autorisé pour cette méthode de paiement." -"Currency","Monnaie" -"Currency code is undefined.","Le code pays n'est pas défini." -"Customer ID is not set.","L'ID client n'est pas réglé." -"Day","Jour" -"Debug Mode","Mode débug" -"Enabled","Activé" -"Expiration Date","Date d'expiration" -"Expiration Date: %s/%s","Date d'expiration : %s/%s" -"Full name of the person receiving the product or service paid for by the recurring payment.","Nom complet de la personne recevant le produit ou le service payé par le paiement récurrent." -"Incorrect credit card expiration date.","Date d'expiration de la carte incorrecte." -"Initial Fee","Frais initiaux." -"Initial non-recurring payment amount due immediately upon profile creation.","Le montant du paiement initial non récurrent est dû à la création du profil." -"Instructions","Instructions" -"Internal Reference ID","ID de référence interne." -"Invalid Credit Card Number","Numéro de carte invalide" -"Issue Number","Numéro du problème." -"Make Check Payable to","Faire un chèque payable à" -"Make Check payable to:","Faire un chèque payable à:" -"Make Check payable to: %s","Faire un chèque payable à: %s" -"Maximum Billing Cycles","Cycles de facturation maximum" -"Maximum Order Total","Montant total maximum" -"Maximum Payment Failures","Échecs de paiement maximum" -"Maximum Trial Billing Cycles","Cycles de tentative de facturation maximum" -"Merchant ID","ID commerçant" -"Minimum Order Total","Montant total minimum" -"Month","Mois" -"N/A","non applicable" -"Name on Card","Nom sur la carte" -"Name on the Card","Nom sur la carte" -"Name on the Card: %s","Nom sur la carte : %s" -"New Order Status","Nouveau statut de la commande" -"Number of billing periods that make up one billing cycle.","Nombre de période de facturation qui font un cycle de facturation." -"Order action is not available.","Action Commande non disponible." -"Overrides API URL that may be specified by a payment method.","Ignorer l'URL de l'API qui pourrait être spécifiée par une méthode de paiement." -"Password","Mot de passe" -"Payment ID: %s","ID du paiement : %s" -"Payment Method","Méthode de paiement" -"Payment Methods","Méthodes de paiement" -"Payment Methods Section","Section des méthodes de paiement" -"Payment Reference ID","ID de référence du paiement" -"Payment Services","Services de paiement" -"Payment from Applicable Countries","Paiement depuis les pays disponibles." -"Payment from Specific Countries","Paiement depuis les pays spécifiques" -"Payment method code is not set.","Le code de la méthode de paiement n'est pas défini." -"Payment method code is undefined.","Le code de la méthode de paiement est indéfini." -"Payment profile is invalid:\n%s","Le profil de paiement est invalide : \n%s" -"Period frequency is wrong.","La période de fréquence est fausse." -"Please enter a valid credit card verification number.","Veuillez entrer un numéro de vérification valide." -"Processor ID","ID processeur" -"Purchase Order","Bon de commande" -"Purchase Order Number","Numéro du bon de commande" -"Purchase Order Number:","Numéro du bon de commande :" -"Purchase Order Number: %s","Numéro du bon de commande : %s" -"Recurring Profile Start Date","Récurrent Profil Date de départ" -"Recurring profile start date has invalid format.","La date de départ du profil récurrent n'est pas dans un format valide." -"Reference ID is not set.","L'ID de la référence n'est pas défini." -"Refund action is not available.","Le remboursement n'est pas disponible." -"Repeats %s time(s).","Se répète %s fois." -"Repeats until suspended or canceled.","Se répète jusqu'à suspension ou annulation." -"Request Card Security Code","Demander un code de carte de sécurité" -"Saved CC","CC enregistré" -"Schedule Description","Description du programme" -"Schedule description must be not empty.","La description du programme ne peut pas être vide." -"Selected payment type is not allowed for billing country.","Le type de paiement sélectionné n'est pas autorisé pour le pays de facturation." -"Send Check to","Envoyer le chèque à" -"Send Check to:","Envoyer le chèque à :" -"Severe 3D Secure Card Validation","Validation de carte 3D Secure rigoureuse" -"Severe validation removes chargeback liability on merchant.","La validation rigoureuse supprime la responsabilité du vendeur sur les remboursements." -"Shipping Amount","Montant de livraison" -"Short description of the recurring payment. By default equals to the product name.","Courte description du paiement récurrent. Par défaut la même que le nom du produit." -"Sort Order","Trier les widgets" -"Start Date","Date de début" -"Start date has invalid format.","La date de départ a un format invalide." -"Start date is undefined.","La date de départ n'est pas définie." -"Subscriber Name","Nom de l'abonné" -"Switch/Solo/Maestro Issue Number","Numéro Switch/Solo/Maestro" -"Switch/Solo/Maestro Only","Switch/Solo/Maestro seulement" -"Switch/Solo/Maestro Start Date","Date de début Switch/Solo/Maestro" -"Tax Amount","Montant des taxes" -"Test Mode","Mode test." -"The date when billing for the profile begins.","La date où la facturation commence pour le profil." -"The number of billing cycles for payment period.","Le nombre de cycles de facturation pour la période de paiement." -"The number of scheduled payments that can fail before the profile is automatically suspended.","Le nombre de paiements qui peuvent échouer avant que le profil soit automatiquement suspendu." -"The payment review action is unavailable.","La vérification du paiement n'est pas disponible." -"The requested Payment Method is not available.","La méthode de paiement demandée n'est pas disponible." -"Title","Titre" -"Trial Billing Amount","Montant d'essai facturé" -"Trial Billing Frequency","Fréquence des factures d'essai" -"Trial Billing Period Unit","Période d'unité des factures" -"Trial Period","Période d'essai" -"Trial billing amount is wrong.","Le montant des factures d'essai est incorrect." -"Trial billing period unit is wrong.","La période d'unité des factures d'essai est incorrecte." -"Trial period frequency is wrong.","La fréquence des périodes d'essai est incorrecte." -"Trial period max cycles is wrong.","Le période maximale des cycles d'essai est incorrecte." -"Two Weeks","Deux semaines" -"Unable to save Billing Agreement:","Impossible d'enregistrer l'accord de facturation :" -"Unit for billing during the subscription period.","Unité de facturation pour la période de souscription." -"Unsupported currency code: %s.","Code de devise non supporté : %s." -"Void action is not available.","L'action annuler n'est pas disponible." -"Week","Semaine" -"What is this?","Qu'est-ce que c'est ?" -"Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.","Faut-il annuler le paiement si les frais initiaux échouent ou les ajouter à la balance." -"Wrong %s specified.","Mauvais %s spécifié." -"Wrong or empty billing amount specified.","Le montant de facturation spécifié est vide ou erroné." -"Year","Année" -"Zero Subtotal Checkout","Vérification du sous-total" diff --git a/app/locale/fr_FR/Mage_Paypal.csv b/app/locale/fr_FR/Mage_Paypal.csv deleted file mode 100644 index 39e29eb5f..000000000 --- a/app/locale/fr_FR/Mage_Paypal.csv +++ /dev/null @@ -1,623 +0,0 @@ -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -"-OR-","-OU-" -"120 x 240","120 x 240" -"120 x 600","120 x 600" -"120 x 90","120 x 90" -"190 x 100","190 x 100" -"2-pixel perimeter around the header space.","Un périmètre de deux pixels autour de l'espace du header." -"234 x 400","234 x 400" -"234 x 60","234 x 60" -"250 x 250","250 x 250" -"300 x 50","300 x 50" -"3D Secure","3D Secure" -"3D Secure Card Validation","Validation de la carte par 3D Secure" -"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at http://www.paypal.com/amexupdate.","Validation D sécurisée nécessaire pour les cartes Maestro. Le support des cartes American Express nécessite l'acceptation d'un accord supplémentaire. En savoir plus à http://www.paypal.com/amexupdate" -"468 x 60","468 x 60" -"728 x 90","728 x 90" -"800 x 66","800 x 66" -"Start accepting payments via PayPal!","Commencer à accepter les paiements via Paypal !" -"A case that has been resolved and close requires a reimbursement.","Un cas qui a été résolu et fermé nécessite un remboursement." -"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","Cette transaction a été annulée en raison d'un litige avec le client suspectant une usurpation non autorisée." -"A reversal has occurred on this transaction because you have given the customer a refund.","Une annulation s'est produite sur cette transaction car vous avez remboursé le client." -"A reversal has occurred on this transaction due to a chargeback by your customer.","Cette transaction a été annulée en raison d'un remboursement par votre client." -"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","Une annulation s'est produite sur cette transaction à cause d'une plainte du client sur la transaction." -"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","Cette transaction a été annulée car votre client a fait jouer sa garantie de remboursement." -"A value is required for live mode. Refer to your CardinalCommerce agreement.","Une valeur est requise pour le mode en direct. Référez-vous à votre contrat CardinalCommerce." -"ACH Deposit (Hold for Dispute or Other Investigation)","Dépôt ACH (bloquer pour litige ou autre enquête)" -"ACH Deposit (Reversal)","Dépôt ACH (annulation)" -"ACH Funding for Funds Recovery from Account Balance","Fonds ACH pour récupération de fonds depuis la balance du compte" -"ACH Withdrawal","Virement ACH" -"API Authentication Methods","API Méthodes d'identification" -"API Certificate","Certificat API" -"API Password","Mot de passe API" -"API Signature","Signature API" -"API Username","Nom d'utilisateur API" -"API Uses Proxy","L'API utilise un proxy" -"Ability for buyer to purchase without PayPal account.","Possibilité pour l'acheteur de commander sans compte PayPal." -"Accept credit card and PayPal payments securely.","Accepter les cartes de crédit et les paiements PayPal en toute sécurité." -"Accept credit cards, debit cards and PayPal payments securely.","Accepter les cartes de crédit, les cartes de débit et les paiements PayPal en toute sécurité." -"Accept payments in your shopping cart. PayPal will process your card payments through the Payflow Gateway.","Accepter les paiements dans votre panier. PayPal va traiter vos payements par carte par le biais de la passerelle Payflow." -"Accept payments with a PCI compliant checkout that keeps customers on your site.","Accepter des paiements par le biais d'une caisse certifiée PCI qui garde les clients sur votre site." -"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Accepter des paiements par le biais d'une caisse certifiée PCI qui garde les clients sur votre site." -"Accept payments with a completely customizable checkout page.","Accepter les paiements avec une page de confirmation complètement personnalisable." -"Accept payments with a completely customizable checkout.","Accepter les paiements avec une confirmation complètement personnalisable." -"Acceptance Mark","Marque d'acceptance" -"Acceptance Mark Image","Image de marque d'acceptance" -"Account-to-Account Payment, initiated by PayPal","Paiement compte-à-compte, initié par PayPal" -"Add PayPal as an additional payment method to your checkout page to increase your sales.","Ajouter PayPal en tant que méthode de paiement supplémentaire pour votre page de confirmations afin d'augmenter les ventes." -"Add PayPal as an additional payment method to your checkout page.","Ajouter PayPal en tant que méthode de paiement supplémentaire à votre page de confirmation." -"Add another payment method to your existing solution or as a stand-alone option.","Ajouter une autre méthode de paiement à votre solution actuelle ou comme option séparée." -"Additional Options","Options additionnelles" -"Address","Adresse" -"Address Verification System Response","Réponse du système à la vérification d'adresse" -"Advanced Settings","Paramètres avancés" -"Advertise Bill Me Later","Afficher Bill Me Later" -"All the address information matched","Toutes les informations de l'adresse correspondent" -"Allow in Billing Agreement Wizard","Autoriser dans l'assistant d'accord de facturation" -"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Variables autorisées : ""paypal"", ""primary"" (default), your_custom_value (un style de page de paiement personnalisé de votre compte vendeur)" -"Allowed Credit Card Types","Types de cartes autorisés" -"Also affects mini-shopping cart.","Affecte aussi le panier mini-shopping." -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","Voulez-vous vraiment quitter cette page ? Vous devrez repasser par toutes les étapes de paiement." -"Ask Customer","Demander au client" -"Attempted Authentication, Bad Result","Essai d'authentification, mauvais résultat" -"Attempted Authentication, Good Result","Essai d'authentification, bon résultat" -"Auction Payment other than through eBay","Paiement des enchères autres que via eBay" -"Authenticated, Bad Result","Authentifié, mauvais résultat" -"Authenticated, Good Result","Authentifié, bon résultat" -"Authorization","Autorisation" -"Authorization Honor Period (days)","Autorisation de la période de garantie (en jours)" -"Authorization expired.","Autorisation expirée." -"Authorization transaction is required to void.","L'autorisation de la transaction doit être annulée." -"Authorization was voided by merchant.","L'autorisation a été annulée par le vendeur." -"Authorized amount of %s.","La quantité autorisée s'élève à : %s." -"Authorizing amount of %s is pending approval on gateway.","La quantité autorisée de %s est en attente d'approbation sur la passerelle." -"Auto","Automatique" -"AutoSweep","Emporter automatiquement" -"Available Balance","Solde disponible" -"Balance Manager Account Bonus","Bonus de la balance du manager" -"Basic Settings - PayPal Express Checkout","Paramètres de base - PayPal Express Checkout" -"Basic Settings - PayPal Integral Evolution","Paramètres de base - PayPal Integral Evolution" -"Basic Settings - PayPal Pasarela integral","Paramètres de base - PayPal Pasarela integral" -"Basic Settings - PayPal Payflow Link","Paramètres de base - PayPal Payflow Link" -"Basic Settings - PayPal Payflow Pro","Paramètres de base - PayPal Payflow Pro" -"Basic Settings - PayPal Payments Advanced","Paramètres de base - PayPal Payments Advanced" -"Basic Settings - PayPal Payments Pro","Paramètres de base - PayPal Payments Pro" -"Basic Settings - PayPal Payments Pro Hosted Solution","Paramètres de base - Solution d'intégration paiements PayPal Payments Pro" -"Basic Settings - PayPal Payments Standard","Paramètres de base - PayPal Payments Standard" -"Basic Settings - PayPal Pro","Paramètres de base - PayPal Pro" -"Basic Settings - PayPal Website Payments Plus","Paramètres de base - PayPal Website Payments Plus" -"Basic Settings - PayPal Website Payments Pro","Paramètres de base - PayPal Website Payments Pro" -"Basic Settings - PayPal Website Payments Pro Hosted Solution","Paramètres de base - Solution d'intégration paiements PayPal Website Payments Pro" -"Basic Settings - PayPal Website Payments Pro Payflow Edition","Paramètres de base - PayPal Website Payments Édition Payflow" -"Basic Settings - PayPal Website Payments Standard","Paramètres de base - Paiements sur site marchand PayPal" -"Billing Address","Adresse de facturation" -"Billing Agreement Signup","Souscription aux accords de facturation" -"Billing Information","Informations de facturation" -"Bonus for first ACH Use","Bonus pour première utilisation de l'ACH" -"Both section above must be complete. ","Les deux sections ci-dessus doivent être complétées." -"Buyer Credit Payment","Paiement acheteur" -"Buyer claims that a possible duplicate payment was made to the merchant.","D'après le client, un paiement en double a été fait au marchand." -"Buyer claims that he did not receive goods or service.","Le client dit ne pas avoir reçu les marchandises ou le service." -"Buyer claims that he/she did not authorize transaction.","Le client dit ne pas avoir autorisé la transaction." -"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","D'après le client, les marchandises ou le service diffèrent de leur description par le marchand." -"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Le client dit que la marchandise reçue est insatisfaisante, défectueuse ou endommagée." -"Buyer\'s Tax ID","Identification fiscale de l'acheteur" -"Buyer\'s Tax ID Type","Type d'identification fiscale de l'acheteur" -"By default it is ""reports.paypal.com"".","Par défaut ""reports.paypal.com""" -"CNPJ","CNPJ" -"CPF","CPF" -"CVV Entry is Editable","L'entrée CVV peut être modifiée" -"CVV2 Check Result by PayPal","Résultats de chèque CVV2 via Paypal" -"Can not send new order email.","N'a pas pu envoyer le nouvel email de commande." -"Cannot create target file for reading reports.","Ne peut pas créer de fichier source pour la lecture des rapports." -"Catalog Category Page","Page catégorie du catalogue" -"Catalog Product Page","Page produit du catalogue" -"Centinel API URL","Centinel Api URL" -"Centinel Custom API URL","Centinel Custom API URL" -"Charge-off","Radiés" -"Chargeback","Frais de retour" -"Checkout Cart Page","Page de panier de paiement" -"Checkout with PayPal","Commander avec PayPal" -"Checkout with PayPal Bill Me Later","Payer avec Bill Me Later de Paypal" -"Choose a secure bundled payment solution for your business.","Choisissez une solution fiable de paiements groupés pour votre entreprise." -"City","Ville" -"Click here if you are not redirected within 10 seconds...","Cliquez ici si vous n'êtes pas redirigé après 10 secondes..." -"Close","Fermer" -"Company","Compagnie" -"Complaint","Réclamation" -"Completion Date","Date de fin" -"Configure","Configurer" -"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Connectez votre compte marchand à une passerelle certifiée PCI qui laisse les clients payer sans quitter votre site." -"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Connectez votre compte marchand à une passerelle entièrement personnalisable qui laisse les clients payer sans quitter votre site." -"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Se connecte au serveur SFTP de Paypal pour récupérer des nouveaux rapports. Etes-vous sûr de vouloir continuer ?" -"Continue","Continuer" -"Countries Payment Applicable From","Formulaire de pays disponibles" -"Country","Pays" -"Coupon Redemption","Annulations de coupons" -"Credit","Crédit" -"Credit Card Settings","Réglages de la carte de crédit" -"Currency Conversion required to cover negative balance","Conversion de monnaie nécessaire pour compenser balance négative" -"Custom","Personnalisé" -"Custom Endpoint Hostname or IP-Address","Nom d'hébergeur ou adresse IP personnalisé" -"Custom Path","Chemin personnalisé" -"Customer Information","Informations du client" -"Customer did not include a confirmed address.","Le client n'a pas d'adresse confirmée." -"Customer failed to pay.","Le paiement du client a échoué." -"Customer used non-confirmed address.","Le client a utilisé une adresse non confirmée." -"Daily","Tous les jours" -"Debit","Débit" -"Debit Card Cash Back","Remboursement carte de débit." -"Debit Card Transaction","Transaction via carte de débit." -"Debit or Credit","Débit ou crédit" -"Debug Mode","Mode débug" -"Direct Payment API","Paiement direct via l'API" -"Discount","Discount" -"Display","Afficher" -"Display Express Checkout in the Payment Information step","Afficher la caisse expresse dans l'étape sur les informations de paiement" -"Displays on catalog pages and homepage.","Affiche sur les pages du catalogue et la page d'accueil." -"Dispute","Litige" -"Don't have a PayPal account? Simply enter your email address.","Vous n'avez pas de compte PayPal ? Entrez simplement votre adresse e-mail." -"Dynamic","Dynamique" -"EFT Funding (German banking)","Fonds EFT (banque allemande)" -"Edit","Modifier" -"Edit Payment Information","Modifier informations de paiement" -"Edit Shopping Cart","Modifier le panier" -"Email Address","Adresse email" -"Email Associated with PayPal Merchant Account","Email associée à un compte Paypal vendeur" -"Email Associated with PayPal Merchant Account (Optional)","E-mail associé au compte marchand PayPal (facultatif)" -"Enable Automatic Fetching","Activer la récupération automatique" -"Enable Bill Me Later","Activer Bill Me Later" -"Enable Express Checkout","Activer le paiement rapide Express Checkout" -"Enable PayPal Guest Checkout","Activer la paiement Paypal en tant qu'invité" -"Enable Payflow Link","Activer Payflow Link" -"Enable SSL verification","Activer la vérification SSL" -"Enable this Solution","Activer cette solution" -"Enabled","Activé" -"Event","Évènement" -"Event Code","Code de l'évènement" -"Every 10 days","Tous les 10 jours" -"Every 14 days","Tous les 14 jours" -"Every 3 days","Tous les 3 jours" -"Every 30 days","Tous les 30 jours" -"Every 40 days","Tous les 40 jours" -"Every 7 days","Tous les 7 jours" -"Exact Match. Address and Postal Code. International","Correspondance exacte. Adresse et code postal. International" -"Exact Match. Address and Postal Code. UK-specific","Correspondance exacte. Adresse et code postal. Spécifique à la Grande Bretagne" -"Exact Match. Address and nine-digit ZIP code","Correspondance exacte. Adresse et code postal ZIP à neuf chiffres" -"Explanation: %s.","Explication : %s." -"Express Checkout","Commande express" -"Express Checkout APIs","APIs de paiement Express" -"Express Checkout and Order have been canceled.","Le contrôle express et la commande ont été annulés." -"Express Checkout has been canceled.","Le contrôle express a été annulé." -"Failed to fetch reports from '%s@%s'.","Échec de récupération des rapports depuis '%s@%s'." -"Fax","Fax" -"Fee Amount","Montant des frais" -"Fee Debit or Credit","Frais de débit ou crédit" -"Fee Reversal","Annulation des frais" -"Fee: Foreign ACH Withdrawal","Frais : virement à l'étranger" -"Fee: Mass Pay Request","Frais : requête de paiement de masse" -"Fee: Web Site Payments Pro Account Monthly","Frais : compte mensuelle de sites web pro" -"Fee: WorldLink Check Withdrawal","Frais : virement Worldlink" -"Fetch","Chercher" -"Fetch Updates","Mises à jour de récupération" -"Fetched %s report rows from '%s@%s'.","Lignes de rapport %s récupérées depuis '%s@%s'." -"For Virtual Quotes Only","Pour les devis virtuels uniquement" -"Frontend Experience Settings","Options de l'interface utilisateur." -"Funding","Fonds" -"General (Authorization)","Général (autorisation)" -"General (Dividend)","Générale (dividendes)" -"General (Funds Transfer from PayPal Account to Another)","Général (transfert de fonds d'un compte Paypal à un autre)" -"General (Purchase with a credit card)","Général (commande via carte de crédit)" -"General Adjustment without businessrelated event","Ajustement général avec les évènements liés au commerce" -"General Currency Conversion","Conversion de monnaie" -"General Funding of PayPal Account ","Fonds du compte Paypal" -"General Redemption","Remboursement général" -"General Withdrawal from PayPal Account","Virement général depuis le compte Paypal" -"General. Product no longer supported","Général. Produit plus supporté." -"General: Use of PayPal account for purchasing as well as receiving payments","Général : Utilisation du compte Paypal pour acheter et recevoir des paiements" -"General: Withdrawal from PayPal Account","Général : virement depuis le compte Paypal." -"General: Withdrawal to Non-Bank Entity","Général : virement vers une entité non-bancaire" -"General: adjustment of a type not belonging to the other T12xx categories","Général : ajustement à un type ne correspondant pas aux autres catégories T12xx" -"General: bonus of a type not belonging to the other T08xx categories","Général : bonus d'un type ne correspondant pas aux autres catégories T08xx" -"General: event not yet categorized","Général : évènement n'appartenant à aucune catégorie" -"General: non-payment fee of a type not belonging to the other T01xx categories","Général : frais de non paiement ne correspondant pas aux catégories T01xx" -"General: received payment of a type not belonging to the other T00xx categories","Général : paiement reçu ne correspondant pas aux autres catégories T01xx" -"General: reversal of a type not belonging to the other T11xx categories","Général : annulation d'un type ne correspondant pas aux autres catégories T11xx" -"General: temporary hold of a type not belonging to the other T15xx categories","Général : blocage temporaire d'un type ne correspondant pas aux catégories T15xx" -"Get Credentials from PayPal","Obtenir la pièce d'identité de Paypal" -"Get Publisher ID from PayPal","Obtenir ID éditeur de Paypal" -"Gift Certificate Payment: purchase of Gift Certificate","Paiement du certificat de cadeau : acheter un certificat de cadeau" -"Gift Certificate Redemption","Obtenir annulation du certificat de cadeau" -"Gross Amount","Montant brut" -"Header (center)","En-tête (centre)" -"Header Background Color","Couleur de fond de l'entête" -"Header Border Color","Couleur du bord de l'entête" -"Header Image URL","URL de l'image de l'entête" -"Help","Aide" -"Hidden Virtual PayPal Debit Card Transaction","Transaction cachée via carte de débit Paypal" -"Hold for Dispute Investigation","Retenir pour enquête du litige" -"Home Page","Page d'accueil" -"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","Je suis désolé mais nous n'avons pas pu réaliser votre opération. Veuillez nous contacter pour que nous puissions vous aider." -"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","Je suis désolé mais nous n'avons pas pu traiter votre paiement. Veuillez essayer un autre mode de paiement ou nous contacter pour que nous vous aidions." -"IPN ""%s"".","IPN ""%s""." -"IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""","IPN ""%s"". %s Montant de la transaction %s. ID de la transaction : ""%s""" -"IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s.","IPN ""%s"". Un litige a été résolu et conclu. %s Montant de la transaction %s." -"IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s","IPN ""%s"". Type de cas ""%s"". ID du cas ""%s"" %s" -"IPN verification ""%s"".","Vérification IPN ""%s""" -"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Si vide, une valeur par défaut sera utilisée. Une URL personnalisée pourrait être fournie par l'accord de CardinalCommerce." -"If not specified, Default Country from General Config will be used","S'il n'est pas spécifié, le pays par défaut dans la configuration générale sera utilisé" -"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","Si cette option est activée, l'utilisateur peut changer l'adresse ainsi que la méthode d'expédition depuis le site de Paypal. Marche instantanément uniquement via le protocole HTTPS." -"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","Si votre compte n'est pas paramétré pour supporter plusieurs utilisateurs, veuillez entrer une nouvelle fois vos identifiants Vendeur/Marchand ici." -"Impossible to issue a refund transaction because the capture transaction does not exist.","Échec du remboursement de la transaction car ladite transaction n'existe pas." -"Incentive","Motivation" -"Initiation Date","Date d'initiation" -"Integral Evolution","Integral Evolution" -"Invoice ID","Identifiant de la facture" -"Issuer Liability","Responsabilité de l'émetteur" -"It is recommended to set this value to ""Debit or Credit Card"" per store views.","Il est recommandé de fixer cette valeur sur ""Carte de crédit""" -"It is recommended to set this value to ""PayPal"" per store views.","Il est recommandé de fixer cette valeur sur ""Paypal""" -"Items in Your Shopping Cart","Objets dans votre panier" -"Last Correlation ID","Dernier identifiant en corrélation" -"Last Transaction ID","Dernier identifiant de transaction" -"Learn More","En savoir plus" -"Login","Identifiant" -"Mass Pay Payment","Paiement de masse" -"Matched (CVV2)","Correspondance (CVV2)" -"Matched (CVV2CSC)","Assorti (CVV2CSC)" -"Matched Address only (no ZIP)","Adresse correspondante uniquement (pas de ZIP)" -"Matched Address only (no ZIP). International","Adresse correspondante uniquement (pas de ZIP). International" -"Matched Postal Code only (no Address)","Code postal correspondant uniquement (pas d'adresse)" -"Matched five-digit ZIP only (no Address)","ZIP à 5 chiffres correspondant uniquement (pas d'adresse)" -"Matched whole nine-didgit ZIP (no Address)","ZIP complet à 9 chiffres correspondant uniquement (pas d'adresse)" -"Merchant Account","Compte du vendeur" -"Merchant Country","Pays commercial" -"Merchant Liability","Responsabilité du vendeur" -"Merchant Location","Localisation du marchand" -"Merchant Protection Eligibility","Eligibilité de protection marchande" -"Merchant Referral Bonus","Bonus de parrainage d'un vendeur" -"Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Le compte marchand n'a pas de mécanisme de retrait. Le marchand doit accepter ou refuser manuellement ce paiement à partir de l'aperçu du compte." -"Merchant account is not verified.","Le compte du vendeur n'est pas vérifié." -"Merchant denied this pending payment.","Le vendeur a refusé ce paiement en attente." -"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Le vendeur utilise un compte en dehors des Etats Unis et ne dispose pas d'un mécanisme de virement de fonds." -"Merchant must upgrade account to Business or Premier status.","Le marchand doit mettre à jour son compte pour un statut Business ou Premier." -"Merchant reference ID format is not supported.","Le format de l'identifiant du vendeur n'est pas supporté." -"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Le vendeur doit postuler via Paypal pour activer les accords de facture. N'activez pas cette option avant que Paypal ne confirme que ceux-ci sont activés pour le compte vendeur." -"Mobile Payment (made via a mobile phone)","Paiement mobile (effectué via un téléphone mobile)" -"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Différentes monnaies. Le vendeur doit manuellement accepter ou refuser ce paiement depuis la vue générale de votre compte." -"N/A","N/A" -"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Adresse non spécifiée, ou pas de réponse. Service non disponible." -"N/A. Global Unavailable","N/A. Indisponible" -"N/A. International Unavailable","N/A. International indisponible." -"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Le vendeur a indiqué que ce CVV2 n'est pas présent." -"N/A. No response","N/A Pas de réponse" -"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. Non autorisé pour des transactions MOTO (Internet / Téléphone)" -"N/A. Not processed","N/A. Non effectué." -"N/A. Retry","N/A. Réessayez" -"N/A. Service not Supported","N/A. Le service n'est pas pris en charge" -"N/A. Service not available","N/A. Service non disponible." -"N/A. Service not supported","N/A. Appareil non supporté" -"N/A. The merchant did not provide AVS information","N/A. Le commerçant n'a pas fourni d'information AVS" -"N/A. The merchant has not implemented CVV2 code handling","N/A. Le vendeur n'a pas implémenté la gestion du code CVV2" -"N/A. Unavailable","N/A. Indisponible." -"Near Bill Me Later checkout button","Près du bouton de paiement Bill Me Later" -"Negative Balance","Solde négatif" -"Never","Jamais" -"No","Non" -"No Details matched","Pas de détails correspondants" -"No Details matched. International","Pas de détail trouvé. International" -"No Liability Shift","Pas de transfert de responsabilité" -"No Logo","Pas de logo" -"No match","Aucune correspondance" -"None of the address information matched","Aucune des informations de l'adresse ne correspondait." -"Not sure what PayPal payment method to use? Click here to learn more.","Vous ne savez pas quelle méthode de paiement PayPal utiliser ? Cliquez ici pour en apprendre davantage." -"Note: %s","Note : %s" -"Nothing to fetch because of an empty configuration.","Rien à extraire en raison d'une configuration vide." -"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Sachez que Paypal peut gérer jusqu'à 10 options de livraisons. C'est pourquoi Magento transférera uniquement les 10 options les moins coûteuses s'il y en a plus de 10 disponibles." -"Notified customer about creditmemo #%s.","Client notifié à propos de la note de crédit #%s." -"Notified customer about invoice #%s.","Client notifié à propos de la note facture #%s." -"Now accepting PayPal (150 X 40)","Accepte maintenant PayPal (150 X 40)" -"Now accepting PayPal (150 X 60)","PayPal désormais accepté (150 X 60)" -"Number of Child Authorizations","Quantité d'autorisations pour enfant" -"Open Authorization","Autorisation ouverte" -"Order","Commande" -"Order ID","Identifiant commande" -"Order Valid Period (days)","Période valide de commande (en jours)" -"Ordered amount of %s.","Montant commandé de %s" -"Ordering amount of %s is pending approval on gateway.","Le montant commandé de %s est en cours d'approbation sur la passerelle." -"Page Background Color","Couleur du fond de la page" -"Page Style","Style de la page" -"Part of the address information matched","Une partie des informations de l'adresse correspond" -"Partner","Partenaire" -"Pasarela integral","Pasarela integral" -"Password","Mot de passe" -"PayPal All-in-One Payment Solutions  Accept and process credit cards and PayPal payments.","Solutions de paiement tout en un PayPal   Acceptez et traitez des paiements par carte de crédit et par PayPal." -"PayPal Balance Manager function of PayPal account","Fonction de gestion de la balance de votre compte Paypal" -"PayPal Billing Agreement Settings","Paramètres de la convention de facturation PayPal" -"PayPal Buyer Warranty Bonus","Bonus Garantie Acheteur PayPal" -"PayPal Debit Card Cash Advance","Avance de fonds carte de débit PayPal" -"PayPal Debit Card Withdrawal from ATM","Retrait depuis distributeur automatique à partir d'une carte de débit Paypal" -"PayPal Express Checkout","PayPal Express Checkout" -"PayPal Express Checkout Shortcut Wrapper","PayPal Express Checkout Shortcut Wrapper" -"PayPal Express Checkout Token does not exist.","Le mot de vérification du paiement express via Paypal n'existe pas." -"PayPal Express Checkout is not enabled.","PayPal Express Checkout n'est pas activé." -"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you. - You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®. - Learn More - ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you. - You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®. - Learn More" -"PayPal Express Order Review Form","PayPal Express Order Review Form" -"PayPal Fee Information","Informations des frais Paypal" -"PayPal Merchant Pages Style","Style de pages marchants PayPal" -"PayPal Payment Gateways","Passerelles de paiement PayPal" -"PayPal Payment Solutions","Solutions de paiement PayPal" -"PayPal Pro","PayPal Pro" -"PayPal Product Logo","Logo produit PayPal" -"PayPal Protection Bonus","Bonus de protection Paypal" -"PayPal Reference ID","Identifiant de référence Paypal" -"PayPal Reference ID Type","Type d'identifiant de référence Paypal" -"PayPal Settlement Reports","Rapports sur le règlement PayPal" -"PayPal certificate does not exist.","Le certificat Paypal n'existe pas." -"PayPal certificate file is empty.","Le fichier de certificat Paypal est vide." -"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal ne traite pas les commandes d'un montant égal à zéro. Pour finaliser votre achat, procédez au paiement standard." -"PayPal gateway has rejected request. %s","Le passerelle de Paypal a rejeté la requête. %s" -"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal vous conseille de configurer un utilisateur supplémentaire sur votre compte dans manager.paypal.com" -"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal vous conseille de configurer un utilisateur supplémentaire sur votre compte dans manager.paypal.com, au lieu de saisir votre nom d'utilisateur admin et mot de passe ici. Ainsi, la sécurité sera améliorée et les interruptions de services seront prévenues si vous changez votre mot de passe plus tard. Si vous ne voulez pas configurer un utilisateur supplémentaire, vous pouvez saisir à nouveau votre nom d'utilisateur marchand ici." -"PayPal response hasn't required fields.","La réponse PayPal n'a pas les champs obligatoires." -"PayPal retains reports for 45 days.","Paypal conserve les rapports pendant 45 jours." -"PayPal/Centinel Electronic Commerce Indicator","Indicateur de commerce électronique de Paypal." -"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa Payer Authentication Service Result" -"Payer Address ID","Identifiant de l'adresse de l'acheteur" -"Payer Address Status","Statut d'adresse du payeur" -"Payer Email","E-mail du payeur" -"Payer ID","ID du payeur" -"Payer Status","Statut du payeur" -"Payer is not identified.","Le payeur n'est pas identifié." -"Payflow Link","Lien Payflow" -"Payflow Link (Includes Express Checkout)","Payflow Link (comprend Express Checkout)" -"Payflow Pro","Payflow Pro" -"Payflow Pro (Includes Express Checkout)","Payflow Pro (comprend Express Checkout)" -"Payflow Pro and Express Checkout","Payflow Pro et Express Checkout" -"Payment Action","Action de paiement" -"Payment Applicable From","Paiement disponible depuis" -"Payment Method","Mode de paiement" -"Payment Refund initiated by merchant","Remboursement de paiement initié par le marchand" -"Payment has been declined. Please try again.","Le paiement a été refusé. Veuillez réessayer." -"Payment is being reviewed by PayPal for risk.","Le paiement est vérifié par Paypal car présente des risques de sécurité." -"Payment transactions disallow storing objects.","Les transactions de paiement ne permettent pas le stockage d'objets." -"Payment was made to an email address that is not yet registered or confirmed.","Le paiement a été effectué à une adresse e-mail pas encore inscrite ou confirmée." -"Payments Advanced","Paiements avancés" -"Payments Advanced (Includes Express Checkout)","Payments Advanced (comprend Express Checkout)" -"Payments Pro (Includes Express Checkout)","Payments Pro (comprend Express Checkout)" -"Payments Pro Hosted Solution","Solution d'intégration paiements Pro" -"Payments Pro and Express Checkout","Payments Pro et Express Checkout" -"Payments Standard","Paiements standard" -"Payments by PayPal (150 X 40)","Paiements par PayPal (150 X 40)" -"Payments by PayPal (150 X 60)","Paiements par PayPal (150 X 60)" -"Pending PayPal","PayPal en attente" -"Place Order","Placer une commande" -"Please agree to all the terms and conditions before placing the order.","Veuillez accepter toutes les conditions générales avant de passer la commande." -"Please contact PayPal Customer Service.","Veuillez contacter le service clients de Paypal." -"Please do not refresh the page until you complete payment.","Merci de ne pas actualiser cette page avant la finalisation du paiement." -"Please re-enable the previously enabled payment solutions.","Veuillez activer à nouveau les solutions de paiement précédemment activées." -"Please select a shipping method...","Veuillez sélectionner un mode d'expédition..." -"Please select region, state or province","Veuillez sélectionnez la région, l'état ou le pays" -"Please update order data to get shipping methods and rates","Veuillez mettre à jour les données de la commande afin d'obtenir les modes et tarifs d'envoi" -"Points Incentive Redemption","Remboursement de prime de points" -"Position","Position" -"Postage Payment to either USPS or UPS","Envoi d'un paiement à USPS ou UPS" -"Preapproved Payment (BillUser API), either sent or received","Paiement préapprouvés (API facture utilisateur), envoyé ou reçu" -"Preapproved Payment ID","Identifiant du paiement pré-approuvé" -"Price","Prix" -"Pro","Pro" -"Process payments using your own internet merchant account.","Traiter les paiements avec votre propre compte marchand internet." -"Product","Produit" -"Product Name","Nom produit" -"Proxy Host","Hébergeur du proxy" -"Proxy Port","Port proxy" -"Publisher ID","ID éditeur" -"Qty","Qté" -"Reauthorization","Réautorisation" -"Reference Information","Informations de référence" -"Reimbursement for a chargeback.","Remboursement pour un rejet de débit." -"Reimbursement of Chargeback","Remboursement." -"Report Date","Date du rapport" -"Reports","Rapports" -"Requested %s and configured %s merchant emails do not match.","Les adresses email demandées %s et configurées %s ne correspondent pas." -"Require CVV Entry","Données CVV requises" -"Require Customer's Billing Address","Adresse de facturation du client requise" -"Required PayPal Settings","Paramètres PayPal nécessaires" -"Required Settings","Paramètres nécessaires" -"Required to display a banner","Requis pour afficher une bannière" -"Reversal","Reprise" -"Reversal of General Account Hold","Annulation de l'attente du compte" -"Reversal of Points Usage","Reprise de l'utilisation des points" -"Reversal of an adjustment.","Annulation d'un ajustement." -"Reversal of hold for Dispute Investigation","Reprise de l'immobilisation pour enquête sur la contestation" -"Review Order","Vérification de la commande" -"Reward Voucher Redemption","Remboursement bon de récompense" -"SFTP Credentials","Titres de compétences SFTP" -"Sale","Vente" -"Sales","Ventes" -"Same as shipping","Identique à l'adresse de livraison" -"Sandbox Credentials","Pièces d'identité du bac à sable" -"Sandbox Mode","Mode Sandbox" -"Schedule","Programme" -"Schedule description is too long.","La description du calendrier est trop longue." -"Scheduled Fetching","Récupération prévue." -"Select a Payment Solution","Sélectionnez une solution de paiement" -"Send Email Confirmation","Envoyer email de confirmation" -"Server Error. Please try again.","Erreur du serveur. Merci de bien vouloir réessayer." -"Settlement Consolidation","Consolidation de l'accord." -"Settlement Report Settings","Accord de règlement des rapports" -"Settlement of a chargeback.","Accord de remboursement." -"Severe 3D Secure Card Validation","Validation de carte 3D Secure rigoureuse" -"Severe Validation Removes Chargeback Liability on Merchant","Validation sévère supprime le risque de remboursement pour le vendeur" -"Severe validation removes chargeback liability on merchant.","La validation rigoureuse supprime la responsabilité du vendeur sur les remboursements." -"Shipping","Envoi" -"Shipping Address","Adresse d'expédition" -"Shipping Information","Informations de livraison" -"Shipping Method","Méthode d'expédition" -"Shop now using (150 X 40)","Faites vos achats en utilisant (150 X 40)" -"Shop now using (150 X 60)","Boutique utilisant maintenant (150 X 60)" -"Shortcut","Raccourci" -"Shortcut Buttons Flavor","Apparence des boutons de raccourci" -"Shortcut on Product View","Raccourci vers la vue du produit" -"Shortcut on Shopping Cart","Raccourci vers le panier d'achat" -"Sidebar (right)","Barre latérale (droite)" -"Sign a billing agreement to streamline further purchases with PayPal.","Signez un accord de facture pour continuer vos achats via Paypal." -"Size","Taille" -"Skip Order Review Step","Passer l'étape de contrôle de la commande" -"Solo","solo" -"Some PayPal solutions conflict.","Conflit entre des solutions PayPal." -"Sorry, no quotes are available for this order at this time.","Désolé, aucune estimation n'est actuellement disponible pour cette commande." -"Sort Order","Trier la commande" -"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Indique ce qu'est la période de garantie sur le compte pour entreprises de Paypal. Elle doit correspondre aux paramètres de Paypal." -"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Indique ce qu'est la période valide de commande sur le compte pour entreprises de Paypal. Elle doit correspondre aux paramètres de Paypal." -"State/Province","Etat / région" -"Static","Statique" -"Street Address","Adresse de la rue" -"Street Address %s","Adresse municipale %s" -"Submitting order information...","Traitement de la commande..." -"Subscriber name is too long.","Le nom de l'inscrit est trop long" -"Subscription ID","Identifiant de l'inscrit" -"Subscription Payment, either payment sent or payment received","Paiement de l'abonnement, paiement envoyé ou paiement reçu" -"Subtotal","Sous-total" -"Summary Text for Aggregated Cart","Texte résumant pour les paniers agrégés" -"Supporting of American Express cards require additional agreement. Learn more at http://www.paypal.com/amexupdate.","La prise en charge des cartes American Express nécessite un accord supplémentaire. En savoir plus : http://www.paypal.com/amexupdate." -"Switch/Maestro","Switch/Maestro" -"Telephone","Téléphone" -"Test Mode","Mode test." -"The background color for the checkout page around the header and payment form.","Couleur de fond pour la page de paiement autour du haut de page et du formulaire de paiement." -"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","La couleur de fond de l'entête de la page de paiement. Code HTML hexadécimal en ASCII de six caractères, non sensible à la case." -"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","Le nombre d'autorisations pour enfant sur votre compte Paypal est d'un enfant. Pour en autoriser davantage, veuillez contacter Paypal." -"The following error(s) occured:","L'erreur / les erreurs suivante(s) s'est / se sont produite(s) :" -"The image at the top left of the checkout page. Max size is 750x90-pixel. https is highly encouraged.","L'image en haut à gauche de la page de paiement. Taille maximum : 750 x 90 pixels. https est fortement conseillé." -"The maximum number of child authorizations is reached.","Le nombre maximum d'autorisations pour enfant est atteint." -"The merchant account is not yet verified.","Le compte du vendeur n'est pas vérifié." -"The payment curency does not match any of the merchant\'s balances currency.","La monnaie du paiement ne correspond pas aux monnaies acceptées par le vendeur." -"The payment eCheck is not yet cleared.","Le paiement eCheck n'est pas encore validé." -"The payment is authorized but not settled.","Le paiement est autorisé mais pas encore réglé." -"The payment is pending because it was made to an email address that is not yet registered or confirmed.","Le paiement est en attente car il a été fait vers une adresse qui n'est pas encore enregistrée ou confirmée." -"The payment is pending while it is being reviewed by PayPal for risk.","Le paiement est en attente alors qu'il est actuellement examiné par PayPal pour le risque." -"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","Le paiement a été effectué via carte de crédit. Afin de recevoir les fonds, le vendeur doit obtenir un compte Business ou Premier." -"There is already another PayPal solution enabled. Enable this solution instead?","Une autre solution PayPal est déjà activée. Activer cette solution à la place ?" -"There was an error processing your order. Please contact us or try again later.","Il y a eu une erreur dans le traitement de votre commande. Veuillez nous contacter ou réessayez plus tard." -"This feature needs be enabled first for the merchant account through PayPal technical support.","Cette fonctionnalité doit d'abord être activée pour le compte commercial via le support technique PayPal." -"This operation requires an existing transaction object.","Cette opération nécessite un objet de transaction existant." -"Time of Day","Heure" -"Title","Titre" -"To proceed to Checkout, please log in using your email address.","Sous-total" -"Transaction ID","ID de la transaction" -"Transaction ID must not be empty.","L'identification de transaction ne peut pas rester vide." -"Transaction Information","Information de la transaction" -"Transaction reversal by PayPal administrators.","Annulation de transaction par les administrateurs de PayPal." -"Transaction reversal due to fraud detected by PayPal administrators.","Annulation de transaction due à la détection d'une fraude par les administrateurs de PayPal." -"Transfer Cart Line Items","Transférer les articles du panier" -"Transfer Shipping Options","Options d'expédition du transfert" -"Triggered Fraud Filters","A déclenché les détecteurs de fraude" -"URL method for Cancel URL and Return URL","Méthode d'URL pour les URL d'annulation et de remboursement" -"Unable to cancel Express Checkout.","N'a pas pu annuler le paiement express." -"Unable to change status. Current status is not correspond to real status.","Impossible de modifier le statut. Le statut actuel ne correspond pas au statut réel." -"Unable to communicate with the PayPal gateway.","Impossible de communiquer avec la passerelle de Paypal." -"Unable to initialize Express Checkout review.","N'a pas pu initialiser la revue du paiement express." -"Unable to initialize Express Checkout.","Impossible de lancer le Checkout Express." -"Unable to place the order.","Impossible d'effectuer la commande." -"Unable to process Express Checkout approval.","N'a pas pu obtenir l'accord pour le paiement express." -"Unable to start Express Checkout.","N'a pas pu lancer le paiement express." -"Unable to update Order data.","Impossible de mettre à jour les données de la commande." -"Unable to update shipping method.","Impossible de mettre à jour la méthode d'expédition." -"Unknown Error. Please try again later.","Erreur inconnue. Veuillez réessayer ultérieurement." -"Unknown reason. Please contact PayPal customer service.","Raison inconnue. Veuillez contacter le service client de PayPal." -"Update Order Data","Mettre à jour les données de la commande" -"Update Shipping Method","Actualiser méthode de livraison" -"Use Proxy","Utiliser un proxy" -"Use colon to specify port. For example: ""test.example.com:5224"".","Utilisez deux points pour spécifier le port. Exemple : ""test.exemple.com : 5224""." -"User","Utilisateur" -"User-initiated Currency Conversion","Conversion de devise initiée par l'utilisateur" -"Uses store frontend name by default.","Utilise le nom d'interface de la boutique par défaut." -"VAT Number","Numéro TVA" -"Vendor","Vendeur" -"View","Vue" -"View Demo","Voir démo" -"View Transaction","Voir la transaction" -"View Transaction Details","Voir les détails de la transction" -"Virtual PayPal Debit Card Transaction","Transaction via carte de débit virtuelle Paypal" -"Virtual Terminal Payment","Terminal de paiement virtuel" -"Void","Annuler" -"Waiting until Customer\'s eCheck will be cleared.","En attente de la vérification de l'eCheck du client." -"We prefer PayPal (150 X 40)","Nous préférons Paypal (150 X 40)" -"We prefer PayPal (150 X 60)","Nous préférons PayPal (150 X 60)" -"Website Payments Plus","Paiements site Internet Plus" -"Website Payments Pro (Includes Express Checkout)","Website Payments Pro (comprend Express Checkout)" -"Website Payments Pro Hosted Solution","Paiements site Internet Pro Solution hébergée" -"Website Payments Pro Hosted Solution (Includes Express Checkout)","Solution d'intégration paiements Pro (comprend Express Checkout)" -"Website Payments Pro Hosted Solution and Express Checkout","Solution d'intégration paiements Pro et Express Checkout" -"Website Payments Pro Payflow Edition (Includes Express Checkout)","Paiements sur site marchand Pro Édition Payflow (comprend Express Checkout)" -"Website Payments Pro Payflow Edition and Express Checkout","Paiements sur site marchand Pro Édition Payflow et Express Checkout" -"Website Payments Pro and Express Checkout","Paiements sur site marchand Pro et Paiement express" -"Website Payments Standard","Paiements sites web standards" -"Website Payments Standard Payment","Paiement site paiement standard" -"What is PayPal?","Qu'est-ce que Paypal?" -"Whether to create a billing agreement, if there are no active billing agreements available.","Ou de créer un accord de facturation, si aucun n'est disponible." -"Will appear as a payment option only for customers who have at least one active billing agreement.","Apparaîtra comme une option de paiement uniquement aux utilisateurs disposant d'au moins un accord de facturation actif." -"WorldLink Withdrawal","Virement WorldLink" -"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Voulez-vous signer un accord de facturation afin de pouvoir continuer les paiements via Paypal ?" -"Wrong Order ID (%s) specified.","Mauvais identifiant de la commande (%s)." -"Wrong PayPal Express Checkout Token specified.","Mauvais code de vérification du paiement express via Paypal." -"Yes","Oui" -"Yes. Matched Address and five-didgit ZIP","Oui. Adresse correspondante et ZIP à 5 chiffres" -"You cannot void a verification transaction","Une transaction de vérification ne peut être refusée" -"You will be redirected to the PayPal website in a few seconds.","Vous serez redirigé vers le site web de Paypal dans quelques secondes." -"You will be redirected to the PayPal website when you place an order.","Vous serez redirigé vers le site de PayPal quand vous effectuerez une commande." -"You will be redirected to the PayPal website.","Vous serez redirigé vers le site de Paypal." -"You will be required to enter your payment details after you place an order.","Vous devrez saisir vos informations de paiement après avoir passé une commande." -"Zip/Postal Code","Code postal" -"chargeback reimbursed","Remboursement effectué." -"chargeback settled","Remboursement effectué." -"customer complaint","Plainte d'un utilisateur." -"customer triggered a chargeback","le client a déclenché un rejet de débit" -"customer triggered money-back guarantee","L'utilisateur a déclenché la garantie de remboursement." -"eBay Auction Payment","Paiement d'enchères eBay" -"merchant refunded payment","Le vendeur a remboursé le paiement." -"no reason","pas de raison" -"reversal of an adjustment","Annulation d'un ajustement." -"unknown reason","raison inconnue" diff --git a/app/locale/fr_FR/Mage_PaypalUk.csv b/app/locale/fr_FR/Mage_PaypalUk.csv deleted file mode 100644 index eee5aec03..000000000 --- a/app/locale/fr_FR/Mage_PaypalUk.csv +++ /dev/null @@ -1,2 +0,0 @@ -"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","Paiement express Paypal (Edition Payflow) Shortcut Wrapper" -"PayPal Express Order Review Form","Formulaire de vérification du paiement express via Paypal." diff --git a/app/locale/fr_FR/Mage_Persistent.csv b/app/locale/fr_FR/Mage_Persistent.csv deleted file mode 100644 index 353db4013..000000000 --- a/app/locale/fr_FR/Mage_Persistent.csv +++ /dev/null @@ -1,74 +0,0 @@ -"""Remember Me"" Default Value","Valeur par défaut « se souvenir de moi »" -"(Not %s?)","(Pas %s)" -"* Required Fields","* Champs requis" -"Address","Adresse" -"Address Information","Adresse" -"Already registered?","Déjà enregistré ?" -"Back","Retour" -"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","En créant un compte dans notre magasin, vous obtenez la possibilité de payer plus rapidement, d'avoir plusieurs adresses de livraison, de consulter et de suivre vos commandes, et plus encore." -"Cannot load configuration from file %s.","N'a pas pu charger la configuration depuis le fichier %s" -"Checkout as Guest","Visitez le site" -"Checkout as a Guest","Payer en tant qu'invité" -"Checkout as a Guest or Register","Payer en tant qu'invité ou s'enregistrer" -"City","Ville" -"Clear Persistence on Log Out","Persistance claire en déconnexion" -"Close","Fermer" -"Company","Compagnie" -"Confirm Password","Confirmer le mot de passe" -"Continue","Continuer" -"Country","Pays" -"Create an Account","Créer un compte" -"Easy access to your order history and status","Accès facile à l'historique et au statut de vos commandes" -"Email Address","Adresse email" -"Enable ""Remember Me""","Activer « se souvenir de moi »" -"Enable Persistence","Activer persistance" -"Fast and easy check out","Paiement rapide et facile" -"Faster checkout","Paiement plus rapide" -"Fax","Fax" -"Forgot Your Password?","Mot de passe oublié ?" -"Forgot your password?","Mot de passe oublié ?" -"General Options","Options générales" -"If you have an account with us, please log in.","Si vous avez un compte chez nous, veuillez vous connecter." -"Loading next step...","Chargement de l'étape suivante..." -"Login","Connexion" -"Login Information","Informations de connexion" -"Login or Create an Account","Se connecter ou Créer un compte" -"New Customers","Nouveaux clients" -"New Here?","Nouveau ?" -"Password","Mot de passe" -"Persist Shopping Cart","Persister panier d'achat" -"Persistence Lifetime (seconds)","Durée de la persistance (secondes)" -"Persistent Shopping Cart","Panier persistent" -"Personal Information","Informations personnelles" -"Please enter the following information to create your account.","Veuillez renseigner les informations suivantes pour créer votre compte." -"Please log in below:","Veuillez vous connecter ci-dessous :" -"Please select region, state or province","Veuillez sélectionnez la région, l'état ou le pays" -"Register","S'inscrire" -"Register and Checkout","S'inscrire et payer" -"Register and save time!","Inscrivez-vous et gagnez du temps !" -"Register to Create an Account","Inscrivez-vous pour créer un compte" -"Register with us for future convenience:","Inscrivez-vous pour une plus grande commodité :" -"Registered Customers","Clients inscrits" -"Registration is free and easy!","L'inscription est simple et gratuite !" -"Remember Me","Se souvenir de moi" -"Returning Customers","Clients récurrents" -"Save in address book","Sauvegarder dans le carnet d'adresses" -"Save multiple shipping addresses","Enregistrer plusieurs adresses de livraison" -"Select State/Province...","Sélectionnez la région" -"Select a billing address from your address book or enter a new address.","Sélectionnez une adresse de facturation depuis votre carnet d'adresses ou entrez une nouvelle adresse" -"Ship to different address","Expédier à une adresse différente" -"Ship to this address","Expédier à cette adresse" -"Shopping cart has been updated with appropriate prices","Le panier a été mis à jour avec les prix appropriés." -"Sign Up for Newsletter","Inscrivez-vous à la lettre d'informations" -"Sign in to speed up your checkout process","Inscrivez-vous pour accélérer le processus de paiement" -"State/Province","Etat / région" -"Street Address","Adresse de la rue" -"Street Address %s","Adresse municipale %s" -"Submit","Soumettre" -"Telephone","Téléphone" -"To proceed to Checkout, please log in using your email address.","Pour passer votre commande, veuillez vous connecter en utilisant votre adresse e-mail." -"VAT Number","Numéro TVA" -"View and track orders and more","Afficher et suivre les commandes et plus" -"Welcome, %s!","Bienvenue, %s !" -"What\'s this?","Qu'est-ce ?" -"Zip/Postal Code","Code postal" diff --git a/app/locale/fr_FR/Mage_Poll.csv b/app/locale/fr_FR/Mage_Poll.csv deleted file mode 100644 index 30d395ce1..000000000 --- a/app/locale/fr_FR/Mage_Poll.csv +++ /dev/null @@ -1,42 +0,0 @@ -"Actions","Action" -"Add Answer","Ajouter une Réponse" -"Add New Answer","Ajouter une Nouvelle Réponse" -"Add New Poll","Ajouter un Nouveau Sondage" -"Answer Title","Titre de la Réponse" -"Answer Title:","Titre de la Réponse:" -"Answer with the same title in this poll","Répondre à ce sondage avec le même titre" -"Are you sure you want to delete it?","Êtes-vous sûr(e) de vouloir le supprimer?" -"Assigned Answers","Réponses Attribuées" -"Closed","Clos" -"Community Poll","Sondage Communautaire" -"Date Closed","Date de Clôture" -"Date Posted","Date de Publication" -"Delete","Supprimer" -"Delete Answer","Supprimer la Réponse" -"Delete Poll","Supprimer le Sondage" -"Disallow Voting in a Poll Multiple Times from Same IP-address","Interdire les Votes Multiples dans un Sondage depuis la Même adresse IP" -"Edit Answer '%s'","Modifier la Réponse '%s'" -"Edit Poll '%s'","Modifier le Sondage '%s'" -"Edit Poll Answer","Modifier la Réponse au Sondage" -"ID","ID" -"Invalid Answer.","Réponse Invalide." -"New Poll","Nouveau Sondage" -"Number of Responses","Nombre de Réponses" -"Open","Ouvert" -"Poll Answers","Réponses au Sondage" -"Poll Information","Informations sur le Sondage" -"Poll Manager","Gestionnaire de Sondage" -"Poll Question","Question du Sondage" -"Poll information","Informations du sondage" -"Poll with the same question","Sondage avec la même question" -"Polls","Sondages" -"Save Answer","Sauver la Réponse" -"Save Poll","Sauver le Sondage" -"Status","Statut" -"The answer has been saved.","La réponse a été sauvée." -"The poll does not exist.","Le sondage n'existe pas." -"Unable to find an answer to delete.","Impossible de trouver une réponse à supprimer" -"Visible In","Visible dans" -"Vote","Voter" -"Votes Count","Nombre de Votes" -"Votes Count:","Nombre de Votes:" diff --git a/app/locale/fr_FR/Mage_ProductAlert.csv b/app/locale/fr_FR/Mage_ProductAlert.csv deleted file mode 100644 index d02e1bc28..000000000 --- a/app/locale/fr_FR/Mage_ProductAlert.csv +++ /dev/null @@ -1,35 +0,0 @@ -"Alert Email Sender","Alerter l'expéditeur de l'email" -"Alert subscription has been saved.","La souscription aux alertes a été enregistrée." -"Allow Alert When Product Comes Back in Stock","Autoriser les alertes quand le produit est à nouveau disponible." -"Allow Alert When Product Price Changes","Autoriser les alertes quand le prix du produit change." -"Click here not to receive alerts for this product","Cliquez ici pour ne plus recevoir d'alertes pour ce produit." -"Error Email Recipient","Erreur dans le destinataire du mail" -"Error Email Sender","Erreur dans l'expéditeur du mail" -"Error Email Template","Erreur dans le modèle du mail" -"Frequency","Fréquence" -"Not enough parameters.","Pas assez de paramètres." -"Price Alert Email Template","Modèle du mail d'alerte de prix." -"Price:","Prix:" -"Product Alerts","Alertes sur les produits" -"Product Alerts Run Settings","Options des alertes sur les produits" -"Product alerts Cron error","Erreur des alertes sur les produits" -"Product price alert","Alerte sur le prix du produit" -"Product stock alert","Alerte sur le stock du produit" -"Regular Price:","Prix normal" -"Sign up for price alert","S'enregistrer pour les alertes sur le prix" -"Sign up to get notified when this product is back in stock","S'enregistrer pour être notifié lorsque ce produit est nouveau en stock" -"Special price:","Prix spécial" -"Start Time","Heure de début" -"Stock Alert Email Template","Modèle du mail d'alerte de stock" -"The alert subscription has been deleted.","La souscription aux alertes a été supprimée." -"The alert subscription has been saved.","La souscription aux alertes a été enregistrée." -"The product is not found.","Le produit n'a pas été trouvé." -"The product was not found.","Le produit n'a pas été trouvé." -"Unable to update the alert subscription.","Échec lors de la mise à jour de la souscription aux alertes." -"Unsubscribe from all price alerts","Se désabonner de toutes les alertes de prix" -"Unsubscribe from all stock alerts","Se désabonner de toutes les alertes de stock" -"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","Vous recevez cette notification car vous avez choisi de recevoir des alertes lorsque les produits suivants sont de nouveau disponibles :" -"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","Vous recevez cette notification car vous avez choisi de recevoir des alertes lorsque les prix des produits suivants changent :" -"You will no longer receive price alerts for this product.","Vous ne recevrez plus d'alertes de prix pour ce produit." -"You will no longer receive stock alerts for this product.","Vous ne recevrez plus d'alertes de stock pour ce produit." -"You will no longer receive stock alerts.","Vous ne recevrez plus d'alertes de stock." diff --git a/app/locale/fr_FR/Mage_Rating.csv b/app/locale/fr_FR/Mage_Rating.csv deleted file mode 100644 index b0638caf9..000000000 --- a/app/locale/fr_FR/Mage_Rating.csv +++ /dev/null @@ -1,29 +0,0 @@ -"1 star","1 étoile" -"2 stars","2 étoiles" -"3 stars","3 étoiles" -"4 stars","4 étoiles" -"5 stars","5 étoiles" -"Add New Rating","Ajouter une note" -"Assigned Options","Options Spécifiques" -"Be the first to review this product","Soyez le premier à évaluer ce produit" -"Default Value","Valeur par Défaut" -"Delete Rating","Supprimer la note" -"Edit Rating","Modifier la note" -"ID","ID" -"If you do not specify a rating title for a store, the default value will be used.","Si vous ne spécifiez pas de titre pour votre note dans une boutique, la valeur par défaut sera utilisée." -"Manage Ratings","Gérer les Notes" -"New Rating","Nouvelle note" -"Option Label","Nom de l'option" -"Option Title","Titre de l'option" -"Option Title:","Titre de l'option:" -"Please select one of each ratings above","Veuillez choisir une de chacune des notes au-dessus" -"Rating Information","Informations sur la note" -"Rating Name","Nom de la note" -"Rating Options","Options de la note" -"Rating Title","Titre de la note" -"Rating Visibility","Visiblité de la note" -"Rating isn't Available","Pas de note disponible" -"Rating with the same title","Note portant le même titre" -"Save Rating","Sauver la note" -"Sort Order","Trier la commande" -"Visible In","Visible dans" diff --git a/app/locale/fr_FR/Mage_Reports.csv b/app/locale/fr_FR/Mage_Reports.csv deleted file mode 100644 index 19c64ea57..000000000 --- a/app/locale/fr_FR/Mage_Reports.csv +++ /dev/null @@ -1,174 +0,0 @@ -"Abandoned Carts","Paniers abandonnés" -"Abandoned carts","Paniers abandonnés" -"Action","Action" -"Add to Cart","Ajouter au panier" -"Add to Compare","Ajouter au comparateur" -"Add to Wishlist","Ajouter à la liste de cadeaux" -"Any","Indifférent" -"Applied Coupon","Coupon appliqué" -"Applies to Any of the Specified Order Statuses","S'applique à tous les statuts de commande spécifiés" -"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Voulez-vous vraiment actualiser les statistiques ? Il peut y avoir une baisse des performances pendant cette opération." -"Are you sure?","Etes-vous sûr ?" -"Avg. Approved Rating","Évaluation moyenne approuvée" -"Avg. Rating","Évaluation moyenne" -"Bestsellers","Meilleures ventes" -"Bought from wishlists","Achetés depuis une liste de cadeaux" -"CSV","CSV (valeurs séparées par des virgules)" -"Carts","Paniers" -"Catalog Category (Without Subcategories)","Catégorie de catalogue (sans sous-catégories)" -"Compared Products Grid Template","Produits comparés sur une grille" -"Compared Products List Template","Produits comparés sur une liste" -"Coupons","Coupons" -"Coupons Usage Report","Rapport sur l'utilisation des coupons" -"Created At","Créé à" -"Current Month Starts","Le mois actuel commence" -"Customer","Client" -"Customer Name","Nom du client" -"Customer Tags","Tags du client" -"Customers","Clients" -"Customers Report","Rapports du client" -"Customers Reviews","Avis des clients" -"Customers Tags","Tags des clients" -"Customers by Number of Orders","Clients par nombre d'achats" -"Customers by Orders Total","Clients par nombre de commandes total" -"Customers by number of orders","Clients par nombre de commandes" -"Customers by orders total","Clients par total des commandes" -"Customers that have wishlist: %s%","Clients qui ont une liste de cadeaux : %s%" -"Dashboard","Tableau de bord" -"Day","Jour" -"Default Recently Compared Products Count","Par défaut Récemment comparé Compte de produits" -"Default Recently Viewed Products Count","Par défaut Récemment vu Compte de produits" -"Description","Description" -"Detail","Détail" -"Downloads","Téléchargements" -"Email","Email" -"Empty Rows","Lignes vides" -"Excel XML","Excel XML" -"Filter","Filtre" -"First Name","Prénom" -"From","De" -"Guest","Invité" -"Hits","Clics" -"ID","ID" -"IP Address","Adresse IP" -"Index model name must be defined","Le nom du modèle Index doit être défini" -"Invalid date specified.","Date spécifiée invalide" -"Invoiced","Facturé" -"Items in Cart","Articles dans le panier" -"Last Name","Nom" -"Last Review","Dernier avis" -"Link","Lien" -"List of Products Recently Compared and Removed from the Compare List by Visitor","Liste des produits récemment comparés et supprimés de la liste de comparaison de Visiteur" -"List of Products Recently Viewed by Visitor","Liste des produits récemment consultés par Visiteur" -"Low Stock","Stock faible" -"Low stock","Stock bas" -"Match Period To","Définir la période à" -"Month","Mois" -"Most Viewed","Les plus vus" -"Name","Nom" -"New Accounts","Nouveaux comptes" -"No","Non" -"Number Added","Nombre ajouté" -"Number Fulfilled","Nombre complété" -"Number Of Reviews","Nombre d'avis" -"Number Purchased","Nombre d'achetés" -"Number Viewed","Nombre de vues" -"Number of Items","Nombre d'articles" -"Number of New Accounts","Nombre de nouveaux comptes" -"Number of Products to display","Nombre de produits à afficher" -"Number of Reviews","Nombre de remarques" -"Number of Times Deleted","Nombre de fois supprimés" -"Number of Total Tags","Nombre total de tags" -"Number of Unique Tags","Nombre de tags uniques" -"Number of Views","Nombre de vues" -"Number of items bought from a wishlist: %s","Nombre d'articles achetés depuis une liste de cadeaux : %s" -"Number of times wishlists have been shared (emailed): %s","Nombre de fois que les listes de cadeaux ont été partagées (par e-mail) : %s" -"Number of wishlist conversions: %s","Nombre de conversions de listes de cadeaux : %s" -"Number of wishlist referrals: %s","Nombre de parrains de la liste de cadeaux : %s" -"Number of wishlists: %s","Nombre de listes de cadeaux : %s" -"Order Status","Statut de la commande" -"Order Taxes Report Grouped by Tax Rate","Commandes Taxes Rapport Groupés par taux d'imposition" -"Orders","Commandes" -"Out of stock","Épuisé" -"Period","Période" -"Poducts Report","Rapport sur les produits" -"Popular Tags","Tags populaires" -"Popularity","Popularité" -"Price","Prix" -"Product Name","Nom produit" -"Product Reviews","Avis sur le produit" -"Product SKU","Produit UGS" -"Product Tags","Étiquettes des produits" -"Products","Produits" -"Products Ordered","Produits commandés" -"Products Report","Rapport sur les produits" -"Products Reviews","Avis sur les produits" -"Products Tags","Tags des produits" -"Products in carts","Produits dans les paniers" -"Purchases","Achats" -"Quantity Ordered","Quantité commandée" -"Quantity of Items","Quantité d'articles" -"Recently Compared","Récemment comparés" -"Recently Compared Products","Produits récemment comparés" -"Recently Viewed","Récemment vus" -"Recently Viewed Products","Produits récemment vus" -"Recently Viewed/Compared Products","Produits récemment vus/comparés" -"Refresh Lifetime Statistics","Rafraîchir les statistiques de durée de vie" -"Refresh Statistics","Rafraîchir les statistiques" -"Refresh Statistics for the Last Day","Rafraîchir les statistiques de la veille" -"Refunds","Remboursements" -"Report","Rapport" -"Reports","Rapports" -"Results","Résultats" -"Revenue","Revenu" -"Review","Avis" -"Reviews","Commentaires" -"Reviews for %s","Commentaires pour %s" -"Sales","Ventes" -"Sales Report","Rapport de ventes" -"Search Query","Recherche" -"Search Terms","Termes de recherche" -"Select day of the month.","Sélectionner le jour du mois" -"Shipping","Envoi" -"Shopping Cart","Panier" -"Shopping Cart Price Rule","Règle de prix du panier" -"Show Actual Values","Afficher les valeurs" -"Show Report","Afficher le rapport" -"Show for Current","Afficher pour le courant" -"Specified","Spécifié" -"Statistics","Statistiques" -"Stock Qty","Qté en stock" -"Submitted In","Soumis dans" -"Submitted On","Soumis sur" -"Subtotal","Sous-total" -"Tag","Étiquette" -"Tag ""%s"" details","Détails ""%s"" du tag" -"Tag Detail","Détail de l'étiquette" -"Tag Name","Nom de l'étiquette" -"Tag Use","Usage de l'étiquette" -"Tags Submitted by %s","Étiquettes soumises par %s" -"Tags submitted to %s","Étiquettes soumises à %s" -"Tax","Taxe" -"Title","Titre" -"To","A" -"Total","Total" -"Total Invoiced vs. Paid Report","Total facturé / Rapport payé" -"Total Ordered Report","Rapport du total commandé" -"Total Refunded Report","Rapport du total remboursé" -"Total Shipped Report","Rapport du total envoyé" -"Total Tags","Total des étiquettes" -"Total invoiced","Total facturé" -"Total refunded","Total remboursé" -"Updated At","Mis à jour à" -"Viewed Products Grid Template","Modèle de grille de produits vus" -"Viewed Products List Template","Formulaire-type de la liste des produits consultés" -"Visible In","Visible dans" -"Wishlist Report","Rapport de liste cadeaux" -"Wishlist vs. Regular Order","Liste cadeaux / Commande régulière" -"Wishlists","Listes cadeaux" -"Year","Année" -"Year-To-Date Starts","Début date à année" -"Yes","oui" -"Your Recently Compared","Vos produits récemment comparés" -"Your Recently Viewed","Récemment vus" -"undefined","indéfini" diff --git a/app/locale/fr_FR/Mage_Review.csv b/app/locale/fr_FR/Mage_Review.csv deleted file mode 100644 index 0bce47413..000000000 --- a/app/locale/fr_FR/Mage_Review.csv +++ /dev/null @@ -1,104 +0,0 @@ -"%d Review(s)","%d avis" -"%s Review(s)","%s avis" -"(Posted on %s)","(Posté le %s)" -"1 star","1 étoile" -"2 star","2 étoiles" -"2 stars","2 étoiles" -"3 star","3 étoiles" -"3 stars","3 étoiles" -"4 star","4 étoiles" -"4 stars","4 étoiles" -"5 star","5 étoiles" -"5 stars","5 étoiles" -"%2$s %3$s (%4$s)","%2$s %3$s (%4$s)" -"Add New Review","Ajouter un nouvel avis" -"Add Your Review","Ajouter votre avis" -"Administrator","Administrateur" -"All Reviews","Tous les avis" -"All Reviews of Customer `%s`","Tous les avis du client `%s`" -"All Reviews of Product `%s`","Toutes les appréciations du Produit `%s` " -"Allow Guests to Write Reviews","Autoriser les invités à écrire des avis" -"Approved","Approuvé" -"Are you sure you want to do this?","Êtes-vous sûrs de vouloir faire celà?" -"Are you sure?","Etes-vous sûr ?" -"Average Customer Rating","Note moyenne des clients" -"Average Customer Rating:","Note moyenne des clients :" -"Back","Retour" -"Back to Main Product Info","Retour à la page principale du produit" -"Back to My Reviews","Retour à Mes avis" -"Back to Product Reviews","Retour aux avis sur le produit" -"Be the first to review this product","Soyez le premier à évaluer ce produit" -"Catalog Product Review View","Voir le catalogue des produits avec avis" -"Catalog Product Reviews List","Catalogue des produits Liste des avis" -"Created On","Créé le" -"Customer","Client" -"Customer My Account Product Reviews","Client Mon Compte Avis sur les produits" -"Customer My Account Review Details","Client Mon compte Détails de l'avis" -"Customer Reviews","Avis du client" -"Customers Reviews","Avis des clients" -"Delete","Supprimer" -"Delete Review","Supprimer l'avis" -"Detailed Rating","Évaluation détaillée" -"Edit Review '%s'","Modifier l'avis '%s'" -"Guest","Invité" -"How do you rate this product?","Comment noter-vous ce produit ?" -"ID","ID" -"Let us know your thoughts","Donnez-nous votre avis" -"Manage Ratings","Gérer les Notes" -"My Product Reviews","Mes avis sur les produits" -"My Recent Reviews","Mes avis récents" -"Name","Nom" -"Name in Store","Nom dans la boutique" -"New Review","Nouvel avis" -"Nickname","Surnom" -"Nickname can\'t be empty","Le pseudo doit être spécifié" -"Not Approved","Non approuvé" -"Only registered users can write reviews. Please, log in or register","Seuls les utilisateurs qui se sont identifiés peuvent faire partager leurs remarques. Veillez vous identifier ou vous enregistrer" -"Pending","En attente" -"Pending Reviews","Avis en attente" -"Pending Reviews of Customer `%s`","Avis en attente du client `%s`" -"Please select a product","Veuillez sélectionner un produit" -"Please select one of each of the ratings above","Veuillez sélectionner une de chaque évaluation ci-dessus" -"Posted By","Posté par" -"Price","Prix" -"Product","Produit" -"Product Name","Nom produit" -"Product Rating","Évaluation du produit" -"Product Rating:","Évaluation du produit :" -"Product Review (submitted on %s):","Avis sur le produit (envoyé le %s) :" -"Product Reviews","Avis sur le produit" -"Product SKU","Produit UGS" -"Products Reviews","Avis sur les produits" -"Qty","Qté" -"Rating:","Évaluation :" -"Review","Avis" -"Review (submitted on %s):","Avis (envoyé le %s) :" -"Review Details","Détails de l'avis" -"Review Form Fields Before","Vérifiez les champs du formulaire avant" -"Review by %s","Avis par %s" -"Review by %s","Avis de %s" -"Review can\'t be empty","Le champ Visualiser doit être rempli" -"Review summary can\'t be empty","Le champ Visualiser le récapitulatif doit être rempli" -"Reviews and Ratings","Avis et évaluations" -"SKU","UGS" -"Save Review","Enregistrer l'avis" -"Status","Statut" -"Submit Review","Envoyer l'avis" -"Summary Rating","Résumé de l'évaluation" -"Summary of Review","Résumé des avis" -"Summary of Your Review","Résumé de votre avis" -"Title","Titre" -"Type","Type" -"Unable to post the review.","Impossible de poster l'avis." -"Update Status","Mettre à jour le statut" -"View All Reviews","Voir tous les avis" -"View Details","Voir détails" -"Visible In","Visible dans" -"Websites","Site web" -"What's your nickname?","Quel est votre surnom ?" -"Write Your Own Review","Écrivez votre propre avis" -"You have submitted no reviews.","Vous n'avez envoyé aucun avis." -"You're reviewing:","Vous donnez votre avis sur :" -"Your Rating:","Votre évaluation :" -"Your Review (submitted on %s):","Votre avis (envoyé le %s) :" -"Your review has been accepted for moderation.","Votre avis a été accepté pour la modération." diff --git a/app/locale/fr_FR/Mage_Rss.csv b/app/locale/fr_FR/Mage_Rss.csv deleted file mode 100644 index 703e47636..000000000 --- a/app/locale/fr_FR/Mage_Rss.csv +++ /dev/null @@ -1,56 +0,0 @@ -"%s - Discounts and Coupons","%s - Promotions et Coupons" -"%s - Special Products","%s - Produits spéciaux" -"%s RSS Feed","%s Flux RSS" -"%s has reached a quantity of %s.","%s a atteint une quantité de %s." -"%s\'s Wishlist","Liste de cadeaux de %s" -"Cannot retrieve the wishlist","Impossible de récupérer la liste de cadeaux" -"Catalog","Catalogue" -"Category Feeds","Flux de catégorie" -"Click for price","Cliquez pour le prix" -"Comment: %s
    ","Commentaire : %s
    " -"Coupons/Discounts","Coupons/promotions" -"Current Status: %s
    ","Statut actuel : %s
    " -"Customer Name: %s","Nom du client : %s" -"Customer Order Status Notification","Notification du statut de la commande du client" -"Details for %s #%s","Détails pour %s #%s" -"Discount","Discount" -"Discount (%s)","Discount (%s)" -"Enable RSS","Activer le flux RSS" -"Error in processing xml. %s","Erreur lors du traitement xml. %s" -"From:","De :" -"Get Feed","Obtenir le flux" -"Gift Message","Message cadeau" -"Grand Total","Total final" -"Low Stock Products","Produits à stock faible" -"Message:","Message :" -"Miscellaneous Feeds","Flux divers" -"New Orders","Nouvelles commandes" -"New Products","Nouveaux produits" -"New Products from %s","Nouveaux produits de %s" -"Notified Date: %s
    ","Date notifiée : %s
    " -"Order # %s Notification(s)","Commander # %s notification(s)" -"Order #%s created at %s","Commande #%s créée à %s" -"Pending product review(s)","Produits en attente de critique(s)" -"Product: ""%s"" review By: %s","Produit : ""%s"" commenté par : %s" -"Product: %s
    ","Produit : %s
    " -"Products tagged with %s","Produit tagué avec %s" -"Purchased From: %s","Acheté de : %s" -"RSS","RSS" -"RSS Feeds","Flux RSS" -"RSS Feeds List","Liste des flux RSS" -"RSS Feeds Section","Section flux RSS" -"Review: %s
    ","Critique : %s
    " -"Rss Config","Configuration RSS" -"Shipping & Handling","Expédition & Traitement" -"Special Products","Produits spéciaux" -"Store: %s
    ","Boutique : %s
    " -"Subtotal","Sous-total" -"Summary of review: %s
    ","Résumé des critiques : %s
    " -"Tags Products","Tags des produits" -"Tax","Taxe" -"There are no Rss Feeds","Il n'y a pas de flux RSS" -"To:","A :" -"Top Level Category","Catégorie de premier niveau" -"Total: %s
    ","Total : %s
    " -"Wishlist","Liste de cadeaux" -"click here to view the review","cliquez ici pour voir le commentaire" diff --git a/app/locale/fr_FR/Mage_Rule.csv b/app/locale/fr_FR/Mage_Rule.csv deleted file mode 100644 index 6a79ef29d..000000000 --- a/app/locale/fr_FR/Mage_Rule.csv +++ /dev/null @@ -1,41 +0,0 @@ -"ALL","TOUS" -"ANY","N'IMPORTE LEQUEL" -"Add","Ajouter" -"Apply","Appliquer" -"Conditions Combination","Combinaison de conditions" -"Customer Groups must be specified.","Les groupes clients doivent être spécifiés." -"End Date must be greater than Start Date.","La date de fin doit être supérieure à la date de début." -"FALSE","FAUX" -"If %s of these conditions are %s:","Si %s de ces conditions sont %s:" -"Invalid discount amount.","Montant de réduction invalide" -"Open Chooser","Ouvrir choisisseur" -"Perform following actions","Exécuter les actions suivantes" -"Please choose a condition to add...","Choisissez une condition à ajouter..." -"Please choose an action to add...","Choisissez une action à ajouter..." -"Remove","Supprimer" -"TRUE","VRAI" -"There is no information about associated entity type ""%s"".","Aucune information sur le type d'entité associé ""%s"". -" -"Websites must be specified.","Les sites internet doivent être spécifiés." -"by","par" -"contains","contient" -"does not contain","ne contient pas" -"does not contains","ne contient pas" -"equals or greater than","supérieur ou égal à" -"equals or less than","inférieur ou égal à" -"for","pour" -"for greater than","pour supérieur à" -"for or greater than","pour ou supérieur à" -"found","trouvé" -"from","de" -"greater than","plus grand que" -"is","est" -"is not","n'est pas" -"is not one of","n'est pas un de" -"is one of","est un de" -"less than","inférieur à" -"not found","pas trouvé" -"not from","pas un des" -"to","à" -"was","était" -"was not","n'était pas" diff --git a/app/locale/fr_FR/Mage_Sales.csv b/app/locale/fr_FR/Mage_Sales.csv deleted file mode 100644 index 237209679..000000000 --- a/app/locale/fr_FR/Mage_Sales.csv +++ /dev/null @@ -1,882 +0,0 @@ -"""%s"" coupon code is not valid.","Le code du coupon ""%s"" n'est pas valable." -"%s","%s" -"%s / %s rate:","%s / %s taux :" -"%s for %s","%s pour %s" -"%s order(s) cannot be canceled","%s commande(s) ne peuvent pas être annulées" -"%s order(s) have been canceled.","%s commande(s) ont été annulées." -"%s order(s) have been put on hold.","%s commande(s) ont été mise(s) en attente." -"%s order(s) have been released from holding status.","%s commande(s) n'a (n'ont) plus le statut ""En attente""." -"%s order(s) were not put on hold.","%s commande(s) n'ont pas été mises en attente." -"%s order(s) were not released from holding status.","%s commande(s) a (ont) toujours le statut ""En attente""." -"* - Enter custom price excluding tax","* - Entrez le prix personnalisé sans les taxes" -"* - Enter custom price including tax","* - Entrez le prix personnalisé avec les taxes" -"* Required Fields","* Champs requis" -"-- Please Select --","-- Veuillez sélectionner --" -"-- Please Select Billing Agreement--","-- Veuillez sélectionner un accord de facturation--" -"About This Order:","A propos de cette commande :" -"About This Profile:","A propos de ce profil :" -"About Your Invoice","Au sujet de votre facture" -"About Your Order","A propos de votre commande" -"About Your Refund","Au sujet de votre remboursement" -"About Your Shipment","Au sujet de votre expédition" -"Accept Payment","Accepter le paiement" -"Accept or Deny Payment","Accepter ou refuser le paiement" -"Account Information","Informations du compte" -"Action","Action" -"Actions","Action" -"Activate","Activer" -"Active","Actif" -"Add","Ajouter" -"Add New Address","Ajouter une nouvelle adresse" -"Add Order Comments","Ajouter commentaires de commande" -"Add Package","Ajouter colis" -"Add Products","Ajouter produits" -"Add Selected Product(s) to Option","Ajouter le(s) produit(s) sélectionné(s) à l'option" -"Add Selected Product(s) to Order","Ajouter le(s) produit(s) sélectionné(s) à la commande" -"Add Selected Product(s) to Package","Ajouter le(s) produits(s) sélectionné(s) au colis" -"Add To Order","Ajouter à la commande" -"Add Tracking Number","Ajouter un numéro de suivi" -"Add comment to order","Ajouter un commentaire à la commande" -"Add new comment to credit memo","Ajouter un nouveau commentaire à la note de crédit" -"Add new comment to shipment","Ajouter un commentaire à l'expédition" -"Add new tracking number","Ajouter un nouveau numéro de suivi" -"Add to Cart","Ajouter au panier" -"Additional Product Info","Informations supplémentaires sur le produit" -"Address","Adresse" -"Address model is not defined.","Le modèle de l'adresse n'est pas défini." -"Adjustment Fee","Ajustement des taxes" -"Adjustment Refund","Ajustement de remboursement" -"Agreement Information","Information sur l'accord" -"Allow Reorder","Autoriser la nouvelle commande" -"Amount","Montant" -"Amount: %s.","Montant : %s." -"An error occurred while assigning order status. Status has not been assigned.","Une erreur s'est produite lors de la détermination de l'état de la commande. L'état n'a pas été déterminé." -"An error occurred while creating shipping label.","Une erreur s'est produite lors de la création de l'étiquette d'expédition." -"An error occurred while saving order status. The status has not been added.","Une erreur s'est produite lors de la sauvegarde de l'état de la commande. L'état n'a pas été ajouté." -"An error occurred while unassigning order status.","Une erreur s'est produite lors du changement d'attribution de l'état de la commande." -"An error occurred while updating the order address. The address has not been changed.","Une erreur s'est produite lors de la mise à jour de l'adresse de la commande. L'adresse n'a pas été modifiée." -"An item option with code %s already exists.","Une option avec le code %s existe déjà." -"Anchor Custom Title","Titre personnalisé" -"Append Comments","Ajouter commentaires" -"Apply","Appliquer" -"Apply Coupon Code","Appliquer code coupon" -"Approved the payment online.","A approuvé le paiement en ligne." -"Are you sure you want to accept this payment?","Voulez-vous vraiment accepter ce paiement ?" -"Are you sure you want to cancel this order?","Voulez-vous vraiment annuler cette commande ?" -"Are you sure you want to delete all items from shopping cart?","Etes-vous certain(e) de vouloir effacer tous les articles du panier?" -"Are you sure you want to deny this payment?","Voulez-vous vraiment refuser ce paiement ?" -"Are you sure you want to do this?","Êtes-vous sûrs de vouloir faire celà?" -"Are you sure you want to send Creditmemo email to customer?","Voulez-vous vraiment envoyer une note de crédit au client par e-mail ?" -"Are you sure you want to send Invoice email to customer?","Voulez-vous vraiment envoyer une facture au client par e-mail ?" -"Are you sure you want to send Shipment email to customer?","Voulez-vous vraiment envoyer l'e-mail d'expédition au client ?" -"Are you sure you want to send order email to customer?","Voulez-vous vraiment envoyer l'e-mail de commande au client ?" -"Are you sure you want to void the payment?","Voulez-vous vraiment annuler le paiement ?" -"Are you sure?","Etes-vous sûr ?" -"Are you sure? This order will be canceled and a new one will be created instead","Êtes-vous sûr ? Cette commande sera supprimée et une nouvelle sera créée à la place." -"Assign Order Status to State","Attribuer l'état de la commande à un État" -"Assign Status to State","Attribuer l'état à un État" -"Assignment Information","Information sur l'attribution" -"At least a payment ID must be set.","Au moins un ID de paiement doit être défini." -"Authorization","Autorisation" -"Authorized amount of %s.","Montant de %s autorisé." -"Authorizing amount of %s is pending approval on gateway.","L'autorisation du paiement de %s est attente d'accord de la passerelle." -"Back","Retour" -"Back to Billing Agreements","Retour aux accords de facturation" -"Back to My Orders","Retour à Mes commandes" -"Back to Recurring Profiles","Retour aux profils récurrents" -"Backordered","Rupture de stock" -"Bestsellers","Meilleures ventes" -"Bill to Name","Facture au nom" -"Billing","Facturation" -"Billing Address","Adresse de facturation" -"Billing Agreement","Accord de facturation" -"Billing Agreement # %s","Accord de facturation # %s" -"Billing Agreement #%s","Accord de facturation #%s" -"Billing Agreement View","Voir l'accord de facturation" -"Billing Agreements","Accords de facturation" -"Billing Last Name","Nom facturation" -"Billing ZIP Code","Code postal facturation" -"Buy %s for price %s","Acheter %s pour le prix de %s" -"CSV","CSV (valeurs séparées par des virgules)" -"Cancel","Annuler" -"Cancel credit memo","Annuler la note de crédit" -"Cancel invoice","Annuler la facture" -"Cancel order","Annuler la commande" -"Canceled","Annulé" -"Canceled order offline.","Commande annulée hors ligne." -"Canceled order online.","Commande annulée en ligne." -"Cannot add order history.","Impossible d'ajouter l'historique des commandes." -"Cannot create an empty shipment.","Impossible de créer un envoi vide." -"Cannot determine the field name.","Impossible de déterminer le nom du champ." -"Cannot do invoice for order.","Impossible d'émettre la facture pour la commande." -"Cannot do shipment for order.","Impossible de procéder à l'expédition pour la commande." -"Cannot get order instance","Ne peut pas obtenir les informations de commande" -"Cannot get the order instance.","Ne peut pas obtenir les informations de commande." -"Cannot register an existing credit memo.","Impossible d'enregistrer une note de crédit existante." -"Cannot register existing invoice","Impossible d'enregistrer une facture existante" -"Cannot register existing shipment","Impossible d'enregistrer un envoi existant" -"Capture","Sauvegarder" -"Capture Amount","Sauvegarder le montant" -"Capture Offline","Sauvegarder hors ligne" -"Capture Online","Sauvegarder en ligne" -"Capture invoice","Sauvegarder facture" -"Captured amount of %s online.","Montant sauvegardé de %s en ligne." -"Capturing amount of %s is pending approval on gateway.","Sauvegarde de %s en attente de vérification par la passerelle." -"Carrier","Transporteur" -"Carrier/Method","Transporteur/méthode" -"Change status, add comments","Changer le statut, ajouter des commentaires" -"Changing address information will not recalculate shipping, tax or other order amount.","Changer les données de l'adresse ne changera pas les coûts d'expédition, les taxes ou les autres frais applicables à la commande." -"Checkout Totals Sort Order","Ordre de tri des totaux de paiements" -"City","Ville" -"Clear Shopping Cart","Vider le panier" -"Click to change shipping method","Cliquez pour changer la méthode d'envoi" -"Close","Fermer" -"Closed","Clos" -"Comma-separated.","Séparé(es) par des virgules." -"Comment","Commenter" -"Comment Text","Commenter texte" -"Comments","Commentaires" -"Comments History","Historique des commentaires" -"Company","Société" -"Complete","Terminer" -"Configure","Configurer" -"Configure and Add to Order","Configurer et ajouter à la commande" -"Contents","Contenu" -"Continue","Continuer" -"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","Détermine le l'IP du client est affichée dans les commandes, factures, expédition et notes de crédit." -"Country","Pays" -"Coupons","Coupons" -"Create","Créer" -"Create New Customer","Créer nouveau client" -"Create New Order","Créer une nouvelle commande" -"Create New Order Status","Créer un nouvel état de commande" -"Create New Order for %s","Créer une nouvelle commande pour %s" -"Create New Order for %s in %s","Créer une nouvelle commande pour %s dans %s" -"Create New Order for New Customer","Créer une nouvelle commande pour un nouveau client" -"Create New Order for New Customer in %s","Créer une nouvelle commande pour un nouveau client dans %s" -"Create New Status","Créer un nouvel état" -"Create Order","Créer une commande" -"Create Packages","Créer colis" -"Create Shipment","Créer une livraison" -"Create Shipping Label","Créer label d'expédition" -"Create Shipping Label...","Créer étiquette d'expédition..." -"Create new credit memo for order","Créer une nouvelle note de crédit pour la commande" -"Create new invoice for order","Créer une nouvelle facture pour une commande" -"Create new shipment for order","Créer une nouvelle livraison pour la commande" -"Create...","Créer..." -"Created At","Créé à" -"Created billing agreement #%s.","Créer un accord de paiement #%s" -"Created:","Créé:" -"Credit Memo","Avoir" -"Credit Memo #","Mémo de crédit N˚" -"Credit Memo # ","Credit Memo # " -"Credit Memo #%1$s | %3$s | %2$s (%4$s)","Avoir #%1$s | %3$s | %2$s (%4$s)" -"Credit Memo Comment Email Sender","Avoir Commentaire Expediteur" -"Credit Memo Comment Email Template","Avoir Commentaire Modèle d'e-mail" -"Credit Memo Comment Email Template for Guest","Avoir Commentaire" -"Credit Memo Comments","Avoir Commentaires" -"Credit Memo Email Sender","Avoir Expediteur" -"Credit Memo Email Template","Avoir Modèle d'e-mail" -"Credit Memo Email Template for Guest","Avoir Modèle d'e-mail pour Invités" -"Credit Memo Update","Avoir Mise à jour" -"Credit Memo Update for Guest","Avoir Mise à jour pour Invités" -"Credit Memos","Avoirs" -"Credit memo canceling problem.","Problème d'annulation de la note de crédit." -"Credit memo cannot be canceled.","La note de crédit ne peut pas être annulée." -"Credit memo has been created automatically","Mémo de crédit a été créé automatiquement." -"Custom Price","Personnaliser le prix" -"Custom Value","Personnaliser la valeur" -"Customer","Client" -"Customer Can Define Start Date","Le client peut définir la date de début" -"Customer Email","Email du client" -"Customer Group","Groupe du client" -"Customer Last Name","Nom du client" -"Customer My Account Order Creditmemo View","Client Mon Compte Commande Avoir Affichage" -"Customer My Account Order History","Client Mon Compte Commande Historique" -"Customer My Account Order Invoice View","Client Mon Compte Commande Facture Affichage" -"Customer My Account Order Shipment View","Client Mon Compte Commande Livraison Affichage" -"Customer My Account Order View","Client Mon Compte Commande Affichage" -"Customer Name","Nom du client" -"Customer\'s Current Activities","Activités en cours du client" -"Customs Value","Valeurs personnalisées" -"Date","Date" -"Date Shipped","Date d'envoi" -"Default Status","État pas défaut" -"Default Template","Modèle par défaut" -"Default logo, will be used in PDF and HTML documents.
    (jpeg, tiff, png) If you see image distortion in PDF, try to use larger image","Le logo par défaut sera utilisé dans les documents au format PDF ou HTML.
    (jpeg, tiff, png) Si vous remarquez une déformation de l'image en PDF, prière d'utiliser une image plus grande." -"Delete","Supprimer" -"Delete Package","Supprimer le colis" -"Denied the payment online.","A refusé le paiement en ligne" -"Deny Payment","Refuser le paiement" -"Description Message","Message descriptif" -"Discount","Discount" -"Discount (%s)","Discount (%s)" -"Discount Amount","Montant de la remise" -"Display Order ID in Header","Afficher l’ID de la commande dans l'en-tête" -"Edit","Modifier" -"Edit Order #%s","Modifier la commande #%s" -"Edit Order %s %s Address","Éditer l'adresse de la commande" -"Edit Order Status","Éditer l'état de la commande" -"Email","Email" -"Email Address","Adresse email" -"Email Copy of Credit Memo","Copie de l'e-mail de la note de crédit" -"Email Copy of Invoice","Copie email de la facture" -"Email Copy of Shipment","Copie de l'e-mail d'expédition" -"Email Order Confirmation","Confirmation de la demande d'email" -"Enable","Activer" -"Enabled","Activé" -"Enter the billing last name and email/ZIP as in the order billing address","Entrer le nom d'expédition et le code postal / email comme dans l'adresse de facturation" -"Entered data is incorrect. Please try again.","Les données saisies sont incorrectes. Veuillez réessayer." -"Error to Show in Shopping Cart","Erreur à afficher dans le panier" -"Excel XML","Excel XML" -"Excl. Tax","H.T." -"Expired","Expiré" -"Explanation","Explication" -"Failed to cancel the billing agreement.","Échec lors de l'annulation de l'accord de facturation." -"Failed to create billing agreement for this order.","Échec de la création de l'accord de facturation pour cette commande." -"Failed to finish billing agreement wizard.","Impossible de terminer l'assistant d'accord de facturation." -"Failed to send the order email.","A échoué d'envoyer la demande d'email" -"Failed to start billing agreement wizard.","Impossible de démarrer l'assistant d'accord de facturation" -"Failed to update the payment.","Échec de la mise à jour du paiement." -"Failed to update the profile.","Échec de la mise à jour du profil." -"Failed to void the payment.","Impossible d'annuler le paiement." -"Fetch","Chercher" -"File extension not known or unsupported type in the following shipment: %s","Extension de fichier inconnue ou type non pris en charge dans l'expédition suivante : %s" -"Find Order By:","Trouver la commande par:" -"First Name","Prénom" -"From","De" -"From Name","De Nom" -"From:","De:" -"G.T. (Base)","G. T. (Base)" -"G.T. (Purchased)","Total général (acheté)" -"General","Général" -"General Information","Informations générales." -"Get Payment Update","Obtenir la mise à jour du paiement" -"Get Update","Obtenir la mise à jour" -"Get shipping methods and rates","Obtenir la méthode d'expédition et les taux" -"Gift Message","Message du cadeau" -"Gift Message for This Order","Message cadeau pour cette commande" -"Gift Message for the Entire Order","Message de cadeau pour l'ensemble de la commande" -"Gift Message for this Order","Message personnalisé pour cette commande" -"Gift Options","Options de cadeau" -"Gift Wrapping for the Entire Order","Emballage cadeau pour l'ensemble de la commande" -"Girth","circonférence" -"Go to Home Page","Go to Home Page" -"Grand Total","Total final" -"Grand Total to be Charged","Grand total à payer" -"Guest","Invité" -"Height","Hauteur" -"Hide Customer IP","Masquer l'IP du client" -"Hold","Mise en attente" -"Hold action is not available.","Le blocage n'est pas disponible." -"Hold order","Bloquer commande." -"Home","Home" -"ID","ID" -"ID #","Identifiant #" -"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"". Credit Memo has not been created. Please create offline Credit Memo.","IPN remboursé. Remboursement effectué par le vendeur. Notification recommandée du montant remboursé de %s. ID de transaction : ""%s"". Aucun Memo Crédit n'a été crée. Veuillez créer un Memo Crédit hors-ligne." -"If empty, the default description above will be used.","Si laissé vide, la description par défaut ci-dessus sera utilisée." -"If empty, the default error above will be used.","Si vide, l'erreur par défaut ci-dessus sera affichée." -"If the invoice was created offline, try creating an offline creditmemo.","Si la facture a été créée hors ligne, essayez de créer une note de crédit hors ligne." -"Incl. Tax","Taxe comprise" -"Information","Renseignements" -"Initial Fee","Frais initiaux." -"Initial Fees","Frais initiaux" -"Initial period payment","Période de paiement initiale" -"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","Les informations fournies ne sont pas suffisantes pour créer l'(les) étiquette(s) d'expédition. Veuillez vérifier les informations de votre boutique et les paramètres d'expédition." -"Invalid block: %s.","Bloc invalide : %s." -"Invalid carrier specified.","Le transporteur spécifié est invalide." -"Invalid draw line data. Please define ""lines"" array.","Ligne de données invalide. Veuillez définir un ordre des ""lignes""." -"Invalid entity model","Modèle d'entité invalide" -"Invalid item option format.","Format d'option d'objet invalide." -"Invalid qty to invoice item ""%s""","Qté invalide pour facturer l'article ""%s""" -"Invalid qty to refund item ""%s""","Qté invalide pourrembourser l'article ""%s""" -"Invalid qty to ship for item ""%s""","Qté invalide pour expédier l'article ""%s""" -"Invalid renderer model","Modèle de rendu invalide" -"Invalid request for adding product to quote.","Requête non valide pour l'ajout du produit au devis." -"Invalid value(s) for Qty to Ship","Valeur(s) invalide(s) pour Qté à expédier" -"Invoice","Facture" -"Invoice #","Facture N˚" -"Invoice # ","Invoice # " -"Invoice #%1$s | %2$s | %4$s (%3$s)","Numéro de facture%1$s | %2$s | %4$s (%3$s)" -"Invoice #%s","Factures n˚%s" -"Invoice Comment Email Sender","Facture Commentaire Expediteur" -"Invoice Comment Email Template","Facture Commentaire Modèle d'email" -"Invoice Comment Email Template for Guest","Modèle de courriel de commentaire de facture pour les clients" -"Invoice Comments","Facture Commentaires" -"Invoice Date","Date de la facture" -"Invoice Email Sender","Expéditeur du courriel de facture" -"Invoice Email Template","Modèle d'email de la facture" -"Invoice Email Template for Guest","Facture Modèle d'email pour invité" -"Invoice Update","Mise à jour facture" -"Invoice Update for Guest","Mise à jour facture pour invité" -"Invoice and Packing Slip Design","Conception de la facture et du bordereau de marchandises" -"Invoice and Ship","Facture et Courrier" -"Invoice canceling problem.","Problème d'annulation de la facture" -"Invoice cannot be canceled.","La facture ne peut être annulée." -"Invoice cannot be captured.","La facture ne peut pas être saisie." -"Invoice cannot be voided.","La facture ne peut pas être annulée" -"Invoice capturing problem.","Problème de saisie de la facture." -"Invoice void problem","Problème d'annulation de la facture" -"Invoice will be created without communication with payment gateway.","La facture va être créée sans communication avec une passerelle de payement" -"Invoiced","Facturé" -"Invoices","Factures" -"Is Closed","Est fermé" -"Item","Article" -"Item Status","Statut article" -"Item object is not specified.","L'objet de l'article n'est pas spécifié." -"Item options declaration error.","Erreur de déclaration pour les options de l'article." -"Item ordered qty","Qté d'articles commandés" -"Item qty declaration error.","Erreur de déclaration de la qté d'articles" -"Items","Objets" -"Items Invoiced","Articles facturés" -"Items Ordered","Articles commandés" -"Items Refunded","Articles remboursés" -"Items Shipped","Articles expédiés" -"Items in the Package","Objets dans le colis" -"Items maximum quantity or price do not allow checkout.","La quantité maximale d'articles ou le prix n'autorise pas le règlement." -"Items options declaration error.","Erreur de déclaration des options d'articles." -"Items to Refund","Articles à rembourser" -"Items to Ship","Articles à expédier" -"Key","Clé" -"Last Name","Nom de famille" -"Last Ordered Items","Derniers articles commandés" -"Last status can\'t be unassigned from state.","Le dernier statut ne peut pas être retiré de l'État." -"Length","Longueur" -"Link to the New Order","Lien vers la nouvelle commande" -"Link to the Previous Order","Lien vers la commande précédente" -"Logo for HTML Print View","Logo pour la vue d'impression HTML" -"Logo for HTML documents only. If empty, default will be used.
    (jpeg, gif, png)","Logo pour les documents HTML seulement. Si vide, le logo par défaut sera utilisé.
    (jpeg, gif, png)" -"Logo for PDF Print-outs (200x50)","Logo pour les impressions PDF (200 x 50)" -"Make Check payable to:","Adresser le chèque à :" -"Manage","Gérer" -"Maximum amount available to refund is %s","Le montant maximal disponible à rembourser est %s" -"Maximum shipping amount allowed to refund is: %s","Plafond de remboursement des frais d'expédition: %s" -"Message","Message" -"Message:","Message:" -"Minimum Amount","Montant minimum" -"Minimum Order Amount","Montant minimum de la commande" -"Mixed","Mélangé" -"Most Viewed","Le plus vu" -"Most Viewed Products Report","Rapport de produits les plus vus" -"Move to Shopping Cart","Mettre dans votre panier" -"Move to Wishlist","Déplacer dans la liste de souhaits" -"Multi-address Description Message","Message de description multi-adresses" -"Multi-address Error to Show in Shopping Cart","Erreur multi-adresses affichée dans votre panier" -"My Orders","Mes commandes" -"My Orders - Details","Mes commandes - Détails" -"N/A","N/A" -"Name","Nom" -"New","Nouveau" -"New Billing Agreement","Nouvel Accord de Facturation" -"New Credit Memo","Nouvel Avoir" -"New Credit Memo for Guest","Nouvelle note de crédit pour le client" -"New Credit Memo for Invoice #%s","Nouveau Credit Memo pour la facture #%s" -"New Credit Memo for Order #%s","Nouveau Credit Memo pour la commande #%s" -"New Invoice","Nouvelle facture" -"New Invoice and Shipment for Order #%s","Nouvelle Facture et Expédition pour la Commande #%s" -"New Invoice for Guest","Nouvelle Facture pour Invité" -"New Invoice for Order #%s","Nouvelle facture pour la commande #%s" -"New Order","Nouvelle Commande" -"New Order Confirmation Email Sender","Expéditeur Email de Confirmation Nouvelle Commande" -"New Order Confirmation Template","Nouveau modèle de confirmation de commande" -"New Order Confirmation Template for Guest","Modèle de Confirmation Nouvelle Commande pour Invité" -"New Order RSS","Nouvelle commande RSS" -"New Order Status","Nouveau statut commande" -"New Order for Guest","Nouvelle Commande pour Invité" -"New Shipment","Nouvelle expédition" -"New Shipment for Guest","Nouvelle expédition pour Invité" -"New Shipment for Order #%s","Nouvelle Expédition pour la Commande #%s" -"Newsletter Subscription","Abonnement à la lettre d'information" -"No","Non" -"No Items","Pas d'article" -"No Items To Refund","Aucun article à rembourser" -"No Payment Methods","Aucun mode de paiement" -"No detail for number ""%s""","Aucune information pour le numéro ""%s""" -"No information available.","Pas d'information disponible" -"No items","Aucun article" -"No order(s) were put on hold.","Aucune commande en attente." -"No order(s) were released from holding status.","Aucune commande n'a été libérée du statut de mise en attente." -"No ordered items","Aucun article commandé" -"No shipping information available","Aucune information d'expédition disponible" -"Nominal Items","Articles individuels." -"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","Les articles individuels doivent être commandés à part. Pour continuer, veuillez retirer les autres articles." -"Nominal order registered.","Commande nominale enregistrée." -"Not Capture","Non saisi" -"Not Initialized","Non initialisé" -"Not Notified","Non notifié" -"Not enough valid data to save the parent transaction ID.","Pas suffisamment de données valides pour sauvegarder l'identifiant de transaction parent." -"Notification Not Applicable","La notification ne s'applique pas" -"Notified","Notifié" -"Notify Customer by Email","Notifier le Client par Email" -"Number","Nombre" -"Number of Invoiced Orders","Nombre de Commandes Facturées" -"Number of Orders","Nombre de commandes" -"Number of Refunded Orders","Nombre de Commandes Remboursées" -"OK","OK" -"Offline Refunded","Remboursé hors connexion" -"On Hold","En Attente" -"Online Refunded","Remboursé en ligne" -"Order","Commande" -"Order #","Commande N˚" -"Order # ","Order # " -"Order # %s","Commande #%s" -"Order # %s %s | %s","Commande n˚ %s %s | %s" -"Order #%s","Commande #%s" -"Order #%s - %s","Commande #%s - %s" -"Order API","Commander API" -"Order Address Information","Informations sur l'adresse de la commande" -"Order Comment","Commentaire Commande" -"Order Comment Email Sender","Emetteur de courriel de commentaires des commandes" -"Order Comment Email Template","Modèle Email Commentaire Commande" -"Order Comment Email Template for Guest","Modèle Email Commentaire Commande pour Invité" -"Order Comments","Commentaires Commande" -"Order Credit Memos","Commander des notes de crédit" -"Order Currency:","Devise de la Commande" -"Order Date","Date de la Commande" -"Order Date (%s)","Date de la Commande (%s)" -"Order Date: ","Date de la commande :" -"Order Date: %s","Date de la Commande: %s" -"Order Details","Détails de la Commande" -"Order Grand Total","Total Commande" -"Order History","Historique des Commandes" -"Order History Info","Informations sur l'historique de la commande" -"Order ID","Identifiant de la Commande" -"Order Information","Informations Commande" -"Order Invoices","Commander les factures" -"Order Shipments","Expéditions Commandes" -"Order State","État de la commande" -"Order Status","Statut de la Commande" -"Order Status Information","Informations sur le statut de la commande" -"Order Statuses","Statuts de la commande" -"Order Subtotal","Sous-total Commande" -"Order Taxes Report Grouped by Tax Rates","Rapport des Taxes sur les Commandes classé par niveau de taxes" -"Order Total","Total Commande" -"Order Totals","Totaux Commande" -"Order Update","Mise à jour de la Commande" -"Order Update for Guest","Mise à jour de la Commande pour Invité" -"Order View","Vue Commande" -"Order credit memo","Note de crédit de la commande" -"Order does not allow to be canceled.","La commande ne peut être annulée" -"Order invoice","Facture Commande" -"Order is suspended as its authorizing amount %s is suspected to be fraudulent.","La commande a été suspendue car son montant d'autorisation %s pourrait être frauduleux." -"Order is suspended as its capture amount %s is suspected to be fraudulent.","La commande est suspendue car son montant %s est soupçonné d'être frauduleux." -"Order object is not specified.","L'objet de la commande n'est pas spécifié." -"Order saving error: %s","Erreur de sauvegarde de la Commande: %s" -"Order shipments","Autres expéditions" -"Order status does not exist.","Le statut de la commande n'existe pas." -"Order status with the same status code already exist.","Un statut de commande avec le même code statut existe déjà." -"Order was placed using %s","La commande a été passée en utilisant %s" -"Ordered","Commandé" -"Ordered amount of %s.","Montant commandé de %s" -"Ordering amount of %s is pending approval on gateway.","Le montant commandé de %s est en cours d'approbation sur la passerelle." -"Orders","Commandes" -"Orders and Returns","Commandes et Retours" -"Orders and Returns Search Form","Formulaire de recherche des Commandes et Retours" -"Original Price","Prix d'origine" -"Original order item that recurring payment profile correspondss to.","Article de la Commande d'origine qui correspond au profil de paiement récurrent" -"PDF Credit Memos","Notes de crédit PDF" -"PDF Invoices","Factures PDF" -"PDF Packingslips","Bons de livraison PDF" -"PDF Print-outs","Impressions de PDF" -"PDF object is not specified.","L'objet PDF n'est pas spécifié." -"PDF page object is not specified.","La page de l'objet PDF n'est pas spécifiée." -"PDF total model should extend Mage_Sales_Model_Order_Pdf_Total_Default","Modèle total de PDF devrait étendre Mage_Sales_Model_Order_Pdf_Total_Default" -"Package","Colis" -"Package types are disregarded for USPS domestic shipments.","Il n'est pas tenu compte du type de paquet pour les expéditions nationales par UPS." -"Packages","Paquets" -"Packingslip # ","Bon de livraison #" -"Paid","Payé" -"Paid Amount","Montant payé" -"Parent Transaction ID","ID de la transaction mère" -"Parent transaction ID must have a transaction ID.","La transaction parente doit avoir un identifiant." -"Partial","Partiel" -"Payment Failed","Le payement a échoué" -"Payment Information","Information paiement" -"Payment Method","Méthode de paiement" -"Payment Method Name","Nom de la méthode de payement" -"Payment Method:","Méthode de paiement :" -"Payment Review","Contrôle du paiement" -"Payment disallow storing objects.","Paiement, ne pas autoriser le stockage d'objets." -"Payment transactions disallow storing objects.","Les transactions de paiement ne permettent pas le stockage d'objets." -"Payment type","Type de paiement" -"Payment update has been made.","La mise à jour du paiement a été effectuée." -"Pending","En cours" -"Pending Payment","Paiement en attente" -"Period","Période" -"Place Order Using Billing Agreements","Passer une commande en recourant aux accords de facturation" -"Placed from IP","Placé depuis l'IP" -"Please Select Products to Add","Sélectionner les produits à acheter" -"Please Select a Customer","Veuillez sélectionner un client" -"Please Select a Store","Veuillez sélectionner une boutique" -"Please check billing address information. %s","Veuillez vérifier l'adresse de facturation. %s" -"Please check shipping address information. %s","Veuillez vérifier l'adresse d'expédition. %s" -"Please define PDF object before using.","Veuillez définir un objet PDF avant usage." -"Please enter positive number in this field.","Veuillez entrer un nombre positif dans ce champ." -"Please select a valid payment method.","Veuillez sélectionner une méthode de paiement valide." -"Please specify a shipping method.","Veuillez spécifier une méthode d'expédition." -"Please specify a valid grid column alias name that exists in grid table.","Veuillez spécifier un nom d'utilisateur qui existe dans le tableau." -"Price","Prix" -"Print","Imprimer" -"Print All","Tout imprimer" -"Print All Invoices","Imprimer toutes les factures" -"Print All Refunds","Imprimer tous les remboursements" -"Print All Shipments","Imprimer toutes les livraisons" -"Print Credit Memos","Imprimer les notes de crédit" -"Print Invoice","Imprimer la facture" -"Print Invoices","Imprimer factures" -"Print Order","Imprimer commande" -"Print Order # %s","Imprimer la commande # %s" -"Print Packingslips","Imprimer les bons de livraison" -"Print Refund","Imprimer le remboursement" -"Print Shipment","Imprimer envoi" -"Print Shipping Label","Imprimer l'étiquette d'expédition" -"Print Shipping Labels","Labels d'expédition" -"Processing","Traitement" -"Product","Produit" -"Product Name","Nom produit" -"Products","Produits" -"Products Bestsellers Report","Rapport des meilleures ventes" -"Products in Comparison List","Produits dans la liste de comparaison" -"Products should be added to package(s)","Les produits doivent être ajoutés au colis" -"Profile #%s","Profil #%s" -"Profile Information","Information sur le profil" -"Profile State","État du profil" -"Profit","Bénéfice" -"Promotion Coupons Usage Report","Rapport sur l'Utilisation des Coupons de Promotions" -"Proper payment object must be set.","Un objet de paiement approprié doit être défini." -"Purchase Order Number:","Numéro de commande :" -"Purchased From","Acheté à" -"Purchased From (Store)","Acheté chez (Boutique)" -"Purchased Item","Article acheté" -"Purchased On","Acheté sur" -"Qty","Qté" -"Qty Invoiced","Qté facturée" -"Qty Ordered","Quantité commandée" -"Qty Shipped","Quantité expédiée" -"Qty To Add","Qté à ajouter" -"Qty to Add","Qté à ajouter" -"Qty to Invoice","Quantité à facturer" -"Qty to Refund","Quantité à rembourser" -"Qty to Ship","Qté à envoyer" -"Quantity Ordered","Quantité commandée" -"Quote item id is not received.","L'identifiant de l'article évalué n'a pas été reçu." -"Quote item is not loaded.","L'article évalué n'a pas été chargé." -"Rate","Taux" -"Recent Orders","Commandes récentes" -"Recently Compared Products","Produits récemment comparés" -"Recently Viewed","Récemment vus" -"Recently Viewed Products","Produits récemment vus" -"Recurring Profile # %s","Profil récurrent # %s" -"Recurring Profile Initial Fee","Profil récurrent Frais initial" -"Recurring Profiles","Profils récurrents" -"Recurring Profiles (beta)","Profils récurrents (beta)" -"Reference ID","ID de référence" -"Reference ID:","Identifiant Référence:" -"Refresh","Rafraîchir" -"Refund","Rembourser" -"Refund #","Remboursement #" -"Refund #%s","N˚%s du/des remboursement(s)" -"Refund Amount","Montant du Remboursement" -"Refund Offline","Remboursement hors connexion" -"Refund Shipping","Remboursement de la Livraison" -"Refund Shipping (Excl. Tax)","Remboursement de la Livraison (H.T.)" -"Refund Shipping (Incl. Tax)","Remboursement de la Livraison (T.T.C.)" -"Refund Totals","Remboursement total" -"Refunded","Remboursé" -"Refunded amount of %s offline.","Montant du remboursement de %s hors ligne" -"Refunded amount of %s online.","Montant du remboursement de %s en ligne" -"Refunds","Remboursements" -"Registered a Void notification.","A enregistré une notification nulle." -"Registered notification about approved payment.","Notification enregistrée pour le paiement approuvé." -"Registered notification about captured amount of %s.","A enregistré une notification à propos du montant saisi de %s." -"Registered notification about denied payment.","A enregistré une notification à propos du paiement refusé." -"Registered notification about refunded amount of %s.","Notification enregistrée pour le montant remboursé de %s" -"Registered update about approved payment.","A déclaré une mise à jour à propos du paiement accepté." -"Registered update about denied payment.","Mise à jour enregistrée sur le paiement refusé." -"Regular Payment","Paiement régulier" -"Related Orders","Commandes liées" -"Remove","Supprimer" -"Remove Coupon Code","Retirer le code de promotion" -"Remove tracking number","Retirer le numéro de suivi" -"Reorder","Commander à nouveau" -"Retrieve credit memo info","Récupérer les informations sur les notes de crédit" -"Retrieve credit memo information","Récupérer les informations de la note de crédit" -"Retrieve credit memo list","Récupérer la liste des notes de crédit" -"Retrieve invoice info","Récupérer les infos sur la facture" -"Retrieve invoice information","Récupérer les informations de la commande" -"Retrieve list of credit memos by filters","Récupérer la liste des notes de crédit par filtre" -"Retrieve list of invoices by filters","Récupérer la liste des commandes par filtres" -"Retrieve list of orders by filters","Récupérer la liste des commandes par filtres" -"Retrieve list of shipments by filters","Récupérer la liste des expéditions par filtres" -"Retrieve order information","Récupérer les informations de la commande" -"Retrieve orders info","Récupérer les infos de la commande" -"Retrieve shipment info","Récupérer les informations de livraison" -"Retrieve shipment information","Récupérer les informations de l'envoi" -"Return to Stock","Retourner au Stock" -"Returned","Retourné" -"Returns","Retours" -"Revenue","Revenu" -"Row Subtotal","Sous-Total de la ligne" -"Row Total","Total de la Ligne" -"SKU","UGK" -"Sales","Ventes" -"Sales Discount","Remise sur les ventes" -"Sales Emails","Courriels de ventes" -"Sales Emails Section","Ventes Emails Section" -"Sales Invoice Print View","Ventes Facture Vue avant impression" -"Sales Items","Articles de ventes" -"Sales Order Print View","Vue d'impression de la commande" -"Sales Section","Ventes Section" -"Sales Shipment Print View","Vue d'impression de l'expédition des ventes" -"Sales Shipping","Expédition des ventes" -"Sales Tax","Taxes sur les ventes" -"Sales Total","Total des ventes" -"Same As Billing Address","(identique à l'adresse de facturation)" -"Save Order Address","Sauvegarder l'adresse de la commande" -"Save Status","Sauvegarder le statut" -"Save Status Assignment","Sauvegarder l'attribution du statut" -"Save in address book","Sauvegarder dans le carnet d'adresses" -"Schedule","Programme" -"Select","Sélectionner" -"Select All","Sélectionner tout" -"Select from existing customer addresses:","Sélectionner à partir d'adresses client existantes:" -"Selected option(s) or their combination is not currently available.","Option(s) sélectionnée(s) actuellement pas disponibles." -"Send Credit Memo Comment Email Copy To","Envoyer un avoir Commentaire Copie de l'email à" -"Send Credit Memo Comments Email Copy Method","Envoyer une copie du mail des commentaires des crédits Memo" -"Send Credit Memo Email Copy Method","Envoyer une copie du mail des crédits Memo" -"Send Credit Memo Email Copy To","Envoyer un avoir Copie de l'email à" -"Send Email","Envoyer l'email" -"Send Invoice Comment Email Copy To","Envoyer une facture Commentaire Copie de l'email à" -"Send Invoice Comments Email Copy Method","Méthode copie envoi email commentaires facture" -"Send Invoice Email Copy Method","Méthode copie envoi email facture" -"Send Invoice Email Copy To","Envoyer une copie de l'email de la facture à" -"Send Order Comment Email Copy To","Envoyer une commande Commentaire Copie de l'email à" -"Send Order Comments Email Copy Method","Méthode copie envoi email commentaires commande" -"Send Order Email","Envoyer un email de commande" -"Send Order Email Copy Method","Envoyer une commande Copie de l'email à" -"Send Order Email Copy To","Envoyer une commande Copie de l'email à" -"Send Sales Emails","Envoyer les ventes Emails" -"Send Shipment Comment Email Copy To","Envoyer une copie du commentaire d'expédition à" -"Send Shipment Comments Email Copy Method","Envoyer une copie du mail des commentaires d'expédition" -"Send Shipment Email Copy Method","Méthode copie envoi email expédition" -"Send Shipment Email Copy To","Envoyer une copie du courriel d'expédition à" -"Send Tracking Information","Envoyer une information de suivi" -"Send shipment info","Envoyer les informations d'expédition" -"Set order for existing transactions not allowed","Le passage de commande pour des transactions existantes n'est pas autorisé" -"Ship","Expédier" -"Ship To","Expédier à" -"Ship to Name","Expédier à Nom" -"Ship to:","Envoyer à :" -"Shipment","Expédition" -"Shipment #","N° d'envoi" -"Shipment #%1$s | %3$s (%2$s)","Expédition #%1$s | %3$s (%2$s)" -"Shipment #%s","Expédition n˚%s" -"Shipment Comment Email Sender","Livraison Expéditeur du Commentaire" -"Shipment Comment Email Template","Livraison Modèle d'E-mail de Commentaire" -"Shipment Comment Email Template for Guest","Livraison Modèle d'E-mail de Commentaire pour Invité" -"Shipment Comments","Commentaires sur l'expédition" -"Shipment Email Sender","Livraison Expéditeur du Mail" -"Shipment Email Template","Modèle de l'e-mail d'expédition" -"Shipment Email Template for Guest","Modèle de l'e-mail d'expédition pour invité" -"Shipment Update","Mise à jour de l'expédition" -"Shipment Update for Guest","Mise à jour de l'expédition pour invité" -"Shipments","Expéditions" -"Shipped","Envoyé" -"Shipped By","Expédié par" -"Shipping","Envoi" -"Shipping & Handling","Expédition et traitement" -"Shipping & Handling","Expédition & Traitement" -"Shipping & Handling Information","Expédition et manutention" -"Shipping Address","Adresse d'expédition" -"Shipping Amount","Montant de la livraison" -"Shipping Information","Informations d'expédition" -"Shipping Method","Méthode d'expédition" -"Shipping Method:","Méthode d'expédition :" -"Shipping Refund","Remboursement de l'expédition" -"Shipping and Tracking Information","Information sur l'expédition et le suivi" -"Shopping Cart","Panier" -"Show Packages","Afficher les colis" -"Signature Confirmation","Confirmation signature" -"Signed Up From","Inscrit à partir de" -"Size","Taille" -"Sku","Sku" -"Sold to:","Vendu à :" -"Some item options or their combination are not currently available.","Certaines options d'article ou leur combinaison ne sont actuellement pas disponibles." -"Some of the products below do not have all the required options.","Certains des articles ci-dessous n'ont pas toutes les options nécessaires." -"Some of the selected options are not currently available.","Certaines des options sélectionnées ne sont actuellement pas disponibles." -"Sorry, no quotes are available for this order at this time.","Désolé, aucune estimation n'est actuellement disponible pour cette commande." -"Source object is not specified.","L'objet source n'est pas spécifié." -"Specified profile does not exist.","Le profil spécifié n'existe pas." -"State Code [State Title]","Code État [Titre État]" -"State/Province","Etat / région" -"Status","Statut" -"Status Code","Code statut" -"Status Label","Étiquette statut" -"Status:","Statut" -"Store Credit","Crédits de la boutique" -"Store View Specific Labels","Vue boutique Étiquettes spécifiques" -"Street Address","Adresse de la rue" -"Submit Comment","Envoyer commentaire" -"Submit Credit Memo","Présenter la note de crédit" -"Submit Invoice","Soumettre facture" -"Submit Invoice and Shipment","Soumettre facture et expédition" -"Submit Order","Envoyer Commande" -"Submit Shipment","Soumettre la livraison" -"Subscribe to Newsletter","S'inscrire à la newsletter" -"Subscribe to Order Status","S'abonner au statut de la commande" -"Subtotal","Sous-total" -"Subtotal after discount.","Sous-total après remise." -"Subtotal:","Sous-total :" -"Suspected Fraud","Fraude supposée" -"Suspend","Suspendre" -"Suspended","Suspendu" -"Tax","Taxe" -"Tax Amount","Montant de la taxe" -"Tax Percent","Pourcentage de taxe" -"Telephone","Téléphone" -"The Order State ""%s"" must not be set manually.","L’État de la commande ""%s"" ne doit pas être défini manuellement." -"The address total model should be extended from Mage_Sales_Model_Quote_Address_Total_Abstract.","Le modèle total de l'adresse devrait être étendu à partir de Mage_Sales_Model_Quote_Address_Total_Abstract." -"The billing agreement ""%s"" has been canceled.","L'accord de facturation ""%s"" a été annulé." -"The billing agreement ""%s"" has been created.","L'accord de facturation ""%s"" a été créé." -"The coupon code has been accepted.","Le code de coupon a été accepté" -"The message has been sent.","Le message a été envoyé." -"The message was sent.","Le message a été envoyé" -"The order address has been updated.","L'adresse de la commande a été mise à jour." -"The order email has been sent.","L'email de la commande a été envoyé" -"The order has been cancelled.","La commande a été annulée." -"The order has been created.","La commande a été créée." -"The order has been put on hold.","La commande a été mise en attente." -"The order has been released from holding status.","La commande n'est plus en attente." -"The order has not been cancelled.","La commande n'a pas été annulée." -"The order status has been assigned.","Le statut de la commande a été assigné." -"The order status has been saved.","Le statut de la commande a été sauvegardé." -"The order status has been unassigned.","Le statut de la commande a été retiré." -"The order was not put on hold.","La commande n'a pas été mise en attente." -"The order was not unheld.","La commande n'a pas été libérée." -"The order was placed using %s","La commande a été passée à partir de %s" -"The order(s) cannot be canceled","La/les commande(s) ne peut/peuvent être annulée(s)" -"The payment has been accepted.","Le payement a été accepté" -"The payment has been denied.","Le paiement a été refusé." -"The payment has been voided.","Le paiement a été invalidé." -"The profile has been updated.","Le profil a été mis à jour." -"The profile has no changes.","Le profil ne comporte aucune modification." -"The profile state has been updated.","L'état du profil a été mis à jour." -"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","La quantité que vous souhaitez ajouter dépasse la quantité totale expédiée d'un ou plusieurs produit(s) sélectionné(s)" -"The requested Payment Method is not available.","La méthode de paiement demandée n'est pas disponible." -"The shipping label has been created.","L'étiquette d'expédition a été créée." -"The transaction ""%s"" (%s) is already closed.","La transaction ""%s"" (%s) est déjà clôturée." -"The transaction ""%s"" cannot be captured yet.","La transaction ""%s"" ne peut pas encore être saisie." -"The value that you entered is not valid.","La valeur que vous avez saisie n'est pas valide." -"There are no billing agreements yet.","Il n'y a pas encore d'accord de facturation" -"There are no printable documents related to selected orders.","Il n'exsite pas de documents imprimables concernant ces commandes." -"There are no shipping labels related to selected orders.","Il n'y a pas de documents d'expédition associés aux commandes sélectionnées." -"There are no shipping labels related to selected shipments.","Il n'y a pas de documents d'expédition associés aux envois sélectionnés." -"There is no need to approve this payment.","Ce paiement ne requiert pas d'accord." -"There is no need to deny this payment.","Il n'y a pas de raison de refuser ce payement" -"There is no update for the payment.","Il n'existe pas de mise à jour pour ce paiement." -"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","Ce message s'affichera dans le panier d'achat lorsque le sous-total après réduction sera inférieur au montant minimal." -"This operation requires an existing transaction object.","Cette opération requiert un objet de transaction existant." -"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","Cette commande contient (%s) articles et ne peut donc pas être modifiée par l'interface d'administration en ce moment, si vous souhaitez continuer à éditer, les (%s) articles seront retirés, la commande sera annulée et une nouvelle commande sera placée." -"This order no longer exists.","Cette commande n'existe plus." -"This product does not have any configurable options","Le produit n'a pas d'options configurables." -"This profile state cannot be changed to ""%s"".","Le profil de peut être changé en ""%s""." -"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","Ceci créera un remboursement hors ligne. Pour créer un remboursement en ligne, ouvrez une facture et créez un mémo crédit. Souhaitez-vous continuer?" -"Tier Pricing","Catégorie de prix" -"Title","Titre" -"To","A" -"To Name","Vers nom" -"To:","A :" -"Total","Total" -"Total %d product(s)","Total %d produit(s)" -"Total (ex)","Total (ex)" -"Total (inc)","Total (inc)" -"Total Due","Total dû" -"Total Invoiced","Total facturé" -"Total Invoiced Paid","Total facturé payé" -"Total Invoiced VS Paid Report","Total facturé contre rapport paiement" -"Total Invoiced not Paid","Total facturé non payé" -"Total Ordered Report","Rapport du total commandé" -"Total Paid","Total payé" -"Total Qty","Quantité totale" -"Total Refund","Total du remboursement" -"Total Refunded","Total remboursé" -"Total Refunded Report","Rapport du total remboursé" -"Total Sales Shipping","Ventes totales expédiées" -"Total Shipped Report","Rapport du total envoyé" -"Total Shipping","Total expédition" -"Total Shipping Charges","Charges totales expédition" -"Total Tax","Taxe totale" -"Total Weight","Poids total" -"Total model should be extended from Mage_Sales_Model_Order_Total_Abstract.","Le modèle complet devrait étendu à partir de Mage_Ventes_Modèle_Commande_Total_Résumé." -"Track Order","Suivre la commande" -"Track all shipment(s)","Suivre toutes les commandes" -"Track all shipments","Suivre toutes les livraisons" -"Track this shipment","Suivre cette expédition" -"Track your order","Suivez votre commande" -"Tracking","Suivi" -"Tracking Number","Numéro de suivi" -"Tracking Number(s):","Numéro(s) de suivi :" -"Transaction ""%s"" was already processed.","La transaction ""%s"" a déjà été traitée." -"Transaction # %s | %s","Transaction # %s | %s" -"Transaction ID","ID de la transaction" -"Transaction ID must not be empty.","L'ID de la transaction ne doit pas être vide." -"Transaction ID: ""%s"".","ID de la Transaction : ""%s""." -"Transaction Type","Type de transaction" -"Transactions","Transactions" -"Trial ","Essai" -"Trial Payment","Paiement d'essai" -"Trial Period","Période d'essai" -"Trial period payment","Paiement de la version d'essai" -"Type","Type" -"Unassign","Modifier l'attribution" -"Unhold","Ne plus retenir" -"Unhold action is not available.","Impossible de libérer l'action." -"Unhold order","Annuler le contrôle de la commande." -"Unknown State","État inconnu" -"Unknown Status","Statut inconnu" -"Unsupported transaction type ""%s"".","Type de transaction inconnu ""%s""." -"Update Changes","Mettre à jour les changements" -"Update Items and Qty\'s","Mettre à jour les articles et quantités" -"Update Qty\'s","Mettre à jour la/les Qté(s)" -"Updated At","Mis à jour à" -"Updated:","Mis à jour :" -"Use Aggregated Data (beta)","Utiliser données agrégées (beta)" -"Use Order Status As Default","Utiliser l'état de la commande comme référence par défaut" -"Validate Each Address Separately in Multi-address Checkout","Valider chaque adresse séparément en utilisant le paiement multi-adresses." -"Value","Valeur" -"View","Vue" -"View All","Voir tout" -"View Another Order","Voir autre commande" -"View Order","Voir la commande" -"Visible on Frontend","Visible sur le Frontend" -"Void","Annuler" -"Void invoice","Annuler la facture" -"Voided authorization.","Autorisation annulée" -"Website","Site" -"Weight","Poids" -"Whether buyer can define the date when billing for the profile begins.","Si l'acheteur peut définir la date de début de facturation" -"Width","Largeur" -"Wishlist","Souhaits" -"Wrong billing agreement ID specified.","Mauvais identifiant des accords de facturation spécifié." -"Wrong quote item id to update configuration.","L'identification du produit sélectionné est incorrecte et la configuration ne peut pas être mise à jour." -"Wrong state: ""%s"".","État incorrect : ""%s""." -"Yes","oui" -"You can leave a box blank if you don\'t wish to add a gift message for whole order","Vous pouvez laisser une case vide si vous ne voulez pas ajouter un message de cadeau pour l'ensemble de la commande" -"You don\'t have permissions to manage this order because of one or more products are not permitted for your website.","Vous n'avez pas les permissions de gérer cette commande parce que un produit ou plus ne sont pas autorisés pour votre site web." -"You have placed no orders.","Vous n'avez pas de commande." -"You will be redirected to the payment system website.","Vous allez être redirigé vers le site de paiement en ligne." -"Your credit card will be charged for","Votre carte de crédit sera débitée pour" -"ZIP/Post Code","Code postal" -"Zip/Postal Code","Code postal" -"cm","cm" -"in","dans" -"kg","kg" -"lb","lb" -"the credit memo email is not sent","Le courriel de note de crédit n'a pas été envoyé" -"the credit memo email was sent","la note de crédit a été envoyée" -"the invoice email is not sent","l'e-mail de facture n'est pas envoyé" -"the invoice email was sent","l'e-mail de facture a été envoyé" -"the order confirmation email is not sent","l'e-mail de confirmation de commande n'est pas envoyé" -"the order confirmation email was sent","l'e-mail de confirmation de commande a été envoyé" -"the shipment email is not sent","Le courriel d'expédition n'a pas été envoyé" -"the shipment email was sent","l'e-mail d'expédition a été envoyé" diff --git a/app/locale/fr_FR/Mage_SalesRule.csv b/app/locale/fr_FR/Mage_SalesRule.csv deleted file mode 100644 index d09dc5ce1..000000000 --- a/app/locale/fr_FR/Mage_SalesRule.csv +++ /dev/null @@ -1,132 +0,0 @@ -"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","%d Règles de prix du panier basées sur l'attribut ""%s"" ont été désactivées." -"%s Coupon(s) have been generated","%s bon(s) ont été créés" -"Actions","Action" -"Active","Actif" -"Add New Rule","Ajouter nouvelle règle" -"Alphabetical","Alphabétique" -"Alphanumeric","Alphanumérique" -"An error occurred while generating coupons. Please review the log and try again.","Une erreur s'est produite lors de la création des bons. Veuillez examiner le registre et réessayer." -"Apply","Appliquer" -"Apply To","Appliquer à" -"Apply the rule only if the following conditions are met (leave blank for all products)","Appliquer la règle seulement si les conditions suivantes sont respectées (laisser en blanc pour tous les produits)" -"Apply the rule only to cart items matching the following conditions (leave blank for all items)","Appliquer la règle seulement aux articles du panier qui respectent les conditions suivantes (laisser en blanc pour tous les articles)" -"Apply the rule to cart items matching the following conditions","Appliquer la règle aux articles du panier respectant les conditions suivantes" -"Apply to Shipping Amount","Appliquer au montant de la livraison" -"Are you sure you want to delete the selected coupon(s)?","Êtes-vous sûrs de vouloir supprimer le(s) bon(s) sélectionné(s) ?" -"Auto","Automatique" -"Auto Generated Specific Coupon Codes","Codes de bon particuliers créés automatiquement" -"Buy X get Y free (discount amount is Y)","Achetez X et obtenez Y gratuitement (le montant de la remise est Y)" -"By Fixed value","par valeur fixe" -"By Percentage","par pourcentage" -"Can\'t acquire coupon.","ne peut pas obtenir le coupon" -"Cart Attribute","Attribut du panier" -"Catalog","Catalogue" -"Code Format","Format du code" -"Code Length","Longueur du code" -"Code Prefix","Préfixe du code" -"Code Suffix","Suffixe du code" -"Conditions","Conditions" -"Conditions combination","Couplage des conditions" -"Coupon","Coupon" -"Coupon Code","Code coupon" -"Coupon Qty","Quantité de bon" -"Coupon with the same code","Bon avec le même code" -"Coupons Information","Informations des bons" -"Created On","Créé le" -"Customer Groups","Groupes de clients" -"Dash Every X Characters","Supprimer tous les caractères X" -"Date Expire","Date d'expiration" -"Date Start","Date de début" -"Default Label","Emballage par défaut" -"Default Rule Label for All Store Views","Règle d'étiquetage par défaut pour toutes les vues du magasins" -"Description","Description" -"Discount Amount","Montant de la remise" -"Discount Qty Step (Buy X)","Remise Qté Etape (acheter X)" -"Edit Rule","Éditer la règle" -"Edit Rule '%s'","Éditer la règle '%s'" -"Excluding prefix, suffix and separators.","Exclure les préfixes, suffixes et séparateurs." -"FOUND","TROUVE" -"Fixed amount discount","Montant fixe de la remise" -"Fixed amount discount for whole cart","Montant fixe de la remise pour tout le panier" -"For matching items only","Pour les articles correspondant seulement" -"For shipment with matching items","Pour la livraison avec les articles correspondant" -"Free Shipping","Expédition gratuite" -"From Date","Depuis" -"General Information","Informations générales" -"Generate","Créer" -"ID","ID" -"If %s %s %s for a subselection of items in cart matching %s of these conditions:","Si %s %s %s pour une sous-sélection d'objets dans le panier correspondant à %s de ces conditions :" -"If an item is %s in the cart with %s of these conditions true:","Si un objet est %s dans le panier avec %s de ces conditions :" -"If empty no separation.","Pas de séparation si vide." -"If you select and save the rule you will be able to generate multiple coupon codes.","Si vous sélectionnez et sauvegardez la règle, vous aurez la possibilité de créer plusieurs codes de bon." -"Inactive","Inactif" -"Item totals are not set for rule.","Le total des objets n'est pas déterminé." -"Labels","Etiquettes" -"Manage Coupon Codes","Gérer les codes de bon" -"Maximum Qty Discount is Applied To","La remise qté maximale est appliquée à" -"NOT FOUND","NON TROUVE" -"NOT LOGGED IN","DÉCONNECTÉ" -"New Rule","Nouvelle règle" -"No","Non" -"No Coupon","Pas de coupon" -"Not valid data provided","Aucune donnée valide fournie" -"Number of Uses","Nombre d'utilisations" -"Numeric","Numérique" -"Payment Method","Méthode de paiement" -"Percent of product price discount","Pour cent de réduction des prix des produits" -"Period","Période" -"Price in cart","Prix dans le panier" -"Priority","Priorité" -"Product attribute combination","Combinaison d'attributs de produits" -"Products subselection","Sous-sélection de produits" -"Promotions","Promotions" -"Public In RSS Feed","Public dans le flux RSS" -"Quantity in cart","Quantité dans le panier" -"Row total in cart","Ligne total dans le panier" -"Rule Information","Information de règle" -"Rule Name","Nom de règle" -"Rule is not defined","La règle n'est pas définie" -"Sales Discount Amount","Montant des ventes discount" -"Sales Subtotal Amount","Montant du sous-total des ventes" -"Sales Total Amount","Montant total des ventes" -"Save and Continue Edit","Sauvegarder et continuer l'édition" -"Shipping Country","Méthode d'expédition" -"Shipping Method","Méthode d'expédition" -"Shipping Postcode","Code postal pour l'expédition" -"Shipping Region","Région d'expédition" -"Shipping State/Province","État/Région d'expédition" -"Shopping Cart Price Rule","Règle de prix du panier" -"Shopping Cart Price Rules","Règles de prix du panier" -"Special Price","Prix spécial" -"Specific Coupon","Coupon spécifique" -"Status","Statut" -"Stop Further Rules Processing","Ne pas aller plus loin dans le traitement des règles" -"Store View Specific Labels","Voir le magasin Labels spécifiques" -"Subtotal","Sous-total" -"Subtotal Amount","Montant du sous-total" -"The rule has been deleted.","La règle a été supprimée." -"The rule has been saved.","La règle a été sauvée." -"This rule no longer exists.","Cette règle n'existe plus." -"Times Used","Périodes utilisées" -"To Date","Date de fin" -"To Fixed Value","Une certaine valeur" -"To Percentage","Au pourcentage" -"Total","Total" -"Total Amount","Montant total" -"Total Items Quantity","Quantité d'articles totale" -"Total Weight","Poids total" -"Unable to create requested Coupon Qty. Please check settings and try again.","Impossible de générer la quantité de bons demandée. Veuillez vérifier les paramètres et réessayer." -"Unable to find a rule to delete.","Aucune règle à supprimer" -"Update prices using the following information","Mettre à jour les prix en utilisant les informations suivantes" -"Update product's %s %s: %s","Mettre à jour le %s %s du produit: %s" -"Update the Product","Mettre à jour le produit" -"Use Auto Generation","Utiliser la création automatique" -"Used","Utilisé" -"Uses per Coupon","Utilisations par coupon" -"Uses per Customer","Utilisations par client" -"Website","Site web" -"Websites","Sites Web" -"Wrong rule specified.","Une mauvaise règle a été spécifiée." -"Yes","oui" -"total amount","montant total" -"total quantity","quantité totale" diff --git a/app/locale/fr_FR/Mage_Sendfriend.csv b/app/locale/fr_FR/Mage_Sendfriend.csv deleted file mode 100644 index 4c7b2fd6e..000000000 --- a/app/locale/fr_FR/Mage_Sendfriend.csv +++ /dev/null @@ -1,38 +0,0 @@ -"Add Recipient","Ajouter destinataire" -"Allow for Guests","Autoriser pour invités" -"An invalid email address for recipient was entered.","Une adresse email invalide a été entrée dans le champ destinataire." -"At least one recipient must be specified.","Au moins un destinataire doit être entré." -"Back","Retour" -"Catalog Product Email to a Friend","Envoyer le catalogue de produits par email à un ami" -"Email Address","Adresse email" -"Email Address:","Adresse email :" -"Email Templates","Modèles d'emails" -"Email to a Friend","Envoyer à un ami par email" -"Email:","Email :" -"Enabled","Activé" -"Invalid Sender Information","Information de l'expéditeur invalide" -"Invalid sender email.","Email de l'expéditeur invalide." -"Limit Sending By","Limiter l'envoi par" -"Max Products Sent in 1 Hour","Maximum de produits envoyés en une heure" -"Max Recipients","Maximum de destinataires" -"Maximum %d email addresses allowed.","%d adresses email autorisées maximum." -"Message:","Message :" -"Name","Nom" -"Name:","Nom :" -"No more than %d emails can be sent at a time.","Pas plus de %d emails ne peuvent être envoyés en même temps." -"Please define a correct Cookie instance.","Veuillez définir un cookie correct." -"Please define a correct Product instance.","Veuillez définir un produit correct." -"Please define the correct Sender information.","Veuillez définir les informations correctes de l'expéditeur." -"Recipient:","Destinataire :" -"Remove Email","Supprimer l'email" -"Select Email Template","Sélectionner le modèle d'email" -"Send Email","Envoyer l'email" -"Send product to a friend","Envoyer le produit à un ami" -"Sender:","Expéditeur :" -"Some emails were not sent.","Certains emails n'ont pas été envoyés." -"The link to a friend was sent.","Le lien a été envoyé à un ami." -"The message cannot be empty.","Le message ne peut pas être vide." -"The messages cannot be sent more than %d times in an hour","Les messages ne peuvent pas être envoyés plus de %d fois en une heure." -"The sender name cannot be empty.","Le nom de l'expéditeur ne peut pas être vide." -"There were some problems with the data.","Il y avait quelques problèmes avec les données." -"You have exceeded limit of %d sends in an hour","Vous avez excédé la limite de %d envois en une heure" diff --git a/app/locale/fr_FR/Mage_Shipping.csv b/app/locale/fr_FR/Mage_Shipping.csv deleted file mode 100644 index 686c02f68..000000000 --- a/app/locale/fr_FR/Mage_Shipping.csv +++ /dev/null @@ -1,93 +0,0 @@ -" for more information or ","pour plus d'informations ou" -"# of Items (and above)","# d'articles (et au-dessus)" -"# of Items vs. Destination","# d'articles vs. destination" -"Allow Shipping to Multiple Addresses","Permettre l'envoi à plusieurs adresses" -"An error occurred while import table rates.","Une erreur est survenue lors de l'importation des taux du tableau." -"Calculate Handling Fee","Calculer les frais de gestion" -"Carrier:","Transporteur :" -"City","Ville" -"Close Window","Fermer la fenêtre" -"Condition","Condition" -"Country","Pays" -"Custom Value","Valeur en douane" -"Date","Date" -"Delivered on:","Livré le :" -"Delivered to:","Livré à :" -"Description","Description" -"Displayed Error Message","Message d'erreur affiché" -"Divide to equal weight (one request)","Diviser pour un poids égal (une demande)" -"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","Dupliquer ligne #%s (Pays""%s"", Région/Etat ""%s"", Code postal ""%s"" et Valeur ""%s"")." -"Enabled","Activé" -"Error:","Erreur :" -"Export","Exporter" -"File has not been imported. See the following list of errors: %s","Le fichier n'a pas été importé. Voir la liste d'erreurs suivantes: %s" -"Fixed","Fixé" -"Flat Rate","Tarif uniforme" -"Free Shipping","Expédition gratuite" -"Google Sitemap Section","Section plan de site Google" -"Handling Fee","Frais de gestion" -"Import","Importer" -"Include Virtual Products in Price Calculation","Inclure les produits virtuels dans le calcul du prix" -"Info:","Info :" -"Invalid %s ""%s"" in the Row #%s.","%s invalide ""%s"" dans la ligne #%s." -"Invalid Country ""%s"" in the Row #%s.","Pays non-valide ""%s"" dans la ligne #%s." -"Invalid Region/State ""%s"" in the Row #%s.","Région/Etat non-valide ""%s"" dans la ligne #%s." -"Invalid Shipping Price ""%s"" in the Row #%s.","Tarifs d'expédition non-valide ""%s"" dans la ligne #%s." -"Invalid Table Rate code for type %s: %s","Code de tableau des tarifs invalide pour le type %s : %s" -"Invalid Table Rate code type: %s","Type de code de tableau des tarifs invalide : %s" -"Invalid Table Rates File Format","Format de fichier du tableau des tarifs invalide" -"Invalid Table Rates format in the Row #%s","Format des tables de taux invalide à la ligne #%s" -"Local Time","Heure locale" -"Location","Emplacement" -"Maximum Qty Allowed for Shipping to Multiple Addresses","Quantité max. autorisée pour l'envoi à plusieurs adresses" -"Method Name","Nom de la méthode" -"Minimum Order Amount","Montant de commande minimal" -"N/A","non applicable" -"None","aucun" -"Options","Options" -"Order Subtotal (and above)","Sous-total de la commande (et au-dessus)" -"Origin","Origine" -"Per Order","Par commande" -"Per Package","Par paquet" -"Percent","pour cent" -"Price","Prix" -"Price vs. Destination","Prix par destination" -"Region/State","Région/État" -"Service Type:","Type de service" -"Ship to Applicable Countries","Envoyer aux pays en vigueur" -"Ship to Specific Countries","Envoyer à des pays spécifiques" -"Shipment #","N° d'envoi" -"Shipment Tracking Popup","Fenêtre de suivi d'envoi" -"Shipped or billed on:","Envoyé ou facturé à:" -"Shipping Methods","Méthode d'envoi" -"Shipping Methods Section","Section de méthode d'envoi" -"Shipping Settings","Réglages d'envoi" -"Shipping Settings Section","Section de réglages d'envoi" -"Show Method if Not Applicable","Afficher la méthode si non disponible" -"Signed by:","Signé par:" -"Sort Order","Trier les widgets" -"Status:","Statut" -"Store Pickup","Récupérer en magasin" -"Street Address","Adresse de la rue" -"Street Address Line 2","Adresse municipale ligne 2" -"Table Rates","Taux" -"The shipping module is not available for selected delivery country.","Le module d'envoi n'est pas disponible pour le pays de livraison sélectionné." -"The shipping module is not available.","Le module d'envoi n'est pas disponible." -"There is no tracking available for this shipment.","Il n'y pas de service de suivi pour cet envoi." -"There is no tracking available.","Il n'y a pas de service de suivi." -"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","La méthode d'envoi est actuellement indisponible. Si vous voulez envoyer par cette méthode, merci de nous contacter." -"This shipping method is not available, please specify ZIP-code","Cette méthode d'envoi n'est pas disponible, précisez un code postal." -"Title","Titre" -"Track:","Suivi:" -"Tracking Information","Information de suivi" -"Tracking Number:","Numéro de suivi" -"Tracking information is currently not available. Please ","Informations de suivi actuellement indisponibles" -"Tracking information is currently unavailable.","Informations de suivi actuellement indisponibles" -"Type","Type" -"Use origin weight (few requests)","Utiliser le poids d'origine (quelques requêtes)" -"Weight (and above)","Poids (et plus)" -"Weight vs. Destination","Poids par destination" -"Weight:","Poids" -"ZIP/Postal Code","Code postal" -"contact us","Nous contacter" -"email us at ","Envoyer nous un email à" diff --git a/app/locale/fr_FR/Mage_Sitemap.csv b/app/locale/fr_FR/Mage_Sitemap.csv deleted file mode 100644 index 1eda5ffca..000000000 --- a/app/locale/fr_FR/Mage_Sitemap.csv +++ /dev/null @@ -1,46 +0,0 @@ -"Action","Action" -"Add Sitemap","Ajouter une sitemap" -"Always","Toujours" -"CMS Pages Options","Options des pages SGC" -"Categories Options","Options des catégories" -"Daily","Tous les jours" -"Edit Sitemap","Éditer la sitemap" -"Enabled","Activé" -"Error Email Recipient","Erreur dans le destinataire du mail" -"Error Email Sender","Erreur dans l'expéditeur du mail" -"Error Email Template","Erreur dans le modèle du mail" -"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","Le fichier ""%s"" n'a pas pu être enregistré. Assurez-vous que le répertoire ""%s"" est accessible en écriture pour le serveur web." -"Filename","Nom de fichier" -"Frequency","Fréquence" -"Generate","Générer" -"Generation Settings","Réglages de génération" -"Google Sitemap","Google Sitemap" -"Hourly","Toutes les heures" -"ID","ID" -"Last Time Generated","Généré pour la dernière fois" -"Link for Google","Lien pour Google" -"Monthly","Tous les mois" -"Never","Jamais" -"New Sitemap","Nouvelle sitemap" -"Path","Chemin" -"Please create the specified folder ""%s"" before saving the sitemap.","Veuillez créer le dossier spécifié ""%s"" avant d'enregistrer le plan du site." -"Please define correct path","Définissez un chemin correct" -"Please make sure that ""%s"" is writable by web-server.","Veuillez vous assurer que ""%s"" est accessible en écriture par le serveur web." -"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","N'utilisez que des lettres (a-z ou A-Z), des nombres (0-9) ou un blanc souligné (_) dans le nom du fichier. Aucune espace ou autre caractère ne sont autorisés." -"Priority","Priorité" -"Products Options","Options de produit" -"Sitemap","Sitemap" -"Sitemap generate Warnings","Avertissements de génération de sitemap" -"Start Time","Heure de début" -"Store View","Vue du magasin" -"The priority must be between 0 and 1.","La priorité est comprise entre 0 et 1" -"The sitemap ""%s"" has been generated.","Le plan du site ""%s"" a été généré." -"The sitemap has been deleted.","La sitemap a été supprimée." -"The sitemap has been saved.","La sitemap a été sauvegardée." -"This sitemap no longer exists.","La sitemap n'existe plus." -"Unable to find a sitemap to delete.","Impossible de trouver une sitemap à supprimer." -"Unable to find a sitemap to generate.","Impossible de trouver une sitemap à générer." -"Unable to generate the sitemap.","Impossible de générer une sitemap." -"Valid values range: from 0.0 to 1.0.","Intervalles de valeurs valides: de 0.0 à 1.0" -"Weekly","Toutes les semaines" -"Yearly","Tous les ans" diff --git a/app/locale/fr_FR/Mage_Tag.csv b/app/locale/fr_FR/Mage_Tag.csv deleted file mode 100644 index 12fcf5253..000000000 --- a/app/locale/fr_FR/Mage_Tag.csv +++ /dev/null @@ -1,101 +0,0 @@ -"# of Uses","# d'utilisations" -"%s tag(s) have been accepted for moderation.","%s tags ont été acceptés pour la modération." -"Tag Name: %s","Nom du tag : %s" -"Action","Action" -"Add","Ajouter" -"Add New Tag","Ajouter un nouveau tag" -"Add Tags","Ajouter des tags" -"Add Your Tags:","Ajouter vos tags :" -"Add tag(s) to product","Ajouter étiquette(s) au produit" -"Add to Cart","Ajouter au panier" -"Add to Wishlist","Ajouter à la liste de cadeaux" -"All Tags","Tous les tags" -"Approved","Approuvé" -"Are you sure you want to delete this tag?","Voulez-vous vraiment supprimer ce tag ?" -"Are you sure you want to do this?","Êtes-vous sûrs de vouloir faire celà?" -"Are you sure?","Etes-vous sûr ?" -"Back","Retour" -"Back to Tags List","Retour à la liste des tags" -"Base Popularity","Popularité de base" -"Block Information","Bloquer l'information" -"CSV","CSV (valeurs séparées par des virgules)" -"Catalog Product View","Vue des produits par catalogue" -"Change status","Changer le satut" -"Click on a tag to view your corresponding products.","Cliquez sur un tag pour voir les produits correspondants." -"Country","Pays" -"Customer My Account My Tags List","Client Mon compte Ma liste de tags" -"Customer My Account Tag View","Client Mon compte Voir tag" -"Customer Since","Client depuis" -"Customers","Clients" -"Customers Submitted this Tag","Clients ayant proposé ce tag" -"Customers Tagged '%s'","Clients tagués '%s'" -"Delete","Supprimer" -"Delete Tag","Supprimer le tag" -"Disabled","Désactivé" -"Edit Tag '%s'","Modifier le tag '%s'" -"Email","Email" -"First Name","Prénom" -"General Information","Informations générales" -"Grid","Grille" -"ID","ID" -"Info","Détails" -"Last Name","Nom" -"List","Liste" -"Manage Tags","Gérer les tags" -"My Recent Tags","Mes tags récents" -"My Tags","Mes tags" -"Name","Nom" -"New Tag","Nouveau tag" -"No matches found.","Aucun résultat trouvé." -"Other people marked this product with these tags:","D'autres personnes ont tagué ce produit avec :" -"Pending","En cours" -"Pending Tags","Tags en attente" -"Popular","Populaire" -"Popular Tags","Tags populaires" -"Price","Prix" -"Product Name","Nom produit" -"Product SKU","Produit UGS" -"Product Tag API","Étiquette API du produit" -"Product Tags","Étiquettes des produits" -"Products","Produits" -"Products Tagged by Administrators","Produits étiquetés par les administrateurs" -"Products Tagged by Customers","Produits étiquetés par les clients" -"Products Tagged with '%s'","Produits étiquetés avec '%s'" -"Products tagged with '%s'","Produits taggués avec ""%s""" -"Rebuild Tag aggregation data","Reconstruire les données d'agrégation des étiquettes" -"Remove","Supprimer" -"Remove product tag","Retirer l'étiquette du produit" -"Retrieve list of tags by product","Retirer la liste d'étiquettes par produit" -"Retrieve product tag info","Retirer les détails de l'étiquette du produit" -"SKU","UGS" -"Save Tag","Enregistrer l'étiquette" -"Save and Continue Edit","Sauvegarder et continuer l'édition" -"Status","Statut" -"Store View","Vue du magasin" -"Tag","Étiquette" -"Tag ""%s"" has already been added to the product.","Le tag ""%s"" a déjà été ajouté au produit." -"Tag ""%s"" has been added to the product.","Le tag ""%"" a été ajouté au produit." -"Tag ""%s"" has been rejected by administrator.","Le tag ""%s"" a été rejeté par l'administrateur." -"Tag Aggregation Data","Données d'agrégation des étiquettes" -"Tag Name","Nom de l'étiquette" -"Tagged Products List","Liste de produits étiquetés" -"Tags","Étiquettes" -"Tags List (All Available)","Liste d'étiquettes (toutes disponibles)" -"Tags List Before","Tag liste avant" -"Tags:","Étiquettes:" -"Telephone","Téléphone" -"The tag has been deleted.","L'étiquette a été supprimée" -"There are no tags available.","Il n'y a pas d'étiquettes disponibles" -"Unable to find any products tagged with '%s' in the current store","Impossible de trouver un produit avec l'étiquette '%s' dans le magasin courant" -"Unable to remove tag. Please, try again later.","Impossible de retirer l'étiquette. Essayez plus tard." -"Unable to save tag(s).","Impossible d'enlever les étiquettes" -"Update","Mettre à jour" -"Update product tag","Mettre à jour l'étiquette du produit" -"Use spaces to separate tags. Use single quotes (') for phrases.","Utiliser des espaces pour séparer les étiquettes. Utilisez des apostrophes pour les phrases." -"View All Tags","Voir toutes les étiquettes." -"View Customers","Voir les clients" -"View Products","Voir les produits" -"XML","XML" -"You have not tagged any products yet.","Vous n'avez étiqueté aucun produit" -"ZIP/Post Code","Code postal" -"[STORE VIEW]","[APERÇU DU MAGASIN]" diff --git a/app/locale/fr_FR/Mage_Tax.csv b/app/locale/fr_FR/Mage_Tax.csv deleted file mode 100644 index 41afedbe6..000000000 --- a/app/locale/fr_FR/Mage_Tax.csv +++ /dev/null @@ -1,163 +0,0 @@ -"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - correspond à n'importe quoi; 'xyz*' correspond à n'importe quoi qui commence par 'xyz' et qui n'est pas plus long que %d." -"-- Please Select --","-- Veuillez sélectionner --" -"Add New Class","Ajouter une nouvelle classe" -"Add New Tax Rate","Ajouter un nouveau taux de change" -"Add New Tax Rule","Ajouter une nouvelle règle de taxe" -"After Discount","Après réduction" -"An error occurred while deleting this rate.","Une erreur est survenue à la suppression de ce taux." -"An error occurred while deleting this rate. Incorrect rate ID.","Une erreur est survenue à la suppression de ce taux. ID de taux incorrecte." -"An error occurred while deleting this tax class.","Une erreur est survenue à la suppression de cette classe de taxe." -"An error occurred while deleting this tax rule.","Une erreur est survenue à la suppression de cette règle de taxe." -"An error occurred while saving this tax class.","Une erreur est survenue à la sauvegarde de cette classe de taux." -"An error occurred while saving this tax class. A class with the same name","Une erreur est survenue lors de l'enregistrement de cette classe de taxes. Une classe avec le même nom" -"Apply Customer Tax","Appliquer la taxe client." -"Apply Discount On Prices","Appliquer la réduction aux prix" -"Apply Tax On","Appliquer la taxe" -"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Appliquer la réduction dont la taxe calculée sur la taxe du store, si ""Appliquer la taxe après la réduction"" est sélectionné." -"Are you sure you want to do this?","Êtes-vous sûrs de vouloir faire celà?" -"Back","Retour" -"Before Discount","Avant réduction" -"CSV","CSV (valeurs séparées par des virgules)" -"Calculate off subtotal only","Calculer hors du sous-total seulement" -"Calculation Settings","Réglages de calcul" -"Catalog Prices","Prix du catalogue" -"Class Name","Nom de la classe" -"Click here to go to Tax configuration and change your settings.","Cliquer ici pour aller dans Configuration des taxes et modifier vos paramètres." -"Code","Code" -"Country","Pays" -"Custom price if available","Prix client si disponible" -"Customer Tax Class","Classe de tax client" -"Customer Tax Class Information","Information sur la classe de taxe client" -"Customer Tax Classes","Classes de taxe client" -"Default Country","Pays par défaut" -"Default Post Code","Code postal par défaut" -"Default State","État par défaut" -"Default Tax Destination Calculation","Calcul de destination de la taxe par défaut" -"Delete Class","Supprimer la classe" -"Delete Rate","Supprimer le taux" -"Delete Rule","Supprimer la règle" -"Display Full Tax Summary","Afficher le résumé des taxes." -"Display Prices","Afficher les prix." -"Display Product Prices In Catalog","Afficher les prix des produits en catalogue" -"Display Shipping Amount","Afficher le montant de l'envoi" -"Display Shipping Prices","Afficher les prix d'envoi" -"Display Subtotal","Afficher le sous-total" -"Display Zero Tax Subtotal","Afficher le sous-total HT" -"Edit Class","Éditer la classe" -"Edit Class '%s'","Éditer la classe '%s'" -"Edit Rule","Éditer la règle" -"Edit Tax Rate","Éditer le taux de la taxe" -"Enable Cross Border Trade","Activer commerce transfrontalier" -"Excel XML","Excel XML" -"Excl. Tax","Taxe non comprise" -"Excl. Tax:","H.T." -"Excluding Tax","Hors Taxes" -"Export Tax Rates","Taux de taxe d'exportation" -"Grand Total (Excl. Tax)","Total général (H.T.)" -"Grand Total (Excl.Tax)","Total général (H.T.)" -"Grand Total (Incl. Tax)","Total général (T.T.C.)" -"Grand Total (Incl.Tax)","Total général (T.T.C.)" -"Grand Total Excl. Tax","Total général H.T." -"Grand Total Incl. Tax","Total général T.T.C." -"Ignore this notification","Ignorer cette notification" -"Import / Export Tax Rates","Taux de taxe d'importation / d'exportation" -"Import Tax Rates","Taux de taxe d'importation" -"Inc. Tax","T.T.C." -"Incl. Tax","Taxe comprise" -"Incl. Tax:","T.T.C." -"Include Tax In Grand Total","Taxes comprises dans le total général" -"Including Tax","Toutes Taxes Comprises" -"Including and Excluding Tax","Toutes Taxes Comprises et Hors Taxes" -"Invalid file format upload attempt","Tentative de téléchargement de fichier au format invalide" -"Invalid file upload attempt","Tentative de téléchargement de fichier invalide" -"Manage Customer Tax Classes","Gérer les catégories de taxes sur les clients" -"Manage Product Tax Classes","Gérer les catégories de taxes sur les produits" -"Manage Tax Rates","Gérer les taux d'imposition" -"Manage Tax Rules","Gérer les règles d'imposition" -"Manage Tax Zones & Rates","Gérer les taux d'imposition par zone" -"Maximum zip code length is 9.","La longueur maximale du code postal est 9." -"Name","Nom" -"New Class","Nouvelle catégorie" -"New Rule","Nouvelle règle" -"New Tax Rate","Nouveau taux d'imposition" -"No","Non" -"None","aucun" -"One of the country has invalid code.","Un des pays a un code invalide" -"Orders, Invoices, Credit Memos Display Settings","Commandes, Factures, Paramètres d'affichage des mémos crédit" -"Original price only","Prix d'origine seulement" -"Please fill all required fields with valid information.","Veuillez remplir tous les champs nécessaires avec des informations valides." -"Please see source for more details.","Veuillez voir la source pour plus de détails." -"Price Display Settings","Paramètres d'Affichage des Prix" -"Priority","Priorité" -"Product Tax Class","Classe de taxe de produit" -"Product Tax Class Information","Information sur la catégorie de taxe sur les produits" -"Product Tax Classes","Catégories de taxes sur les produits" -"Range From","Trier à partir de" -"Range To","Trier jusqu'à" -"Range To should be equal or greater than Range From.","Fourchette à doit être plus grande ou égale à Fourchette de." -"Rate","Taux" -"Rate Percent","Taux Pourcentage" -"Rate Percent should be a positive number.","Le pourcentage du taux doit être un nombre positif." -"Reset","Réinitialiser" -"Row Total","Total de la Ligne" -"Sales","Ventes" -"Save Class","Enregistrer la Catégorie" -"Save Rate","Enregistrer le Taux" -"Save Rule","Enregistrer la règle" -"Save and Continue Edit","Sauvegarder et continuer l'édition" -"Shipping & Handling (Excl.Tax)","Expédition et traitement (HT)" -"Shipping & Handling (Incl.Tax)","Expédition et traitement (TTC)" -"Shipping & Handling Tax","Expédition & Frais de traitement" -"Shipping (Excl. Tax)","Expédition (HT)" -"Shipping (Incl. Tax)","Expédition (TTC)" -"Shipping Excl. Tax (%s)","Expédition HT (%s)" -"Shipping Incl. Tax (%s)","Expédition TTC (%s)" -"Shipping Prices","Frais d'envoi" -"Shopping Cart Display Settings","Paramètres d'affichage du panier" -"Sort Order","Trier les widgets" -"State","État" -"State/Region","État/Région" -"Subtotal (Excl. Tax)","Sous-total (HT)" -"Subtotal (Excl.Tax)","Sous-total (HT)" -"Subtotal (Incl. Tax)","Sous-total (TTC)" -"Subtotal (Incl.Tax)","Sous-total (TTC)" -"Subtotal only","Sous-total uniquement" -"Tax","Taxe" -"Tax Calculation Based On","Calcul des taxes basé sur" -"Tax Calculation Method Based On","Méthode de calcul des taxes basée sur" -"Tax Class for Shipping","Catégorie de taxe pour l'envoi" -"Tax Classes","Catégorie de taxe" -"Tax Identifier","Tax Identifier" -"Tax Rate","Taux d'imposition" -"Tax Rate Information","Information sur le taux d'imposition" -"Tax Rule Information","Information sur les règles des taxes" -"Tax Rules","Règles des taxes" -"Tax Section","Section des taxes" -"Tax Titles","Titre des taxes" -"Tax rate cannot be removed. It exists in tax rule","Le taux de frais ne peut être supprimé. Il existe dans les règles" -"Tax rates at the same priority are added, others are compounded.","Les taux d'imposition de la même priorité sont ajoutés, les autres sont combinés." -"The tax class has been deleted.","La catégorie de taxe a été supprimée." -"The tax class has been saved.","La catégorie de taxe a été sauvegardée." -"The tax rate has been deleted.","Le taux d'imposition a été supprimé." -"The tax rate has been imported.","Le taux d'imposition a été importé." -"The tax rate has been saved.","Le taux d'imposition a été sauvegardé." -"The tax rule has been deleted.","La règle de taxe a été supprimée." -"This class no longer exists","Cette catégorie n'existe plus." -"This rule no longer exists","Cette règle n'existe plus" -"This rule no longer exists.","Cette règle n'existe plus." -"Total","Total" -"Unit Price","Prix unitaire" -"Warning tax configuration can result in rounding errors","Avertissement, la configuration de taxe peut provoquer l'arrondissement d'erreurs" -"Warning tax configuration can result in unexpected FPT prices on applicable devices","Avertissement, la configuration de taxe peut provoquer des prix FTP inattendus sur les appareils applicables" -"Warning tax discount configuration might result in different discounts than a customer might expect","Avertissement, la configuration de remises de taxes peut provoquer des remises différentes de ce qu'attend le client" -"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","Lorsque le prix catalogue inclut les taxes, l'activation de ce paramètre établira le prix quel que soit le taux de taxe du client." -"Whether catalog prices entered by admin include tax.","Si les prix du catalogue ajoutés par l'admin comprennent les taxes." -"Whether shipping amounts entered by admin or obtained from gateways include tax.","Si les montants d'expédition ajoutés par l'admin ou obtenus par les passerelles comprennent les taxes." -"Yes","oui" -"You cannot delete this tax class as it is used for %d customer groups.","Vous ne pouvez pas supprimer cette catégorie de taxe car elle est utilisée par %d groupes de clients." -"You cannot delete this tax class as it is used for %d products.","Vous ne pouvez pas supprimer cette catégorie de taxe car elle est utilisée par %d produits." -"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","Vous ne pouvez pas supprimer cette taxe car elle est utilisée par une ou plusieurs règle(s). Vous devez d'abord supprimer la ou les règle(s) dans la(les)quelle(s) elle figure." -"Zip code should not contain characters other than digits.","Le code postal ne doit pas contenir des caractères autres que des chiffres." -"Zip/Post Code","Code postal" -"Zip/Post is Range","Le code postal est étendu" -"for store(s)","pour boutique(s)" diff --git a/app/locale/fr_FR/Mage_Usa.csv b/app/locale/fr_FR/Mage_Usa.csv deleted file mode 100644 index 3665582b8..000000000 --- a/app/locale/fr_FR/Mage_Usa.csv +++ /dev/null @@ -1,381 +0,0 @@ -" was not delivered nor scanned","n'a été ni livré, ni scanné" -"""Per Order"" allows single handling fee for entire order. ""Per Package"" allows individual handling fee for each package.","""Par commande"" permet des frais uniques pour une commande entière. ""Par colis"" permet une gestion individuelle de chaque colis." -"1 Day Freight","Fret une journée" -"2 Day","2 jours" -"2 Day AM","2 jours, le matin" -"2 Day Freight","Fret deux jours" -"2Day","2 jours" -"2nd Day Air","2nd Day Air" -"2nd Day Air AM","2nd Day Air AM" -"2nd Day Air AM Letter","2nd Day Air AM Letter" -"2nd Day Air Letter","2nd Day Air Letter" -"3 Day Freight","Fret 3 jours" -"3 Day Select","3 Day Select" -"Access ID","Identifiant d'accès" -"Access License Number","Numéro de la licence d'accès" -"Account ID","Identifiant du compte" -"Account Number","Numéro de compte" -"Additional Protection Configuration Value","Valeur de la protection supplémentaire" -"Additional Protection Enabled","Protection supplémentaire activée" -"Additional Protection Min Subtotal","Sous-total de la protection supplémentaire" -"Additional Protection Value","Valeur de la protection supplémentaire" -"Additional Protection Value Rounding Method","Méthode d'arrondi de la valeur de la protection supplémentaire" -"Adult","Adulte" -"Adult Signature Required","Signature d'un adulte requise" -"Allowed Methods","Méthodes autorisées" -"Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges.","Permet de séparer le poids total de la commande en plusieurs parties s'il dépasse %s %s afin d'assurer un calcul précis des frais d'expédition." -"Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","Permet de séparer le poids total de la commande en plusieurs parties s'il dépasse 70 kg afin d'assurer un calcul précis des frais d'expédition." -"Bound Printed Matter","Lier l'imprimé" -"Break bulk economy","Tarif économique vrac" -"Break bulk express","Break bulk express" -"Business Service Center","Centre de service aux entreprises" -"Calculate Handling Fee","Calculer les frais de gestion" -"Canada Standard","Canada Standard" -"Cannot identify measure unit for %s","Ne peut pas identifier l'unité pour %s" -"Cannot identify weight unit for %s","Impossible d'identifier l'unité de poids pour %s" -"Cannot retrieve shipping rates","Ne peut pas récupérer les frais d'expédition" -"Centimeters","Centimètres" -"Commercial","Commercial" -"Configuration","Configuration" -"Container","Conteneur" -"Content Type","Type de contenu" -"Customer Packaging","Conditionnement de l'utilisateur" -"Customer Supplied Package","Colis fourni par le client" -"Customer services","Service client" -"DHL","DHL" -"DHL (Deprecated)","DHL (obsolète)" -"DHL service is not available at %s date","DHL service is not available at %s date" -"Debug","Déboguer" -"Default Package Height","Hauteur du colis par défaut" -"Default Package Length","Longueur du colis par défaut" -"Default Package Width","Largeur du colis par défaut" -"Delivered","Livré" -"Delivery Confirmation","Confirmation de livraison" -"Depth","Profondeur" -"Destination Type","Type de destination" -"Destination facility code is empty","Le code de centre de destination est vide" -"Development","Développement" -"Direct","Direct" -"Displayed Error Message","Message d'erreur affiché" -"Divide Order Weight","Poids de commande fractionnelle" -"Documents","Documents" -"Domestic Shipment Days","Jours de livraison" -"Domestic economy select","Domestic economy select" -"Domestic express","Domestic express" -"Drop Box","Boîte de dépôt" -"Dropoff","Déposer" -"Easy shop","Easy shop" -"Economy select","Economy select" -"Empty response","Réponse vide" -"Enable Negotiated Rates","Permettre les tarifs négociés" -"Enabled for Checkout","Activé pour le paiement" -"Enables/Disables SSL verification of Magento server by UPS.","Activer/Désactiver la vérification des serveurs de Magento par UPS." -"Error #%s : %s","Erreur n° %s : %s" -"Error #%s : %s (%s)","Erreur #%s : %s (%s)" -"Error #%s: %s","Erreur #%s: %s" -"Europack","Europack" -"Europe First Priority","Europe First Priority" -"Exchange rate %s (Base Currency) -> %s not found. DHL method %s skipped","Impossible de trouver taux de change %s (devise de base) -> %s. Omission de la méthode DHL %s" -"Express","Express" -"Express 10:30","Express 10:30" -"Express 10:30 AM","Express 10:30 AM" -"Express 12:00","Express 12:00" -"Express 9:00","Express 9:00" -"Express Mail","Express Mail" -"Express Saturday","Express Saturday" -"Express Saver","Express Saver" -"Express easy","Express easy" -"Express envelope","Express envelope" -"Express worldwide","Express worldwide" -"Failed to parse xml document: %s","Échec de l'analyse du document xlm %s" -"FedEx","FedEx" -"FedEx 10kg Box","FedEx 10kg Box" -"FedEx 25kg Box","FedEx 25kg Box" -"FedEx Box","FedEx Box" -"FedEx Envelope","FedEx Envelope" -"FedEx Pak","FedEx Pak" -"FedEx Tube","FedEx Tube" -"First Overnight","First Overnight" -"First-Class","First-Class" -"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope" -"First-Class Mail International Letter","First-Class Mail International Letter" -"First-Class Mail International Postcard","First-Class Mail International Postcard" -"First-Class Mail Large Envelope","First-Class Mail Large Envelope" -"First-Class Mail Large Postcards","First-Class Mail Large Postcards" -"First-Class Mail Letter","First-Class Mail Letter" -"First-Class Mail Parcel","First-Class Mail Parcel" -"First-Class Mail Postcards","First-Class Mail Postcards" -"First-Class Package International Service","First-Class Package International Service" -"First-Class Package Service","First-Class Package Service" -"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup" -"Flat","Flat" -"Flat-Rate Box","Flat-Rate Box" -"Flat-Rate Envelope","Flat-Rate Envelope" -"Free Method","Méthode gratuite" -"Free Shipping with Minimum Order Amount","Expédition gratuite avec montant minimum de la commande" -"Freight","Fret" -"Freight worldwide","Fret international" -"Gateway URL","URL de la passerelle" -"Gateway XML URL","URL XML de la passerelle" -"Gift","Cadeau" -"Girth","circonférence" -"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)" -"Global Express Guaranteed Document","Global Express Guaranteed Document" -"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular" -"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular" -"Globalmail business","Globalmail business" -"Ground","Sol" -"Ground Commercial","Sol commercial" -"Ground Residential","Sol résidentiel" -"Handling Applied","Gestion appliquée" -"Handling Fee","Frais de gestion" -"Height","Hauteur" -"Height, width and length should be equal or greater than %s","La hauteur, la largeur et la longueur doivent être supérieures ou égales à %s" -"Home Delivery","Livraison à la maison" -"Hub ID","Identification hub" -"Inches","Pouces" -"Indirect","Indirect" -"International Economy","International Economy" -"International Express","International Express" -"International First","International First" -"International Ground","Terres internationales" -"International Priority","International Priority" -"International Shipment Days","International Shipment Days" -"Intl Economy Freight","Intl Economy Freight" -"Intl Priority Freight","Intl Priority Freight" -"Jetline","Jetline" -"Jumbo box","Jumbo box" -"Key","Clé" -"Kilograms","Kilogrammes" -"Large","Large" -"Large Express Box","Large Express Box" -"Length","Longueur" -"Letter","Lettre" -"Library","Bibliothèque" -"Library Mail","Library Mail" -"Live","En direct" -"Machinable","Usinable" -"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Poids maximum du colis (veuillez consulter votre transporteur pour le poids maximum supporté)" -"Media Mail","Media Mail" -"Medical express","Medical express" -"Medium Express Box","Medium Express Box" -"Merchandise","Marchandise" -"Meter Number","Numéro de mètre" -"Minimum Order Amount for Free Shipping","Montant minimum de la commande pour expédition gratuite" -"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","Poids minimum du colis (veuillez consulter votre transporteur pour le poids minimum supporté)" -"Mode","Mode" -"National Freight","Fret nationale" -"Next Afternoon","Next Afternoon" -"Next Day Air","Next Day Air" -"Next Day Air Early AM","Next Day Air Early AM" -"Next Day Air Early AM Letter","Next Day Air Early AM Letter" -"Next Day Air Intra (Puerto Rico)","Next Day Air Intra (Puerto Rico)" -"Next Day Air Letter","Next Day Air Letter" -"Next Day Air Saver","Next Day Air Saver" -"Next Day Air Saver Letter","Next Day Air Saver Letter" -"No","Non" -"No packages for request","Pas de colis par requête" -"Non Documents","Non-documents" -"Non documents","Non-documents" -"Non-rectangular","Non rectangulaire" -"None","Aucun" -"Not Required","Non requis" -"Order","Commande" -"Order #%s","Commande n°%s" -"Origin of the Shipment","Origine de l'expédition" -"Origin serviceAreaCode is missing","Code d'aire de service d'origine manquant" -"Other","Autre" -"Others","Autres" -"PAK","PAK" -"Package","Colis" -"Package Description","Description du colis" -"Package content is missing","Le contenu du colis est manquant" -"Packages Request Type","Type de demande de colis" -"Packaging","Conditionnement" -"Pallet","Pallet" -"Parcel","Colis" -"Parcel Post","Parcel Post" -"Password","Mot de passe" -"Pickup Method","Méthode de ramassage" -"Piece Id barcode is missing","Identifiant code-barre de l'unité manquant" -"Piece number information is missing","Informations sur le numéro de l'unité manquantes" -"Please make sure to use only digits here. No dashes are allowed.","Veuillez n'utiliser que des chiffres dans ce champ. Les tirets ne sont pas autorisés." -"Please, specify origin country","Veuillez spécifier le pays d'origine" -"Pounds","Livres" -"Priority Mail","Priority Mail" -"Priority Mail Express","Priority Mail Express" -"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes" -"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup" -"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope" -"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup" -"Priority Mail Express International","Priority Mail Express International" -"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes" -"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope" -"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope" -"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope" -"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope" -"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope" -"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery" -"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes" -"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope" -"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope" -"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope" -"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope" -"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup" -"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope" -"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup" -"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup" -"Priority Mail International","Priority Mail International" -"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box" -"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope" -"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope" -"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box" -"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box" -"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope" -"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box" -"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope" -"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box" -"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope" -"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope" -"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box" -"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup" -"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope" -"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup" -"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box" -"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup" -"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope" -"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup" -"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A" -"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup" -"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B" -"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup" -"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C" -"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup" -"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box" -"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup" -"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope" -"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup" -"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope" -"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup" -"Priority Overnight","Priority Overnight" -"Product content code is invalid","Code de contenu du produit incorrect" -"Product name is missing","Nom du produit manquant" -"Receiver","Destinataire" -"Rectangular","Rectangulaire" -"Reference code is missing","Le code de référence est manquant" -"Regular","Ordinaire" -"Regular Pickup","Ramasse ordinaire" -"Request Courier","Demander un courrier" -"Required","Requis" -"Required for negotiated rates; 6-character UPS.","Requis pour les taux négociés, UPS 6 caractères." -"Residential","Résidentiel" -"Residential Delivery","Livraison résidentielle" -"Response is in the wrong format","Réponse dans le mauvais format" -"Return","Retour" -"Round","Rond" -"Routing barcode is missing","Code-barre de routage manquant" -"Same day","Même jour" -"Sample","Échantillon" -"Sandbox Mode","Mode Sandbox" -"Second Day Service","Second Day Service" -"Secure Gateway URL","URL paserelle sécurisée" -"Secureline","Secureline" -"Sender","Expéditeur" -"Sender city info is missing","La ville de l'expéditeur est manquante" -"Sender contact name is missing","Le nom de l'expéditeur est manquant" -"Sender country info is missing","Le pays de l'expéditeur est manquant" -"Service type does not match","Le type de service ne correspond pas" -"Ship to Applicable Countries","Envoyer aux pays en vigueur" -"Ship to Specific Countries","Envoyer à des pays spécifiques" -"Shipment Contains Hazardous Materials","Le colis contient des matières dangereuses" -"Shipment Dutiable","Colis taxable" -"Shipment Duty Payment Type","Type de paiement des taxes sur le colis" -"Shipment Type","Type d'expédition" -"Shipment is not available.","Expédition non disponible." -"Shipment picked up","Colis récupéré." -"Shipper Number","Numéro de l'expéditeur" -"Shipping Accept XML URL","Shipping Accept XML URL" -"Shipping Confirm XML URL","Shipping Confirm XML URL" -"Shipping Key","Clé de l'envoi" -"Shipping Key (International)","Clé de l'envoi (international)" -"Show Method if Not Applicable","Afficher la méthode si non disponible" -"Signature Required","Signature requise" -"Size","Taille" -"Small Express Box","Petit colis express" -"Smart Post","Poste intelligente" -"Sort Order","Trier les widgets" -"Specific","Spécifique" -"Sprintline","Sprintline" -"Standard Overnight","Standard nuit" -"Standard Post","Standard Post" -"Station","Gare" -"Subtotal","Sous-total" -"Subtotal With Discount","Sous-total avec réduction" -"The field is applicable if the Smart Post method is selected.","Le champ est applicable si la méthode Smart Post est sélectionnée." -"The response is in wrong format.","La réponse est au mauvais format" -"There is no available method for selected shipping address.","Il n'y a pas de méthode disponible pour l'adresse d'expédition sélectionnée." -"There is no items in this order","Il n'y a pas d'objets dans cette commande" -"Third Party","Tierce partie" -"Title","Titre" -"To Lower","Vers plus petit" -"To Upper","Vers plus haut" -"Tracking XML URL","URL vers le XML de tracking" -"UPS","UPS" -"UPS Expedited","Expédié par UPS" -"UPS Express","UPS Express" -"UPS Express Box","Boîte UPS Express" -"UPS Express Early A.M.","UPS Express début de matinée" -"UPS Express Plus","UPS Express plus" -"UPS Ground","UPS sol" -"UPS Letter Envelope","Enveloppe UPS Letter" -"UPS Next Day Air","UPS par avion, lendemain" -"UPS Next Day Air Early A.M.","UPS par avion, lendemain début de matinée" -"UPS Next Day Air Saver","UPS lendemain par avion économique" -"UPS Saver","UPS économique" -"UPS Second Day Air","UPS deux jours par avion" -"UPS Second Day Air A.M.","UPS deux jours par avion le matin" -"UPS Standard","UPS Standard" -"UPS Three-Day Select","UPS 3 jours Select" -"UPS Today Dedicated Courrier","UPS jour-même courrier" -"UPS Today Express","UPS jour-même express" -"UPS Today Express Saver","UPS jour-même express économique" -"UPS Today Intercity","UPS jour-même intercity" -"UPS Today Standard","UPS jour-même standard" -"UPS Tube","UPS Tube" -"UPS Type","UPS Type" -"UPS Worldwide 10 kilo","UPS Monde 10kg" -"UPS Worldwide 25 kilo","UPS Monde 25kg" -"UPS Worldwide Expedited","UPS Monde Expédié" -"UPS Worldwide Express","UPS Monde Express" -"UPS Worldwide Express Plus","UPS Monde Express Plus" -"UPS Worldwide Express PlusSM","UPS Monde Express PlusSM" -"UPS Worldwide Saver","UPS Worldwide Saver" -"USPS","USPS" -"USPS GXG Envelopes","USPS GXG Envelopes" -"Unable to retrieve tracking","Échec de la récupération" -"United Parcel Service","United Parcel Service (UPS)" -"United Parcel Service XML","XML United Parcel Service (UPS)" -"Unknown error","Erreur inconnue" -"Used only when ""Additional Protection Value"" is set to ""Configuration"". Can contain only numeric amount.","Utilisé uniquement lorsque ""Valeur de la protection additionnelle"" est fixé sur ""Configuration"". Peut uniquement contenir une valeur numérique." -"User ID","Identifiant de l'utilisateur" -"Variable","Variable" -"Waybill barcode information is missing","Information du code-barre de la feuille de route manquante" -"Weight Unit","Unité de poids" -"Weight unit is invalid","Unité de poids invalide" -"Width","Largeur" -"Worldwide Expedited","Monde expédié" -"Worldwide Express","Monde Express" -"Worldwide Express Letter","Lettre Monde Express" -"Worldwide Express Plus","Monde Express Plus" -"Worldwide Express Plus Letter","Lettre Monde Express Plus" -"Worldwide Express Saver","Économique Monde Express" -"Wrong Content Type.","Type de contenu incorrect." -"Wrong Region.","Région incorrecte." -"Yes","oui" -"Your Packaging","Votre colis" -"Zero shipping charge for '%s'","Aucun frais de port pour '%s'" -"cm","cm" -"inch","pouce" diff --git a/app/locale/fr_FR/Mage_Weee.csv b/app/locale/fr_FR/Mage_Weee.csv deleted file mode 100644 index 71b4632ba..000000000 --- a/app/locale/fr_FR/Mage_Weee.csv +++ /dev/null @@ -1,25 +0,0 @@ -"All Websites","Tous les sites web" -"Apply Discounts To FPT","Appliquer les réductions aux taxes sur les produits fixes" -"Apply Tax To FPT","Appliquer les taxes sur les produits fixes" -"Display Prices In Emails","Afficher les prix dans les mails" -"Display Prices In Product Lists","Afficher les prix dans les listes de produits" -"Display Prices In Sales Modules","Afficher les prix dans les modules de vente" -"Display Prices On Product View Page","Afficher les prix sur la page de vue du produit" -"Enable FPT","Permettre les taxes sur les produits fixes" -"Excluding FPT","Exclure les taxes sur les produits fixes" -"Excluding FPT, FPT description, final price","Exclure les taxes sur les produits fixes, les descriptions, et le prix final" -"FPT Tax Configuration","Configuration de taxe FTP" -"Fixed Product Tax","Taxe sur le produit fixe" -"Fixed Product Taxes","Taxes sur le produit fixe" -"Include FPT In Subtotal","Inclure la taxe sur les produits fixes dans le sous-total" -"Including FPT and FPT description","Inclure les taxes sur les produits fixes et leur description" -"Including FPT and FPT description [incl. FPT VAT]","Inclure les taxes sur les produits fixes et leur description (incluant la TVA)" -"Including FPT only","Inclure uniquement les taxes sur les produits fixes" -"Loaded and Displayed with Tax","Chargé et affiché avec la taxe" -"Not Taxed","Non taxé" -"Taxed","Taxé" -"Total","Total" -"Total Incl. Tax","Total incluant les taxes" -"Total excl. tax","Total hors taxe" -"Total incl. tax","Total dont taxes" -"Total:","Total :" diff --git a/app/locale/fr_FR/Mage_Widget.csv b/app/locale/fr_FR/Mage_Widget.csv deleted file mode 100644 index 3773cb395..000000000 --- a/app/locale/fr_FR/Mage_Widget.csv +++ /dev/null @@ -1,75 +0,0 @@ -"%s","%s" -"-- Please Select --","-- Veuillez sélectionner --" -"Actions","Action" -"Add Layout Update","Ajouter une mise à jour" -"Add New Widget Instance","Ajouter un nouveau widget" -"All","Tous" -"All Pages","Toutes les pages" -"All Product Types","Tous les types de produits" -"An error occurred during saving a widget: %s","Une erreur s'est produite durant la sauvegarde d'un composant d'interface graphique : %s" -"Anchor Categories","Catégories fixes" -"Apply","Appliquer" -"Assign to Store Views","Assigner aux vues de la boutique" -"Big Image","Grande image" -"Block Reference","Bloc référence" -"CMS","CMS" -"Categories","Catégories" -"Choose...","Choisir" -"Close","Fermer" -"Continue","Continuer" -"Default Template","Modèle par défaut" -"Delete","Supprimer" -"Design Package/Theme","Thème visuel" -"Export to:","Exporter vers" -"Frontend Properties","Propriétés de l'interface" -"Generic Pages","Pages génériques" -"Images","Images" -"Insert Widget","Insérer un widget" -"Insert Widget...","Insérer un widget..." -"Layout Updates","Mise à jour de la disposition" -"Manage Widget Instances","Gérer les widgets lancés" -"New Instance","Nouvelle fenêtre" -"New Widget Instance","Nouveau widget" -"Next page","Page suivante" -"Non-Anchor Categories","Catégories non fixes" -"Not Selected","Non sélectionné" -"Open Chooser","Ouvrir le sélecteur" -"Page","Page" -"Please Select Block Reference First","Veuillez sélectionner le bloc de référence en premier" -"Previous page","Page précédente" -"Products","Produits" -"Remove Layout Update","Supprimer la mise à jour de la disposition" -"Save and Continue Edit","Sauvegarder et continuer l'édition" -"Select All","Tout sélectionner" -"Select Visible","Sélectionner le widget visible" -"Settings","Options" -"Sort Order","Trier les widgets" -"Sort Order of widget instances in the same block reference","Trier l'ordre des widgets dans le même bloc de référence" -"Specific %s","%s spécifique" -"Specified Page","Page spécifiée" -"Template","Modèle visuel" -"The information in this tab has been changed.","L'information sur cet onglet a été changée." -"The widget instance has been deleted.","Ce widget a été supprimé." -"The widget instance has been saved.","Ce widget a été sauvegardé." -"This tab contains invalid data. Please solve the problem before saving.","Cet onglet contient des données invalides. Veuillez résoudre ce problème avant d'enregistrer." -"Thumbnail","Miniature" -"Total %d records found","%d total d'enregistrements trouvés" -"Type","Type" -"Unselect All","Tout dé sélectionner" -"Unselect Visible","Désélectionner" -"View","Vue" -"Widget","Widget" -"Widget ""%s""","Widget ""%s""" -"Widget ID","Identifiant du widget" -"Widget Insertion","Insertion de widgets " -"Widget Instance","Widget" -"Widget Instance Title","Titre du widget" -"Widget Options","Options des widgets" -"Widget Type","Type de widget" -"Widget Type is not specified","Le type de widget n'est pas précisé" -"Widget instance is not full complete to create.","Le widget ne peut pas être crée car il n'est pas complet." -"Widgets","Widgets" -"Wrong widget instance specified.","Erreur sur la spécification de l'instance de widget." -"items selected","objets sélectionnés" -"of %s pages","de %s des pages" -"per page","par page" diff --git a/app/locale/fr_FR/Mage_Wishlist.csv b/app/locale/fr_FR/Mage_Wishlist.csv deleted file mode 100644 index a52fe79fa..000000000 --- a/app/locale/fr_FR/Mage_Wishlist.csv +++ /dev/null @@ -1,100 +0,0 @@ -"%1$s has been updated in your wishlist.","%1$s a été mis à jour dans votre liste de souhaits." -"%d product(s) have been added to shopping cart: %s.","%d produit(s) a(ont) été ajouté(s) au caddy: %s." -"%s for ""%s"".","%s pour ""%s""." -"%s has been moved to wishlist %s","%s a été déplacé dans la liste de voeux %s" -"%s's Wishlist","%s de la liste de vœux" -"* Required Fields","* Champs requis" -"Add All to Cart","Tout ajouter au caddy" -"Add to Cart","Ajouter au caddy" -"Add to Compare","Ajouter pour comparer" -"Add to Wishlist","Ajouter à liste de vœux" -"Added From","Formulaire ajouté" -"An error occurred while adding item to wishlist.","Une erreur s'est produit lors de l'ajout de l'article à la liste de vœux." -"An error occurred while adding item to wishlist: %s","Une erreur s'est produite lors de l'ajout de l'article à la liste de vœux: %s" -"An error occurred while deleting the item from wishlist.","Une erreur s'est produite lors de l'effacement de l'article de la liste de vœux." -"An error occurred while deleting the item from wishlist: %s","Une erreur s'est produite lors de l'effacement de l'article de la liste de vœux: %s" -"An error occurred while updating wishlist.","Une erreur s'est produite lors de la mise à jour de la liste de souhaits." -"Are you sure you want to remove this product from your wishlist?","Êtes-vous sûr(e) de vouloir enlever ce produit de votre liste de vœux?" -"Are you sure you would like to remove this item from the wishlist?","Êtes-vous sûr(e) de vouloir enlever ce produit de la liste de vœux?" -"Back","Retour" -"Can\'t delete item from wishlist","Impossible de supprimer l'article de la liste de souhaits." -"Can\'t save description %s","Ne peut sauvegarder la description %s" -"Can\'t update wishlist","Ne peut mettre à jour la liste de vœux" -"Cannot add item to shopping cart","Ne peut ajouter l'article au caddy" -"Cannot add the following product(s) to shopping cart: %s.","Impossible d'ajouter le(s) produit(s) suivant(s) au panier d'achat virtuel : %s." -"Cannot add the item to shopping cart.","Ne peut ajouter l'article au caddy." -"Cannot configure product","Impossible de configurer le produit." -"Cannot load wishlist item","Impossible de charger l'article de la liste de souhaits." -"Cannot move item to wishlist","Impossible de déplacer l'objet dans la liste de voeux" -"Cannot specify product.","Ne peut spécifier produit." -"Cannot specify wishlist item.","Impossible de spécifier l'article de la liste de souhaits." -"Cannot specify wishlist.","Ne peut spécifier liste de vœux." -"Cannot update wishlist","Ne peut mettre à jour liste de vœux" -"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Cochez cette case si vous voulez ajouter un lien vers un flux rss à votre liste de vœux." -"Click for price","Cliquez pour le prix" -"Comment","Commentaires" -"Comment:","Commentaires:" -"Configure Wishlist Item","Configurer un article de la liste de souhaits." -"Configured Price:","Prix configuré :" -"Could not find such wishlist","Impossible de trouver une telle liste de voeux" -"Could not find wishlist","Impossible de trouver la liste de voeux" -"Customer My Account My Wishlist","Mon compte Ma liste de vœux client" -"Customer My Account Wishlist Sharing Form","Formulaire partage liste de vœux Mon compte client" -"Customer Shared Wishlist View","Client a partagé vue liste de vœux" -"Date Added","Date ajoutée" -"Days in Wishlist","Jours dans la liste de souhaits" -"Display Wishlist Summary","Afficher résumé liste de souhaits" -"Edit","Éditer" -"Email Sender","Envoyez courriel à l'expéditeur" -"Email Template","Modèle courriel" -"Email address can\'t be empty.","Adresse courriel ne peut être vide." -"Email addresses, separated by commas","Adresses courriel, séparées par virgules" -"Enabled","Activé" -"General Options","Options générales" -"Go to Wishlist","Aller à liste de vœux" -"Helper for wishlist options rendering doesn't implement required interface.","L'assistant pour les options de la liste de souhaits n'implante pas l'interface requise." -"In stock","En stock" -"Last Added Items","Derniers articles ajoutés" -"Message","Message" -"My Wishlist","Ma liste de vœux" -"My Wishlist (%d item)","Ma liste de vœux (%d article)" -"My Wishlist (%d items)","Ma liste de vœux (%d articles)" -"My Wishlist (%d)","Ma liste de vœux (%d)" -"My Wishlist Link","Lien Ma Liste de souhaits" -"Options Details","Informations options" -"Out of stock","Pas en stock" -"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Veuillez entrer des adresses courriel valides, séparées par des virgules. Par exemple lucdassier@domaine.com, pierremaitre@domaine.com" -"Please input a valid email address.","Veuillez entrer une adresse courriel valide." -"Please, enter your comments...","Veuillez entrer vos commentaires..." -"Price","Prix" -"Product","Produit" -"Product Details and Comment","Détails et commentaires sur le produit" -"Product(s) %s have required options. Each of them can be added to cart separately only.","Produit(s) %s requiert(èrent) option(s). Chacun d'eux peut être ajouté au caddy de façon séparée seulement." -"Product(s) %s have required options. Each product can only be added individually.","Le(s) produit(s) %s possède(nt) des options requises. Chaque produit peut uniquement être ajouté individuellement." -"Quantity","Quantité" -"RSS Feed","Flux RSS" -"RSS link to %s's wishlist","Lien RSS vers %s de liste de vœux" -"Remove Item","Enlever article" -"Remove This Item","Enlever cet article" -"Remove item","Supprimer l'objet" -"Requested cart item doesn't exist","Le panier demandé n'existe pas" -"Requested wishlist doesn't exist","La liste de voeux demandée n'existe pas" -"Share Options","Options de partage" -"Share Wishlist","Partager liste de vœux" -"Share Your Wishlist","Partagez votre liste de vœux" -"Sharing Information","Partager infos" -"This Wishlist has no Items","Cette liste de souhaits ne contient aucun article" -"This product(s) is currently out of stock","Ce(s) produit(s) n'est(ne sont) actuellement pas disponible(s)" -"Unable to add the following product(s) to shopping cart: %s.","Incapable d'ajouter le(s) produit(s) suivant(s) au caddy: %s." -"Update Wishlist","Mettre à jour liste de vœux" -"User Description","Description de l'utilisateur" -"View Details","Vue détails" -"View Product","Voir produit" -"What's this?","Qu'est-ce ?" -"Wishlist","Liste de vœux" -"Wishlist Section","Section liste de vœux" -"Wishlist Sharing","Partager liste de vœux" -"Wishlist could not be created.","La liste de voeux n'a pas pu être créée." -"Wishlist is empty now.","Liste de vœux maintenant vide" -"You have no items in your wishlist.","Vous n'avez pas d'articles dans votre liste de vœux." -"Your Wishlist has been shared.","Votre liste de vœux a été partagée." diff --git a/app/locale/fr_FR/Mage_XmlConnect.csv b/app/locale/fr_FR/Mage_XmlConnect.csv deleted file mode 100644 index 30cb210ee..000000000 --- a/app/locale/fr_FR/Mage_XmlConnect.csv +++ /dev/null @@ -1,1200 +0,0 @@ -" But cart has some errors.","Mais le panier contient des erreurs." -" Note: Image size affects the performance of your app."," Note: Image size affects the performance of your app." -"""Description"" is more than %d characters long","La ""description"" contient plus de %d caractères" -"""Title"" is more than %d characters long","Le ""titre"" contient plus de %d caractères" -"""id"" attribute is required for a ""%s"" field.","""id"" attribuée est requise pour un champ ""%s""." -"""line_count"" attribute is required for ""multiline"" element.","L'attribut ""compte_ligne"" est requis pour un élément ""multi-ligne""." -"""message"" attribute is required for ""%s"" validator rule.","L'attribut ""message"" est requis pour la règle de validation ""%s""." -"%1$s has been added to your wishlist.","%1$s a été ajouté à votre liste de souhaits." -"%1$s incl tax.","%1$s TTC." -"%@ is not correct","%@ is not correct" -"%s API Key required.","%s clé API requise." -"%s Application ID required.","ID application %s requis." -"%s Secret Key required.","Clé secrète %s requise." -"%s attribute is required.","L'attribut %s est requis." -"%s fields is required","%s fields is required" -"%s has been added to your cart.","%s a été ajouté à votre panier." -"%s id:","%s id:" -"%s was updated in your shopping cart.","%s was updated in your shopping cart." -"(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)","(Inclut plus de pays que ceux listés ci-dessous. En tant que propriétaire de l'application, vous êtes responsables pour respecter les lois spécifiques à votre pays par rapport à la distribution ou vente de votre application dans ce pays, y compris votre pays d'origine.)" -"* - field is required","* - field is required" -"*Subject to change","*Sujet à changement" -"1. Please select type of the action:","1. Please select type of the action:" -"10:40 AM","10:40" -"2. Please select a page","2. Please select a page" -"2. Type Category Name","2. Type Category Name" -"2. Type Product Name","2. Type Product Name" -"80px x 80px","80px x 80px" -"80x80 px","80x80 px" -"Login to Urabn Airship.","Login pour Urban Airship." -"Login to Urban Airship.","Login to Urban Airship." -"A Catalog Only App will not support functions such as add to cart, add to wishlist, or login.","Une application uniquement consultable (Catalog App) ne supporte pas les fonctions telles que ajouter au panier, ajouter à la liste de souhaits, ou connexion." -"A new password has been sent.","Un nouveau mot de passe a été défini." -"About","About" -"Access forbidden","Access forbidden" -"Account","Compte" -"Account Information","Account Information" -"Account Settings","Account Settings" -"Account confirmation is required. Please check your email for the confirmation link.","Une confirmation du compte est requise. Vous trouverez le lien de confirmation dans l'email qui vous a été envoyé." -"Account information has been saved.","Les informations du compte ont été sauvegardées." -"Action","Action" -"Action type does\'t recognized","Action type does\'t recognized" -"Action type does\'t recognized.","Action type does\'t recognized." -"Action type doesn\'t recognized.","Action type doesn\'t recognized." -"Activate","Activer" -"Activate PayPal Checkout","Activer paiement PayPal" -"Activate PayPal MECL","Activer Paypal BECM" -"Activation Key","Clé d'activation" -"Add","Add" -"Add Action","Add Action" -"Add Address from Contacts","Add Address from Contacts" -"Add App","Ajouter application" -"Add Custom","Add Custom" -"Add New Address","Add New Address" -"Add New Template","Ajouter nouveau modèle" -"Add Page","Ajouter page" -"Add To Wishlist","Add To Wishlist" -"Add a billing address","Add a billing address" -"Add a shipping address","Add a shipping address" -"Add to Cart","Ajouter au panier" -"Add to Wishlist","Ajouter à la liste de souhaits" -"Adding Product to Cart...","Adding Product to Cart..." -"Adding Product to WishList...","Adding Product to WishList..." -"Additional Address","Adresse supplémentaire" -"Additional Info","Additional Info" -"Address","Adresse" -"Address 2","Adresse 2" -"Address Book","Address Book" -"Address Book Updated","Address Book Updated" -"Address Info","Address Info" -"Address book is empty","Address book is empty" -"Address data not specified.","Données d'adresse non spécifiées" -"Address does not belong to this customer.","L'adresse n'est pas celle de ce client." -"Address has been deleted.","L'adresse a été supprimée." -"Address has been saved.","L'adresse a été sauvegardée." -"Admin Application Settings","Admin Application Settings" -"Admin Mobile Application","Admin Mobile Application" -"Admin application has not been enabled","Admin application has not been enabled" -"Administrative contact for this app and for app submission issues.","Contact administratif pour cette application et pour les problèmes de soumission d'applications." -"Advanced Settings","Paramètres avancés" -"After submitting the App to Magento, please contact %1$s to receive the Application Key, Application Secret and Application Master Secret.","Après avoir envoyé l'app à Magento, veuillez contacter %1$s pour recevoir Application Key, Application Secret et Application Master Secret." -"AirMail Message Queue","File d'attente des messages AirMail" -"AirMail Messages Queue","File d'attente des messages AirMail" -"AirMail Template Preview","Aperçu du modèle AirMail" -"AirMail message","Message AirMail" -"AirMail templates","Modèles AirMail" -"All Allowed Countries","Tous les pays autorisés" -"All Images","All Images" -"All locations","Tous les emplacements" -"Amount","Amount" -"Amount in %@","Amount in %@" -"Amounts","Amounts" -"An account with this email address already exists.","Un compte avec cette adresse email existe déjà." -"An error occurred while adding item to wishlist.","Une erreur s'est produite lors de l'ajout d'un article à la liste de souhaits." -"An error occurred while deleting the address.","Une erreur s'est produite lors de la suppression de l'adresse." -"An error occurred while loading categories.","Une erreur s'est produite lors du chargement des catégories." -"An error occurred while loading category filters.","Une erreur s'est produite lors du chargement des filtres de catégories." -"An error occurred while loading configuration.","An error occurred while loading configuration." -"An error occurred while loading localization.","An error occurred while loading localization." -"An error occurred while loading login form.","An error occurred while loading login form." -"An error occurred while loading wishlist.","Une erreur s'est produite lors du chargement de la liste d'envies." -"An error occurred while processing your order. Please contact us or try again later.","Une erreur s'est produite lors du traitement de la commande. Veuillez nous contacter ou réessayer plus tard." -"An error occurred while processing your request.","Une erreur s'est produite lors du traitement de votre demande." -"An error occurred while removing item from wishlist.","Une erreur s'est produite lors du retrait de l'article de la liste de souhaits." -"An error occurred while removing items from wishlist.","Une erreur s'est produite lors du retrait des articles de votre liste de souhaits." -"Analytics","Analytics" -"Android","Android" -"Android doesn\'t support AirMail message type.","Android ne prend pas en charge les messages de type AirMail." -"App Background","Arrière-plan application" -"App Background (landscape mode)","App Background (landscape mode)" -"App Background (landscape mode).","Arrière-plan application (mode paysage)." -"App Background (portrait mode)","App Background (portrait mode)" -"App Background (portrait mode).","Arrière-plan application (mode portrait)." -"App Background
    (landscape mode)","Arrière-plan application
    (mode paysage)." -"App Background
    (portrait mode)","Arrière-plan application
    (mode portrait)." -"App Background image missing.","Image manquante dans l'arrière-plan de l'application." -"App Code","Code application" -"App Information","Informations sur l'application" -"App Name","Nom de l'application" -"App Stores","Boutiques de l'application" -"App Submission History","Historique des soumissions d'applications" -"App Title","Titre de l'application" -"App code","App code" -"App code required.","Code application requis." -"App does not exist.","L’application n'existe pas." -"App has been deleted.","L'application a été supprimée." -"App has been saved.","L'application a été sauvegardée." -"App has been submitted.","L'application a été soumise." -"App model not loaded.","Modèle d'application non chargé." -"App with specified code does not exist.","L'application avec le code spécifié n'existe pas." -"Appears in the info section of your app (example: Copyright 2010 – Your Company, Inc.)","Apparait dans la section info de votre application (exemple : Copyright 2010 – Votre entreprise, Inc.)" -"Application","Application" -"Application Key","Clé de l'application" -"Application Master Secret","Master Secret de L'application" -"Application Name","Nom de l'application" -"Application Secret","Secret de l'application" -"Application doesn\'t exist.","Application doesn\'t exist." -"Apply","Apply" -"Applying Coupon Code","Applying Coupon Code" -"Applying Gift Card %@","Applying Gift Card %@" -"Are you sure you want to cancel a message?","Are you sure you want to cancel a message?" -"Are you sure you want to cancel selected records?","Are you sure you want to cancel selected records?" -"Are you sure you want to delete a message?","Are you sure you want to delete a message?" -"Are you sure you want to delete selected records?","Are you sure you want to delete selected records?" -"Are you sure you want to delete this theme? This change will affect all applications.","Etes-vous sûr de vouloir effacer ce thème ? Ce changement affectera toutes les applications." -"Are you sure you want to do this?","Êtes-vous sûr de vouloir faire cela ?" -"Are you sure you want to remove this item?","Are you sure you want to remove this item?" -"Are you sure you whant to cancel a message?","Êtes-vous sûr de vouloir annuler un message ?" -"Are you sure you whant to delete a message?","Êtes-vous sûr de vouloir supprimer un message ?" -"Are you sure you what to cancel selected records?","Êtes-vous sûr de vouloir annuler les enregistrements sélectionnés?" -"Are you sure you what to delete selected records?","Êtes-vous sûr de vouloir supprimer les enregistrements sélectionnés ?" -"As Low As","As Low As" -"As Low Excl. Tax","As Low Excl. Tax" -"As Low Incl. Tax","As Low Incl. Tax" -"As a Magento customer, Urban Airship is offering you unlimited Push Notifications and Rich Push for $100/year* along with a 60 day free trial.","En tant que client Magento, Urban Airship vous offre des notifications push illimitées et rich push pour 100$/an* ainsi qu'une période d'essai gratuite de 60 jours." -"As low as","As low as" -"As low as excl. tax","As low as excl. tax" -"As low as incl. tax","As low as incl. tax" -"At last one application has to be created.","Au moins une application doit être créée." -"At least one option should be selected","At least one option should be selected" -"Authentication complete.","Authentification réussie." -"Authentication to %@ did failed...","Authentication to %@ did failed..." -"Average Order Amount","Average Order Amount" -"Average Orders","Average Orders" -"Average Rating","Average Rating" -"Back","Retour" -"Back to App Edit","Retour à la Modification de l'application" -"Background Color","Couleur arrière-plan" -"Balance","Solde" -"Balance Change","Changement de solde" -"Balance History","Historique du solde" -"Banner on Home Screen","Bannière sur l'écran d'accueil" -"Banner on Home Screen (landscape mode)","Banner on Home Screen (landscape mode)" -"Banner on Home Screen (landscape mode) image missing.","L'image de bannière en fond d'écran (mode paysage) est manquante." -"Banner on Home Screen (portrait mode)","Banner on Home Screen (portrait mode)" -"Banner on Home Screen (portrait mode) image missing.","L'image de bannière en fond d'écran (mode portrait) est manquante." -"Banner on Home Screen
    (landscape mode)","Bannière de fond d'écran
    (mode paysage)" -"Banner on Home Screen
    (portrait mode)","Bannière de fond d'écran
    (mode portrait)" -"Banner on Home Screen image missing.","Bannière manquante sur l'image de l'écran d'accueil." -"Banners on Home Screen","Banners on Home Screen" -"Best Sellers","Best Sellers" -"Billing","Billing" -"Billing Address","Adresse de facturation" -"Billing address","Billing address" -"Billing address has been set.","L'adresse de facturation a été définie." -"Bundle Products","Bundle Products" -"Buy %1$s for %2$s","Acheter %1$s pour %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Acheter %1$s pour %2$s (%3$s TTC) chacun" -"Buy %1$s for %2$s each","Acheter %1$s pour %2$s chacun" -"Buy %1$s with %2$s discount each","Achetez %1$s avec une réduction de %2$s sur chaque" -"Buy More & Save","Buy More & Save" -"Buyer country is not allowed by store.","Le pays de l'acheteur n'est pas autorisé par la boutique." -"CMS Page","CMS Page" -"CMS Pages haven\'t been found.","CMS Pages haven\'t been found." -"Cache Lifetime (seconds)","Durée cache (secondes)" -"Cache Management","Gestion du cache" -"Can\'t add item to shopping cart.","Impossible d'ajouter un article au panier." -"Can\'t apply the coupon code.","Impossible d'appliquer le code de réduction." -"Can\'t copy file ""%s"" to ""%s"".","Impossible de copier le ficher ""%s"" sur ""%s""." -"Can\'t create wishlist.","Impossible de créer une liste de souhaits." -"Can\'t delete ""%s"" theme.","Le thème ""%s"" ne peut être effacé." -"Can\'t load XML.","Impossible de charger XML." -"Can\'t load admin application settings.","Can\'t load admin application settings." -"Can\'t load application with id ""%s""","L'application ne peut être chargée avec l'id ""%s""" -"Can\'t load cart info.","Les informations du panier ne peuvent être chargées." -"Can\'t load cart.","Le panier ne peut être chargé." -"Can\'t load customer form.","Le formulaire client ne peut être chargé." -"Can\'t load default themes.","Les thèmes par défaut ne peuvent être chargés." -"Can\'t load selected theme. Please check your media folder permissions.","Les thèmes sélectionnés ne peuvent être chargés. Veuillez vérifier votre dossier de permissions média." -"Can\'t load template with id ""%s""","Can\'t load template with id ""%s""" -"Can\'t open submission form.","Impossible d'ouvrir le formulaire de soumission." -"Can\'t read file ""%s"".","Impossible de lire le fichier ""%s""." -"Can\'t remove the item.","Impossible de retirer l'article." -"Can\'t reset theme.","Impossible de réinitialiser le thème." -"Can\'t save address.","Impossible de sauvegarder l'adresse." -"Can\'t save the customer.","Impossible de sauvegarder le client." -"Can\'t save theme.","Impossible de sauvegarder le thème." -"Can\'t show configuration.","Impossible d'afficher la configuration." -"Can\'t specify product.","Impossible de spécifier le produit." -"Can\'t submit application.","Impossible de soumettre l'application." -"Can\'t update cart.","Impossible de mettre à jour le panier." -"Can\'t write to file ""%s"".","Impossible d'écrire dans le fichier ""%s""." -"Cancel","Annuler" -"Canceled","Annulé" -"Canceling PayPal ...","Canceling PayPal ..." -"Cancelled","Annulé" -"Cannot apply gift card.","La carte cadeau ne peut être appliquée." -"Cannot configure product.","Cannot configure product." -"Cannot load theme ""%s"".","Impossible de charger le thème ""%s""." -"Cannot redeem Gift Card.","La carte cadeau ne peut être rachetée." -"Cannot remove gift card.","La carte cadeau ne peut être supprimée." -"Cannot save theme ""%s"". Incorrect data received","Impossible de sauvegarder le thème ""%s"". Données reçues incorrectes." -"Cannot update the item.","Cannot update the item." -"Card Verification Number","Numéro de vérification de la carte" -"Card verification number is wrong","Le numéro de vérification de la carte est erroné." -"Carrier","Transporteur" -"Cart","Chariot" -"Cart Updated","Cart Updated" -"Cart has been updated.","Le panier a été mis à jour." -"Cart has some errors.","Le panier contient des erreurs." -"Cart is empty.","Le panier est vide." -"Catalog Only App?","Cataloguer uniquement l'application ?" -"Category","Category" -"Category Button Color","Couleur du bouton catégorie" -"Category Item Background Color","Couleur du fond de la catégorie de l'objet" -"Cc:","Cc:" -"Chairs","Chaises" -"Change Orientation","Changer l'orientation" -"Change Password","Modifier le mot de passe" -"Changes have been saved to theme.","Les changements du thème ont été enregistrés." -"Check","Check" -"Check Gift Card","Check Gift Card" -"Check Gift Card Promo Redeemed","Check Gift Card Promo Redeemed" -"Checking Gift Card %@","Checking Gift Card %@" -"Checkout","Checkout" -"Checkout Page Registration","Checkout Page Registration" -"Checkout as Guest","Checkout as Guest" -"Checkout as Guest or Register","Checkout as Guest or Register" -"Checkout has been initialized.","Le paiement a été initialisé." -"Checkout initialization...","Checkout initialization..." -"Checkout initialized!","Checkout initialized!" -"Choose Store View","Choose Store View" -"Choose amount","Choose amount" -"Choose file","Choose file" -"City","Ville" -"Clear","Clear" -"Close","Close" -"Color Themes","Thèmes couleur" -"Colors","Couleurs" -"Commiting updates...","Commiting updates..." -"Company","Compagnie" -"Completed","Effectué" -"Configuration data have been saved","Configuration data have been saved" -"Configure Cart Item","Configure Cart Item" -"Confirm New Password","Confirmer le nouveau mot de passe" -"Confirm Password","Confirmer le mot de passe" -"Connecting","Connecting" -"Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate.","Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate." -"Contact Email","Email de contact" -"Contact Information","Informations de contact" -"ContactsAreEmpty","ContactsAreEmpty" -"Container is not defined.","Le contenant n'est pas défini." -"Content","Contenu" -"Continue","Continue" -"Copyright","Copyright" -"Copyright Page Logo","Logo page Copyright" -"Copyright Page Logo (iPhone 4 retina)","Copyright Page Logo (iPhone 4 retina)" -"Copyright Page Logo
    (iPhone 4 retina)","Logo page Copyright
    (iPhone 4 retina)" -"Copyright: Magento (c) 2010","Copyright: Magento (c) 2010" -"Countries","Countries" -"Countries Payment Applicable From","Paiement pays applicable depuis" -"Country","Pays" -"Country options don\'t recognized for ""%s"".","Options du pays non reconnues pour ""%s""." -"Coupon code %s is not valid.","Code de réduction %s non valide." -"Coupon code %s was applied.","Code de réduction %s appliqué." -"Coupon code is empty.","Le code de réduction est vide." -"Coupon code was canceled.","Le code de réduction a été annulé." -"Create Account","Create Account" -"Create an Account","Create an Account" -"Creating a Template is allowed only for applications which have device type iPhone.","La création de modèle est autorisée uniquement pour les applications destinées à des appareils de type iPhone" -"Credit Card","Carte de crédit" -"Credit Card %s","Carte bancaire %s" -"Credit Card Number","Numéro de carte de crédit" -"Credit Card Type","Type de carte de crédit" -"Credit card number does not match credit card type.","Le numéro de la carte de crédit ne correspond pas au type de la carte de crédit." -"Cross Sells","Cross Sells" -"Current Balance: %s","Solde actuel: %s" -"Current Password","Mot de passe actuel" -"Currently, PayPal MEP is not available for the Android application","Actuellement, Paypal MEP n'est pas disponible pour l'application Android" -"Currently, the system does not support the viewing of the order detail.","Currently, the system does not support the viewing of the order detail." -"Custom App Icon","Icône d'application personnalisé" -"Custom App Icon (iPhone 4 retina)","Custom App Icon (iPhone 4 retina)" -"Custom App Icon
    (iPhone 4 retina)","Icône d'application personnalisé
    (iPhone 4 Retina)" -"Custom Colors","Couleurs personnalisées" -"Custom amount","Custom amount" -"Customer","Customer" -"Customer Name","Customer Name" -"Customer authentication problem.","Problème d'identification de l'utilisateur" -"Customer balance available in enterprise version of Magento only.","Solde client disponible seulement en version d'entreprise Magento." -"Customer balance is disabled for current store","Le solde client est désactivé pour le magasin actuel" -"Customer email not specified.","L'email de l'utilisateur n'est pas précisé." -"Customer logout problem.","Problème lors de la déconnexion de l'utilisateur." -"Customer not logged in.","Utilisateur non connecté." -"Customers","Customers" -"DD","JJ" -"Date","Date" -"Date Created","Date de création" -"Date Submitted","Date d'envoi" -"Date Updated","Date de mise à jour" -"Date:","Date:" -"Day","Jour" -"Deeper Messaging and Engagement with Rich Push.","Allez plus loin dans la messagerie et l’engagement avec Rich Push." -"Default Billing Address","Adresse de facturation par défaut" -"Default Shipping Address","Adresse d'expédition par défaut" -"Default Theme","Thème par défaut" -"Default themes are missed.","Default themes are missed." -"Delete","Supprimer" -"Delete Action","Delete Action" -"Delete theme","Supprimer le thème" -"Deleted","Supprimé" -"Description","Description" -"Description that appears in Android Market. %s chars maximum. ","Description qui apparaît dans l'Android Market. %s caractères maximum." -"Description that appears in the iTunes App Store. %s chars maximum. ","Description qui apparaît dans l'iTunes App Store. %s caractères maximum." -"Deselect All","Tout désélectionner" -"Design","Design" -"Device","Appareil" -"Device Information","Informations de l'appareil" -"Device Type","Type d'appareil" -"Device doesn\'t recognized","Device doesn\'t recognized" -"Device doesn\'t recognized. Unable to load a template.","Appareil non reconnu. Impossible de charger un modèle." -"Device doesn\'t recognized: ""%s"". Unable to load a helper.","Appareil non reconnu. ""%s"". Impossible de charger l'aide." -"Device doesn\'t recognized: ""%s"". Unable to load preview model.","Appareil non reconnu. ""%s"". Impossible de charger l'aperçu du modèle." -"Device type doesn\'t recognized.","Device type doesn\'t recognized." -"Discount code is empty","Discount code is empty" -"Discount:","Discount:" -"Done","Done" -"Downloadable Products Updated","Downloadable Products Updated" -"Downloads limit:","Downloads limit:" -"E-mail","E-mail" -"Edit","Éditer" -"Edit Action","Edit Action" -"Edit Address","Edit Address" -"Edit AirMail Message","Modifier le message AirMail" -"Edit AirMail Message Queue #%s","Modifier la file d'attente du message AirMail #%s" -"Edit App ""%s""","Modifier l'application ""%s""" -"Edit Filter","Modifier le filtre" -"Edit Image","Edit Image" -"Edit Mail List","Edit Mail List" -"Edit Template ""%s""","Modifier le modèle ""%s""" -"Edit filter","Edit filter" -"Edit note","Edit note" -"Either remote URL or application code was not set. Please make sure you filled all the values and try again.","Either remote URL or application code was not set. Please make sure you filled all the values and try again." -"Element with id %s already exists","Un élément avec l'identifiant %s existe déjà" -"Email","Email" -"Email Address","Adresse email" -"Email address you provided is not valid. Please provide a valid one.","Email address you provided is not valid. Please provide a valid one." -"Email is not correct","Email is not correct" -"Email is not specified","Email is not specified" -"Enable Admin Application","Enable Admin Application" -"Enable AirMail Message Push notification","Activer les notifications push pour les messages AirMail" -"Enable Facebook","Activer Facebook" -"Enable Flurry Analytics","Activer Flurry Analytics" -"Enable Flurry Analytics for the merchant.","Activer Flurry Analytics pour le vendeur" -"Enable LinkedIn","Activer Linkedln" -"Enable Standard Checkout","Activer le paiement standard" -"Enable Twitter","Activer Twitter" -"Enter Name","Enter Name" -"Enter discount code first.","Enter discount code first." -"Enter discount code if any","Enter discount code if any" -"Enter e-mail","Enter e-mail" -"Enter giftcard promo code here","Enter giftcard promo code here" -"Enter text","Enter text" -"Enter the gift card code","Enter the gift card code" -"Error","Error" -"Error Loading Configuration Format","Error Loading Configuration Format" -"Error during shortening url","Error during shortening url" -"Error message text is missed.","Error message text is missed." -"Error while processing file ""%s"".","Erreur lors de la gestion du fichier ""%s""" -"Error while reading data from Payment Bridge. Please, try again.","Erreur lors de la lecture des données de la passerelle de paiement. Veuillez réessayer plus tard." -"Error while reading remote data","Error while reading remote data" -"Error while uploading file ""%s"".","Erreur lors du chargement du fichier ""%s""." -"Error while uploading file ""%s"". Disallowed file type. Only ""jpg"", ""jpeg"", ""gif"", ""png"" are allowed.","Erreur lors du téléchargement du fichier ""%s"". Type de fichier non autorisé. Seuls les fichiers ""jpg"", ""jpeg"", ""gif"" et ""png"" sont autorisés. " -"Error.","Erreur." -"Excl. Tax","Excl. Tax" -"Expiration Date - Month","Date d'expiration - Mois" -"Expiration Date - Year","Date d'expiration - Année" -"Expires: %s","Expire :%s" -"Extend the life of your app with Urban Airship Push Notifications.","Etendez la vie de votre application avec les notifications Push de Urban Airship." -"Extensions","Extensions" -"FILTERS APPLIED","FILTRES APPLIQUÉS" -"Facebook","Facebook" -"Facebook API","API Facebook" -"Facebook Application ID","ID application Facebook" -"Facebook post failed...","Facebook post failed..." -"Fax","Fax" -"File can\'t be uploaded.","Le fichier ne peut être chargé." -"File doesn\'t exist ""%s"".","Le fichier n'existe pas ""%s""." -"Filter","Filter" -"Filters","Filters" -"First Name","Prénom" -"Fixed amounts","Fixed amounts" -"Flurry API Code","Code API Flurry" -"Flurry Analytics","Flurry Analytics" -"Flurry Analytics Site","Site Flurry Analytics" -"Fonts","Polices" -"Forgot Password","Forgot Password" -"Forgot Password?","Forgot Password?" -"Forgot your password?","Forgot your password?" -"Form","Form" -"Free","Libre" -"From","From" -"From Excl. Tax","From Excl. Tax" -"From Incl. Tax","From Incl. Tax" -"From excl. tax","From excl. tax" -"From incl. tax","From incl. tax" -"Full Description","Full Description" -"Funk Leaf","Funk Leaf" -"Gallery","Gallery" -"General","Général" -"Generate Offline Catalog","Generate Offline Catalog" -"Get Content from CMS Page","Obtenir du contenu sur la page CMS" -"Gift Card ""%s"" was added.","La carte de réduction ""%s"" a été ajoutée." -"Gift Card ""%s"" was redeemed.","La carte cadeau ""%#"" a été annulée." -"Gift Card ""%s"" was removed.","La carte cadeau ""%s"" a été supprimée." -"Gift Card (%s)","Carte cadeau (%s)" -"Gift Card amount applied to order: %s","Montant de la carte cadeau appliquée à la commande: %s" -"Gift Card code is empty.","Le code carte cadeau est vide." -"Gift Card: %s","Carte cadeau: %s" -"Gift card account available in enterprise version of Magento only.","Compte de carte de cadeau disponible uniquement en version entreprise de Magento." -"Giftcard promo code","Giftcard promo code" -"Grand Total","Grand Total" -"Grand Total (Excl. Tax)","Total (H.T.)" -"Grand Total (Incl. Tax)","Total (TTC)" -"Guest","Invité" -"Header Background Color","Couleur arrière-plan en-tête" -"Header Font Color","Couleur police en-tête" -"High Resolution Application Icon","Icône application haute résolution" -"Home","Accueil" -"Hot Red","Rouge vif" -"How do you rate this product?","Comment évaluez-vous ce produit ?" -"How to incorporate Urban Airship within your application:","Comment inclure Urban Airship dans votre demande:" -"I Agree","I Agree" -"I agree to the Terms and Conditions","I agree to the Terms and Conditions" -"ID","ID" -"Icon that will appear on the user\'s device after they download your app.","Icon that will appear on the user\'s device after they download your app." -"Icon that will appear on the user\'s device after they download your app. Recommended size: 48px x 48px.","Icône qui apparaitra sur l'appareil de l'utilisateur après qu'il ait téléchargé l'application. Taille recommandée : 48 x 48 pixels." -"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 72px x 72px.","Icône qui apparaitra sur l'appareil de l'utilisateur après qu'il ait téléchargé l'application. Vous n'avez pas besoin d'appliquer de gradient ou des contours estompés (Apple le fait automatiquement). Taille recommandée : 72 x 72 pixels." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 114px x 114px.","Icône qui apparaitra sur l'appareil de l'utilisateur après qu'il ait téléchargé l'application. Vous n'avez pas besoin d'appliquer de gradient ou des contours estompés (Apple le fait automatiquement). Taille recommandée : 114 x 114 pixels." -"Icon that will appear on the user’s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 57px x 57px at 72 dpi.","Icône qui apparaitra sur l'appareil de l'utilisateur après qu'il ait téléchargé l'application. Vous n'avez pas besoin d'appliquer de gradient ou des contours estompés (Apple le fait automatiquement). Taille recommandée : 57 x 57 pixels (ppp : 72)." -"Icons","Icônes" -"If leave this field empty, the message will be sent immediately","Si vous laissez ce champ vide, le message sera envoyé immédiatement." -"If you want to disable the cache on the application side, leave the field empty. Warning! When disabling cache, the application will take time to load each page.","Si vous voulez désactiver le cache sur le côté de l'application, laissez ce champ vide. Attention ! Lorsque le cache est désactivé, l'application mettra du temps à charger chaque page." -"Image %s is required.","Image %s is required." -"Image action has been saved.","Image action has been saved." -"Image does not exist. Please reload this page.","Image does not exist. Please reload this page." -"Image file was not found.","Fichier image introuvable." -"Image has been deleted.","Image has been deleted." -"Image id is required.","Image id is required." -"Image limits don\'t recognized for ""%s"" image type","Image limits don\'t recognized for ""%s"" image type" -"Image that appears on first screen while your app is loading.","Image that appears on first screen while your app is loading." -"Image that appears on first screen while your app is loading. Required size: 1024px x 768px.","Image qui apparait sur le premier écran lorsque votre application est en cours de chargement. Taille requise : 1024 x 768 pixels." -"Image that appears on first screen while your app is loading. Required size: 320px x 455px.","Image qui apparait sur le premier écran lorsque votre application est en cours de chargement. Taille requise : 320 x 455 pixels." -"Image that appears on first screen while your app is loading. Required size: 320px x 460px.","Image qui apparait sur le premier écran lorsque votre application est en cours de chargement. Taille requise : 320 x 460 pixels." -"Image that appears on first screen while your app is loading. Required size: 640px x 920px.","Image qui apparait sur le premier écran lorsque votre application est en cours de chargement. Taille requise : 640 x 920 pixels." -"Image that appears on first screen while your app is loading. Required size: 768px x 1024px.","Image qui apparait sur le premier écran lorsque votre application est en cours de chargement. Taille requise : 768 x 1024 pixels." -"Image type doesn\'t recognized: ""%s"".","Image type doesn\'t recognized: ""%s""." -"Image type is required.","Image type is required." -"Images","Images" -"Images order has been updated.","Images order has been updated." -"In Queue","En attente" -"In Stock","En stock" -"In addition, click here to review Urban Airship\'s Terms of Service: click here.","En outre, cliquez ici pour voir les modalités de service d'Urban Airship : cliquez ici." -"In order to resubmit your app, you need to first purchase a %s from MagentoCommerce","Pour soumettre à nouveau votre application, vous devez d'abord acheter un %s sur MagentoCommerce" -"In order to submit your app, you need to first purchase a %s from MagentoCommerce","Pour soumettre votre application, vous devez d'abord acheter un %s sur MagentoCommerce" -"Inactive Tabs","Onglets inactifs" -"Incl. Tax","Incl. Tax" -"Incl. tax","Incl. tax" -"Initialization PayPal ...","Initialization PayPal ..." -"Initialization of the PayPal checkout failed!","Initialization of the PayPal checkout failed!" -"Invalid XML.","XML invalide." -"Invalid current password.","Mot de passe actuel invalide." -"Invalid customer data.","Données clients invalides." -"Invalid data.","Données invalides." -"Invalid email address.","Adresse email invalide." -"Invalid item or wishlist.","Article ou liste de souhaits invalide." -"Invalid login or password.","Identifiant ou mot de passe invalide." -"Invalid shipping method.","Méthode d'expédition invalide." -"Issue Number","Numéro de livraison" -"It\'s not allowed to delete submitted application.","La suppression d'une application soumise n'est pas autorisée." -"Item","Item" -"Item Options","Item Options" -"Item has been added to cart.","L'article a été ajouté au panier." -"Item has been deleted from cart.","L'article a été retiré du panier." -"Item has been removed from wishlist.","L'article a été retiré de la liste de souhaits." -"Items","Items" -"Items were updated. But can\'t update wishlist.","Les articles ont été mis à jour. Mais impossible de mettre à jour la liste de souhaits." -"Keep your image size below %s KB for optimal performance.","Keep your image size below %s KB for optimal performance." -"Key","Clé" -"Keywords","Mot clés" -"Label","Étiquette" -"Landscape app Background","Landscape app Background" -"Landscape banners on Home Screen","Landscape banners on Home Screen" -"Large iTunes Icon","Grande icône iTunes" -"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.","Grande icône qui apparait dans l'iTunes App Store. Vous n'avez pas besoin d'appliquer un gradient ou des contours estompés (Apple le fait automatiquement). Taille requise : 512 x 512 pixels." -"Last 5 Orders","Last 5 Orders" -"Last 5 Search Terms","Last 5 Search Terms" -"Last Name","Nom de famille" -"Last update: %@","Last update: %@" -"Lifetime Sales","Lifetime Sales" -"LindedIn","LindedIn" -"Link:","Link:" -"LinkedIn","LinkedIn" -"LinkedIn API","API LinkedIn" -"LinkedIn API Key","Clé API LinkedIn" -"LinkedIn Authorization","LinkedIn Authorization" -"LinkedIn Autorization","LinkedIn Autorization" -"LinkedIn Secret Key","Clé secrète LinkedIn" -"Linkedin post failed...","Linkedin post failed..." -"List of downloadable products is empty","List of downloadable products is empty" -"Load more items","Load more items" -"Loader Splash Screen","Splash Screen chargement" -"Loader Splash Screen (iPhone 4 retina)","Loader Splash Screen (iPhone 4 retina)" -"Loader Splash Screen (landscape mode)","Loader Splash Screen (landscape mode)" -"Loader Splash Screen (portrait mode)","Loader Splash Screen (portrait mode)" -"Loader Splash Screen
    (iPhone 4 retina)","Splash Screen chargement
    (iPhone 4 retina)" -"Loader Splash Screen
    (landscape mode)","Splash Screen chargement
    (mode paysage)" -"Loader Splash Screen
    (portrait mode)","Splash Screen chargement
    (mode portrait)" -"Loading %@...","Loading %@..." -"Loading Account Form...","Loading Account Form..." -"Loading Address Book...","Loading Address Book..." -"Loading Address Form...","Loading Address Form..." -"Loading CMS page ...","Loading CMS page ..." -"Loading Cart...","Loading Cart..." -"Loading Gallery...","Loading Gallery..." -"Loading Login Form...","Loading Login Form..." -"Loading My Downloadable Products...","Loading My Downloadable Products..." -"Loading Order Details","Loading Order Details" -"Loading Orders List...","Loading Orders List..." -"Loading Preview...","Chargement de l'aperçu ..." -"Loading Product Options...","Loading Product Options..." -"Loading Products...","Loading Products..." -"Loading Registration Form...","Loading Registration Form..." -"Loading Restore Password Form...","Loading Restore Password Form..." -"Loading Store Credit...","Loading Store Credit..." -"Loading WishList...","Loading WishList..." -"Loading Write Review Form...","Loading Write Review Form..." -"Loading category ...","Loading category ..." -"Loading more items...","Loading more items..." -"Loading product ...","Loading product ..." -"Loading shipping methods ...","Loading shipping methods ..." -"Loading...","Loading..." -"Locations","Emplacements" -"Log In","Connexion" -"Log Out","Log Out" -"Log in to Admin Panel","Log in to Admin Panel" -"Log into Account","Log into Account" -"Log into your account","Log into your account" -"Log out Account","Log out Account" -"LogInMessageTitle","LogInMessageTitle" -"Login and password are required.","Identifiant et mot de passe requis." -"Logo in Header","Logo dans l'en-tête" -"Logo in Header image missing.","Logo dans l'image de l'en-tête manquante" -"Logout complete.","Déconnexion réussie." -"M.I.","M.I." -"MEP is PayPal\'s native checkout experience for the iPhone. You can choose to use MEP alongside standard checkout, or use it as your only checkout method for Magento mobile. PayPal MEP requires a PayPal business account","MEP est l’expérience de passage en caisse de PayPal pour l’iPhone. Vous pouvez choisir d'utiliser MEP aux côtés du passage en caisse standard, ou de l’utiliser comme votre seule méthode de passage en caisse pour Magento mobile. PayPal MEP nécessite un compte d'affaires PayPal" -"MM","MM" -"Mailbox title","Titre boîte aux lettres" -"Main Tabs","Onglets principaux" -"Make Inactive","Rendre inactif" -"Make this app available in the following territories","Rendre cette application disponible dans les pays suivants" -"Manage Apps","Gérer les applications" -"Manage Mobile App","Gérer les applications pour mobiles" -"Maximum length is 140","Longueur maximum : 140" -"Maximum length is 255","Longueur maximum : 125" -"Maximum size: %s KB.","Maximum size: %s KB." -"Maximum: %.2f","Maximum: %.2f" -"Merchant Label","Étiquette vendeur" -"Merge","Merge" -"Message","Message" -"Message Queue","File d'attente messages" -"Message Settings","Paramètres messages" -"Message Templates","Modèles messages" -"Message Title","Titre message" -"Message Type","Type message" -"Message can be edited when status of the message is ""In Queue"" only.","Un message ne peut être modifié que lorsque l'état du message est ""En file d'attente""." -"Message content","Contenu du message" -"Message text is missed.","Message text is missed." -"Message title","Titre du message" -"Message too long, please use 140 symbols","Message too long, please use 140 symbols" -"Message type doesn\'t recognized","Message type doesn\'t recognized" -"Minimize","Minimize" -"Minimum %@, maximum %@","Minimum %@, maximum %@" -"Minimum: %.2f","Minimum: %.2f" -"Mobile","Mobile" -"Mobile Express Checkout has been canceled.","L'Express Checkout Mobile a été annulé" -"Mobile Express Checkout processed successfully.","Commande Expresse Mobile traitée avec succès." -"Month","Mois" -"More","Plus" -"More Info","Plus d'infos" -"More Tabs","Plus d'onglets" -"Most Viewed Products","Most Viewed Products" -"My Account","My Account" -"My Downloadable Products","My Downloadable Products" -"My Orders","My Orders" -"My Wishlist","My Wishlist" -"Name","Name" -"Name on Card","Nom sur la carte" -"Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize. %s chars max.","Nom qui apparait en bas de votre application lorsque les utilisateurs l'installent sur leur appareil. Nous conseillons de choisir un nom avec 10-12 caractères et que vos clients reconnaitront. %s caractères max." -"New AirMail Message","Nouveau message AirMail" -"New AirMail Message Queue","Nouvelle file d'attente de messages AirMail" -"New App","Nouvelle application" -"New Customers","New Customers" -"New Password","Nouveau mot de passe" -"New Template","Nouveau modèle" -"New to Our Store?","New to Our Store?" -"Nickname","Surnom" -"No","No" -"No Payment Information Required","Pas d'informations de paiement requises" -"No Ratings","No Ratings" -"No internet connection. Retry later ...","No internet connection. Retry later ..." -"No items were specifed to update.","Aucun article à mettre à jour n'a été spécifié." -"No items were updated.","Aucun article n'a été mis à jour." -"No product selected.","Aucun produit sélectionné." -"No products found. Please retry with other term","No products found. Please retry with other term" -"No shipping method required.","Aucune méthode d'expédition requise." -"No such file ""%s"".","Aucun fichier ""%s""." -"Not Submitted","Non soumis" -"Note: Image size affects the performance of your app.","Note: Image size affects the performance of your app." -"Notice","Note" -"Number of Orders","Number of Orders" -"Number of Uses","Number of Uses" -"OK","OK" -"OR, Pay with Standard Checkout","OR, Pay with Standard Checkout" -"Offline Catalog","Offline Catalog" -"Offline cart stored on server","Offline cart stored on server" -"Offline catalog export complete.","Offline catalog export complete." -"Offline catalog export failed.","Offline catalog export failed." -"One or more keywords that describe your app. Keywords are matched to users\' searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum.","Un ou plusieurs mots clés qui décrivent votre application. Les mots clés sont mis en correspondance avec les recherches des utilisateurs dans l'App Store et aident à obtenir des résultats de recherche pertinents. Séparez les mots clés multiples avec des virgules. 100 caractères maximum." -"Onepage checkout is disabled.","Onepage checkout est désactivé." -"Only custom theme can be deleted","Seul un thème personnalisé peut être effacé" -"Only default theme can be reset","Seul le thème par défaut peut être réinitialisé" -"Only free apps are allowed in this version.","Seules les applications gratuites sont acceptées dans cette version." -"Only registered users can write reviews. Please, log in or register.","Seuls les utilisateurs inscrits peuvent écrire des commentaires. Veuillez vous connecter ou vous inscrire." -"Open","Open" -"Options","Options" -"Options menu items","Options du menu des objets" -"Order","Order" -"Order #","Order #" -"Order #%s - %s","Commande #%s - %s" -"Order Date: %s","Date de la commande : %s" -"Order Details Updated","Order Details Updated" -"Order ID","Order ID" -"Order ID:","Order ID:" -"Order Info","Order Info" -"Order List Updated","Order List Updated" -"Order Number","Order Number" -"Order Review","Order Review" -"Order canceled","Order canceled" -"Order failed","Order failed" -"Order id is not specified.","L'id de la commande n'est pas spécifié." -"Order is not available.","La commande n'est pas disponible." -"Ordered","Commandé" -"Ordered Items","Ordered Items" -"Orders","Orders" -"Other amount","Other amount" -"Out of Stock","Out of Stock" -"Output format is not specified. Please, specify ""format"" key in constructor, or set it using setFormat().","Le format de sortie n'est pas spécifié. Veuillez spécifer la clé de ""format"" dans le constructeur, ou la définir à l'aide de setFormat()." -"Overall Activity","Overall Activity" -"POST data is not valid.","Les données POST sont invalides." -"Pages","Pages" -"Password","Mot de passe" -"Password fields cannot be empty.","Les champs mot de passe ne peuvent pas être vides." -"Password is not specified","Password is not specified" -"Password:","Password:" -"PayPal","PayPal" -"PayPal Checkout","PayPal Checkout" -"PayPal MECL is the mobile version of PayPal\'s Express Checkout service. You can choose to use MECL alongside standard checkout, or use it as your only checkout method for Magento Mobile.","Paypal MECL est la version mobile du service Express Checkout de Paypal. Vous pouvez choisir d'utiliser MECL aux côtés du passage en caisse standard, ou de l’utiliser comme votre seule méthode de passage en caisse pour Magento Mobile." -"PayPal MEP","MEP Paypal" -"PayPal Mobile Embedded Payment (MEP)","PayPal Mobile Embedded Payment (MEP)" -"PayPal Mobile Express Checkout","Paypal Express Checkout Mobile" -"PayPal Mobile Express Checkout Library (MECL)","Bibliothèque Paypal Express Checkout Mobile" -"PayPal Mobile Express Checkout Token does not exist.","Le jeton Paypal Express Checkout Mobile n'existe pas." -"Payer Email: %s","Courriel du payeur : %s" -"Payment Applicable From","Paiement applicable depuis" -"Payment Bridge module unavailable.","Module Payment Bridge indisponible." -"Payment Information","Payment Information" -"Payment Method","Méthode de Paiement" -"Payment Method has been set.","La méthode de paiement a été configurée." -"Payment Methods","Méthodes de paiement" -"Payment method","Payment method" -"Payment method was successfully set.","La méthode de paiement a été configurée avec succès." -"Paypal MEP doesn\'t support checkout with any discount.","Paypal ECM ne prend pas en charge les commandes bénéficiant d'une réduction." -"Place Order","Place Order" -"Placing order ...","Placing order ..." -"Please click here to see how to setup and retrieve API credentials.","Veuillez cliquer ici pour voir comment mettre en place et récupérer des informations d'authentification API." -"Please Select Application","Veuillez sélectionner une application" -"Please Select Device Type","Veuillez sélectionner un type d'appareil" -"Please agree to all the terms and conditions before placing the order.","Veuillez accepter toutes les conditions générales avant de passer la commande." -"Please create and save an application first.","Veuillez d'abord créer et sauvegarder une application." -"Please enter ""App Title"".","Veuillez saisir le ""Titre de l'application""." -"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Veuillez entrer une URL valide. Le protocole est nécessaire (http://, https:// ou ftp://)" -"Please enter a valid date.","Veuillez saisir une date valide." -"Please enter a valid email address. For example johndoe@domain.com.","Veuillez entrer une adresse email valide. Par exemple johndoe@domaine.com." -"Please enter at least one email recipient","Please enter at least one email recipient" -"Please enter issue number or start date for switch/solo card type.","Veuillez entrer le numéro de problème ou la date de début pour le type de carte Switch/Solo." -"Please enter the Activation Key.","Veuillez saisir la clé d'activation." -"Please enter the Copyright.","Veuillez saisir le Copyright." -"Please enter the Description.","Veuillez saisir la description." -"Please enter the Price.","Veuillez saisir le prix." -"Please enter the Resubmission Key.","Veuillez saisir la clé de re-soumission." -"Please enter the Title.","Veuillez saisir le titre." -"Please make sure your passwords match.","Veillez à ce que vos mots de passe correspondent." -"Please save application first.","Please save application first." -"Please select an option.","Veuillez sélectionner une option." -"Please select at least one country.","Veuillez saisir au moins un pays." -"Please select payment method to cover a quote","Please select payment method to cover a quote" -"Please set email","Please set email" -"Please specify payment method","Please specify payment method" -"Please specify shipping method","Please specify shipping method" -"Please upload an image for ""App Background (landscape mode)"" field from Design Tab.","Veuillez uploader une image pour le champ ""Arrière-plan application (mode paysage)"" de l'onglet Design." -"Please upload an image for ""App Background (portrait mode)"" field from Design Tab.","Veuillez uploader une image pour le champ ""Arrière-plan application (mode portrait)"" de l'onglet Design." -"Please upload an image for ""App Background"" field from Design Tab.","Veuillez uploader une image pour le champ ""Arrière-plan application"" de l'onglet Design." -"Please upload an image for ""Banner on Home Screen (landscape mode)"" field from Design Tab.","Veuillez télécharger une image de ""Bannière de fond d'écran (mode paysage)"" dans le champ de l'onglet Design." -"Please upload an image for ""Banner on Home Screen (portrait mode)"" field from Design Tab.","Veuillez télécharger une image de ""Bannière de fond d'écran (mode portrait)"" dans le champ de l'onglet Design." -"Please upload an image for ""Banner on Home Screen"" field from Design Tab.","Veuillez soumettre une image pour le champ ""Bannière sur l'écran d'accueil"" depuis l'onglet Design" -"Please upload an image for ""Logo in Header"" field from Design Tab.","Veuillez soumettre une image pour le champ ""Logo sur le header depuis l'onglet Design" -"Please use letters only (a-z or A-Z) in this field.","Veuillez n'utiliser que des lettres (a-z ou A-Z) dans ce champ." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Veuillez n'utiliser que des chiffres dans ce champ. Evitez les espaces et autres caractères tels que des points ou des virgules." -"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Veuillez uniquement utiliser des lettres (a-z ou A-Z) ou des chiffres (0-9) dans ce champ. Aucune espace ou aucun autre caractère n'est autorisé." -"Please wait...","Please wait..." -"Please, specify gift card amount!","Please, specify gift card amount!" -"Portrait app Background","Portrait app Background" -"Portrait banners on Home Screen","Portrait banners on Home Screen" -"Post data is empty.","Post data is empty." -"Post this product to your wall","Post this product to your wall" -"Posting to e-mails","Posting to e-mails" -"Preferred size: %spx x %spx.","Preferred size: %spx x %spx." -"Prefix","Préfixe" -"Preset Theme","Thème présélectionné" -"Preview","Aperçu" -"Price","Prix" -"Price Font Color","Couleur de la police du prix" -"Price excluding tax","Price excluding tax" -"Price including tax","Price including tax" -"Primary Color","Couleur principale" -"Primary Font Color","Couleur principale de la police" -"Problem changing or sending password.","Problème en changeant ou en envoyant le mot de passe." -"Proceed to Checkout","Proceed to Checkout" -"Product","Product" -"Product Added to Cart","Product Added to Cart" -"Product Added to Wishlist","Product Added to Wishlist" -"Product Gallery Updated","Product Gallery Updated" -"Product Name3 ","Nom de produit3" -"Product Name3 1","Nom de produit3 1" -"Product Name3 2","Nom de produit3 2" -"Product Options Updated","Product Options Updated" -"Product Removed From Wishlist","Product Removed From Wishlist" -"Product Reviews Updated","Product Reviews Updated" -"Product SKU","Product SKU" -"Product Updated","Product Updated" -"Product added","Product added" -"Product is out of stock","Product is out of stock" -"Product is unavailable.","Le produit n'est pas disponible<" -"Product only available on the website.","Product only available on the website." -"Product succesfully added to cart","Product succesfully added to cart" -"Product was not specified.","Le produit n'a pas été spécifié." -"Product(s) currently out of stock.","Les produits sont actuellement épuisés." -"Products","Products" -"Pull Down To Update..","Pull Down To Update.." -"Purchase Order Number","Numéro de commande" -"Push Notification","Notification Push" -"Push Notifications allow you to send messages directly to the people who have installed your app on their device. Send messages to your full audience even when your app is closed. Push Notifications are one of the best ways to keep your app active by delivering valuable content directly to your customers. Learn more about Push Notifications - %1$s","Les notifications push vous permettent d'envoyer des messages directement aux personnes qui ont installé votre application sur leur appareil. Envoyez des messages à votre public complet, même lorsque votre application est fermée. Les notifications push sont une des meilleures façons de garder votre application active en offrant un contenu de valeur directement à vos clients. En savoir plus sur les notifications push - %1$s" -"Push Title","Titre Push" -"Push message","Message Push" -"Push title","Titre Push" -"Qty","Qty" -"Qty:","Qty:" -"Quantity","Quantity" -"Quantity:","Quantity:" -"Queue Date","Date de la file d'attente" -"Queue Message","Message de la file d'attente" -"Queue does not exist.","La file d'attente n'existe pas" -"Queue is allowed only for applications with enabled Push Notification.","La file d'attente est autorisée uniquement pour les applications ayant la notification Push activée." -"Quote instance is required.","Estimation requise." -"Quote item is not found.","Quote item is not found." -"Range param doesn\'t recognized","Range param doesn\'t recognized" -"Ratings and Reviews","Ratings and Reviews" -"Read the Terms and Conditions","Read the Terms and Conditions" -"Recent Activity","Recent Activity" -"Recipient Information","Informations du destinataire" -"Recommended size %spx x %spx.","Recommended size %spx x %spx." -"Recommended size 1024px x 344px. Note: Image size affects the performance of your app.","Taille recommandée 1024px x 344px. Remarque: la taille de l'image affecte les performances de votre application." -"Recommended size 1024px x 704px. Note: Image size affects the performance of your app.","Taille recommandée : 1024 x 704 pixels. Note : La taille de l'image affecte la performance de votre application." -"Recommended size 320px x 230px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Taille recommandée : 320 x 230 pixels. Note : la taille de l'image affecte la performance de votre application. Veillez à conserver une taille d'image inférieure à 50 KB pour une performance optimale." -"Recommended size 320px x 258px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Taille recommandée : 320 x 258 pixels. Note : la taille de l'image affecte la performance de votre application. Veillez à conserver une taille d'image inférieure à 50 KB pour une performance optimale." -"Recommended size 320px x 367px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.","Taille recommandée : 320 x 367 pixels. Note : la taille de l'image affecte la performance de votre application. Veillez à conserver une taille d'image inférieure à 75 KB pour une performance optimale." -"Recommended size 35px x 35px.","Taille recommandée : 35 x 35 pixels." -"Recommended size 768px x 294px. Note: Image size affects the performance of your app.","Taille recommandée : 768 x 294 pixels. Note : la taille de l'image affecte la performance de votre application." -"Recommended size 768px x 960px. Note: Image size affects the performance of your app.","Taille recommandée : 768 x 960 pixels. Note : la taille de l'image affecte la performance de votre application." -"Recommended size: %spx x %spx at %s dpi.","Recommended size: %spx x %spx at %s dpi." -"Recommended size: %spx x %spx.","Recommended size: %spx x %spx." -"Recover","Recover" -"Redeem","Redeem" -"Redeeming Gift Card %@","Redeeming Gift Card %@" -"Redemption functionality is disabled.","La fonctionnalité de rédemption est désactivée." -"Refunded","Remboursé" -"Regions","Regions" -"Register","Register" -"Registering cart ...","Registering cart ..." -"Registering user ...","Registering user ..." -"Regular","Regular" -"Regular and confirmation passwords must be equal","Le mot de passe saisi et le mot de passe de confirmation doivent être semblables." -"Related Product Background Color","Couleur arrière-plan produit associé" -"Release To Update...","Release To Update..." -"Relevance","Relevance" -"Remaining downloads","Remaining downloads" -"Remove","Remove" -"Remove Address...","Remove Address..." -"Removing %@...","Removing %@..." -"Removing Coupon...","Removing Coupon..." -"Removing Gift Card...","Removing Gift Card..." -"Removing Product from WishList...","Removing Product from WishList..." -"Removing Store Credit...","Removing Store Credit..." -"Request internal error.","Demande d'erreur interne." -"Request param %s is missed","Request param %s is missed" -"Required size: %spx x %spx.","Required size: %spx x %spx." -"Reset theme to default","Réinitialiser au thème par défaut" -"Resubmission Key","Clé de re-soumission" -"Resubmit App","Soumettre à nouveau l'application" -"Resubmit App failure. %s","Resubmit App failure. %s" -"Results","Results" -"Revenue","Revenue" -"Revert","Revert" -"Revert Discount","Revert Discount" -"Review","Revoir" -"Rich Push allows you to create and send engaging experiences by adding HTML and other rich media components to your push notifications. Moving beyond alerts and badge updates, Rich Push takes users into the app while displaying content in a customizable WebKit view. Create branded messages that engage your users with new content and information, all without having to update your app. Learn more about Rich Push - %1$s","Rich Push vous permet de créer et d'envoyer des expériences séduisantes en ajoutant des composants HTML et d'autres composants médias à vos notifications push. Au-delà des alertes et des mises à jour de badges, Push Rich prend les utilisateurs dans l'app, tout en affichant le contenu d'une vue personnalisable WebKit. Créer des messages propre à votre marque qui livrent à vos utilisateurs de nouveaux contenus et de l'information, le tout sans avoir à mettre à jour votre application. En savoir plus sur push Rich - %1$s" -"SORT BY:","TRIER PAR :" -"Sample","Sample" -"Samples","Samples" -"Save","Enregistrer" -"Save As","Enregistrer sous" -"Save Theme","Enregistrer thème" -"Save and Continue Edit","Enregistrer et continuer la modification" -"Save and Submit App","Sauvegarder et soumettre l'application" -"Save in address book","Sauvegarder dans le carnet d'adresses" -"Saving Address...","Saving Address..." -"Saving changes ...","Saving changes ..." -"Saving shipping address ...","Saving shipping address ..." -"Saving shipping methods ...","Saving shipping methods ..." -"Screen resolution is not supported","Screen resolution is not supported" -"Screens:","Ecrans :" -"Scroll Background Color","Parcourir les couleurs d'arrière-plan" -"Search","Chercher" -"Search Term","Search Term" -"Search Updated","Search Updated" -"Searching for %@...","Searching for %@..." -"Secondary Color","Couleur secondaire" -"Secondary Font Color","Couleur secondaire de police" -"See all","See all" -"Select %@","Select %@" -"Select All","Sélectionner tout" -"Select Chart","Select Chart" -"Select Links","Select Links" -"Select Options","Select Options" -"Select Payment Method","Select Payment Method" -"Select Range","Select Range" -"Select a","Select a" -"Select a Billing Address","Select a Billing Address" -"Select a Shipping Address","Select a Shipping Address" -"Select from Address Book","Select from Address Book" -"Select shipping method","Select shipping method" -"Selected product is unavailable.","Le produit sélectionné est indisponible." -"Send","Send" -"Sender Information","Informations de l'expéditeur" -"Sending e-mail failed...","Sending e-mail failed..." -"Set","Set" -"Settings","Réglages" -"Shake device to reset the filter","Shake device to reset the filter" -"Share","Share" -"Share on LinkedIn","Share on LinkedIn" -"Share on Twitter","Share on Twitter" -"Ship method","Ship method" -"Shipped","Expédié" -"Shipping","Shipping" -"Shipping Address","Adresse d'expédition" -"Shipping Method","Méthode d'expédition" -"Shipping address","Shipping address" -"Shipping address has been set.","L'adresse d'expédition a été définie." -"Shipping method","Shipping method" -"Shipping method has been set.","La méthode d'expédition a été définie." -"Shipping method is required","Le mode de livraison est requis" -"Shipping method successfully updated","La méthode d'expédition a bien été mise à jour" -"Shipping to this address is not possible.","La livraison à cette adresse n'est pas possible." -"Shop","Achetez" -"Shop All","Shop All" -"Shop Updated","Shop Updated" -"Shopping Cart","Shopping Cart" -"Shopping cart is empty.","Le panier est vide." -"Show Password","Show Password" -"Sign In","Sign In" -"Signing In...","Signing In..." -"Signing Out ...","Signing Out ..." -"Sky Blue","Bleu Ciel" -"Social Networking","Réseautage social" -"Some emails were not sent.","Certains emails n'ont pas été envoyés." -"Sorry, no payment options are available for this order at this time.","Désolé, aucune option de paiement n'est disponible pour cette commande pour le moment." -"Sorry, no quotes are available for this order at this time.","Désolé, aucune offre n'est disponible pour cette commande pour le moment." -"Sorry, there are no items in this category.","Sorry, there are no items in this category." -"Special","Special" -"Special Excl. Tax","Special Excl. Tax" -"Special Incl. Tax","Special Incl. Tax" -"Specific Countries","Pays spécifiques" -"Specified address does not exist.","L'adresse indiquée n'existe pas." -"Specified invalid app code.","Code d'application invalide." -"Specified invalid data.","Données invalides." -"Specified item does not exist in wishlist.","L'article spécifié n'existe pas dans la liste de souhaits." -"Standard Checkout","Paiement standard" -"Standard Checkout uses the checkout methods provided by Magento. Only inline payment methods are supported. (e.g PayPal Direct, Authorize.Net, etc.)","Le paiement standard utilise les méthodes de paiement fournies par Magento. Seuls les paiements en ligne sont acceptés (par. ex. : PayPal Direct, Authorize.Net, etc.)" -"Start Date","Date de début" -"Start Date - Month","Date de début - Mois" -"Start Date - Year","Date de début - Année" -"Starting At","Starting At" -"Starting At Excl. Tax","Starting At Excl. Tax" -"Starting At Incl. Tax","Starting At Incl. Tax" -"Starting at excl. tax","Starting at excl. tax" -"Starting at incl. tax","Starting at incl. tax" -"State/Province","Etat / région" -"Status","Statut" -"Storage of offline cart on server failed. Please retry later","Storage of offline cart on server failed. Please retry later" -"Store Credit Info Updated","Store Credit Info Updated" -"Store Credit payment is not being used in your shopping cart.","Le paiement de crédit du magasin n'est pas utilisé dans votre panier." -"Store View","Vue boutique" -"Store credit","Store credit" -"Store logo that is displayed on copyright page of app.","Store logo that is displayed on copyright page of app." -"Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.","Logo de la boutique qui est affiché sur la page du copyright de l'application. Taille préférée : 100 x 100 pixels." -"Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px.","Sauvegarder le logo présenté sur la page des droits d'auteur de l'app. Taille idéale : 200px x 200px." -"Store switcher hasn\'t been defined","Store switcher hasn\'t been defined" -"Street Address","Adresse de la rue" -"Street Address 2","Adresse de la rue 2" -"Subject:","Subject:" -"Submission","Soumission" -"Submission Fields","Champs de soumission" -"Submission History","Historique de la soumission" -"Submit App","Soumettre l'App" -"Submit App ""%s""","Soumettre l'App ""%s""" -"Submit App failure. %s","Échec de la soumission de l'App. %s" -"Submit App failure. Invalid activation key provided","Échec de la soumission de l'App. Le code d'activation saisi est incorrect." -"Submit Review","Submit Review" -"Submitted","Soumise" -"Submitting Review...","Submitting Review..." -"Subtotal","Subtotal" -"Subtotal (Excl. Tax)","Sous-total (sans les taxes)" -"Subtotal (Incl. Tax)","Sous-total (TTC)" -"Subtotal Excl. Tax","Subtotal Excl. Tax" -"Subtotal Incl. Tax","Subtotal Incl. Tax" -"Subtotal excluding tax","Subtotal excluding tax" -"Subtotal incl. tax:","Subtotal incl. tax:" -"Subtotal including tax","Subtotal including tax" -"Subtotal:","Subtotal:" -"Success","Success" -"Successfully posted to Facebook","Successfully posted to Facebook" -"Successfully posted to Linkedin","Successfully posted to Linkedin" -"Suffix","Suffixe" -"Summary of Your Review","Résumé de votre remarque" -"Swipe a product to reveal more options","Swipe a product to reveal more options" -"T-Shirts","T-shirts" -"Tabs","Tabulations" -"Tax","Taxe" -"Telephone","Téléphone" -"Tell a Friend","Le dire à un ami" -"Tell a Friend is disabled.","Le dire à un ami est désactivé." -"Tell a Friend link has been sent.","Le lien Le dire à un ami a été envoyé." -"Template","Formulaire" -"Template Content","Contenu du formulaire" -"Template Name","Nom du formulaire" -"Template does not exist.","Le formulaire n'existe pas." -"Template for new AirMail Message does not exist.","Il n'existe pas de modèle pour le nouveau message AirMail." -"Template has been deleted.","Le modèle a été supprimé." -"Terms And Conditions","Terms And Conditions" -"Text length does not satisfy specified max text range.","La longueur du texte ne correspond pas à la longueur maximale de texte spécifiée." -"Text length does not satisfy specified min text range.","La longueur du texte ne correspond pas à la longueur minimale de texte spécifiée." -"Thank you for registering!","Merci de votre inscription !" -"Thank you for your purchase! ","Merci de votre commande !" -"The %s field should be filled.","The %s field should be filled." -"The Mailbox title will be shown in the More Info tab. To understand more about the title, please click here","Le titre de la boîte aux lettres sera affiché dans l'onglet Plus d'infos. Pour en savoir plus sur le titre, veuillez clicquer ici" -"The application is currently inactive.\nPlease try again later.","The application is currently inactive.\nPlease try again later." -"The cart is empty","The cart is empty" -"The custom amount value should be higher than 0.","The custom amount value should be higher than 0." -"The custom amount value should not be higher than %s.","The custom amount value should not be higher than %s." -"The custom amount value should not be lower than %s.","The custom amount value should not be lower than %s." -"The following email(s) are either mistyped or have incorrect format. Check them and try again:\n","The following email(s) are either mistyped or have incorrect format. Check them and try again:\n" -"The icon that appears in the Android Market.","The icon that appears in the Android Market." -"The icon that appears in the Android Market. Recommended size: 512px x 512px. Maximum size: 1024 KB.","L'icône qui apparait sur Android Market.Taille recommandée : 512 x 512 pixels. Taille maximum : 1024 KB." -"The length of the text in the %s field is too big. Please shorten the text.","The length of the text in the %s field is too big. Please shorten the text." -"The max length of the field ""%@"" is %d!","The max length of the field ""%@"" is %d!" -"The minimum password length is 6","The minimum password length is 6" -"The server responded with invalid data.","The server responded with invalid data." -"The shortening service returned status code %d indicating a client side error.","The shortening service returned status code %d indicating a client side error." -"The shortening service returned status code %d indicating a server side error.","The shortening service returned status code %d indicating a server side error." -"The store credit payment has been removed from shopping cart.","Le paiement de crédit du magasin a été retiré du panier." -"The value is too big!","The value is too big!" -"The value should not be greater than %.2f!","The value should not be greater than %.2f!" -"The value should not be less than %.2f!","The value should not be less than %.2f!" -"Theme configurations are successfully reset.","Les configurations de thème sont réinitialisées." -"Theme has been created.","Le thème a été créé." -"Theme has been delete.","Le thème a été supprimé." -"Theme label can\'t be empty","Le nom de thème ne peut être vide" -"Theme label:","Nom de thème:" -"Theme name is not set.","Le nom du thème n'est pas défini." -"There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?","There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?" -"There are no items here","There are no items here" -"There are no items in your cart","There are no items in your cart" -"There is an error in loading an app\'s configuration","There is an error in loading an app\'s configuration" -"There is an error in retrieving the data. Please try again later","There is an error in retrieving the data. Please try again later" -"There is no addresses for this contact","There is no addresses for this contact" -"There is no store credit history!","There is no store credit history!" -"There were some problems with the data.","Il y a eu quelques problèmes avec les données." -"This email address was not found in our records.","Cette adresse email est introuvable dans notre système." -"This functionality disabled in offline mode","This functionality disabled in offline mode" -"This is a required field.","Ceci est un champ obligatoire." -"This product has no images.","This product has no images." -"Title","Titre" -"Title bar","Barre de titre" -"To","To" -"To Excl. Tax","To Excl. Tax" -"To Incl. Tax","To Incl. Tax" -"To activate PayPal MEP payment method activate Express checkout first. ","Pour activer la méthode de paiement PayPal MEP, activez d'abord le paiement Express." -"To excl. tax","To excl. tax" -"To incl. tax","To incl. tax" -"To preview the newly uploaded images, please save your application first.","To preview the newly uploaded images, please save your application first." -"To:","To:" -"Token has not been set.","Le jeton n'a pas été réglé." -"Too many recipients have been set. Max amount of recipients is:","Too many recipients have been set. Max amount of recipients is:" -"Top Search Terms","Top Search Terms" -"Total","Total" -"Total Order Amount","Total Order Amount" -"Total incl. Tax: %1$s","Total, TVA incl. : %1s" -"Total incl. tax","Total incl. tax" -"Totals","Totals" -"Touch and hold a product to delete from shopping cart","Touch and hold a product to delete from shopping cart" -"Touch and hold a product to reveal more options","Touch and hold a product to reveal more options" -"Try Again","Try Again" -"Twitter","Twitter" -"Twitter API","Twitter API" -"Twitter API Key","Clé Twitter API" -"Twitter Authorization","Twitter Authorization" -"Twitter Autorization","Twitter Autorization" -"Twitter Secret Key","Clé secrète Twitter" -"Twitter post failed...","Twitter post failed..." -"Type","Type" -"Type and data is required","Type and data is required" -"URL","URL" -"Unable to cancel Mobile Express Checkout.","Impossible d'annuler Mobile Express Checkout." -"Unable to cancel queue.","Impossible d'annuler la file d'attente" -"Unable to collect cart totals.","Impossible de recueillir les totaux des paniers." -"Unable to delete queue.","Impossible de supprimer la file d'attente." -"Unable to find an app to delete.","Impossible de trouver une application à supprimer." -"Unable to find template to delete.","Impossible de trouver un modèle à supprimer." -"Unable to get shipping methods list.","Impossible d'obtenir la liste des méthodes d'expédition." -"Unable to initialize MEP Checkout.","Impossible d'initialiser le paiement MEP." -"Unable to initialize PayPal Mobile Express Checkout.","Impossible d'initialiser PayPal Mobile Express Checkout." -"Unable to initialize express checkout review.","Impossible d'initialiser la revue de checkout express." -"Unable to initialize express checkout shipping method list.","Impossible d'initialiser la liste de modes d'expéditions express checkout." -"Unable to initialize return action.","Impossible d'initialiser l'action de retour." -"Unable to load addresses.","Impossible de charger les adresses." -"Unable to load application form.","Impossible de charger le formulaire de demande." -"Unable to load banners.","Unable to load banners." -"Unable to load billing address form.","Impossible de charger le formulaire d'adresse de facturation." -"Unable to load billing address.","Impossible de charger l'adresse de facturation." -"Unable to load categories.","Impossible de charger les catégories." -"Unable to load checkout.","Impossible de charger le passage en caisse." -"Unable to load localization.","Unable to load localization." -"Unable to load order list.","Impossible de charger la liste de la commande." -"Unable to load order review.","Impossible de charger la revue de la commande." -"Unable to load product gallery.","Impossible de charger la présentation photographique du produit." -"Unable to load product info.","Impossible de charger les informations ud produit." -"Unable to load product options.","Impossible de charger les options des produits." -"Unable to load product review.","Impossible de charger l'évaluation du produit." -"Unable to load product reviews.","Impossible de charger les évaluations des produits." -"Unable to load review form.","Impossible de charger le formulaire de revue." -"Unable to load search.","Impossible de charger la recherche." -"Unable to load shipping address form.","Impossible de charger le formulaire d'adresse d'expédition." -"Unable to place the order.","Impossible d'effectuer la commande." -"Unable to post the review.","Impossible de poster l'aperçu." -"Unable to process preview.","Impossible de gérer l'aperçu." -"Unable to render a gift card account.","Impossible de rendre un compte de carte cadeau." -"Unable to render an order.","Impossible de rendre une commande." -"Unable to render downloadable products.","Unable to render downloadable products." -"Unable to render the store credits.","Impossible de rendre les crédits magasin." -"Unable to save app.","Impossible d'enregistrer l'application." -"Unable to save message.","Impossible d'enregistrer le message." -"Unable to save shipping address.","Impossible d'enregistrer l'adresse livraison." -"Unable to save shipping method.","Impossible d'enregistrer le moyen de livraison." -"Unable to save template.","Impossible d'enregistrer le modèle." -"Unable to start MEP Checkout.","Impossible de lancer le paiement MEP" -"Unable to start Mobile Express Checkout.","Impossible de démarrer Mobile Express Checkout." -"Unable to update shipping method.","Impossible de mettre à jour la méthode d'expédition." -"Undefined","Non défini" -"Unit Price","Unit Price" -"Unit Price:","Unit Price:" -"Unknown Error","Erreur indéterminée" -"Unknown Error.","Erreur indéterminée." -"Unknown Payment Bridge Error","Unknown Payment Bridge Error" -"Unknown error ocured. Please retry later","Unknown error ocured. Please retry later" -"Unsupported character in path: ""%s""","Caractère non pris en charge dans le circuit: ""%s""" -"Unsupported value type received","Type de valeur non prise en charge reçue" -"Update Comment Error","Update Comment Error" -"Update Preview","Aperçu mise à jour" -"Updating ...","Updating ..." -"Updating Cart...","Updating Cart..." -"Upon receiving these credentials, please fill in the corresponding fields.","Sur réception de ces informations d'identification, veuillez remplir les champs correspondants." -"Urban Airship Push Notification","Urban Airship Push Notification" -"Use Billing Address","Use Billing Address" -"Use Store Credit (%s available)","Utiliser un crédit magasin (%s disponible)" -"Use as my default billing address","Utiliser comme mon adresse de facturation par défaut." -"Use as my default shipping address","À utiliser comme mon adresse de livraison par défaut" -"Use billing address for shipping","Use billing address for shipping" -"User Name:","User Name:" -"User session is expired","User session is expired" -"Version","Version" -"View Cart","View Cart" -"View Details","Vue détails" -"View Gallery","Voir la Galerie" -"View Wishlist","View Wishlist" -"Warning: All related AirMail messages will be deleted!","Alerte: Tous les messages liés à AirMail seront supprimés !" -"Website is offline","Website is offline" -"Website is offline.","Le site web est hors ligne" -"WishList Updated","WishList Updated" -"Wishlist has been cleared.","La liste de voeux a été effacée." -"Wishlist has been updated.","La liste de voeux a été mise à jour." -"Wishlist has been updated. But there are accrued some errors while updating some items.","La liste de voeux a été mise à jour. Mais certains erreurs sont apparues lors de la mise à jour d'objets." -"Wishlist is empty.","Wishlist is empty." -"Write a Review","Write a Review" -"Write a review","Write a review" -"Wrong Ipad background image orientation has been specified: ""%s"".","L'orientation du fond d'écran de l'iPad est incorrecte. ""%s""." -"Wrong PayPal Mobile Express Checkout Token specified.","Erreur sur le jeton PayPal Mobile Express Checkout spécifié." -"Wrong device type.","Mauvais type d'appareil." -"Wrong email format","Format d'email incorrect" -"Wrong or expired Gift Card Code.","Code de carte cadeau expiré ou faux." -"Wrong theme format.","Format de thème incorrect" -"YYYY","YYYY" -"Year","Année" -"Yes","Yes" -"You are already logged in.","Vous êtes déjà connecté" -"You are not logged in","You are not logged in" -"You can watch statistics here.","Vous pouvez regarder les statistiques ici." -"You canceled your order. Touch ""Pay with PayPal"" to try again.","You canceled your order. Touch ""Pay with PayPal"" to try again." -"You have entered an incorrect decimal value in the custom amount field. Provide a valid value.","You have entered an incorrect decimal value in the custom amount field. Provide a valid value." -"You have placed no orders.","You have placed no orders." -"You have uncommitted actions. Commit?","You have uncommitted actions. Commit?" -"You may also like","You may also like" -"You must login first","You must login first" -"You must read and agree to the Terms and Conditions before placing your order.","You must read and agree to the Terms and Conditions before placing your order." -"You need to enable PayPal Express Checkout first from the Payment configuration before enabling PayPal MECL.","Vous devez activer PayPal Express Checkout tout d'abord dans la configuration de paiement avant d'activer PayPal MECL." -"You will receive an order confirmation email with details of your order and a link to track its progress.","Vous recevrez un email de confirmation de commande avec les détails de votre commande et un lien pour sa progression." -"Your current balance is:","Votre solde actuel est de :" -"Your order # is: %s. ","Votre commande # est %s." -"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it." -"Your order failed. Touch ""Pay with PayPal"" to try again.","Your order failed. Touch ""Pay with PayPal"" to try again." -"Your review has been accepted for moderation.","Votre revue a été acceptée." -"Your tweet has been sent. Thanks for sharing this product on Twitter","Your tweet has been sent. Thanks for sharing this product on Twitter" -"Zip/Postal Code","Code postal" -"\'%s\' exceeds the allowed file size: %d (bytes)","\'%s\' dépasse la taille de fichier autorisé : %d (octets)" -"\'%s\' height exceeds allowed value of %d px","\'%s\' hauteur dépasse la valeur autorisée de %d px" -"\'%s\' is not a valid file extension. Allowed extensions: %s","\'%s\'n'est pas une extension de fichier valide. Extensions autorisées : %s" -"\'%s\' width exceeds allowed value of %d px","La largeur de \'%s\' dépasse la valeur autorisée de %d px" -"and","et" -"as Guest","as Guest" -"each","chaque" -"field is required","field is required" -"iPad","iPad" -"iPhone","iPhone" -"image_id is required","image_id is required" -"not set","not set" -"required","required" -"save","enregistrer" -"ver. %s","ver. %s" diff --git a/app/locale/fr_FR/Phoenix_Moneybookers.csv b/app/locale/fr_FR/Phoenix_Moneybookers.csv deleted file mode 100644 index 01a226249..000000000 --- a/app/locale/fr_FR/Phoenix_Moneybookers.csv +++ /dev/null @@ -1,42 +0,0 @@ -"All Credit Cards / Visa, Mastercard, AMEX, JCB, Diners (powered by Moneybookers) - International","Toutes cartes de crédit / Visa, Mastercard, AMEX, JCB, Diners (par Moneybookers) - International" -"CartaSi (powered by Moneybookers) - Italy","CartaSi (par Moneybookers) - Italie" -"Carte Bleue (powered by Moneybookers) - France","Carte Bleue (par Moneybookers) - France" -"Customer ID","Identifiant utilisateur" -"Dankort (powered by Moneybookers) - Denmark","Dankort (par Moneybookers) - Danemark" -"EPS Online-Überweisung (powered by Moneybookers) - Austria","EPS Online-Überweisung (par Moneybookers) - Autriche" -"Enabled","Actif" -"Find out more about Online Bank Transfer","En savoir plus sur Online Bank Transfer" -"Giropay (powered by Moneybookers) - Germany","Giropay (par Moneybookers) - Germany" -"Laser (powered by Moneybookers) - Ireland","Laser (par Moneybookers) - Irlande" -"Lastschrift (ELV) (powered by Moneybookers) - Germany","Lastschrift (ELV) (par Moneybookers) - Allemagne" -"Loading secure payment page (SSL)","Chargement de la page de paiement sécurisé (SSL)" -"Maestro (powered by Moneybookers) - United Kingdom, Austria, Spain","Maestro (fourni par Moneybookers) - Royaume-Uni, Autriche, Espagne" -"Moneybookers","Moneybookers" -"Moneybookers Settings","Paramètres Moneybookers" -"Moneybookers Transaction ID: %s","Identifiant de la transaction Moneybookers : %s" -"Moneybookers eWallet","eWallet Moneybookers" -"More information about Moneybookers","En savoir plus sur Moneybookers" -"Nordea Solo (powered by Moneybookers) - Finland","Nordea Solo (par Moneybookers) - Finlande" -"Nordea Solo (powered by Moneybookers) - Sweden","Nordea Solo (par Moneybookers) - Suède" -"Online Bank Transfer (powered by Moneybookers)","Online Bank Transfer (fourni par Moneybookers)" -"Order ID","Identifiant commande" -"POLi (powered by Moneybookers) - Australia","POLi (par Moneybookers) - Australie" -"Payment failed.","Échec du paiement." -"Payment from Applicable Countries","Paiement depuis les pays applicables" -"Payment from Specific Countries","Paiement depuis les pays spécifiques" -"Payment has not been processed yet.","Le paiement n'a pas encore été validé." -"Payment was canceled.","Paiement annulé." -"Pending bank transfer created.","Virement bancaire en attente créé." -"Please pay your order now","Veuillez payer votre commande maintenant." -"Postepay (powered by Moneybookers) - Italy","Postepay (géré par Moneybookers) - Italie" -"Powered by Moneybookers","Fourni par Moneybookers" -"Przelewy24 (powered by Moneybookers) - Poland","Przelewy24 (géré par Moneybookers) - Polande" -"Sofortüberweisung (powered by Moneybookers) - Germany","Sofortüberweisung (géré par Moneybookers) - Allemagne" -"Sort Order","Trier la commande" -"The amount has been authorized and captured by Moneybookers.","Le montant a été autorisé et récupéré de Moneybookers." -"The customer was redirected to Moneybookers.","Le client a été redirigé vers Moneybookers." -"The order has been canceled.","La commande a été annulée." -"Title","Titre" -"You will be redirected to our secure payment page when you place an order.","Vous serez redirigé vers notre page de paiement sécurisée lorsque vous placez une commande<" -"eNETS (powered by Moneybookers) - Singapore","eNETS (powered by Moneybookers) - Singapore" -"iDeal (powered by Moneybookers) - Netherlands","iDeal (powered by Moneybookers) - Netherlands" diff --git a/app/locale/fr_FR/template/email/account_new.html b/app/locale/fr_FR/template/email/account_new.html deleted file mode 100644 index 51e3aaa62..000000000 --- a/app/locale/fr_FR/template/email/account_new.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}}
    -

    Chère/Cher {{htmlescape var=$customer.name}},

    -

    Bienvenue dans {{var store.getFrontendName()}}. Pour vous connecter lorsque vous visitez notre site, il vous suffit de cliquer sur Connexion ou Mon compte en haut de chaque page, puis d'entrer votre adresse e-mail et votre mot de passe.

    -

    - Utilisez les valeurs suivantes lorsque vous êtes invité(e) à vous connecter:
    - E-mail: {{var customer.email}}
    - Mot de passe: {{htmlescape var=$customer.password}}

    -

    Lorsque vous vous connectez à votre compte, vous pouvez effectuer les opérations suivantes:

    -
      -
    • – – Procéder au paiement plus rapidement lorsque vous faites un achat
      • -
    • – – Vérifier l'état des commandes
      • -
    • – – Afficher les anciennes commandes
      • -
    • – – Modifier les informations sur votre compte
      • -
    • – – Changer votre mot de passe
      • -
    • – – Enregistrer d'autres adresses (pour l'expédition à plusieurs membres de votre famille et amis !)
      • -
    -

    Si vous avez des questions concernant votre compte ou un autre sujet, n'hésitez pas à nous contacter à l'adresse {{config path='trans_email/ident_support/email'}} ou par téléphone au {{config path='general/store_information/phone'}}.

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/account_new_confirmation.html b/app/locale/fr_FR/template/email/account_new_confirmation.html deleted file mode 100644 index 304e9c3a4..000000000 --- a/app/locale/fr_FR/template/email/account_new_confirmation.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Chère/Cher {{htmlescape var=$customer.name}},

    -

    Votre e-mail {{var customer.email}} doit être confirmé avant de l'utiliser pour vous connecter à notre magasin.

    -

    Pour confirmer l'e-mail et vous connecter instantanément, veuillez utiliser ce lien de confirmation. Ce lien n'est valide qu'une seule fois.

    -

    - Utilisez les valeurs suivantes lorsque vous êtes invité(e) à vous connecter:
    - E-mail: {{var customer.email}}
    - Mot de passe: {{htmlescape var=$customer.password}}

    -

    Si vous avez des questions concernant votre compte ou un autre sujet, n'hésitez pas à nous contacter à l'adresse {{config path='trans_email/ident_support/email'}} ou par téléphone au {{config path='general/store_information/phone'}}.

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/account_new_confirmed.html b/app/locale/fr_FR/template/email/account_new_confirmed.html deleted file mode 100644 index 5ef47c244..000000000 --- a/app/locale/fr_FR/template/email/account_new_confirmed.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Chère/Cher {{htmlescape var=$customer.name}},

    -

    Bienvenue dans {{var store.getFrontendName()}}. Pour vous connecter lorsque vous visitez notre site, il vous suffit de cliquer sur Connexion ou Mon compte en haut de chaque page, puis d'entrer votre adresse e-mail et votre mot de passe.

    -

    Lorsque vous vous connectez à votre compte, vous pouvez effectuer les opérations suivantes:

    -
      -
    • – – Procéder au paiement plus rapidement lorsque vous faites un achat
      • -
    • – – Vérifier l'état des commandes
      • -
    • – – Afficher les anciennes commandes
      • -
    • – – Modifier les informations sur votre compte
      • -
    • – – Changer votre mot de passe
      • -
    • – – Enregistrer d'autres adresses (pour l'expédition à plusieurs membres de votre famille et amis !)
      • -
    -

    Si vous avez des questions concernant votre compte ou un autre sujet, n'hésitez pas à nous contacter à l'adresse {{config path='trans_email/ident_support/email'}} ou par téléphone au {{config path='general/store_information/phone'}}.

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/account_password_reset_confirmation.html b/app/locale/fr_FR/template/email/account_password_reset_confirmation.html deleted file mode 100644 index 71f6c0e1a..000000000 --- a/app/locale/fr_FR/template/email/account_password_reset_confirmation.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    __('Dear {{htmlescape var=$customer.name}}')__,

    -

    Vous avez récemment demandé de changer le mot de passe de votre compte.

    -

    Si vous avez demandé de changer ce mot de passe, veuillez cliquer sur ce lien pour le réinitialiser: {{store url="customer/account/resetpassword/" _query_id=$customer.id _query_token=$customer.rp_token}}

    -

    Si vous ne parvenez pas à cliquer sur le lien, veuillez copier l'URL et le coller directement dans votre navigateur.

    -
    -

    Si vous n'avez pas formulé cette demande, vous pouvez ignorer ce message et votre mot de passe restera inchangé.

    -

    Merci, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/fr_FR/template/email/admin_password_new.html b/app/locale/fr_FR/template/email/admin_password_new.html deleted file mode 100644 index 170fddd92..000000000 --- a/app/locale/fr_FR/template/email/admin_password_new.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Chère/Cher {{htmlescape var=$user.name}},

    -

    Votre nouveau mot de passe est: {{htmlescape var=$password}}

    -

    Vous pouvez changer votre mot de passe à tout moment en vous connectant à votre compte.

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/admin_password_reset_confirmation.html b/app/locale/fr_FR/template/email/admin_password_reset_confirmation.html deleted file mode 100644 index 77fa02f5f..000000000 --- a/app/locale/fr_FR/template/email/admin_password_reset_confirmation.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Cher/chère {{htmlescape var=$user.name}},

    -

    Vous avez récemment demandé de changer le mot de passe de votre compte.

    -

    Si vous avez demandé de changer ce mot de passe, veuillez cliquer sur ce lien pour le réinitialiser: {{store url="adminhtml/index/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}

    -

    Si vous ne parvenez pas à cliquer sur le lien, veuillez copier l'URL et le coller directement dans votre navigateur.

    -
    -

    Si vous n'avez pas formulé cette demande, vous pouvez ignorer ce message et votre mot de passe restera inchangé.

    -

    Merci, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/fr_FR/template/email/amazonpayments_asp_notification_error.html b/app/locale/fr_FR/template/email/amazonpayments_asp_notification_error.html deleted file mode 100644 index 9b19ada4a..000000000 --- a/app/locale/fr_FR/template/email/amazonpayments_asp_notification_error.html +++ /dev/null @@ -1,12 +0,0 @@ - - -
    -
    __('Amazon Simple Pay notification message')__
    -
    __('Request')__:
    -
    {{var request}}
    -
    __('Error')__:
    -
    {{var error}}
    -
    \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/contact_form.html b/app/locale/fr_FR/template/email/contact_form.html deleted file mode 100644 index b4ac67518..000000000 --- a/app/locale/fr_FR/template/email/contact_form.html +++ /dev/null @@ -1,12 +0,0 @@ - - -Nom : {{var data.name}} E-mail : {{var data.email}} Téléphone : {{var data.telephone}} Commentaire : {{var data.comment}} -Courrier électronique: {{var data.email}} -Téléphone: {{var data.telephone}} - -Commentaire: {{var data.comment}} \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/currency_update_warning.html b/app/locale/fr_FR/template/email/currency_update_warning.html deleted file mode 100644 index 5fc9a9e46..000000000 --- a/app/locale/fr_FR/template/email/currency_update_warning.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Avertissements sur les actualisations de devise : {{var warnings}}: - - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/log_clean_warning.html b/app/locale/fr_FR/template/email/log_clean_warning.html deleted file mode 100644 index 51d2f8c7e..000000000 --- a/app/locale/fr_FR/template/email/log_clean_warning.html +++ /dev/null @@ -1,7 +0,0 @@ - - -Avertissements sur le nettoyage des journaux : {{var warnings}}: - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/moneybookers_activateemail.html b/app/locale/fr_FR/template/email/moneybookers_activateemail.html deleted file mode 100644 index 8d6824911..000000000 --- a/app/locale/fr_FR/template/email/moneybookers_activateemail.html +++ /dev/null @@ -1,6 +0,0 @@ - -{{var store.getFrontendName()}}
    -Adresse e-mail Moneybookers: {{var email_addr}}
    -Identification client Moneybookers: {{var customer_id}}
    -URL: {{var url}}
    -Langue: {{var language}}
    diff --git a/app/locale/fr_FR/template/email/newsletter_subscr_confirm.html b/app/locale/fr_FR/template/email/newsletter_subscr_confirm.html deleted file mode 100644 index e7c25eccf..000000000 --- a/app/locale/fr_FR/template/email/newsletter_subscr_confirm.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Merci de vous être abonné(e) à notre bulletin d'information.

    -

    Pour commencer à recevoir le bulletin d'information, vous devez d'abord confirmer votre abonnement en cliquant sur le lien suivant:
    - {{var subscriber.getConfirmationLink()}}

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/newsletter_subscr_success.html b/app/locale/fr_FR/template/email/newsletter_subscr_success.html deleted file mode 100644 index 6745f2a65..000000000 --- a/app/locale/fr_FR/template/email/newsletter_subscr_success.html +++ /dev/null @@ -1,2 +0,0 @@ - -Abonnement au bulletin d'information effectué \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/newsletter_unsub_success.html b/app/locale/fr_FR/template/email/newsletter_unsub_success.html deleted file mode 100644 index 38d434228..000000000 --- a/app/locale/fr_FR/template/email/newsletter_unsub_success.html +++ /dev/null @@ -1,2 +0,0 @@ - -Désabonnement du bulletin d'information effectué \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/password_new.html b/app/locale/fr_FR/template/email/password_new.html deleted file mode 100644 index 74df2841e..000000000 --- a/app/locale/fr_FR/template/email/password_new.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Chère/Cher {{htmlescape var=$customer.name}},

    -

    Votre nouveau mot de passe est: {{htmlescape var=$customer.password}}

    -

    Vous pouvez changer votre mot de passe à tout moment en vous connectant à votre compte.

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/fr_FR/template/email/payment_failed.html b/app/locale/fr_FR/template/email/payment_failed.html deleted file mode 100644 index d3d367ebc..000000000 --- a/app/locale/fr_FR/template/email/payment_failed.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - -
    La transaction de paiement a échouée.
    -

    - Raison
    - {{var reason}} -

    -

    - Type de paiement
    - {{var checkoutType}} -

    -

    - Client:
    - {{var customer}} <{{var customerEmail}}> -

    -

    - Articles
    - {{var items}} -

    -

    - Total:
    - {{var total}} -

    -

    - Adresse de facturation:
    - {{var billingAddress.format('html')}} -

    -

    - Adresse d'expédition:
    - {{var shippingAddress.format('html')}} -

    -

    - Mode d'expédition:
    - {{var shippingMethod}} -

    -

    - Mode de paiement:
    - {{var paymentMethod}} -

    -

    - Date et heure:
    - {{var dateAndTime}} -

    -
    \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/product_alert_cron_error.html b/app/locale/fr_FR/template/email/product_alert_cron_error.html deleted file mode 100644 index 00e6a2774..000000000 --- a/app/locale/fr_FR/template/email/product_alert_cron_error.html +++ /dev/null @@ -1,7 +0,0 @@ - - -Avertissements lors de l'exécution du script d'alerte de produit : {{var warnings}}: - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/product_price_alert.html b/app/locale/fr_FR/template/email/product_price_alert.html deleted file mode 100644 index e1bf5e6b2..000000000 --- a/app/locale/fr_FR/template/email/product_price_alert.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Bonjour {{var customerName}}, - -{{var alertGrid}} \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/product_share.html b/app/locale/fr_FR/template/email/product_share.html deleted file mode 100644 index 8bd55cc6e..000000000 --- a/app/locale/fr_FR/template/email/product_share.html +++ /dev/null @@ -1,13 +0,0 @@ - - - -Bienvenue, {{htmlescape var=$name}}

    Regardez {{var product_name}}

    Message:
    {{var message}}

    \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/product_stock_alert.html b/app/locale/fr_FR/template/email/product_stock_alert.html deleted file mode 100644 index c5c6dd787..000000000 --- a/app/locale/fr_FR/template/email/product_stock_alert.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Bonjour {{var customerName}}, - -{{var alertGrid}} \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/creditmemo_new.html b/app/locale/fr_FR/template/email/sales/creditmemo_new.html deleted file mode 100644 index da88af124..000000000 --- a/app/locale/fr_FR/template/email/sales/creditmemo_new.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Bonjour, {{htmlescape var=$order.getCustomerName()}}

    -

    - Nous vous remercions pour votre commande auprès de {{var store.getFrontendName()}}. - Vous pouvez vérifier l'état de votre commande en vous connectant à votre compte. - Si vous avez des questions au sujet de votre commande, veuillez nous contacter à l'adresse {{config path='trans_email/ident_support/email'}} ou nous appeler au {{config path='general/store_information/phone'}} du lundi au vendredi, de 8h à 17h. -

    -
    -

    Votre avoir #{{var creditmemo.increment_id}} pour la commande #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Informations de facturation:Mode de paiement:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Informations d'expédition:Mode d'expédition:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} -

    {{var comment}}

    -

    Merci, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/creditmemo_new_guest.html b/app/locale/fr_FR/template/email/sales/creditmemo_new_guest.html deleted file mode 100644 index caa0bb756..000000000 --- a/app/locale/fr_FR/template/email/sales/creditmemo_new_guest.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Bonjour, {{htmlescape var=$billing.getName()}}

    -

    - Nous vous remercions pour votre commande auprès de {{var store.getFrontendName()}}. Si vous avez des questions au sujet de votre commande, veuillez nous contacter à l'adresse. - ou nous appeler au {{config path='trans_email/ident_support/email'}} du lundi au vendredi entre 8h et 17h {{config path='general/store_information/phone'}} Votre avoir #{{var creditmemo.increment_id}} pour la commande #{{var order.increment_id}}. -

    -
    -

    Informations de facturation

    -
    - - - - - - - - - - - - - - - -
    Mode de paiement:Informations d'expédition:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Mode d'expédition:Merci encore:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} -

    {{var comment}}

    -

    Merci, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/creditmemo_update.html b/app/locale/fr_FR/template/email/sales/creditmemo_update.html deleted file mode 100644 index 4e2d26ff8..000000000 --- a/app/locale/fr_FR/template/email/sales/creditmemo_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Chère/Cher, {{htmlescape var=$order.getCustomerName()}},

    -

    - Votre commande # {{var order.increment_id}} a été
    - {{var order.getStatusLabel()}}. -

    -

    Vous pouvez vérifier l'état de votre commande en vous connectant à votre compte.

    -

    {{var comment}}

    -

    - Si vous avez des questions, n'hésitez pas à nous contacter à l'adresse - {{config path='trans_email/ident_support/email'}} - ou par téléphone au {{config path='general/store_information/phone'}}. -

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/creditmemo_update_guest.html b/app/locale/fr_FR/template/email/sales/creditmemo_update_guest.html deleted file mode 100644 index 3633cd622..000000000 --- a/app/locale/fr_FR/template/email/sales/creditmemo_update_guest.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Chère/Cher, {{htmlescape var=$billing.getName()}},

    -

    - Votre commande # {{var order.increment_id}} a été
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Si vous avez des questions, n'hésitez pas à nous contacter à l'adresse - {{config path='trans_email/ident_support/email'}} - ou par téléphone au {{config path='general/store_information/phone'}}. -

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/invoice_new.html b/app/locale/fr_FR/template/email/sales/invoice_new.html deleted file mode 100644 index b222917f9..000000000 --- a/app/locale/fr_FR/template/email/sales/invoice_new.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Bonjour, {{htmlescape var=$order.getCustomerName()}}

    -

    - Nous vous remercions pour votre commande auprès de {{var store.getFrontendName()}}. Vous pouvez vérifier l'état de votre commande en. - vous connectant à votre compte Si vous avez des questions au sujet de votre commande, veuillez nous contacter à l'adresse. - ou nous appeler au {{config path='trans_email/ident_support/email'}} du lundi au vendredi entre 8h et 17h {{config path='general/store_information/phone'}} Votre facture #{{var invoice.increment_id}} pour la commande #{{var order.increment_id}}. -

    -
    -

    Informations de facturation

    -
    - - - - - - - - - - - - - - - -
    Mode de paiement:Informations d'expédition:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Mode d'expédition:Merci encore:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}}  -
    -
    - {{/depend}} - {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} -

    {{var comment}}

    -

    Encore merci, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/invoice_new_guest.html b/app/locale/fr_FR/template/email/sales/invoice_new_guest.html deleted file mode 100644 index 95426da68..000000000 --- a/app/locale/fr_FR/template/email/sales/invoice_new_guest.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Bonjour, {{htmlescape var=$billing.getName()}}

    -

    - Nous vous remercions pour votre commande auprès de {{var store.getFrontendName()}}. Si vous avez des questions au sujet de votre commande, veuillez nous contacter à l'adresse. - ou nous appeler au {{config path='trans_email/ident_support/email'}} du lundi au vendredi entre 8h et 17h {{config path='general/store_information/phone'}} Votre facture #{{var invoice.increment_id}} pour la commande #{{var order.increment_id}}. -

    -
    -

    Informations de facturation

    -
    - - - - - - - - - - - - - - - -
    Mode de paiement:Informations d'expédition:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Mode d'expédition:Merci encore:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} -

    {{var comment}}

    -

    Encore merci, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/invoice_update.html b/app/locale/fr_FR/template/email/sales/invoice_update.html deleted file mode 100644 index df4d05ca8..000000000 --- a/app/locale/fr_FR/template/email/sales/invoice_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Chère/Cher, {{htmlescape var=$order.getCustomerName()}},

    -

    - Votre commande # {{var order.increment_id}} a été
    - {{var order.getStatusLabel()}}. -

    -

    Vous pouvez vérifier l'état de votre commande en vous connectant à votre compte.

    -

    {{var comment}}

    -

    - Si vous avez des questions, n'hésitez pas à nous contacter à l'adresse - {{config path='trans_email/ident_support/email'}} - ou par téléphone au {{config path='general/store_information/phone'}}. -

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/invoice_update_guest.html b/app/locale/fr_FR/template/email/sales/invoice_update_guest.html deleted file mode 100644 index 0d693e803..000000000 --- a/app/locale/fr_FR/template/email/sales/invoice_update_guest.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Chère/Cher, {{htmlescape var=$billing.getName()}},

    -

    - __('Your order # {{var order.increment_id}} has been')__
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Si vous avez des questions, n'hésitez pas à nous contacter à l'adresse - {{config path='trans_email/ident_support/email'}} - ou par téléphone au {{config path='general/store_information/phone'}}. -

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/order_new.html b/app/locale/fr_FR/template/email/sales/order_new.html deleted file mode 100644 index beb0c660f..000000000 --- a/app/locale/fr_FR/template/email/sales/order_new.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Bonjour, {{htmlescape var=$order.getCustomerName()}}

    -

    - Nous vous remercions pour votre commande auprès de {{var store.getFrontendName()}}. Une fois votre colis expédié, nous vous enverrons un e-mail avec un lien pour suivre votre commande. Vous pouvez vérifier l'état de votre commande en. - vous connectant à votre compte. - Si vous avez des questions au sujet de votre commande, veuillez nous contacter à l'adresse ou nous appeler au. - du lundi au vendredi entre 8h et 17h {{config path='trans_email/ident_support/email'}} Vous trouverez la confirmation de votre commande ci-dessous. Merci encore de votre confiance {{config path='general/store_information/phone'}} Votre commande #{{var order.increment_id}}. -

    -

    (enregistrée le {{var order.getCreatedAtFormated('long')}}).

    -
    -

    Informations de facturation Mode de paiement

    -
    - - - - - - - - - - - - - - - -
    Informations d'expédition:Mode d'expédition:
    - {{var order.getBillingAddress().format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Merci encore:Méthode d'expédition:
    - {{var order.getShippingAddress().format('html')}} -   -   - {{var order.getShippingDescription()}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_items" order=$order}} -

    {{var order.getEmailCustomerNote()}}

    -

    Merci, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/order_new_guest.html b/app/locale/fr_FR/template/email/sales/order_new_guest.html deleted file mode 100644 index 6d1ad6bf1..000000000 --- a/app/locale/fr_FR/template/email/sales/order_new_guest.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Bonjour, {{htmlescape var=$order.getBillingAddress().getName()}}

    -

    - Nous vous remercions pour votre commande auprès de {{var store.getFrontendName()}}. Une fois votre colis expédié, nous vous enverrons un e-mail avec un lien pour suivre votre commande. Si vous avez des questions au sujet de votre commande, veuillez nous contacter à l'adresse. - ou nous appeler au. - du lundi au vendredi entre 8h et 17h {{config path='trans_email/ident_support/email'}} Vous trouverez la confirmation de votre commande ci-dessous. Merci encore de votre confiance {{config path='general/store_information/phone'}} Votre commande #{{var order.increment_id}}. -

    -

    (enregistrée le {{var order.getCreatedAtFormated('long')}}).

    -
    -

    Informations de facturation Mode de paiement

    -
    - - - - - - - - - - - - - - - -
    Informations d'expédition:Mode d'expédition:
    - {{var order.getBillingAddress().format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Merci encore:Méthode d'expédition:
    - {{var order.getShippingAddress().format('html')}} -   -   - {{var order.getShippingDescription()}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_items" order=$order}} -

    {{var order.getEmailCustomerNote()}}

    -

    Encore merci, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/order_update.html b/app/locale/fr_FR/template/email/sales/order_update.html deleted file mode 100644 index 04a3094c9..000000000 --- a/app/locale/fr_FR/template/email/sales/order_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Chère/Cher, {{htmlescape var=$order.getCustomerName()}},

    -

    - Votre commande # {{var order.increment_id}} a été
    - {{var order.getStatusLabel()}}. -

    -

    Vous pouvez vérifier l'état de votre commande en vous connectant à votre compte.

    -

    {{var comment}}

    -

    - Si vous avez des questions, n'hésitez pas à nous contacter à l'adresse - {{config path='trans_email/ident_support/email'}} - ou par téléphone au {{config path='general/store_information/phone'}}. -

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/order_update_guest.html b/app/locale/fr_FR/template/email/sales/order_update_guest.html deleted file mode 100644 index 865b7a353..000000000 --- a/app/locale/fr_FR/template/email/sales/order_update_guest.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Chère/Cher, {{htmlescape var=$billing.getName()}},

    -

    - Votre commande # {{var order.increment_id}} a été
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Si vous avez des questions, n'hésitez pas à nous contacter à l'adresse - {{config path='trans_email/ident_support/email'}} - ou par téléphone au {{config path='general/store_information/phone'}}. -

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/shipment_new.html b/app/locale/fr_FR/template/email/sales/shipment_new.html deleted file mode 100644 index 12434e4ca..000000000 --- a/app/locale/fr_FR/template/email/sales/shipment_new.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Bonjour, {{htmlescape var=$order.getCustomerName()}}

    -

    - Nous vous remercions pour votre commande auprès de {{var store.getFrontendName()}}. Vous pouvez vérifier l'état de votre commande en. - vous connectant à votre compte Si vous avez des questions au sujet de votre commande, veuillez nous contacter à l'adresse. - ou nous appeler au {{config path='trans_email/ident_support/email'}} du lundi au vendredi entre 8h et 17h {{config path='general/store_information/phone'}} Vous trouverez votre confirmation d'expédition ci-dessous. Merci encore de votre confiance. -

    -

    - Votre expédition #{{var shipment.increment_id}} pour la commande #{{var order.increment_id}}. -

    -
    -

    Informations de facturation

    -
    - - - - - - - - - - - - - - - -
    Mode de paiement:Informations d'expédition:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - - - - - - - - - - - - - - - -
    Mode d'expédition:Merci encore:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -

    {{var comment}}

    -

    Merci, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/shipment_new_guest.html b/app/locale/fr_FR/template/email/sales/shipment_new_guest.html deleted file mode 100644 index 8e9851b97..000000000 --- a/app/locale/fr_FR/template/email/sales/shipment_new_guest.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Bonjour, {{htmlescape var=$billing.getName()}}

    -

    - Nous vous remercions pour votre commande auprès de {{var store.getFrontendName()}}. Si vous avez des questions au sujet de votre commande, veuillez nous contacter à l'adresse. - ou nous appeler au {{config path='trans_email/ident_support/email'}} du lundi au vendredi entre 8h et 17h {{config path='general/store_information/phone'}} Vous trouverez votre confirmation d'expédition ci-dessous. Merci encore de votre confiance. -

    -

    - Votre expédition #{{var shipment.increment_id}} pour la commande #{{var order.increment_id}}. -

    -
    -

    Informations de facturation

    -
    - - - - - - - - - - - - - - - -
    Mode de paiement:Informations d'expédition:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - - - - - - - - - - - - - - - -
    Mode d'expédition:Merci encore:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -

    {{var comment}}

    -

    Merci, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/shipment_update.html b/app/locale/fr_FR/template/email/sales/shipment_update.html deleted file mode 100644 index 25dcfc47f..000000000 --- a/app/locale/fr_FR/template/email/sales/shipment_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Chère/Cher, {{htmlescape var=$order.getCustomerName()}},

    -

    - Votre commande # {{var order.increment_id}} a été
    - {{var order.getStatusLabel()}}. -

    -

    Vous pouvez vérifier l'état de votre commande en vous connectant à votre compte.

    -

    {{var comment}}

    -

    - Si vous avez des questions, n'hésitez pas à nous contacter à l'adresse - {{config path='trans_email/ident_support/email'}} - ou par téléphone au {{config path='general/store_information/phone'}}. -

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sales/shipment_update_guest.html b/app/locale/fr_FR/template/email/sales/shipment_update_guest.html deleted file mode 100644 index 604c2b8ae..000000000 --- a/app/locale/fr_FR/template/email/sales/shipment_update_guest.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Chère/Cher, {{htmlescape var=$billing.getName()}},

    -

    - Votre commande # {{var order.increment_id}} a été
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Si vous avez des questions, n'hésitez pas à nous contacter à l'adresse - {{config path='trans_email/ident_support/email'}} - ou par téléphone au {{config path='general/store_information/phone'}}. -

    -

    Merci encore, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/sitemap_generate_warning.html b/app/locale/fr_FR/template/email/sitemap_generate_warning.html deleted file mode 100644 index b2e6a53bc..000000000 --- a/app/locale/fr_FR/template/email/sitemap_generate_warning.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Avertissements lors de la génération du plan du site : {{var warnings}}: - - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/fr_FR/template/email/token.html b/app/locale/fr_FR/template/email/token.html deleted file mode 100644 index 34122be8c..000000000 --- a/app/locale/fr_FR/template/email/token.html +++ /dev/null @@ -1,9 +0,0 @@ - - - -Bonjour, {{htmlescape var=$userName}}

    -Votre autorisation de {{htmlescape var=$applicationName}} __('has been changed to')__ {{htmlescape var=$status}} par l'équipe d'administration.

    diff --git a/app/locale/fr_FR/template/email/wishlist_share.html b/app/locale/fr_FR/template/email/wishlist_share.html deleted file mode 100644 index 5eff52375..000000000 --- a/app/locale/fr_FR/template/email/wishlist_share.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Bonjour,
    Regardez ma liste de souhaits chez {{var store.getFrontendName()}}.

    -

    {{var message}}

    - {{var items}} -
    - {{depend salable}}

    Ajouter tous les articles au panier d'achat |{{/depend}} Afficher tous les articles de la liste de souhaits

    -

    Merci, {{htmlescape var=$customer.name}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/Mage_AdminNotification.csv b/app/locale/nl_NL/Mage_AdminNotification.csv deleted file mode 100644 index 508aacbd0..000000000 --- a/app/locale/nl_NL/Mage_AdminNotification.csv +++ /dev/null @@ -1,31 +0,0 @@ -"Actions","Acties" -"An error occurred while marking notification as read.","Er is een fout opgetreden terwijl er een notitie als gelezen werd gemarkeerd." -"An error occurred while marking the messages as read.","Er is een fout opgetreden terwijl de berichten als gelezen werden gemarkeerd" -"An error occurred while removing messages.","Er is een fout opgetreden terwijl de berichten werden verwijderd" -"An error occurred while removing the message.","Er is een fout opgetreden terwijl het bericht werd verwijderd." -"Are you sure?","Weet u het zeker" -"Date Added","Datum toegevoegd" -"Last Update","Laatste update" -"Mark as Read","Markeer als gelezen" -"Mark as read","Markeer als gelezen" -"Message","Bericht" -"Messages Inbox","Berichten inbox" -"Notifications","Notificaties" -"Please select messages.","Selecteer a.u.b. berichten" -"Read Details","Lees details" -"Remove","Verwijderen" -"Severity","Zwaarheid" -"Show List","Laat lijst zien" -"Show Toolbar","Laat werkbalk zien" -"The message has been marked as read.","Dit bericht is gemarkeerd als gelezen" -"The message has been removed.","Dit bericht is verwijderd" -"Total of %d record(s) have been marked as read.","Een totaal van %d bestand(en) is gemarkeerd als gelezen" -"Total of %d record(s) have been removed.","Een totaal van %d bestand(en) zijn verwijderd." -"Unable to proceed. Please, try again.","Niet in staat om door te gaan, probeer a.u.b. opnieuw." -"Update Frequency","Update frequentie" -"Use HTTPS to Get Feed","Gebruik HTTPS om Feed te verkrijgen" -"Wrong message type","Verkeerde berichttype" -"critical","Kritisch" -"major","groot" -"minor","klein" -"notice","aankondiging" diff --git a/app/locale/nl_NL/Mage_Adminhtml.csv b/app/locale/nl_NL/Mage_Adminhtml.csv deleted file mode 100644 index f32427ba9..000000000 --- a/app/locale/nl_NL/Mage_Adminhtml.csv +++ /dev/null @@ -1,1215 +0,0 @@ -" The customer does not exist in the system anymore.","Deze klant staat niet meer in het systeem." -" [deleted]"," [verwijderd]" -" and "," en " -"%s (Default Template from Locale)","%s (Standaard sjabloon van Lokale)" -"%s cache type(s) disabled.","%s cache type(s) uitgeschakeld." -"%s cache type(s) enabled.","%s cache type(s) ingeschakeld." -"%s cache type(s) refreshed.","%s cache type(s) herladen." -"(For Type ""Local Server"" need to use relative path to Magento install var/export or var/import, e.g. var/export, var/import, var/export/some/dir, var/import/some/dir)","(Voor ""Local Server"" Type moet u het desbetreffende pad naar Magento install var/export of var/import gebruiken, b.v. var/export, var/import, var/export/some/dir, var/import/some/dir)" -"(For US 2-letter state names)","(Voor VS 2-letter staatsnamen)" -"(If left empty will be auto-generated)","(Indien leeg gelaten wordt dit automatisch gegenereerd)" -"(Leave empty for first spreadsheet)","(Laat leeg voor de eerste spreadsheet)" -"(Products will be added/updated to this store if 'store' column is blank or missing in the import file.)","(Producten worden toegevoegd/geüpdatet aan deze winkel, indien de 'winkel' kolom leeg of niet aanwezig is in het import bestand.)" -"(Shift-)Click or drag to change value","(Shift-)Klik of sleep om de waarde te veranderen" -"(Starting with)","(Beginnende met)" -"(When 'No', only mapped fields will be imported. When mapping, use 'column1', 'column2', etc.)","(Bij 'Nee', worden alleen in kaart gebrachte velden geïmporteerd. Wanneer in kaart gebracht, gebruik kolom1, kolom2, enz.)" -"(You have to increase php memory_limit before changing this value)","(U moet uw PHP memory_limit verhogen voordat u deze waarde verhoogt)" -"(\\t for tab)","(\\t voor tabblad)" -"* - If indexing is in progress, it will be killed and new indexing process will start.","* - Indien een indexeringproces bezig is zal deze worden gestopt en een nieuw proces worden begonnen." -"* Required Fields","* Vereiste velden" -"- Click on any of the time parts to increase it","- Klik op een van de tijd gedeeltes om deze te verhogen" -"- Hold mouse button on any of the above buttons for faster selection.","- Houd de muisknop op een van de bovenstaande knoppen om sneller te selecteren" -"- Use the %s buttons to select month","- Gebruik de %s knoppen om de maand te selecteren" -"- Use the %s, %s buttons to select year","- Gebruik de %s, %s knoppen om het jaar te selecteren" -"- or Shift-click to decrease it","- of Shift-klik om het te verlagen" -"- or click and drag for faster selection.","- of klik en sleep voor snelle selectie." -"-- Not Selected --","-- Niet geselecteerd --" -"-- Please Select --","-- Selecteer alstublieft --" -"-- Please Select Billing Agreement--","-- Selecteer Factureringsovereenkomst" -"-- Please Select a Category --","-- Selecteer een Categorie --" -"-- Please select --","-- Selecteer a.u.b. --" -"--Please Select--","--Selecteer alstublieft--" -"1 Hour","1 Uur" -"12 Hours","12 Uur" -"12h AM/PM","12h AM/PM" -"2 Hours","2 Uur" -"24 Hours","24 Uur" -"24h","24u" -"2YTD","2JTD" -"6 Hours","6 Uur" -"

    404 Error

    Page not found.

    ","

    404 Error

    Pagina niet gevonden.

    " -"%s requests access to your account","%s verzoek om toegang tot uw account" -"Attention: Captcha is case sensitive.","Attention: Captcha is hoofdletter gevoelig" -"A user with the same user name or email aleady exists.","Er bestaat al een gebruiker met dezelfde naam of hetzelfde e-mailadres." -"API Key","API Sleutel" -"API Key Confirmation","API Sleutel Bevestiging" -"ASCII","ASCII" -"Abandoned Carts","Verlaten winkelwagens" -"About the calendar","Over de kalender" -"Access Denied","Toegang Geweigerd" -"Access denied","Toegang gewijgerd" -"Access denied.","Toegang geweigerd." -"Account Created in:","Account Gecreëerd in:" -"Account Created on (%s):","Account Gecreëerd op (%s):" -"Account Created on:","Account Gecreëerd op:" -"Account Information","Accountinformatie" -"Account Status","Account Status" -"Account status","Account status" -"Action","Actie" -"Actions","Acties" -"Actions XML","Acties XML" -"Active","Actief" -"Add","Toevoegen" -"Add Exception","Voeg uitzondering toe" -"Add Field Mapping","Veldmapping Toevoegen" -"Add Field with URL:","Veld met URL toevoegen:" -"Add New","Nieuwe Toevoegen" -"Add New Image","Nieuw Plaatje Toevoegen" -"Add New Profile","Nieuw Profiel Toevoegen" -"Add New Role","Nieuwe Rol Toevoegen" -"Add New Template","Nieuw Sjabloon Toevoegen" -"Add New URL Rewrite","Voeg Nieuwe URL Herschrijving Toe" -"Add New User","Voeg Nieuwe Gebruiker Toe" -"Add New Variable","Voeg Nieuwe Variabele Toe" -"Add Products","Producten toevoegen" -"Add URL Rewrite","Voeg URL Herschrijving Toe" -"Add URL Rewrite for a Category","Voeg URL Herschrijving toe voor een Categorie" -"Add URL Rewrite for a Product","Voeg URL Herschrijving toe voor een Product" -"Add after","Voeg toe na" -"Additional Cache Management","Extra Cache Beheer" -"Address Type:","Adrestype:" -"Admin","Admin" -"Advanced Admin Section","Geavanceerde Admin Sectie" -"Advanced Profiles","Geavanceerde Profielen" -"Advanced Section","Geavanceerde Sectie" -"After authorization application will have access to you account.","Na uw autorisatie verzoek krijgt u toegang tot uw account." -"All","Alles" -"All Allowed Countries","Alle Toegestane Landen" -"All Cache","Alle Cache" -"All Files","Alle Bestanden" -"All Reviews","Alle Recensies" -"All Store Views","Alle Winkelbezichtigingen" -"All Tags","Alle Labels" -"All Websites","Alle Websites" -"All countries","Alle landen" -"All fields","Alle velden" -"All possible rates were fetched, please click on ""Save"" to apply","Alle mogelijke cijfers zijn opgehaald, klik op ""Save"" om toe te passen" -"All rates were fetched, please click on ""Save"" to apply","Alle cijfers zijn opgehaald, klik op ""Save"" om toe te passen" -"All valid rates have been saved.","Alle geldige aantallen zijn opgeslagen." -"Always (during development)","Altijd (tijdens ontwikkeling)" -"Amounts","Hoeveelheden" -"An error has occured while syncronizing media storages.","Een fout heeft zich voorgedaan tijdens het synchroniseren van het mediageheugen." -"An error occurred while clearing the JavaScript/CSS cache.","Er is een fout opgetreden tijdens het opschonen van de JavaScript/CSS opslagplaats." -"An error occurred while clearing the image cache.","Er is een fout opgetreden tijdens het opschonen van de afbeeldingopslagplaats." -"An error occurred while deleting URL Rewrite.","er is een fout opgetreden tijdens het verwijderen van URL Rewrite." -"An error occurred while deleting email template data. Please review log and try again.","Er is een fout opgetreden tijdens het verwijderen van e-mail sjabloondata. Bekijk de log en probeer opnieuw." -"An error occurred while deleting record(s).","Er is een fout opgetreden tijdens het verwijderen van data." -"An error occurred while deleting this role.","Er is een fout opgetreden tijdens het verwijderen van deze role." -"An error occurred while deleting this set.","Er is een fout opgetreden tijdens het verwijderen van deze set." -"An error occurred while deleting this template.","Er is een fout opgetreden tijdens het verwijderen van dit sjabloon." -"An error occurred while finishing process. Please refresh the cache","Er is een fout opgetreden tijdens het afsluiten. Ververs de opslagplaats." -"An error occurred while rebuilding the CatalogInventory Stock Status.","Er is een fout opgetreden tijdens het herbouwen van de CatalogInventory Stock Status." -"An error occurred while rebuilding the catalog index.","Er is een fout opgetreden tijdens het herbouwen van de catalogus index." -"An error occurred while rebuilding the flat catalog category.","Er is een fout opgetreden tijdens het herbouwen van de flat catalogus categorie." -"An error occurred while rebuilding the flat product catalog.","Er is een fout opgetreden tijdens het herbouwen van de flat product catalogus" -"An error occurred while rebuilding the search index.","Er is een fout opgetreden tijdens het herbouwen van de zoekindex." -"An error occurred while refreshing the Catalog Rewrites.","Er is een fout opgetreden tijdens het verversen van de Catalog Rewrites." -"An error occurred while refreshing the Layered Navigation indices.","Er is een fout opgetreden tijdens het verversen van de Layered Navigation indices." -"An error occurred while refreshing the catalog rewrites.","Een fout heeft zich voorgedaan tijdens het verversen van de catalogus." -"An error occurred while refreshing the layered navigation indices.","Een fout heeft zich voorgedaan tijdens het verversen van de gelaagde navigatie indexen." -"An error occurred while saving URL Rewrite.","Er is een fout opgetreden tijdens het opslaan van URL Rewrite" -"An error occurred while saving account.","Fout voorgekomen bij opslaan van account." -"An error occurred while saving review.","Er is een fout opgetreden tijdens het opslaan van de beoordeling." -"An error occurred while saving the customer.","Fout voorgekomen bij opslaan klant." -"An error occurred while saving this configuration:","Fout voorgekomen bij opslaan van deze configuratie:" -"An error occurred while saving this role.","Fout voorgekomen bij opslaan van deze rol." -"An error occurred while saving this template.","Fout voorgekomen bij opslaan van dit sjabloon." -"An error occurred while updating the selected review(s).","Fout voorgekomen bij het updaten van de geselecteerde beoordeling(en)." -"Any","Iedere" -"Any Attribute Set","Iedere attribuut set" -"Any Group","Iedere groep" -"Any Status","Iedere status" -"Any Store","Iedere winkel" -"Any Type","Ieder type" -"Any Visibility","Iedere zichtbaarheid" -"Any data created since the backup was made will be lost including admin users, customers and orders.","Alle data dat gecreëerd is sinds de backup is gemaakt zal verloren gaan inclusief admin gebruikers, klanten en orders." -"Archive file name:","Archiveer bestandsnaam:" -"Are you sure that you want to delete this template?","Weet je zeker dat je dit sjabloon wilt verwijderen?" -"Are you sure that you want to strip tags?","Weet je zeker dat je de tags wilt verwijderen?" -"Are you sure you want to do this?","Weet je zeker dat je dit wilt doen?" -"Are you sure you want to proceed?","Weet u zeker dat u door wilt gaan?" -"Area","Gebied" -"As low as:","Zo laag als:" -"Assigned","Toegewezen" -"Associated Tags","Gerelateerde tags" -"Attribute Set Name:","Attribuut set naam:" -"Attributes","Attributen" -"Authorization confirmed","Autorisatie bevestigd" -"Authorize","Autoriseer" -"Authorize application","Autoriseer verzoek" -"Authorized OAuth Tokens","Geautoriseerde OAuth tokens" -"Automatic (equalize price ranges)","Automatisch (maak prijsklassen gelijk)" -"Automatic (equalize product counts)","Automatisch (maak product aantallen gelijk)" -"Average Order Amount","Gemiddeld Orderbedrag" -"Average Orders","Gemiddelde Orders" -"BINARY","BINAIR" -"Back","Terug" -"Back to Login","Terug naar Inloggen" -"Backup","Backup" -"Backup Name","Backup Naam" -"Backup options","Backup opties" -"Backups","Backups" -"Base currency","Basisvaluta" -"Bcc","Bcc" -"Bestsellers","Bestsellers" -"Billing Address","Facturatieadres" -"Billing Address: ","Factuuradres:" -"Billing Agreement","Facturatieovereenkomst:" -"Billing Agreements","Facturatieovereenkomsten:" -"Block Information","Blok Informatie" -"Both (without and with tax)","Beiden (zonder en met btw)" -"Both IPN and PDT","Zowel IPN als PDT" -"Browse Files...","Blader door Bestanden..." -"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","Bundel met dynamische prijzen kan geen op maat gedefinieerde opties bevatten. Opties zullen niet opgeslagen worden." -"CMS","CMS" -"CRITICAL","KRITIEK" -"CSV","CSV" -"CSV / Tab separated","CSV / Tabel gescheiden" -"Cache Control","Cache-controle" -"Cache Control (beta)","Cache-controle (beta)" -"Cache Management","Beheer cache" -"Cache Type","Cache-type" -"Cancel","Annuleren" -"Cannot add new comment.","Kan geen nieuw commentaar toevoegen." -"Cannot add tracking number.","Kan geen volgnummer toevoegen." -"Cannot create an invoice without products.","Kan geen factuur aanmaken zonder producten." -"Cannot create credit memo for the order.","Kan geen kredietnota voor de order aanmaken." -"Cannot delete the design change.","Kan de ontwerpverandering niet verwijderen." -"Cannot delete tracking number.","Kan volgnummer niet verwijderen." -"Cannot do shipment for the order separately from invoice.","Kan de verzending voor de bestelling niet los van de factuur doen." -"Cannot do shipment for the order.","Kan geen verzending van de bestelling doen." -"Cannot initialize shipment for adding tracking number.","Kan de verzending niet beginnen voor het toevoegen van volgnummer." -"Cannot initialize shipment for delete tracking number.","Kan de verzending niet beginnen voor het verwijderen van volgnummer." -"Cannot load track with retrieving identifier.","Kan het volgen niet laden met het ophalen van id." -"Cannot retrieve tracking number detail.","Kan detail van het volgnummer niet ophalen." -"Cannot save shipment.","Kan verzending niet opslaan." -"Cannot save the credit memo.","Kan kredietnota niet opslaan." -"Cannot send shipment information.","Kan verzendingsinformatie niet verzenden." -"Cannot update item quantity.","Kan product hoeveelheid niet updaten." -"Cannot update the item\'s quantity.","Kan de product hoeveelheid niet updaten." -"Card Verification Number","Kaartverificatienummer" -"Catalog","Catalogus" -"Catalog Price Rules","Catalogus prijs regels" -"Catalog Rewrites","Catalogus herschrijvingen" -"Categories","Categoriën" -"Category","Categorie" -"Category:","Categorie:" -"Chart is disabled. If you want to enable chart, click here.","Grafiek is uitgeschakeld. Indien u de grafiek wilt inschakelen, klik here." -"Checkbox","Selectie vakje" -"Child Transactions","Kinder transacties" -"Choose Store View:","Selecteer winkel aanzicht:" -"Choose an attribute","Kies een attribuut" -"Chosen category does not associated with any website, so url rewrite is not possible.","Gekozen categorie komt met geen enkele website overeen, de url herschrijving is daarom niet mogelijk." -"Chosen product does not associated with any website, so url rewrite is not possible.","Gekozen product komt met geen enkele website overeen, de url herschrijving is daarom niet mogelijk," -"Clear","Haal weg" -"Close","Sluiten" -"Code","Code" -"Comment text field cannot be empty.","Comment tekstbox kan niet leeg zijn." -"Complete","Compleet" -"Config form fieldset clone model required to be able to clone fields","Config vorm fieldset kloon model nodig om velden te kunnen klonen" -"Configuration","Configuratie" -"Confirm New Password","Bevestig nieuw wachtwoord" -"Confirm token authorization Pop Up for admin","Bevestig token autorisatie Pop Up voor beheerder" -"Confirm token authorization for admin","Bevestig token autorisatie voor beheerder" -"Confirmation Of Authorization","Bevestiging van de Autorisatie" -"Confirmed email:","Bevestigd e-mail:" -"Connect with the Magento Community","Verbind met de Magento Gemeenschap" -"Continue","Doorgaan" -"Convert to Plain Text","Verander naar Gewone Tekst" -"Cookie (unsafe)","Cookie (onveilig)" -"Country","Land" -"Country:","Land:" -"Coupons","Waardebonnen" -"Create","Maak aan" -"Create DB Backup","Maak DB Back-up" -"Create New Attribute","Maak Nieuw Attribuut" -"Create URL Rewrite:","Maak URL Herschrijving:" -"Created At","Gecreëerd op" -"Credit Card %s","Credit Card %s" -"Credit Card Number","Nummer creditcard" -"Credit Card Number: xxxx-%s","Nummer creditcard xxxx-%s" -"Credit Card Type","Type credit card" -"Credit Card Type: %s","Type credit card: %s" -"Credit Memo History","Creditnota Geschiedenis" -"Credit Memo Totals","Creditnota Totaal" -"Credit Memos","Creditnotas" -"Credit memo #%s comment added","Creditnota #%s commentaar toegevoegd" -"Credit memo #%s created","Creditnota #%s aangemaakt" -"Credit memo\'s total must be positive.","Totaal van creditmemo's moet positief zijn." -"Currency","Munteenheid" -"Currency ""%s"" is used as %s in %s.","Valuta ""%s"" wordt gebruikt als %s in %s." -"Currency Information","Valutainformatie" -"Currency Setup Section","Sectie voor instellen valuta" -"Current Configuration Scope:","Bereik van huidige configuratie:" -"Current Month","Huidige maand" -"Custom","Zelfgekozen" -"Custom Variable ""%s""","Gepersonaliseerde Variabele ""%s""" -"Custom Variables","Zelfgekozen variabelen" -"Customer","Klant" -"Customer Group:","Klantgroep:" -"Customer Groups","Klantgroepen" -"Customer Name","Naam klant" -"Customer Reviews","Klantbeoordelingen" -"Customer Shopping Carts","Klantwinkelmandjes" -"Customer Since:","Klant sinds:" -"Customer Tax Classes","Belastingtarieven klant" -"Customer with the same email already exists.","Klant met dit emailadres bestaat reeds." -"Customers","Klanten" -"Customers by Number of Orders","Klanten op volgorde van aantal bestellingen" -"Customers by Orders Total","Klanten op volgorde van totaal bestellingen" -"DHTML Date/Time Selector","DHTML Datum/tijd selectie" -"Dashboard","Dashboard" -"Data Format","Dataformat" -"Data transfer:","Dataoverdracht:" -"Database","Database" -"Dataflow - Advanced Profiles","Dataflow - Geavanceerde Profielen" -"Dataflow - Profiles","Dataflow - Profielen" -"Date","Datum" -"Date & Time","Datum & tijd" -"Date Added","Datum Toegevoegd" -"Date Updated","Bijgewerkt op datum" -"Date selection:","Datumselectie:" -"Date selector","Datumselector:" -"Day","Dag" -"Decimal separator:","Scheidingsteken decimalen:" -"Default (Admin) Values","Standaard (admin) waardes" -"Default Billing Address","Standaard betalingsadres" -"Default Config","Standaardconfiguratie" -"Default Template from Locale","Standaardsjabloon van locale" -"Default Values","Standaardwaardes" -"Default display currency ""%s"" is not available in allowed currencies.","Standaard weergegeven valuta ""%s"" is niet beschikbaar in toegestane valuta." -"Default scope","Standaardbereik" -"Delete","Verwijderen" -"Delete %s","Verwijder %s" -"Delete %s '%s'","Verwijder %s '%s'" -"Delete File","Verwijder bestand" -"Delete Image","Verwijder beeld" -"Delete Profile","Profiel verwijderen" -"Delete Role","Verwijder Rol" -"Delete Store","Verwijder Winkel" -"Delete Store View","Verwijder Winkel Aanzicht" -"Delete Template","Verwijder Template" -"Delete User","Verwijder Gebruiker" -"Delete Website","Verwijder Website" -"Description","Beschrijving" -"Design","Ontwerp" -"Design Section","Ontwerp Sectie" -"Details","Details" -"Developer Section","Ontwikkelaar Sectie" -"Direction:","Richting:" -"Disable","Maak onbruikbaar" -"Disabled","Uitgeschakeld" -"Display %s first","Geef %s eerst weer" -"Display default currency","Geef standaard muntsoort weer" -"Distributed under GNU LGPL. See %s for details.","Gedistrubueerd onder GNU LGPL. Zie %s voor details." -"Do you really want to KILL parallel process and start new indexing process?","Weet u zeker dat u het parallele proces wilt AFSLUITEN en een nieuw indexeringsproces wilt starten?" -"Do you really want to proceed?","Wilt u echt doorgaan?" -"Download","Download" -"Downloads","Downloads" -"Drag to move","Sleep om te verplaatsen" -"Drop-down","Drop-down" -"Edit","Bewerken" -"Edit Design Change","Bewerk Ontwerp Verandering" -"Edit Email Template","Bewerk E-mail Sjabloon" -"Edit Order","Bestelling bewerken" -"Edit Poll","Bewerk Peiling" -"Edit Queue","Bewerk Rij" -"Edit Review","Bewerk Recensie" -"Edit Role","Bewerk Rol" -"Edit Store View","Bewerk Voorraad View" -"Edit System Template","Bewerk Systeem Sjabloon" -"Edit Template","Bewerk Sjabloon" -"Edit URL Rewrite","Bewerk URL Rewrite" -"Edit User","Bewerk Gebruiker" -"Edit User '%s'","Bewerk Gebruiker ""%s'" -"Edit Website","Bewerk Website" -"Email","Email" -"Email Address:","E-mailadres:" -"Email Preview","E-mail Preview" -"Email to a Friend","E-mail Vriend" -"Email:","E-mail" -"Enable","Maak bruikbaar" -"Enabled","Aan" -"Enclose Values In:","Sluit Waarden In:" -"Entity Attributes","Eenheidattributen" -"Entity Type","Eenheid Type" -"Entity type:","Type eenheid" -"Error","Fout" -"Excel XML","Excel XML" -"Excl. Tax","Excl. BTW" -"Exclude media folder from backup","Sluit de media map uit van de backup" -"Expiration Date","Houdbaarheidsdatum" -"Expiration Date: %s/%s","Tenminste houdbaar tot: %s/%s" -"Export","Export" -"Export CSV","Exporteer CSV" -"Export Filters","Exporteer Filters" -"Export to:","Exporteer naar:" -"Export:","Exporteer:" -"FTP Host","FTP Host" -"FTP Host[:Port]","FTP Host[:Port]" -"FTP Login","FTP Login" -"FTP Password","FTP wachtwoord" -"FTP credentials","FTP referenties" -"Failed","Mislukt" -"Failed to add a product to cart by id ""%s"".","Product toevoegen aan winkelwagen door I.D. is mislukt ""%s""." -"Failed to cancel the billing agreement.","Kon de facturatie-overeenkomst niet annuleren." -"Failed to clear the JavaScript/CSS cache.","Kon het JavaScript/CSS niet uit de cache verwijderen." -"Failed to delete the billing agreement.","Kon de facturatieovereenkomst niet verwijderen." -"Failed to update the profile.","Was niet in staat het profiel te updaten." -"Field","Veld" -"Field Mapping","Veld Mapping" -"File","Bestand" -"File Information","Bestand informatie" -"File System","Bestanden Systeem" -"File mode","Bestandsmodus" -"File name:","Bestandsnaam:" -"File size should be more than 0 bytes","Bestandsgrootte moet groter zijn dan 0 bytes" -"Finished profile execution.","Klaar met het uitvoeren van het profiel." -"First Invoice Created Date","Datum Eerste Factuur" -"First Name","Voornaam" -"First Name is required field.","Voornaam is een vereist veld." -"First Name:","Voornaam" -"Fixed","Gemaakt" -"Flush Catalog Images Cache","Flush Catalogus Afbeeldingenopslagplaats" -"Flush JavaScript/CSS Cache","Flush JavaScript/CSS Opslagplaats" -"For category","Voor categorie" -"For latest version visit: %s","Zie voor de laatste versie: %s" -"For product","Voor product" -"Forgot Admin Password","Beheerderswachtwoord vergeten" -"Forgot your password?","Uw wachtwoord vergeten?" -"Forgot your user name or password?","Gebruikersnaam of wachtwoord vergeten?" -"From","Van" -"GLOBAL","GLOBAAL" -"Gb","Gb" -"General Information","Algemene informatie" -"General Section","Algemene Sectie" -"Get Image Base64","Krijg Afbeelding Base64" -"Get help for this page","Hulp krijgen voor deze pagina" -"Give the verifier code to application administrator","Geef de verificatie code aan applicatiebeheerder" -"Global Attribute","Globaal Attribuut" -"Global Record Search","Globaal records zoeken" -"Global Search","Globale zoektocht" -"Go Today","Ga Vandaag" -"Go to messages inbox","Ga naar inbox" -"Go to notifications","Ga naar meldingen" -"Google Base","Google Base" -"Google Content","Google-inhoud" -"Google Sitemaps","Google Sitemaps" -"Grand Total","Totaal" -"Grid (default) / List","Grid (vaststaand) / Lijst" -"Grid Only","Alleen Rooster" -"Group:","Groep:" -"Guest","Gast" -"HTTP (unsecure)","HTTP (onbeveiligd)" -"HTTPS (SSL)","HTTPS (SSL)" -"Help Us Keep Magento Healthy - Report All Bugs","Help ons Magento gezond te houden - rapporteer alle bugs" -"Helper attributes should not be used in custom layout updates.","Help attributen moeten niet gebruikt worden in gebruikelijke layout updates." -"Helper for options rendering doesn't implement required interface.","Help voor optie verduidelijking implementeert gevraagde interface niet." -"Home","Thuis" -"ID","ID" -"ID Path","ID Pad" -"IP Address","IP Adres" -"IPN (Instant Payment Notification) Only","Alleen IPN (Onmiddellijke Betaling Notificatie)" -"Id","Id" -"If there is an account associated with %s you will receive an email with a link to reset your password.","Als er een rekening geassocieerd is met %s ontvangt u een email met een link om uw wachtwoord te herstellen." -"If this message persists, please contact the store owner.","Neem contact op met de winkeleigenaar indien dit bericht aanhoudt." -"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Als u geen optiewaarde voor een specifieke store view specificeert, wordt de vaststaande waarde (admin) worden gebruikt." -"Images (.gif, .jpg, .png)","Afbeeldingen (.gif, .jpg, .png)" -"Images Cache","Afbeeldingen Voorraad" -"Import","Import" -"Import Service","Importeer dienst" -"Import and Export","Importeren en exporteren" -"Import and Export Tax Rates","Import en Export Belastingtarieven" -"Import/Export","Import/Export" -"Import/Export Advanced","Import/Export Geavanceerd" -"Import/Export Profile","Import/Export Profiel" -"Important: ","Belangrijk:" -"Imported %s records","Geïmporteerde %s gegevens" -"In","In" -"In Database:","In databse:" -"In File:","In bestand:" -"Inactive","Inactief" -"Incl. Tax","Incl. BTW" -"Incoming Message","Inkomend Bericht" -"Insert Variable...","Voeg Variabel in..." -"Interactive","Interactief" -"Interface Locale: %s","Interface locatie-instelling: %s" -"Invalid Form Key. Please refresh the page.","Ongeldig Formaat Sleutel. Gelieve de pagina te herladen." -"Invalid Import Service Specified","Ongeldige Import Service Geselecteerd" -"Invalid POST data (please check post_max_size and upload_max_filesize settings in your php.ini file).","Ongeldige POST data (kijk post_max_size en upload_max_filesize instellingen na in uw php.ini file)." -"Invalid Secret Key. Please refresh the page.","Ongeldige Geheime Sleutel. Ververs de pagina." -"Invalid User Name or Password.","Ongeldige Gebruikersnaam of Wachtwoord." -"Invalid directory: %s","Ongeldige directory: %s" -"Invalid email address ""%s"".","Ongeldig e-mailadres ""%s""." -"Invalid email address.","Ongeldig e-mailadres." -"Invalid file: %s","Ongeldig bestand: %s" -"Invalid input data for %s => %s rate","Ongeldige invoerdata voor %s => %s tarief" -"Invalid parent block for this block","Ongeldig hoofdblok voor dit blok" -"Invalid parent block for this block.","Ongeldig bron blok voor dit blok." -"Invalid password reset token.","Ongeldige wachtwoord herstel token" -"Invalid sender name ""%s"". Please use only visible characters and spaces.","Ongeldige naam van verzender ""%s"". Gebruik a.u.b. alleen zichtbare karakters en spaties." -"Invalid timezone","Ongeldige tijdzone" -"Invalidated","Ongeldig gemaakt" -"Inventory Stock Status","Inventarislijst status" -"Invoice #%s comment added","Factuur #%s commentaar toegevoegd" -"Invoice #%s created","Factuur #%s aangemaakt" -"Invoice History","Factuurhistorie" -"Invoice Totals","Totaal facturen" -"Invoice canceling error.","Factuur annuleringsfout." -"Invoice capturing error.","Factuur ophaal fout." -"Invoice voiding error.","Factuur vernietiging fout." -"Invoices","Facturen" -"Is Closed","Is gesloten" -"Is Default","Is Standaard" -"Issue Number","Uitgave Nummer" -"Items","Artikelen" -"JavaScript seems to be disabled in your browser.","JavaScript lijkt uitgeschakeld te zijn in uw browser." -"JavaScript/CSS","Javascript/CSS" -"JavaScript/CSS Cache","Javascript/CSS Cache" -"Kb","Kb" -"Last 24 Hours","Afgelopen 24 uur" -"Last 5 Orders","Laatste 5 bestellingen" -"Last 5 Search Terms","Laatste 5 zoektermen" -"Last 7 Days","Laatste 7 Dagen" -"Last Credit Memo Created Date","Laatste Kredietnota Aanmaak Datum" -"Last Invoice Created Date","Laatste factuur creatie datum" -"Last Logged In (%s):","Laatst ingelogd in (%s):" -"Last Logged In:","Laatste login:" -"Last Name","Achternaam" -"Last Name is required field.","Achternaam is een verplicht veld." -"Last Name:","Achternaam:" -"Last updated: %s. To refresh last day\'s statistics, click here.","Laatste update: %s. Om de statistieken van de voorgaande dag te verversen, klik hier." -"Latest Message:","Laatste boodschap:" -"Layered Navigation Indices","Gelaagde Navigatie Indices" -"Layered Navigation Indices were refreshed.","Gelaagde Navigatie Indices zijn ververst." -"Leave empty to use tax identifier","Laat dit veld leeg om het belastingidentificatienummer te gebruiken" -"Lifetime Sales","Lifetime Verkopen" -"Lifetime statistics have been updated.","Lifetime statistieken zijn geupdate." -"Links","Links" -"Links with associated products will retain only after saving current product.","Links met gerelateerde producten worden slechts behouden na het opslaan van huidige product." -"List (default) / Grid","Lijst (standaard) / Rooster" -"List Only","Alleen Lijst" -"Load Template","Laad Sjabloon" -"Load default template","Laad standaard sjabloon" -"Loading...","Aan het laden..." -"Local Server","Lokale Server" -"Local/Remote Server","Lokale/Op afstand Server" -"Locale","Lokaal" -"Log In","Inloggen" -"Log Out","Uitloggen" -"Log in to Admin Panel","Log in op het Administratie Bedieningspaneel" -"Log in to use %s","Log in om %s te gebruiken" -"Log into Magento Admin Page","Inloggen bij Magento administratiepagina" -"Logged in as %s","Ingelogd als %s" -"Login","Log in" -"Low Stock","Lage Voorraad" -"MAJOR","MAJOR" -"MINOR","MINOR" -"MS Excel XML","MS Excel XML" -"Magento Admin","Magento Administrator" -"Magento Commerce - Administrative Panel","Magento Commerce - Administratiepaneel" -"Magento Connect","Magento Connect" -"Magento Connect Manager","Magento Connect Manager" -"Magento Logo","Magento Logo" -"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento is een handelsmerk van Magento Inc. Copyright © %s Magento Inc." -"Magento root directory","Magento root directory" -"Magento ver. %s","Magento ver. %s" -"Magento™ is a trademark of Magento Inc.
    Copyright © %s Magento Inc.","Magento™ is een handelsmerk van Magento Inc.
    Copyright © %s Magento Inc." -"Make sure that data encoding in the file is consistent and saved in one of supported encodings (UTF-8 or ANSI).","Zorg ervoor dat de data die is gecodeerd in het bestand consistent is en opgeslagen in één van de ondersteunde coderingen. (UTF-8 of ANSI)." -"Manage Attribute Sets","Beheer Attribuut Sets" -"Manage Attributes","Attributen beheren" -"Manage Categories","Beheer Categorieën" -"Manage Content","Content beheren" -"Manage Currency Rates","Beheer Wisselkoersen" -"Manage Currency Symbols","Beheer valutasymbolen" -"Manage Customers","Beheer Klanten" -"Manage Options (values of your attribute)","Beheer Opties (waarden van uw attribuut)" -"Manage Ratings","Beheer Ratings" -"Manage Stores","Beheer Winkels" -"Manage Tax Rules","Manage Belasting Regels" -"Manage Tax Zones and Rates","Belastingzones en -tarieven beheren" -"Manage Titles (Size, Color, etc.)","Beheer Titels (Grootte, Kleur, etc.)" -"Manual","Handmatig" -"Matched Expression","Bijpassende Expressie" -"Maximum sender name length is 255. Please correct your settings.","Maximale afzendernaam lengte is 255. Corrigeer de instellingen." -"Mb","Mb" -"Media (.avi, .flv, .swf)","Media (.avi, .flv, .swf)" -"Media storages synchronization has completed!","Mediageheugen synchronisatie voltooid!" -"Messages Inbox","Berichten Postvak In" -"Month","Maand" -"Most Viewed","Meest bekeken" -"Most Viewed Products","Meest bekeken producten" -"Multiple Select","Multiple Selecteer" -"My Account","Mijn account" -"My Applications","Mijn toepassingen" -"N/A","Nvt" -"NOTICE","OPMERKING" -"Name","Naam" -"Name on Card","Naam Op Kaart" -"Name on the Card: %s","Naam op de Kaart: %s" -"Name:","Naam:" -"Never (production)","Nooit (productie)" -"New ","Nieuw" -"New API Key","Nieuwe API-sleutel" -"New Accounts","Nieuwe Accounts" -"New Attribute","Nieuw Attribuut" -"New Block","Nieuw blok" -"New Category","Nieuwe Categorie" -"New Class","Nieuwe Klasse" -"New Condition","Nieuwe Conditie" -"New Custom Variable","Nieuw Aangepast Variabel" -"New Customer","Nieuwe Klant" -"New Customers","Nieuwe Klanten" -"New Design Change","Nieuwe Ontwerpverandering" -"New Email Template","Nieuw E-mail Sjabloon" -"New Group","Nieuwe Groep" -"New Invoice","Nieuwe Factuur" -"New Item Type","Nieuw Item Type" -"New Memo","Nieuwe Nota" -"New Memo for #%s","Nieuwe Nota voor #%s" -"New Page","Nieuwe Pagina" -"New Password","Nieuw Wachtwoord" -"New Poll","Nieuwe Poll" -"New Profile","Nieuw Profiel" -"New Rate","Nieuw Tarief" -"New Rating","Nieuwe beoordeling" -"New Review","Nieuwe Review" -"New Role","Nieuwe Rol" -"New Rule","Nieuwe Regel" -"New Search","Nieuwe Zoekopdracht" -"New Set","Nieuwe Reeks" -"New Shipment","Nieuwe Verzending" -"New Sitemap","Nieuwe Sitemap" -"New Store View","Nieuwe Winkel Bezichtiging" -"New System Template","Nieuw Systeemtemplate" -"New Tag","Nieuwe Tag" -"New Template","Nieuw Sjabloon" -"New User","Nieuwe Gebruiker" -"New Variable","Nieuw Variabele" -"New Website","Nieuwe Website" -"New attribute set mapping","Nieuw attribuut set mappen" -"New password field cannot be empty.","Nieuw wachtwoord veld mag niet leeg zijn" -"Newsletter","Nieuwsbrief" -"Newsletter Problems","Nieuwsbrief Problemen" -"Newsletter Queue","Nieuwsbrief Wachtrij" -"Newsletter Subscribers","Nieuwsbrief abonnees" -"Newsletter Templates","Nieuwsbrief sjablonen" -"Next month (hold for menu)","Volgende maand (houd ingedrukt voor menu)" -"Next year (hold for menu)","Volgend jaar (houd ingedrukt voor menu)" -"No","Nee" -"No (price without tax)","Nee (prijs zonder BTW)" -"No Data","Geen Data" -"No Data Found","Geen gegevens gevonden" -"No Templates Found","Geen sjablonen gevonden" -"No change","Geen verandering" -"No customer id defined.","Geen klant identificatie." -"No information available.","Geen informatie beschikbaar." -"No profile loaded...","Geen profiel geladen..." -"No records found for this period.","Geen registraties gevonden voor deze periode." -"No records found.","Geen bestanden gevonden." -"No report code specified.","Geen meldingscode gespecificeerd." -"No search keywords.","Geen zoek sleutelwoorden." -"No search modules were registered","Er werden geen zoekmodules geregistreerd." -"No wishlist item id defined.","Geen verlanglijst identificatie." -"None","Geen" -"Note:","Aantekening:" -"Notes","Aantekeningen" -"Notifications","Notificaties" -"Number of Orders","Aantal Orders" -"Number of Uses","Aantal Gebruiken" -"Number of Views","Aantal keer bekeken" -"Number of records:","Aantal archieven:" -"OAuth Consumers","OAuth Consumenten" -"OAuth authorization for admin","OAuth autorisatie voor beheerder" -"OAuth authorization simple for admin","OAuth autorisatie eenvoudig voor beheerder" -"OK","OK" -"Old rate:","Oude tarief:" -"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Zodra u inlogt op uw PayPal-rekening Geavanceerd, navigeer naar de Service-instellingen - Hosted betalingspagina's - Set Up menu en stel de hieronder beschreven opties in" -"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Zodra u inlogt op uw PayPal-Payflow Link-account, navigeer naar de Service-instellingen - Hosted betalingspagina's - Set Up menu en stel de hieronder beschreven opties in" -"One or more media files failed to be synchronized during the media storages syncronization process. Refer to the log file for details.","Eén of meer mediabestanden zijn niet gesynchroniseerd tijdens het mediageheugen synchronisatieproces. Ga naar het logbestand voor details." -"One or more of the Cache Types are invalidated:","Een of meer van de cache types zijn niet meer geldig:" -"Online Customers","Online Klanten" -"Only Once (version upgrade)","Slechts eenmalig (versie bijwerken)" -"Only attributes with scope ""Global"", input type ""Dropdown"" and Use To Create Configurable Product ""Yes"" are available.","Alleen eigenschappen met ""Global"" scope, input type ""Dropdown"" en Use To Create Configurable Product ""Ja"" zijn beschikbaar." -"Only mapped fields","Alleen gemapte velden" -"Optional","Optioneel" -"Options","Opties" -"Options is required","Opties zijn benodigd" -"Order","Bestelling" -"Order #%s","Bestelling #%s" -"Order #%s (%s)","Bestelling #%s (%s)" -"Order Created Date","Bestelling aangemaakt op datum" -"Order ID","ID Bestelling" -"Order Totals","Totalen Bestelling" -"Order Updated Date","Bestelling bijgewerkt op datum" -"Order Updated Date report is real-time, does not need statistics refreshing.","Bestelling Aangepaste Datum rapport is real-time, deze hoeft niet statisch vernieuwd te worden." -"Orders","Bestellingen" -"Original Magento attribute names in first row:","Originele Magento attributennamen in de eerste rij:" -"Out of stock","Uit voorraad" -"PDT (Payment Data Transfer) Only","PDT (Betaling Informatie Overdracht) Alleen" -"Package Extensions","Pakket Uitbreidingen" -"Pages","Pagina's" -"Parent Product Thumbnail","Hoofdproduct Thumbnail" -"Parent Transaction ID","Ouder transactie ID" -"Passive mode","Passieve modus" -"Password","Wachtwoord" -"Password Confirmation","Wachtwoord Confirmatie" -"Password confirmation must be same as password.","Wachtwoord confirmatie moet het zelfde zijn als wachtwoord." -"Password must be at least of %d characters.","Wachtwoord moet ten minste %d tekens lang zijn." -"Password must include both numeric and alphabetic characters.","Wachtwoord moet zowel nummers als letters bevatten." -"Password:","Wachtwoord:" -"Path:","Pad:" -"Payment method instance is not available.","Betalingsmethode niet beschikbaar" -"Payment method is not available.","Betalingsmethode is niet beschikbaar." -"Payment method must be specified.","Betalingsmethode moet gekozen worden." -"Pending Reviews","In afwachting van beoordelingen" -"Pending Tags","Nog niet actieve Tags" -"Per Item","Per Stuk" -"Per Order","Per Bestelling" -"Percent","Procent" -"Performed At","Uitgevoerd Op" -"Period","Periode" -"Permanent (301)","Permanent (301)" -"Permissions","Toestemmingen" -"Personal Information","Persoonlijke Informatie" -"Phone:","Telefoon:" -"Please Select","Selecteer A.U.B." -"Please confirm site switching. All data that hasn\'t been saved will be lost.","Bevestig a.u.b. site switching. Alle data die niet zijn opgeslagen, zullen verdwijnen." -"Please enter 6 or more characters.","Voer 6 of meer karakters in." -"Please enter a number greater than 0 in this field.","Voer a.u.b. een getal groter dan 0 in in dit veld." -"Please enter a valid $ amount. For example $100.00.","Voer a.u.b. een geldig € hoeveelheid in. Bijvoorbeeld €100,00." -"Please enter a valid URL. For example http://www.example.com or www.example.com","Voer a.u.b. een geldige YRL in. Bijvoorbeeld http://www.voorbeeld.com of www.voorbeeld.com" -"Please enter a valid URL. http:// is required","Voer a.u.b. een geldige URL in. http:// is vereist" -"Please enter a valid credit card number.","Voer geldig creditcard nummer in." -"Please enter a valid date.","Voer a.u.b. een geldige datum in." -"Please enter a valid email address. For example johndoe@domain.com.","Voer a.u.b. een geldig e-mailadres in. Bijvoorbeeld johndoe@domain.com." -"Please enter a valid email.","Voer a.u.b. een geldig e-mailadres in." -"Please enter a valid number in this field.","Voer in dit veld een geldig nummer in." -"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Voer een geldig telefoonnummer in. Bijvoorbeeld (123) 456-7890 of 123-456-7890." -"Please enter a valid social security number. For example 123-45-6789.","Voer a.u.b. een geldig burgerservicenummer in. Bijvoorbeeld 123-45-6789." -"Please enter a valid value from list","Voer een geldige invoer van de lijst in" -"Please enter a valid value, ex: 10,20,30","Voer a.u.b. een geldige waarde in, v.b. 10, 20, 30" -"Please enter a valid zip code.","Voer een geldige postcode in." -"Please enter a valid zip code. For example 90602 or 90602-1234.","Voer a.u.b. een geldige postcode in. Bijvoorbeeld 1234 AB." -"Please enter another credit card number to complete your purchase.","Voer alstublieft een ander creditcardnummer in om uw aankoop te voltooien." -"Please enter password","Voer aub uw wachtwoord in" -"Please enter password to confirm rollback.","Voer aub uw wachtwoord in om de rollback te bevestigen." -"Please enter valid password.","Voer a.u.b. een geldig wachtwoord in." -"Please make sure that all global admin search modules are installed and activated.","Zorg dat alle global admin search modules geïnstalleerd en geactiveerd zijn." -"Please make sure that your changes were saved before running the profile.","Zorg dat al uw veranderingen opgeslagen zijn voordat u het profiel uitvoert." -"Please make sure your passwords match.","Let er alstublieft op dat de wachtwoorden overeenkomen." -"Please select State/Province.","Selecteer Staat/Provincie." -"Please select a customer.","Selecteer een klant." -"Please select a store.","Selecteer a.u.b. een winkel." -"Please select an option.","Selecteer alstublieft een optie." -"Please select catalog searches.","Selecteer alstublieft catalogus zoekopdrachten." -"Please select customer(s).","Selecteer a.u.b. (een) klant(en)" -"Please select message(s).","Selecteer alstublieft boodschap(pen)." -"Please select one of the above options.","Selecteer alstublieft een van de bovenstaande opties." -"Please select one of the options.","Selecteer a.u.b. één van de opties." -"Please select review(s).","Selecteer alstublieft recentie(s)." -"Please select tag(s).","Selecteer a.u.b. (een) tag(s)" -"Please specify backup creation options","Specificeer aub de backup creatie opties" -"Please specify the admin custom URL.","Specificeer a.u.b. de admin standaard URL." -"Please try to logout and sign in again.","Probeer uit te loggen en log opnieuw in." -"Please type the letters from the image:","Voer aub de letters van de afbeelding in:" -"Please use in this field only ""a-z,0-9,_"".","Gebruikt in dit veld alleen ""a-z,0-9,_""." -"Please use letters only (a-z) in this field.","Gebruik alstublieft alleen letters (a-z) in dit veld." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Gebruik alleen getallen in dit veld. Vermijd spaties of andere tekens zoals punten of komma's." -"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","Gelieve alleen de letters (a-z of A-Z), nummers (0-9) en/of spaties in dit veld te gebruiken." -"Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Gebruik a.u.b. alleen letters (a-z) of nummers (0-9) in dit veld. Spaties en andere karakters zijn niet toegestaan." -"Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.","Gebruik alstublieft alleen letters (a-z) of nummers (0-9) of spaties en # in dit veld." -"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Gebruik het volgende datumformaat: dd/mm/jjjj. Bijvoorbeeld 17/03/2006 voor 17 maart 2006." -"Please wait while the indexes are being refreshed.","Wacht alstublieft terwijl de indexen worden vernieuwd." -"Please wait, loading...","Wacht alstublieft, aan het laden..." -"Please wait...","Even geduld..." -"Please, add some answers to this poll first.","Voeg alstublieft eerst een aantal antwoorden toe aan deze poll." -"Please, select ""Visible in Stores"" for this poll first.","Selecteer alstublieft ""Zichtbaar in winkels"" eerst voor deze peiling." -"Poll Manager","Poll Manager" -"Polls","Peilingen" -"Popular","Populair" -"Position","Positie" -"Position of Watermark for %s","Positie van Watermerk voor %s" -"Pregenerated product images files.","Gegenereerde product afbeeldingsbestanden." -"Prev. month (hold for menu)","Vorige maand (vasthouden voor menu)" -"Prev. year (hold for menu)","Vorig jaar (houd ingedrukt voor menu)" -"Preview","Preview" -"Preview Template","Voorbeeld sjabloon" -"Price","Prijs" -"Price alert subscription was saved.","Prijsnotificatie abonnement werd opgeslagen." -"Price:","Prijs:" -"Processed %s%% %s/%d records","Verwerkte %s%% %s/%d bestanden" -"Product","Product" -"Product Name","Productnaam" -"Product Reviews","Productbeoordelingen" -"Product Tax Classes","Product Belasting Klassen" -"Product Thumbnail Itself","Product Miniatuurweergave Zelf" -"Product is not loaded.","Product is niet geladen." -"Product:","Product:" -"Products","Producten" -"Products Bestsellers Report","Producten Bestsellers Rapport" -"Products Most Viewed Report","Verslag meest bekeken producten" -"Products Ordered","Bestelde Producten" -"Products in Carts","Producten in Wagens" -"Profile Action","Profiel Actie" -"Profile Actions XML","Profiel Acties XML" -"Profile Direction","Profiel Richting" -"Profile History","Profielgeschiedenis" -"Profile Information","Profielinformatie" -"Profile Name","Profielnaam" -"Profile Payments","Profiel Betalingen" -"Profile Schedule","Profiel Schema" -"Profile Wizard","Profiel Wizard" -"Profiles","Profielen" -"Promo","Promotie" -"Promotions","Promoties" -"Purchased Item","Aangeschaft Artikel" -"Put store on the maintenance mode while backup creation","Zet de store in onderhoudsmodus tijdens het maken van back-ups" -"Put store on the maintenance mode while rollback processing","Zet de winkel in de onderhoudsmodus tijdens het rollback proces" -"Quantity","Hoeveelheid" -"Queue Refresh","Verversing Rij" -"Queued... Cancel","In de Wachtrij... Annuleer" -"REST Roles","REST Functies" -"Radio Buttons","Radio Knoppen" -"Rates","Tarieven" -"Read details","Lees details" -"Rebuild","Herbouwen" -"Rebuild Catalog Index","Herbouw Catalogus Index" -"Rebuild Flat Catalog Category","Herbouw Flat Catalogus Categorie" -"Rebuild Flat Catalog Product","Herbouw Plat Catalogus Product" -"Recent Orders","Recente Bestellingen" -"Recent statistics have been updated.","Recente statistieken zijn geüpdatet." -"Recurring Profile View","Herhaalde Profiel View" -"Recursive Dir","Recursieve Dir" -"Redirect","Doorverwijzing" -"Reference","Referentie" -"Reference ID","Referentie ID" -"Refresh","Ververs" -"Refresh Now*","Vernieuw Nu*" -"Refresh Statistics","Statistieken verversen" -"Region/State","Regio/Staat" -"Regular Price:","Normale prijs:" -"Reject","Wijs af" -"Reject token authorization Pop Up for admin","Weiger token autorisatie Pop Up voor beheerder" -"Reject token authorization for admin","Weiger token autorisatie voor beheerder" -"Rejection Of Authorization","Afwijzing van de Autorisatie" -"Release","Uitgave" -"Release Stability","Geef Stabiliteit Vrij" -"Release Version","Uitgave Versie" -"Reload captcha","Herlaad captcha" -"Remote FTP","Afgelegen FTP" -"Remove","Verwijderen" -"Reports","Verslagen" -"Request Path","Vraag Pad op" -"Required","Benodigd" -"Reset","Opnieuw" -"Reset Filter","Stel Filter Opnieuw in" -"Reset Password","Herstel Wachtwoord" -"Reset a Password","Wachtwoord opnieuw instellen" -"Resize","Formaat Veranderen" -"Resource Access","Toegang tot hulpbron" -"Resources","Hulpbronnen" -"Results","Resultaten" -"Retrieve Password","Wachtwoord Opvragen" -"Return Html Version","Keer HTML Versie Terug" -"Revenue","Omzet" -"Reviews","Reviews" -"Reviews and Ratings","Beoordelingen en waarderingen" -"Rewrite Rules","Regels herschrijven" -"Role ID","Rol ID" -"Role Info","Rol Informatie" -"Role Information","Rolinformatie" -"Role Name","Rolnaam" -"Role Resources","Rol Bronnen" -"Role Users","Rol gebruikers" -"Roles","Rollen" -"Roles Resources","Rollen hulpbronnen" -"Root Category","Root Category" -"Rotate CCW","Draai CCW" -"Rotate CW","CW roteren" -"Run","Run" -"Run Profile","Profiel uitvoeren" -"Run Profile Inside This Window","Profiel runnen in dit scherm" -"Run Profile in Popup","Profiel runnen in popup scherm" -"Running... Kill","Werkende... Afbreken" -"SKU","SKU" -"SKU:","SKU:" -"SSL Error: Invalid or self-signed certificate","SSL Fout: Ongeldig of zelfondertekend certificaat" -"Sales","Verkoop" -"Sales Report","Verkooprapport" -"Samples","Monsters" -"Save","Opslaan" -"Save & Generate","Sla op & Genereer" -"Save Account","Bewaar Account" -"Save Cache Settings","Bewaar Opslag Instellingen" -"Save Config","Sla Configuratie op" -"Save Currency Rates","Bewaar Huidige Waarden" -"Save Profile","Profiel opslaan" -"Save Role","Sla Rol op" -"Save Template","Sjabloon Opslaan" -"Save User","Bewaar Gebruiker" -"Save and Continue Edit","Opslaan en doorgaan met bewerken" -"Search","Zoeken" -"Search Index","Zoekindex" -"Search Term","Zoek Woord" -"Search Terms","Zoek Voorwaarden" -"Select","Selecteren" -"Select All","Selecteer Alles" -"Select Category","Selecteer Categorie" -"Select Date","Selecteer Datum" -"Select Range","Gebied selecteren" -"Select date","Selecteer datum" -"Selected allowed currency ""%s"" is not available in installed currencies.","Geselecteerde toegestane munteenheid ""%s"" is niet beschikbaar in de geïnstalleerde munteenheden." -"Selected base currency is not available in installed currencies.","De gekozen basis valuta is niet beschikbaar in de geïnstalleerde valuta's." -"Selected default display currency is not available in allowed currencies.","Geselecteerde vaststaande display valuta is niet beschikbaar in toegestane valuta." -"Selected default display currency is not available in installed currencies.","De gekozen weer te geven valuta is niet beschikbaar in de geïnstalleerde valuta's." -"Self-assigned roles cannot be deleted.","Zelf-toegewezen rollen kunnen niet verwijderd worden." -"Sender","Verzender" -"Separate Email","Afgezonderde E-mail" -"Shipment #%s comment added","Verzending #%s commentaar toegevoegd" -"Shipment #%s created","Verzending #%s gecreëerd" -"Shipment Comments","Verzending Commentaar" -"Shipment History","Verzending geschiedenis" -"Shipments","Verzendingen" -"Shipping","Verzending" -"Shipping Address","Verzendingsadres" -"Shipping Address: ","Verzendadres:" -"Shipping Origin","Verzending Herkomst" -"Shipping Price","Verzendkosten" -"Shipping address selection is not applicable","Verzendadres selectie is niet van toepassing" -"Shipping method must be specified.","Verzendingsmethode moet gekozen worden." -"Shipping method selection is not applicable","Verzendmethode selectie is niet van toepassing" -"Shopping Cart","Winkelmandje" -"Shopping Cart Price Rules","Winkelwagen Berekeningsregels" -"Shopping Cart from %s","Winkelwagen van %s" -"Show By","Tonen op" -"Show Report For:","Toon Verslag Van:" -"Show Reviews","Laat Beoordelingen Zien" -"Sitemap Information","Sitemap Informatie" -"Size for %s","Rangschikken naar %s" -"Skip Category Selection","Sla Categorie Selectie over" -"Some items in this order have different invoice and shipment types. You can create shipment only after the invoice is created.","Some zaken in deze bestelling hebben verschillende factuur- en bezorgtypes. U kunt alleen een bezorging maken na het maken van de rekening." -"Some of the ordered items do not exist in the catalog anymore and will be removed if you try to edit the order.","Sommige van de bestelde artikelen bestaan niet meer in de catalogus en zullen verwijderd worden als u de bestelling aanpast." -"Sorry, this feature is coming soon...","Sorry, deze optie komt binnenkort..." -"Special Price:","Speciale prijs:" -"Specific Countries","Specifieke Landen" -"Specified","Gespecificeerd" -"Specified profile does not exist.","Gespecificeerd profiel bestaat niet." -"Spreadsheet Name:","Naam spreadsheet:" -"Start Date","Begindatum" -"Starting profile execution, please wait...","Bezig met het beginnen van de uitvoering van het profiel, wacht u alstublieft..." -"State/Province:","Staat/Provincie:" -"Static Blocks","Statische blokken" -"Status","Status" -"Status:","Status:" -"Stock Quantity:","Hoeveelheid in voorraad:" -"Stock notification was saved.","Voorraad notificatie opgeslagen." -"Store","Winkel" -"Store Email Addresses Section","Sla E-mail Adres Sectie op" -"Store View","Aanblik winkel" -"Store:","Sla op:" -"Stores","Warenhuizen" -"Subject","Onderwerp" -"Submit","Bevestig" -"Subpackage cannot be conflicting.","Subpakket mag niet conflicteren." -"Subtotal","Subtotaal" -"Switch/Solo card issue number: %s","Switch/Solo kaartnummer: %s" -"Switch/Solo card start Date: %s/%s","Switch/Solo kaart begindatum: %s/%s" -"Switch/Solo/Maestro Only","Alleen Switch/Solo/Maestro" -"Switch/Solo/Maestro(UK Domestic) Only","Alleen Switch/Solo/Maestro (UK Domestic)" -"Switch/Solo/Maestro(UK Domestic) card issue number: %s","Switch/Solo/Maestro(UK Domestic) kaartnummer: %s" -"Switch/Solo/Maestro(UK Domestic) card start Date: %s/%s","Switch/Solo/Maestro(UK Domestic) afgiftedatum: %s/%s" -"Symbol","Symbool" -"Synchronization is required.","Synchronisatie is nodig." -"Synchronization of media storages has been successfully completed.","Synchronisatie van mediaopslag is succesvol voltooid." -"Synchronize","Synchroniseer" -"Synchronizing %s to %s","Aan het synchroniseren van %s tot s%" -"Synchronizing...","Aan het synchroniseren..." -"System","Systeem" -"System Section","Systeem Sectie" -"System busy","Systeem bezig" -"Tags","Labels" -"Target Path","Doelpad" -"Tax","Belasting" -"Tb","Tb" -"Template","Sjabloon" -"Template Content","Inhoud sjabloon" -"Template Information","Sjabloon informatie" -"Template Name","Naam sjabloon" -"Template Styles","Sjabloon Stijlen" -"Template Subject","Sjabloon Onderwerp" -"Template Type","Sjabloon Type" -"Temporary (302)","Tijdelijk (302)" -"Terms and Conditions","Voorwaarden" -"Text","Tekst" -"The Catalog Rewrites were refreshed.","De Catalogus Rewrites zijn ververst." -"The CatalogInventory Stock Status has been rebuilt.","De Catalogus Inventaris Voorraad Status is herbouwd." -"The Comment Text field cannot be empty.","U kunt het Opmerking Tekstveld niet leeglaten." -"The Flat Catalog Product was rebuilt","Het Flat Catalogus Product is verbouwd." -"The JavaScript/CSS cache has been cleaned.","De JavaScript/CSS opslagplaats is opgeschoond." -"The JavaScript/CSS cache has been cleared.","De JavaScript/CSS opslagplaats is opgeruimd." -"The Layered Navigation indexing has been queued.","De Layered Navigation indexering staat in de wachtrij." -"The Layered Navigation indexing queue has been canceled.","De Layered Navigation indexering wachtrij is geannuleerd." -"The Layered Navigation indices were refreshed.","De Layered Navigatie indexen zijn verversd." -"The Layered Navigation process has been queued to be killed.","Het Layered Navigation proces staat in de wachtrij." -"The Magento cache storage has been flushed.","De Magento cache opslag is gespoeld." -"The URL Rewrite has been deleted.","De URL Rewrite is verwijderd." -"The URL Rewrite has been saved.","De URL Rewrite is opgeslagen." -"The account has been saved.","De account is bewaard." -"The archive can be uncompressed with %s on Windows systems","Het archief kan worden uitgepakt met %s op Windows systemen" -"The attribute set has been removed.","De attribuutset is verwijderd." -"The backup's creation process will take time.","Het maken van een back-up zal tijd innemen." -"The billing agreement has been canceled.","De betalingsovereenkomst is geannuleerd." -"The billing agreement has been deleted.","De betaalovereenkomst is verwijderd." -"The cache storage has been flushed.","De cache opslag is gespoeld." -"The carrier needs to be specified.","De vervoerder moet gespecificeerd worden." -"The catalog index has been rebuilt.","De catalogusindex in herbouwd." -"The catalog rewrites have been refreshed.","De catalogus rewrites is verversd." -"The configuration has been saved.","De configuratie is opgeslagen." -"The credit memo has been canceled.","De kredietnota is geannuleerd." -"The credit memo has been created.","Het kredietgeheugen is gemaakt." -"The credit memo has been voided.","De kredietnota is vervallen." -"The custom variable has been deleted.","De standaard variabele is verwijderd." -"The custom variable has been saved.","De custom variabele is opgeslagen." -"The customer has been deleted.","De klant is verwijderd." -"The customer has been saved.","De klant is bewaard." -"The design change has been deleted.","De ontwerpverandering is verwijderd." -"The design change has been saved.","De ontwerpverandering is opgeslagen." -"The email address is empty.","Het email-adres is leeg." -"The email template has been deleted.","De email-template is verwijderd." -"The email template has been saved.","Het e-mailsjabloon is bewaard." -"The flat catalog category has been rebuilt.","De platte cataloguscategorie is herbouwd." -"The group node name must be specified with field node name.","De groepsnode naam moet gespecificeerd worden met een veldnode naam." -"The image cache was cleaned.","Het afbeeldingencache werd opgeschoond." -"The image cache was cleared.","De afbeeldingcache is geschoond." -"The invoice and shipment have been created.","De factuur en verzending zijn aangemaakt." -"The invoice and the shipment have been created. The shipping label cannot be created at the moment.","De factuur en de verzending is gemaakt. De verzendlavel kan nu niet worden gemaakt." -"The invoice has been canceled.","De factuur is geannuleerd." -"The invoice has been captured.","De factuur is berekend." -"The invoice has been created.","De rekening is gemaakt." -"The invoice has been voided.","De factuur is nietig verklaard." -"The invoice no longer exists.","De factuur bestaat niet meer." -"The item %s (SKU %s) does not exist in the catalog anymore.","Het product %s (SKU %s) bestaat niet meer in de catalogus." -"The order does not allow creating an invoice.","De bestelling staat het maken van een factuur niet toe." -"The order no longer exists.","De bestelling bestaat niet meer." -"The poll has been deleted.","De peiling is verwijderd." -"The poll has been saved.","De peiling is opgeslagen." -"The profile has been deleted.","Het profiel is verwijderd." -"The profile has been saved.","Het profiel is opgeslagen." -"The profile has been updated.","Het profiel is geüpdatet." -"The profile has no changes.","Het profiel bevat geen wijzigingen." -"The profile you are trying to save no longer exists","Het profiel dat u probeert op te slaan bestaat niet meer" -"The rating has been deleted.","De waardering is verwijderd." -"The rating has been saved.","De waardering is opgeslagen." -"The role has been deleted.","De rol is verwijderd." -"The role has been saved.","De rol is bewaard." -"The role has been successfully saved.","De rol is opgeslagen." -"The search index has been rebuilt.","De zoekindex is opnieuw samengesteld." -"The shipment has been created.","De verzending is aangemaakt." -"The shipment has been sent.","De bestelling is verzonden." -"The shipping label has been created.","Het verzendingslabel is aangemaakt." -"The tag has been deleted.","Dit Label is verwijderd." -"The tag has been saved.","De tag is opgeslagen." -"The transaction details have been updated.","De transactiegegevens zijn bijgewerkt." -"The user has been deleted.","De gebruiker is verwijderd." -"The user has been saved.","De gebruiker is opgeslagen." -"Themes JavaScript and CSS files combined to one file.","Thema's JavaScript en CSS bestanden gecombineerd tot een bestand." -"There is an error in one of the option rows.","Er is een fout in één van de optie rijen." -"This Account is","Dit account is" -"This Email template no longer exists.","Deze e-mailsjabloon bestaat niet langer." -"This Role no longer exists","Deze rol bestaat niet meer" -"This Role no longer exists.","Deze rol bestaat niet meer." -"This account is","Dit account is" -"This account is inactive.","Dit account is niet actief." -"This action cannot be undone.","Deze actie kan niet ongedaan worden gemaakt." -"This attribute set does not have attributes which we can use for configurable product","Deze attributenset heeft geen attributen die we voor een configureerbaar product kunnen gebruiken" -"This attribute shares the same value in all the stores","Dit attribuut deelt dezelfde waarde in alle winkels" -"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Dit is een demo winkel. Geplaatste bestellingen bij deze winkel worden niet gehonoreerd of uitgevoerd." -"This is a required field.","Dit is een verplicht veld." -"This product is currently disabled.","Dit product is momenteel niet aanwezig." -"This report depends on timezone configuration. Once timezone is changed, the lifetime statistics need to be refreshed.","Dit rapport hangt af van tijdzone configuratie. Zodra tijdzone is veranderd, moeten de lifetime statistieken verversd worden." -"This section is not allowed.","Deze sectie is niet toegestaan." -"This user no longer exists.","De gebruiker bestaat niet langer meer." -"Time","Tijd" -"Time selection:","Tijdselectie:" -"Time:","Tijd:" -"Timeout limit for response from synchronize process was reached.","Timeout limiet voor respons van synchroniseerproces is bereikt." -"To","Naar" -"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","Om wachtende autorisaties te annuleren en bedragen vrij te geven die tijdens deze betaling zijn verwerkt, druk op Annuleer." -"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","Om PayPal Payflow Link te gebruiken, moet u uw PayPal-Payflow Link account configureren op de website van PayPal." -"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","Om PayPal-betalingen Geavanceerd te gebruiken, moet u uw PayPal-betalingen Geavanceerd account configureren op de website van PayPal." -"Toggle Editor","Toggle Editor" -"Tools","Gereedschap" -"Top 5 Search Terms","Top 5 Zoektermen" -"Total","Totaal" -"Total Invoiced","Totaal gefactureerd" -"Total Order Amount","Totale Bestellingshoeveelheid" -"Total Refunded","Totaal Terugbetaald" -"Total of %d record(s) have been deleted.","Er zijn in totaal %d dossier(s) verwijderd" -"Total of %d record(s) have been updated.","Er zijn in totaal %d dossier(s) bijgewerkt" -"Total of %d record(s) were canceled.","Totaal van %d record(s) zijn geannuleerd." -"Total of %d record(s) were deleted","Totaal van %d verslag(en) zijn gewist" -"Total of %d record(s) were deleted.","Totaal van %d verslag(en) zijn gewist." -"Total of %d record(s) were updated","Totaal van %d verslag(en) zijn bijgewerkt" -"Total of %d record(s) were updated.","Totaal van %d verslag(en) zijn bijgewerkt." -"Track Order","Volg Order" -"Track this shipment","Track deze verzending" -"Tracking number %s for %s assigned","Volgnummer %s voor %s toegewezen" -"Tracking number cannot be empty.","Volgnummer kan niet leeg zijn." -"Transaction Data","Transactie Data" -"Transaction Details","Transactie Details" -"Transaction ID","Transactie ID" -"Transaction Type","Transactie Type" -"Transactional Emails","Transactionele Emails" -"Transactions","Transacties" -"Try Magento Go for Free","Probeer Magento Go gratis" -"Type","Type" -"Type:","Type:" -"URL Rewrite","URL Herschrijving" -"URL Rewrite Information","URL Herschrijf Informatie" -"URL Rewrite Management","URL Herschrijf Management" -"Unable to cancel the credit memo.","Niet mogelijk om creditnota te annuleren." -"Unable to find a Email Template to delete.","Kan geen Email-Template vinden om te verwijderen." -"Unable to find a poll to delete.","Niet instaat om een peiling te vinden om te verwijderen." -"Unable to find a tag to delete.","Kan geen tag vinden om te verwijderen." -"Unable to find a user to delete.","Kan geen gebruiker vinden om te verwijderen." -"Unable to initialize import model","Kan importmodel niet initialiseren" -"Unable to refresh lifetime statistics.","Kan levensduur statistieken niet vernieuwen." -"Unable to refresh recent statistics.","Kan recente statistieken niet vernieuwen." -"Unable to save Cron expression","Niet instaat om Cron expressie op te slaan" -"Unable to save the cron expression.","Kan de cron uitdrukking niet opslaan." -"Unable to save the invoice.","Niet instaat om factuur op te slaan." -"Unable to send the invoice email.","Kan geen factuur email sturen." -"Unable to send the shipment email.","Niet instaat om verzending e-mail te versturen." -"Unable to update transaction details.","Onmogelijk om transactie details te updaten." -"Unable to void the credit memo.","Niet instaat om creditnota te vernietigen." -"Unknown","Onbekend" -"Unlimited","Onbeperkt" -"Update","Update" -"Updated At","Geüpdate At" -"Upload File","Bestand uploaden" -"Upload Files","Upload Bestanden" -"Upload HTTP Error","Upload HTTP Fout" -"Upload I/O Error","Upload I/O Fout" -"Upload Security Error","Upload Beveiligingsfout" -"Upload import file","Upload belangrijk bestand" -"Uploaded file is larger than %.2f kilobytes allowed by server","Het geüploade bestand is groter dan de %.2f kilobytes die de server toestaat" -"Use All Available Attributes","Gebruik Alle Beschikbare Attributen" -"Use Config Settings","Gebruik Configuratiesettings" -"Use Default","Gebruik Standaard" -"Use Default Value","Standaardwaarde gebruiken" -"Use Default Variable Values","Gebruik Standaard Variabele Waarden" -"Use FTP Connection","Gebruik FTP Connectie" -"Use Website","Gebruik Website" -"Used Currently For","Momenteel Gebruikt Voor" -"Used as Default For","Standaard Gebruikt Voor" -"User Email","Email van Gebruiker" -"User ID","Gebruikers ID" -"User Info","Gebuikersinformatie" -"User Information","Gebruikersinformatie" -"User Name","Gebruikersnaam" -"User Name is required field.","Gebruikersnaam is verplicht veld." -"User Name:","Gebruikersnaam:" -"User Password","Gebruikerswachtwoord" -"User Role","Rol van gebruiker" -"User Roles","Rollen van gebruiker" -"User Roles Information","Gebruiker Rol Informatie" -"User Type Resources","Gebruikerstype Hulpmiddelen" -"User name","Gebruikersnaam" -"Users","Gebruikers" -"VAT Number is Invalid","Btw-nummer is ongeldig." -"VAT Number is Valid","Btw-nummer is geldig." -"Validation Results","Validatie Resultaten" -"Value","Waarde" -"Value Delimiter:","Waarde scheidingsteken:" -"Variable","Variabele" -"Variable Code","Variabele Code" -"Variable HTML Value","Variabele HTML Waarde" -"Variable ID","Variabele ID" -"Variable Name","Naam variabele" -"Variable Plain Value","Variabele Basis Waarde" -"Verifier code: %s","Verifieer code: %s" -"View Actions XML","Zie Acties XML" -"View Full Size","Zie Volledig Formaat" -"View Memo","Zie Memo" -"View Memo for #%s","Bekijk memo voor #%s" -"View Shipment","Bekijk verzending:" -"View Statistics For:","Bekijk Statistieken voor:" -"Visibility:","Zichtbaarheid:" -"Warning","Waarschuwing" -"Warning! Empty value can cause problems with CSV format.","Waarschuwing! Lege waarde kan problemen veroorzaken met CSV format." -"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Waarschuwing! Deze actie verwijdert deze gebruiker van de al bestaande rol. Weet u het zeker?" -"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Waarschuwing! Deze actie zal de gebruikers verwijderen die al zijn toegewezen. Weet u het zeker?" -"Warning: Please do not close the window during importing/exporting data","Waarschuwing: Sluit dit venster niet tijdens het im-/exporteren van data" -"Watermark File for %s","Watermerk Bestand voor %s" -"We appreciate our merchants\' feedback, please take our survey to provide insight on the features you would like included in Magento. Remove this notification","Wij waarderen feedback van onze handelaars, doe a.u.b. ons onderzoek om ons inzicht te verschaffen in de functies die u graag in Magento zou willen zien. Verwijder deze notitie" -"We\'re in our typing table, coding away more features for Magento. Thank you for your patience.","Wij zijn druk aan het werk, bezig met het schrijven van nieuwe functies van Magento. Bedankt voor uw geduld." -"Web Section","Web Sectie" -"Web Services","Web Diensten" -"Web services","Web diensten" -"Website","Website" -"What is this?","Wat is dit?" -"Wishlist Report","Wishlist Rapport" -"Wishlist item is not loaded.","Verlanglijst product is niet geladen." -"Wrong account specified.","Foute rekening gespecificeerd." -"Wrong billing agreement ID specified.","Verkeerde betalingsovereenkomst ID gespecificeerd." -"Wrong column format.","Verkeerd kolomformaat." -"Wrong newsletter template.","Verkeerde nieuwsbrief sjabloon." -"Wrong quote item.","Verkeerde quote item." -"Wrong tab configuration.","Verkeerde tab configuratie." -"Wrong tag was specified.","Verkeerde tag gespecificeerd." -"Wrong transaction ID specified.","Verkeerde transactie ID gespecificeerd." -"XML","XML" -"XML data is invalid.","XML data is ongeldig." -"XML object is not instance of ""Varien_Simplexml_Element"".","XML object is geen voorbeeld van ""Varien_Simplexml_Element""." -"YTD","YTD" -"Year","Jaar" -"Yes","Ja" -"Yes (301 Moved Permanently)","Ja (301 Permanent Verplaatst)" -"Yes (302 Found)","Ja (302 Gevonden)" -"Yes (only price with tax)","Ja (alleen prijs met belasting)" -"You cannot delete your own account.","U kunt uw eigen account niet verwijderen." -"You have %s unread message(s).","U heeft %s ongelezen boodschap(pen)." -"You have %s unread message(s). Go to messages inbox.","U heeft %s ongelezen bericht(en). Ga naar berichten inbox." -"You have %s, %s and %s unread messages. Go to messages inbox.","U heeft %s, %s en %s ongelezen berichten. Ga naar berichten inbox." -"You have logged out.","U bent uitgelogd." -"You have not enough permissions to use this functionality.","U heeft niet genoeg toegang om deze functie te gebruiken." -"You must have JavaScript enabled in your browser to utilize the functionality of this website.","U moet JavaScript in uw browser hebben ingeschakeld om de functionaliteit van de website te gebruiken." -"You need to specify order items.","U moet order artikelen specificeren." -"You will need to wait when the action ends.","U zult moeten wachten wanneer de actie voltooid is." -"Your answers contain duplicates.","Uw antwoorden bevatten duplicaten." -"Your password has been updated.","Uw wachtwoord is geupdate." -"Your password reset link has expired.","Uw wachtwoord herstel link is verlopen." -"Your server PHP settings allow you to upload files not more than %s at a time. Please modify post_max_size (currently is %s) and upload_max_filesize (currently is %s) values in php.ini if you want to upload larger files.","Uw server PHP settings staan uploadbestanden toe die niet groter zijn dan %s per keer. Pas de post_max_size (is nu %s) en upload_max_filesize (is nu %s) waarden in php.ini aan als u grotere bestanden wilt uploaden." -"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Uw webserver is verkeerd geconfigureerd. Daarom zijn geconfigureerde bestanden met gevoelige informatie toegankelijk voor de buitenwereld. Neem contact op met uw provider." -"Zip/Postal Code","Zip/Postcode" -"Zip/Postal Code:","Postcode:" -"[ deleted ]","[ verwijderd ]" -"[GLOBAL]","[GLOBAAL]" -"[STORE VIEW]","[WINKEL OVERZICHT]" -"[WEBSITE]","[WEBSITE]" -"b","b" -"close","sluit" -"critical","kritiek" -"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","voorbeeld: ""sitemap/"" of ""/"" voor basispad (pad moet beschrijfbaar zijn)" -"example: sitemap.xml","voorbeeld: sitmap.xml" -"failed","mislukt" -"from","van" -"major","groot" -"minor","klein" -"notice","merk op" -"store(%s) scope","winkel(%s) omvang" -"successful","succesvol" -"to","naar" -"website(%s) scope","website(%s) omvang" -"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento configuration.","Het is niet aanbevolen {{base_url}} te gebruiken in een productieomgeving Base Unsecure URL / Base Secure URL aan te geven. Het is zeer aanbevolen deze waarde in uw magento configuratiete veranderen." diff --git a/app/locale/nl_NL/Mage_AmazonPayments.csv b/app/locale/nl_NL/Mage_AmazonPayments.csv deleted file mode 100644 index c80f5fc58..000000000 --- a/app/locale/nl_NL/Mage_AmazonPayments.csv +++ /dev/null @@ -1,101 +0,0 @@ -" Select Shipping Method","Selecteer Verzendmethode" -"
    Trace confirmation request:
    %s","
    Traceer bevestigingsverzoek:
    %s" -"Access Key","Access Key" -"Access Key ID","Access Key ID" -"Amazon Simple Pay","Amazon Simple Pay" -"Amazon Simple Pay notification error","Amazon Simple Pay notificatie fout" -"Amazon Simple Pay service capture confirmation error: confirmation request amount is not equal to the amount of order.","Amazon Simple Pay Service ontvangst bevestiging error: verzoek tot bevestiging bedrag is niet gelijk aan het bedrag van de bestelling." -"Amazon Simple Pay service capture confirmation error: the amount in the existing invoice does not match the amount in the confirmation request.","Amazon Simple Pay Service ontvangst bevestigingsfout: het bedrag in de bestaande factuur komt niet overeen met het bedrag in het confirmatie verzoek." -"Amazon Simple Pay service capture confirmation error: the existing transaction ID does not match the transaction ID in the confirmation request.","Amazon Simple Pay Service ontvangst bevestigingsfout: het bestaande transactie-ID komt niet overeen met het transactie-ID in het verzoek om bevestiging." -"Amazon Simple Pay service capture confirmation. The invoice was captured automatically.","Amazon Simple Pay Service ontvangst bevestiging. De factuur is automatisch vastgelegd." -"Amazon Simple Pay service confirmation error: order states sequence violation.","Amazon Simple Pay Service confirmatie error: Vanwege volgorde overtreding." -"Amazon Simple Pay service confirmation error: the order currency does not match the currency of the IPN request.","Amazon Simple Pay Service bevestigingsfout: de valuta in de bestelling komt niet overeen met de valuta van het IPN verzoek." -"Amazon Simple Pay service confirmation error: the order specified in the IPN request cannot be found.","Amazon Simple Pay Service bevestigingsfout: de bestelling vermeld in het IPN ​​verzoek kan niet worden gevonden." -"Amazon Simple Pay service confirmation error: the payment method in the order is not Amazon Simple Pay.","Amazon Simple Pay Service bevestigingsfout: de betaalmethode in de bestelling is niet Amazon Simple Pay." -"Amazon Simple Pay service confirmed capture for invoice %s.","Amazon Simple Pay Service bevestigd ontvangst van factuur %s." -"Amazon Simple Pay service confirmed refund for credit memo %s.","Amazon Simple Pay Service bevestigd restitutie voor creditnota %s." -"Amazon Simple Pay service has confirmed amount authorization.","Amazon Simple Pay Service heeft het bevestigde bedrag geautoriseerd." -"Amazon Simple Pay service has confirmed cancelation.","Amazon Simple Pay Service heeft de annulering bevestigd." -"Amazon Simple Pay service has confirmed capture for invoice %s. The invoice was automatically captured.","Amazon Simple Pay Service heeft de betaling bevestigd voor factuur %s. De factuur werd automatisch opgemaakt." -"Amazon Simple Pay service has confirmed capture initiation.","Amazon Simple Pay Service heeft de vastgelegde initiatie bevestigd." -"Amazon Simple Pay service has confirmed capture.","Amazon Simple Pay Service heeft de betaling bevestigd." -"Amazon Simple Pay service has confirmed payment capture. Invoice %s was automatically created after confirmation.","Amazon Simple Pay Service heeft bevestigd dat de betaling is vastgelegd. Factuur %s is automatisch aangemaakt na bevestiging." -"Amazon Simple Pay service has confirmed payment capture. Invoice was created automatically.","Amazon Simple Pay Service heeft bevestigd dat de betaling is vastgelegd. Factuur is automatisch aangemaakt." -"Amazon Simple Pay service has confirmed payment refund. Credit memo %s was automatically created after confirmation.","Amazon Simple Pay Service heeft de terugbetaling restitutie bevestigd. Creditnota %s is automatisch aangemaakt na bevestiging." -"Amazon Simple Pay service has confirmed payment refund. Credit memo was created automatically.","Amazon Simple Pay Service heeft de terugbetaling restitutie bevestigd. De creditnota werd automatisch aangemaakt." -"Amazon Simple Pay service has confirmed payment refund. The credit memo was created automatically.","Amazon Simple Pay Service heeft de betaling restitutie bevestigd. De creditnota werd automatisch aangemaakt." -"Amazon Simple Pay service has confirmed refund.","Amazon Simple Pay Service heeft de terugbetaling bevestigd." -"Amazon Simple Pay service has confirmed refund. The credit memo was processed automatically.","Amazon Simple Pay Service heeft de terugbetaling bevestigd. De creditnota werd automatisch verwerkt." -"Amazon Simple Pay service has confirmed refunded credit memo %s. The credit memo was processed automatically.","Amazon Simple Pay Service heeft de teruggestorte creditnota bevestigd %s. De creditnota werd automatisch verwerkt." -"Amazon Simple Pay service is not available. Payment was not processed.","Amazon Simple Pay service is niet beschikbaar. De betaling is niet verwerkt." -"Amazon Simple Pay service payment confirmation has failed.","Amazon Simple Pay Service betalingsbevestiging is mislukt." -"Amazon Simple Pay service refund confirmation error: the amount in the existing creditmemo does not match the amount in the confirmation request.","Amazon Simple Pay Service terugbetaling bevestiging fout: het bedrag in de bestaande creditmemo komt niet overeen met het bedrag in het bevestigingsverzoek." -"Amazon Simple Pay service refund confirmation error: the confirmation request amount does not match the order amount.","Amazon Simple Pay Service terugbetaling bevestigingsfout: het bedrag op het confirmatie verzoek komt niet overeen met het orderbedrag." -"Amazon Simple Pay service refund confirmation error: the transaction ID in the existing creditmemo does not match the transaction ID in the confirmation request.","Amazon Simple Pay Service terugbetaling bevestigingsfout: De transactie ID in de bestaande creditmemo komt niet overeen met de transactie-ID in het verzoek om confirmatie." -"Authorize Only","Alleen authoriseren" -"Authorize and Capture","Authoriseren en opnemen" -"Cancel Description","Omschrijving Annuleren" -"Cancel Order Notification received from Checkout by Amazon service.","Bestelling annuleren Notificatie ontvangen van Checkout door Amazon service." -"Checkout by Amazon","Checkout door Amazon" -"Continue Shopping","Ga door met Winkelen" -"Customer was redirected to Amazon Simple Pay site","Consument is doorgestuurd naar Amazon Simple Pay website" -"Debug","Debug" -"Debug Log","Debug Log" -"Email Sender","E-mail Verzender" -"Enable","Stel in werking" -"Error Log","Error Log" -"FPS Sandbox Service URI","FPS Sandbox Service URI" -"FPS Service URI","FPS Service URI" -"Immediate Return","Onmiddellijke Terugkeer" -"Invalid action code.","Ongeldige actiecode." -"Invalid request.","Ongeldig verzoek." -"Invoice was created with Checkout by Amazon.","Factuur is gecreëerd met Checkout door Amazon." -"Merchant ID","Verkopers Identificatie" -"Merchant Login","Verkoper Login" -"Merchant Name","Verkoper Naam" -"Merchant Password","Verkoper Wachtwoord" -"Merchant Token","Verkoper Token" -"Method Choice Checkout Message","Methode Keuze Checkout Bericht" -"New Order Notification received from Checkout by Amazon service.","Nieuwe Order Notificatie ontvangen van de Checkout door Amazon service." -"New Order Status","Nieuwe Status van de Bestelling" -"Notification Error Transactional Email","Notificatie Fout Transactionele E-mail" -"Order Ready To Ship Notification received form Checkout by Amazon service.","Bestelling Klaar Om Te Versturen Melding gekregen van de Checkout door Amazon service." -"Order was canceled with Checkout by Amazon.","Bestelling is geannuleerd door Checkout van Amazon." -"Payment Action","Betaling" -"Payment Description","Betalingsomschrijving" -"Payment Sandbox Service URI","Betaling Sandbox Service URI" -"Payment Service URI","Betalingsdienst URI" -"Payment authorization canceled with Amazon Simple Pay service.","Betalingsautorisatie ingetrokken met Amazon Simple Pay service." -"Pending Amazon Simple Pay","In afwachting op Amazon Simple Pay" -"Redirect Message","Redirect Bericht" -"Refund Description","Terugbetaling Omschrijving" -"Refund was created with Checkout by Amazon.","Terugbetaling is gecreëerd met Checkout door Amazon." -"Report Email","Meldings E-mail" -"Report Error to Email","Stuur Error naar e-mail" -"Response body is not a valid FPS response.","Response body is geen geldige FPS reactie." -"SUCCESS","SUCCES" -"Sandbox","Zandbak" -"Secret Key","Secret Key" -"Secret Key ID","Secret Key ID" -"Shipment was created with Checkout by Amazon.","Verzending is gecreëerd met Checkout door Amazon." -"Thank you for your purchase!","Bedankt voor uw aankoop!" -"The customer has canceled payment and successfully returned from Amazon Simple Pay site","De consument heeft de betaling opgezegd en is met succes teruggekeerd de van Amazon Simple Pay website" -"The customer has successfully returned from Amazon Simple Pay site","De consument is met succes teruggekeerd van de Amazon Simple Pay website" -"The invoice was created (online capture). Waiting for capture confirmation from Amazon Simple Pay service.","De factuur is opgemaakt (online capture). In afwachting op capture bevestiging van Amazon Simple Pay service." -"The invoice was not refunded. Amazon Simple Pay service error: [%s] %s","Het factuurbedrag is niet terugbetaald. Amazon Simple Pay Service error: [%s] %s" -"The item specified in callback request XML was not found in quote.","Het item dat is opgegeven in de callback request XML is niet gevonden in de offerte." -"The order was not canceled. Amazon Simple Pay service error: [%s] %s","De bestelling is niet geannuleerd. Amazon Simple Pay Service error: [%s] %s" -"The order was not captured online. Authorization confirmation is required.","De order werd niet online vastgelegd. Autorisatie bevestiging is vereist." -"The order was not captured. Amazon Simple Pay service error: [%s] %s","De opdracht is niet vastgelegd. Amazon Simple Pay Service error: [%s]%s" -"The payment was captured online with Amazon Simple Pay service. The invoice was created. Waiting for capture confirmation from the payment service.","De betaling is online vastgelegd met Amazon Simple Pay service. De factuur is gemaakt. In afwachting op capture bevestiging van de betaaldienst." -"The payment was refunded online with Amazon Simple Pay service. The credit memo was created. Waiting for refund confirmation from Amazon Simple Pay service.","De betaling is online terugbetaald met Amazon Simple Pay service. De creditnota is aangemaakt. In afwachting op de terugbetaling bevestiging van Amazon Simple Pay service." -"The payment was refunded online. Waiting for refund confirmation from Amazon Simple Pay service.","De betaling was online terugbetaald. Wachten op terugbetaling bevestiging van de Amazon Simple Pay service." -"The request is not a valid IPN request.","Het verzoek is geen geldige IPN verzoek." -"The request was signed incorrectly or the signature is missing.","Het verzoek werd niet correct ondertekend of de handtekening ontbreekt." -"Title","Titel" -"Use Callback API","Gebruik Callback API" -"You will be redirected to Checkout by Amazon in a few seconds.","U wordt in een paar seconden door Amazon doorgestuurd om te afrekenen." -"You will receive an order confirmation email with details of your order and a link to track its progress.","U ontvangt een email met de bevestiging van uw bestelling en een link om uw zending te volgen." -"You will receive an order confirmation email with details of your order and a link to track its progress.
    ","U ontvangt een orderbevestigings e-mail met de details van uw bestelling en een link om de voortgang bij te houden.
    " -"Your billing address will be ignored and you will be redirected to Checkout by Amazon website.","Uw factuuradres worden genegeerd en u wordt doorgestuurd naar de kassa door de Amazon website." -"Your order has been received.","Uw bestelling is ontvangen." diff --git a/app/locale/nl_NL/Mage_Api.csv b/app/locale/nl_NL/Mage_Api.csv deleted file mode 100644 index 74a4d8d78..000000000 --- a/app/locale/nl_NL/Mage_Api.csv +++ /dev/null @@ -1,18 +0,0 @@ -"Access denied.","Toegang geweigerd." -"Can not find webservice adapter.","Kan de webservice adapter niet vinden." -"Client Session Timeout (sec.)","Klant Sessie Time out (sec.)" -"Default Response Charset","Karakterset standaard antwoord" -"Email","Email" -"Enable WSDL Cache","Activeer WSDL Cache" -"General Settings","Algemene instellingen" -"Invalid webservice adapter specified.","Ongeldige webdienst adapter gespecificeerd." -"Invalid webservice handler specified.","Ongeldige webservice handler gespecificeerd." -"Magento Core API","Magento Core API" -"Magento Core API Section","Magento Core API Sectie" -"SOAP/XML-RPC - Roles","SOAP/XML-RPC - Functies" -"SOAP/XML-RPC - Users","SOAP/XML-RPC - Gebruikers" -"Unable to login.","Kan niet inloggen." -"User Name","Gebruikersnaam" -"WS-I Compliance","WS-I naleving" -"Web Services","Web Diensten" -"Your account has been deactivated.","Uw account is gedeactiveerd." diff --git a/app/locale/nl_NL/Mage_Api2.csv b/app/locale/nl_NL/Mage_Api2.csv deleted file mode 100644 index 77da17c8f..000000000 --- a/app/locale/nl_NL/Mage_Api2.csv +++ /dev/null @@ -1,238 +0,0 @@ -"%s","%s" -"%s role is a special one and can\'t be changed.","%s functie is bijzonder en kan niet worden veranderd." -"%s role is a special one and can\'t be deleted.","%s functie is bijzonder en kan niet worden verwijderd." -"%s role is protected.","%s functie is beveiligd." -"ACL Attribute Rules","ACL Attribuut Regels" -"ACL Attributes Information","ACL Attributen Informatie" -"Add","Toevoegen" -"Add Admin Role","Voeg Beheerder Functie Toe" -"Add New Role","Nieuwe Rol Toevoegen" -"Address Type","Adrestype" -"Admin","Admin" -"Allow","Toestaan" -"An error occurred while deleting the role.","Er is een fout opgetreden tijdens het verwijderen van de functie." -"An error occurred while saving attribute rules.","Er is een fout opgetreden tijdens het opslaan van de attribuut regels." -"An error occurred while saving role.","Er is een fout opgetreden tijdens het opslaan van de functie." -"Api Rules Information","Api Regels Informatie" -"Assigned","Toegewezen" -"Associate to Website","Koppel aan Website" -"Attribute Rules Information","Attribuut Regels Informatie" -"Attribute Set","Attributenset" -"Attributes","Attributen" -"Automatically Return Credit Memo Item to Stock","Retourneer automatisch het krediet memo product aan de vooraad" -"Back","Terug" -"Backorders","Nabestellingen" -"Base Currency","Basis Munteenheid" -"Base Customer Balance","Basis Consument Saldo" -"Base Discount","Basis Korting" -"Base Discount Amount","Basis Kortingsbedrag" -"Base Item Subtotal","Basis Artikel Subtotaal" -"Base Item Subtotal Including Tax","Basis Artikel Subtotaal Inclusief BTW" -"Base Original Price","Basis Oorspronkelijke Prijs" -"Base Price","Basisprijs" -"Base Price Including Tax","Basisprijs Inclusief BTW" -"Base Shipping","Basis Verzendkosten" -"Base Shipping Discount","Basis Verzendkosten Korting" -"Base Shipping Tax","Basis Verzendkosten BTW" -"Base Subtotal","Basis Subtotaal" -"Base Subtotal Including Tax","Basis Subtotaal Inclusief BTW" -"Base Tax Amount","Basis BTW-bedrag" -"Base Total Due","Basis Totaal Bedrag" -"Base Total Paid","Basis Totaal Betaald" -"Base Total Refunded","Basis Totaal Terugbetaald" -"Buy Now URL","Nu Kopen URL" -"Can Be Divided into Multiple Boxes for Shipping","Kan Worden Onderverdeeld in Meerdere Dozen voor Verzending" -"Canceled Qty","Geannuleerd Aantal" -"Catalog","Catalogus" -"Catalog Product","Catalogus Product" -"CatalogInventory","Winkel inventaris" -"Category ID","Categorie ID" -"City","Stad" -"Company","Bedrijf" -"Country","Land" -"Coupon Code","Kortingsboncode" -"Create","Creëren" -"Create Permanent Redirect for old URL","Creëer Permanente Omleiding voor oude URL" -"Created From","Gemaakt Van" -"Customer","Klant" -"Customer Address","Klantadres" -"Customer Address ID","Consument Adres ID" -"Customer Balance","Saldo Klant" -"Customer First Name","Voornaam Klant" -"Customer ID","Klant ID" -"Customer Last Name","Klant Achternaam" -"Customer Middle Name","Consument Tussenvoegsel" -"Customer Prefix","Consument Voorvoegsel" -"Customer Suffix","Consument Achternaam" -"Default Image","Standaard Afbeelding" -"Delete","Verwijderen" -"Deny","Weigeren" -"Disable automatic group change based on VAT ID","Schakel automatische groep wijziging op basis van BTW-nummer uit" -"Discount","korting" -"Discount Amount","Kortingsbedrag" -"Discount Description","Korting Beschrijving" -"Edit","Bewerken" -"Edit %s ACL attribute rules","Bewerk %s ACL attribuut regels" -"Edit Role","Bewerk Rol" -"Edit attribute rules for %s Role","Bewerk attribuut regels voor Functie %s" -"Email","Email" -"Enable Qty Increments","Sta groeitoename in hoeveelheid toe" -"Exclude","Sluit Uit" -"File Content","Bestandsinhoud" -"File MIME Type","Bestand MIME Type" -"File Name","Bestandsnaam" -"Final Price With Tax","Eindbedrag Inclusief BTW" -"Final Price Without Tax","Eindbedrag Exclusief BTW" -"First Name","Voornaam" -"Gift Message","Cadeauboodschap" -"Grand Total","Groot Totaal" -"Grand Total to Be Charged","Aan te Rekenen Eindtotaal" -"Group","Groep" -"Guest","Gast" -"Has Custom Options","Heeft Aangepaste Opties" -"ID","ID" -"Inventory Data","Voorraadgegevens" -"Invoiced Qty","Gefactureerd Aantal" -"Is Confirmed","Is Bevestigd" -"Is Default Billing Address","Is Standaard Factuuradres" -"Is Default Shipping Address","Is Standaard Afleveradres" -"Item ID","Product ID" -"Item Subtotal","Product Subtotaal" -"Item Subtotal Including Tax","Product Subtotaal Inclusief BTW" -"Label","Label" -"Last Logged In","Laatste Keer Ingelogd" -"Last Name","Achternaam" -"Low Stock Date","Datum Weinig Voorraad" -"Manage Stock","Beheer voorraad" -"Maximum Qty Allowed in Shopping Cart","Maximale hoeveelheid toegestaan in winkelwagen" -"Minimum Qty Allowed in Shopping Cart","Minimale hoeveelheid toegestaan in winkelwagen" -"New Role","Nieuwe Rol" -"Notify for Quantity Below","Bericht bij hoeveelheid minder dan" -"OAuth","OAuth" -"Order","Bestelling" -"Order Addresses","Bestelling Adressen" -"Order Comments","Opmerkingen over de Bestellingen" -"Order Currency","Bestelling Valuta" -"Order Date","Datum van de Bestelling" -"Order ID","ID Bestelling" -"Order ID (internal)","Bestelling ID (intern)" -"Order Item ID","Bestelling Product ID" -"Order Items","Bestelling Product" -"Order Status","Bestelling Status" -"Ordered Qty","Besteld Aantal" -"Orders","Bestellingen" -"Original Price","Originele prijs" -"Parent Order Item ID","Bovenliggend Bestelling Product ID" -"Payment Method","Betalingsmethode" -"Phone Number","Telefoonnummer" -"Placed from IP","Geplaatst van IP" -"Please enter a valid number in ""max_sale_qty"" field","Vul een geldig nummer in ""max_sale_qty"" veld" -"Please enter a valid number in ""min_qty"" field","Vul een geldig nummer in ""min_qty"" veld" -"Please enter a valid number in ""min_sale_qty"" field","Vul een geldig nummer in ""min_sale_qty"" veld" -"Please enter a valid number in ""notify_stock_qty"" field","Vul een geldig aantal in ""notify_stock_qty"" veld" -"Please use numbers only in ""category_id"" field.","Gebruik alleen getallen in ""category_id"" veld." -"Please use numbers only in ""qty_increments"" field. Please avoid spaces or other characters such as dots or commas.","Gebruik alleen getallen in ""qty_increments"" veld. Vermijd spaties of andere tekens zoals punten of komma's." -"Position","Positie" -"Price","Prijs" -"Price Including Tax","Prijs Inclusief BTW" -"Product","Product" -"Product Category","Product Categorie" -"Product ID","Product Identificatie" -"Product Image","Product Afbeelding" -"Product Type","Product Type" -"Product URL","Product URL" -"Product Website","Product Website" -"Product and Custom Options Name","Product en Aangepaste Opties Naam" -"Qty","hoeveelheid" -"Qty Increments","Hoeveelheid groeitoename" -"Qty Uses Decimals","Hoeveelheid Gebruikt Decimalen" -"Qty for Item's Status to Become Out of Stock","Aantal voor Artikelstatus wordt Niet op voorraad" -"REST - Attributes","REST - Attributen" -"REST - Roles","REST - Functies" -"REST ACL Attributes","REST ACL attributen" -"REST Attributes","REST Attributen" -"REST Role","REST Functies" -"REST Roles","REST Functies" -"REST Roles Information","REST Functies Informatie" -"Read","Lezen" -"Refunded Qty","Restitutie Hoeveelheid" -"Regular Price With Tax","Normale Prijs Inclusief BTW" -"Regular Price Without Tax","Normale Prijs Exclusief BTW" -"Rest Roles","Rest Functies" -"Retrieve","Ophalen" -"Role ""%s"" no longer exists","Functie ""%s"" bestaat niet meer" -"Role ""%s"" not found.","Functie ""%s"" niet gevonden." -"Role API Resources","Functie API Resources" -"Role Info","Rol Informatie" -"Role Information","Rolinformatie" -"Role Name","Rolnaam" -"Role Users","Rol gebruikers" -"Role has been deleted.","Functie is verwijderd." -"Roles","Rollen" -"SKU","SKU" -"Salability Status","Verkoopbaarheid Status" -"Sales","Verkoop" -"Save","Opslaan" -"Shipped Qty","Verzonden Aantal" -"Shipping Amount","Verzendingskosten" -"Shipping Discount","Verzendkorting" -"Shipping Including Tax","Verzendkosten Inclusief Belasting" -"Shipping Method","Bezorgmethode" -"Shipping Tax","Verzendkosten BTW" -"State","Provincie" -"Stock Availability","Voorraad beschikbaarheid" -"Stock ID","Voorraad ID" -"Stock Item","Voorraad Product" -"Stock Status","Voorraadstatus" -"Store Currency to Order Currency Rate","Winkel Valuta naar Bestelling Valuta Tarief" -"Store Name","Winkel Naam" -"Street","Straat" -"Subtotal","Subtotaal" -"Subtotal Including Tax","Subtotaal inclusief Belasting" -"System","Systeem" -"Tax Amount","BTW Bedrag" -"Tax Name","BTW Naam" -"Tax Percent","Belastingspercentage" -"Tax Rate","Belastingniveau" -"The ""enable_qty_increments"" field must be set to 0 or 1.","De ""enable_qty_increments"" veld moet worden ingesteld op 0 of 1." -"The ""is_decimal_divided"" field must be set to 0 or 1.","De ""is_decimal_divided"" veld moet worden ingesteld op 0 of 1." -"The ""is_in_stock"" field must be set to 0 or 1.","De ""is_in_stock"" veld moet worden ingesteld op 0 of 1." -"The ""is_qty_decimal"" field must be set to 0 or 1.","Het ""is_qty_decimal"" veld moet worden ingesteld op 0 of 1." -"The ""is_qty_decimal"" field must be set to 0, 1, or 2.","Het ""is_qty_decimal"" veld moet worden ingesteld op 0, 1, of 2." -"The ""manage_stock"" field must be set to 0 or 1.","Het ""manage_stock"" veld moet worden ingesteld op 0 of 1." -"The ""stock_status_changed_auto"" field must be set to 0 or 1.","Het ""stock_status_changed_auto"" veld moet worden ingesteld op 0 of 1." -"The ""use_config_backorders"" field must be set to 0 or 1.","Het ""use_config_backorders"" veld moet worden ingesteld op 0 of 1." -"The ""use_config_enable_qty_inc"" field must be set to 0 or 1.","Het ""use_config_enable_qty_inc"" veld moet worden ingesteld op 0 of 1." -"The ""use_config_manage_stock"" field must be set to 0 or 1.","Het ""use_config_manage_stock"" veld moet worden ingesteld op 0 of 1." -"The ""use_config_max_sale_qty"" field must be set to 0 or 1.","Het ""use_config_max_sale_qty"" veld moet worden ingesteld op 0 of 1." -"The ""use_config_min_qty"" field must be set to 0 or 1.","Het ""use_config_min_qty"" veld moet worden ingesteld op 0 of 1." -"The ""use_config_min_sale_qty"" field must be set to 0 or 1.","Het ""use_config_min_sale_qty"" veld moet worden ingesteld op 0 of 1." -"The ""use_config_notify_stock_qty"" field must be set to 0 or 1.","Het ""use_config_notify_stock_qty"" veld moet worden ingesteld op 0 of 1." -"The ""use_config_qty_increments"" field must be set to 0 or 1.","Het ""use_config_qty_increments"" veld moet worden ingesteld op 0 of 1." -"The attribute rules were saved.","De attribuut regels zijn opgeslagen." -"The role has been saved.","De rol is bewaard." -"The role is a special one and not for assigning it to admin users.","De Functie is een bijzondere en niet om aan beheerder gebruikers toe te wijzen." -"Total Due","Totaalbedrag verwacht" -"Total Paid","Totaal Betaald" -"Total Refunded","Totaal Terugbetaalde" -"Total Reviews Count","Totaal Aantal Beoordelingen" -"Type","Type" -"URL","URL" -"Update","Update" -"Use Config Settings for Allow Gift Message","Gebruik Configuratie Instellingen om Cadeauberichten toe te staan" -"Use Config Settings for Allow Gift Wrapping","Gebruik Configuratie Instellingen om Cadeau Inpakken toe te staan" -"Use Config Settings for Backorders","Gebruik Configuratie Instellingen voor Nabestellingen" -"Use Config Settings for Enable Qty Increments","Gebruik Configuratie Instellingen om Schakel Aantal Verhogingen In toe te staan" -"Use Config Settings for Manage Stock","Gebruik Configuratie Instellingen voor Beheer Voorraad" -"Use Config Settings for Maximum Qty Allowed in Shopping Cart","Gebruik Configuratie Instellingen voor Maximum Aantal in Winkelwagen" -"Use Config Settings for Minimum Qty Allowed in Shopping Cart","Gebruik Configuratie Instellingen voor Minimum Aantal in Winkelwagen" -"Use Config Settings for Notify for Quantity Below","Gebruik Configuratie Instellingen voor Meld de Hoeveelheid Hieronder" -"Use Config Settings for Qty Increments","Gebruik Configuratie Instellingen voor Aantal Verhogingen" -"Use Config Settings for Qty for Item's Status to Become Out of Stock","Gebruik Configuratie Instellingen voor Aantal voordat Product Status Niet Op Voorraad is" -"User Type","Gebruikerstype" -"User type ""%s"" no longer exists","Type gebruiker ""%s"" bestaat niet meer" -"User type ""%s"" not found.","Type gebruiker ""%s"" niet gevonden." -"Web Services","Web Diensten" -"Web services","Web diensten" -"Write","Schrijven" -"ZIP/Postal Code","Postcode" diff --git a/app/locale/nl_NL/Mage_Authorizenet.csv b/app/locale/nl_NL/Mage_Authorizenet.csv deleted file mode 100644 index 6b85251f7..000000000 --- a/app/locale/nl_NL/Mage_Authorizenet.csv +++ /dev/null @@ -1,41 +0,0 @@ -"--Please Select--","--selecteer a.u.b.--" -"API Login ID","API login ID" -"Accepted Currency","Geaccepteerde valuta" -"Amount of %s approved by payment gateway. Transaction ID: ""%s"".","Bedrag van %s goedgekeurd door betalingsdienst. Transactie ID: ""%s""." -"Authorize.net Direct Post","Authorize.net directe post" -"Card Verification Number","Kaart verificatie nummer" -"Card Verification Number Visual Reference","Kaart verificatie nummer visuele referentie" -"Close","sluiten" -"Credit Card Information","Creditcard informatie" -"Credit Card Number","Creditcardnummer" -"Credit Card Type","Creditcardtype" -"Credit Card Types","Creditcardtypes" -"Credit Card Verification","Creditcard verificatie" -"Debug","Debug" -"Email Customer","email klant" -"Enabled","Werkzaam gemaakt" -"Expiration Date","vervaldatum" -"Gateway URL","Gateway URL" -"Maximum Order Total","Maximale bestellingstotalen" -"Merchant MD5","Verkoper MD5" -"Merchant's Email","Verkoper's email" -"Minimum Order Total","Minimale bestellingstotalen" -"New Order Status","Nieuwe bestellingsstatus" -"Order saving error: %s","Bestelling opslaan fout: %s" -"Payment Action","Betalingsactie" -"Payment authorization error.","Betalingsautorisatie fout." -"Payment authorization error. Transacion id is empty.","Betalings autorisatie fout. Transactie ID is leeg." -"Payment error. Order was not found.","Betalingsfout. Bestelling is niet gevonden." -"Payment error. Paid amount doesn\'t match the order amount.","Betalingsfout. Betaalde bedrag is niet hetzelfde als bedrag van bestelling." -"Payment from Applicable Countries","Betaling vanuit toegestane landen" -"Payment from Specific Countries","Betaling vanuit specifieke landen" -"Please, choose payment method","Kies a.u.b. de verzendmethode" -"Response hash validation failed. Transaction declined.","Antwoord op hash validatie mislukt. Transactie geweigerd." -"Sort Order","Sorteer Bestelling" -"Test Mode","Testmode" -"The order has been created.","De bestelling is aangemaakt" -"There was an error processing your order. Please contact us or try again later.","Er is een fout opgetreden bij het verwerken van uw bestelling. Contacteer ons a.u.b. of probeert u het later nog eens." -"Title","Titel" -"Transaction Key","Transactiesleutel" -"What is this?","Wat is dit?" -"You will be required to enter your payment details before you place an order.","U zult uw betalingsgegevens moeten invullen alvorens u een bestelling kunt plaatsen." diff --git a/app/locale/nl_NL/Mage_Backup.csv b/app/locale/nl_NL/Mage_Backup.csv deleted file mode 100644 index 47c245696..000000000 --- a/app/locale/nl_NL/Mage_Backup.csv +++ /dev/null @@ -1,55 +0,0 @@ -"Action","Actie" -"An error occurred while creating the backup.","Er is een fout opgetreden tijdens het maken van de backup." -"An error occurred while writing to the backup file ""%s"".","Er is een fout opgetreden terwijl het backup-bestand ""%s"" werd geschreven." -"Are you sure you want to delete the selected backup(s)?","Weet u zeker dat u de geselecteerde back-up(s) wilt verwijderen?" -"Backup Type","Back-up Type" -"Backup file ""%s"" cannot be read from or written to.","Backup-bestand ""%s"" kan niet gelezen of beschreven worden." -"Backup file ""%s"" does not exist.","Backup-bestand ""%s"" bestaat niet." -"Backup file does not exist.","Backup-bestand bestaat niet" -"Backup file handler was unspecified.","Backup bestand behandelaar is niet gespecificeerd." -"Backup file not found","Back-up bestand niet gevonden" -"Backup file path was not specified.","Backup-bestand pad is niet gespecificeerd." -"Backups","Backups" -"Cannot read backup file.","Kan backup-bestand niet lezen." -"Create Backup","Creëer backup" -"Database","Database" -"Database Backup","Database Back-up" -"Database and Media","Database en Media" -"Database and Media Backup","Database en Media Back-up" -"Database was successfuly backed up.","Database backup is met succes uitgevoerd" -"Download","Download" -"Enable Scheduled Backup","Schakel Geplande Back-up in" -"Failed to connect to FTP","Kan geen verbinding maken met FTP" -"Failed to delete one or several backups.","Fout bij verwijderen van een of meerdere back-ups." -"Failed to rollback","Terugdraaien mislukt" -"Failed to validate FTP","Kan FTP niet valideren" -"Frequency","Frequentie" -"Invalid Password.","Ongeldig Wachtwoord." -"Maintenance Mode","Onderhouds Modus" -"Name","Naam" -"Not enough free space to create backup.","Niet genoeg vrije ruimte om back-up te creëren." -"Not enough permissions to create backup.","Niet genoeg rechten om back-up te creëren." -"Not enough permissions to perform rollback","Niet genoeg rechten om terugdraaien uit te voeren" -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup.""","Gelieve ofwel vinkt u de ""Zet winkel in onderhoudsmodus"" optie uit, of update uw rechten om door te gaan met de backup." -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback.""","Gelieve ofwel vinkt u de ""Zet winkel in onderhoudsmodus"" optie aan, of update uw rechten om door te gaan met de herstelprocedure." -"Put store on the maintenance mode while backup's creation","Zet store op de onderhoudsmodus, tijdens het maken van back-up's" -"Rollback","Terugrollen" -"Scheduled Backup Settings","Geplande Back-up Instellingen" -"Size, Bytes","Grootte, bytes" -"Start Time","Begintijd" -"System","Systeem" -"System (excluding Media)","Systeem (met uitzondering van Media)" -"System Backup","Systeem Back-up" -"System couldn't put store on the maintenance mode","Systeem kon store niet in de onderhoudsmodus zetten" -"The database and media backup has been created.","De database en media back-up zijn gemaakt." -"The database backup has been created.","De database back-up is gemaakt." -"The file was compressed with Zlib, but this extension is not installed on server.","Het bestand is gecomprimeerd met Zlib, maar deze extensie is niet geïnstalleerd op de server." -"The selected backup(s) has been deleted.","De geselecteerde back-up(s) is/zijn verwijderd." -"The system (excluding Media) backup has been created.","De systeem (met uitzondering van Media) back-up is gecreëerd." -"The system backup has been created.","Het systeem back-up is gemaakt." -"Time","Tijd" -"Type","type" -"Unable to create backup. Please, try again later.","Niet in staat om backup te creëren. Probeer a.u.b. later opnieuw." -"Unable to save the cron expression.","Kan de cron uitdrukking niet opslaan." -"Wrong order of creation for new backup.","Verkeerde volgorde van creëren van nieuwe backup." -"You do not have sufficient permissions to enable Maintenance Mode during this operation.","U heeft niet voldoende rechten om de onderhoudsmodus in te schakelen tijdens deze handeling." diff --git a/app/locale/nl_NL/Mage_Bundle.csv b/app/locale/nl_NL/Mage_Bundle.csv deleted file mode 100644 index 05459d40a..000000000 --- a/app/locale/nl_NL/Mage_Bundle.csv +++ /dev/null @@ -1,71 +0,0 @@ -"%1$s incl tax.","%1$s incl tax." -"* Required Fields","* Vereiste velden" -"-- Select --","--selecteer--" -"Add New Option","Voeg nieuwe optie toe" -"Add Selection","Voeg selectie toe" -"As Low as","Zo laag als" -"As low as","Zo laag als" -"Bundle Items","Bundel producten" -"Bundle Product","Bundel product" -"Bundle Product View Summary","Bundel Product Overzicht" -"Buy %1$s","Buy %1$s" -"Buy %1$s for","Buy %1$s for" -"Buy %1$s for %2$s","Buy %1$s for %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Buy %1$s for %2$s (%3$s incl. tax) each" -"Buy %1$s for %2$s each","Buy %1$s for %2$s each" -"Buy %1$s with %2$s discount each","Koop %1$s met %1$s korting per stuk" -"Catalog Product View (Bundle)","Catalogus product weergave (bundel)" -"Checkbox","checkbox" -"Choose a selection...","Kies een selectie..." -"Click for price","Click for price" -"Close","sluiten" -"Default","standaard" -"Default Qty","Standaardhoeveelheid" -"Default Title","Standaardtitel" -"Drop-down","drop-down" -"Dynamic","Dynamisch" -"Excl. Tax","Excl. belasting" -"Excl. Tax:","Excl. Tax:" -"Fixed","Gefixeerd" -"From","Vanuit" -"From:","Vanuit:" -"Gift Message","Cadeau bericht" -"Incl. Tax","Incl. belasting" -"Incl. Tax:","Incl. Tax:" -"Input Type","Invoertype" -"Is Required","Is vereist" -"Message:","Bericht:" -"Multiple Select","Meerdere selecties" -"N/A","N.V.T" -"No options of this product are available.","Geen opties van dit product zijn beschikbaar" -"None","Geen" -"Percent","Procent" -"Percent Discount","Procent korting" -"Please Select Products to Add","Selecteer Alstublieft Producten om Toe te Voegen" -"Please enter a number greater 0 in this field.","Vul hier een getal groter dan 0 in." -"Please enter search conditions to view products.","Voer a.u.b. zoekvoorwaarden in om producten te bekijken" -"Please select options for product.","Selecteer a.u.b. opties voor product." -"Please specify product option(s).","Specificeer a.u.b. product optie(s)." -"Position","Positie" -"Price Range","Prijsbereik" -"Price Type","Prijs type" -"Price as configured","Prijs zoals geconfigureerd" -"Qty:","Kwant:" -"Radio Buttons","Radioknoppen" -"Required options are not selected.","Vereiste opties zijn niet geselecteerd" -"Selected required options are not available.","Geselecteerde, vereiste opties zijn niet beschikbaar." -"Separately","Apart" -"Ship Bundle Items","Verzend bundel producten" -"Shipment","Verzending" -"Store View Title","Winkelweergave titel" -"There is no defined renderer for ""%s"" option type.","Er is geen gedefinieerde maker voor ""%s"" optietype." -"This product is also part of bundle(s)","Dit product is ook onderdeel van bundel(s)" -"To","Aan" -"To:","Aan:" -"Together","Samen" -"Total incl. Tax: %1$s","Total incl. Tax: %1$s" -"Use Default Value","Gebruik standaardwaarde" -"User Defined Qty","Aantal bepaald door gebruiker" -"and","and" -"each","each" -"save","save" diff --git a/app/locale/nl_NL/Mage_Captcha.csv b/app/locale/nl_NL/Mage_Captcha.csv deleted file mode 100644 index 4d9f8e11b..000000000 --- a/app/locale/nl_NL/Mage_Captcha.csv +++ /dev/null @@ -1,22 +0,0 @@ -"Attention: Captcha is case sensitive.","Attention: Captcha is hoofdletter gevoelig" -"After number of attempts to login","Na aantal pogingen om in te loggen" -"Always","Altijd" -"CAPTCHA","CAPTCHA" -"CAPTCHA Timeout (minutes)","CAPTCHA Pauze (minuten)" -"CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen","CAPTCHA voor ""Gebruiker creëren"" en ""Wachtwoord vergeten"" formulieren is altijd ingeschakeld als gekozen" -"Case Sensitive","Hoofdletter Gevoelig" -"Displaying Mode","Display Modus" -"Enable CAPTCHA in Admin","Schakel CAPTCHA in in Admin" -"Enable CAPTCHA on Frontend","Schakel CAPTCHA in in Frontend" -"Font","Lettertype" -"Forms","Formulieren" -"If 0 is specified, CAPTCHA on the Login form will be always available.","Als 0 is gespecificeerd, is CAPTCHA op het Login formulier altijd beschikbaar." -"Incorrect CAPTCHA.","Onjuiste CAPTCHA." -"Number of Symbols","Aantal Symbolen" -"Number of Unsuccessful Attempts to Login","Aantal Niet Succesvolle Pogingen om In te Loggen" -"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Specificeer aub maximaal 8 symbolen. Toegestane bereik (bv. 3-5)" -"Please type the letters below","Voer aub de letters hieronder in" -"Please type the letters from the image:","Voer aub de letters van de afbeelding in:" -"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.
    Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Gebruik aub alleen letters (a-z of A-Z) of nummers (0-9) in dit veld. Er zijn geen spaties of andere symbolen toegestaan.
    Soortgelijkende symbolen (bv. ""i"", ""l"", ""1"") verlagen de kans op een correcte herkenning door de klant." -"Reload captcha","Herlaad captcha" -"Symbols Used in CAPTCHA","Symbolen Gebruikt in CAPTCHA" diff --git a/app/locale/nl_NL/Mage_Catalog.csv b/app/locale/nl_NL/Mage_Catalog.csv deleted file mode 100644 index d91d8fbf0..000000000 --- a/app/locale/nl_NL/Mage_Catalog.csv +++ /dev/null @@ -1,848 +0,0 @@ -"# of Use","# van Gebruik" -"%1$s incl tax.","%1$s incl. BTW." -"%s - %s","%s - %s" -"%s Item(s)","%s Artikel(en)" -"%s and above","% s en meer" -"%s-%s of %s","%s-%s van %s" -"(%d)","(%d)" -"(Copy data from: %s)","(Kopieer data van: %s)" -"* Required Fields","* Vereiste velden" -"-- Please Select --","-- Selecteer alstublieft --" -"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","86400 standaard, indien niet ingesteld. Om direct te verversen, Verwijder de Blokken HTML Output Cache." -"Warning! Applying MAP by default will hide all product prices on the frontend.","Waarschuwing! Het gebruik van MAP zal standaard alle product prijzen in de frontend verbergen." -"A group with the same name already exists.","Een groep met dezelfde naam bestaat reeds." -"A name is required","Een naam is benodigd." -"A product type is not defined for the indexer.","Een product type is niet gedefinieerd voor de indexer." -"ALL GROUPS","ALLE GROEPEN" -"AM","AM" -"Action","Actie" -"Actual Price","Werkelijke Prijs" -"Add","Toevoegen" -"Add Attribute","Voeg Attribuut toe" -"Add Design Change","Voeg Design Verandering toe" -"Add Group","Voeg Groep toe" -"Add Group Price","Groepsprijs toevoegen" -"Add New","Nieuwe Toevoegen" -"Add New Attribute","Nieuwe attribuut toevoegen" -"Add New Attribute Set","Voeg Nieuwe Attribuut Set toe" -"Add New Group","Voeg Nieuwe Groep toe" -"Add New Images","Voeg Nieuwe Plaatjes toe" -"Add New Option","Voeg Nieuwe Optie Toe" -"Add New Row","Voeg Nieuwe Rij Toe" -"Add New Search Term","Voeg Nieuwe Zoekterm Toe" -"Add New Set","Voeg Nieuwe Reeks Toe" -"Add Product","Voeg Product Toe" -"Add Product To Websites","Voeg Product Toe Aan Websites" -"Add Root Category","Voeg Root Categorie Toe" -"Add Subcategory","Voeg Subcategorie Toe" -"Add Tax","Voeg BTW Toe" -"Add Tier","Voeg Rang Toe" -"Add attribute into attribute set","Voeg attribuut toe aan de attribuut set" -"Add group into attribute set","Voeg groep toe aan attribuut set" -"Add new custom option into product","Voeg een nieuwe aangepaste optie toe aan het product" -"Add new values into custom option","Voeg nieuwe waarden toe aan aangepaste optie" -"Add option","Voeg optie toe" -"Add to Cart","Aan mandje toevoegen" -"Add to Compare","Voeg toe om te Vergelijken" -"Add to Wishlist","Aan verlanglijst toevoegen" -"Additional Information","Aanvullende Informatie" -"Alert Urls","Melding Url's" -"All","Alles" -"All Product Types","Alle Product Types" -"All Websites","Alle Websites" -"All products","Alle producten" -"All products - recently added products, New products - products marked as new","Alle producten - recent toegevoegde producten, Nieuwe producten - producten die als nieuw zijn gemarkeerd" -"All products of this set will be deleted! Are you sure you want to delete this attribute set?","Alle producten van deze reeks zullen worden verwijderd! Weet u zeker dat u deze attributenreeks wilt verwijderen?" -"Allow All Products per Page","Sta Alle Producten per Pagina Toe" -"Allow Dynamic Media URLs in Products and Categories","Sta Dynamische Media URL's in Producten en Categorieën Toe" -"Allow HTML Tags on Frontend","Sta HTML Tags op Front-end toe" -"Allowed File Extensions","Toegestane Bestandsextensies" -"Allowed file extensions to upload","Toegestane bestandsextensies om te uploaden" -"Amount","Aantal" -"An error occurred while adding products to websites.","Er is een fout opgetreden tijdens het toevoegen van producten aan websites." -"An error occurred while clearing comparison list.","Er is een fout opgetreden tijdens het opschonen vergelijkingslijst." -"An error occurred while deleting this review.","Er is een fout opgetreden bij het verwijderen van deze recentie." -"An error occurred while removing products from websites.","Er is een fout opgetreden tijdens het verwijderen van producten van websites." -"An error occurred while saving the URL rewrite","Er is een fout opgetreden tijdens het opslaan van de URL rewrite" -"An error occurred while saving the attribute set.","Er is een fout opgetreden tijdens het opslaan van de attribuut set." -"An error occurred while saving the collection, aborting. Error message: %s","Er is een fout opgetreden bij het opslaan van de collectie, afbreken. Foutmelding:% s" -"An error occurred while saving the product. ","Er is een fout opgetreden tijdens het opslaan van het product." -"An error occurred while saving the search query.","Er is een fout opgetreden tijdens het opslaan van de zoek query." -"An error occurred while saving this group.","Er is een fout opgetreden tijdens het opslaan van deze groep." -"An error occurred while saving this review.","Er is een fout opgetreden bij het opslaan van deze recensie." -"An error occurred while trying to delete the category.","Er is een fout opgetreden tijdens het proberen de categorie te verwijderen." -"An error occurred while updating the product(s) attributes.","Er is een fout opgetreden tijdens het updaten van de product attributen." -"An error occurred while updating the product(s) status.","Er is een fout opgetreden tijdens het updaten van de product status." -"An invalid group ID is specified, skipping the record.","Een ongeldige groeps-ID is opgegeven, het dossier wordt overgeslagen." -"An invalid option ID is specified for %s (%s), skipping the record.","Een ongeldige optie ID is gespecificeerd voor %s (%s), het record overslaan." -"An invalid store was specified.","Een ongeldige winkel is gespecificeerd." -"Anchor Custom Text","Anker Custom Tekst" -"Anchor Custom Title","Anker Custom Titel" -"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","Geschikt om alleen producten en categorieën te catalogiseren. Elke mediacontent zal worden ingevoegd in de editor als een statische URL. Het wordt niet geüpdatet als de systeemconfiguratie URL veranderingen baseert." -"Apply MAP (Default Value)","Pas MAP toe (Vaststaande Waarde)" -"Apply To","Pas Toe Op" -"Approved","Goed Gekeurd" -"Are you sure you want to delete this category?","Weet u zeker dat u deze categorie wilt verwijderen?" -"Are you sure you would like to remove all products from your comparison?","Weet u zeker dat u alle producten van uw vergelijking wilt verwijderen?" -"Are you sure you would like to remove this item from the compare products?","Weet u zeker dat u dit item van uw vergeleken producten wilt verwijderen?" -"Are you sure?","Weet u het zeker?" -"As low as:","Zo laag als:" -"Assign","Toewijzen" -"Assign product link","Productlink toewijzen" -"Assign product to category","Ken product toe aan categorie" -"Assigned Products","Toegekende producten" -"Associated Products","Geassocieerde Producten" -"Attrib. Set Name","Stel naam attrib. in" -"Attribute ""%s"" is invalid.","Attribuut ""%s"" is ongeldig." -"Attribute ""%s"" is required.","Attribuut ""%s"" is vereist." -"Attribute Information","Kenmerk Informatie" -"Attribute Model","Kenmerk Model" -"Attribute Name:","Kenmerk Naam:" -"Attribute Set","Attributenset" -"Attribute Sets","Attribuut Sets" -"Attribute add","Voeg attribuut toe" -"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribuutcode is ongeldig. Gebruik alleen letter (a-z) of underscore(_) in dit veld, eerste teken moet een letter zijn." -"Attribute group with the \"/name/\" name already exists","Attribuutgroep met de \"/name/\" naam bestaat al" -"Attribute group with the \/name/\ name already exists","Attribuutgroep met de \/naam/\ bestaat al" -"Attribute remove","Verwijder attribuut" -"Attribute with the same code already exists","Kenmerk met dezelfde code bestaat reeds" -"Attributes","Attributen" -"Attrribute names can be specified per store.","Namen van kenmerken kunnen per opslag worden gespecificeerd." -"Autogenerate","Automatisch genereren" -"Availability:","Beschikbaarheid:" -"Back","Terug" -"Backend Model","Achterkant Model" -"Backend Table","Achterkant Tafel" -"Backend Table Title","Achterkant Tafel Titel" -"Backorders","Backorders" -"Based On","Gebaseerd op" -"Before Order Confirmation","Voor Bestelling Bevestiging" -"Best Value","Beste Waarde" -"Block after Info Column","Blok na Info Kolom" -"Bottom Block Options Wrapper","Onderaan Blokkeer Opties Omslag" -"Bottom/Left","Onderaan/Links" -"Bottom/Right","Onderaan/Rechts" -"Browse By","Browse met" -"Bundle Items","Items samenvoegen" -"Buy %1$s","Koop % 1$s" -"Buy %1$s for","Koop %1$s voor" -"Buy %1$s for %2$s","Koop %1$s voor %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Koop %1$s voor %2$s (%3$s inclusief belasting) elk" -"Buy %1$s for %2$s each","Koop %1$s voor %2$s elk" -"Cache Lifetime (Seconds)","Cache levensduur (Seconden)" -"Cache refresh needed.","Cache moet worden vernieuwd" -"Can be Divided into Multiple Boxes for Shipping","Kan Worden Verdeeld over Meerdere Dozen bij Verzending" -"Can be used only with catalog input type Dropdown","Kan worden gebruikt met catalogusinvoer type Dropdown" -"Can be used only with catalog input type Dropdown, Multiple Select and Price","Kan alleen worden gebruikt met catalogusinvoer type Dropdown. Meervoudige selectie en Prijs" -"Can\'t create image.","Kan geen beeld maken" -"Cancel","Annuleren" -"Cannot create image.","Kan beeld niet creëren." -"Cannot create writeable directory '%s'.","Kan geen beschrijfbare directory '%s' aanmaken" -"Cart Item Attribute","Winkelwagen artikel attribuut" -"Catalog","Catalogus" -"Catalog Category (Anchor)","Catalogus categorie (anker)" -"Catalog Category (Non-Anchor)","Catalogus categorie (niet anker)" -"Catalog Category (Without Subcategories)","Catalogus categorie (zonder subcategorieën)" -"Catalog Category Link","Catalogus categorie link" -"Catalog New Products List","Catalogus Nieuwe Producten Lijst" -"Catalog Price Scope","Catalogus prijs bereik" -"Catalog Product Compare List","Catalogus productvergelijkingslijst" -"Catalog Product Email to a Friend","Catalogus Product E-mail naar een Vriend" -"Catalog Product Image Gallery Popup","Catalogus productbeeldenreeks popup" -"Catalog Product Link","Catalogus Product Link" -"Catalog Product View (Any)","Catalogus Product Bezichtiging (Elke)" -"Catalog Product View (Configurable)","Catalogus Product Bezichtiging (Configureerbaar)" -"Catalog Product View (Grouped)","Catalogus Product Bezichtiging (Gegroepeerd)" -"Catalog Product View (Simple)","Catalogus Product Bezichtiging (Simpel)" -"Catalog Product View (Virtual)","Catalogus Product Bezichtiging (Virtueel)" -"Catalog Section","Catalogus Gedeelte" -"Catalog Seo Sitemap (Category List)","Catalogus Seo Sitemap (Categorielijst)" -"Catalog Seo Sitemap (Category Tree)","Catalogus Seo Sitemap (Categorieboom)" -"Catalog Seo Sitemap (Common)","Catalogus Seo Sitemap (Algemeen)" -"Catalog Seo Sitemap (Product List)","Catalogus Seo Sitemap (Productlijst)" -"Catalog URL Rewrites","Catalogus URL Herschrijvingen" -"Catalog product custom option values API","Catalogusproduct op maat optiewaarden API" -"Catalog product custom options API","Catalogusproduct op maat opties API" -"Catalog, Search","Catalogus, Zoeken" -"Categories","Categoriën" -"Categories Sitemap","Categorieën Sitemap" -"Category","Categorie" -"Category API","Categorie API" -"Category Data","Categorie Data" -"Category Flat Data","Categorie Flat Data" -"Category Link Block Template","Categorie Link Bloktemplate" -"Category Link Inline Template","Categorie Link Inline Template" -"Category Products","Categorie Producten" -"Category Top Navigation","Categorie Topnavigatie" -"Category URL Suffix","Categorie URL Achtervoegsel" -"Category attributes API","Categorie attributen API" -"Category move error","Categorie verplaatsfout" -"Category move error %s","Categorie verplaatsing fout %s" -"Category move operation is not possible: parent category is equal to child category.","Categorie verplaatsoperatie is niet mogelijk: broncategorie is gelijk aan kindcategorie." -"Category move operation is not possible: the current category was not found.","Categorie verplaatsoperatie is niet mogelijk: de huidige categorie werd niet gevonden." -"Category move operation is not possible: the new parent category was not found.","Categorie verplaatsoperatie is niet mogelijk: de nieuwe broncategorie werd niet gevonden." -"Category must be an instance of Mage_Catalog_Model_Category.","Categorie moet een instantie zijn van Mage_Catalog_Model_Category." -"Center","Centrum" -"Change","Verander" -"Change or Retrieve attribute store view","Verander of Herstel attribuut winkelbezichtiging" -"Change status","Verander status" -"Check items to add to the cart or","Controleer items om aan het winkelwagentje toe te voegen of" -"Choose an Option...","Kies een Optie..." -"Clear All","Verwijder Alles" -"Clear Price","Verwijder Prijs" -"Click for price","Klik voor de prijs" -"Close Window","Venster Sluiten" -"Collapse All","Vouw Alles Op" -"Comma-separated.","Komma-gescheiden." -"Comparable","Vergelijkbaar" -"Comparable on Front-end","Vergelijkbaar op front-end" -"Comparable on the Frontend","Vergelijkbaar op de Front-end" -"Compare","Vergelijk" -"Compare Products","Vergelijk Producten" -"Conditions Combination","Voorwaarden Combinatie" -"Configurable Product","Configureerbaar Product" -"Configurable Product Settings","Configureerbare Productinstellingen" -"Configure Product","Product instellen" -"Continue","Doorgaan" -"Copy From Configurable","Kopieer Van Configureerbaar" -"Country/State","Land/Provincie" -"Create","Maak aan" -"Create (Upload)","Creëer (Upload)" -"Create Empty","Creëer Leeg" -"Create Permanent Redirect for URLs if URL Key Changed","Maak een Permanente Omleiding voor URL's als URL-Key is Gewijzigd" -"Create Permanent Redirect for old URL","Creëer Permanente Omleiding voor oude URL" -"Create Product Settings","Creëer Product Instellingen" -"Create Simple Associated Product","Creëer Eenvoudig Samenhangend Product" -"Create attribute set based on another set","Maak een attribuut set op basis van een andere set" -"Create new attribute","Maak nieuw attribuut" -"Create new category","Creëer nieuwe Categorie" -"Create new product","Creëer nieuw product" -"Cross-sells","Cross-sells" -"Currently Shopping by:","Op het moment Winkelt:" -"Custom Design","Custom-design" -"Custom Options","Custom Opties" -"Custom options","Aangepaste opties" -"Customer Group","Klantgroep" -"Customers Reviews","Klantenrecensies" -"Customers Tagged Product","Door Klanten Getagd Product" -"Data Type for Saving in Database","Data type om in Database op te slaan" -"Date & Time Custom Options","Datum & Tijd Custom Opties" -"Date Fields Order","Datum Velden Bestelling" -"Date Subscribed","Datum Ingeschreven" -"Datetime","Datumtijd" -"Decimal","Decimaal" -"Declare attribute value saving scope","Verklaar attribuut waarde opslagscope" -"Default ""What's This"" Text Message","Vaststaande ""Wat is dit"" Tekstbericht" -"Default Popup Text Message","Vaststaand Popup Tekstbericht" -"Default Price","Vaststaande Prijs" -"Default Price Navigation Step","Vaststaande Prijs Navigatie Stap" -"Default Qty","Vaststaande Qty" -"Default Values","Standaardwaardes" -"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","Definieert de standaard munteenheid (""Munteenheid instellingen"" > ""Munteenheid opties"" > ""Basis munteenheid"")." -"Delete","Verwijderen" -"Delete Attribute","Verwijder Attribuut" -"Delete Attribute Set","Verwijder Attribuut Set" -"Delete Category","Verwijder Categorie" -"Delete Group Price","Verwijder Groepsprijs" -"Delete Option","Verwijder Optie" -"Delete Row","Verwijder Rij" -"Delete Search","Verwijder Zoekopdracht" -"Delete Selected Group","Verwijder Geselecteerde Groep" -"Delete Tier","Verwijder Rij" -"Delete attribute","Verwijder attribuut" -"Delete category","Categorie verwijderen" -"Delete product","Verwijder product" -"Depends on design theme","Hangt van ontwerpthema af" -"Design","Ontwerp" -"Details","Details" -"Disabled","Uitgeschakeld" -"Disallowed file type.","Niet toegestaan bestandstype." -"Display Actual Price","Toon Actuele Prijzen" -"Display Page Control","Schermpagina controle" -"Display Price Interval as One Price","Toon Prijs Interval als Een prijs" -"Display Product Count","Geef Aantal Producten weer" -"Display Type","Schermtype" -"Display in Suggested Terms","Toon in Voorgestelde Voorwaarden" -"Double click on a group to rename it","Dubbelklik op een groep om van naam te veranderen" -"Double click on above image to view full picture","Dubbelklik op bovenstaande afbeelding om volledige foto te bekijken" -"Downloadable Information","Downloadbare informatie" -"Duplicate","Duplicaat" -"Duplicate amount found.","Dupliceer gevonden aantal." -"Duplicate website group price customer group.","Dubbele website groep prijs klantengroep." -"Duplicate website tier price customer group and quantity.","Dupliceer website prijs klantengroep en hoeveelheid." -"Duplicate website, country and state tax found.","Dupliceer gevonden belasting van website, land en staat." -"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","Bijvoorbeeld {{media url=""pad/naar/plaatje.jpg""}} {{skin url=""pad/naar/plaatje.gif""}}. Dynamische opdrachtenverwerking heeft invloed op de performantie van de catalogus." -"Edit","Bewerken" -"Edit Attribute Set '%s'","Bewerken attribuutset '%s'" -"Edit Product Attribute","Bewerken productattribuut" -"Edit Product Attribute ""%s""","Bewerk productattribuut ""%s""" -"Edit Search","Bewerk Zoekopdracht" -"Edit Search '%s'","Bewerk Zoekopdracht '%s'" -"Edit Set Name","Bewerk Set Naam" -"Email","Email" -"Email to a Friend","E-mail Vriend" -"Empty","Leeg" -"Enable MAP","Sta MAP toe" -"Enable Qty Increments","Sta Qty Incrementen toe" -"Enable WYSIWYG","Sta WYSIWYG toe" -"Enable for reindexing a big number of SKUs.","Inschakelen voor het indexeren van een groot aantal SKU's." -"Enabled","Aan" -"Error during retrieval of option value: %s","Fout bij het ophalen van optie waarde: %s" -"Exclude","Sluit Uit" -"Expand All","Klap Alles Uit" -"Failed","Mislukt" -"Failed to copy file %s. Please, delete media with non-existing images and try again.","Kopiëren van het bestand %s mislukt. Verwijder alstublieft media met niet-bestaande afbeeldingen en probeer het opnieuw." -"Failed to move file: %s","Niet gelukt om bestand te verplaatsen: %s" -"Feature Products","Eigenschap Producten" -"Field is not complete","Veld is incompleet" -"File options format is not valid.","Bestandsopties formaat is niet geldig." -"File upload failed","Bestandsupload gefaald" -"Filter","Filter" -"Filter model name must be declared.","Filter modelnaam moet worden gedeclareerd." -"Filter must be an object. Please set correct filter.","Filter moet een object zijn. Stel alstublieft een correct filter in." -"Filterable (no results)","Filtreerbaar (geen resultaten)" -"Filterable (with results)","Filtreerbaar (met resultaten)" -"First Name","Voornaam" -"Fixed","Gemaakt" -"For internal use.","Voor intern gebruik." -"For the last time placed.","Het laatst geplaatst" -"Frontend","Voorkant" -"Frontend Model","Model Voorkant" -"Frontend Properties","Front end Eigenschappen" -"Gallery","Galerij" -"General Information","Algemene informatie" -"Get full information about attribute with list of options","Ontvang volledige informatie over attribuut met een lijst van opties" -"Get full information about custom option in product","Verkrijg volledige informatie over aangepaste optie in product" -"Get list of available custom option types","Verkrijg lijst met beschikbare aangepaste optie typen" -"Get list of non-default attributes by product type and attributes set","Ontvang een lijst van niet-standaard attributen per type product en de in te stellen attributen" -"Get list of possible attribute types","Verkrijg lijst met mogelijke attribuuttypen" -"Get special price","Ontvang speciale prijs" -"Global","Wereldwijd" -"Globally Editable","Wereldwijd te bewerken" -"Go to Home Page","Ga naar Homepage" -"Grid","Rooster" -"Group add","Voeg groep toe" -"Group remove","Groep verwijderen" -"Grouped Product","Gegroepeerd Product" -"Groups","Groepen" -"Home","Thuis" -"ID","ID" -"ID: %s","ID: %s" -"If empty, the Category Name will be used","Als u het leeg laat, zal de Categorie Naam gebruikt worden" -"If empty, the Product Name will be used","Als u het leeg laat, zal de Product Naam gebruikt worden" -"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Als u geen optiewaarde voor een specifieke store view specificeert, wordt de vaststaande waarde (admin) worden gebruikt." -"Image","Beeld" -"Image content is not valid base64 data.","Afbeelding content is geen geldige base64 data." -"Image does not exist.","Afbeelding bestaat niet." -"Image file was not found.","Afbeelding bestand niet gevonden." -"Image type and information need to be specified for each store view.","Afbeelding type en informatie moeten voor elke store view gespecificeerd worden." -"In Cart","In Winkelwagen" -"In Stock","In voorraad" -"In stock","In voorraad" -"Incl. Tax","Incl. BTW" -"Index product and categories URL rewrites","Index product en categorieën URL rewrites" -"Index product attributes for layered navigation building","Index product attributen voor layered navigatie building" -"Index product prices","Index product prijzen" -"Indexed category/products association","Geïndexeerde categorie/producten verbinding" -"Info","Info" -"Info Column Options Wrapper","Info Kolom Opties Omslag" -"Input Type","Invoer Type" -"Integer","Heel getal" -"Interval Division Limit","interval divisie limiet" -"Invalid Tier Prices","Ongeldige Rij Prijzen" -"Invalid attribute %s","Ongeldig kenmerk %s" -"Invalid attribute option specified for attribute %s (%s), skipping the record.","Onjuist attribuut optie gekozen voor attribuut %s (%s), record wordt overgeslagen." -"Invalid attribute set specified, skipping the record.","Ongeldige reeks kenmerken gespecificeerd, vermelding wordt overgeslagen" -"Invalid block: %s.","Ongeldig blok: %s" -"Invalid category IDs.","Onjuiste categorie ID's." -"Invalid category.","Ongeldige categorie" -"Invalid image file type.","Ongeldig bestandstype beeld" -"Invalid image type.","Ongeldig beeldtype." -"Invalid option ID specified for %s (%s), skipping the record.","Ongeldige optie ID gespecificeerd voor %s (%s), record wordt overgeslagen." -"Invalid product type specified, skipping the record.","Ongeldig producttype gespecificeerd, record wordt overgeslagen." -"Invalid store specified","Ongeldige winkel gespecificeerd" -"Invalid store specified, skipping the record.","Ongeldige winkel gespecificeerd, record wordt overgeslagen." -"Invalid tier prices. The product is not associated to the requested website.","Onjuiste tier prijzen. Het product is niet gerelateerd aan de opgevraagde website." -"Inventory","Voorraad" -"Is Default","Is Standaard" -"Is Required","Is Benodigd" -"Items %s to %s of %s total","Onderdelen %s tot %s van totaal %s" -"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Items waarvan u niet wilt dat ze te zien zijn in de catalogus of zoekresultaten, dienen de status 'Uitgeschakeld' te hebben in de gewenste winkel." -"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Items waarvan u niet wilt dat ze te zien zijn in de catalogus of zoekresultaten, dienen de status 'Uitgeschakeld' te hebben in de gewenste winkel." -"Keep your eyes open for our special Back to School items and save A LOT!","Houd onze speciale Terug naar School items in de gaten en bespaar EEN BOEL!" -"Label","Label" -"Last Name","Achternaam" -"Last Notification","Laatste Notificatie" -"Layered Navigation","Gelaagde Navigatie" -"Learn More","Meer Informatie" -"Line %d, Email: %s","Regel %d, Email: %s" -"Line %d, SKU: %s","Lijn %d, SKU: %s" -"Link (Related, Up sell, Cross sell)","Link (Gerelateerd, Up sell, Cross sell)" -"Link product does not exist.","Gelinkt product bestaat niet." -"Link to a Specified Category","Link naar een Gespecificeerde Categorie" -"Link to a Specified Product","Link naar een Gespecificeerd Product" -"List","Lijst" -"List Mode","Lijstmodus" -"List of Products that are set as New","Lijst van Producten die zijn ingesteld als Nieuw" -"List of types","Lijst van types" -"Manage Attribute Sets","Beheer Attribuut Sets" -"Manage Attributes","Attributen beheren" -"Manage Catalog Categories","Manage Catalogus Categorieën" -"Manage Categories","Beheer Categorieën" -"Manage Label / Options","Beheer Label / Opties" -"Manage Options (values of your attribute)","Beheer Opties (waarden van uw attribuut)" -"Manage Product Attributes","Beheer Productkenmerken" -"Manage Product Sets","Beheer Productgroepen" -"Manage Products","Manage Producten" -"Manage Stock","Beheer Voorraad" -"Manage Titles (Size, Color, etc.)","Beheer Titels (Grootte, Kleur, etc.)" -"Max Characters","Max Karakters" -"Maximal Depth","Maximale diepte" -"Maximum Image Size","Maximum Grootte Afbeelding" -"Maximum Number of Price Intervals","Maximum Aantal Prijsintervallen" -"Maximum Qty Allowed in Shopping Cart","Maximaal toegestaan aantal in winkelwagen" -"Maximum allowed image size for '%s' is %sx%s px.","Maximum toegestane afbeeldingsgrote voor '%s' is %sx%s pixels." -"Maximum image height","Maximale beeldhoogte" -"Maximum image width","Maximale beeldbreedte" -"Maximum number of characters:","Maximaal aantal karakters" -"Maximum number of price intervals is 100","Maximum aantal prijsintervallen is 100" -"Media Image","Media Beeld" -"Minimum Advertised Price","Minimum Geadverteerde Prijs" -"Minimum Lines per Page","Minimum Regels per Pagina" -"Minimum Qty Allowed in Shopping Cart","Minimum Qty Toegestaan in Winkelwagen" -"Minimum Qty for Item\'s Status to be Out of Stock","Minimum aantal waarbij Status van Item op geen voorraad komt" -"Missing SKU, skipping the record.","SKU mist, record wordt overgeslagen." -"More Views","Meer Views" -"Move","Verplaats" -"Move category in tree","Verplaats categorie in tree" -"Multi update product","Multi-update product" -"Must be in the allowed values list.","Behoord in toegestane waarden lijst te staan." -"My Account","Mijn Account" -"N/A","Nvt" -"Name","Naam" -"Name in %s","Naam in %s" -"New Product","Nieuw Product" -"New Product Attribute","Nieuw Productkenmerk" -"New Products","Nieuwe Producten" -"New Products Grid Template","Patroon Nieuwe Producten Rooster" -"New Products List Template","Nieuw Product Lijst Sjabloon" -"New Root Category","Nieuwe categorie" -"New Search","Nieuwe Zoekopdracht" -"New Set Name","Nieuwe Serie Naam" -"New Subcategory","Nieuwe subcategorie" -"New products","Nieuwe producten" -"Next","Volgende" -"No","Nee" -"No image","Geen beeld" -"No layout updates","Geen lay-out updates" -"No options of this product are available.","Voor dit product zijn geen opties beschikbaar" -"No product collections found.","Geen productverzamelingen gevonden" -"None","Geen" -"Not Visible Individually","Niet afzonderlijk zichtbaar" -"Notify Low Stock RSS","Geef Lage Voorraad RSS aan" -"Notify for Quantity Below","Geef Kwantiteit Beneden aan" -"Number of Products per Page","Aantal producten per pagina" -"Number of Products to Display","Aantal Producten Weer te Geven" -"Number of Uses","Aantal Gebruiken" -"Number of results","Aantal resultaten" -"Number of results (For the last time placed)","Aantal resultaten (Voor de laatste keer geplaatst)" -"OK","OK" -"OR","OF" -"Old Price:","Oude prijs" -"On Gesture","Op Gebaar" -"Option validation failed to add product to cart.","Optie bevestiging is er niet in geslaagd een product aan kar toe te voegen." -"Option values","Optie waarden" -"Option:","Optie:" -"Options","Opties" -"Options Control","Opties Controle" -"Options is required","Opties zijn benodigd" -"Our customer service is available 24/7. Call us at (555) 555-0123.","Onze klantenservice is 24 per dag beschikbaar. Bel ons op (555) 555-0123." -"Out of Stock","Niet voorradig" -"Out of stock","Uit voorraad" -"PM","PM" -"Page Title Separator","Pagina Titel Afscheider" -"Parent Category","Parent Categorie" -"Pending","In afwachting" -"Pending Reviews RSS","In Afwachting van Reviews RSS" -"Percentage","Percentage" -"Please add rows to option.","Voeg rijen toe aan optie." -"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","Wees voorzichtig aangezien er een pakket data formulier geladen wordt zodra u op de rij klikt en alle niet opgeslagen data zal verloren gaan." -"Please click on the Close Window button if it is not closed automatically.","Klik alstublieft op de Venster Sluiten knop als het niet automatisch wordt afgesloten." -"Please enter a new group name","Voer een nieuwe groepsnaam in" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Gelieve ""Catalogus URL Herschrijvingen"" en ""Productattributen"" in Systeem te vernieuwen -> Index Management" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Ververs alstublieft ""Catalogus URL herschrijvingen"" en ""Productattributen in Systeem -> Indexbeheer" -"Please refresh ""Product Attributes"" in System -> Index Management","Gelieve ""Productattributen"" in Systeem te vernieuwen -> Index Management" -"Please select a static block ...","Selecteer een statisch blok ..." -"Please select items.","Selecteer artikelen." -"Please select one or more attributes.","Selecteer een of meer attributen." -"Please select product(s).","Selecteer alstublieft product(en)." -"Please select products for attributes update","Selecteer alstublieft producten voor attributen update" -"Please set up merge date/time","Stel alstublieft het samenvoegen van datum/tijd in" -"Please set up merge date/time later then present date","Stel alstublieft de samenvoegdatum/tijd later dan de huidige datum in" -"Please specify date required option(s).","Specificeer alstublieft de benodige optie(s) voor de datum." -"Please specify the number of products, that will not be divided into subintervals.","Geef het aantal producten op, die niet in sub-intervallen zullen worden verdeeld." -"Please specify the product required option(s)","Specificeer alstublieft de benodige optie(s) voor het product." -"Please specify the product required option(s).","Specificeer alstublieft de benodige optie(s) voor de datum." -"Please specify the product\'s option(s).","Specificeer de product optie(s)." -"Please specify the product\'s required option(s).","Gelieve het artikel's benodigde optie(s) te specificeren." -"Please specify the quantity of product(s).","Specificeer alstublieft de hoeveelheid product(en)." -"Please specify time required option(s).","Specificeer alstublieft de benodigde optie(s) voor de tijd." -"Please wait...","Even geduld..." -"Position","Positie" -"Position in Layered Navigation","Positie in Gelaagde Navigatie" -"Position of attribute in layered navigation block","Positie van attribuut in gelaagd navigatieblok" -"Prev","Vorige" -"Previous","Vorige" -"Price","Prijs" -"Price Navigation Step Calculation","Prijs Navigatie Stap Berekening" -"Price Type","Prijstype" -"Price is not available","Prijs is niet beschikbaar" -"Price values for options should be specified in system base currency.","Prijswaarden voor opties dienen gespecificeerd te zijn in de basisvaluta van het systeem." -"Price:","Prijs:" -"Price: %s","Prijs: %s" -"Print This Page","Deze pagina afdrukken" -"Product","Product" -"Product API","Product API" -"Product Alerts","Product Waarschuwingen" -"Product Attribute","Productattribuut" -"Product Attributes","Productattributen" -"Product Categories","Product Categorieën" -"Product Description","Product Omschrijving" -"Product Extra Info","Product extra informatie" -"Product Flat Data","Product Platte Gegevens" -"Product ID","Product Identificatie" -"Product Image Placeholders","Product Afbeelding Plaatshouder" -"Product Image Watermarks","Product Afbeelding Watermerken" -"Product Images","Product Afbeeldingen" -"Product Images API","Productbeelden API" -"Product In Websites","Product in websites" -"Product Info Column","Product Informatie Kolom" -"Product Information","Productinformatie" -"Product Link Block Template","Productlink blok sjabloon" -"Product Link Inline Template","Productlink inline sjabloon" -"Product Listing Sort by","Sorteer Product Lijst op" -"Product Name","Productnaam" -"Product Prices","Productprijzen" -"Product Reviews","Productbeoordelingen" -"Product Tags","Productlabels" -"Product Tier Price API","Product niveau prijs API" -"Product Type","Product Type" -"Product URL Suffix","Product URL Achtervoegsel" -"Product View Extra Hint","Product bekijk extra hint" -"Product attribute sets API","Product attribuut zet API" -"Product attributes API","Product attributen API" -"Product collection expected.","Product collectie verwacht." -"Product is not loaded","Produkt is niet geladen" -"Product links API (related, cross sells, up sells)","Product links API (gerelateerd, kruisverkoop, omhoogverkoop)" -"Product types API","Product types API" -"Product with this combination of attributes already associated to configurable.","Product met deze combinatie van attributen is reeds geassocieerd met configureerbaar." -"Products","Producten" -"Products Comparison List","Productvergelijkingslijst" -"Products Information","Producteninformatie" -"Products Reviews","Productrecensies" -"Products Sitemap","Producten sitemap" -"Products only","Producten alleen" -"Products per Page on Grid Allowed Values","Producten per pagina op raamwerk toegestane waardes" -"Products per Page on Grid Default Value","Producten per Pagina op Rooster Standaard Waarde" -"Products per Page on List Allowed Values","Producten per Pagina op Lijst Toegestane Waardes" -"Products per Page on List Default Value","Producten per pagina op lijst standaardwaarde" -"Properties","Eigenschappen" -"Qty","Hoeveelheid" -"Qty Increments","Hoeveelheid Stappen" -"Qty Uses Decimals","Hoeveelheid Gebruikt Decimalen" -"Qty for Item\'s Status to Become Out of Stock","Hoeveelheid voor Status van Items die niet Op Voorraad Zijn" -"Qty:","Hoeveelheid:" -"Quantity","Hoeveelheid" -"Quick Create","Snel aanmaken" -"Quick Overview","Snel Overzicht" -"Quick simple product creation","Snel en eenvoudig een product aanmaken" -"Records for ""%s"" store found.","Gegevens over ""%s"" winkel gevonden." -"Redirect","Doorverwijzing" -"Redirect URL","Omleiding URL" -"Regular Price:","Normale prijs:" -"Related Products","Gerelateerde Producten" -"Remove","Verwijderen" -"Remove Product From Websites","Verwijder product van websites" -"Remove This Item","Verwijder Dit Item" -"Remove attribute from attribute set","Verwijder attribuut uit de attribuut reeks" -"Remove attribute set","Verwijder attributen reeks" -"Remove custom option","Verwijder de aangepaste optie" -"Remove group from attribute set","Verwijder groep uit de attributen reeks" -"Remove option","Verwijder optie" -"Remove product assignment","Verwijder product opdracht" -"Remove product image","Verwijder productbeeld" -"Remove product link","Verwijder product link" -"Remove value from custom option","Verwijder de waarde van de aangepaste optie" -"Rename existing group","Geef bestaande groep nieuwe naam" -"Rename group","Geef groep nieuwe naam" -"Reorganize EAV category structure to flat structure","Reorganiseer EAV categoriestructuur naar platte structuur" -"Reorganize EAV product structure to flat structure","Organiseer EAV product structuur naar een platte structuur" -"Reset","Opnieuw" -"Results","Resultaten" -"Results per page","Resultaten per pagina" -"Retrieve attribute data","Haal attribuut informatie op" -"Retrieve attribute list","Haal attributen lijst op" -"Retrieve attribute options","Haal attributen opties op" -"Retrieve categories tree","Ophalen categorieboom" -"Retrieve category attributes","Ophalen categorieattributen" -"Retrieve category data","Ophalen categoriedata" -"Retrieve hierarchical tree","Ophalen hiërarchische boom" -"Retrieve linked products","Haal gelinkte producten op" -"Retrieve list of assigned products","Ophalen lijst toegewezen producten" -"Retrieve list of option values","Ophalen lijst van optiewaarden" -"Retrieve list of product custom options","Ophalen lijst van aangepaste productopties" -"Retrieve one level of categories by website/store view/parent category","Haal een niveau van categorieën uit de website/winkel zicht/wortel categorie" -"Retrieve option value info","Ophalen optiewaarde info" -"Retrieve product","Haal product op" -"Retrieve product attribute sets","Ophalen productattributensets" -"Retrieve product image","Ophalen productbeeld" -"Retrieve product image list","Haal product afbeelding lijst op" -"Retrieve product image types","Haal product afbeelding types op" -"Retrieve product link type attributes","Ophalen productlink type attributen" -"Retrieve product link types","Ophalen productlink types" -"Retrieve product tier prices","Haal producten van dit niveau prijzen op" -"Retrieve product types","Ophalen producttypes" -"Retrieve products data","Haal product data op" -"Retrieve products list by filters","Ophalen productlijst op filters" -"Reviews","Reviews" -"Roll Over for preview","Beweeg uw muis erover heen voor een voorvertoning" -"Root","Root" -"SKU","SKU" -"SKU length should be %s characters maximum.","SKU lengte moet minimum %s karakters zijn." -"Save","Opslaan" -"Save Attribute","Attribuut opslaan" -"Save Attribute Set","Sla Attributen Set Op" -"Save Category","Categorie opslaan" -"Save Search","Sla Zoekactie Op" -"Save and Continue Edit","Opslaan en doorgaan met bewerken" -"Saved %d record(s)","%d archief(ven) opgeslagen" -"Scope","Reikwijdte" -"Scope must not be changed, because the attribute is used in configurable products.","Reikwijdte moet niet veranderd worden, omdat de attribuut gebruikt wordt door configureerbare producten." -"Search","Zoeken" -"Search Engine Optimizations","Zoekmachine optimalisaties" -"Search Information","Zoekinformatie" -"Search Query","Zoek Query" -"Search Term with such search query already exists.","Een zoekwoord met deze zoekvraag bestaat al." -"Search Weight","Zoek Gewicht" -"Searchable","Zoekbaar" -"See price before order confirmation.","Zie prijs voor bevestiging van bestelling." -"Select Category...","Selecteer categorie..." -"Select Configurable Attributes ","Selecteer Configureerbare Attributen" -"Select Product...","Selecteer Product..." -"Select type of option","Selecteer optietype" -"Select type options required values rows.","Selecteer optietype verplichte rijwaarden." -"Selected Product Types","Geselecteerde Product Types" -"Send Count","Aantal Versturen" -"Set Ascending Direction","Stel een Oplopende Directie in" -"Set Descending Direction","Stel een Aflopende Directie in" -"Set Name","Stel Naam in" -"Set Root Category for Store","Stel Basiscategorie voor Winkel in" -"Set root category for this store in the configuration","Stel de basiscategorie voor deze winkel in op de configuratie" -"Set special price","Stel aanbieding in" -"Set/Get current store view","Stel in/Haal op huidige winkel zicht" -"Settings","Instellingen" -"Share Facebook","Deel Facebook" -"Share on Facebook","Delen via Facebook" -"Share on Twitter","Delen via Twitter" -"Shop By","Shoppen op" -"Shopping Options","Winkel Opties" -"Show","Toon" -"Show Details","Laat Details zien" -"Show Tags","Labels tonen" -"Simple Product","Simpel Product" -"Site Map","Sitekaart" -"Sitemap","Sitemap" -"Skip import row, is not valid value ""%s"" for field ""%s""","Sla import rij over, geen geldige waarde ""% s"" voor veld ""% s""" -"Skip import row, required field ""%s"" for the new customer is not defined.","Sla import rij over, gevraagd veld ""%s"" voor nieuwe klant is onbekend." -"Skip import row, the value ""%s"" is invalid for field ""%s""","Sla import rij over, de waarde ""% s"" is ongeldig voor veld ""% s""" -"Skipping import row, required field ""%s"" for new products is not defined.","Het overslaan van import rij, verplicht veld ""%s"" voor nieuwe producten is niet gedefinieerd." -"Skipping import row, required field ""%s"" is not defined.","Sla import rij over, gevraagd veld ""%s"" is onbekend." -"Skipping import row, store ""%s"" field does not exist.","Sla import rij over, opslag ""% s"" veld bestaat niet." -"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Sla import rij over, waarde ""%s"" is ongeldig voor ""%s"" veld." -"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Sommige van de bewerkte produkten hebben onbekende SKU waarde. Vul in voor gebruik van deze producten." -"Some of the selected item options are not currently available.","Een deel van de geselecteerde item opties zijn momenteel niet beschikbaar." -"Sort By","Sorteren op" -"Sort Order","Sorteer Bestelling" -"Source Model","Bron model" -"Special Expires On: %s","Aanbieding Verloopt Op: %s" -"Special Price:","Speciale prijs:" -"Special Price: %s","Speciale Aanbieding: %s" -"Starting at:","Begint bij:" -"Static","Statisch" -"Static block and products","Statisch blok en producten" -"Static block only","Alleen statisch blok" -"Status","Status" -"Stock Availability","Voorraad beschikbaarheid" -"Store","Winkel" -"Store View","Aanblik winkel" -"Stretch","Periode" -"Subscribe to RSS Feed","Aanmelden voor de RSS feed" -"Super product attributes configuration","Super product attributen configuratie" -"Synonym For","Synoniem voor" -"System Properties","Systeemeigenschappen" -"Tag Name","Tag Naam" -"Tax","Belasting" -"Template","Sjabloon" -"Text","Tekst" -"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","De Flat Catalogus module heeft een limiet van %2\$d filterbare en/of sorteerbare attributen. Op dit moment zijn er %1\$d. Verminder het aantal filterbare/sorteerbare attributen om deze module te kunnen gebruiken" -"The From Date value should be less than or equal to the To Date value.","De waarde van de Begin Datum moet kleiner zijn dan of gelijk aan de waarde van de Eind Datum." -"The attribute code \'%s\' is reserved by system. Please try another attribute code","De attribuutcode \'%s\' is door het systeem gereserveerd. Probeer alsjeblieft een andere attribuutcode." -"The attribute model is not defined","Het attribuutmodel is niet gedefinieerd" -"The attribute set has been saved.","De attributenreeks is opgeslagen." -"The base directory to upload file is not specified.","De basisdirectory om bestand te uploaden is onbekend." -"The category has been deleted.","De categorie is verwijderd." -"The category has been saved.","De categorie is bewaard." -"The comparison list was cleared.","De vergelijkingslijst is gewist." -"The file '%s' for '%s' has an invalid extension","Het bestand '%' voor '%' heeft een ongeldige uitgang" -"The file '%s' you uploaded is larger than %s Megabytes allowed by server","Het bestand '%s' dat u heeft geüpload is groter dan de %s Megabyte toegestaan door de server" -"The file you uploaded is larger than %s Megabytes allowed by server","Het bestand dat u heeft geüpload is groter dan de %s Megabytes toegestaan door de server" -"The filters must be an array.","De filters moeten een array zijn." -"The image contents is not valid base64 data.","De inhoud van de afbeelding is geen geldige base64 data." -"The image is not specified.","De afbeelding is niet gespecificeerd." -"The model collection resource name is not defined.","De model collectie bronnaam is niet gedefinieerd." -"The product %s has been added to comparison list.","Het product %s is toegevoegd aan de vergelijkingslijst." -"The product %s has been removed from comparison list.","Het product %s is verwijderd van de vergelijkingslijst." -"The product attribute has been deleted.","Het productattribuut is verwijderd." -"The product attribute has been saved.","Het productattribuut is opgeslagen." -"The product has been created.","Het product is aangemaakt." -"The product has been deleted.","Het product is verwijderd." -"The product has been duplicated.","Het product is verdubbeld." -"The product has been saved.","Het product is opgeslagen." -"The product has required options","Het product heeft verplichte opties" -"The review has been deleted","De beoordeling is verwijderd" -"The review has been saved.","De beoordeling is opgeslagen." -"The review was removed by another user or does not exist.","De beoordeling werd verwijderd door een andere gebruiker of bestaat niet." -"The search was deleted.","De zoekactie werd verwijderd." -"The text is too long","De tekst is te lang" -"There are no %s available.","Er zijn geen %s beschikbaar." -"There are no customers for this alert","Er zijn geen klanten voor deze alert" -"There are no customers for this alert.","Er zijn geen klanten voor deze melding." -"There are no products matching the selection.","Er zijn geen producten die overeenkomen met de selectie." -"There was an error while request processing.","Er heeft zich een fout voorgedaan tijdens het verwerken van uw verzoek." -"This Attribute no longer exists","Dit Attribuut bestaat niet langer" -"This attribute cannot be deleted.","Dit attribuut kan niet verwijderd worden." -"This attribute cannot be edited.","Dit attribuut kan niet gewijzigd worden." -"This attribute cannot be updated.","Dit attribuut kan niet bijgewerkt worden." -"This attribute is used in configurable products.","Dit kenmerk wordt gebruikt in configureerbare producten." -"This attribute is used in configurable products. You cannot remove it from the attribute set.","Dit attribuut wordt gebruikt in configureerbare producten. U kunt het niet verwijderen uit de attributenreeks." -"This attribute no longer exists","Deze eigenschap bestaat niet meer" -"This attribute set no longer exists.","Deze attribuutset bestaat niet meer." -"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","Deze groep bevat attributen die gebruikt worden in configureerbare producten. Verplaats deze attributen naar een andere groep en probeer het opnieuw." -"This group contains system attributes. Please move system attributes to another group and try again.","Deze groep bevat systeemattributen. Verplaats de systeemattributen naar een andere groep en probeer het opnieuw." -"This is a required option","Dit is een verplichte optie" -"This product no longer exists.","Dit product bestaat niet meer." -"This search no longer exists.","Deze zoekactie bestaat niet langer." -"This setting will be applied when all prices in the specific price interval are equal.","Deze instelling wordt toegepast wanneer alle prijzen in de specifieke prijsinterval gelijk zijn." -"Tier Pricing","Niveau Prijsstelling" -"Tile","Tegel" -"Time Format","Tijdsformat" -"Title","Titel" -"To reindex the enabled product(s), the store or product must be specified","Om de ingeschakelde product(en) te herindexeren, moet de winkel of het product worden gespecificeerd" -"To see product price, add this item to your cart. You can always remove it later.","Om de product prijs te zien, voeg dit artikel toe aan uw winkelwagen. U kunt het later altijd nog verwijderen." -"Top/Left","Boven/Links" -"Top/Right","Top/Rechts" -"Total Qty Base Items","Totale Hoeveelheid Opgenomen Items" -"Total Qty Content Items","Totaal Aantal Artikelen" -"Total incl. Tax: %1$s","Totaal inclusief belasting: %1$s" -"Total of %d record(s) have been deleted.","Er zijn in totaal %d dossier(s) verwijderd" -"Total of %d record(s) have been updated.","Er zijn in totaal %d dossier(s) bijgewerkt" -"Total of %d record(s) were updated","Totaal van %d verslag(en) zijn bijgewerkt" -"Type","Type" -"URL Rewrite Management","URL Herschrijf Management" -"Unable to complete this request.","Niet in staat deze aanvraag te voltooien." -"Unable to find a search term to delete.","Niet in staat een zoekterm te vinden om te verwijderen." -"Unable to find an attribute to delete.","Niet instaat om een attribuut te vinden om te verwijderen." -"Unable to get the product ID.","Niet in staat om product ID op te halen." -"Unassigned Attributes","Niet Toegewezen Attributen" -"Unknown EAV indexer type ""%s"".","Onbekende EAV indexeertype ""%s""." -"Unknown attribute: %s.","Onbekend attribuut: %s." -"Unsupported product type ""%s"".","Niet ondersteund produkttype ""%s""." -"Up-sells","Up-sells" -"Update","Update" -"Update Attributes","Update Attributen" -"Update Tier Price","Update Prijs" -"Update assigned product","Update toegewezen product" -"Update attribute","Update attribuut" -"Update attributes","Update eigenschappen" -"Update category","Update categorie" -"Update custom option of product","Update de custom optie van het product" -"Update product","Update product" -"Update product image","Update product afbeelding" -"Update product link","Update product link" -"Update product tier prices","Update product niveau prijzen" -"Update value of custom option","Update waarde van aangepaste optie" -"Upload new product image ","Upload nieuwe productafbeelding" -"Use Canonical Link Meta Tag For Categories","Use Canonisch Link Meta Tag Voor Categorieën" -"Use Canonical Link Meta Tag For Products","Gebruik een Kanonieke Link Meta Label Voor Product" -"Use Categories Path for Product URLs","Gebruik Categorieën Pad voor Product URL's" -"Use Config Settings","Gebruik Configuratiesettings" -"Use Default Value","Standaardwaarde gebruiken" -"Use Flat Catalog Category","Gebruik Flat Catalogus Categorie" -"Use Flat Catalog Product","Gebruik Flat Catalogus Product" -"Use In Layered Navigation","Gebruik in Layered Navigatie" -"Use In Search Results Layered Navigation","Gebruik in Zoek Resultaten een Gelaagde Navigatie" -"Use JavaScript Calendar","Gebruik Javascript Kalender" -"Use Static URLs for Media Content in WYSIWYG for Catalog","Gebruik Vaste URL's voor Media Inhoud in WYSIWYG voor de Catalogus" -"Use To Create Configurable Product","Gebruik Om Configureerbaar Product Te Creëren" -"Use Tree Like Category Sitemap","Gebruik Boomnetwerk Als Categorie Sitemap" -"Use config","Gebruik config" -"Use default","Gebruik standaard" -"Use for Promo Rule Conditions","Gebruik voor Promotie Regels Voorwaarden" -"Use four-digit year format.","Gebruik 4-cijferig jaar formaat." -"Use in Advanced Search","Gebruik in Geavanceerd Zoeken" -"Use in Layered Navigation","Gebruik in Layered Navigation" -"Use in Layered Navigation
    (Can be used only with catalog input type 'Dropdown')","Gebruik in Layered Navigatie
    (Kan alleen gebruikt worden met catalogus inputtype 'Dropdown')" -"Use in Quick Search","Gebruik in Quick Search" -"Used for Sorting in Product Listing","Gebruikt voor Sortering in Product Listing" -"Used in Product Listing","Gebruik in Product Listing" -"Value for ""%s"" is invalid.","Waarde voor ""%s"" is ongeldig." -"Value for ""%s"" is invalid: %s","Waarde voor ""%s"" is ongeldig: %s" -"Varchar","Varlet" -"View Details","Details Bekijken" -"View as","Bekijk als" -"Virtual Product","Virtueel product" -"Visibility","Zichtbaarheid" -"Visible","Zichtbaar" -"Visible on Catalog Pages on Front-end","Zichtbaar op Catalogus Pagina's op Front-end" -"Visible on Product View Page on Front-end","Zichtbaar op de productaanblikpagina op het front-end" -"WYSIWYG Editor","WYSIWYG Editor" -"Watermark","Watermerk" -"Watermark Default Size","Watermerk Standaard Grootte" -"Watermark Opacity, Percent","Watermerk doorzichtigheid, percentage" -"Watermark Position","Watermerk positie" -"We Also Recommend","Ook Aanbevolen" -"Website","Website" -"Website Item Must be checked","Website artikel moet gecontroleerd worden" -"Website Store Must be checked","Webwinkel Moet gecheckt worden" -"Websites","Websites" -"What's this?","Wat is dit?" -"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Of u de ""All"" optie toont in de ""Show X Per Page"" dropdown." -"Will make search for the query above return results for this search.","Maakt zoektocht naar de query hierboven, geef resultaten voor deze zoekopdracht." -"Wrong BuyRequest instance in options group.","Verkeerde KoopVerzoek instantie in opties groep." -"Wrong configuration item instance in options group.","Verkeerde configuratie artikel in optiegroep." -"Wrong configuration item option instance in options group.","Verkeerde configuratie artikel optie in optiegroep." -"Wrong option instance type in options group.","Verkeerde optie instantie type in opties groep." -"Wrong option type to get group instance.","Verkeerde optie type om groep voorbeeld te krijgen." -"Wrong product instance type in options group.","Verkeerd productvoorbeeld type in optiegroep." -"Wrong product type filter specified","Verkeerd product type filter opgegeven" -"Wrong product type to extract configurable options.","Verkeerd producttype om configureerbare opties van af te nemen." -"Year Range","Jaar Range" -"Yes","Ja" -"You cannot remove system attribute from this set.","U kunt geen systeemattributen uit deze set verwijderen." -"You have no items to compare.","U heeft geen artikelen om te vergelijken." -"You may also be interested in the following product(s)","U heeft wellicht ook interesse in de volgende product(en):" -"Zoom In","Inzoomen" -"Zoom Out","Zoom Uit" -"and","en" -"and above","en hoger" -"categories","categorieën" -"each","ieder" -"ex. http://domain.com","bijv. http://domein.nl" -"leave blank if its not an image","Laat leeg als het geen afbeelding is" -"per page","per pagina" -"products","producten" -"px.","px." -"save","bewaar" -"select all","alle selecteren" -"unselect all","Onselecteer alles" -"x","x" diff --git a/app/locale/nl_NL/Mage_CatalogInventory.csv b/app/locale/nl_NL/Mage_CatalogInventory.csv deleted file mode 100644 index cc2aaa91c..000000000 --- a/app/locale/nl_NL/Mage_CatalogInventory.csv +++ /dev/null @@ -1,62 +0,0 @@ -"""%s"" is not available in the requested quantity. %s of the items will be backordered.","""%s"" is niet beschikbaar in gevraagde hoeveelheid. %s van de artikelen zullen terugbesteld worden." -"%s is available for purchase in increments of %s only.","%s is beschikbaar voor verkoop, doch enkel in groeitoename van %s." -"%s is not a correct comparsion method.","%s is geen correcte vergelijkingsmethode." -"Note that these settings are applicable to cart line items, not the whole cart.","Let op dat deze instellingen alleen van toepassing zijn op winkelwagen lijn producten, niet op de hele winkelwagen." -"Add Minimum Qty","Voeg minimumhoeveelheid toe" -"Allow Qty Below 0","Sta hoeveelheid minder dan 0 toe" -"Allow Qty Below 0 and Notify Customer","Sta hoeveelheid minder dan 0 toe en waarschuw klant" -"Automatically Return Credit Memo Item to Stock","Retourneer automatisch het krediet memo product aan de vooraad" -"Backorders","Nabestellingen" -"By Fixed value","Bij gefixeerde waarde" -"By Percentage","Bij percentage" -"Cannot specify product identifier for the order item.","Kan geen product identificeerder specificeren voor te bestellen product" -"Catalog Inventory","Catalogus voorraad" -"Decrease Stock When Order is Placed","Verminder voorraad wanneer bestelling is geplaatst" -"Display Out of Stock Products","Toon Producten die Niet op Voorraad Zijn" -"Display products availability in stock in the frontend","Geef producten in voorraad weer op de frontend" -"Enable Qty Increments","Sta groeitoename in hoeveelheid toe" -"In Stock","Op voorraad" -"Index Product Stock Status","Index product voorraad status" -"Inventory","Voorraad" -"Inventory API","Voorraad API" -"Inventory Section","Voorraad sectie" -"Manage Stock","Beheer voorraad" -"Maximum Qty Allowed in Shopping Cart","Maximale hoeveelheid toegestaan in winkelwagen" -"Minimum Qty","Minimale hoeveelheid" -"Minimum Qty Allowed in Shopping Cart","Minimale hoeveelheid toegestaan in winkelwagen" -"Multi update product stock data","Multi-update product voorraadgegevens" -"No Backorders","Geen nabestellingen" -"Not all products are available in the requested quantity","Niet alle producten zijn beschikbaar in de aangevraagde hoeveelheid" -"Notify for Quantity Below","Bericht bij hoeveelheid minder dan" -"Only %s left","Nog maar %s over" -"Only X left Threshold","Slechts X over drempel" -"Out of Stock","Niet op voorraad" -"Product Name","Productnaam" -"Product Stock Options","Product voorraad opties" -"Products will still be shown by direct product URLs.","Producten worden nog steeds getoond door direct product URL's." -"Qty","Qa" -"Qty Increments","Hoeveelheid groeitoename" -"Qty for Item's Status to Become Out of Stock","Aantal voor Artikelstatus wordt Niet op voorraad" -"Retrieve stock data","Verkrijg voorraad data" -"Retrieve stock data by product ids","Verkrijg voorraad data, gesorteerd op product IDs" -"Rule price","Regelprijs" -"Set Items' Status to be In Stock When Order is Cancelled","Stel product status in op 'op voorraad' wanneer bestelling is geannuleerd" -"Some of the products are currently out of stock.","Sommige van de producten zijn op dit moment niet op voorraad." -"Some of the products cannot be ordered in requested quantity.","Een aantal van de producten kan niet in de gevraagde hoeveelheid besteld worden" -"Some of the products cannot be ordered in the requested quantity.","Enkelen van de producten kunnen niet besteld worden in de aangevraagde hoeveelheid" -"Stock Options","Voorraadopties" -"Stock Status","Voorraadstatus" -"The maximum quantity allowed for purchase is %s.","Het maximale aantal dat kan worden gekocht is %s." -"The minimum quantity allowed for purchase is %s.","Het minimale aantal dat kan worden gekocht is %s." -"The requested quantity for ""%s"" is not available.","De gevraagde hoeveelheid voor ""%s"" is niet beschikbaar." -"The stock item for Product in option is not valid.","Het voorraadproduct voor product in opties is niet geldig." -"The stock item for Product is not valid.","Het voorraadproduct voor product is niet geldig." -"This product is available for purchase in increments of %s only.","Dit product is beschikbaar voor verkoop, doch enkel in groeitoenames van %s." -"This product is currently out of stock.","Dit product is op dit moment niet op voorraad." -"This product is not available in the requested quantity. %s of the items will be backordered.","Dit product is niet in de gevraagde hoeveelheid beschikbaar. % s van de artikelen worden nabesteld." -"To Fixed Value","Naar gefixeerde waarde" -"To Percentage","Naar percentage" -"Undefined product type.","Niet-gedefinieerd producttype" -"Update","wijziging" -"Update product stock data","Vernieuw product voorraad data" -"Update the Product","Vernieuw het product" diff --git a/app/locale/nl_NL/Mage_CatalogRule.csv b/app/locale/nl_NL/Mage_CatalogRule.csv deleted file mode 100644 index 75fea3162..000000000 --- a/app/locale/nl_NL/Mage_CatalogRule.csv +++ /dev/null @@ -1,64 +0,0 @@ -"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","%d catalogus prijs regels gebaseerd op ""%s"" attribuut zijn uitgeschakeld." -"Actions","Acties" -"Active","actief" -"Add New Rule","voeg nieuwe regel toe" -"An error occurred while deleting the rule. Please review the log and try again.","Er is een fout opgetreden tijdens het verwijderen van de regel. Herzie a.u.b. de log en probeer opnieuw." -"An error occurred while saving the rule data. Please review the log and try again.","Er is een fout opgetreden tijdens het opslaan van de regeldata. Herzie a.u.b. het log en probeer opnieuw." -"Apply","Toepassen" -"Apply Rules","Stel regels in" -"Attribute Set","Attributenset" -"By Fixed Amount","Door Vaste Hoeveelheid" -"By Percentage of the Original Price","Door Percentage van de Oorspronkelijke Prijs" -"Catalog","Catalogus" -"Catalog Price Rule","Catalogus prijs regel" -"Catalog Price Rules","Catalogus prijs regels" -"Category","Categorie" -"Conditions","Voorwaarden" -"Conditions (leave blank for all products)","Voorwaarden (laat leeg voor alle producten)" -"Conditions Combination","Voorwaardencombinaties" -"Customer Groups","Klantgroepen" -"Date Expire","Vervaldatum" -"Date From","Datum vanaf" -"Date Start","Startdatum" -"Date To","Datum tot" -"Description","Omschrijving" -"Discount Amount","Hoeveelheid Korting" -"Edit Rule","Bewerk regel" -"Edit Rule '%s'","Bewerk regel '%s'" -"Enable Discount to Subproducts","Schakel Korting op Deelproducten in" -"Expiration Date","vervaldatum" -"From Date","Vanaf datum" -"General Information","Algemene informatie" -"ID","ID" -"Inactive","Inactief" -"New Rule","Nieuwe regel" -"No","Nee" -"Options","Opties" -"Priority","Prioriteit" -"Product Attribute","Product attribuut" -"Promotions","Promoties" -"Rule Information","Regel informatie" -"Rule Name","Regel naam" -"Save and Apply","Sla op en stel in" -"Save and Continue Edit","Bewaar en Ga Door met Bewerking" -"Start Date","Startdatum" -"Status","Status" -"Stop Further Rules Processing","Stop verdere verwerking van regels" -"The rule has been deleted.","De regel is verwijderd" -"The rule has been saved.","De regel is opgeslagen." -"The rules have been applied.","De regels zijn ingesteld." -"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","Er zijn regels die zijn veranderd, maar niet werden toegepast. Alleen gebruikers met exclusieve toegang kunnen regels toepassen." -"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Er zijn regels welke veranderd zijn, maar niet ingesteld. Klik op 'stel regels in' om direct effect te zien in de catalogus." -"This rule no longer exists.","Deze regel bestaat niet langer" -"To Date","Naar datum" -"To Fixed Amount","Naar Vaste Hoeveelheid" -"To Percentage of the Original Price","Naar Percentage van de Oorspronkelijke Prijs" -"Type","type" -"Unable to apply rules.","Niet in staat om regels in te stellen" -"Unable to find a rule to delete.","Niet in staat om een regel te vinden om te verwijderen" -"Update Prices Using the Following Information","Update Prijzen Met behulp van de Volgende Informatie" -"Update product's %s %s: %s","Update producten %s %s: %s" -"Website","Website" -"Websites","Websites" -"Wrong rule specified.","Verkeerde regel gespecificeerd" -"Yes","ja" diff --git a/app/locale/nl_NL/Mage_CatalogSearch.csv b/app/locale/nl_NL/Mage_CatalogSearch.csv deleted file mode 100644 index e0d2e9d56..000000000 --- a/app/locale/nl_NL/Mage_CatalogSearch.csv +++ /dev/null @@ -1,49 +0,0 @@ -"%s and greater","%s en groter" -"%d item(s) were found using the following search criteria","%d product(en) zijn gevonden door de volgende zoekcriteria te gebruiken" -"Advanced Search","Geavanceerde zoekopdracht" -"Advanced Search Form","Geavanceerd zoekformulier" -"Advanced Search Result","Geavanceerde zoekrerultaten" -"All","Alle" -"Applies for ""Like"" search type only.","Geldt alleen voor ""vergelijkbare"" zoektypes." -"Apply Layered Navigation if Search Results are Less Than","Breng gelaagde navigatie aan als de zoekresultaten minder zijn dan" -"Attribute setting change related with Search Index. Please run Rebuild Search Index process.","Attribuut instelling verandert met zoekindex. Start a.u.b. het Herstel zoekindex proces." -"Autogenerated Site Map","Automatisch aangemaakte sitemap." -"Catalog Advanced Search","Geavanceerde catalogus zoekopdracht" -"Catalog Search","Catalogus zoekopdracht" -"Catalog Search Index","Catalogus zoekopdracht index" -"Don't see what you're looking for?","Ziet u niet wat u zoekt?" -"Enter ""0"" to enable layered navigation for any number of results.","Voer ""0"" in om gelaagde navigatie in te stellen voor elk aantal resultaten" -"Go","Ga" -"Go to Home Page","Ga naar homepage" -"Grid","Stramien" -"Home","Thuis" -"List","Lijst" -"Maximum Query Length","Maximum vraag lengte" -"Maximum Query Words Count","Maximum aantal vraagwoorden" -"Maximum Search query length is %s. Your query was cut.","De Maximale Zoekopdracht lengte is %s. Uw zoekopdracht is ingekort." -"Maximum words count is %1$s. In your search query was cut next part: %2$s.","Maximum aantal woorden is %1$s. In uw zoekterm was het volgende deel verwijderd: %2$s." -"Minimal Query Length","Minimale vraag lengte" -"Minimum Search query length is %s","Minimale lengte voor zoek vraag is %s." -"Modify your search","Bewerk uw zoekopdracht" -"No","Nee" -"No items were found using the following search criteria.","Er zijn geen producten gevonden toen de volgende zoekcriteria werden gebruikt" -"Please specify at least one search term.","Specificeer a.u.b. ten minste één zoekterm" -"Popular Search Terms","Populaire zoektermen" -"Quick Search Form","Snel zoekformulier" -"Rebuild Catalog product fulltext search index","Bouw catalogus product volledige tekst zoek index opnieuw" -"Relevance","Relevantie" -"Results","Resultaten" -"Search","Zoekopdracht" -"Search Settings","Zoek in instellingen" -"Search Terms","Zoek in voorwaarden" -"Search Type","Zoek in type" -"Search entire store here...","Zoek in de gehele winkel hier..." -"Search results for '%s'","Zoekresultaten voor '%s'" -"Search results for: '%s'","Zoekresultaten voor: '%s'" -"Search:","Zoek:" -"Specified date is invalid.","Gespecificeerde datum is ongeldig." -"Subscribe to Feed","Abonneer op Feed" -"There are no search terms available.","Er zijn geen zoektermen beschikbaar" -"Yes","ja" -"Your search returns no results.","Uw zoekopdracht heeft geen resultaten opgeleverd." -"up to %s","Tot aan %s" diff --git a/app/locale/nl_NL/Mage_Centinel.csv b/app/locale/nl_NL/Mage_Centinel.csv deleted file mode 100644 index 0ec255a7f..000000000 --- a/app/locale/nl_NL/Mage_Centinel.csv +++ /dev/null @@ -1,33 +0,0 @@ -"3D Secure CAVV","3D Veilige CAVV" -"3D Secure Card Validation","3D Secure Card Validation" -"3D Secure Cardholder Validation","3D Veilige Kaarthouder Verificatie" -"3D Secure Electronic Commerce Indicator","3D Veilige Electronische Commerce Indicator" -"3D Secure Verification Result","3D Veilig Verificatie Resultaat" -"3D Secure XID","3D Veilige XID" -"Card Issuer Liability","Kaart Uitgever Verplichting" -"Card Verification","Kaart Verificatie" -"Enrolled","Ingeschreven" -"Enrolled but Authentication Unavailable","Ingeschreven maar Authenticatie niet Beschikbaar" -"Failed","Mislukt" -"MasterCard SecureCode","MasterCard SecureCode" -"Merchant Liability","Winkelier Aansprakelijkheid" -"Not Enrolled","Niet Ingeschreven" -"Order cannot be placed.","Order kan niet geplaatst worden." -"Payment information error. Please start over.","Betalingsinformatie fout. Start a.u.b. overnieuw." -"Please continue with placing order.","Ga aub verder met plaatsen order." -"Please verify the card with the issuer bank before placing the order.","Verifieer de kaart a.u.b. met de uitgevende bank, voordat u de order plaatst." -"Please verify the card with the issuer bank:","Verifieer de kaart a.u.b. met de uitgevende bank:" -"Start/Reset Validation...","Begin/Herstel Validatie..." -"Successful","Succesvol" -"Successful attempt","Succesvolle poging" -"The card has failed verification with the issuer bank.","De kaart verificatie met de uitgevende bank is mislukt." -"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Er is verkeerde betalingsinformatie verzonden of de tijdslimiet is verlopen. Probeer het a.u.b. opnieuw." -"There has been wrong payment information submitted or time limit has expired. Please, try again.","Er is verkeerde betalingsinformatie verzonden of tijdslimiet is verlopen. Probeer a.u.b. opnieuw." -"This card has failed validation and cannot be used.","Deze kaart kon niet worden gevalideerd en is onbruikbaar." -"To ensure the security of your transactions","Om de veiligheid van uw transacties te verzekeren" -"Unable to complete","Niet afgemaakt" -"Validation failed.","Validatie mislukt." -"Verification Failed","Verificatie mislukt" -"Verification Successful","Verificatie geslaagd" -"Verification cannot be processed","Verificatie kan niet worden verwerkt" -"Verified by Visa","Geverifieerd door Visa" diff --git a/app/locale/nl_NL/Mage_Checkout.csv b/app/locale/nl_NL/Mage_Checkout.csv deleted file mode 100644 index 249db4ae9..000000000 --- a/app/locale/nl_NL/Mage_Checkout.csv +++ /dev/null @@ -1,360 +0,0 @@ -"%s was added to your shopping cart.","%s is aan uw mandje toegevoegd." -"%s was updated in your shopping cart.","%s is bijgewerkt in uw winkelmandje." -"* Required Fields","* Vereiste Velden" -"Add New Address","Adres Toevoegen" -"Add New Condition","Nieuwe voorwaarde toevoegen" -"Add coupon code for shopping cart","Vouchercode voor winkelmandje toevoegen" -"Add gift messages to shopping cart","Cadeauboodschappen aan winkelmandje toevoegen" -"Add product to shopping cart","Product aan winkelmandje toevoegen" -"Add product(s) to shopping cart","Product(en) aan winkelmandje toevoegen" -"Add to Cart","Voeg toe aan winkelwagen" -"Add to Compare","Toevoegen om te vergelijken" -"Add to Wishlist","Aan wenslijst toevoegen" -"Additional Product Info","Verdere productinformatie" -"Address","Adres" -"Address %s of %s","Adres %s van %s" -"After Adding a Product Redirect to Shopping Cart","Ga na het toevoegen van een product naar het mandje" -"Allow Guest Checkout","Gasten toestaan om uit te checken" -"Already registered?","Bent u al geregistreerd?" -"An error occurred in the process of payment","Er heeft zich een fout voorgedaan in het betalingsproces" -"An error occurred while deleting this condition.","Er heeft zich een fout voorgedaan bij het verwijderen van deze voorwaarde" -"An error occurred while saving this condition.","Er heeft zich een fout voorgedaan bij het opslaan van deze voorwaarde." -"Apply","Toepassen" -"Apply Coupon","Coupon gebruiken" -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","Weet u zeker dat u deze pagina wilt verlaten? U zal opnieuw de stappen voor het afrekenen moeten doorlopen." -"Are you sure you would like to remove this item from the shopping cart?","Weet u zeker dat u dit artikel uit uw mandje wilt verwijderen?" -"Back","Terug" -"Back to Billing Information","Terug naar de betalingsinformatie" -"Back to Select Addresses","Terug naar de adresselectie" -"Back to Shipping Information","Terug naar de verzendingsinformatie" -"Back to Shopping Cart","Terug naar het mandje" -"Based on your selection, you may be interested in the following items:","Gebaseerd op uw keuze, bent u misschien geïnteresseerd in de volgende items:" -"Billing Address","Factuuradres" -"Billing Information","Betalingsinformatie" -"Billing Information - %s","Betalingsinformatie - %s" -"Can not remove the item.","Kan product niet verwijderen." -"Can not save item.","Kan product niet opslaan." -"Cancel","Annuleren" -"Cancel Coupon","Coupon annuleren" -"Cannot add item to the shopping cart.","Het item kan niet aan het mandje toegevoegd worden." -"Cannot add the item to shopping cart","Het item kan niet aan het mandje toegevoegd worden." -"Cannot add the item to shopping cart.","Het item kan niet aan het mandje toegevoegd worden." -"Cannot apply the coupon code.","De couponcode kan niet gebruikt worden." -"Cannot configure product.","Kan product niet configureren." -"Cannot open the overview page","De overzichtspagina kan niet geopend worden" -"Cannot process the item.","Kan artikel niet verwerken." -"Cannot remove the item.","Het item kan niet verwijderd worden." -"Cannot update shopping cart.","Het mandje kan niet geupdate worden" -"Cannot update the item.","Kan artikel niet bijwerken." -"Card Verification Number Visual Reference","Visuele referentie kaartverificatienummer" -"Cart","Winkelwagen" -"Cart Product API","Mandje product API" -"Cart Subtotal:","Subtotaal mandje:" -"Change","Wijzigen" -"Change Billing Address","Verander Factuuradres" -"Checkbox Text","Tekst checkbox" -"Checkout","Betalen" -"Checkout Conditions","Betalingsvoorwaarden" -"Checkout Forms Extra","Afrekenen Extra Formulieren" -"Checkout Method","Betalingsmethode" -"Checkout Options","Betalingsopties" -"Checkout Progress Wrapper","Afrekening voortgang wrapper" -"Checkout Section","Betalingsdeel" -"Checkout Terms and Conditions","Algemene Voorwaarden Afrekenen" -"Checkout as Guest","Als een gast uitchecken" -"Checkout as a Guest or Register","Betalen als een gast of registreren" -"Checkout with Multiple Addresses","Met meerdere adressen uitchecken" -"City","Stad" -"Clear Shopping Cart","Maak winkelwagen leeg" -"Click here to print a copy of your order confirmation.","Klik hier om een kopie van uw bestellingsbevestiging te printen." -"Click here to continue shopping.","Klik here om door te gaan met winkelen." -"Close","Sluiten" -"Company","Bedrijf" -"Condition Name","Naam voorwaarde" -"Configurable Product Image","Instelbare productafbeelding" -"Configure Cart Item","Artikel in mandje configureren" -"Confirm Password","Bevestig Wachtwoord" -"Content","inhoud" -"Content Height","Hoogte inhoud" -"Content Height (css)","Hoogte inhoud (css)" -"Continue","Doorgaan" -"Continue Shopping","Doorgaan met shoppen" -"Continue to Billing Information","Doorgaan naar de betalingsinformatie" -"Continue to Review Your Order","Doorgaan om uw bestelling te controleren" -"Continue to Shipping Information","Doorgaan naar verzendingsinformatie" -"Country","Land" -"Coupon code ""%s"" is not valid.","Vouchercode ""%s"" is niet geldig." -"Coupon code ""%s"" was applied.","Vouchercode ""%s"" is toegepast." -"Coupon code was canceled.","De coupon code is geannuleerd" -"Create Billing Address","Betaaladres aanmaken" -"Create Shipping Address","Verzendadres aanmaken" -"Create an order from shopping cart","Maak een bestelling van het winkelmandje aan" -"Create shopping cart","Winkelmandje aanmaken" -"Customer Address is not valid.","Klantadres is niet geldig." -"Customer Information","Klantinformatie" -"Customer's information","Informatie van de klant" -"Data saving problem","Probleem met het opslaan van data" -"Default Billing","Standaard facturering" -"Default Shipping","Standaard verzending" -"Delete Condition","Verwijder voorwaarde" -"Details","Details" -"Disabled","Uitgeschakeld" -"Discount Codes","Kortingcodes" -"Display Cart Summary","Toon overzicht van winkelwagen" -"Display Shopping Cart Sidebar","Toon winkelwagen zijbalk" -"Display item quantities","Toon item hoeveelheden" -"Display number of items in cart","Toon het aantal items in de winkelwagen" -"Display number of items in wishlist","Aantal artikelen in verlanglijstje weergeven" -"Easy access to your order history and status","Makkelijke toegang tot uw bestelgeschiedenis en -status" -"Edit","Bewerk" -"Edit Address","Bewerk adres" -"Edit Billing Address","Bewerk factureeradres" -"Edit Condition","Voorwaarde aanpassen" -"Edit Items","Bewerk items" -"Edit Shipping Address","Bewerk verzendadres" -"Edit Terms and Conditions","Bewerk voorwaarden" -"Edit Your Cart","Bewerk uw winkelwagen" -"Edit item","Artikel bewerken" -"Edit item parameters","Parameters van artikel bewerken" -"Email Address","E-mail adres" -"Empty Cart","Winkelwagen Leegmaken" -"Empty Shopping Cart Content Before","Eerst Winkelwagen Inhoud Legen" -"Enable Onepage Checkout","Activeer Eenpagina afrekenen" -"Enable Terms and Conditions","Activeer voorwaarden." -"Enabled","Ingeschakeld" -"Enter a New Address","Voer een nieuw adres in" -"Enter your coupon code if you have one.","Voer uw kortingsbon in als u die heeft." -"Enter your destination to get a shipping estimate.","Voer uw bestemming in om een schatting van de verzendkosten te krijgen." -"Estimate","Schatting" -"Estimate Shipping and Tax","Schat de verzendkosten en btw" -"Excl. Tax","exclusief btw" -"Fast and easy check out","Snel en makkelijk afrekenen" -"Fax","Fax" -"Forgot an Item?","Een item vergeten?" -"Forgot your password?","Bent u uw wachtwoord vergeten?" -"Get a Quote","Verkrijg een prijsopgave" -"Get list of available payment methods","Lijst van beschikbare betalingsmethoden verkrijgen" -"Get list of available shipping methods","Lijst van beschikbare verzendingsmethoden verkrijgen" -"Get list of products in shopping cart","Lijst van producten in winkelmandje verkrijgen" -"Get terms and conditions","Voorwaarden verkrijgen" -"Get total prices for shopping cart","Totale prijs voor winkelmandje verkrijgen" -"Gift Message","Cadeauboodschap" -"Grand Total:","Alles bij elkaar:" -"Grouped Product Image","Gegroepeerde productafbeelding" -"HTML","HTML" -"ID","identiteit" -"Incl. Tax","inclusief btw" -"Invalid checkout type.","Ongeldig checkout-soort" -"Invalid data.","Ongeldige data." -"Invalid email address ""%s""","Ongeldig e-mailadres ""%s""" -"Invalid method: %s","Ongeldige methode: %s" -"Invalid shipping method.","Ongeldige verzendmethode." -"Item not found or already ordered","Item niet gevonden of al besteld" -"Item was removed successfully.","Product is succesvol verwijderd." -"Item was updated successfully.","Product is succesvol geüpdate." -"Items","Artikelen" -"Items After","Artikelen na" -"Items Before","Artikelen voor" -"Load customer quote error","Laad klant prijsopgave fout" -"Loading next step...","De volgende stap wordt geladen..." -"Login","log in" -"Login/Registration Before","Inloggen/Registratie voor" -"Manage Terms and Conditions","Beheer Algemene Voorwaarden" -"Maximum Display Recently Added Item(s)","Maximale weergave recentelijk toegevoegd(e) item(s)" -"Maximum qty allowed for Shipping to multiple addresses is %s","Maximale toegestane hoeveelheid voor verzending naar meerdere adressen is %s" -"Mini-cart promotion block","Mini-winkelwagen promotie blokkade" -"Minimum order amount is %s","Minimale bestelhoeveelheid is %s" -"Move","Verplaats" -"Move to Wishlist","ga naar verlanglijstje" -"Move to wishlist","Naar verlanglijst verplaatsen" -"Multishipping Checkout","Multiverzending afrekening" -"Multishipping Checkout Address (Any) Form","Adresserings (alle) formulier voor multiverzending afrekening" -"Multishipping Checkout Billing Address Creation","Aanmaken van multiverzending afrekening factureeradres" -"Multishipping Checkout Billing Address Edit Form","Bewerkingsformulier voor multiverzending afrekening factureeradres" -"Multishipping Checkout Billing Address Selection","Factureringsadres-selectie voor multiverzending afrekening" -"Multishipping Checkout Billing Information Step","Factureringsinformatie stap voor multiverzending afrekening" -"Multishipping Checkout Customer Address Edit Form","Klantadres bewerkingsformulier voor multiverzending afrekening" -"Multishipping Checkout Overview","Multiverzending afrekening overzicht" -"Multishipping Checkout Shipping Address Creation","Aanmaak van verzendingsadres voor multiverzending afrekening" -"Multishipping Checkout Shipping Address Edit Form","Verzendadres bewerkingsformulier voor multiverzending afrekening" -"Multishipping Checkout Shipping Address Selection","Verzendingsadres-selectie voor multiverzending afrekening" -"Multishipping Checkout Shipping Information Step","Verzendingsinformatie stap vooo multiverzending afrekening" -"Multishipping Checkout Success","Multiverzending afrekening gelukt" -"My Cart","Mijn winkelwagen" -"My Cart (%s item)","Mijn winkelwagen (%s item)" -"My Cart (%s items)","Mijn winkelwagen (%s items)" -"My Cart Extra Actions","Mijn wagen extra acties" -"My Cart Link","Link naar mijn winkelwagen" -"New Address","Nieuw Adres" -"New Condition","Nieuwe Voorwaarde" -"New Terms and Conditions","Nieuwe Algemene Voorwaarden" -"No Payment Methods","Geen betalingsmethoden" -"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","BESTELTOTAAL ZAL WORDEN GETOOND VOORDAT U DE BESTELLING VERSTUURD" -"One Page Checkout","Een-pagina afrekenen" -"One Page Checkout Failure","Een pagina-afrekening mislukt" -"One Page Checkout Overview","Afrekeningsoverzicht op een pagina" -"One Page Checkout Success","Een pagina-afrekening gelukt" -"One item of products do not have identifier or sku","Een item van de producten heeft geen identifier of sku" -"One item of products is not belong any of quote item","Een item van de producten behoort niet toe tot een van de offerte items" -"Order #","Bestelling #" -"Order Review","Overzicht bestelling" -"Order Success","Bestelling Succes" -"Order place error.","Fout bij het plaatsen van bestelling." -"Other Items in Your Order","Andere Artikelen in Uw Bestelling" -"Overview Items After","Overzicht artikelen na" -"Password","Wachtwoord" -"Payment Failed Email Reciever","Betaling Mislukt Email Ontvanger" -"Payment Failed Email Sender","Betaling Mislukt E-mail Verzender" -"Payment Failed Emails","Betaling Mislukt E-mails" -"Payment Failed Template","Betaling Mislukt Sjabloon" -"Payment Information","Betaalinformatie" -"Payment Method","Betaalwijze" -"Payment Methods After","Betaalmethode Achteraf" -"Payment Methods After Checkout Button","Betaalwijzen Na Kassa Knop" -"Payment Methods Before","Betaalmethode Vooraf" -"Payment Methods Before Checkout Button","Betalingsmethoden Voor Afrekenknop" -"Payment method information","Informatie betalingsmethode" -"Payment method is not defined","Betaalwijze is niet gedefinieerd" -"Payment methods in shopping cart","Betalingsmethoden in winkelmandje" -"Payment profile # %s: ""%s"".","Betalingsprofiel # %s: ""%s""." -"Place Order","Bestelling plaatsen" -"Please agree to all Terms and Conditions before placing the order.","Gelieve in te stemmen met de Algemene Voorwaarden voor het plaatsen van de bestelling." -"Please agree to all Terms and Conditions before placing the orders.","Gelieve in te stemmen met de Algemene Voorwaarden voor het plaatsen van de bestellingen." -"Please agree to all the terms and conditions before placing the order.","Gelieve in te stemmen met de algemene voorwaarden voor het plaatsen van de bestelling." -"Please check billing address information.","Gelieve de facturatieadresgegevens te controleren." -"Please check shipping address information.","Gelieve de gegevens van het afleveradres te controleren." -"Please check shipping addresses information.","Gelieve de gegevens van het afleveradres te controleren." -"Please choose to register or to checkout as a guest","Registreer of check uit als gast a.u.b." -"Please log in below:","Gelieve hieronder aanmelden:" -"Please select region, state or province","Selecteer alstublieft regio, staat of provincie" -"Please select shipping address for applicable items","Gelieve een verzendadres selecteren voor de toepasselijke artikelen" -"Please select shipping methods for all addresses","Gelieve verzendwijzen selecteren voor alle adressen" -"Please select valid payment method.","Gelieve een geldige betalingsmethode te kiezen." -"Please specify payment method.","Geef wijze van betaling aan" -"Please specify shipping method.","Gelieve een verzendingsmethode te specificeren." -"Please specify shipping methods for all addresses.","Gelieve verzendingsmethodes voor alle adressen te selecteren." -"Price","prijs" -"Proceed to Checkout","Doorgaan naar Kassa" -"Product","product" -"Product Name","Productnaam" -"Products","Producten" -"Qty","Hoeveelheid" -"Qty:","Hoeveelheid:" -"Quantity was recalculated from %d to %d","Kwantiteit is herberekend van %d naar %d" -"Quote Lifetime (days)","Prijsopgave Levensduur (dagen)" -"Quote item does not exist.","Prijsopgaaf artikel bestaat niet." -"Quote item is not found.","Prijsopgaaf artikel is niet gevonden." -"Recently added item(s)","Recent toegevoegde artikel(en)" -"Register","Registreer" -"Register and save time!","Registreer en bespaar tijd!" -"Register to Create an Account","Registreer om een Account aan te maken" -"Register with us for future convenience:","Registreer bij ons voor gemak in de toekomst:" -"Remove Item","Product verwijderen" -"Remove This Item","Verwijder Dit Artikel" -"Remove coupon code from shopping cart","Verwijder vouchercode uit winkelmandje" -"Remove item","Verwijder artikel" -"Remove product from shopping cart","Verwijder product uit winkelmandje" -"Remove product(s) from shopping cart","Verwijder product(en) uit winkelmandje" -"Require Customer To Be Logged In To Checkout","Verzoek Klant in te loggen voordat Afgerekend wordt." -"Retrieve information about shopping cart","Informatie over winkelmandje verkrijgen" -"Review Order","Herzien Bestelling" -"Review Order - %s","Herzien Bestelling - %s" -"SKU","Verhandelbare Eenheid" -"Sales","Verkoop" -"Save Condition","Bewaar Staat" -"Save in address book","Opslaan in adresboek" -"See price before order confirmation.","Zie prijs voor bevestiging van bestelling." -"Select Address","Kies Adres" -"Select Addresses","Selecteer Adressen" -"Select Shipping Method","Kies Verzendingsmethode" -"Select State/Province...","Selecteer Staat/Provincie..." -"Select a billing address from your address book or enter a new address.","Selecteer een factuuradres uit uw adresboek of voer een nieuw adres in." -"Select a shipping address from your address book or enter a new address.","Selecteer een verzendadres vanuit uw adresboek of geef een nieuw e-mailadres in" -"Send Payment Failed Email Copy Method","Stuur Betaling Mislukt E-mail Kopie Methode" -"Send Payment Failed Email Copy To","Stuur Betaling Mislukt E-mail Kopie Naar" -"Send To","Stuur Naar" -"Separate by "","".","Scheid door "",""." -"Set customer for shopping cart","Klant instellen voor winkelmandje" -"Set customer's addresses in shopping cart","Stel adres van klant in winkelmandje in" -"Set payment method","Stel betalingsmethode in" -"Set shipping method","Stel verzendingsmethode in" -"Ship to Multiple Addresses","Stuur naar Meerdere Adressen" -"Ship to different address","Verzend naar ander adres" -"Ship to this address","Verzend naar dit adres" -"Shipping Address","Ontvangst Adres" -"Shipping Information","Verzendinformatie" -"Shipping Method","Verzendwijze" -"Shipping Methods","Versturing Methodes" -"Shipping To","Verzenden naar" -"Shipping information","Verzendingsinformatie" -"Shipping method has not been selected yet","Verzendwijze is nog niet geselecteerd" -"Shipping methods in shopping cart","Verzendingsmethoden in winkelmandje" -"Shipping selection is not applicable.","Verzenden selectie is niet toepasbaar." -"Shopping Cart","Winkelmandje" -"Shopping Cart Form Before","Winkelwagen Formulier Voor" -"Shopping Cart Items After","Winkelwagen Producten Achteraf" -"Shopping Cart Items Before","Winkelwagen Producten Vooraf" -"Shopping Cart Sidebar","Winkelwagen Zijbalk" -"Shopping Cart Sidebar Extra Actions","Winkelmandje zijbalk extra acties" -"Shopping Cart is Empty","Winkelwagen is Leeg" -"Shopping cart ability to set coupon code","Mogelijk in winkelmandje om vouchercode in te stellen" -"Show Content as","Laat inhoud zien als" -"Some of the requested products are not available in the desired quantity.","Sommige van de gevraagde producten zijn niet beschikbaar in de gevraagde hoeveelheid." -"Some of the requested products are unavailable.","Sommige van de gewenste producten zijn niet beschikbaar." -"Some products quantities were recalculated because of quantity increment mismatch","Sommige productkwantiteiten zijn opnieuw berekend door wanverhouding kwantiteitstoename" -"Sorry, guest checkout is not enabled. Please try again or contact store owner.","Sorry, kassa is niet ingeschakeld voor gasten. Probeer het opnieuw of neem contact op met de eigenaar van de winkel." -"Sorry, no quotes are available for this order at this time.","Sorry, op dit moment zijn er geen offertes beschikbaar voor deze bestelling." -"State/Province","staat/provincie" -"Status","Status" -"Store View","winkelweergave" -"Street Address","Straat Adres" -"Street Address %s","Straatnaam en huisnummer %s" -"Submitting order information...","Doorgeven order informatie..." -"Subtotal","Subtotaal" -"Subtotal must exceed minimum order amount","Subtotaal moet groter zijn dan minimum bestelaantal" -"Telephone","telefoon" -"Terms and Conditions","Algemene voorwaarden" -"Terms and Conditions Information","Algemene voorwaarden Informatie" -"Terms and conditions","Voorwaarden" -"Text","Tekst" -"Thank you for your purchase!","Bedankt voor uw aankoop!" -"The condition has been deleted","De voorwaarde is verwijderd" -"The condition has been saved.","De voorwaarde is opgeslagen." -"The onepage checkout is disabled.","Afrekenen op een pagina is uitgeschakeld." -"The product could not be found.","Het product kan niet gevonden worden." -"The product does not exist.","Het product bestaat niet." -"There are %s items in your cart.","Er zijn %s artikelen in uw winkelmandje." -"There is 1 item in your cart.","Er is 1 artikel in uw winkelmandje." -"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","Er is al een klant geregistreerd met behulp van dit e-mailadres. Log in met dit e-mailadres of gebruik een ander e-mailadres om je account te registreren." -"There was an error processing your order. Please contact us or try again later.","Er is een fout opgetreden tijdens de verwerking van uw bestelling. Neem contact op met ons of probeer het later opnieuw." -"This condition no longer exists.","Deze voorwaarde bestaat niet meer." -"Total","totaal" -"Total for this address","Totaal voor dit adres" -"Unable to set Payment Method.","Niet mogelijk om de betaalwijze in te stellen." -"Unit Price","Prijs per stuk" -"Update","Updaten" -"Update Cart","Mandje bijwerken" -"Update Qty & Addresses","Bijwerken Aantal & Adressen" -"Update Shopping Cart","Winkelwagen bijwerken" -"Update Total","Totaal bijwerken" -"Update product quantities in shopping cart","Productkwantiteiten in winkelmandje bijwerken" -"Update product(s) quantities in shopping cart","Kwantiteit product(en) in winkelmandje bijwerken" -"Use Billing Address","Factuuradres gebruiken" -"VAT Number","BTW nummer" -"View Shopping Cart","Winkelwagen Bekijken" -"Visible items in minicart","Zichtbare producten in mini-winkelwagen" -"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","We verwerken uw order en u ontvangt binnenkort een email met de details van uw bestelling. Zodra uw bestelling is verzonden ontvangt u een andere email met een link om de zending te kunnen volgen." -"What's this?","Wat is dit?" -"What's this?","Wat is dit?" -"You have no items in your shopping cart.","Uw winkelwagen bevat geen artikelen." -"You will receive an order confirmation email with details of your order and a link to track its progress.","U ontvangt een email met de bevestiging van uw bestelling en een link om uw zending te volgen." -"Your Checkout Progress","Uw betalingsvoortgang" -"Your billing agreement # is: %s.","Uw factureringsovereenkomst # is: %s." -"Your order # is: %s.","Uw bestelling # is: %s." -"Your order cannot be completed at this time as there is no payment methods available for it.","Uw bestelling kan nu niet worden afgerond omdat er geen betaalmethoden beschikbaar zijn." -"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Uw bestelling kan nu niet worden afgerond omdat er geen verzendmethoden beschikbaar zijn. Maak de noodzakelijke veranderingen uw in afleveradres." -"Your order has been received.","Uw bestelling is ontvangen." -"Your order number is ","Uw bestelnummer is" -"Your recurring payment profiles:","Uw herbruikbare betalingsprofielen:" -"Zip/Postal Code","Postcode" -"ok","oké" diff --git a/app/locale/nl_NL/Mage_Cms.csv b/app/locale/nl_NL/Mage_Cms.csv deleted file mode 100644 index fd4a1199c..000000000 --- a/app/locale/nl_NL/Mage_Cms.csv +++ /dev/null @@ -1,123 +0,0 @@ -"A block identifier with the same properties already exists in the selected store.","Een blok identificeerder met dezelfde waarden bestaat reeds in de geselecteerde winkel." -"A directory with the same name already exists. Please try another folder name.","Een directory met dezelfde naam bestaat reeds. Probeer a.u.b. een andere mapnaam." -"A page URL key for specified store already exists.","Een pagina URL sleutel voor gespecificeerde winkel bestaat reeds." -"Action","Actie" -"Add New Block","Voeg nieuw blok toe." -"Add New Page","Voeg nieuwe pagina toe" -"All Countries","Alle landen" -"An error occurred while saving the page.","Er is een fout opgetreden tijdens het opslaan van de pagina." -"Anchor Custom Text","Anker aangepaste tekst" -"Anchor Custom Title","Anker aangepaste titel" -"Are you sure you want to delete current folder?","Weet u zeker dat u de huidige map wilt verwijderen?" -"Are you sure you want to delete the selected file?","Weet u zeker dat u het geselecteerde bestand wilt verwijderen?" -"Block","Blokkeer" -"Block Information","Blokkeerinformatie" -"Block Title","Blokkeertitel" -"CMS","CMS" -"CMS Content Wrapper","CMS inhouds wikkel" -"CMS Home Page","CMS thuispagina" -"CMS No Cookies Page","CMS geen cookies pagina" -"CMS No Route Page","CMS geen route pagina" -"CMS No-Route Page","CMS geen-route pagina" -"CMS Page","CMS pagina" -"CMS Page Link","CMS pagina link" -"CMS Page Link Block Template","CMS pagina link blokkeer thema" -"CMS Page Link Inline Template","CMS pagina link in lijn thema" -"CMS Pages (All)","CMS pagina's (alle)" -"CMS Static Block","CMS statisch blok" -"CMS Static Block Default Template","CMS statisch blok standaard thema" -"Cannot create new directory.","Kan geen nieuwe directory maken" -"Cannot delete directory %s.","Kan directory %s niet verwijderen." -"Cannot delete root directory %s.","Kan worteldirectory %s niet verwijderen." -"Cannot upload file.","Kan bestand niet uploaden" -"Collapse All","Vouw allen in" -"Content","Inhoud" -"Content Heading","Inhoud hoofd" -"Content Management","Inhoudsbeheer" -"Contents of a Static Block","Inhoud van een statisch blok" -"Create Folder...","Maak map..." -"Custom Design","Aangepast ontwerp" -"Custom Design From","Aangepast ontwerp formulier" -"Custom Design To","Aangepast ontwerp naar" -"Custom Layout","Aangepaste layout" -"Custom Layout Update XML","Aangepaste layout vernieuwing XML" -"Custom Theme","Aangepast thema" -"Customer Tax Class Information","Klant belasting klasse informatie" -"Date Created","datum gecreëerd." -"Delete Block","Verwijder blok" -"Delete File","Verwijder bestand" -"Delete Folder","Verwijder map" -"Delete Page","Verwijder pagina" -"Description","Omschrijving" -"Design","Ontwerp" -"Disabled","Uitgeschakeld" -"Disabled Completely","Compleet uitgeschakeld" -"Disabled by Default","Uitgeschakeld in standaardmodus" -"Edit Block","Bewerk blok" -"Edit Block '%s'","Bewerk blok '%s'" -"Edit Page","Bewerk pagina" -"Edit Page '%s'","Bewerk pagina '%s'" -"Enable WYSIWYG Editor","Stel WYSIWYG bewerker in" -"Enabled","Werkzaam gemaakt" -"Enabled by Default","Ingeschakeld door standaard" -"Expand All","Klap allen uit" -"General Information","Algemene informatie" -"Go to Home Page","Ga naar homepage" -"Home","Thuis" -"ID","ID" -"Identifier","Identificeerder" -"If empty, the Page Title will be used","Indien leeg, zal de paginatitel worden gebruikt" -"Images (%s)","Afbeeldingen (%s)" -"Insert File","Voeg bestand in" -"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","Onjuiste mapnaam. Gebruik a.u.b. alfanumerieke karakters, lage streepjes en streepjes." -"Keywords","sleutelwoorden" -"Last Modified","laatst gemodificeerd" -"Layout","layout" -"Layout Update XML","layout update XML" -"Link to a CMS Page","Link naar een CMS pagina" -"Manage Pages","beheer pagina's" -"Media Gallery","Media gallerij" -"Media Storage","Media opslag" -"Meta Data","Meta data" -"Meta Description","Meta omschrijving" -"Meta Keywords","Meta sleutelwoorden" -"New Block","Nieuw blok" -"New Folder Name:","Nieuwe mapnaam:" -"New Page","Nieuwe pagina" -"No files found","Geen bestanden gevonden" -"Page Information","Pagina informatie" -"Page Layout","Pagina layout" -"Page Status","Pagina status" -"Page Title","Pagina titel" -"Pages","Pagina's" -"Product Tax Class Information","Product belasting klasse informatie" -"Redirect to CMS-page if Cookies are Disabled","Leid om naar CMS-pagina indien cookies zijn uitgeschakeld" -"Relative to Website Base URL","Relatief aan website basis URL" -"Save Block","Sla blok op" -"Save Page","Sla pagina op" -"Save Process","Sla proces op" -"Select Block...","Selecteer blok..." -"Select Page...","Selecteer pagina..." -"Show Breadcrumbs for CMS Pages","Toon broodkruimels voor CMS pagina's" -"Show Notice if JavaScript is Disabled","Toon notitie indien JavaScript is aangezet" -"Static Blocks","Statische blokken" -"Status","Status" -"Storage Root","Opslag wortel" -"Store View","Winkelweergave" -"Template","Thema" -"The block has been deleted.","Het blok is verwijderd" -"The block has been saved.","Het blok is opgeslagen" -"The directory %s is not writable by server.","De directory%s is niet overschrijfbaar door de server." -"The page URL key cannot consist only of numbers.","De pagina-URL sleutel kan niet alleen uit nummers bestaan." -"The page URL key contains capital letters or disallowed symbols.","De pagina-URL sleutel bevat hoofdletters of niet-toegestane symbolen." -"The page has been deleted.","De pagina is verwijderd" -"The page has been saved.","De pagina is opgeslagen" -"The static block content cannot contain directive with its self.","De inhoud van het statische blok mag geen richtlijn met zichzelf bevatten." -"This block no longer exists.","Dit blok bestaat niet langer" -"This page no longer exists.","Deze pagina bestaat niet langer" -"Title","Titel" -"URL Key","URL sleutel" -"Unable to find a block to delete.","Niet in staat om een blok te vinden om te verwijderen" -"Unable to find a page to delete.","Niet in staat om een pagina te vinden om te verwijderen" -"WYSIWYG Options","WYSIWYG opties" -"px.","px." diff --git a/app/locale/nl_NL/Mage_Compiler.csv b/app/locale/nl_NL/Mage_Compiler.csv deleted file mode 100644 index bacd421e9..000000000 --- a/app/locale/nl_NL/Mage_Compiler.csv +++ /dev/null @@ -1,21 +0,0 @@ -"Collected Files Count","Aantal verzamelde bestanden" -"Compilation","Compilatie" -"Compilation State","Compilatiestaat" -"Compilation error","Compilatiefout" -"Compiled","Gecompileerd" -"Compiled Scopes Count","Aantal gecompileerde scopes" -"Compiler Status","Compiler status" -"Compiler include path is disabled.","Compiler include path is uitgeschakeld." -"Compiler include path is enabled.","Compiler include path is ingeschakeld." -"Directory ""%s"" must be writeable","Directory ""%s"" moet beschrijfbaar zijn" -"Disable","Uitschakelen" -"Disabled","Uitgeschakeld" -"Enable","Inschakelen" -"Enabled","Werkzaam gemaakt" -"File ""%s"" must be writeable","Bestand ""%s"" moet beschrijfbaar zijn" -"Not Compiled","Niet gecompileerd" -"Run Compilation Process","Compilatieproces runnen" -"Scopes Compilation Settings","Scopes compilatieinstellingen" -"System","Systeem" -"The compilation has completed.","De compilatie is voltooid." -"Tools","Hulpmiddelen" diff --git a/app/locale/nl_NL/Mage_Connect.csv b/app/locale/nl_NL/Mage_Connect.csv deleted file mode 100644 index 9ad018955..000000000 --- a/app/locale/nl_NL/Mage_Connect.csv +++ /dev/null @@ -1,58 +0,0 @@ -"1.5.0.0 & later","1.5.0.0 & later" -"Action","Actie" -"Add Author","Voeg auteur toe" -"Add Contents Path","Voeg inhoudspad toe" -"Add PHP Extension dependency","Voeg PHP extensie afhankelijkheid toe" -"Add Package dependency","Voeg pakket afhankelijkheid toe" -"Add files","Voeg bestanden toe" -"Authors","Auteurs" -"Channel","Kanaal" -"Contents","Inhoud" -"Create Extension Package","Creëer extensie pakket" -"Dependencies","Afhankelijkheden" -"Description","Omschrijving" -"Edit Extension","Bewerk extensie" -"Email","Email" -"Extension","Extensie" -"Extensions","Extensies" -"Failed to create the package.","Niet in staat om het pakket te creëren." -"Failed to load the package data.","Niet in staat om de pakketdata te laden." -"Failed to save the package.","Niet in staat om het pakket op te slaan." -"Files","Bestanden" -"Folder","Map" -"Ignore","Negeer" -"Include","Sluit in" -"License","Licentie" -"License URI","Licentie URL" -"Load Local Package","Laad lokaal pakket" -"Load local Package","Laad lokaal pakket" -"Magento Connect","Magento verbinden" -"Magento Connect Manager","Magento verbindingsmanager" -"Max","Maximaal" -"Maximum","Maximum" -"Min","Minimaal" -"Minimum","Minimum" -"Name","Naam" -"New Extension","Nieuwe extensie" -"PHP Version","PHP versie" -"Package","Pakket" -"Package Extensions","Pakket extensies" -"Package File Name","Pakket bestandsnaam" -"Package Info","Pakket info" -"Packages","Pakketten" -"Path","Pad" -"Pre-1.5.0.0","Pre-1.5.0.0" -"Release Info","Uitbrengingsinformatie" -"Remove","Verwijder" -"Save As...","Sla op als..." -"Save Data and Create Package","Sla data op en creëer pakket." -"Save package with custom package file name","Sla pakket op met aangepaste pakket bestandsnaam" -"Summary","Overzicht" -"Supported releases","Ondersteunde uitbrenging" -"System","Systeem" -"Target","Doel" -"The package %s data has been loaded.","De data van het pakket %s is geladen." -"The package data has been saved.","De data van het pakket is opgeslagen" -"There was a problem saving package data","Er is een probleem opgetreden bij het opslaan van de pakketdata" -"Type","type" -"User","Gebruiker" diff --git a/app/locale/nl_NL/Mage_Contacts.csv b/app/locale/nl_NL/Mage_Contacts.csv deleted file mode 100644 index baacd585b..000000000 --- a/app/locale/nl_NL/Mage_Contacts.csv +++ /dev/null @@ -1,19 +0,0 @@ -"* Required Fields","* Vereiste velden" -"Comment","Reactie" -"Contact Form","contactformulier" -"Contact Information","contactinformatie" -"Contact Us","contacteer ons" -"Contact Us Form","contacteer ons vanuit" -"Contacts","contacten" -"Contacts Section","contact sectie" -"Email","Email" -"Email Options","email opties" -"Email Sender","email afzender" -"Email Template","email thema" -"Enable Contact Us","schakel contacteer ons in" -"Name","Naam" -"Send Emails To","verstuur emails naar" -"Submit","Bevestig" -"Telephone","telefoon" -"Unable to submit your request. Please, try again later","Niet in staat om uw aanvraag in te dienen. Probeer a.u.b. later opnieuw." -"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","Uw vraag is verstuurd en zal zo spoedig mogelijk beantwoord worden. Dank u dat u contact met ons heeft opgenomen." diff --git a/app/locale/nl_NL/Mage_Core.csv b/app/locale/nl_NL/Mage_Core.csv deleted file mode 100644 index 45a6924b7..000000000 --- a/app/locale/nl_NL/Mage_Core.csv +++ /dev/null @@ -1,394 +0,0 @@ -"%s","%s" -"%s already exist.","%s bestaan al." -"%s already exists.","%s bestaat al." -"-- Please Select --","-- Selecteer a.u.b.--" -"Warning! When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","Waarschuwing! Als u CDN gebruikt, loopt JavaScript soms niet goed als CDN niet in uw subdomein is" -"Warning! When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).","Waarschuwing! Bij het gebruik van Store Code in URL's, kan in sommige gevallen het systeem niet goed werken als URL's zonder Store Codes worden gespecificeerd in de diensten van derden (bijv. PayPal etc.)." -"A category object is required for determining the product request path.","Een categorie object is vereist om product verzoek pad te bepalen." -"Add Block Names to Hints","Voeg Namen Blokkeren toe aan Hints" -"Add Secret Key to URLs","Voeg Geheime Toets toe aan URL's" -"Add Store Code to Urls","Voeg Opslag Code toe aan URL's" -"Admin","Admin" -"Admin Base URL","Admin Base URL" -"Admin User Emails","Admin Gebruiker E-mails" -"Advanced","Gevorderd" -"After selecting a new media storage location, press the Synchronize button - to transfer all media to that location. Media will not be available in the new - location until the synchronization process is complete.","Na het selecteren van een nieuwe media opslagplaats, druk op de synchronisatiekonp om alle media naar die locatie te brengen. Media is pas beschikbaar op de nieuwe locatie als het synchronisatieproces voltooid is." -"Allow Countries","Sta Landen toe" -"Allow Magento Backend to run in frame","Sta Magento Backend toe om in een venster te werken" -"Allow Magento Frontend to run in frame","Sta Magento Frontend toe om in een venster te werken" -"Allow Symlinks","Sta Symlinks toe" -"Allowed IPs (comma separated)","Toegestane IP's (gescheiden door komm's)" -"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Toegestane bestandstypes: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Niet alle browsers ondersteunen deze formaten!" -"Allows customers to stay logged in when switching between different stores.","Staat klanten toe ingelogd te blijven tijdens het switchen tussen verschillende winkels" -"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Alternatieve tekst voor volgende link in paginatie menu. Als het leeg is, wordt vaststaande afbeelding gebruikt." -"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Alternatieve tekst voor vorige link in paginatie menu. Als het leeg is, wordt vaststaande afbeelding gebruikt." -"An error occurred while saving. Please review the error log.","Er is een fout opgetreden tijden het opslaan. Bekijk a.u.b. het error log." -"Anchor Text for Next","Ankertekst voor Volgende" -"Anchor Text for Previous","Ankertekst voor Vorige" -"Anchor symbol (#) is not supported in request path","Ankersymbool (#) wordt niet ondersteund in gevraagd pad" -"Anchor symbol (#) is not supported in url rewrite suffix","Anker symbool (#) is niet ondersteund in URL herschrijvings toevoeging" -"Are you sure?","Weet u het zeker" -"Auto-redirect to Base URL","Stuur automatisch door naar basis URL" -"Back","terug" -"Backup Options","Backup opties" -"Base JavaScript URL","Basis JavaScript URL" -"Base Link URL","Basis link URL" -"Base Media URL","Basis media URL" -"Base Secure URL","Basis Veilige URL" -"Base Skin URL","Basis thema URL" -"Base URL","Basis URL" -"Base Unsecure URL","Basis Onveilige URL" -"Before modifying the store view code please make sure that it is not used in index.php.","Voordat u de winkelweergave bewerkt moet u er eerst zeker van zijn dat het niet gebruikt wordt in index.php." -"Before modifying the website code please make sure that it is not used in index.php.","Voordat u de code van de website bewerkt, moet u er eerst zeker van zijn dat het niet gebruikt wordt in index.php." -"Block with name ""%s"" already exists","Blokkering met de naam ""%s"" bestaat reeds." -"Browser Capabilities Detection","Browser capabiliteiten detectie" -"CSS Settings","CSS instellingen" -"Cache Storage Management","Cache opslag beheer" -"Cache storage may contain additional data. Are you sure that you want flush it?","Cache opslag kan toevoegende data bevatten. Weet u zeker dat u het wilt verwijderen?" -"Can not create invoice. Order was not found.","Kan geen rekening maken. Bestelling is niet gevonden." -"Can't retrieve request object","Kan gevraagde object niet vinden." -"Can\'t retrieve entity config: %s","Kan geen entiteit configuratie %s verkrijgen." -"Cancel","annuleer" -"Cannot complete this operation from non-admin area.","Kan deze operatie vanuit geen-admin gedeelte niet voltooien." -"Card type does not match credit card number.","Kaarttype komt niet overeen met het nummer van de credit card." -"Code","Code" -"Controller file was loaded but class does not exist","Beheerbestand is geladen, maar de klasse bestaat niet" -"Cookie Domain","cookie domein" -"Cookie Lifetime","cookie levensduur" -"Cookie Path","cookie pad" -"Cookie Restriction Mode","Cookie Restrictie Modus" -"Copyright","copyright" -"Core","Kern" -"Countries Options","landen opties" -"Country","Land" -"Create Store","creëer winkel" -"Create Store View","creëer winkelweergave" -"Create Website","creëer website" -"Credit card number does not match credit card type.","creditcardnummer komt niet overeen met creditcardtype" -"Current Package Name","huidige pakketnaam" -"Custom Admin Path","aangepast administratiepad" -"Custom Admin URL","Aangepaste Admin URL" -"Custom Design","Aangepast ontwerp" -"Custom Email 1","aangepaste Email 1" -"Custom Email 2","Aangepaste Email 2" -"Custom Variables","Aangepaste variabelen" -"Custom1 Contact Email","Klandizie1 Contact E-mail" -"Custom1 Contact Name","Klandizie1 Contact Naam" -"Custom2 Contact Email","Klandizie2 Contact E-mail" -"Custom2 Contact Name","Klandizie2 Contact Naam" -"Customer Support","Klantenservice" -"Dashboard","Dashboard" -"Date From","Datum vanaf" -"Date To","Datum tot" -"Date/time format ""%s"" is not supported.","Datum/Tijd formaat ""%s"" wordt niet ondersteund." -"Debug","Debug" -"Default","standaard" -"Default Country","Standaardland" -"Default Description","Standaardomschrijving" -"Default Keywords","Standaard sleutelwoorden" -"Default No-route URL","Standaard geen-route URL" -"Default Pages","Standaard pagina's" -"Default Robots","Standaard robots" -"Default Store","Standaard winkel" -"Default Store View","Standaard winkelweergave" -"Default Title","Standaardtitel" -"Default Web URL","Standaard web URL" -"Delete","Verwijder" -"Delete Store","Standaard winkel" -"Delete Store View","Verwijder winkelweergave" -"Delete Website","Verwijder website" -"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","Het verwijderen van %1$s zal niet de informatie verwijderen die geassocieerd wordt met %1$s (b.v. categorieën, producten, etc.) maar de %1$s data zal niet worden hersteld. Wij suggesteren dat u een backup maakt van de database voordat u de %1$s verwijdert." -"Design","Ontwerp" -"Design Change","Ontwerp verandering" -"Developer","Ontwerper" -"Developer Client Restrictions","Ontwerper klant restricties" -"Disable Email Communications","zet email communicaties uit" -"Disable Modules Output","Zet modules output uit" -"Display Demo Store Notice","Toon demo winkel notitie" -"Duplicate Of Template Name","Dubbele template naam" -"Edit Design Change","Bewerk ontwerp verandering" -"Edit Store","Bewerk winkel" -"Edit Store View","Bewerk winkelweergave" -"Edit Website","Bewerk website" -"Empty identifier field name","Lege identificeerder veldnaam" -"Empty main table name","Lege basis tabel naam." -"Enable Charts","Stel lijsten in" -"Enabled","Werkzaam gemaakt" -"Enabled for Admin","Ingesteld voor administrateur" -"Enabled for Frontend","Ingesteld voor voorkant" -"Environment Update Time","Milieu update tijd" -"Error in file: ""%s"" - %s","Fout in bestand ""%s""- %s" -"European Union Countries","EU-landen" -"Exceptions Log File Name","Uitzonderingen log bestand naam" -"Favicon Icon","Favicon Icoon" -"File %s does not exist","Bestand %s bestaat niet" -"File %s is not readable","Bestand %s is niet leesbaar" -"File not found","Bestand niet gevonden" -"File system","Bestandssysteem" -"File with an extension ""%value%"" is protected and cannot be uploaded","Bestand met de uitgang ""%value%"" is beschermd en kan niet worden geüpload." -"First Day of Week","Eerste dag van de week" -"Flush Cache Storage","Verwijder cache opslag" -"Flush Magento Cache","Leeg Magento Cache" -"Footer","Voet" -"Forgot Password Email Sender","Wachtwoord vergeten e-mailverzender" -"Forgot Password Email Template","Vergeten wachtwoord email thema" -"General","Algemeen" -"General Contact","Algemeen contact" -"General Contact Email","Algemeen Contact E-mail" -"General Contact Name","Algemeen Contact Naam" -"General Settings","Algemene instellingen" -"Get info about current Magento installation","Ontvang informatie over de huidige Magento installatie" -"Global","Wereldwijd" -"HTML Head","HTML head" -"HTML tags are not allowed","HTML tags zijn niet toegestaan" -"Header","Header" -"Host","Host" -"How many links to display at once.","Hoeveel links in één keer weer te geven." -"ID Path for Specified Store","ID Pad voor Gespecificeerde Winkel" -"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","Als de huidige frame positie de uiterste pagina's niet dekt wordt een een link aangemaakt tot aan de huidige positie plus/minus deze waarde." -"Incorrect credit card expiration date.","Onjuiste creditcard vervaldatum." -"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" niet gevonden in de input type lijst." -"Invalid URL '%value%'.","Ongeldige URL '%waarde%'." -"Invalid base url type","Ongeldig basis url type" -"Invalid block name to set child %s: %s","Ongeldig blok naam om child %s op te zetten: %s" -"Invalid block type: %s","Ongeldig bloktype: %s" -"Invalid block: %s","Ongeldig blok: %s" -"Invalid connection","ongeldige verbinding" -"Invalid date","Invalid date" -"Invalid layout update handle","Ongeldige layout update handle" -"Invalid messages storage ""%s"" for layout messages initialization","Ongeldige berichten opgeslagen ""%s"" voor layout bericht initialisatie" -"Invalid query","Ongeldige zoekopdracht" -"Invalid transactional email code: %s","Ongeldige transactionele e-mail code: %s" -"Invalid website\'s configuration path: %s","Ongeldig website configuratie pad: %s" -"JavaScript Settings","JavaScript Instellingen" -"Layout","layout" -"Leave empty for access from any location.","Laat leeg voor toegang vanaf iedere locatie." -"List of stores","Lijst met winkels" -"Locale","Lokaal" -"Locale Options","Lokale Opties" -"Log Settings","Log Instellingen" -"Logging from Mage::log(). File is located in {{base_dir}}/var/log","Logging van Mage::log(). Bestand bevindt zich in {{base_dir}}/var/log" -"Logging from Mage::logException(). File is located in {{base_dir}}/var/log","Logging van Mage::logException(). Bestand bevindt zich in {{base_dir}}/var/log" -"Login is Case Sensitive","Inloggen is hoofdlettergevoelig" -"Logo Image","Logo afbeelding" -"Logo Image Alt","Logo afbeelding Alt" -"Logo Image Src","Logo afbeeldingsbestand" -"Magento info","magento informatie" -"Magento info API","Magento informatie API" -"Mail Sending Settings","Email verstuur instellingen" -"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Verzeker u ervan dat de basis-URL eindigt met '/' (schuine streep), bijvoorbeeld http://yourdomain/magento/" -"Manage Stores","Beheer winkels" -"Match expressions in the same order as displayed in the configuration.","Stem expressies overeen in dezelfde volgorde als weergegeven in de configuratie" -"Media Storage","Media Opslag" -"Merge CSS Files","CSS Bestanden Samenvoegen" -"Merge JavaScript Files","Voeg JavaScript bestanden samen" -"Miscellaneous HTML","Gemengde HTML" -"Miscellaneous Scripts","Veelsoortige Scripts" -"Model collection resource name is not defined.","Model collectie bronnaam is niet gedefinieerd." -"Module ""%1$s"" cannot depend on ""%2$s"".","Module ""%$s"" kan niet afhankelijk zijn van ""%2$s""." -"Module ""%1$s"" requires module ""%2$s"".","Module ""%1$s"" heeft module ""%2$s"" nodig." -"Name","Naam" -"New Design Change","Nieuwe Ontwerpverandering" -"New Store","Nieuwe Winkel" -"New Store View","Nieuwe winkelweergave" -"New Website","Nieuwe Website" -"No","Nee" -"Offloader header","Ontlader koptekst" -"PHP SOAP extension is required.","PHP SOAP extensie is vereist." -"Package","Pakket" -"Pagination","Paginanummering" -"Pagination Frame","Paginatie Frame" -"Pagination Frame Skip","Paginatie Frame Skip" -"Parent directory does not exist: %s","Hoofd pad bestaat niet: %s" -"Path ""%value%"" is not available and cannot be used.","Pad ""%value%"" is niet beschikbaar en kan niet gebruikt worden." -"Path ""%value%"" is protected and cannot be used.","Pad ""%value%"" is beschermd en kan niet worden gebruikt." -"Path ""%value%"" may not include parent directory traversal (""../"", ""..\\).""","Pad ""%value%"" mag geen parent directory traversal bevatten (""../"", ""..\\).""" -"Please define flag code.","Definieer a.u.b. de vlagcode" -"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Voer 6 of meer karakters in a.u.b. Spaties worden genegeerd." -"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Geef 7 of meer karakters in. Wachtwoord moet zowel cijfers als letters bevatten." -"Please enter a number 0 or greater in this field.","Voer een nummer groter dan 0 in." -"Please enter a number 1 or greater in this field.","Voer aub een nummer 1 of hoger in dit veld in." -"Please enter a number greater than 0 in this field.","Voer a.u.b. een nummer groter dan 0 in dit veld." -"Please enter a number lower than 100.","Voer a.u.b. een nummer beneden de 100 in dit veld." -"Please enter a valid $ amount. For example $100.00.","Voer a.u.b. een geldig € hoeveelheid in. Bijvoorbeeld €100,00." -"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Voer a.u.b. een geldige URL sleutel in. Bijvoorbeeld ""voorbeeld-pagina"", ""voorbeeld-pagina.html"" of ""eenanderniveau/voorbeeld-pagina""." -"Please enter a valid URL. For example http://www.example.com or www.example.com","Voer a.u.b. een geldige YRL in. Bijvoorbeeld http://www.voorbeeld.com of www.voorbeeld.com" -"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Voer een geldige URL in. Protocol is vereist (http://, https:// of ftp://)" -"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Voer a.u.b. een geldige XML-identificeerder in. Bijvoorbeeld iets_1, blok5, id-4." -"Please enter a valid credit card number.","Voer a.u.b. een geldig creditcardnummer in." -"Please enter a valid credit card verification number.","Voer a.u.b. een geldig creditcard verificatienummer in." -"Please enter a valid date between %s and %s","Voer a.u.b. een geldige datum in tussen %s en %s" -"Please enter a valid date equal to or greater than %s","Voer een geldige datum in groter dan of gelijk aan %s" -"Please enter a valid date less than or equal to %s","Voer a.u.b. een geldige datum in die minder of gelijk aan %s is." -"Please enter a valid date.","Voer a.u.b. een geldige datum in." -"Please enter a valid day (1-%d).","Voer a.u.b. een geldige dag in (1-%d)." -"Please enter a valid email address. For example johndoe@domain.com.","Voer a.u.b. een geldig e-mailadres in. Bijvoorbeeld johndoe@domain.com." -"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Voer een geldig faxnummer in. Bijvoorbeeld (123) 456-7890 of 123-456-7890." -"Please enter a valid full date","Voer a.u.b. een geldige, volledige datum in" -"Please enter a valid month (1-12).","Voer een geldige maand in (1-12)." -"Please enter a valid number in this field.","Voer in dit veld een geldig nummer in." -"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Voer een geldig telefoonnummer in. Bijvoorbeeld (123) 456-7890 of 123-456-7890." -"Please enter a valid social security number. For example 123-45-6789.","Voer a.u.b. een geldig BSN-nummer in. Bijvoorbeeld 123456789." -"Please enter a valid year (1900-%d).","Voer een geldig jaar in (1900-%d)." -"Please enter a valid zip code.","Voer een geldige postcode in." -"Please enter a valid zip code. For example 90602 or 90602-1234.","Voer a.u.b. een geldige postcode in. Bijvoorbeeld 1234 AB." -"Please enter issue number or start date for switch/solo card type.","Voer uitgavenummer in of start datum voor switch/solo kaarttype." -"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Voer een geldige CSS-lengte in. Bijvoorbeeld 100px, 77pt, 20em, .5ex of 50%" -"Please make sure your passwords match.","Let er alstublieft op dat de wachtwoorden overeenkomen." -"Please select State/Province.","Selecteer Staat/Provincie." -"Please select a file","Selecteer een bestand" -"Please select an option.","Selecteer een optie." -"Please select one of the above options.","Selecteer alstublieft een van de bovenstaande opties." -"Please select one of the options.","Selecteer alstublieft een van de opties." -"Please set available and/or protected paths list(s) before validation.","Stel beschikbare en/of beschermde pad lijst(en) in voor validatie." -"Please specify either a category or a product, or both.","Specificeerd a.u.b. een categorie of een product, of beide." -"Please use letters only (a-z or A-Z) in this field.","Gebruik a.u.b. alleen letters (a-z of A-Z) in dit veld." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Gebruik alleen getallen in dit veld. Vermijd spaties of andere tekens zoals punten of komma's." -"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Gebruik alleen letters (a-z of A-Z) of nummers (0-9) in dit veld. Spaties en andere karakters zijn niet toegestaan." -"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Gebruikt alleen letters (a-z of A-Z), getallen (0-9), spaties of # in dit veld." -"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Gelieve alleen de letters (a-z of A-Z), nummers (0-9) en/of laag streepje(_) in dit veld te gebruiken, het eerste karakter moet een letter zijn." -"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Gebruikt alleen letters (a-z of A-Z), getallen (0-9) of underscore(_) in dit veld, eerste teken moet een letter zijn." -"Please use only visible characters and spaces.","Gebruik alleen zichtbare karakters en spaties." -"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Gebruik dit datumformat: dd/mm/jjjj. Bijvoorbeeld 17/03/2006 voor 17 maart 2006." -"Please wait, loading...","Even geduld alstublieft, bezig met laden..." -"Polls","Peilingen" -"Port (25)","Poort (25)" -"Profiler","Profiler" -"Recovery Link Expiration Period (days)","Herstel Link Verloop Periode (dagen)" -"Request Path for Specified Store","Gevraagd Pad voor Gespecificeerde Winkel" -"Request path length exceeds allowed %s symbols.","Verzoek path lengte is groter dan de toegestane ​​%s symbolen." -"Requested file may not include parent directory traversal (""../"", ""..\\ notation)""","Opgevraagd bestand mag geen ouder-directory traverse (""../"", ""..\\ notatie)"" bevatten" -"Requested invalid store ""%s""","Gevraagde ongeldige winkel ""%s""" -"Resource is not set.","Bron is niet ingesteld" -"Retrieve info about current Magento installation","Haal informatie op over de huidige Magento installatie" -"Retrieve store data","Winkeldata ophalen" -"Retrieve store list","Winkellijst ophalen" -"Return-Path Email","Return-Pad E-mail" -"Root Category","Wortelcategorie" -"Sales Representative","Verkoopvertegenwoordiger" -"Sales Representative Contact Email","Handelsvertegenwoordiger Contact E-mail" -"Sales Representative Contact Name","Handelsvertegenwoordiger Contact Naam" -"Save","Opslaan" -"Save Store","Bewaar Winkel" -"Save Store View","Bewaar Winkel View" -"Save Website","Sla website op" -"Search Engines Optimization","Zoekmachine Optimalisatie" -"Secure","Veilig" -"Security","Beveiliging" -"Select Date","Selecteer Datum" -"Select Media Database","Selecteer media database" -"Sender Email","Afzender Email" -"Sender Name","Naam Afzender" -"Services","Diensten" -"Session Cookie Management","Sessie cookie beheer" -"Session Lifetime (seconds)","Sessie duur (secondes)" -"Session Validation Settings","Sessie validatie-instellingen" -"Set Return-Path","Geef het return-path op" -"Set as Default","Stel in als Standaard" -"Skin (Images / CSS)","Skin (Afbeeldingen / CSS)" -"Small Logo Image Src","Klein Logo Afbeelding Bron" -"Sort Order","Sorteer Bestelling" -"Specified date/time ""%1$s"" do not match format ""%2$s"".","De gespecificeerde datum/tijd ""%1$s"" komt niet overeen met formaat ""%2$s""." -"Start date cannot be greater than end date.","Begin datum kan niet later zijn dan eind datum." -"Startup Page","Startpagina" -"Status","Status" -"Storage Configuration for Media","Opslag Configuratie voor Media" -"Store","Winkel" -"Store API","Winkel API" -"Store Contact Address","Winkel contactadres" -"Store Contact Information","Winkel contactinformatie" -"Store Contact Telephone","Winkel contact telefoon" -"Store Email Addresses","Winkel email adressen" -"Store Information","Winkel Informatie" -"Store Name","Winkel Naam" -"Store View","Winkelweergave" -"Store View Information","Winkel bekijk informatie" -"Store View Name","Zie Winkel Naam" -"Store view doesn't exist","Winkelweergave bestaat niet" -"Store with the same code","Winkel met zelfde code" -"System","Systeem" -"System Log File Name","Systeem log bestandsnaam" -"Template Path Hints","Sjabloon Pad Hints" -"Template Settings","Thema instellingen" -"Template Variables","Sjabloon Variabelen" -"Templates","Sjablonen" -"Text length does not satisfy specified text range.","Tekst lengte voldoet niet aan de vereiste tekstgebiedsvoorwaarden." -"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","De %s die u invoerde is onjuist. Verzeker u er a.u.b. van dat het geschreven is in ""http://domein.com/"" formaat." -"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value." -"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","De winkelcode mag alleen letters (a-z), nummers (0-9) en lage streepjes bevatten (_). Het eerste teken moet een letter zijn" -"The store does not exist","De winkel bestaat niet" -"The store has been deleted.","De winkel is verwijderd." -"The store has been saved.","De winkel is opgeslagen" -"The store view has been deleted.","Het winkelzicht is verwijderd." -"The store view has been saved","De winkelweergave is opgeslagen." -"The template Name must not be empty.","De Sjabloon Naam mag niet leeg zijn." -"The value is not within the specified range.","De waarde ligt niet in het toegestane gebied." -"The website does not exist.","De website bestaat niet." -"The website has been deleted.","De website is verwijderd." -"The website has been saved.","De website is opgeslagen." -"Themes","Thema's" -"This category and all its child elements","Deze categorie en alle onderelementen" -"This category and its child categories only","Deze categorie en de categorieën daarbinnen alleen" -"This category and its products only","Alleen deze categorie en haar producten" -"This category only","Alleen deze categorie" -"This date is a required value.","Deze datum is een vereiste waarde" -"This is a required field.","Dit is een verplicht veld." -"This store cannot be deleted.","De winkel kan niet verwijderd worden." -"This store view cannot be deleted.","Deze winkel kan niet verwijderd worden." -"This website cannot be deleted.","Deze website kan niet verwijderd worden." -"This will be displayed just before body closing tag.","Deze zullen worden vertoond, juist voor de body sluit tag." -"This will be included before head closing tag in page HTML.","Dit zal worden ingevoegd voor de sluitingstag in de head van de HTML." -"Timezone","Tijdzone" -"Title Prefix","Titel vooraf" -"Title Suffix","Titel" -"Transactional Emails","Transactionele Emails" -"Translate Inline","Vertaal in lijn" -"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Vertalingen, blokken en andere uitvoer zouden uitgeschakeld moeten zijn voor zowel front-end en administrator inline vertalingen." -"Translations","Vertalingen" -"Two and more slashes together are not permitted in request path","Twee of meer schuine strepen zijn niet toegestaan in gevraagde pad." -"Two and more slashes together are not permitted in url rewrite suffix","Twee of meer schuine strepen zijn niet toegestaan in URL herschrijvings navoeging" -"Unable to create directory: %s","Niet in staat om directory %s te maken" -"Unable to delete store view. Please, try again later.","Niet instaat om het winkelzicht te verwijderen. Probeer het later nogmaals." -"Unable to delete store. Please, try again later.","Kan de winkel niet verwijderen. Probeer het later nog eens a.u.b." -"Unable to delete website. Please, try again later.","Niet instaat om de website te verwijderen. Probeer het later nogmaals." -"Unable to proceed. Please, try again","Niet instaat om verder te gaan. Probeer het later nogmaals" -"Unable to proceed. Please, try again.","Kan niet verdergaan. Probeer a.u.b. opnieuw." -"Unable to save file ""%s"" at ""%s""","Niet in staat om bestand ""%s"" op te slaan in ""%s""" -"Unable to save file: %s","Niet in staat om bestand: %s op te slaan" -"Unknown old style column type definition: {$definition}.","Onbekende ouderwetse kolomtype definitie: {$definitie}." -"Unknown scope ""%s"".","Onbekende maat ""%s""." -"Unsecure","Onzeker" -"Url Options","Url Opties" -"Use Custom Admin Path","Gebruik Standaard Admin Pad" -"Use Custom Admin URL","Gebruik Aangepaste Admin URL" -"Use HTTP Only","Gebruik alleen HTTP" -"Use SID on Frontend","Gebruik SID op Frontend" -"Use Secure URLs in Admin","Gebruik zekere URLs in de administratie" -"Use Secure URLs in Frontend","Gebruik Veilige URL's in Frontend" -"Use Web Server Rewrites","Gebruik Web Server Rewrites" -"VAT Number","BTW nummer" -"Validate HTTP_USER_AGENT","Valideer HTTP_USER_AGENT" -"Validate HTTP_VIA","Valideer HTTP_VIA" -"Validate HTTP_X_FORWARDED_FOR","Valideer HTTP_X_FORWARDED_FOR" -"Validate REMOTE_ADDR","Valideer REMOTE_ADDR" -"Validation has failed.","Validatie is mislukt." -"Values less than 60 are ignored. Note that changes will apply after logout.","Waarden kleiner dan 60 worden genegeerd. N.b. veranderingen worden toegepast na logout." -"Variable Code must be unique.","Variabele Code moet uniek zijn." -"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Waarschuwing! Deze instelling aanzetten is niet aanbevolen op productiemilieu's, omdat het een potentieel beveiligingsgevaar oplevert." -"Web","Web" -"Website","Website" -"Website Information","Website Informatie" -"Website Name","Website naam" -"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Website code mag alleen letters (a-z), nummers (0-9) of underscore(_) bevatten, het eerste karakter moet een letter zijn." -"Website with the same code","Website met dezelfde code" -"Weekend Days","Weekend dagen" -"Welcome Text","Welkomsttekst" -"Wrong file info format","Verkeerde bestandsinformatiebestand" -"Wrong number of arguments for %s","Onjuist aantal argumenten voor %s" -"Wrong old style column type definition: {$definition}.","Verkeerde oude stijl kolom type definitie {$definition}." -"Yes","Ja" -"You will have to log in after you save your custom admin path.","U zult moeten inloggen nadat u uw standaard admin pad heeft bewaard." -"Your design change for the specified store intersects with another one, please specify another date range.","Uw ontwerp verandering voor de gespecificeerde store komt in conflict met een andere, specificeer a.u.b. een andere datumrange." -"database ""%s""","Database ""%s""" diff --git a/app/locale/nl_NL/Mage_Cron.csv b/app/locale/nl_NL/Mage_Cron.csv deleted file mode 100644 index c9427b555..000000000 --- a/app/locale/nl_NL/Mage_Cron.csv +++ /dev/null @@ -1,24 +0,0 @@ -"10 minutes","10 minuten" -"15 minutes","15 minuten" -"20 minutes","20 minuten" -"30 minutes","30 minuten" -"5 minutes","5 minuten" -"Cron (Scheduled Tasks) - all the times are in minutes","Cron (ingeplande taken) - alle tijden zijn in minuten" -"Daily","Dagelijks" -"Failure History Lifetime","Foute geschiedenis levenstijd" -"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","Voor correcte URLs, gegenereerd gedurende cron processen, zorgt u ervoor dat Web > zekere en onzekere basis URLs expliciet zijn ingesteld." -"Generate Schedules Every","Maak schema's elke" -"History Cleanup Every","geschiedenis schoonmaak elke" -"Hourly","Ieder uur" -"Invalid callback: %s::%s does not exist","Onjuiste callback, %s::%s bestaat niet" -"Invalid model/method definition, expecting ""model/class::method"".","Onjuist model/methode definitie, ik verwacht ""model/class::method""." -"Minute Intervals","1 minuut interval" -"Missed if Not Run Within","Gemist indien geen loop van binnen" -"Monthly","Maandelijks" -"No callbacks found","Geen callbacks gevonden" -"Schedule Ahead for","Plan vooruit voor" -"Success History Lifetime","Succesgeschiedenis levensduur" -"Too late for the schedule.","Te laat voor schema." -"Unable to delete the cron task.","Kon de cron taak niet verwijderen." -"Unable to save the cron expression.","Niet in staat om de cron expressie op te slaan." -"Weekly","Wekelijks" diff --git a/app/locale/nl_NL/Mage_CurrencySymbol.csv b/app/locale/nl_NL/Mage_CurrencySymbol.csv deleted file mode 100644 index daa0a7082..000000000 --- a/app/locale/nl_NL/Mage_CurrencySymbol.csv +++ /dev/null @@ -1,10 +0,0 @@ -"Currency","Munteenheid" -"Custom currency symbols were applied successfully.","Klandizie muntsoort symbolen zijn succesvol toegepast." -"Manage Currency","Beheer Muntsoort" -"Manage Currency Rates","Beheer Wisselkoersen" -"Rates","Tarieven" -"Save Currency Symbols","Bewaar Muntsoort Symbolen" -"Symbol","Symbool" -"Symbols","Symbolen" -"System","Systeem" -"Use Standard","Gebruik Standaard" diff --git a/app/locale/nl_NL/Mage_Customer.csv b/app/locale/nl_NL/Mage_Customer.csv deleted file mode 100644 index 18649a7d1..000000000 --- a/app/locale/nl_NL/Mage_Customer.csv +++ /dev/null @@ -1,469 +0,0 @@ -" or ","of" -"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' lijkt een DNS hostnaam te zijn maar kan geen TLD deel eruit halen." -"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' lijkt een DNS hostnaam te zijn maar komt niet overeen met de TLD in de eigen bekende lijst." -"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' lijkt een DNS hostnaam te zijn maar kan niet overeenkomen met de hostnaam voor het TLD schema '%tld%'" -"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' lijkt een DNS hostnaam te zijn maar bevat een liggende streep op een ongeldige positie" -"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' lijkt een DNS hostnaam te zijn maar de gegeven punycode kan niet worden gedecodeerd" -"'%value%' appears to be a local network name but local network names are not allowed","'%value%' lijkt een lokale netwerk naam te zijn maar, lokale netwerk namen zijn niet toegestaan" -"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' lijkt een IP adres te zijn, maar IP adressen zijn niet toegestaan" -"'%value%' does not appear to be a valid local network name","'%value%' blijkt geen geldige lokale netwerk naam te zijn" -"* Required Fields","* Vereiste velden" -"ALL GROUPS","ALLE GROEPEN" -"Account Dashboard","Account dashboard" -"Account Information","Accountinformatie" -"Account Sharing Options","Account deelopties" -"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please click here.","Account bevestiging is vereist. Controleert u uw e-mail voor de bevestigingslink. Om de bevestiging e-mail opnieuw te sturen klik hier." -"Action","Actie" -"Add New Address","Nieuw adres toevoegen" -"Add New Customer","Nieuwe klant toevoegen" -"Add New Customer Group","Nieuwe klantengroep toevoegen" -"Added From","Toegevoegd Vanuit" -"Additional Address Entries","Verdere adresregels" -"Address","Adres" -"Address Book","Adresboek" -"Address Books","Adresboeken" -"Address Information","Adresgegevens" -"Address Templates","Adrestemplates" -"Addresses","Adressen" -"Admin","Admin" -"All","Alles" -"All Store Views","Alle Winkelbezichtigingen" -"All countries","Alle landen" -"Always optional.","Altijd optioneel." -"Amount","Aantal" -"An error occurred while deleting the address.","Een fout heeft plaats gevonden tijdens het verwijderen van het adres." -"An error occurred while retrieving the option value: %s.","Er is een fout opgetreden bij het ophalen van de optie waarde: %s." -"An error occurred while saving the collection, aborting. Error: %s","Er is een fout opgetreden bij het opslaan van de collectie, afbreken. Fout: %s" -"An invalid option ID is specified for %s (%s), skipping the record.","Een ongeldige optie ID is gespecificeerd voor %s (%s), het record overslaan." -"Approved","Goed Gekeurd" -"Are you sure that you want to remove this item?","Weet u zeker dat u dit item wilt verwijderen?" -"Are you sure you want to cancel adding of this address?","Weet u zeker dat u het toevoegen van dit adres wilt annuleren?" -"Are you sure you want to delete this address?","Weet u zeker dat u dit adres wilt verwijderen?" -"Are you sure?","Weet u het zeker?" -"Array of Entity collections is expected.","Array van Entiteitencollecties wordt verwacht." -"Assign a Customer Group","Wijs een Klantgroep Toe" -"Average Sale","Gemiddelde Verkoop" -"Back","Terug" -"Back - link to the previously viewed page","Terug - link naar de hiervoor bekeken pagina" -"Back to Login","Terug naar Inloggen" -"Bad request.","Slecht verzoek." -"Based on the VAT ID, the customer would belong to the Customer Group %s.","Gebasseerd op het BTW nr., behoort de klant tot de Klanten Groep %s." -"Bill to Name","Bon op naam" -"Bought From","Gekocht van" -"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Door een account aan te maken bij onze winkel, kunt u sneller afrekenen, meerdere verzendadressen opgeven, uw bestellingen bekijken en tracken en meer." -"CSV","CSV" -"Cancel","Annuleren" -"Cannot save a new password.","Kan geen nieuw wachtwoord opslaan." -"Cannot save address.","Kan adres niet opslaan." -"Cannot save the customer.","Kan klant niet opslaan." -"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Kan klantaccounts niet globaal delen omdat sommige klantaccounts met dezelfde emails op meerdere websites bestaan en daarom niet samengevoegd kunnen worden." -"Change Account Password","Verander Account Wachtwoord" -"Change Billing Address","Wijzig Factureeradres" -"Change Password","Verander wachtwoord" -"Change Shipping Address","Verander Verzendingsadres" -"City","Stad" -"Company","Bedrijf" -"Config","Configuratie" -"Configure","Configureren" -"Confirm New Password","Bevestig nieuw wachtwoord" -"Confirm Password","Bevestig wachtwoord" -"Confirmation Link Email","Bevestigingslink Email" -"Confirmed","Bevestigd" -"Contact Information","Contact Informatie" -"Continue Shopping","Ga door met Winkelen" -"Country","Land" -"Create","Maak aan" -"Create New Account Options","Maak Nieuwe Account Opties Aan" -"Create New Customer Account","Maak Nieuwe Klantaccount Aan" -"Create Order","Maak Bestelling Aan" -"Create an Account","Een account aanmaken" -"Create customer","Creëer klant" -"Create customer address","Creëer klant adres" -"Current Password","Huidig wachtwoord" -"Customer","Klant" -"Customer API","Klanten API" -"Customer Account Edit Form","Klant Account Wijzigingsformulier" -"Customer Account Login Form","Klant Account Login Formulier" -"Customer Account Logout Success","Klant Account Logout Succes" -"Customer Account Registration Form","Klant Account Registratieformulier" -"Customer Addresses","Klant adres" -"Customer Configuration","Klant Configuratie" -"Customer Forgot Password Form","Klant Wachtwoord Vergeten Formulier" -"Customer Group","Klantgroep" -"Customer Groups","Klantgroepen" -"Customer Information","Klantinformatie" -"Customer Login","Klant Login" -"Customer My Account (All Pages)","Klant Mijn Account (Alle Pagina's)" -"Customer My Account Address Book","Klant Mijn Account Adresboek" -"Customer My Account Address Edit Form","Klant Mijn Account Adres Wijzigingsformulier" -"Customer My Account Dashboard","Klant Mijn Account Dashboard" -"Customer Since","Klant sinds" -"Customer View","Klant View" -"Customer collection expected.","Klant collectie verwacht." -"Customer email is required","Klant e-mail is vereist" -"Customer website ID must be specified when using the website scope","Klant website ID moet worden gespecificeerd bij het gebruik van de website scope" -"Customer will stay on the current page if ""No"" is selected.","Klant blijft op de huidige pagina indien ""No"" word geselecteerd." -"Customers","Klanten" -"Customers Only","Alleen klanten" -"Customers Section","Klantensectie" -"DD","DD" -"Date","Datum" -"Date Added","Datum Toegevoegd" -"Date of Birth","Geboortedatum" -"Day","Dag" -"Days in Wishlist","Dagen in Wensenlijst" -"Default Addresses","Vaststaand Adres" -"Default Billing Address","Standaard betalingsadres" -"Default Email Domain","Vaststaand E-mail Domein" -"Default Group","Vaststaande Groep" -"Default Shipping Address","Standaard verzendingsadres" -"Default Value for Disable Automatic Group Changes Based on VAT ID","Standaard Waarde voor het Uitschakelen van Automatische Groepswijzigingen Gebasseerd op BTW nr." -"Default Welcome Email","Vaststaande Welkomst E-mail" -"Delete","Verwijderen" -"Delete Address","Verwijder Adres" -"Delete Customer","Verwijder Klant" -"Delete Customer Group","Verwijder Klantgroep" -"Delete customer","Klant verwijderen" -"Delete customer address","Verwijder Klant adres" -"Deleted Stores","Verwijderde Winkels" -"Details","Details" -"Disabled","Uitgeschakeld" -"Edit","Bewerken" -"Edit Account Info","Bewerk Account Info" -"Edit Account Information","Bewerk Account Informatie" -"Edit Address","Adres bewerken" -"Edit Address Entry","Bewerk Adres Ingave" -"Edit Customer Group ""%s""","Klantengroep wijzigen ""%s""" -"Edit Customer Groups","Bewerk Klantgroepen" -"Edit Customer's Address","Bewerk Klant Adres" -"Edit Group","Bewerk Groep" -"Edit Newsletters","Bewerk Nieuwsbrieven" -"Email","Email" -"Email Address","e-mailadres" -"Email Sender","E-mail Verzender" -"Email:","E-mail" -"Enable Automatic Assignment to Customer Group","Schakel Automatische Toewijzing in voor Klanten Groep" -"Entity collection is expected.","Eenheid collectie wordt verwacht" -"Excel XML","Excel XML" -"Failed to confirm customer account.","Bevestiging van klantaccount mislukt." -"Fax","Fax" -"First Name","Voornaam" -"Forgot Email Template","Email Template Vergeten" -"Forgot Password","Wachtwoord vergeten" -"Forgot Your Password","Uw Wachtwoord Vergeten" -"Forgot Your Password?","Uw Wachtwoord Vergeten?" -"Forgot and Remind Email Sender","Vergeet en Herinner Email Zender" -"Form Fields Before","Formulier Velden Voor" -"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","Vanaf uw Mijn Account Dashboard heeft u de mogelijkheid om een momentopname van uw recentelijke accountactiviteit te bekijken en uw accountgegevens te updaten. Selecteer een link hieronder om gegevens te bekijken of te bewerken." -"Gender","Geslacht" -"Gender is required.","Geslacht is verplicht" -"General Subscription","Algemeen Abonnement" -"Generate Human-Friendly Customer ID","Genereer een prettig te gebruiken Klant-ID" -"Global","Wereldwijd" -"Group","Groep" -"Group Information","Groep Informatie" -"Group Name","Groep Naam" -"Group for Invalid VAT ID","Groep voor Ongeldig BTW nr." -"Group for Valid VAT ID - Domestic","Groep voor Geldig BTW nr. - Intern" -"Group for Valid VAT ID - Intra-Union","Groep voor Geldig BTW nr. - Intra-Unie" -"Guest","Gast" -"HTML","HTML" -"Hello, %s!","Hallo, %s!" -"ID","ID" -"IP Address","IP Adres" -"If you believe this is an error, please contact us at %s","Als u gelooft dat fit een fout is, contacteer ons dan aub via %s" -"If you have an account with us, please log in.","Als u een account bij ons heeft, logt u dan alstublieft in." -"Invalid attribute option specified for attribute %s (%s), skipping the record.","Onjuist attribuut optie gekozen voor attribuut %s (%s), record wordt overgeslagen." -"Invalid attribute set specified, skipping the record.","Ongeldige reeks kenmerken gespecificeerd, vermelding wordt overgeslagen" -"Invalid billing address for (%s)","Ongeldig factuur adres voor (%s)" -"Invalid current password","Huidige wachtwoord incorrect" -"Invalid customer data","Ongeldige klantdata" -"Invalid email address ""%s"".","Ongeldig e-mailadres ""%s""." -"Invalid email address.","Ongeldig e-mailadres." -"Invalid login or password.","Ongeldige login of wachtwoord" -"Invalid password reset token.","Ongeldige wachtwoord herstel token" -"Invalid shipping address for (%s)","Ongeldig post adres voor (%s)" -"Invalid store specified, skipping the record.","Ongeldige winkel gespecificeerd, record wordt overgeslagen." -"Invalid website, skipping the record, line: %s","Ongeldige website, overslaan van de data, lijn: %s" -"Last Activity","Laatste Activiteit" -"Last Date Subscribed","Laatste Ingeschreven Datum" -"Last Date Unsubscribed","Laatste Niet Ingeschreven Datum" -"Last Name","Achternaam" -"Last URL","Laatste URL" -"Leave empty for default (15 minutes).","Laat leeg voor standaard (15 minuten)." -"Leave empty for default (2). Valid range: 1-4","Laat leeg voor standaard (2). Toegestane hoeveelheid: 1-4" -"Lifetime Sales","Lifetime Verkopen" -"Log In","Inloggen" -"Log Out","Uitloggen" -"Login","Log in" -"Login Information","Log in Gegevens" -"Login Options","Login Opties" -"Login and password are required.","Login en wachtwoord zijn noodzakelijk." -"Login or Create an Account","Log in of Maak een Account aan" -"MM","MM" -"Manage Addresses","Beheer Adressen" -"Manage Customers","Beheer Klanten" -"Maximum length must be less then %s symbols","Maximale lengte moet minder zijn als %s symbolen" -"Missing email, skipping the record, line: %s","Geen email, overslaan van de data, lijn: %s" -"Missing email, skipping the record.","Geen e-mail adres, sla bestand over." -"Missing first name, skipping the record, line: %s","Geen voornaam, overslaan van de data, lijn: %s" -"Missing firstname, skipping the record.","Voornaam ontbreekt, sla record over." -"Missing last name, skipping the record, line: %s","Geen achternaam, overslaan van de data, lijn: %s" -"Missing lastname, skipping the record.","Achternaam ontbreekt, sla record over." -"Missing website, skipping the record, line: %s","Geen website, overslaan van de data, lijn: %s" -"Month","Maand" -"My Account","Mijn account" -"My Account Wrapper","Mijn Account Wrapper" -"My Dashboard","Mijn Dashboard" -"My Orders","Mijn bestellingen" -"Name","Naam" -"Name and Address Options","Naam en Adres Opties" -"Never","Nooit" -"New Address","Nieuw Adres" -"New Address Entry","Nieuw Adres Ingave" -"New Customer","Nieuwe Klant" -"New Customer Address","Nieuwe Klant Adres" -"New Customer Group","Nieuwe Klanten Groep" -"New Customer Groups","Nieuwe Klantgroepen" -"New Customers","Nieuwe Klanten" -"New Group","Nieuwe Groep" -"New Password","Nieuw Wachtwoord" -"New account","Nieuw account" -"New account confirmation key","Nieuwe account bevestigingskey" -"New account confirmed","Nieuw account bevestigd" -"New password field cannot be empty.","Nieuw wachtwoord veld mag niet leeg zijn" -"Newsletter","Nieuwsbrief" -"Newsletter Finish","Nieuwsbrief Eind" -"Newsletter Information","Nieuwsbrief Informatie" -"Newsletter Received","Nieuwsbrief Ontvangen" -"Newsletter Start","Nieuwsbrief Begin" -"Newsletter Subscription","Nieuwsbrief abonnement" -"Newsletters","Nieuwsbrief" -"No Items Found","Geen Artikelen Gevonden" -"No Newsletter Found","Geen Nieuwsbrief Gevonden" -"No customer collections found","Geen klanten collecties gevonden" -"No item specified.","Geen artikel gespecificeerd." -"Not Sent","Niet verstuurd" -"Not confirmed, can login","Niet bevestigd, u kunt inloggen" -"Not confirmed, cannot login","Niet bevestigd, kan niet inloggen." -"Number of Lines in a Street Address ","Aantal regels van een adres" -"Offline","Offline" -"Online","Online" -"Online Customers","Online Klanten" -"Online Customers Options","Online Klanten Opties" -"Online Minutes Interval","Online Minuten Interval" -"Order #","Bestelling #" -"Order Total","Totaal Bestelling" -"Orders","Bestellingen" -"PDF","PDF" -"Password","Wachtwoord" -"Password Management","Wachtwoord Beheer" -"Password Options","Wachtwoord Opties" -"Password forgotten","Wachtwoord vergeten" -"Password:","Wachtwoord:" -"Paused","Gepauzeerd" -"Pending","In afwachting" -"Per Website","Per Website" -"Personal Information","Persoonlijke Informatie" -"Please enter a number 1 or greater in this field.","Voer aub een nummer 1 of hoger in dit veld in." -"Please enter a valid date between %s and %s at %s.","Voer aub een geldige datum in tussen %s en %s op %s." -"Please enter a valid date equal to or greater than %s at %s.","Voer aub een geldige datum in gelijk aan of later dan %s op %s." -"Please enter a valid date less than or equal to %s at %s.","Voer aub een geldige datum in eerder dan of gelijk aan %s op %s." -"Please enter the city.","Vul alstublieft de stad in." -"Please enter the country.","Vul alstublieft het land in." -"Please enter the first name.","Vul alstublieft de voornaam in." -"Please enter the last name.","Vul alstublieft de achternaam in." -"Please enter the state/province.","Vul alstublieft de staat/provincie in." -"Please enter the street.","Vul alstublieft de straat in." -"Please enter the telephone number.","Vul alstublieft het telefoonnummer in." -"Please enter the zip/postal code.","Vul alstublieft de postcode in." -"Please enter your email address below. You will receive a link to reset your password.","Voer hieronder uw e-mailadres in. U ontvangt een link waarmee u uw wachtwoord opnieuw kunt instellen." -"Please enter your email below and we\'ll send you confirmation link for it.","Gelieve uw e-mailadres hieronder in te vullen en wij zullen uw een confirmatie link sturen." -"Please enter your email.","Geef u e-mail in a.u.b." -"Please make sure your passwords match.","Let er alstublieft op dat de wachtwoorden overeenkomen." -"Please select a website which contains store view","Selecteer aub een website dat een winkel zicht bevat" -"Please select region, state or province","Selecteer a.u.b. uw provincie" -"Please, check your email for confirmation key.","Check a.u.b. uw e-mail voor de bevestigingskey." -"Prefix Dropdown Options","Voorvoegsel Keuzelijst Opties" -"Price","Prijs" -"Product","Product" -"Product ID","Product Identificatie" -"Product Name","Productnaam" -"Product Reviews","Productbeoordelingen" -"Product Tags","Productlabels" -"Purchase On","Kopen op" -"Purchased On","Gekocht Op" -"Qty","Hoeveelheid" -"Recent Orders","Recente Bestellingen" -"Records for %s store found.","Archieven voor %s winkel gevonden." -"Recovery Link Expiration Period (days)","Herstel Link Verloop Periode (dagen)" -"Redirect Customer to Account Dashboard after Logging in","Leid Klant naar Account Dashboard na Inloggen" -"Refunded","Terugbetaald" -"Register","Registreren" -"Registered Customers","Geregistreerde Klanten" -"Remind Email Template","Herinner Email Voorbeeld" -"Remind Password","Herinner Wachtwoord" -"Remove","Verwijderen" -"Require Emails Confirmation","Benodigd E-mail Confirmatie" -"Reset a Password","Wachtwoord opnieuw instellen" -"Retrieve address data","Haal adresgegevens terug" -"Retrieve address info","Haal adresinfo terug" -"Retrieve customer addresses","Haal klant adres op" -"Retrieve customer data","Haal klantgegevens terug" -"Retrieve customer groups","Haal klantengroep op" -"Retrieve customer info","Haal klant informatie op" -"Retrieve customers","Haal klanten op" -"Retrieve your confirmation link here","Haal uw bevestigingslink hier terug" -"Retrieve your password here","Haal uw wachtwoord hier op" -"SKU","SKU" -"Sales Statistics","Verkoopstatistieken" -"Save","Opslaan" -"Save Address","Sla adres op" -"Save Customer","Sla klant op" -"Save Customer Group","Sla Klantgroep Op" -"Save Password","Sla Wachtwoord Op" -"Save and Continue Edit","Opslaan en doorgaan met bewerken" -"Saved %d record(s)","%d archief(ven) opgeslagen" -"Semicolon (;) separated values.
    Put semicolon in the beginning for empty first option.
    Leave empty for open text field.","Puntcomma (;) gescheiden waarden.
    Zet een puntkomma in het begin voor een lege eerste waarde.
    Laat leeg voor een open tekstveld." -"Send Auto-Generated Password","Verstuur Automatisch Gegenereerde Wachtwoord" -"Send From","Verzend Van" -"Send Welcome Email","Verzend Welkomstemail" -"Send Welcome Email after Confirmation","Stuur een Welkomst E-mail na Confirmatie" -"Send confirmation link","Verzend bevestigingslink" -"Sending","Verzenden" -"Sent","Verzonden" -"Session Start Time","Sessie Start Tijd" -"Set as Default Billing Address","Stel in als Standaard Factureeradres" -"Set as Default Shipping Address","Stel in als Standaard Afleveradres" -"Share Customer Accounts","Deel Klanten Accounts" -"Shipped to First Name","Verzonden naar Voornaam" -"Shipped to Last Name","Verzonden naar Achternaam" -"Shipped to Name","Verzonden naar Naam" -"Shopping Cart","Winkelmandje" -"Shopping Cart - %d item(s)","Winkel Wagen - %d artikel(en)" -"Shopping Cart of %1$s - %2$d item(s)","Winkelwagen van %1$s - %2$d voorwerp(en)" -"Show Date of Birth","Geboortedatum tonen" -"Show Gender","Geslacht tonen" -"Show Middle Name (initial)","Laat Midden Naam Zien (Initieel)" -"Show Prefix","Voorvoegsel tonen" -"Show Suffix","Achtervoegsel tonen" -"Show Tax/VAT Number","Laat Belasting/VAT Nummer Zien" -"Show VAT Number on Frontend","Laat BTW-nummer zien op Frontend" -"Sign Up for Newsletter","Schrijf in voor Nieuwsbrief" -"Skipping import row, required field ""%s"" is not defined.","Sla import rij over, gevraagd veld ""%s"" is onbekend." -"Skipping import row, website ""%s"" field does not exist.","Import rij overgeslagen, website ""%s"" veld bestaat niet." -"State/Province","Staat/Provincie" -"Status","Status" -"Store","Winkel" -"Store View","Aanblik winkel" -"Street Address","Adres straat" -"Street Address %s","Straatnaam en huisnummer %s" -"Subject","Onderwerp" -"Submit","Bevestig" -"Subscribe to Newsletter","Aanmelden voor nieuwsbrief" -"Subscribed to Newsletter?","Aangemeld voor de nieuwsbrief?" -"Suffix Dropdown Options","Achtervoegsel dropdown opties" -"Tag Name","Tag Naam" -"Tax Calculation Based On","Belasting Berekening Gebaseerd Op" -"Tax Class","BTW Klasse" -"Tax/VAT number","Belasting/VAT nummer" -"Telephone","Telefoon" -"Text","Tekst" -"Text One Line","Tekst Een Regel" -"Thank you for registering with %s.","Bedankt voor het registeren op %s." -"The Date of Birth is required.","De Geboortedatum is verplicht." -"The TAX/VAT number is required.","Het BTW/belastingnummer is verplicht." -"The VAT ID entered (%s) is not a valid VAT ID.","Het ingevoerde BTW nr. (%s) is geen geldig BTW nr." -"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","Het ingevoerde BTW nr. (%s) is geen geldig BTW nr. De klant zou behoren tot Klant Groep %s." -"The VAT ID is valid. The current Customer Group will be used.","Het BTW nr. is geldig. De huidige Klant Groep wordt gebruikt." -"The account information has been saved.","De accountinformatie is opgeslagen." -"The address does not belong to this customer.","Dit adres is niet het adres van deze klant." -"The address has been deleted.","Het adres is verwijderd." -"The address has been saved.","Het adres is niet opgeslagen." -"The customer ID and email did not match, skipping the record, line: %s","De klant ID en email komen niet overeen, overslaan van de data, lijn: %s" -"The customer does not have default billing address.","De klant heeft geen facturatieadres." -"The customer email (%s) already exists, skipping the record, line: %s","De klant email (%s) bestaat al, overslaan van de data, lijn: %s" -"The customer group has been deleted.","De klantgroep is verwijderd." -"The customer group has been saved.","De klanten groep is opgeslagen." -"The customer is currently assigned to Customer Group %s.","De klant is op het moment toegewezen aan Klant Groep %s." -"The first name cannot be empty.","De voornaam kan niet leeg gelaten worden." -"The group ""%s"" cannot be deleted","De groep ""%s"" kan niet verwijderd worden" -"The last name cannot be empty.","Achternaam kan niet leeg gelaten worden." -"The minimum password length is %s","Minimumlengte van het wachtwoord is %s" -"The password cannot be empty.","Het wachtwoord kan niet leeg gelaten worden." -"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","Het wachtwoord moet ten minste 6 tekens lang zijn. Voorloop of volg spaties worden genegeerd." -"The suffix that goes after name (Jr., Sr., etc.)","Het achtervoegsel dat achter naam komt (Jr., Sr., etc.)" -"The title that goes before name (Mr., Mrs., etc.)","De titel staat voor de naam (Mr., Mrs., e.d.)" -"There are no items in customer's wishlist at the moment","Er staan momenteel geen items op het verlanglijstje van de klant" -"There are no items in customer\'s shopping cart at the moment","Er zitten momenteel geen items in het winkelwagentje van de klant" -"There is already an account with this email address. If you are sure that it is your email address, click here to get your password and access your account.","Er is al een account met dit e-mail adres. Indien u zeker weet dat dit uw e-mail adres is, klik hier om uw wachtwoord te ontvangen en toegang te krijgen tot uw account." -"There was an error validating the VAT ID.","Er is een fout opgetreden bij het valideren van uw BTW nr." -"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","Er is een fout opgetreden bij het valideren van uw BTW nr. De klant zou behoren tot Klant Groep %s." -"This account is not confirmed.","Deze account is niet bevestigd." -"This customer email already exists","Dit klanten e-mail adres bestaat al" -"This customer has no saved addresses.","Deze klant heeft geen opgeslagen adressen." -"This email does not require confirmation.","Deze e-mail behoeft geen confirmatie." -"This email will be sent instead of default welcome email, after account confirmation.","Deze email zal in plaats van de standaard welkomstemail worden verzonden, na bevestiging van de account." -"This is My Default %s Address","Dit is Mijn Standaard %s Adres" -"To Cart","Naar Winkelwagentje" -"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","Om BTW-nummer weer te geven op frontend, stelt u de optie toon BTW-nummer op frontend in op Ja." -"Total","Totaal" -"Type","Type" -"Unable to save the customer.","Niet instaat om de klant op te slaan." -"Unknown","Onbekend" -"Unsubscribe from Newsletter","Afmelden van nieuwsbrief" -"Update","Update" -"Update customer address data","Update klant adres informatie" -"Update customer data","Klantgegevens bijwerken" -"Use as My Default %s Address","Gebruik als Mijn Standaard %s Adres" -"Use as My Default Billing Address","Als mijn standaard betalingsadres gebruiken" -"Use as My Default Shipping Address","Gebruik als Mijn Standaard Afleveradres" -"Use as my default billing address","Gebruiken als mijn standaard factuuradres" -"Use as my default shipping address","Gebruik als mijn standaard verzendadres" -"VAT Number","BTW nummer" -"VAT Request Date","BTW aanvraag Datum" -"VAT Request Identifier","BTW Aanvraag Identificatie" -"Validate VAT Number","Geldig BTW nr." -"Validate on Each Transaction","Valideer bij Elke Transactie" -"Validation Error Group","Validatie Fout Groep" -"View","Bekijk" -"View Order","Bestelling bekijken" -"Visitor","Bezoeker" -"Visitors Only","Alleen bezoekers" -"Website","Website" -"Welcome Email","Welkomst E-mail" -"Wishlist","Verlanglijst" -"Wishlist - %d item(s)","Wensenlijst - %d artikel(en)" -"Would you like to change the Customer Group for this order?","Wilt u de Klant Groep voor deze order veranderen?" -"Wrong confirmation key.","Verkeerde confirmatie sleutel." -"Wrong customer account specified.","Verkeerde klantaccount opgegeven." -"Wrong email.","Verkeerde email." -"Wrong transactional account email type","Verkeerde transactionele account e-mail soort" -"YYYY","YYYY" -"Year","Jaar" -"You are currently not subscribed to any newsletter.","U staat niet ingeschreven voor enige nieuwsbrief." -"You are currently not subscribed to our newsletter.","U staat niet ingeschreven voor onze nieuwsbrief." -"You are currently subscribed to 'General Subscription'.","U staat ingeschreven op ""Algemene Abonnement""" -"You are currently subscribed to our newsletter.","U bent momenteel geabonneerd op onze nieuwsbrief." -"You are now logged out","U bent nu uitgelogd" -"You have logged out and will be redirected to our homepage in 5 seconds.","U bent uitgelogd en zult doorverwezen worden naar onze webpagina in 5 seconden." -"You have no additional address entries in your address book.","U heeft geen additionele adresvermeldingen in uw adresboek staan." -"You have no additional entries in your address book.","U heeft geen additionele inzendingen in uw adressenlijst." -"You have no default billing address in your address book.","U heeft geen standaard factuuradres in uw adresboek staan." -"You have no default entries in your address book.","U heeft geen standaard inzendingen in uw adressenlijst." -"You have no default shipping address in your address book.","U heeft geen standaard verzendingsadres in uw adresboek staan." -"You have not set a default billing address.","U heeft geen standaard facturatieadres ingesteld." -"You have not set a default shipping address.","U heeft geen standaard verzendingsadres ingesteld." -"You have placed no orders yet.","U heeft nog geen bestellingen geplaatst." -"You have placed no products yet.","U heeft nog geen producten geplaatst." -"You will be charged tax.","U wordt belasting berekend." -"You will not be charged tax.","Er wordt u geen belasting berekend." -"Your Tax ID cannot be validated.","Uw Belasting ID kan niet gevalideerd worden." -"Your VAT ID was successfully validated.","Uw BTW nr. is succesvol gevalideerd." -"Your account balance is: %s","Uw account balans is: %s" -"ZIP","Postcode" -"ZIP/Post Code","ZIP/Postcode" -"Zip/Postal Code","Zip/Postcode" -"n/a","n.v.t." -"or","of" -"register","Registreer" diff --git a/app/locale/nl_NL/Mage_Dataflow.csv b/app/locale/nl_NL/Mage_Dataflow.csv deleted file mode 100644 index 2e04801d0..000000000 --- a/app/locale/nl_NL/Mage_Dataflow.csv +++ /dev/null @@ -1,32 +0,0 @@ -"Link","Link" -"Actions XML is not valid.","XML acties is niet geldig." -"An error occurred while opening file: ""%s"".","Een fout vond plaats bij het openen van bestand: ""%s""." -"Could not load file: ""%s"".","Kan het bestand niet laden: ""%s""." -"Could not save file: %s.","Kon bestand: %s niet opslaan." -"Declared adapter %s was not found.","De gekozen adapter %s was niet gevonden." -"Destination folder ""%s"" is not a directory.","Bestemmingsmap ""%s"" is geen directory." -"Destination folder ""%s"" is not writable.","Bestemmingsmap ""%s"" is niet beschrijfbaar." -"Done","Klaar" -"Dry run set, stopping execution.","Testen compleet, stopt uitvoering." -"ETA: %s","ETA: %s" -"Error in field mapping: field list for mapping is not defined.","Fout in het field mapping: Field lijst voor het mappen niet gedefinieerd." -"File ""%s"" does not exist.","Bestand ""%s"" bestaat niet." -"Found %d rows.","Heeft %d rijen gevonden." -"Less than a minute","Minder dan een minuut" -"Loaded successfully: ""%s"".","Laden is geslaagd: ""%s""." -"Memory Used: %s","Geheugen Gebruikt: %s" -"Method ""%s"" not defined in adapter %s.","Methode ""%s"" is niet gedefinieerd in adapter %s." -"Method ""%s"" was not defined in adapter %s.","Methode ""%s"" was niet gedefinieerd in adapter %s." -"Please declare ""adapter"" and ""method"" nodes first.","Geeft eerst de ""adapter"" en ""methode"" nodes aan." -"Processed records: %s","Verwerkte records: %s" -"Profile with the same name already exists.","Profiel met dezelfde naam bestaat al." -"Saved successfully: ""%s"" [%d byte(s)].","Succesvol opgeslagen: ""%s"" [%d byte(s)]." -"Sheet 1","Blad 1" -"Skip undefined row.","Ongedefinieerde rij overslaan." -"Starting %s :: %s","Start %s :: %s" -"The destination folder ""%s"" does not exist or there is no access to create it.","De bestemmingsmap ""%s"" bestaat niet of er is geen toegang om het aan te maken." -"Total records: %s","Aantal records: %s" -"hour","uur" -"hours","uren" -"minute","minuut" -"minutes","minuten" diff --git a/app/locale/nl_NL/Mage_Directory.csv b/app/locale/nl_NL/Mage_Directory.csv deleted file mode 100644 index f7753168a..000000000 --- a/app/locale/nl_NL/Mage_Directory.csv +++ /dev/null @@ -1,49 +0,0 @@ -"-- Please select --","-- Selecteer a.u.b. --" -"Allowed Currencies","Toegestane Munteenheden" -"Base Currency","Basis Munteenheid" -"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","Basis munteenheid wordt gebruikt voor alle online betalingstransacties. Reikwijdte is gedefinieerd door de catalogus prijsreikwijdte (""Catalogus"" > ""Prijs"" > ""Catalogus prijsreikwijdte"")." -"Can\'t convert rate from ""%s-%s"".","Kan tarief niet omzetten van ""%s-%s""." -"Cannot retrieve rate from %s.","Kan koers niet terughalen van %s." -"Connection Timeout in Seconds","Connectie Timeout in Secondes" -"Continue »","Ga verder »" -"Country","Land" -"Country API","Land API" -"Country and Format Type combination should be unique","Land en Format Type combinatie behoren uniek te zijn" -"Currency","Munteenheid" -"Currency Options","Munteenheid Opties" -"Currency Setup","Munteenheid Setup" -"Currency Update Warnings","Munteenheid Update Waarschuwing" -"Default Display Currency","Standaard Weergave Munteindheid" -"Directory","Directory" -"Display not required State","Weergave niet benodigd Fase" -"Enabled","Aan" -"Error Email Recipient","Foutmelding Email Ontvanger" -"Error Email Sender","Foutmelding Email Verstuurder" -"Error Email Template","Foutmelding Email Template" -"FATAL ERROR:","FATALE FOUTMELDING:" -"Frequency","Frequentie" -"Installed Currencies","Geïnstalleerde Munteenheden" -"Invalid Import Service specified.","Ongeldige Import Service aangegeven." -"Invalid country code: %s","Ongeldige landen code: %s" -"Invalid rates received","Ongeldige tarieven ontvangen" -"Invalid target currency.","Ongeldige doelvaluta." -"List of countries","Lijst van landen" -"List of regions in specified country","Lijst van regio's in het gespecificeerde land" -"Postal Code is Optional for the following countries","Postcode is Optioneel voor de volgende landen" -"Region","Regio" -"Region API","Regio API" -"Scheduled Import Settings","Geplande Import Instellingen" -"Select Your Currency","Selecteer Uw Valuta" -"Service","Service" -"Start Time","Begintijd" -"State is required for","Fase is benodigd voor" -"State/Province","Staat/Provincie" -"States Options","Fase Opties" -"Strikeiron Email Update Warnings","Strikeiron Email Update Waarschuwingen" -"Unable to initialize the import model.","Kan het importmodel niet initialiseren." -"Undefined rate from ""%s-%s"".","Niet gedefinieerde koers van ""%s-%s""." -"WARNING:","WAARSCHUWING:" -"Webservicex","Webservicex" -"Your Currency","Uw Valuta" -"Your Currency:","Uw Valuta:" -"Your current currency is: %s","Uw huidige valuta is %s" diff --git a/app/locale/nl_NL/Mage_Downloadable.csv b/app/locale/nl_NL/Mage_Downloadable.csv deleted file mode 100644 index 4f1b42614..000000000 --- a/app/locale/nl_NL/Mage_Downloadable.csv +++ /dev/null @@ -1,95 +0,0 @@ -"Add","Toevoegen" -"Add New Row","Voeg Nieuwe Rij Toe" -"Add links and samples to downloadable product","Voeg links en voorbeelden toe aan te downloaden product" -"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.","Alfanumerieke, schuine streep en onderstreepte lettertekens worden aangeraden voor bestandsnamen. Ongeschikte lettertekens worden vervangen met \'_\'." -"An error occurred while getting the requested content.","Er is een fout opgetreden bij het ophalen van de gevraagde content." -"An error occurred while getting the requested content. Please contact the store owner.","Er is een fout opgetreden bij het ophalen van de gevraagde content. Neem alstublieft contact op met de winkeleigenaar." -"An error occurred while saving the file(s).","Er is een fout opgetreden bij het opslaan van het/de bestand(en)." -"Availability:","Beschikbaarheid:" -"Back","Terug" -"Canceled","Geannuleerd" -"Cannot connect to remote host, error: %s.","Kan geen verbinding maken met remote host, fout: %s." -"Catalog Product View (Downloadable)","Catalogus Product Weergave (Downloadbaar)" -"Category API","Categorie API" -"Customer My Account Downloadable Items","Klant Mijn Account Downloadbare Items" -"Date","Datum" -"Default Link Title","Standaard Link Titel" -"Default Maximum Number of Downloads","Standaard Maximaal Aantal Downloads" -"Default Sample Title","Standaard Voorbeeldtitel" -"Delete","Verwijderen" -"Disable Guest Checkout if Cart Contains Downloadable Items","Schakel Gast Afrekenen uit als Winkelwagentje Downloadbare Items Bevat" -"Downloadable Information","Downloadbare informatie" -"Downloadable Product","Downloadbaar Product" -"Downloadable Product Options","Downloadbaar Product Opties" -"Downloadable Product Section","Downloadbaar Productgedeelte" -"Edit","Bewerken" -"Edit item parameters","Parameters van artikel bewerken" -"Excl. Tax","Excl. BTW" -"File","Bestand" -"From:","Van:" -"Gift Message","Cadeauboodschap" -"Go to My Downloadable Products","Ga naar Mijn Downloadbare Producten" -"Guest checkout will only work with shareable.","Gast uitchecken werkt alleen met deelbare." -"In stock","In voorraad" -"Incl. Tax","Incl. BTW" -"Invalid download URL host.","Ongeldige download URL host." -"Invalid download URL scheme.","Ongeldig download URL schema." -"Invalid download link type.","Ongeldig download link type." -"Invoiced","Gefactureerd" -"Links can be purchased separately","Links kunnen separaat gekocht worden" -"List","Lijst" -"Max. Downloads","Max. Downloads" -"Message:","Bericht:" -"Move","Verplaats" -"Move to wishlist","Naar verlanglijst verplaatsen" -"My Downloadable Products","Mijn Downloadbare Producten" -"Open Links in New Window","Open Links in Nieuw Venster" -"Order #","Bestelling #" -"Order Item Status to Enable Downloads","Order Item Status om Downloads Mogelijk te Maken" -"Order id cannot be null","Bestel id kan geen nul zijn" -"Order item id cannot be null","Bestel artikel kan geen nul zijn" -"Ordered","Besteld" -"Out of stock","Uit voorraad" -"Pending","In afwachting" -"Please log in to download your product or purchase %s.","Gelieve in te loggen om uw product te downloaden of te kopen %s." -"Please log in to download your product.","Log in om uw product te downloaden." -"Please set resource file and link type.","Bepaal hulpbronnenbestand en link type." -"Please specify product link(s).","Specificeer productlink(s)." -"Price","Prijs" -"Product downloadable links","Links van te downloaden producten" -"Qty","Hoeveelheid" -"Refunded","Terugbetaald" -"Remaining Downloads","Resterende downloads" -"Remove","Verwijderen" -"Remove Item","Artikel verwijderen" -"Remove links and samples from downloadable product","Verwijder links en voorbeelden van downloadbaar product" -"Requested link does not exist.","Gevraagde link bestaat niet." -"Retrieve links and samples list from downloadable product","Ontvang links- en voorbeeldenlijst van downloadbaar product" -"SKU","Verhandelbare Eenheid" -"Sample","Monster" -"See price before order confirmation.","Zie prijs voor bevestiging van bestelling." -"Shareable","Deelbaar" -"Shipped","Verzonden" -"Sorry, there was an error getting requested content. Please contact the store owner.","Helaas is een fout opgetreden tijdens het opvragen van de gevraagde inhoud. Neem contact op met de eigenaar van de winkel." -"Sort Order","Sorteer Bestelling" -"Start Download","Start download" -"Status","Status" -"Subtotal","Subtotaal" -"The file does not exist.","Het bestand bestaat niet." -"The link has expired.","De link is verlopen." -"The link is not available.","De link is niet beschikbaar." -"There are files that were selected but not uploaded yet. Please upload or remove them first","Er zijn bestanden die geselecteerd zijn, maar nog niet geüpload. Gelieve deze te uploaden of te verwijderen." -"Title","Titel" -"To:","Aan:" -"U","U" -"Unlimited","Onbeperkt" -"Update","Updaten" -"Use Content-Disposition","Gebruik Content-Disposition" -"Use Default Value","Standaardwaarde gebruiken" -"View Order","Bestelling bekijken" -"What's this?","Wat is dit?" -"You have not purchased any downloadable products yet.","U heeft nog geen downloadbare artikelen aangeschafd." -"attachment","bijlage" -"download","download" -"inline","inline" -"sample","specimen" diff --git a/app/locale/nl_NL/Mage_Eav.csv b/app/locale/nl_NL/Mage_Eav.csv deleted file mode 100644 index 448941898..000000000 --- a/app/locale/nl_NL/Mage_Eav.csv +++ /dev/null @@ -1,124 +0,0 @@ -"""%s"" contains not only digit characters.","""%s"" bevat niet alleen numerieke tekens." -"""%s"" does not fit the entered date format.","""%s"" past niet in het ingevoegde datum format." -"""%s"" exceeds the allowed file size.","""%s"" overschrijdt de toegestane bestandsgrootte." -"""%s"" exceeds the allowed length.","""%s"" overschrijdt de toegestane lengte" -"""%s"" has not only alphabetic and digit characters.","""%s"" bevat niet alleen alfabetische en numerieke tekens." -"""%s"" has not only alphabetic characters.","""%s"" bevat niet alleen alfabetische tekens." -"""%s"" height exceeds allowed value of %s px.","""%s"" hoogte overschrijd de toegestane waarde van %s px." -"""%s"" invalid type entered.","""%s"" ongeldige type ingevoerd." -"""%s"" is a required value.","""%s"" is een vereiste waarde." -"""%s"" is an empty string.","""%s"" is een lege string." -"""%s"" is not a valid URL.","""%s"" is een ongeldige URL." -"""%s"" is not a valid date.","""%s"" is een ongeldige datum." -"""%s"" is not a valid email address.","""%s"" is een ongeldig e-mail adres." -"""%s"" is not a valid file","""%s"" is een ongeldig bestand." -"""%s"" is not a valid file extension.","""%s"" is een ongeldige bestandsextensie." -"""%s"" is not a valid file.","""%s"" is een ongeldig bestand." -"""%s"" is not a valid hostname.","""%s"" is een ongeldige bestandsnaam." -"""%s"" is not a valid image format","""%s"" is een ongeldige afbeeldings indeling" -"""%s"" length must be equal or greater than %s characters.","""%s"" lengte moet groter zijn dan of gelijk zijn aan %s karakters." -"""%s"" length must be equal or less than %s characters.","""%s"" lengte moet kleiner zijn dan of gelijk zijn aan %s karakter." -"""%s"" width exceeds allowed value of %s px.","""%s"" breedte overschrijd de toegestane waarde van %s px." -"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' lijkt een DNS hostnaam te zijn maar kan geen TLD deel eruit halen." -"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' lijkt een DNS hostnaam te zijn maar komt niet overeen met de TLD in de eigen bekende lijst." -"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' lijkt een DNS hostnaam te zijn maar kan niet overeenkomen met de hostnaam voor het TLD schema '%tld%'" -"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' lijkt een DNS hostnaam te zijn maar bevat een liggende streep op een ongeldige positie" -"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' lijkt een DNS hostnaam te zijn maar de gegeven punycode kan niet worden gedecodeerd" -"'%value%' appears to be a local network name but local network names are not allowed","'%value%' lijkt een lokale netwerk naam te zijn maar, lokale netwerk namen zijn niet toegestaan" -"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' lijkt een IP adres te zijn, maar IP adressen zijn niet toegestaan" -"'%value%' does not appear to be a valid URI hostname","'%value%' blijkt geen geldige URI hostnaam te zijn" -"'%value%' does not appear to be a valid local network name","'%value%' blijkt geen geldige lokale netwerk naam te zijn" -"'%value%' does not match the expected structure for a DNS hostname","'%value%' komt niet overeen met de verwachte structuur van een DNS hostnaam" -"A joint field with this alias (%s) is already declared","Een samengesteld veld met deze alias (%s) is al opgegeven" -"Add Option","Voeg Optie toe" -"An error occurred while loading a record, aborting. Error: %s","Er is een fout opgetreden tijdens het laden van een record, afbreken. Fout: %s" -"An error occurred while loading the collection, aborting. Error: %s","Er is een fout opgetreden tijdens het laden van de collectie, afbreken. Fout: %s" -"An error occurred while saving a record, aborting. Error: ","Er is een fout opgetreden tijdens het opslaan van een record, afbreken. Fout:" -"Attempt to add an invalid object","Poging een ongeldig object toe te voegen" -"Attribute '%s' used in configurable products","Attribuut '%s' gebruikt in configureerbare producten" -"Attribute Code","Attribuutcode" -"Attribute Label","Attribuutlabel" -"Attribute Properties","Attribuut Eigenschappen" -"Attribute object is undefined","Attribuut object is ongedefinieerd" -"Attribute set with the ""%s"" name already exists.","Attributenset met naam ""%s"" bestaat al." -"Attribute with the same code","Attribuut met zelfde code" -"Can\'t create table: %s","Kan geen tabel creëren: %s" -"Catalog Input Type for Store Owner","Catalogus Input Type voor Winkeleigenaar" -"Current module EAV entity is undefined","Huidige module EAV eenheid in ongedefinieerd" -"Current module pathname is undefined","Huidige module padnaam is ongedefinieerd" -"Data integrity: No header row found for attribute","Data integriteit: Geen koptekst rij gevonden voor attribuut" -"Date","Datum" -"Decimal Number","Decimaal Getal" -"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","Standaard Productoverzicht Sorteer op bestaat niet in voorraad Productoverzicht Sorteer op." -"Default Value","Vaststaande Waarde" -"Default option value is not defined","Vaststaande optie waarde is niet gedefinieerd." -"Delete","Verwijderen" -"Dropdown","Dropdown" -"Email","Email" -"Entity collection expected.","Eenheidscollectie verwacht." -"Entity collections expected.","Eenheidscollecties verwacht." -"Entity instance is not defined","Voorbeeld eenheid is niet gedefinieerd" -"Entity is not initialized","Eenheid is niet geïnitialiseerd" -"Entity object is undefined","Doel eenheid is niet gedefinieerd" -"Failed to load node %s from config","Knooppunt %s van config laden mislukt" -"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","Voor intern gebruik. Moet uniek zijn zonder spaties. Maximale lengte van attribuut code moet minder dan %s tekens zijn" -"Form Element with the same attribute","Vorm element met zelfde attribuut" -"Form Fieldset with the same code","Vorm Fieldset met zelfde code" -"Form Type with the same code","Vorm Type met zelfde code" -"Form code is not defined","Vorm code is niet gedefinieerd" -"Frontend label is not defined","Front end label is niet gedefinieerd" -"Input Validation for Store Owner","Input Validatie voor Winkeleigenaar" -"Integer Number","Integer Getal" -"Invalid EAV attribute.","Ongeldig EAV attribuut." -"Invalid alias, already exists in joint attributes","Ongeldige alias, bestaat al in samengestelde attributen" -"Invalid attribute name: %s","Ongeldige attribuutnaam: %s" -"Invalid attribute requested: %s","Ongeldig attribuut gevraagd: %s" -"Invalid attribute type","Ongeldig attribuut type" -"Invalid character encountered in increment ID: %s","Ongeldig teken gevonden in increment ID: %s" -"Invalid date","Ongeldige datum" -"Invalid default date","Ongeldige standaarddatum" -"Invalid default decimal value","Ongeldige standaard decimale waarde" -"Invalid entity specified","Ongeldige entiteit gespecificeerd" -"Invalid entity supplied.","Ongeldige entiteit geleverd." -"Invalid entity supplied: %s","Ongeldige entiteit geleverd: %s" -"Invalid entity type","Ongeldig type entiteit" -"Invalid entity_id, skipping the record.","Ongeldige entiteit_id, record wordt overgeslagen." -"Invalid entity_type specified: %s","Ongeldige entiteit_type gespecificeerd: %s" -"Invalid foreign key","Ongeldige vreemde sleutel" -"Invalid form type.","Ongeldig type formulier." -"Invalid joint fields","Ongeldige verbonden velden" -"Invalid store specified","Ongeldige winkel gespecificeerd" -"Invalid type given. String expected","Ongeldog type opgegeven. String verwacht" -"Joined field with this alias is already declared","Verbonden veld met deze alias is reeds gedeclareerd" -"Joint field or attribute expression with this alias is already declared","Verbonden veld of attribuut expressie met deze alias is reeds gedeclareerd" -"Letters","Letters" -"Letters (a-z, A-Z) or Numbers (0-9)","Letters (a-z, A-Z) or cijfers (0-9)" -"Loaded %d records","%d Records geladen" -"Maximum length of attribute code must be less then %s symbols","Maximale lengte van attribuutcode moet minder zijn dan %s symbolen" -"Multiple Select","Multiple Selecteer" -"No","Nee" -"No options found in config node %s","Geen opties gevonden in config node %s" -"None","Geen" -"Not shared with other products","Niet gedeeld met andere producten" -"Problem loading the collection, aborting. Error: %s","Probleem bij laden van collectie, laden wordt geaborteerd. Fout: %s" -"Problem saving the collection, aborting. Error: %s","Probleem bij opslaan van verzameling, opslaan wordt geborteerd. Fout: %s" -"Required","Benodigd" -"Saved %d record(s).","%d Record(s) opgeslagen." -"Source model ""%s"" not found for attribute ""%s""","Bronmodel ""%s"" niet gevonden voor attribuut ""%s""" -"System","Systeem" -"Text Area","Tekstgebied" -"Text Field","Tekstveld" -"The value of attribute ""%s"" must be unique","De waarde van attribuut ""%s"" moet uniek zijn" -"The value of attribute ""%s"" must be unique.","De waarde van attribute ""%s"" moet uniek zijn." -"This attribute is used in configurable products","Dit attribuut wordt gebruikt in configureerbare producten" -"URL","URL" -"Unique Value","Unieke waarde" -"Unique Value (not shared with other products)","Unieke waarde (niet gedeeld met andere producten)" -"Unknown parameter","Onbekende parameter" -"Values Required","Waardes verplicht" -"Wrong attribute group ID","Verkeerde attribuut groep ID" -"Wrong attribute set ID","Verkeerde attribuut set ID" -"Wrong entity ID","Verkeerde entiteit ID" -"Wrong type definition for %s","Verkeerde soort definitie voor %s" -"Yes","Ja" -"Yes/No","Ja/Nee" diff --git a/app/locale/nl_NL/Mage_GiftMessage.csv b/app/locale/nl_NL/Mage_GiftMessage.csv deleted file mode 100644 index 82a990050..000000000 --- a/app/locale/nl_NL/Mage_GiftMessage.csv +++ /dev/null @@ -1,38 +0,0 @@ -"Add","Toevoegen" -"Add gift message for shopping cart","Voeg persoonlijke boodschap toe voor winkelmand" -"Add gift messages for quote item of shopping cart","Voeg persoonlijke boodschap toe voor bepaald artikel in winkelmand" -"Add gift messages to products of shopping cart","Voeg persoonlijke boodschappen toe aan producten in winkelmand" -"Add gift options","Voeg cadeauopties toe" -"Add gift options for Individual Items","Voeg cadeauopties toe voor afzonderlijke artikelen" -"Add gift options for the Entire Order","Voeg cadeauopties toe voor gehele bestelling" -"Add gift options.","Cadeauopties toevoegen." -"Allow Gift Messages for Order Items","Cadeauberichten toestaan voor artikelen in bestelling" -"Allow Gift Messages on Order Level","Cadeauberichten toestaan op niveau van bestelling" -"An error occurred while saving the gift message.","Fout bij opslaan van cadeaubericht." -"Are you sure?","Weet u het zeker?" -"Cancel","Annuleren" -"Do you have any gift items in your order?","Zijn er cadeaus bij uw bestelling?" -"Edit","Bewerken" -"From","Van" -"Gift Message","Cadeauboodschap" -"Gift Message API","Persoonlijke boodschap API" -"Gift Options","Cadeauopties" -"Gift Options for","Cadeauopties voor" -"Gift Options for Individual Items","Cadeauopties voor afzonderlijke artikelen" -"Gift Options for the Entire Order.","Cadeauopties voor de hele bestelling." -"Gift Options for this address.","Cadeauopties voor dit adres." -"Item %d of %d","Artikel %d van %d" -"Message","Boodschap" -"No","Nee" -"OK","OK" -"Save Gift Message","Cadeaubericht opslaan" -"The gift message has been removed","Het cadeaubericht is verwijderd" -"The gift message has been saved","Het cadeaubericht is opgeslagen" -"The gift message has been saved.","Het cadeaubericht is opgeslagen." -"To","Naar" -"Unknown entity type","Onbekend entiteit type" -"Use config","Gebruik config" -"Yes","Ja" -"You can leave this box blank if you do not wish to add a gift message for the item.","Je kunt deze ruimte leeglaten als je geen cadeaubericht wilt toevoegen voor dit artikel." -"You can leave this box blank if you do not wish to add a gift message for this address.","Je kunt deze ruimte leeglaten als je geen cadeaubericht wilt toevoegen voor dit adres." -"You can leave this box blank if you do not wish to add a gift message for whole order.","Je kunt deze ruimte leeglaten als je voor de hele bestelling geen cadeaubericht wilt toevoegen." diff --git a/app/locale/nl_NL/Mage_GoogleAnalytics.csv b/app/locale/nl_NL/Mage_GoogleAnalytics.csv deleted file mode 100644 index 26cbe89af..000000000 --- a/app/locale/nl_NL/Mage_GoogleAnalytics.csv +++ /dev/null @@ -1,5 +0,0 @@ -"Account Number","Account nummer" -"Enable","Maak bruikbaar" -"Enable IP anonymization","Activeer IP-anonimisering" -"Google API","Google API" -"Google Analytics","Google Analytics" diff --git a/app/locale/nl_NL/Mage_GoogleBase.csv b/app/locale/nl_NL/Mage_GoogleBase.csv deleted file mode 100644 index 7c379a8d3..000000000 --- a/app/locale/nl_NL/Mage_GoogleBase.csv +++ /dev/null @@ -1,78 +0,0 @@ -"Active","Actief" -"Add Attribute Mapping","Attribuutmapping toevoegen" -"Add New Attribute","Nieuwe attribuut toevoegen" -"Add to Google Base","Aan Google Base toevoegen" -"Are you sure?","Weet u het zeker?" -"Attribute","Attribuut" -"Attribute Set","Attributenset" -"Attribute Set and Item Type","Attributenset en artikeltype" -"Attributes","Attributen" -"Attributes Mapping","Attributenmapping" -"Attributes Set","Attributenset" -"AuthSub","AuthSub" -"Available Products","Beschikbare Producten" -"Base Currency should be set to %s for %s in system configuration. Otherwise item prices won't be correct in Google Base.","Basis munteenheid moet op %s gezet worden voor %s in systeemconfiguratie. Anders zullen prijzen van artikelen niet correct zijn in Google Base." -"Cannot update Google Base Item for Store '%s'","Kan Google Base Item niet bijwerken voor Winkel '%s'" -"Captcha confirmation error: %s","Captcha bevestigingsfout: %s" -"Captcha has been confirmed.","Captcha is bevestigd." -"Catalog","Catalogus" -"Clicks","Kliks" -"ClientLogin","KlantLogin" -"Confirm","Bevestigen" -"Current Mapping will be reloaded. Continue?","Huidige mapping zal opnieuw geladen worden. Doorgaan?" -"Custom attribute, no mapping","Aangepast attribuut, geen mapping" -"Delete","Verwijderen" -"Delete Mapping","Mapping verwijderen" -"Edit Item Type","Artikeltype bewerken" -"Edit Item Type ""%s""","Bewerk artikeltype ""%s""" -"Error: %s","Fout: %s" -"Expires","Verloopt" -"Google","Google" -"Google Base","Google Base" -"Google Base Attribute","Google Base attribuut" -"Google Base ID","Google Base ID" -"Google Base Item Type","Google Base artikeltype" -"Google Base Item type","Google Base artikeltype" -"Google Base Items","Google Base artikelen" -"Google base","Google base" -"Hide","Verbergen" -"Hosted","Gehost" -"Hosted or Google","Gehost of Google" -"Impr.","Impr." -"Invalid Product Model for Google Base Item","Ongeldig productmodel voor Google Base artikel" -"Item Type was deleted","Artikeltype is verwijderd" -"Item Types","Artikeltype" -"Item model is not specified to delete Google Base entry.","Artikelmodel om uit Google Base te verwijderen is niet gespecificeerd." -"Items","Artikelen" -"Manage Attribute Mapping","Attribuutkaart beheren" -"Manage Attributes","Attributen beheren" -"Manage Items","Artikelen beheren" -"New Item Type","Nieuw Item Type" -"New ItemType","Nieuw ArtikelType" -"No","Nee" -"No items were deleted from Google Base","Er zijn geen items verwijderd uit Google Base" -"No items were published","Er zijn geen items gepubliceerd" -"No items were saved as inactive items","Er zijn geen items opgeslagen als inactieve items" -"No products were added to Google Base","Er zijn geen producten toegevoegd aan Google Base" -"Object model is not specified to save Google Base entry.","Object model is niet gespecificeerd om Google Base ingang op te slaan." -"Please, select Attribute Set and Google Item Type to load attributes","Selecteer a.u.b. Attribute Set and Google Item Type om attributen te laden" -"Product Name","Productnaam" -"Publish","Publiceren" -"Published","Gepubliceerd" -"Remove","Verwijderen" -"Save Mapping","Sla Mapping op" -"Session expired during export. Please revise exported products and repeat the process if necessary.","Sessie verlopen tijdens export. Bekijk geëxporteerde producten en herhaal zonodig het proces." -"Synchronize","Synchroniseer" -"Target Country","Target Land" -"The item type has been saved.","Het item type is opgeslagen." -"This action will update items statistics and remove the items which are not available in Google Base. Continue?","Deze actie update item statistieken en verwijderd de items die niet beschikbaar zijn in Google Base. WIlt u verder gaan?" -"Total of %d items(s) have been deleted; total of %d items(s) have been updated.","Totaal van %d item(s) is verwijderd; totaal van %d item(s) is geüpdatet." -"Total of %d items(s) have been published.","Totaal van %d item(s) is gepubliceerd." -"Total of %d items(s) have been removed from Google Base.","Totaal van %d item(s) is verwijderd van Google Base." -"Total of %d items(s) have been saved as inactive items.","Totaal van %d item(s) is opgeslagen als inactief item." -"Total of %d product(s) have been added to Google Base.","Totaal van %d item(s) is toegevoegd aan Google Base." -"Unable to connect to Google Base. Please, check Account settings in configuration.","Niet mogelijk met Google Base te verbinden, bekijk Account instellingen in configuratie." -"Unable to select a Store View.","Niet mogelijk een Store View te selecteren." -"View Available Products","Bekijk Beschikbare Producten" -"View Item in Google Base","Bekijk artikel in Google Base" -"Yes","Ja" diff --git a/app/locale/nl_NL/Mage_GoogleCheckout.csv b/app/locale/nl_NL/Mage_GoogleCheckout.csv deleted file mode 100644 index 57a9a1cfe..000000000 --- a/app/locale/nl_NL/Mage_GoogleCheckout.csv +++ /dev/null @@ -1,131 +0,0 @@ -"* Select shipping method","* Selecteer verzendmethode" -"2Day","Vandaag" -"2nd Day Air","Arriveert 2 werkdagen na verzenddatum" -"2nd Day Air AM","Arriveert 2 werkdagen na verzenddatum in de middag" -"3 Day Select","Levering aan het eind van de 3e werkdag" -"
    Warning: %s
    ","
    Waarschuwing: %s
    " -"Warning! This option disables the merchant calculated shipping. With this option, Google API ignores any attempt to affect shipping prices.","Warning! Deze optie maakt gecalculeerde verzending ongeldig. Met deze optie, negeert Google API elke poging de verzendkosten te beïnvloeden." -"A virtual item to reflect the discount total","Een virtueel artikel om de totale korting te zien" -"A virtual item to reflect the tax total","Een virtueel artikel om de totale b.t.w. te zien" -"AVS Status: %s","Status van adres verificatie: %s" -"Add Shipping Method","Voeg Verzendmethode toe" -"Allowed Methods","Toegestane Methoden" -"Amount: %s","Aantal: %s" -"Auto-generated from GoogleCheckout Charge","Automatische GoogleCheckout Prijs" -"Buyer Account Age: %s days","Aantal dagen dat Koper deze Account heeft: %s dagen" -"CC Partial: xxxx-%s","CC Gedeeltelijk: xxxx-%s" -"CID Status: %s","Status antecedenten onderzoek: %s" -"Carrier Calculated Methods","Precies Berekende Leveringsmethode" -"Cart Discount","Kaart Korting" -"Checkout Image Style","Checkout Afbeelding Stijl" -"Commercial","Reclame" -"Continue Shopping URL","Ga door met Winkelen URL" -"Credit memo has been created automatically","Notitie van krediet is automatisch gemaakt" -"Debug","Debug" -"Default Package Height (in)","Standaard Pakket Hoogte (inches)" -"Default Package Length (in)","Standaard Pakket Lengte (inches)" -"Default Package Width (in)","Standaard Pakket Breedte (inches)" -"Default Price for Methods","Standaard Prijs voor Methoden" -"Default price:","Standaard Prijs:" -"Delivery Address Category","Bezorgadres Categorie" -"Delivery Schedule","Leverschema" -"Description-based delivery","Levering op beschrijving" -"Disable Default Tax Tables","Maak standaard b.t.w. tabel onbruikbaar" -"Discount Tax","Korting b.t.w." -"Eligible for Protection: %s","Geschikt voor Bescherming: %s" -"Email delivery","Email levering" -"Enable","Maak bruikbaar" -"Enable Carrier Calculated","Stel Precies Uitgerekende Verzending in Staat" -"Enable Digital Delivery","Stel Digitale Levering in Staat" -"Enable Flat Rate","Stel Proportioneel Tarief in Staat" -"Enable Merchant Calculated","Stel Prijs Wordt Overeengekomen na Opgave van Adres in Staat" -"Enable this if your checkout request is too big and being cut off.","Stel dit in staat als u betalingsverzoek te groot is en niet wordt geaccepteerd." -"Expiration: %s","Verstrijking: %s" -"Express Mail","Express Post" -"Express Saver","Express Bespaarder" -"FedEx","FedEx" -"Financial: %s -> %s","Financieel: %s -> %s" -"First Overnight","Levering eerstvolgende ochtend van een werkdag" -"Free Shipping","Gratis Verzending" -"Fulfillment: %s -> %s","Invulling: %s -> %s" -"Google API","Google API" -"Google Authorization:","Google Authorisatie:" -"Google Buyer ID: %s","Google Koper ID: %s" -"Google Charge:","Google Prijs:" -"Google Chargeback:","Google Chargeback:" -"Google Checkout","Google Checkout" -"Google Checkout Shipping - Carrier Calculated","Google Checkout Verzending - Precies Uitgerekend" -"Google Checkout Shipping - Digital Delivery","Google Checkout Verzending - Digitale Levering" -"Google Checkout Shipping - Flat Rate","Google Checkout verzending - Proportioneel Tarief" -"Google Checkout Shipping - Merchant Calculated","Google Checkout Verzending - Prijs wordt overeengekomen na opgave van adres" -"Google Checkout: %s","Google Checkout: %s" -"Google Order Number: %s","Google Bestellingsnummer: %s" -"Google Order Status Change:","Google Bestellingsstatus Verandering:" -"Google Refund:","Google Terugbetaling:" -"Google Risk Information:","Google Risico Informatie:" -"GoogleCheckout is not configured","GoogleCheckout is niet geconfigureerd" -"Ground","Grond" -"Hide Cart Contents","Verberg Kaart Inhoud" -"Home Delivery","Thuisbezorging" -"IP Address: %s","IP Adres: %s" -"If enabled, cart contents will be hidden after clicking on the Google Checkout button in the shopping cart, and restored if ""Edit Cart"" link was activated.","Wanneer ontvankelijk, zal de inhoud van de kaart worden verborgen na het klikken op de Google Checkout knop in het boodschappenkarretje en worden hersteld als de ""Pas Kaart Aan"" link is geactiveerd." -"Inches","Inches (duimen)" -"Invoice Auto-Created: %s","Factuur Automatisch Aangemaakt: %s" -"Is Buyer Willing to Receive Marketing Emails: %s","Is Koper Bereid Marketing Emails te Ontvangen: %s" -"Key/URL delivery","Key/URL levering" -"Large - %s","Large - %s" -"Latest Charge: %s","Laatst gemaakte Kosten: %s" -"Latest Chargeback: %s","Laatste Chargeback: %s" -"Latest Refund: %s","Laatste Terugbetaling: %s" -"Location","Locatie" -"Media Mail","Mediapost" -"Medium - %s","Medium - %s" -"Merchant ID","Verkopers Identificatie" -"Merchant Key","Handels Toets" -"Method","Methode" -"New Order Status","Nieuwe Status van de Bestelling" -"Next Day Air","Levering volgende werkdag" -"Next Day Air Early AM","Levering volgende werkdag in de vroege ochtend" -"Next Day Air Saver","Levering volgende werkdag" -"No","Nee" -"No Comment","Geen commentaar" -"No Reason","Zonder Reden" -"Optimistic","Optimistisch" -"Optional, leave empty for home page.","Optioneel, laat leeg voor de home page." -"Order creation error","Bestelorder aanmaak fout" -"Parcel Post","Pakketpost" -"Pessimistic","Pessimistisch" -"Priority Mail","Prioritaire Post" -"Priority Overnight","Levering volgende werkdag" -"Rate 1 Amount","Niveau 1 Aantal" -"Rate 1 Ship To Applicable Countries","Niveau 1 Verzend Naar Geschikte Landen" -"Rate 1 Ship to Specific Countries","Niveau 1 Verzend naar Specifieke Landen" -"Rate 1 Title","Niveau 1 Titel" -"Rate 2 Amount","Niveau 2 Aantal" -"Rate 2 Ship To Applicable Countries","Niveau 2 Venzend Naar Geschikte Landen" -"Rate 2 Ship to Specific Countries","Niveau 2 Verzend naar Specifieke Landen" -"Rate 2 Title","Niveau 2 Titel" -"Rate 3 Amount","Niveau 3 Aantal" -"Rate 3 Ship To Applicable Countries","Niveau 3 Verzend Naar Geschikte Landen" -"Rate 3 Ship to Specific Countries","Niveau 3 Verzend naar Specifieke Landen" -"Rate 3 Title","Niveau 3 Titel" -"Required for live Google Checkout transactions. Make sure that this option corresponds to Use Secure URLs in Frontend (""Web"" > ""Secure"").","Vereist voor live Google Checkout transacties. Zorg ervoor dat deze optie overeenkomt met het gebruiken van Secure URL's in Frontend (""Web""> ""Secure"")." -"Residential","residentieel" -"Sandbox","Zandbak" -"Secure Callback URL","Veilige Terugbelfunctie URL" -"Small - %s","Small - %s" -"Standard Overnight","Standaard levering volgende werkdag" -"The tax amount has been applied based on the information received from Google Checkout, because tax amount received from Google Checkout is different from the calculated tax amount","De toegepaste hoeveelheid b.t.w. is gebaseerd op de ontvangen informatie van Google Checkout, omdat de ontvangen hoeveelheid b.t.w. anders is dan de berekende." -"Title","Titel" -"Total Chargeback: %s","Totale Chargeback: %s" -"Total Charged: %s","Totaal Bedrag: %s" -"Total Refunded: %s","Totale teruggave: %s" -"Transparent","Transparant" -"UPS","UPS" -"USPS","USPS" -"United Kingdom","Verenigd Koninkrijk" -"United States","Verenigde Staten" -"Unknown Reason","Onbekende Reden" -"White Background","Witte Achtergrond" -"Yes","Ja" -"You will be redirected to GoogleCheckout in a few seconds.","U gaat binnen enkele seconden terug naar GoogleCheckout" diff --git a/app/locale/nl_NL/Mage_ImportExport.csv b/app/locale/nl_NL/Mage_ImportExport.csv deleted file mode 100644 index 4fb1cfcd9..000000000 --- a/app/locale/nl_NL/Mage_ImportExport.csv +++ /dev/null @@ -1,93 +0,0 @@ -"%s file does not exists or is not readable","%s bestand bestaat niet of is onleesbaar" -"-- Please Select --","-- Selecteer alstublieft --" -"Adapter must be an instance of Mage_ImportExport_Model_Import_Adapter_Abstract","Adapter moet een instantie zijn van Mage_ImportExport_Model_Import_Adapter_Abstract" -"Adapter object must be an instance of %s","Er moet %s worden ingevoerd" -"Adapter type must be a non empty string","Adaptertype mag geen lege zin zijn" -"Append Complex Data","Voeg Complex Data Toe" -"Attribute Code","Attribuutcode" -"Attribute Label","Attribuutlabel" -"Attribute does not has options, so filtering is impossible","Attribuut heeft geen opties, dus filtering is onmogelijk" -"Begin data validation","Begin gegevensvalidatie" -"Begin export of %s","Begin export van %s" -"Begin import of ""%s"" with ""%s"" behavior","Begin import van ""%s"" met ""%s"" gedrag" -"CSV","CSV" -"Can not determine attribute filter type","Kan filtertype attribuut niet bepalen" -"Can not find required columns: %s","Kan de benodigde %s kolommen vinden" -"Cannot get autoincrement value","Kan autoincrement waarde niet krijgen" -"Check Data","Kijk Data Na" -"Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d","Rijen gecontroleerd: %d, gecontroleerde eenheden: %d ongeldige rijen: %d, totaal aantal fouten: %sd" -"Column names have duplicates","Kolomnamen bevat dubbele invoer" -"Column names is empty or is not an array","Kolomnamen is leeg of niet een reeks" -"Column names: ""%s"" are invalid","Kolomnamen: ""%s"" is ongeldig" -"Customers","Klanten" -"Data is invalid or file is not uploaded","Gegevens zijn ongeldig of bestand is niet geüpload" -"Delete Entities","Verwijder Eenheden" -"Destination directory is not writable","Bestemmingsmap is niet beschrijfbaar" -"Destination file is not writable","Bestemmingsbestand is niet schrijfbaar" -"Destination file path must be a string","Bestemmingspad bestand moet tekst zijn" -"Done import data validation","import gegevensvalidatie voltooid" -"Duplicate Unique Attribute for '%s'","Dubbele Unieke Eigenschap voor '%s'" -"Entity Type","Eenheid Type" -"Entity adapter obejct must be an instance of Mage_ImportExport_Model_Export_Entity_Abstract","Entiteit adapter obejct moet een instantie van Mage_ImportExport_Model_Export_Entity_Abstract worden" -"Entity adapter object must be an instance of Mage_ImportExport_Model_Import_Entity_Abstract","Entiteit adapterobject moet een instantie zijn van Mage_ImportExport_model_Import_Entity_Abstract" -"Entity is unknown","Entiteit is onbekend" -"Entity type model must be an instance of Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract","Entiteit type model moet een instantie zijn van Mage_ImportExport_Model_Export_Entiteit_Product_Type_Abstract" -"Entity type model must be an instance of Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract","Entiteit type model moet een instantie zijn van Mage_ImportExport_Model_Import_Entiteit_Product_Type_Abstract" -"Error in data structure: behaviors are mixed","Fout in datastructuur: gedragingen zijn gemengd" -"Error in data structure: entity codes are mixed","Fout in datastructuur: entiteitcodes zijn gemengd" -"Errors limit (%d) reached. Please fix errors and re-upload file","Fouten limiet (%d) bereikt. Gelieve de fouten te repareren en het bestand opnieuw te uploaden" -"Export","Export" -"Export File Format","Export Bestand Formaat" -"Export Settings","Export Instellingen" -"Export has been done.","Export is voltooid." -"Exported %s rows.","Geëxporteerde %s regels." -"File does not contain data.","Bestand bevat geen gegevens." -"File does not contain data. Please upload another one","Bestand bevat geen gegevens. Upload a.u.b. een andere" -"File format is unknown","Bestand format is onbekend" -"File is partially valid, but import is not possible","Bestand is gedeeltelijk geldig, maar het is niet mogelijk te importeren" -"File is totally invalid. Please fix errors and re-upload file","Bestand is totaal ongeldig. Herstel a.u.b. de fouten en upload bestand opnieuw" -"File is valid! To start import process press ""Import"" button","Bestand is geldig! Om het importeren te starten klik op de ""Import"" knop" -"File is valid, but import is not possible","Bestand is geldig, maar het is niet mogelijk te importeren" -"File was not uploaded","Bestand was niet geüpload" -"Filter","Filter" -"From","Van" -"Header column names already set","Koptekst kolom namen zijn reeds ingesteld" -"Import","Import" -"Import Behavior","Import Gedrag" -"Import Settings","Import Instellingen" -"Import has been done successfuly.","Import is succesvol gedaan." -"Import successfully done.","Import is succesvol gelukt" -"Import/Export","Import/Export" -"Input entity code is not equal to entity adapter code","Ingevoerde entity code staat niet gelijk aan de entity adapter code" -"Invalid entity","Ongeldige entity" -"Invalid entity model","Ongeldig eenheidsmodel" -"Invalid file format","Ongeldig bestandsformat" -"Invalid parameters","Ongeldige parameters" -"Invalid seek position","Ongeldige zoek positie" -"Invalid value for '%s'","Ongeldige waarde voor '%s'" -"Invalid value for '%s' column","Ongeldige waarde voor '%s' kolom" -"No filter data provided","Geen gefilterde data gegeven" -"No source specified","Geen bron gespecificeerd" -"No valid data sent","Geen geldige gegevens verzonden" -"No writer specified","Geen schrijver gespecificeerd" -"Node does not has model token tag","Node heeft geen model token tag" -"Not implemented yet","Nog niet ingevoerd" -"Please fix errors and re-upload file","Herstel a.u.b. fouten en upload bestand opnieuw" -"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Gelieve de fouten te corrigeren en de bestanden opnieuw te uploaden of klik simpelweg ""Importeer"" om een regel met fouten over te slaan" -"Products","Producten" -"Replace Existing Complex Data","Vervang Bestaande Complex Data" -"Select File to Import","Selecteer Bestand om te Importeren" -"Skip","Sla over" -"Source file moving failed","Verplaatsen van het bronbestand mislukt" -"Source file path must be a string","Bronbestand moet een string zijn" -"Source is not set","Bron is niet aangegeven" -"Status","Status" -"There are no product types available for export","Er zijn geen product types beschikbaar voor export" -"There is no data for export","Er is geen data om te exporteren" -"To","Naar" -"Total size of uploadable files must not exceed %s","Totale grootte van bestanden die geüpload dienen te worden moet niet groter zijn dan %s" -"Unknown attribute filter type","Onbekend attributenfilter type" -"Uploaded file has no extension","Het geüploade bestand heeft geen uitgang" -"Validation finished successfully","Validatie voltooid met succes" -"in rows","in regels" -"in rows:","in regels:" diff --git a/app/locale/nl_NL/Mage_Index.csv b/app/locale/nl_NL/Mage_Index.csv deleted file mode 100644 index a9a5ae243..000000000 --- a/app/locale/nl_NL/Mage_Index.csv +++ /dev/null @@ -1,47 +0,0 @@ -"%s Index process is working now. Please try run this process later.","%s Index proces is nu in werking. Probeer dit proces later te laten lopen." -"%s index was rebuilt.","%s index is verbouwd." -"'%s' Index Process Information","'%s' Index Proces Informatie" -"Action","Actie" -"Cannot initialize the indexer process.","Kan het indexeerproces niet initialiseren." -"Change Index Mode","Change Index Modus" -"Click here to go to Cache Management and refresh cache types.","Klik hier om naar Cache beheer te gaan en ververs cachetypes." -"Click here to go to Index Management and rebuild required indexes.","Klik hier om naar Indexbeheer te gaan en de vereiste indices te herbouwen." -"Delete","Verwijderen" -"Description","Beschrijving" -"Disable","Maak onbruikbaar" -"Enable","Maak bruikbaar" -"General","Algemeen" -"Index","Index" -"Index Description","Index Omschrijving" -"Index Management","Index Management" -"Index Mode","Index Modus" -"Index Name","Index Naam" -"Index mode","Index modus" -"Indexer code is not defined.","Indexeercode is niet gedefinieerd." -"Indexer model is not defined.","Indexeermodel is niet gedefinieerd." -"Indexer model should extend Mage_Index_Model_Indexer_Abstract.","Indexeermodel moet Mage_Index_Model_Indexer_Abstract uitbreiden." -"Manual Update","Handmatige Update" -"Mode","Modus" -"Never","Nooit" -"No","Nee" -"One or more of the Indexes are not up to date:","Een of meer van de indexen zijn niet up-to-date:" -"Please select Index(es)","Selecteer index(en)" -"Please select Indexes","Selecteer indexen" -"Process Information","Procesinformatie" -"Processing","Aan het verwerken" -"Ready","Gereed" -"Refresh","Ververs" -"Reindex Data","Data herindexeren" -"Reindex Required","Herindexering noodzakelijk" -"Revoke","Intrekken" -"Status","Status" -"System","Systeem" -"The index has been saved.","De index is opgeslagen." -"There was a problem with reindexing process.","Er was een probleem met het herindexeren." -"There was a problem with saving process.","Er is een probleem bij het opslaan." -"Total of %d index(es) have changed index mode.","Totaal van %d index(en) hebben een gewijzigde index modus." -"Total of %d index(es) have reindexed data.","Totaal van %d index(en) hebben geherindexeerde data." -"Update Required","Update is Nodig" -"Update on Save","Update bij opslaan." -"Updated At","Geüpdate At" -"Yes","Ja" diff --git a/app/locale/nl_NL/Mage_Install.csv b/app/locale/nl_NL/Mage_Install.csv deleted file mode 100644 index ad1dd9192..000000000 --- a/app/locale/nl_NL/Mage_Install.csv +++ /dev/null @@ -1,125 +0,0 @@ -"(Make sure you keep it in a safe place.)","(Zorg ervoor dat u het op een veilige plaats bewaard)" -"(Optional. Leave blank for no prefix)","(Optioneel. Laat leeg als er geen prefix is)" -"(ver. %s)","(ver. %s)" -"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","Extra pad toegevoegd na Base URL om uw Administratieve Paneel te bereiken (b.v. admin, database, bediening enz.)." -"Admin Path","Admin Pad" -"After successfull installation please click the button below.","Zodra installatie gelukt is, klik op onderstaande knop." -"All packages were installed, click 'OK' to continue with installation.","Alle pakketten zijn geïnstalleerd, klik op 'OK' om met de installatie verder te gaan." -"Alternatively you could try the 'Manual Downloads and Upgrades' method.","U kunt daarnaast ook de 'Handmatige Downloads en Upgrades' methode proberen." -"Base URL","Basis URL" -"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Voor u doorgaat met opslaan, maak a.u.b. een notitie van uw versleutelingscode (Magento gebruikt het om wachtwoorden, creditcards en meer te versleutelen)." -"Check out our","Bekijk onze" -"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Bekijk dit vakje alleen als het niet lukt om automatisch Secure URL te valideren, bijvoorbeeld als HTTP verificatie vereist is." -"Check this box only if it is not possible to automatically validate the Base URL.","Bekijk dit vakje alleen als het niet lukt om automatisch Base URL te valideren." -"Choose this if you would like to test frontend and backend functionality.","Kies dit als u de front en back end functionaliteit wilt testen." -"Configuration","Configuratie" -"Confirm Password","Bevestig wachtwoord" -"Connection","Verbinding" -"Continue","Doorgaan" -"Continue After Manual Download","Ga door Na Handmatige Download" -"Continue Full Download / SVN Installation","Ga door Met Volledige Download / SVN Installatie" -"Create Admin Account","Creëer Admin Account" -"Currently this is the most stable state available for Magento packages.","Op dit moment is dit de stabielste staat voor Magento pakketten." -"Database","Database" -"Database Connection","Database Verbinding" -"Database Name","Naam Database" -"Database Name cannot be empty.","Naam database kan niet leeg zijn." -"Database Type","Database Type" -"Database connection error.","Database connectie fout." -"Database host","Database host" -"Database server does not support the InnoDB storage engine.","Database-server ondersteunt de InnoDB opslag engine niet." -"Database user name","Database gebruikersnaam" -"Database user password","Database gebruikerswachtwoord" -"Default Currency","Standaard Currency" -"Download","Download" -"Download Magento Core Modules and Updates","Download Magento Core Modules en Updates" -"Downloading and installing Magento, please wait...","Magento aan het downloaden en installeren, wachten aub..." -"Email","Email" -"Email Address","e-mailadres" -"Enable Charts","Charts instellen" -"Enable this option if you want the charts to be displayed on Dashboard.","Schakel deze optie in als je de grafieken weergegeven wilt hebben op Dashboard." -"Enable this option only if you have SSL available.","Schakel deze optie alleen in als je SSL geschikbaar hebt." -"Encryption Key","Versleutel Key" -"File System","Bestanden Systeem" -"First Name","Voornaam" -"Full Download / SVN Installation","Volledige Download / SVN installatie" -"Get ready to experience Open-Source eCommerce Evolved.","Maak je klaar om de nieuwe versie Open-Source eCommerce te ervaren." -"Go to Backend","Ga naar Backend" -"Go to Frontend","Ga naar Frontend" -"Having trouble installing Magento?","Moeilijkheden met het installeren van Magento?" -"Help Us to Keep Magento Healthy","Help ons Magento gezond te houden" -"Host","Host" -"I agree to the above terms and conditions.","Ik accepteer de bovenstaande voorwaarden en condities." -"If you are a developer and would like to have the latest public updates, choose this option.","Kies deze optie indien u een ontwikkelaar bent en de laatste updates wilt ontvangen." -"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Indien u PHP gebruikt als CGI, dan kunt u uw PHP processen onder dezelfde gebruiker uitvoeren als de gebruiker die u heeft gebruikt voor uw Magento bestanden." -"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Indien u de installatiewizard over een oudere Magento versie laat installeren, moet u deze methode gebruiken." -"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Indien u uw Magento folders niet beschrijfbaar wilt, of kunt maken voor het webproces, dan kunt u het PEAR bestand gelocaliseerd in de root van de Magento installatie gebruiken." -"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","Als u het volledige pakket heeft gedownload, of Magento via SVN heeft geïnstalleerd, dan kan u het beste de pakket installatie en verificatie voorbij gaan door op de knop hieronder te klikken." -"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","Als u het liefste de Magento pakketten met het web administratie bedieningspaneel wilt beheren, moeten alle Magento folders en bestanden web beschrijfbare toestemming hebben." -"If your server is running on MS Windows, most probably you will not need to change anything.","Als uw server MS Windows gebruikt hoeft u waarschijnlijk niks te veranderen." -"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","In andere gevallen zult u de Magento bestanden beschrijfbare toestemming moeten geven voor de gebruiker waaronder het web proces draait." -"Installation","Installatie" -"Installation Guide","Installatie Handleiding" -"Installer does not exist for %s database type","Installer bestaat niet voor de %s database soort" -"Last Name","Achternaam" -"License Agreement","Licentie-overeenkomst" -"Locale","Lokaal" -"Locale settings","Lokale instellingen" -"Localization","Lokalisatie" -"Login Information","Log in Gegevens" -"Magento","Magento" -"Magento Connect Manager Deployment","Magento Connect Manager Deployment" -"Magento Installation Wizard","Magento Installatiewizard" -"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento is een handelsmerk van Magento Inc. Copyright © %s Magento Inc." -"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento gebruikt deze sleutel om wachtwoorden, creditcards en dergelijke te beveiligen. Als u dit veld leeg laat zal het systeem een encryptiesleutel voor uw aanmaken en het op de volgende pagina weergeven." -"Manual Downloads and Upgrades","Handmatig Downloaden en Upgraden" -"No resource for %s DB model.","Geen hulpbron voor %s DB model." -"One of PHP Extensions ""%s"" must be loaded.","Een van de PHP extensies ""%s""moet geladen zijn." -"PHP Extension '%s' loaded","PHP Uitbreiding '%s' geladen" -"PHP Extensions ""%s"" must be loaded.","PHP Extensions ""%s"" moeten worden geladen." -"PHP extension ""%s"" must be loaded.","PHP extensie ""%s"" moet geladen zijn." -"Package Management through the Web","Pakket Management door het Web" -"Password","Wachtwoord" -"Password Confirmation","Wachtwoord Confirmatie" -"Path ""%s"" must be writable.","Pad ""%s"" moet beschrijfbaar zijn." -"Personal Information","Persoonlijke Informatie" -"Please correct the user data and try again.","Gelieve de gebruikers data de corrigeren en het nogmaals te proberen." -"Please make sure that mod_rewrite is enabled in Apache configuration.","Controleer of mod_rewrite is ingeschakeld in uw Apache configuratie." -"Please note that it is much less stable than beta.","Houd er rekening mee dat het veel minder stabiel is dan beta." -"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","Let op! Op het moment worden alleen UNIX, Linux en Mac OS X shells ondersteund. Voor Windows gelieve de '%s' optie te gebruiken." -"Please set all required settings before clicking Continue","Gelieve alle benodigde instellingen in te stellen voordat u verder gaat" -"Preferred stability: %s","Gewenste stabiliteit: %s" -"Proceed With Automatic Download (%s)","Verder Gaan Met Automatische Download (%s)" -"Provide a complete base URL for SSL connection. For example: %s","Geef een volledige basis URL voor SSL connectie. Bijvoorbeeld: %s" -"Report All Bugs","Rapporteer Alle Bugs" -"Required Fields","Benodigde Velden" -"Response from server isn\'t valid.","Antwoord van de server is niet valide." -"Run admin interface with SSL","Start administratie bedieningspaneel met SSL" -"Run this in your shell from Magento root folder:","Voer dit in uw shell van uw Magento root folder uit:" -"Save Session Data In","Sla Sessie Data Op In" -"Save Session Files In","Sla Sessie Bestanden Op In" -"Secure Base URL","Veilige Basis URL" -"Session Storage Options","Sessie Opslag Opties" -"Setting preferred state to: %s","Verander gewenste staat naar: %s" -"Skip Base URL Validation Before the Next Step","Sla Basis-URL Validatie Over Voor de Volgende Stap" -"Skip Secure URL validation before next step","Sla Beveiligde URL validatie over voor volgende stap" -"Tables Prefix","Tabellen Voorvoegsel" -"The URL ""%s"" is invalid.","De URL ""%s"" is ongeldig." -"The URL ""%s"" is not accessible.","De URL ""%s"" is niet toegankelijk." -"The database server version doesn\'t match system requirements (required: %s, actual: %s).","De database server komt niet overeen met systeemvereisten (benodigd: %s, werkelijk: %s)." -"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","In de tabel prefix mogen alleen letters (az), cijfers (0-9) en onderstrepingstekens (_) bevatten, het eerste karakter moet een letter zijn." -"There was a problem installing Magento packages. Please read the log, correct errors and try again.","Er was een probleem met het installeren van Magento pakketten. Lees alstublieft het logboek, verbeter fouten en probeer het opnieuw." -"Time Zone","Tijdszone" -"Use Secure URLs (SSL)","Gebruik Beveiligde URL's (SSL)" -"Use Web Server (Apache) Rewrites","Gebruik Web Server (Apache) Herschrijvingen" -"User Name","Gebruikersnaam" -"User Password","Gebruikerswachtwoord" -"Username","Gebruikersnaam" -"Validation","Validatie" -"Web access options","Webtoegangsopties" -"Welcome","Welkom" -"Welcome to Magento's Installation Wizard","Welkom bij Magento's Installatiewizard" -"You can specify server port, ex.: localhost:3307
    If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","U kunt een serverpoort specificeren, bv.: localhost:3307
    Als u niet de standaard UNIX-socket gebruikt, kunt u deze hier specificeren in plaats van host, bv.: /var/run/mysqld/mysqld.sock" -"You could enable this option to use web server rewrites functionality for improved search engines optimization.","U zou deze optie kunnen inschakelen om webserver herschrijving functionaliteit te gebruiken voor verbeterde zoekmachines optimalisatie." -"You're All Set","U Bent Klaar" -"You're All Set!","U Bent Klaar!" diff --git a/app/locale/nl_NL/Mage_Log.csv b/app/locale/nl_NL/Mage_Log.csv deleted file mode 100644 index 44c250e50..000000000 --- a/app/locale/nl_NL/Mage_Log.csv +++ /dev/null @@ -1,9 +0,0 @@ -"Enable Log Cleaning","Schonen van log toestaan" -"Error Email Recipient","Foutmelding Email Ontvanger" -"Error Email Sender","Foutmelding Email Verstuurder" -"Error Email Template","Foutmelding Email Template" -"Frequency","Frequentie" -"Log Cleaning","Log aan het schonen" -"Log cleanup Warnings","Log schoonmaak waarschuwingen" -"Save Log, Days","Log opslaan, dagen" -"Start Time","Begintijd" diff --git a/app/locale/nl_NL/Mage_Media.csv b/app/locale/nl_NL/Mage_Media.csv deleted file mode 100644 index c99a85d43..000000000 --- a/app/locale/nl_NL/Mage_Media.csv +++ /dev/null @@ -1,3 +0,0 @@ -"An error occurred while creating the image.","Er is een fout opgetreden tijdens het aanmaken van het plaatje." -"The image does not exist or is invalid.","De afbeelding bestaat niet of is niet valide." -"This content requires last version of Adobe Flash Player. Get Flash","Deze inhoud vereist de meest recente versie van Adobe Flash Player. Get Flash" diff --git a/app/locale/nl_NL/Mage_Newsletter.csv b/app/locale/nl_NL/Mage_Newsletter.csv deleted file mode 100644 index 496a73b8a..000000000 --- a/app/locale/nl_NL/Mage_Newsletter.csv +++ /dev/null @@ -1,137 +0,0 @@ -" Copy","Kopieer" -"Action","Actie" -"Add New Template","Nieuw Sjabloon Toevoegen" -"Add to Queue","Toevoegen aan de wachtrij" -"Allow Guest Subscription","Sta Gast Subscriptie Toe" -"An error occurred while saving your subscription.","Er heeft een fout plaatsgevonden tijdens het opslaan van uw subscriptie." -"Are you sure that you want to delete this template?","Weet je zeker dat je dit sjabloon wilt verwijderen?" -"Are you sure that you want to strip all tags?","Weet u zeker dat uw alle labels wilt verwijderen?" -"Back","Terug" -"Cancel","Annuleren" -"Cancelled","Geannuleerd" -"Cannot mark as received subscriber.","Kan niet markeren als ontvangen aanmelder." -"Confirmation Email Sender","Confirmatie E-mail Verstuurder" -"Confirmation Email Template","Confirmatie E-mail Sjabloon" -"Confirmation request has been sent.","Confirmatie verzoek verzonden." -"Convert to Plain Text","Verander naar Gewone Tekst" -"Create Newsletter Template","Maak een Nieuw Nieuwsbrief Sjabloon" -"Customer","Klant" -"Customer First Name","Voornaam Klant" -"Customer Last Name","Achternaam Klant" -"Customer My Account Newsletter Subscriptions","Klant Mijn Account Nieuwsbrief Aanmeldingen" -"Date Added","Datum Toegevoegd" -"Date Updated","Bijgewerkt op datum" -"Delete","Verwijderen" -"Delete Selected Problems","Verwijder Geselecteerde Problemen" -"Delete Template","Verwijder Template" -"Do you really want to cancel the queue?","Weet u zeker dat u de wachtrij wilt opheffen?" -"Duplicate template code.","Sjabloon code is al in gebruik." -"Edit Newsletter","Nieuwsbrief Aanpassen" -"Edit Newsletter Template","Nieuwsbrief Sjabloon Aanpassen" -"Edit Queue","Bewerk Rij" -"Edit Template","Bewerk Sjabloon" -"Email","Email" -"Enter your email address","Vul hier uw e-mailadres in" -"Error Code","Fout Code" -"Error Text","Fout Omschrijving" -"Follow this link to unsubscribe {{var subscriber.getUnsubscriptionLink()}}","Volg deze link om je af te melden <!-- Deze tag is voor de afmeldingslink -->{{var subscriber.getUnsubscriptionLink()}}" -"Guest","Gast" -"ID","ID" -"Invalid queue selected.","Ongeldige wachtrij geselecteerd" -"Invalid subscription ID.","Ongeldig abonnement." -"Invalid subscription confirmation code.","Ongeldige bevestigingscode abonnement" -"Message","Boodschap" -"Need to Confirm","Bevestiging vereist" -"New Newsletter Template","Nieuwe Nieuwsbrief Sjabloon" -"New Template","Nieuw Sjabloon" -"Newsletter","Nieuwsbrief" -"Newsletter Message Preview","Voorbeeld Nieuwsbrief Bericht" -"Newsletter Problem Reports","Nieuwsbrief Probleem Overzichten" -"Newsletter Queue","Nieuwsbrief Wachtrij" -"Newsletter Section","Nieuwsbrief sectie" -"Newsletter Sign-up:","Aanmelden voor Nieuwsbrief:" -"Newsletter Styles","Nieuwsbrief stijlen" -"Newsletter Subscribers","Nieuwsbrief abonnees" -"Newsletter Subscription","Nieuwsbrief abonnement" -"Newsletter Subscription Form Before","Aanmeldingsformulier nieuwsbrief eerst" -"Newsletter Subscriptions","Nieuwsbrief abonnementen" -"Newsletter Templates","Nieuwsbrief sjablonen" -"Newsletter subscription confirmation","Nieuwsbrief abonnementsbevestiging" -"Newsletter subscription success","Nieuwsbrief inschrijven geslaagd" -"Newsletter unsubscription success","Nieuwsbrief uitschrijven geslaagd" -"No Templates Found","Geen sjablonen gevonden" -"No problems found.","Geen problemen gevonden." -"No subscribers selected.","Geen abonnees geselecteerd." -"Not Activated","Niet geactiveerd" -"Not Sent","Niet verstuurd" -"Pause","Pauzeer" -"Paused","Gepauzeerd" -"Please enter a valid email address.","Voer een geldig email adres in." -"Please enter new template name","Voer een nieuwe sjabloonnaam in" -"Please refer to exeption.log","Raadpleeg alstublieft exeption.log" -"Please select subscriber(s)","Selecteer abonnee(s)" -"Preview","Preview" -"Preview Template","Voorbeeld sjabloon" -"Processed","Verwerkt" -"Queue Date Start","Startdatum wachtrij" -"Queue Finish","Einde Wachtrij" -"Queue Information","Informatie Wachtrij" -"Queue Newsletter...","Nieuwsbrief Wachtrij..." -"Queue Start","Begin Wachtrij" -"Queue Subject","Onderwerp Wachtrij" -"Recipients","Ontvangers" -"Reset","Opnieuw" -"Resume","Ga door (meaning ' continue')" -"Return HTML Version","Laat Zien in HTML" -"Save As","Opslaan Als" -"Save Newsletter","Nieuwsbrief Opslaan" -"Save Template","Sjabloon Opslaan" -"Save and Resume","Opslaan en Doorgaan" -"Selected problem subscribers have been unsubscribed.","Geselecteerde probleem abonnees zijn losgekoppeld" -"Selected problems have been deleted.","Geselecteerde problemen zijn verwijderd" -"Sender","Verzender" -"Sender Email","Afzender Email" -"Sender Name","Naam Afzender" -"Sending","Verzenden" -"Sent","Verzonden" -"Sign Up for Our Newsletter:","Schrijf in voor Onze Nieuwsbrief" -"Sign up for our newsletter","Schrijf in voor onze nieuwsbrief" -"Sorry, but administrator denied subscription for guests. Please register.","Sorry, maar de beheerder heeft aanmelding voor gasten uitgeschakeld. Registreer u alstublieft." -"Start","Begin" -"Status","Status" -"Store","Winkel" -"Store View","Aanblik winkel" -"Subject","Onderwerp" -"Submit","Bevestig" -"Subscribe","Inschrijven" -"Subscribed","Uitschrijven" -"Subscriber","Abonnee" -"Subscribers","Abonnees" -"Subscribers From","Inschrijfformulier" -"Subscription Options","Abonnee opties" -"Success Email Sender","Email afzender geslaagd" -"Success Email Template","Email sjabloon geslaagd" -"Template Content","Inhoud sjabloon" -"Template Information","Sjabloon informatie" -"Template Name","Naam sjabloon" -"Template Styles","Sjabloon Stijlen" -"Template Subject","Sjabloon Onderwerp" -"Template Type","Sjabloon Type" -"Thank you for your subscription.","Bedankt voor het inschrijven." -"The subscription has been removed.","Het abonnement is verwijderd." -"The subscription has been saved.","Het abonnement is opgeslagen." -"There was a problem with the subscription.","Er was een probleem bij het inschrijven." -"There was a problem with the subscription: %s","Er was een probleem bij het inschrijven: %s" -"There was a problem with the un-subscription.","Er was een probleem bij het uitschrijven." -"This email address is already assigned to another user.","Dit emailadres wordt al door een andere gebruiker gebruikt." -"Type","Type" -"Unconfirmed","Onbevestigd" -"Unsubscribe","Uitschrijven" -"Unsubscribe Selected","Uitschrijving geselecteerd" -"Unsubscribed","Uitgeschreven" -"Unsubscription Email Sender","Uitschrijving email zender" -"Unsubscription Email Template","Sjabloon uitschrijvingsbericht" -"View Newsletter","Bekijk nieuwsbrief" -"Website","Website" -"You have been unsubscribed.","U bent uitgeschreven." -"Your subscription has been confirmed.","Uw uitschrijving is bevestigd." diff --git a/app/locale/nl_NL/Mage_Oauth.csv b/app/locale/nl_NL/Mage_Oauth.csv deleted file mode 100644 index ca505cf0a..000000000 --- a/app/locale/nl_NL/Mage_Oauth.csv +++ /dev/null @@ -1,118 +0,0 @@ -"%name% '%value%' is too long. It must has length %min% symbols.","%name% '%value%' is te lang. Het moet een lengte hebben %min% symbolen." -"%name% '%value%' is too short. It must has length %min% symbols.","%name% '%value%' is te kort. Het moet een lengte hebben %min% symbolen." -"* Required Fields","* Vereiste velden" -"%s requests access to your account","%s requests access to your account" -"Admin","Admin" -"After authorization application will have access to you account.","After authorization application will have access to you account." -"An error occurred on confirm authorize.","Er is een fout opgetreden tijdens de bevestiging van de autorisatie." -"An error occurred on delete action.","Er is een fout opgetreden tijdens de verwijder actie." -"An error occurred on delete application.","Er is een fout opgetreden tijdens het verwijderen van de toepassing." -"An error occurred on reject authorize.","Er is een fout opgetreden tijdens het afwijzen van de autorisatie." -"An error occurred on saving consumer data.","Er is een fout opgetreden tijdens het opslaan van de consumentengegevens." -"An error occurred on update revoke status.","Er is een fout opgetreden tijdens het wijzigen van de status intrekken." -"An error occurred while deleting the consumer.","Er is een fout opgetreden tijdens het verwijderen van de consument." -"An error occurred.","Er is een fout opgetreden." -"An error occurred. Your authorization request is invalid.","Er is een fout opgetreden. Uw autorisatie verzoek is ongeldig." -"App Name","App Naam" -"Application ""%s"" has been deleted.","Toepassing ""%s"" is verwijderd." -"Application ""%s"" has been enabled.","Toepassing ""%s"" is ingeschakeld." -"Application ""%s"" has been revoked.","Toepassing ""%s"" is ingetrokken." -"Application Name","Naam toepassing" -"Application not found.","Toepassing niet gevonden." -"Are you sure you want to delete this application?","Weet u zeker dat u deze toepassing wilt verwijderen?" -"Are you sure you want to disable this application?","Weet u zeker dat u deze toepassing wilt verwijderen?" -"Are you sure you want to enable this application?","Weet u zeker dat u deze toepassing mogelijk wilt maken?" -"Authorization confirmed","Authorization confirmed" -"Authorization confirmed.","Autorisatie bevestigd." -"Authorize","Authorize" -"Authorize application","Authorize application" -"Authorized Tokens","Geautoriseerde Tokens" -"Callback URL","Callback URL" -"Cleanup Probability","Opschonings Waarschijnlijkheid" -"Cleanup Settings","Opschonings Instellingen" -"Close","Sluiten" -"Confirm OAuth token authorization","Bevestig OAuth token autorisatie" -"Confirm token authorization Pop Up for admin","Confirm token authorization Pop Up for admin" -"Confirm token authorization for admin","Confirm token authorization for admin" -"Confirmation Of Authorization","Confirmation Of Authorization" -"Consumer Information","Consumenteninformatie" -"Consumer Name","Consument Naam" -"Consumers","Consumenten" -"Created At","Gemaakt op" -"Customer","Klant" -"Customer My Account My OAuth Applications","Consumentenservice Mijn account Mijn OAuth Toepassingen" -"Delete","Verwijderen" -"Disable","Maak onbruikbaar" -"Disabled","Uitgeschakeld" -"Edit","Bewerken" -"Edit Consumer","Bewerk consument" -"Email","Email" -"Email Address","e-mailadres" -"Enable","Stel in werking" -"Enabled","Aan" -"Entry with ID #%s not found.","Entry met ID #%s niet gevonden." -"Expiration Period","Vervalperiode" -"Give the verifier code to application administrator","Give the verifier code to application administrator" -"ID","ID" -"Invalid Callback URL","Ongeldige Callback URL" -"Invalid ID parameter.","Ongeldige ID parameter." -"Invalid Rejected Callback URL","Ongeldige Verworpen Callback URL" -"Invalid entry ID.","Ongeldige entry ID." -"Invalid revoke status.","Intrekken status ongeldig." -"Key","Sleutel" -"Log In","Inloggen" -"Log in as a customer","Log in als een consument" -"Log in as admin","Log in als beheerder" -"Log in as customer","Log in als consument" -"Log in to use %s","Log in to use %s" -"Login","Log in" -"My Applications","My Applications" -"Name","Naam" -"New Consumer","Nieuwe Consument" -"OAuth","OAuth" -"OAuth Admin My Apps","OAuth Beheerd Mijn apps" -"OAuth Authorized Tokens","OAuth Geautoriseerde Tokens" -"OAuth Consumers","OAuth Consumers" -"OAuth authorization Pop Up for customer","OAuth autorisatie Pop Up voor de consument" -"OAuth authorization for admin","OAuth authorization for admin" -"OAuth authorization for customer","OAuth autorisatie voor consument" -"OAuth authorization simple for admin","OAuth authorization simple for admin" -"Password","Wachtwoord" -"Permissions","Toestemmingen" -"Please login to proceed authorization.","Log in om de autorisatie door te voeren." -"Please select needed row(s).","Selecteer noodzakelijke regel(s)." -"Please select revoke status.","Selecteer status intrekken." -"REST - My Apps","REST - Mijn apps" -"REST - OAuth Authorized Tokens","REST - OAuth Geautoriseerde Tokens" -"REST - OAuth Consumers","REST - OAuth Consumenten" -"Reject","Wijs af" -"Reject OAuth token authorization","Weiger OAuth token autorisatie" -"Reject authorization","Weiger autorisatie" -"Reject token authorization Pop Up for admin","Reject token authorization Pop Up for admin" -"Reject token authorization for admin","Reject token authorization for admin" -"Rejected Callback URL","Afgewezen Callback URL" -"Rejection Of Authorization","Rejection Of Authorization" -"Revoked","ingetrokken" -"Role Name","Rolnaam" -"Save","Opslaan" -"Save and Continue Edit","Opslaan en doorgaan met bewerken" -"Secret","geheim" -"Selected entries enabled.","Geselecteerde inzendingen zijn ingeschakeld." -"Selected entries has been deleted.","Geselecteerde inzendingen zijn verwijderd." -"Selected entries revoked.","Geselecteerde inzendingen zijn ingetrokken." -"Status","Status" -"System","Systeem" -"The application access request is rejected.","Het verzoek tot toegang van de toepassingen is afgewezen." -"The consumer has been deleted.","De consument is verwijderd." -"The consumer has been saved.","De consument is opgeslagen." -"Token Status Change","Token Status Aanpassen" -"Token Status Change Email Template","Token Status Verander E-mail Template" -"Unable to find a consumer.","Niet in staat om de consument te vinden." -"User ID","Gebruikers ID" -"User Name","Gebruikersnaam" -"User Type","Gebruikerstype" -"Verifier code: %s","Verifier code: %s" -"You have no applications.","U heeft geen verzoeken." -"deleted","verwijderd" -"enabled","ingeschakeld" -"revoked","ingetrokken" diff --git a/app/locale/nl_NL/Mage_Page.csv b/app/locale/nl_NL/Mage_Page.csv deleted file mode 100644 index 0762a8cfe..000000000 --- a/app/locale/nl_NL/Mage_Page.csv +++ /dev/null @@ -1,81 +0,0 @@ -"%s Item(s)","%s Artikel(en)" -"%s-%s of %s","%s-%s van %s" -"© 2012 Magento Demo Store. All Rights Reserved.","© 2012 Magento Demo Store. Alle Rechten Voorbehouden." -"© 2013 Magento Demo Store. All Rights Reserved.","© 2013 Magento Demo Winkel. Alle rechten voorbehouden." -"(Shift-)Click or drag to change value","(Shift-)Klik of sleep om de waarde te veranderen" -"(ver. %s)","(ver. %s)" -"- Click on any of the time parts to increase it","- Klik op een van de tijd gedeeltes om deze te verhogen" -"- Hold mouse button on any of the above buttons for faster selection.","- Houd de muisknop op een van de bovenstaande knoppen om sneller te selecteren" -"- Use the %s buttons to select month","- Gebruik de %s knoppen om de maand te selecteren" -"- Use the %s, %s buttons to select year","- Gebruik de %s, %s knoppen om het jaar te selecteren" -"- or Shift-click to decrease it","- of Shift-klik om het te verlagen" -"- or click and drag for faster selection.","- of klik en sleep voor snelle selectie." -"-- Please Select --","-- Selecteer alstublieft --" -"1 column","1 kolom" -"2 columns with left bar","2 kolommen met linkerbalk" -"2 columns with right bar","2 kolommen met rechterbalk" -"3 columns","3 kolommen" -"About the calendar","Over de kalender" -"Account","Account" -"All Empty Layout Pages","Alle lege opmaakpagina's" -"All One-Column Layout Pages","Alle een-kolom opmaakpagina's" -"All Pages","Alle pagina's" -"All Pages (Print Version)","Alle pagina's (printversie)" -"All Three-Column Layout Pages","Alle drie-kolom opmaakpagina's" -"All Two-Column Layout Pages (Left Column)","Alle twee-kolom opmaakpagina's (linkerbalk)" -"All Two-Column Layout Pages (Right Column)","Alle twee-kolom opmaakpagina's (rechterbalk)" -"Allow","Toestaan" -"Breadcrumbs","Broodkruimels" -"Click here if nothing has happened","Klik hier als niets is gebeurd" -"Close","Sluiten" -"Close Window","Venster Sluiten" -"DHTML Date/Time Selector","DHTML Datum/tijd selectie" -"Date selection:","Datumselectie:" -"Default Description","Standaard Omschrijving" -"Default welcome msg!","Standaard welkom bericht!" -"Display %s first","Geef %s eerst weer" -"Distributed under GNU LGPL. See %s for details.","Gedistrubueerd onder GNU LGPL. Zie %s voor details." -"Drag to move","Sleep om te verplaatsen" -"Empty","Leeg" -"For latest version visit: %s","Zie voor de laatste versie: %s" -"Free Shipping on orders over 50$","Gratis Verzending op bestellingen boven de 50$" -"Go Today","Ga Vandaag" -"Help Us to Keep Magento Healthy","Help ons Magento gezond te houden" -"Interface Language","Interface Taal" -"Items %s to %s of %s total","Onderdelen %s tot %s van totaal %s" -"JavaScript seems to be disabled in your browser.","JavaScript lijkt uitgeschakeld te zijn in uw browser." -"Left Column","Linker Kolom" -"Left Column First (shows above main column on smaller screens)","Linker Kolom Eerst (wordt boven de hoofd kolom weergegeven op kleinere schermen)" -"Main Content Area","Area Hoofd Inhoud" -"Menu","Menu" -"Navigation Bar","Navigatiebalk" -"Next","Volgende" -"Next month (hold for menu)","Volgende maand (houd ingedrukt voor menu)" -"Next year (hold for menu)","Volgend jaar (houd ingedrukt voor menu)" -"Page Bottom","Onderkant pagina" -"Page Footer","Voetnoot Pagina" -"Page Header","Kopregel Pagina" -"Page Top","Bovenkant pagina" -"Page:","Pagina:" -"Prev. month (hold for menu)","Vorige maand (vasthouden voor menu)" -"Prev. year (hold for menu)","Vorig jaar (houd ingedrukt voor menu)" -"Previous","Vorige" -"Redirecting...","Doorverwijzen..." -"Report All Bugs","Rapporteer Alle Bugs" -"Results per page","Resultaten per pagina" -"Right Column","Rechterkolom" -"Search","Zoek" -"Select Store","Selecteer winkel" -"Select Store:","Selecteer winkel:" -"Select date","Selecteer datum" -"Show","Toon" -"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Dit is een demo winkel. Geplaatste bestellingen bij deze winkel worden niet gehonoreerd of uitgevoerd." -"This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our Privacy Policy page. To accept cookies from this site, please click the Allow button below.","Deze website vereist cookies om u van alle functies gebruik te laten maken. Voor meer informatie over welke gegevens bewaard worden in de cookies, zie ons privacybeleid. Om cookies van deze site te aanvaarden, klik dan op onderstaande knop Toestaan​​." -"Time selection:","Tijdselectie:" -"Time:","Tijd:" -"View All ","Alles Bekijken" -"Welcome, %s!","Welkom, %s!" -"You must have JavaScript enabled in your browser to utilize the functionality of this website.","U moet JavaScript in uw browser hebben ingeschakeld om de functionaliteit van de website te gebruiken." -"Your Language","Uw taal" -"Your Language:","Uw taal:" -"per page","per pagina" diff --git a/app/locale/nl_NL/Mage_PageCache.csv b/app/locale/nl_NL/Mage_PageCache.csv deleted file mode 100644 index 818bb9252..000000000 --- a/app/locale/nl_NL/Mage_PageCache.csv +++ /dev/null @@ -1,12 +0,0 @@ -"An error occurred while clearing the external full page cache.","Er is een fout opgetreden bij het opruimen van de externe volledige pagina cache." -"Cookie Lifetime (seconds)","Cookie Levensduur (seconden)" -"Enable External Cache","Schakel Externe Cache In" -"External Cache Control","Externe Cache Besturing" -"External Full Page Cache Settings","Externe Volledige Pagina Cache-instellingen" -"External Page Cache","Externe Pagina Cache" -"External full page cache.","Externe volledige pagina cache." -"Failed to load external cache control","Kan geen externe cache-control laden" -"Flush External Page Cache","Flush Externe Pagina Cache" -"If empty, default value will be used.","Indien leeg, wordt de standaard waarde aangehouden." -"The external full page cache has been cleaned.","De externe volledige pagina cache is schoongemaakt." -"Zend Full Page Cache","Zend Volledige Pagina Cache" diff --git a/app/locale/nl_NL/Mage_Paygate.csv b/app/locale/nl_NL/Mage_Paygate.csv deleted file mode 100644 index 3ed662b84..000000000 --- a/app/locale/nl_NL/Mage_Paygate.csv +++ /dev/null @@ -1,67 +0,0 @@ -"3D Secure","3D Secure" -"3D Secure Card Validation","3D Secure Card Validation" -"API Login ID","API Login ID" -"Accepted Currency","Geaccepteerde munteenheid" -"Allow Partial Authorization","Gedeeltelijke autorisatie toestaan" -"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","Weet u zeker dat u uw betaling wilt annuleren? Klik op OK om uw betaling te annuleren en het geld vrij te geven. Klik op Cancel om een andere kredietkaart te gebruiken en verder te gaan met uw betaling." -"Authorize Only","Alleen authoriseren" -"Authorize and Capture","Authoriseren en opnemen" -"Authorize.Net Transaction ID %s","Authorize.Net Transactie ID %s" -"Authorize.net","Authorize.net" -"Cancel","Annuleren" -"Centinel API URL","Centinel API URL" -"Credit Card Types","Types credit card" -"Credit Card Verification","Credit Card Verificatie" -"Credit Card: xxxx-%s","Kredietkaart: xxxx-%s" -"Debug","Debug" -"Email Customer","E-mail Klant" -"Enabled","Aan" -"Error in payment gateway.","Fout in betaling gateway." -"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","Gateway acties zijn vergrendeld omdat de gateway een of meerdere transacties niet kan voltooien. Log alstublieft in op uw Authorize.Net account om zelf het problem/de problemen op te lossen." -"Gateway error: %s","Gateway fout: %s" -"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Indien leeg, een standaard waarde kan worden gebruikt. Een aangepaste URL kan worden geleverd volgens de CardinalCommerce overeenkomst" -"Invalid amount for authorization.","Ongeldig bedrag voor autorisatie." -"Invalid amount for capture.","Ongeldige aantal voor vangst." -"Invalid amount for partial authorization.","Ongeldig aantal voor gedeeltelijke autorisatie." -"Invalid amount for refund.","Ongeldige aantal voor teruggave." -"Invalid split tenderId ID.","Ongeldige split tenderld ID." -"Invalid transaction ID.","Foute transactie ID." -"Maximum Order Total","Maximale Bestelling" -"Merchant's Email","Verkopers e-mail" -"Minimum Order Total","Minimale Bestelling" -"New Order Status","Nieuwe Status van de Bestelling" -"Parent Authorize.Net transaction (ID %s) expired","Parent Authorize.Net transactie (ID %s) is verlopen" -"Payment Action","Betaling" -"Payment authorization error.","Fout bij autorisatie betaling." -"Payment canceling error.","Probleem met het annuleren van de betaling." -"Payment capturing error.","Fout in het ophalen van de betaling." -"Payment from Applicable Countries","Betaling van Geëigende Landen" -"Payment from Specific Countries","Betaling van Specifieke Landen" -"Payment partial authorization error.","Fout in de gedeeltelijke autorisatie van de betaling." -"Payment refunding error.","Fout in het terugbetalen van de betaling." -"Payment updating error.","Fout bij het bijwerken van de betaling." -"Payment voiding error.","Fout in het vernietigen van de betaling." -"Processed Amount","Verwerkte hoeveelheid" -"Remaining Balance","Resterend balans" -"Severe 3D Secure Card Validation","Strenge 3D Secure Card Validation" -"Severe Validation Removes Chargeback Liability on Merchant","Strenge validatie verwijdert terugboekingsaansprakelijkheid voor de handelaar" -"Shopping cart contents and/or address has been changed.","Winkel wagen inhoud en/of adres is gewijzigd." -"Sort Order","Sorteer Bestelling" -"Test Mode","Test modus" -"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","U heeft onvoldoende tegoed op uw creditcard om de aankoop te voltooien. Het bedrag is vastgezet. Om de aankoop te voltooien, klik op OK en geef een extra creditcardnummer op. Om de aankoop te annuleren en het geld terug te zetten, klik op Cancel." -"There was an error canceling transactions. Please contact us or try again later.","Er heeft zich een fout voorgedaan tijdens het annuleren van de transacties. Neem contact met ons op of probeer later." -"Title","Titel" -"Transaction Key","Transactiesleutel" -"You have reached the maximum number of credit card allowed to be used for the payment.","Het aantal toegestane creditcards voor deze betaling is bereikt." -"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","Het aantal toegestane creditcards voor één betaling is bereikt. Het saldo is nog steeds onvoldoende om de betaling te voltooien. De betaling is geannuleerd en de vastgezette bedragen zijn vrijgegeven." -"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","Uw creditcard is geweigerd. Klik op OK om een andere creditcard te gebruiken voor uw betaling. Klik op Cancel om het bedrag vrij te geven en kies een andere betaalmethode." -"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","Uw order kan niet worden geplaatst, omdat de inhoud van uw winkelwagentje en/of adres gewijzigd zijn. Geautoriseerde bedragen van uw vorige betaling zijn vrijgegeven. Ga naar het betalingsproces voor de inhoud van uw huidige winkelwagen." -"Your payment has been cancelled. All authorized amounts have been released.","Uw betaling is geannuleerd. Alle geautoriseerde bedragen zijn vrijgegeven." -"amount %s","bedrag %s" -"authorize","autoriseer" -"authorize and capture","autoriseer en vang" -"capture","vang" -"failed","mislukt" -"refund","teruggave" -"successful","succesvol" -"void","ongeldig" diff --git a/app/locale/nl_NL/Mage_Payment.csv b/app/locale/nl_NL/Mage_Payment.csv deleted file mode 100644 index ef121dda5..000000000 --- a/app/locale/nl_NL/Mage_Payment.csv +++ /dev/null @@ -1,142 +0,0 @@ -"%s %s cycle.","%s %s cyclus." -"* Required Fields","* Vereiste Velden" -"--Please Select--","--Selecteer alstublieft--" -"3D Secure Card Validation","3D Secure Card Validation" -"3D Secure Credit Card Validation","3D Secure Credit Card Validatie" -" %s"," %s" -"A value is required for live mode. Refer to your CardinalCommerce agreement.","Een waarde is gevraagd voor live modus. Verwijs naar uw CardinalCommerce overeenkomst." -"Allow Initial Fee Failure","Sta Voorletter Vergoeding Fout toe" -"An internal reference ID is required to save the payment profile.","Een interne referentie ID is noodzakelijk om betaalprofiel op te slaan." -"Authorize action is not available.","Autorisatieactie is niet beschikbaar." -"Auto Bill on Next Cycle","Auto Rekening in Volgende Cyclus" -"Automatically Invoice All Items","Automatische Factuur Alle Items" -"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","Breng automatisch de uitstaande balanshoeveelheid in rekening in de volgende betaalcyclus (als er mislukte betalingen waren)." -"Bank Transfer Payment","Bank Overdracht Betaling" -"Billing Agreement status is not set.","Betaalovereenkomst status is niet opgesteld." -"Billing Amount","Grootte Rekening" -"Billing Frequency","Frequentie Rekening" -"Billing Period","Periode Rekening" -"Billing Period Unit","Rekening Periode Eenheid" -"Billing period unit is not defined or wrong.","Rekening periode eenheid is ongedifinieerd of verkeerd." -"Cannot retrieve the payment info model object.","Kan het betaal info model object niet terugkrijgen." -"Cannot retrieve the payment information object instance.","Kan de betalingsinformatie niet ophalen van de objectinstantie." -"Cannot retrieve the payment method code.","Kan de code voor de betalingsmethode niet ophalen." -"Cannot retrieve the payment method model object.","Kan betaalmethode model object niet terugkrijgen" -"Capture action is not available.","Opnameactie niet beschikbaar." -"Card Verification Number","Kaartverificatienummer" -"Cash On Delivery Payment","Contant Op Bezorging Betaling" -"Centinel API URL","Centinel API URL" -"Check / Money Order","Bekijk / Geld Bestelling" -"Credit Card Number","Nummer creditcard" -"Credit Card Number: xxxx-%s","Nummer creditcard xxxx-%s" -"Credit Card Type","Type credit card" -"Credit Card Type: %s","Type credit card: %s" -"Credit Card Types","Types credit card" -"Credit card number mismatch with credit card type.","Kredietkaartnummer komt niet overeen met type kredietkaart." -"Credit card type is not allowed for this payment method.","Type kredietkaart is niet toegestaan voor deze betalingsmethode." -"Currency","Munteenheid" -"Currency code is undefined.","Valuta code not gekozen." -"Customer ID is not set.","Klant ID is niet ingesteld." -"Day","Dag" -"Debug Mode","Debug Modus" -"Enabled","Aan" -"Expiration Date","Houdbaarheidsdatum" -"Expiration Date: %s/%s","Tenminste houdbaar tot: %s/%s" -"Full name of the person receiving the product or service paid for by the recurring payment.","Volledige naam van de persoon die het product of de service ontvangt, betaald door de wederkerende betaling." -"Incorrect credit card expiration date.","Onjuiste creditcard vervaldatum." -"Initial Fee","Initiële Betaling" -"Initial non-recurring payment amount due immediately upon profile creation.","Bij het aanmaken van uw profiel moet u gelijk een eenmalige betaling voldoen." -"Instructions","Instructies" -"Internal Reference ID","Interne Referentie ID" -"Invalid Credit Card Number","Ongeldig Kredietkaartnummer" -"Issue Number","Uitgave Nummer" -"Make Check Payable to","Maak de Check betaalbaar aan" -"Make Check payable to:","Maak de Check betaalbaar aan:" -"Make Check payable to: %s","Maak de Check betaalbaar aan: %s" -"Maximum Billing Cycles","Maximum hoeveelheid Betalingcycli" -"Maximum Order Total","Maximale Bestelling" -"Maximum Payment Failures","Maximum Betaling Storingen" -"Maximum Trial Billing Cycles","Maximum Trial Betaling Cycli" -"Merchant ID","Verkopers Identificatie" -"Minimum Order Total","Minimale Bestelling" -"Month","Maand" -"N/A","Nvt" -"Name on Card","Naam Op Kaart" -"Name on the Card","Naam op de Kaart" -"Name on the Card: %s","Naam op de Kaart: %s" -"New Order Status","Nieuwe Status van de Bestelling" -"Number of billing periods that make up one billing cycle.","Aantal rekeningperiodes waaruit 1 rekening cyclus bestaat." -"Order action is not available.","Actie bestelling is niet beschikbaar" -"Overrides API URL that may be specified by a payment method.","Neemt API URL over dat door een betaalmethode gespecificeerd kan zijn." -"Password","Wachtwoord" -"Payment ID: %s","Betaal ID: %s" -"Payment Method","Betaalmethode" -"Payment Methods","Betalingsmethoden" -"Payment Methods Section","Betaalmethode Sectie" -"Payment Reference ID","Betaalreferentie ID" -"Payment Services","Betaaldiensten" -"Payment from Applicable Countries","Betaling van Geëigende Landen" -"Payment from Specific Countries","Betaling van Specifieke Landen" -"Payment method code is not set.","Betaalmethode code is niet ingesteld." -"Payment method code is undefined.","Betaalmethode code is niet gedefinieerd." -"Payment profile is invalid:\n%s","Betaalprofiel is ongeldig:\n%s" -"Period frequency is wrong.","Periode frequentie is verkeerd." -"Please enter a valid credit card verification number.","Voer a.u.b. een geldig creditcard verificatienummer in." -"Processor ID","Processor ID" -"Purchase Order","Aankoop Bestelling" -"Purchase Order Number","Aankoopnummer" -"Purchase Order Number:","Aankoop Bestellingsnummer:" -"Purchase Order Number: %s","Verkooporder Nummer: %s" -"Recurring Profile Start Date","Periodiek Profiel Startdatum" -"Recurring profile start date has invalid format.","Periodiek profiel startdatum heeft een ongeldig formaat." -"Reference ID is not set.","Referentie ID is niet ingesteld." -"Refund action is not available.","Actie voor teruggave is niet beschikbaar." -"Repeats %s time(s).","Herhaalt zich %s keer." -"Repeats until suspended or canceled.","Herhaalt zich tot opschorting of annulering." -"Request Card Security Code","Verzoek Beveiligingscode van Kaart" -"Saved CC","CC opgeslagen" -"Schedule Description","Schema Beschrijving" -"Schedule description must be not empty.","Schema beschrijving mag niet leeg zijn." -"Selected payment type is not allowed for billing country.","De geselecteerde betalingsmethode is niet toegestaan voor het facturatieland." -"Send Check to","Verzend Rekening naar" -"Send Check to:","Verzend Rekening naar:" -"Severe 3D Secure Card Validation","Strenge 3D Secure Card Validation" -"Severe validation removes chargeback liability on merchant.","Ernstige bevestiging verwijdert de aansprakelijkheid voor terugboeking van de handelaar." -"Shipping Amount","Verzendingskosten" -"Short description of the recurring payment. By default equals to the product name.","Korte omschrijving van de periodieke betaling. Standaard is deze dezelfde als de productnaam." -"Sort Order","Sorteer Bestelling" -"Start Date","Begindatum" -"Start date has invalid format.","Startdatum heeft een ongeldig formaat." -"Start date is undefined.","Startdatum is ongedefinieerd." -"Subscriber Name","Abonnee Naam" -"Switch/Solo/Maestro Issue Number","Switch/Solo/Maestro verstrekkingsnummer" -"Switch/Solo/Maestro Only","Alleen Switch/Solo/Maestro" -"Switch/Solo/Maestro Start Date","Switch/Solo/Maestro startdatum" -"Tax Amount","BTW Bedrag" -"Test Mode","Test modus" -"The date when billing for the profile begins.","Datum waarop facturering van het profiel begint." -"The number of billing cycles for payment period.","Het aantal rekeningen per betalingsperiode." -"The number of scheduled payments that can fail before the profile is automatically suspended.","Het aantal betalingen die mis mogen gaan voordat het profiel automatisch opgeschort wordt." -"The payment review action is unavailable.","De optie om de betaling te herzien is niet beschikbaar." -"The requested Payment Method is not available.","De gevraagde Betalingsmethode is niet beschikbaar." -"Title","Titel" -"Trial Billing Amount","Trial Betalingshoeveelheid" -"Trial Billing Frequency","Trial Betalingsfrequentie" -"Trial Billing Period Unit","Trial Betaling-periode-eenheid" -"Trial Period","Trial Periode" -"Trial billing amount is wrong.","Trial Factureringshoeveelheid is verkeerd." -"Trial billing period unit is wrong.","Trial Facturering-periode-eenheid is verkeerd." -"Trial period frequency is wrong.","Trial periode frequentie is verkeerd." -"Trial period max cycles is wrong.","Trial periode maximum hoeveelheid cycli is verkeerd." -"Two Weeks","Twee Weken" -"Unable to save Billing Agreement:","Niet mogelijk om Betalingsovereenkomst op te slaan:" -"Unit for billing during the subscription period.","Eenheid voor het factureren tijdens de subscriptie periode." -"Unsupported currency code: %s.","Niet-ondersteunde valuta code: %s." -"Void action is not available.","Vernietigactie is niet beschikbaar." -"Week","Week" -"What is this?","Wat is dit?" -"Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.","Of het profiel opgeschort moet worden wanneer de eerste betaling gefaald heeft, of moet het op het uitstaande balans worden gezet." -"Wrong %s specified.","Verkeerde %s gespecificeerd." -"Wrong or empty billing amount specified.","Verkeerde of geen betalingshoeveeldheid gekozen." -"Year","Jaar" -"Zero Subtotal Checkout","Subtotaal van Nul Afrekenen" diff --git a/app/locale/nl_NL/Mage_Paypal.csv b/app/locale/nl_NL/Mage_Paypal.csv deleted file mode 100644 index 3caa45d48..000000000 --- a/app/locale/nl_NL/Mage_Paypal.csv +++ /dev/null @@ -1,623 +0,0 @@ -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -"-OR-","-OF-" -"120 x 240","120 x 240" -"120 x 600","120 x 600" -"120 x 90","120 x 90" -"190 x 100","190 x 100" -"2-pixel perimeter around the header space.","2-pixel omtrek om de top ruimte." -"234 x 400","234 x 400" -"234 x 60","234 x 60" -"250 x 250","250 x 250" -"300 x 50","300 x 50" -"3D Secure","3D Secure" -"3D Secure Card Validation","3D Secure Card Validation" -"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at http://www.paypal.com/amexupdate.","3D Secure validatie is vereist voor Maestro kaarten. Ondersteuning van American Express kaarten vereisen extra overeenkomst. Kijk ook op http://www.paypal.com/amexupdate." -"468 x 60","468 x 60" -"728 x 90","728 x 90" -"800 x 66","800 x 66" -"Start accepting payments via PayPal!","Accepteer betalingen via PayPal!" -"A case that has been resolved and close requires a reimbursement.","Een geval dat is opgelost en vraagt ​​om een ​​terugbetaling." -"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","Een terugboeking heeft plaatsgevonden op deze transactie vanwege een geschil met de klant op vermoeden van een ongeautoriseerde vervalsing." -"A reversal has occurred on this transaction because you have given the customer a refund.","Een terugboeking heeft plaatsgevonden op deze transactie, omdat u de klant een restitutie hebt gegeven." -"A reversal has occurred on this transaction due to a chargeback by your customer.","Een terugboeking heeft plaatsgevonden op deze transactie als gevolg van een terugvordering door uw klant." -"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","Een terugboeking heeft plaatsgevonden op deze transactie als gevolg van een klacht over de transactie van uw klant." -"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","Een terugboeking heeft plaatsgevonden op deze transactie omdat uw klant een geld-terug garantie heeft geactiveerd." -"A value is required for live mode. Refer to your CardinalCommerce agreement.","Een waarde is gevraagd voor live modus. Verwijs naar uw CardinalCommerce overeenkomst." -"ACH Deposit (Hold for Dispute or Other Investigation)","ACH Storting (Wordt gehouden ingeval van dispuut of een ander onderzoek)" -"ACH Deposit (Reversal)","ACH Storting (Herroeping)" -"ACH Funding for Funds Recovery from Account Balance","ACH Financiering voor fondsen herstel op het account balans" -"ACH Withdrawal","ACH Opname" -"API Authentication Methods","API Verificatie Methoden" -"API Certificate","API Certificaat" -"API Password","API Wachtwoord" -"API Signature","API Handtekening" -"API Username","API Gebruikersnaam" -"API Uses Proxy","API Gebruikt Proxy" -"Ability for buyer to purchase without PayPal account.","Mogelijkheid voor de koper om te kopen zonder PayPal account." -"Accept credit card and PayPal payments securely.","Veilig accepteren credit card en PayPal betalingen." -"Accept credit cards, debit cards and PayPal payments securely.","Veilig accepteren credit cards, debit cards en PayPal-betalingen." -"Accept payments in your shopping cart. PayPal will process your card payments through the Payflow Gateway.","Accepteer betalingen in uw winkelwagen. PayPal zal uw card betalingen via de Payflow Gateway verwerken." -"Accept payments with a PCI compliant checkout that keeps customers on your site.","Accepteer betalingen met een PCI-compliant checkout dat klanten houdt op uw site." -"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Accepteer betalingen met een PCI-compliant checkout dat klanten houdt op uw site." -"Accept payments with a completely customizable checkout page.","Accepteer betalingen met een volledig aanpasbare checkout pagina." -"Accept payments with a completely customizable checkout.","Accepteer betalingen met een volledig aanpasbare checkout." -"Acceptance Mark","Acceptatie Stempel" -"Acceptance Mark Image","Acceptatie Stempel Afbeelding" -"Account-to-Account Payment, initiated by PayPal","Account-naar-Account Betaling, gestart door PayPal" -"Add PayPal as an additional payment method to your checkout page to increase your sales.","Voeg PayPal als een extra betaalmethode op uw checkout pagina om uw omzet te verhogen." -"Add PayPal as an additional payment method to your checkout page.","Voeg PayPal toe als een extra betaalmethode op uw checkout pagina." -"Add another payment method to your existing solution or as a stand-alone option.","Voeg een betaalmethode toe aan uw bestaande betaalmethoden of als een stand-alone optie." -"Additional Options","Meer Opties" -"Address","Adres" -"Address Verification System Response","Adres Verificatie Systeem Antwoord" -"Advanced Settings","Geavanceerde instellingen" -"Advertise Bill Me Later","Adverteer Bill Me Later" -"All the address information matched","Al de adres komt overeen" -"Allow in Billing Agreement Wizard","Sta dit toe in de Facturatie-overeenkomst Wizard" -"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Toegestane waarden: ""paypal"", ""primary"" (systeemgekozen waarde), uw_gebruikelijke_waarde ( een gebruikelijke betalingspaginastijl van uw verkoop account profiel)." -"Allowed Credit Card Types","Toegestane Kredietkaarten Types" -"Also affects mini-shopping cart.","Heeft ook een effect op de mini-winkelwagen." -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","Weet u zeker dat u deze pagina wilt verlaten? U zal opnieuw de stappen voor het afrekenen moeten doorlopen." -"Ask Customer","Vraag een Klant" -"Attempted Authentication, Bad Result","Poging tot Autorisatie, Slecht Resultaat" -"Attempted Authentication, Good Result","Poging tot Autorisatie, Goed Resultaat" -"Auction Payment other than through eBay","Veiling Betaling anders dan via eBay" -"Authenticated, Bad Result","Geverifieerd, Slecht Resultaat" -"Authenticated, Good Result","Geverifieerd, Goed Resultaat" -"Authorization","Autorisatie" -"Authorization Honor Period (days)","Autorisatie Eer Periode (dagen)" -"Authorization expired.","Autorisatie verlopen." -"Authorization transaction is required to void.","Autorisatie transactie moet vernietigd worden." -"Authorization was voided by merchant.","Autorisatie was vernietigd door de handelaar." -"Authorized amount of %s.","Geautoriseerde hoeveelheid van %s" -"Authorizing amount of %s is pending approval on gateway.","Geautoriseerde hoeveelheid van %s wacht op goedkeuring van de poort." -"Auto","Auto" -"AutoSweep","AutomatischOpschonen" -"Available Balance","Beschikbaar Balans" -"Balance Manager Account Bonus","Balans Beheerder Account Bonus" -"Basic Settings - PayPal Express Checkout","Basisinstellingen - PayPal Express Checkout" -"Basic Settings - PayPal Integral Evolution","Basisinstellingen - PayPal Integral Evolution" -"Basic Settings - PayPal Pasarela integral","Basisinstellingen - PayPal Pasarela integral" -"Basic Settings - PayPal Payflow Link","Basisinstellingen - PayPal Payflow Link" -"Basic Settings - PayPal Payflow Pro","Basisinstellingen - PayPal Payflow Pro" -"Basic Settings - PayPal Payments Advanced","Basisinstellingen - Geavanceerde PayPal-betalingen" -"Basic Settings - PayPal Payments Pro","Basisinstellingen - PayPal-betalingen Pro" -"Basic Settings - PayPal Payments Pro Hosted Solution","Basisinstellingen - PayPal-betalingen Pro Hosted Solution" -"Basic Settings - PayPal Payments Standard","Basisinstellingen - PayPal-betalingen Standaard" -"Basic Settings - PayPal Pro","Basisinstellingen - PayPal Pro" -"Basic Settings - PayPal Website Payments Plus","Basisinstellingen - PayPal Website Betalingen Plus" -"Basic Settings - PayPal Website Payments Pro","Basisinstellingen - PayPal Website Betalingen Pro" -"Basic Settings - PayPal Website Payments Pro Hosted Solution","Basisinstellingen - PayPal Website Betalingen Pro Hosted Solution" -"Basic Settings - PayPal Website Payments Pro Payflow Edition","Basisinstellingen - PayPal Website Betalingen Pro Payflow Editie" -"Basic Settings - PayPal Website Payments Standard","Basisinstellingen - PayPal Website Betalingen Standaard" -"Billing Address","Facturatieadres" -"Billing Agreement Signup","Betalingsovereenkomst aanmelding" -"Billing Information","Factuur Informatie" -"Bonus for first ACH Use","Bonus voor eerste ACH gebruik" -"Both section above must be complete. ","Beide bovenstaande gedeelten moet volledig zijn." -"Buyer Credit Payment","Koper krediet betaling" -"Buyer claims that a possible duplicate payment was made to the merchant.","Koper beweert dat een mogelijke dubbele betaling aan de handelaar is gedaan." -"Buyer claims that he did not receive goods or service.","Koper beweert dat hij de goederen of diensten niet heeft ontvangen." -"Buyer claims that he/she did not authorize transaction.","Koper beweert dat hij/zij de transactie niet heeft geautoriseerd." -"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Koper beweert dat de ontvangen goederen of diensten verschillen van de omschrijving van de goederen of diensten." -"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Koper beweert dat de ontvangen goederen niet naar wens, defect of beschadigd zijn." -"Buyer\'s Tax ID","Kopers Belastings ID" -"Buyer\'s Tax ID Type","Koper 's Belastings ID Type" -"By default it is ""reports.paypal.com"".","Ingesteld op ""reports.paypal.com""." -"CNPJ","CNPJ" -"CPF","CPF" -"CVV Entry is Editable","CVV Entry is Bewerkbaar" -"CVV2 Check Result by PayPal","CVV2 Controle Resultaat van PayPal" -"Can not send new order email.","Kan geen nieuwe ordermail verzenden." -"Cannot create target file for reading reports.","Kan geen doelbestand aanmaken voor het lezen van rapporten." -"Catalog Category Page","Catalogus Categorie Pagina" -"Catalog Product Page","Catalogus Product Pagina" -"Centinel API URL","Centinel API URL" -"Centinel Custom API URL","Centinel Custom API URL" -"Charge-off","Afschrijving" -"Chargeback","Terugboeking" -"Checkout Cart Page","Afrekenen Winkelwagen Pagina" -"Checkout with PayPal","Checkout met PayPal" -"Checkout with PayPal Bill Me Later","Afrekenen met PayPal Bill Me Later" -"Choose a secure bundled payment solution for your business.","Kies een veilige gebundelde betaalmethode voor uw bedrijf." -"City","Stad" -"Click here if you are not redirected within 10 seconds...","Klik hier als je niet wordt doorverwezen binnen 10 seconden ..." -"Close","Sluiten" -"Company","Bedrijf" -"Complaint","Klacht" -"Completion Date","Voltooiingsdatum" -"Configure","Configureren" -"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Sluit uw verkopers account aan met een PCI-compliant gateway waarmee klanten kunnen betalen zonder uw site te verlaten." -"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Sluit uw verkopers account aan een volledig aanpasbare gateway waarmee klanten kunnen betalen zonder uw site te verlaten." -"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Maakt contact met de PayPal SFTP server om nieuwe rapporten op te halen. Weet u zeker dat u door wilt gaan?" -"Continue","Doorgaan" -"Countries Payment Applicable From","Landen Waaruit Betaling van Toepassing" -"Country","Land" -"Coupon Redemption","Waardebon Inleveren" -"Credit","Krediet" -"Credit Card Settings","Creditkaart Instellingen" -"Currency Conversion required to cover negative balance","Valuta Conversie nodig om het negatieve balans te dekken" -"Custom","Zelfgekozen" -"Custom Endpoint Hostname or IP-Address","Aangepast Eindpunt Hostnaam of IP-Adres" -"Custom Path","Aangepast Pad" -"Customer Information","Klantinformatie" -"Customer did not include a confirmed address.","Klant heeft geen bevestigd adres toegevoegd." -"Customer failed to pay.","Klant heeft niet betaald." -"Customer used non-confirmed address.","Klant gebruikte niet-bevestigd adres." -"Daily","Dagelijks" -"Debit","Debet" -"Debit Card Cash Back","Debetkaart Geld Terug" -"Debit Card Transaction","Debetkaart Transactie" -"Debit or Credit","Debet of Credit" -"Debug Mode","Debug Modus" -"Direct Payment API","Directe Betaling API" -"Discount","Korting" -"Display","Weergeven" -"Display Express Checkout in the Payment Information step","Weergave Snel uitchecken in de Betalingsinformatie stap" -"Displays on catalog pages and homepage.","Wordt weergegeven op cataloguspagina's en startpagina." -"Dispute","Geschil" -"Don't have a PayPal account? Simply enter your email address.","Heeft u nog geen PayPal account? Vul simpelweg uw email adres in." -"Dynamic","Dynamisch" -"EFT Funding (German banking)","EFT fondsen (Duits bankieren)" -"Edit","Aanpassen" -"Edit Payment Information","Betaal Informatie Aanpassen" -"Edit Shopping Cart","Bewerken winkelmandje" -"Email Address","e-mailadres" -"Email Associated with PayPal Merchant Account","Email adres gerelateerd aan PayPal Winkelier Rekening" -"Email Associated with PayPal Merchant Account (Optional)","E-mail geassocieerd met PayPal Zakelijke Account (optioneel)" -"Enable Automatic Fetching","Inschakelen van automatisch ophalen" -"Enable Bill Me Later","Bill Me Later Inschakelen" -"Enable Express Checkout","Activeer Express Checkout" -"Enable PayPal Guest Checkout","Inschakelen van PayPal gast afrekening" -"Enable Payflow Link","Activeer Payflow Link" -"Enable SSL verification","Activeer SSL verificatie" -"Enable this Solution","Activeer deze Methode" -"Enabled","Aan" -"Event","Gebeurtenis" -"Event Code","Gebeurtenis code" -"Every 10 days","Iedere 10 dagen" -"Every 14 days","Iedere 14 dagen" -"Every 3 days","Iedere 3 dagen" -"Every 30 days","Iedere 30 dagen" -"Every 40 days","Iedere 40 dagen" -"Every 7 days","Iedere 7 dagen" -"Exact Match. Address and Postal Code. International","Exacte overeenkomst. Adres en postcode. Internationaal" -"Exact Match. Address and Postal Code. UK-specific","Exacte overeenkomst. Adres en postcode. Specifiek voor Verenigd Koninkrijk" -"Exact Match. Address and nine-digit ZIP code","Exacte overeenkomst. Adres en negencijferige ZIP code" -"Explanation: %s.","Uitleg: %s." -"Express Checkout","Versneld afrekenen" -"Express Checkout APIs","Versneld afrekenen APIs" -"Express Checkout and Order have been canceled.","Express Checkout en bestelling zijn geannuleerd." -"Express Checkout has been canceled.","Express Checkout is geannuleerd." -"Failed to fetch reports from '%s@%s'.","Kon verslagen niet ophalen van '%s@%s'." -"Fax","Fax" -"Fee Amount","Kosten bedrag" -"Fee Debit or Credit","Kosten betaalrekening of creditcard" -"Fee Reversal","Omkeren kosten" -"Fee: Foreign ACH Withdrawal","Kosten: buitenlandse ACH opname" -"Fee: Mass Pay Request","Kosten: massaal betalingsverzoek" -"Fee: Web Site Payments Pro Account Monthly","Kosten: betalingen website pro account per maand" -"Fee: WorldLink Check Withdrawal","Kosten: WereldLink check opname" -"Fetch","Haal op" -"Fetch Updates","Updates halen" -"Fetched %s report rows from '%s@%s'.","%s verslagrijen op gehaald van '%s@%s'." -"For Virtual Quotes Only","Alleen Voor Virtuele Prijsopgaves" -"Frontend Experience Settings","Frontend ervaring instellingen" -"Funding","Financiering" -"General (Authorization)","Algemeen (Machtiging)" -"General (Dividend)","Algemeen (Dividend)" -"General (Funds Transfer from PayPal Account to Another)","Algemeen (Geldmiddelen Overplaatsen van een PayPal Account naar een Andere)" -"General (Purchase with a credit card)","Algemeen (Aankoop met een creditcard)" -"General Adjustment without businessrelated event","Algemene Aanpassing zonder zakengerelateerde gebeurtenis" -"General Currency Conversion","Algemene Valuta Omzetting" -"General Funding of PayPal Account ","Algemene Financiering van PayPal Account" -"General Redemption","Algemene Afschrijving" -"General Withdrawal from PayPal Account","Algemene Opname van PayPal Account" -"General. Product no longer supported","Algemeen. Product niet langer ondersteund" -"General: Use of PayPal account for purchasing as well as receiving payments","Algemeen: Gebruik van PayPal account voor zowel aankopen als ontvangen van betalingen" -"General: Withdrawal from PayPal Account","Algemeen: Opname van PayPal Account" -"General: Withdrawal to Non-Bank Entity","Algemeen: Opname naar Niet-Bancaire Entiteit" -"General: adjustment of a type not belonging to the other T12xx categories","Algemeen: aanpassing van een type dat niet behoort tot de andere T12xx categorieën" -"General: bonus of a type not belonging to the other T08xx categories","Algemeen: bonus van een type dat niet behoort tot de andere T08xx categorieën" -"General: event not yet categorized","Algemeen: gebeurtenis nog niet gecategoriseerd" -"General: non-payment fee of a type not belonging to the other T01xx categories","Algemeen: niet-betalingsvergoeding van een type dat niet behoort tot de andere T01xx categorieën" -"General: received payment of a type not belonging to the other T00xx categories","Algemeen: betaling ontvangen van een type dat niet behoort tot de andere T00xx categorieën" -"General: reversal of a type not belonging to the other T11xx categories","Algemeen: omkering van een type dat niet behoort tot de andere T11xx categorieën" -"General: temporary hold of a type not belonging to the other T15xx categories","Algemeen: tijdelijke blokkering van een type dat niet behoort tot de andere T15xx categorieën" -"Get Credentials from PayPal","Verkrijg Waarmerkingskenmerken van PayPal" -"Get Publisher ID from PayPal","Publisher ID ophalen van PayPal" -"Gift Certificate Payment: purchase of Gift Certificate","Geschenkcertificaat Betaling: aankoop van Geschenkcertificaat" -"Gift Certificate Redemption","Geschenkcertificaat Inlossen" -"Gross Amount","Brutobedrag" -"Header (center)","Koptekst (midden)" -"Header Background Color","Aanhef Achtergrond Kleur" -"Header Border Color","Kop Kantlijn Kleur" -"Header Image URL","Kop Afbeelding URL" -"Help","Help" -"Hidden Virtual PayPal Debit Card Transaction","Verborgen Virtuele PayPal Debitcard Transactie" -"Hold for Dispute Investigation","Wacht op Onderzoek naar Geschil" -"Home Page","Thuispagina" -"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","Het spijt me - maar wij kunnen uw transactie niet voltooien. Neem alstublieft contact met ons op zodat wij u kunnen helpen." -"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","Het spijt me - maar wij kunnen uw transactie niet voltooien. Probeert u alstublieft een andere betalingsmethode of neem contact met ons op zodat wij u kunnen helpen." -"IPN ""%s"".","IPN ""%s""." -"IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""","IPN ""%s"". %s Transactiebedrag %s. Transactie ID: ""%s""" -"IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s.","IPN ""%s"". Een geschil is opgelost en gesloten. %s Transactiebedrag %s." -"IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s","IPN ""%s"". Geval type ""%s"". Geval ID ""%s"" %s" -"IPN verification ""%s"".","IPN verificatie ""%s""." -"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Indien leeg, een standaard waarde kan worden gebruikt. Een aangepaste URL kan worden geleverd volgens de CardinalCommerce overeenkomst" -"If not specified, Default Country from General Config will be used","Indien niet opgegeven, wordt het Standaard Land vanuit de algemene instellingen gebruikt." -"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","Als deze optie is ingeschakeld; kan de klant het afleveradres en bezorgingsmethode aanpassen op de PayPal website. Werkt live alleen via het HTTPS protocol." -"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","Als u niet beschikt over meerdere gebruikers op uw account, kunt u uw Leverancier/Zakelijke gebruiker Login hier opnieuw in te voeren." -"Impossible to issue a refund transaction because the capture transaction does not exist.","Het is niet mogelijk om een geld-terug-gave op te vragen aangezien de transactie niet bestaat." -"Incentive","Prikkel" -"Initiation Date","Begin Datum" -"Integral Evolution","Integrale Evolutie" -"Invoice ID","Factuur ID" -"Issuer Liability","Uitgever Verantwoordelijkheid" -"It is recommended to set this value to ""Debit or Credit Card"" per store views.","Het is aanbevolen deze waarde naar ""betaalkaart of creditcard"" per winkel view in te stellen." -"It is recommended to set this value to ""PayPal"" per store views.","Het is aanbevolen deze waarde naar ""PayPal"" per winkel view in te stellen." -"Items in Your Shopping Cart","Artikelen in Uw Winkelwagen" -"Last Correlation ID","Laatste Correlatie ID" -"Last Transaction ID","Laatste Transactie ID" -"Learn More","Meer Informatie" -"Login","Log in" -"Mass Pay Payment","Bulkbetaling" -"Matched (CVV2)","Komt over een (CVV2)" -"Matched (CVV2CSC)","Komt over een (CVV2CSC)" -"Matched Address only (no ZIP)","Alleen Adres komt overeen (geen ZIP)" -"Matched Address only (no ZIP). International","Alleen Adres komt overeen (geen ZIP). Internationaal" -"Matched Postal Code only (no Address)","Alleen Post Code komt overeen (geen Adres)" -"Matched five-digit ZIP only (no Address)","Alleen 5-getal ZIP code komt overeen (geen Adres)" -"Matched whole nine-didgit ZIP (no Address)","Gehele 9-cijferige ZIP code komt overeen (geen Adres)" -"Merchant Account","Handelaar Account" -"Merchant Country","Handelaar Land" -"Merchant Liability","Winkelier Aansprakelijkheid" -"Merchant Location","Locatie Verkoper" -"Merchant Protection Eligibility","In aanmerking komen voor handelaar bescherming" -"Merchant Referral Bonus","Handelaar Doorverwijzing Bonus" -"Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Handelaar account heeft geen opname mechanisme. Handelaar moet handmatig betalingen accepteren of weigeren via zijn Account Overzicht." -"Merchant account is not verified.","Handelaar account niet geverifieerd." -"Merchant denied this pending payment.","Handelaar heeft deze betaling afgewezen." -"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Handelaar bezit een niet-Amerikaans account en heeft geen opname mechanisme." -"Merchant must upgrade account to Business or Premier status.","Handelaar moet zijn account opwaarderen tot een Business of Premier status." -"Merchant reference ID format is not supported.","Handelaar doorverwijzing ID formaat is niet ondersteund." -"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Handelaar moet zich bij PayPal aanmelden voor het inschakelen van facturatieovereenkomsten. Schakel deze optie pas in wanneer PayPal bevestigd dat facturatieovereenkomsten zijn ingeschakeld voor uw handelaarsaccount." -"Mobile Payment (made via a mobile phone)","Mobiele Betaling (betaling via een mobiele telefoon)" -"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Meerdere valuta probleem. Handelaar moet handmatig deze betaling accepteren of weigeren via het PayPal Account Overzicht." -"N/A","Nvt" -"N/A. Address not checked, or acquirer had no response. Service not available","n.v.t. Adres niet gecontroleerd of verkrijger had geen reactie. Service niet beschikbaar" -"N/A. Global Unavailable","n.v.t. Globaal Onbeschikbaar" -"N/A. International Unavailable","n.v.t. Internationaal Onbeschikbaar" -"N/A. Merchant has indicated that CVV2 is not present on card","n.v.t. Handelaar heeft aangegeven dat CVV2 niet aanwezig is op de kaart" -"N/A. No response","n.v.t. Geen reactie" -"N/A. Not allowed for MOTO (Internet/Phone) transactions","n.v.t. Niet toegestaan voor MOTO (Internet/Telefoon) overboekingen" -"N/A. Not processed","n.v.t. Niet verwerkt" -"N/A. Retry","n.v.t. Probeer opnieuw" -"N/A. Service not Supported","n.v.t. Service niet ondersteund" -"N/A. Service not available","n.v.t. Service niet beschikbaar" -"N/A. Service not supported","N/A. Dienst niet ondersteund." -"N/A. The merchant did not provide AVS information","n.v.t. De handelaar heeft geen AVS informatie overhandigd" -"N/A. The merchant has not implemented CVV2 code handling","n.v.t. De handelaar heeft geen CVV2 code verwerking ingevoerd" -"N/A. Unavailable","n.v.t. Niet beschikbaar" -"Near Bill Me Later checkout button","Dichtbij Bill Me Later afreken knop" -"Negative Balance","Negatief Balans" -"Never","Nooit" -"No","Nee" -"No Details matched","Geen Details kwamen overeen" -"No Details matched. International","Geen Details kwamen overeen. Internationaal" -"No Liability Shift","Geen Aansprakelijkheid Verschuiving" -"No Logo","Geen Logo" -"No match","Geen overeenkomst" -"None of the address information matched","Geen van de adres informatie kwam overeen" -"Not sure what PayPal payment method to use? Click here to learn more.","Bent u niet zeker welke PayPal betaalmethode u gaat gebruiken? Klik hier voor meer informatie." -"Note: %s","Notitie: %s" -"Nothing to fetch because of an empty configuration.","Niets op te halen door lege configuratie." -"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Merk op dat PayPal tot 10 verzendopties kan hanteren. Daarom plaatst Magento alleen de 10 goedkoopste verzendopties als er meer dan 10 beschikbaar zijn." -"Notified customer about creditmemo #%s.","Klant verwittigd over kredietmemo #%s." -"Notified customer about invoice #%s.","Klant verwittigd over factuur #%s." -"Now accepting PayPal (150 X 40)","Accepteert nu PayPal (150 X 40)" -"Now accepting PayPal (150 X 60)","Accepteert nu PayPal (150 X 60)" -"Number of Child Authorizations","Aantal kindauthorisaties" -"Open Authorization","Open authorisatie" -"Order","Bestelling" -"Order ID","ID Bestelling" -"Order Valid Period (days)","Periode bestelling geldig (dagen)" -"Ordered amount of %s.","Bestelde hoeveelheid van %s." -"Ordering amount of %s is pending approval on gateway.","In afwachting van goedkeuring bestelde hoeveelheid van %s." -"Page Background Color","Achtergrondkleur pagina" -"Page Style","Stijl pagina" -"Part of the address information matched","Deel van de adresinformatie komt overeen" -"Partner","Partner" -"Pasarela integral","Pasarela integraal" -"Password","Wachtwoord" -"PayPal All-in-One Payment Solutions  Accept and process credit cards and PayPal payments.","PayPal All-in-One Betaalmethoden  Accepteer en verwerk creditcards en PayPal-betalingen." -"PayPal Balance Manager function of PayPal account","PayPal Balansbeheerder functie van PayPal account" -"PayPal Billing Agreement Settings","Instellingen PayPal Factureringsvoorwaarden" -"PayPal Buyer Warranty Bonus","PayPal koper garantie bonus" -"PayPal Debit Card Cash Advance","PayPal betaalkaart kas voorschot" -"PayPal Debit Card Withdrawal from ATM","PayPal betaalkaart geld pinnen" -"PayPal Express Checkout","PayPal Express Checkout" -"PayPal Express Checkout Shortcut Wrapper","PayPal Express Checkout Shortcut Wrapper" -"PayPal Express Checkout Token does not exist.","PayPal Express Afrekenen Teken bestaan niet." -"PayPal Express Checkout is not enabled.","PayPal Express Checkout is niet ingeschakeld." -"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you. - You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®. - Learn More - ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you. - You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®. - Learn More" -"PayPal Express Order Review Form","PayPal Express Bestelling Terugzien Formulier" -"PayPal Fee Information","PayPal kosten informatie" -"PayPal Merchant Pages Style","PayPal handelaar pagina stijl" -"PayPal Payment Gateways","PayPal Betalingsgateways" -"PayPal Payment Solutions","PayPal Betaalmethoden" -"PayPal Pro","PayPal Pro" -"PayPal Product Logo","PayPal productlogo" -"PayPal Protection Bonus","PayPal beschermingsbonus" -"PayPal Reference ID","PayPal referentie ID" -"PayPal Reference ID Type","PayPal referentie ID type" -"PayPal Settlement Reports","PayPal Overeenstemming Rapporten" -"PayPal certificate does not exist.","PayPal certificaat bestaat niet." -"PayPal certificate file is empty.","PayPal certificaat bestand is leeg." -"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal ondersteunt de verwerking van bestellingen met een bedrag van nul niet. Ga door met het normale betalingsproces om uw aankoop te voltooien." -"PayPal gateway has rejected request. %s","PayPal gateway heeft het verzoek afgekeurd. %s" -"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal adviseert dat u een extra gebruiker creëert op uw account op manager.paypal.com" -"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal adviseert dat u een extra gebruiker creëert op uw account op manager.paypal.com, in plaats van dat u uw gebruikersnaam en wachtwoord hier invoert. Dit zal uw veiligheid bevorderen en zal onderbrekingen voorkomen als u later uw wachtwoord wijzigt. Als u niet een extra gebruiker wilt creëren, kunt u hier met uw zakelijke account inloggen." -"PayPal response hasn't required fields.","Antwoord van PayPal bevat de vereiste velden niet." -"PayPal retains reports for 45 days.","PayPal behoudt meldingen voor 45 dagen." -"PayPal/Centinel Electronic Commerce Indicator","PayPal/Centinel Elektronische Handelsindicator" -"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa Betaler Machtigingsservice Resultaat" -"Payer Address ID","Betaler Adres ID" -"Payer Address Status","Betaler Adres Status" -"Payer Email","Betaler Email" -"Payer ID","Betaler ID" -"Payer Status","Betaler Status" -"Payer is not identified.","Betaler is niet geïdentificeerd." -"Payflow Link","Payflow Link" -"Payflow Link (Includes Express Checkout)","Payflow Link (Bevat Express Checkout)" -"Payflow Pro","Payflow Pro" -"Payflow Pro (Includes Express Checkout)","Payflow Pro (Bevat Express Checkout)" -"Payflow Pro and Express Checkout","Payflow Pro and Express Checkout" -"Payment Action","Betaling" -"Payment Applicable From","Betaling van Toepassing Van" -"Payment Method","Betaalmethode" -"Payment Refund initiated by merchant","Betalingsterugstorting gestart door handelaar" -"Payment has been declined. Please try again.","Betaling is afgewezen. Probeer het alstublieft opnieuw." -"Payment is being reviewed by PayPal for risk.","Betaling wordt beoordeeld door Paypal op risico." -"Payment transactions disallow storing objects.","Betalingstransacties staan het opslaan van objecten niet toe." -"Payment was made to an email address that is not yet registered or confirmed.","Betaling werd gedaan naar een emailadres dat nog niet geregistreerd of bevestigd is." -"Payments Advanced","Betalingen Geavanceerd" -"Payments Advanced (Includes Express Checkout)","Betalingen Geavanceerd (Bevat Express check-out)" -"Payments Pro (Includes Express Checkout)","Betalingen Pro (Bevat Express Checkout)" -"Payments Pro Hosted Solution","Betalingen Pro Hosted Solution" -"Payments Pro and Express Checkout","Betalingen Pro en Express Checkout" -"Payments Standard","Standaard Betalingen" -"Payments by PayPal (150 X 40)","Betalingen door PayPal (150 X 40)" -"Payments by PayPal (150 X 60)","Betalingen door PayPal (150 X 60)" -"Pending PayPal","In afwachting van PayPal" -"Place Order","Bestelling plaatsen" -"Please agree to all the terms and conditions before placing the order.","Ga alstublieft akkoord met alle voorwaarden voor het plaatsen van de bestelling." -"Please contact PayPal Customer Service.","Neem alstublieft contact op met Paypal Klantenservice." -"Please do not refresh the page until you complete payment.","Ververs alstublieft niet de pagina totdat de betaling is voltooid." -"Please re-enable the previously enabled payment solutions.","Gelieve de eerder geactiveerde betaalmethode in te schakelen." -"Please select a shipping method...","Selecteer een methode van verzending..." -"Please select region, state or province","Selecteer a.u.b. uw provincie" -"Please update order data to get shipping methods and rates","Update alstublieft de bestellings gegevens om verzendings methodes en tarieven te krijgen" -"Points Incentive Redemption","Punten Incentive Aflossing" -"Position","Positie" -"Postage Payment to either USPS or UPS","Porto betaling aan USPS dan wel UPS" -"Preapproved Payment (BillUser API), either sent or received","Vooraf goedgekeurde Betaling (RekeningGebruiker API), verzonden of ontvangen" -"Preapproved Payment ID","Vooraf goedgekeurde Betaling ID" -"Price","Prijs" -"Pro","Pro" -"Process payments using your own internet merchant account.","Verwerk betalingen via uw eigen internet zakelijke rekening." -"Product","Product" -"Product Name","Productnaam" -"Proxy Host","Proxy Host" -"Proxy Port","Proxy Poort" -"Publisher ID","Publisher ID" -"Qty","Hoeveelheid" -"Reauthorization","Nieuwe autorisatie" -"Reference Information","Verwijsinformatie" -"Reimbursement for a chargeback.","Vergoeding voor een terugboeking" -"Reimbursement of Chargeback","Vergoeding van een terugboeking" -"Report Date","Datum bericht" -"Reports","Verslagen" -"Requested %s and configured %s merchant emails do not match.","Gevraagde %s en ingestelde %s verkoper e-mails komen niet overeen." -"Require CVV Entry","Vereist invoer CVV" -"Require Customer's Billing Address","Factuuradres van de klant vereist" -"Required PayPal Settings","Vereiste PayPal Instellingen" -"Required Settings","Vereiste Instellingen" -"Required to display a banner","Banner weergeven vereist" -"Reversal","Omzetting" -"Reversal of General Account Hold","Omzetting van Algemene Rekening Houder" -"Reversal of Points Usage","Omzetting van Puntengebruik" -"Reversal of an adjustment.","Omzetting van een aanpassing" -"Reversal of hold for Dispute Investigation","Aanpassing van houder voor onderzoek naar dispuut" -"Review Order","Overzicht van de bestelling" -"Reward Voucher Redemption","Beloning Voucher Aflossing" -"SFTP Credentials","SFTP inloggegevens" -"Sale","Verkoop" -"Sales","Verkoop" -"Same as shipping","Zelfde als verzenden" -"Sandbox Credentials","Sandbox inloggegevens" -"Sandbox Mode","Sandbox modus" -"Schedule","Schema" -"Schedule description is too long.","Schemabeschrijving is te lang." -"Scheduled Fetching","Ophalen ingeroosterd" -"Select a Payment Solution","Selecteer een Betaalmethode" -"Send Email Confirmation","Verstuur Bevestigingsemail." -"Server Error. Please try again.","Serverfout. Probeer het opnieuw." -"Settlement Consolidation","Overeenkomst consolidatie" -"Settlement Report Settings","Overeenkomst verslag instellingen" -"Settlement of a chargeback.","Regeling van een terugboeking." -"Severe 3D Secure Card Validation","Strenge 3D Secure Card Validation" -"Severe Validation Removes Chargeback Liability on Merchant","Strenge validatie verwijdert terugboekingsaansprakelijkheid voor de handelaar" -"Severe validation removes chargeback liability on merchant.","Ernstige bevestiging verwijdert de aansprakelijkheid voor terugboeking van de handelaar." -"Shipping","Verzending" -"Shipping Address","Verzendingsadres" -"Shipping Information","Aflever Informatie" -"Shipping Method","Verzendingsmethode" -"Shop now using (150 X 40)","Winkel nu met (150 X 40)" -"Shop now using (150 X 60)","Winkel nu met (150 X 60)" -"Shortcut","Snelkoppeling" -"Shortcut Buttons Flavor","Snelkoppeling knoppen flavor" -"Shortcut on Product View","Snelkoppeling op product bekijken" -"Shortcut on Shopping Cart","Snelkoppeling op winkelmandje" -"Sidebar (right)","Zijbalk (rechts)" -"Sign a billing agreement to streamline further purchases with PayPal.","Teken een betaalovereenkomst om toekomstige aankopen met PayPal te stroomlijnen." -"Size","Grootte" -"Skip Order Review Step","Bestelling Herzien Stap Overslaan" -"Solo","Alleen" -"Some PayPal solutions conflict.","Sommige PayPal oplossingen conflicteren." -"Sorry, no quotes are available for this order at this time.","Sorry, geen prijsopgaven zijn beschikbaar voor deze bestelling op dit moment." -"Sort Order","Sorteer Bestelling" -"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specificeert wat de Authorization Honor Period is op de PayPal rekening van de winkelier. Dit dient gelijk te zijn aan de instelling in PayPal zelf." -"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specificeert wat de Order Valid Period is op de PayPal rekening van de winkelier. Dit dient gelijk te zijn aan de instelling in PayPal zelf." -"State/Province","Staat/Provincie" -"Static","Statisch" -"Street Address","Adres straat" -"Street Address %s","Straatnaam en huisnummer %s" -"Submitting order information...","Bestellingsinformatie aan het overbrengen..." -"Subscriber name is too long.","Naam van abonnee is te lang" -"Subscription ID","Abonnement ID" -"Subscription Payment, either payment sent or payment received","Abonnementsbetaling, betaling verzonden of betaling ontvangen" -"Subtotal","Subtotaal" -"Summary Text for Aggregated Cart","Samenvatting tekst voor samengesteld winkelmandje" -"Supporting of American Express cards require additional agreement. Learn more at http://www.paypal.com/amexupdate.","Ondersteuning van American Express kaarten vereist een additionele overeenkomst. Leer meer op http://www.paypal.com/amexupdate" -"Switch/Maestro","Switch/Maestro" -"Telephone","Telefoon" -"Test Mode","Test modus" -"The background color for the checkout page around the header and payment form.","De achtergrondkleur voor de afrekenpagina rond de header en het betalingsformulier." -"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","De achtergrondkleur voor de header van de afrekenpagina. Niet hoofdlettergevoelige zes-letterteken HTML hexadecimale kleurcode in ASCII." -"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","Het standaard aantal kindmachtigingen in uw PayPal account is 1. Om meerdere machtigingen te doen, neem alstublieft contact op met PayPal om een verhoging aan te vragen." -"The following error(s) occured:","De volgende fout (en) is/zijn opgetreden:" -"The image at the top left of the checkout page. Max size is 750x90-pixel. https is highly encouraged.","De afbeelding linksboven op de afrekeningspagina. Maximale grootte is 750x90 pixels. Https is ten sterkte aangeraden." -"The maximum number of child authorizations is reached.","Het maximale aantal kindmachtigingen is bereikt." -"The merchant account is not yet verified.","De handelsaccount is nog niet geverifieerd." -"The payment curency does not match any of the merchant\'s balances currency.","De betalingsvaluta komt met geen enkele valuta van de saldi van de handelaar overeen." -"The payment eCheck is not yet cleared.","De betalings eCheck is nog niet vrijgegeven." -"The payment is authorized but not settled.","De betaling is gemachtigd, maar niet afgehandeld." -"The payment is pending because it was made to an email address that is not yet registered or confirmed.","De betaling staat in de wacht omdat deze aangemaakt is met een emailadres dat nog niet geregistreerd of bevestigd is." -"The payment is pending while it is being reviewed by PayPal for risk.","De betaling staat in de wacht, terwijl deze beoordeeld wordt op risico door PayPal." -"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","De betaling werd gemaakt via creditcard. Om de gelden te ontvangen, moet de handelaar de account upgraden naar Business of Premier status." -"There is already another PayPal solution enabled. Enable this solution instead?","Er is al een andere PayPal oplossing geactiveerd. Activeer in plaats daarvan deze oplossing?" -"There was an error processing your order. Please contact us or try again later.","Er heeft zich een fout voorgedaan bij het verwerken van uw bestelling. Neem alstublieft contact met ons op of probeer het later opnieuw." -"This feature needs be enabled first for the merchant account through PayPal technical support.","Deze functie moet eerst worden ingeschakeld voor de merchant account via PayPal technische ondersteuning." -"This operation requires an existing transaction object.","Deze operatie vereist een bestaand transactie object." -"Time of Day","Tijd van de Dag" -"Title","Titel" -"To proceed to Checkout, please log in using your email address.","Logt u a.u.b. in met uw e-mail adres om door te gaan naar Afrekenen." -"Transaction ID","Transactie ID" -"Transaction ID must not be empty.","Transactie-ID mag niet leeg zijn." -"Transaction Information","Transactie Informatie" -"Transaction reversal by PayPal administrators.","Transactie terugboeking door PayPal beheerders." -"Transaction reversal due to fraud detected by PayPal administrators.","Transactie terugboeking als gevolg van fraude gedetecteerd door PayPal beheerders." -"Transfer Cart Line Items","Plaats Winkelwagentje Posten Over" -"Transfer Shipping Options","Plaats Verzendingsopties Over" -"Triggered Fraud Filters","Fraudeur Filters Getriggerd" -"URL method for Cancel URL and Return URL","URL-methode voor Annuleren URL en Terugkeren URL" -"Unable to cancel Express Checkout.","Onmogelijk om Express Checkout te annuleren." -"Unable to change status. Current status is not correspond to real status.","Kon status niet veranderen. Huidige status correspondeert niet met werkelijke status." -"Unable to communicate with the PayPal gateway.","Kan niet communiceren met de PayPal gateway." -"Unable to initialize Express Checkout review.","Onmogelijk om Express Checkout terug te zien." -"Unable to initialize Express Checkout.","Kan Expres Afrekenen niet initialiseren." -"Unable to place the order.","Kan bestelling niet plaatsen." -"Unable to process Express Checkout approval.","Niet mogelijk om Express Checkout door het validatie te halen." -"Unable to start Express Checkout.","Onmogelijk om Express Checkout te beginnen" -"Unable to update Order data.","Kan Bestel gegevens niet bijwerken." -"Unable to update shipping method.","Niet in staat om de versturingsmethode de updaten." -"Unknown Error. Please try again later.","Onbekende fout. Probeer het later opnieuw." -"Unknown reason. Please contact PayPal customer service.","Onbekende oorzaak. Neem alstublieft contact op met de klantendienst van PayPal." -"Update Order Data","Update Bestel Gegevens" -"Update Shipping Method","Verzend Methode Updaten" -"Use Proxy","Proxy gebruiken" -"Use colon to specify port. For example: ""test.example.com:5224"".","Gebruik een dubbelepunt om de poort te specificeren. Bijvoorbeeld: ""test.voorbeeld.com:5224""." -"User","Gebruiker" -"User-initiated Currency Conversion","Gebruiker-geïnitieerde munteenheid conversie" -"Uses store frontend name by default.","Gebruikt standaard de frontend naam van de winkel" -"VAT Number","BTW nummer" -"Vendor","Verkoper" -"View","Bekijk" -"View Demo","Bekijk Demo" -"View Transaction","Transactie bekijken" -"View Transaction Details","Bekijk Transactie Details" -"Virtual PayPal Debit Card Transaction","Virtuele Paypal Debitcard Transactie" -"Virtual Terminal Payment","Virtuele Laatste Betaling" -"Void","Geldig" -"Waiting until Customer\'s eCheck will be cleared.","Wachten tot Klant\'s eCheck wordt vrijgegeven." -"We prefer PayPal (150 X 40)","PayPal heeft onze voorkeur (150 X 40)" -"We prefer PayPal (150 X 60)","Paypal heeft onze voorkeur (150 X 60)" -"Website Payments Plus","Website betalingen plus" -"Website Payments Pro (Includes Express Checkout)","Website Betalingen Pro (Bevat Express Checkout)" -"Website Payments Pro Hosted Solution","Website betalingen professioneel gehoste oplossing" -"Website Payments Pro Hosted Solution (Includes Express Checkout)","Website Betalingen Pro Hosted Solution (Bevat Express Checkout)" -"Website Payments Pro Hosted Solution and Express Checkout","Website Betalingen Pro Hosted Solution en Express Checkout" -"Website Payments Pro Payflow Edition (Includes Express Checkout)","Website Betalingen Payflow Pro Editie (Bevat Express Checkout)" -"Website Payments Pro Payflow Edition and Express Checkout","Website betalingen Payflow Pro Editie en Express Checkout" -"Website Payments Pro and Express Checkout","Website Betalingen Pro en Express Checkout" -"Website Payments Standard","Website Betalingen Standaard" -"Website Payments Standard Payment","Website Betalingen Standaard Betaling" -"What is PayPal?","Wat is PayPal?" -"Whether to create a billing agreement, if there are no active billing agreements available.","Of er een facturatieovereenkomst aangemaakt moet worden als er geen actieve facturatieovereenkomsten beschikbaar zijn." -"Will appear as a payment option only for customers who have at least one active billing agreement.","Zal verschijnen als betaling optie voor klanten die tenminste een actieve facturatieovereenkomst hebben." -"WorldLink Withdrawal","WorldLink Opname" -"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Zou u graag een facturatieovereenkomst willen ondertekenen voor een betere integratie met PayPal?" -"Wrong Order ID (%s) specified.","Verkeerde Bestelling ID (%s) gespecificeerd." -"Wrong PayPal Express Checkout Token specified.","Verkeerde PayPal Express Checkout Token gekozen." -"Yes","Ja" -"Yes. Matched Address and five-didgit ZIP","Ja. Het adres en de 5-cijferige ZIP code komen overeen" -"You cannot void a verification transaction","U kunt een verificatie-transactie niet nietig verklaren" -"You will be redirected to the PayPal website in a few seconds.","U zult binnen enkele seconden naar de PayPal website worden geleid." -"You will be redirected to the PayPal website when you place an order.","U wordt door verwezen naar de PayPal website wanneer u een bestelling plaatst." -"You will be redirected to the PayPal website.","U zult doorverwezen worden naar de PayPal website." -"You will be required to enter your payment details after you place an order.","U zult uw betalingsdetails moeten invoeren na het plaatsen van een bestelling." -"Zip/Postal Code","Zip/Postcode" -"chargeback reimbursed","terugbetaling uitgekeerd" -"chargeback settled","Terugboeking geregeld" -"customer complaint","klacht van klant" -"customer triggered a chargeback","klant heeft een terugbetaling aangevraagd" -"customer triggered money-back guarantee","klant heeft geld-terug garantie aangevraagd" -"eBay Auction Payment","eBay veiling betaling" -"merchant refunded payment","handelaar heeft de betaling teruggeboekt" -"no reason","geen reden" -"reversal of an adjustment","omkering van aanpassing" -"unknown reason","onbekende reden" diff --git a/app/locale/nl_NL/Mage_PaypalUk.csv b/app/locale/nl_NL/Mage_PaypalUk.csv deleted file mode 100644 index c260cba00..000000000 --- a/app/locale/nl_NL/Mage_PaypalUk.csv +++ /dev/null @@ -1,2 +0,0 @@ -"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","PayPal Express Checkout (Payflow Edition) Shortcut Wrapper" -"PayPal Express Order Review Form","PayPal Express Bestelling Terugzien Formulier" diff --git a/app/locale/nl_NL/Mage_Persistent.csv b/app/locale/nl_NL/Mage_Persistent.csv deleted file mode 100644 index 2e34787cd..000000000 --- a/app/locale/nl_NL/Mage_Persistent.csv +++ /dev/null @@ -1,74 +0,0 @@ -"""Remember Me"" Default Value","""Onthoud me"" standaardwaarde" -"(Not %s?)","(Niet %s?)" -"* Required Fields","* Vereiste velden" -"Address","Adres" -"Address Information","Adresgegevens" -"Already registered?","Al ingeschreven?" -"Back","Terug" -"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Door een account aan te maken bij onze winkel, kunt u sneller afrekenen, meerdere verzendadressen opgeven, uw bestellingen bekijken en tracken en meer." -"Cannot load configuration from file %s.","Kan configuratie van bestand %s niet laden." -"Checkout as Guest","Als een gast betalen" -"Checkout as a Guest","Afrekenen als een Gast" -"Checkout as a Guest or Register","Betaal als Gast of Schrijf in" -"City","Stad" -"Clear Persistence on Log Out","Verwijder persistentie bij het uitloggen" -"Close","Sluiten" -"Company","Bedrijf" -"Confirm Password","Bevestig wachtwoord" -"Continue","Doorgaan" -"Country","Land" -"Create an Account","Een account aanmaken" -"Easy access to your order history and status","Gemakkelijke toegang tot uw bestelgeschiedenis en -status" -"Email Address","e-mailadres" -"Enable ""Remember Me""","Zet ""Onthoud mij"" aan" -"Enable Persistence","Persistentie aanzetten" -"Fast and easy check out","Snelle en gemakkelijk betalingen" -"Faster checkout","Snelle afrekening" -"Fax","Fax" -"Forgot Your Password?","Uw Wachtwoord Vergeten?" -"Forgot your password?","Uw wachtwoord vergeten?" -"General Options","Algemene opties" -"If you have an account with us, please log in.","Als u een account bij ons heeft, logt u dan alstublieft in." -"Loading next step...","Volgende stap aan het laden..." -"Login","Log in" -"Login Information","Log in Gegevens" -"Login or Create an Account","Log in of Maak een Account aan" -"New Customers","Nieuwe Klanten" -"New Here?","Nieuw Hier?" -"Password","Wachtwoord" -"Persist Shopping Cart","Blijvend winkelmandje" -"Persistence Lifetime (seconds)","Duur winkelmandje (seconden)" -"Persistent Shopping Cart","Blijvend winkelmandje" -"Personal Information","Persoonlijke Informatie" -"Please enter the following information to create your account.","Vul a.u.b. de volgende informatie in voor het aanmaken van uw account" -"Please log in below:","Log hieronder in" -"Please select region, state or province","Selecteer a.u.b. uw provincie" -"Register","Registreer" -"Register and Checkout","Registreren en Afrekenen" -"Register and save time!","Registreer en bespaar tijd!" -"Register to Create an Account","Registreer om een Account aan te maken" -"Register with us for future convenience:","Registreer bij ons voor verder gemak" -"Registered Customers","Geregistreerde Klanten" -"Registration is free and easy!","Registreren is makkelijk en gratis!" -"Remember Me","Onthoud me" -"Returning Customers","Terugkerende Klanten" -"Save in address book","Sla op in adresboek" -"Save multiple shipping addresses","Meerdere afleveradressen opslaan" -"Select State/Province...","Selecteer Provincie" -"Select a billing address from your address book or enter a new address.","Selecteer rekeninggegevens uit uw adresboek of voer nieuwe gegevens in" -"Ship to different address","Verzend naar ander adres" -"Ship to this address","Verzend naar dit adres" -"Shopping cart has been updated with appropriate prices","Het winkelkarretje is bijgewerkt met de juiste prijzen." -"Sign Up for Newsletter","Schrijf in voor Nieuwsbrief" -"Sign in to speed up your checkout process","Meldt u aan om uw afreken proces te versnellen" -"State/Province","Staat/Provincie" -"Street Address","Adres straat" -"Street Address %s","Straatnaam en huisnummer %s" -"Submit","Bevestig" -"Telephone","Telefoon" -"To proceed to Checkout, please log in using your email address.","Om verder te gaan naar Checkout, gelieve in te loggen met uw email adres." -"VAT Number","BTW nummer" -"View and track orders and more","Bekijk en volg bestellingen, en meer" -"Welcome, %s!","Welkom, %s!" -"What\'s this?","Wat is dit?" -"Zip/Postal Code","Zip/Postcode" diff --git a/app/locale/nl_NL/Mage_Poll.csv b/app/locale/nl_NL/Mage_Poll.csv deleted file mode 100644 index a5872141e..000000000 --- a/app/locale/nl_NL/Mage_Poll.csv +++ /dev/null @@ -1,42 +0,0 @@ -"Actions","Acties" -"Add Answer","Voeg Antwoord toe" -"Add New Answer","Voeg Nieuw Antwoord toe" -"Add New Poll","Voeg Nieuwe Peiling toe" -"Answer Title","Beantwoord Titel" -"Answer Title:","Beantwoord Titel:" -"Answer with the same title in this poll","Antwoord met dezelfde titel in deze peiling" -"Are you sure you want to delete it?","Weet u zeker dat u het wilt verwijderen?" -"Assigned Answers","Toegewezen Antwoorden" -"Closed","Gesloten" -"Community Poll","Peiling Community" -"Date Closed","Data Gesloten" -"Date Posted","Datum Gepost" -"Delete","Verwijderen" -"Delete Answer","Verwijder Antwoord" -"Delete Poll","Verwijder Peiling" -"Disallow Voting in a Poll Multiple Times from Same IP-address","Sta Meedere Keren Stemmen in een Peiling van Zelfde IP-adres niet toe" -"Edit Answer '%s'","Bewerk Antwoord '%s'" -"Edit Poll '%s'","Bewerk Peiling '%s'" -"Edit Poll Answer","Bewerk Antwoord Peiling" -"ID","ID" -"Invalid Answer.","Ongeldig Antwoord." -"New Poll","Nieuwe Poll" -"Number of Responses","Aantal Responses" -"Open","Open" -"Poll Answers","Peiling antwoorden" -"Poll Information","Peiling informatie" -"Poll Manager","Poll Manager" -"Poll Question","Peiling vraag" -"Poll information","Peiling informatie" -"Poll with the same question","Peiling met dezelfde vraag" -"Polls","Peilingen" -"Save Answer","Antwoord opslaan" -"Save Poll","Peiling opslaan" -"Status","Status" -"The answer has been saved.","Het antwoord is opgeslagen." -"The poll does not exist.","De peiling bestaat niet." -"Unable to find an answer to delete.","Kan geen antwoord vinden om te verwijderen." -"Visible In","Zichtbaar in" -"Vote","Stem" -"Votes Count","Aantal stemmen" -"Votes Count:","Aantal stemmen:" diff --git a/app/locale/nl_NL/Mage_ProductAlert.csv b/app/locale/nl_NL/Mage_ProductAlert.csv deleted file mode 100644 index 5073cf0f7..000000000 --- a/app/locale/nl_NL/Mage_ProductAlert.csv +++ /dev/null @@ -1,35 +0,0 @@ -"Alert Email Sender","Waarschuwing E-mail Verzender" -"Alert subscription has been saved.","Waarschuwing subscriptie is opgeslagen." -"Allow Alert When Product Comes Back in Stock","Ik wil een waarschuwing ontvangen wanneer dit product weer in voorraad is" -"Allow Alert When Product Price Changes","Ik wil een waarschuwing ontvangen wanneer de prijs van dit product veranderd" -"Click here not to receive alerts for this product","Klik hier om geen waarschuwingen voor dit product te ontvangen" -"Error Email Recipient","Foutmelding Email Ontvanger" -"Error Email Sender","Foutmelding Email Verstuurder" -"Error Email Template","Foutmelding Email Template" -"Frequency","Frequentie" -"Not enough parameters.","Niet genoeg parameters." -"Price Alert Email Template","Prijs Waarschuwing E-mail Sjabloon" -"Price:","Prijs:" -"Product Alerts","Product Waarschuwingen" -"Product Alerts Run Settings","Product Waarschuwingen Uitvoer Instellingen" -"Product alerts Cron error","Product waarschuwingen Cron fout" -"Product price alert","Product prijs waarschuwing" -"Product stock alert","Product voorraad waarschuwing" -"Regular Price:","Normale prijs:" -"Sign up for price alert","Meld u nu aan voor prijs waarschuwingen" -"Sign up to get notified when this product is back in stock","Meld u nu aan om gewaarschuwd te worden wanneer dit product weer in voorraad is" -"Special price:","Speciale prijs:" -"Start Time","Begintijd" -"Stock Alert Email Template","Voorraad Waarschuwing E-mail Sjabloon" -"The alert subscription has been deleted.","De waarschuwingssubscriptie is verwijderd." -"The alert subscription has been saved.","De waarschuwingssubscriptie is opgeslagen." -"The product is not found.","Het product is niet gevonden." -"The product was not found.","Het product kon niet worden gevonden." -"Unable to update the alert subscription.","Niet instaat om de alarm subscriptie te updaten." -"Unsubscribe from all price alerts","Schrijf u uit van alle prijs alarmen" -"Unsubscribe from all stock alerts","Schrijf u uit van alle aandeel alarmen" -"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","U ontvangt deze notificatie omdat u zich ingeschreven heeft om een waarschuwing te ontvangen wanneer de volgende producten weer beschikbaar zijn:" -"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","U ontvangt deze notificatie omdat u zich ingeschreven heeft om een waarschuwing te ontvangen wanneer de prijs van de volgende producten veranderd:" -"You will no longer receive price alerts for this product.","U zult geen waarschuwing over de prijs van dit product meer ontvangen." -"You will no longer receive stock alerts for this product.","U zult geen waarschuwingen over de beschikbaarheid van dit product ontvangen." -"You will no longer receive stock alerts.","U zult geen voorraad waarschuwingen meer ontvangen." diff --git a/app/locale/nl_NL/Mage_Rating.csv b/app/locale/nl_NL/Mage_Rating.csv deleted file mode 100644 index 5e7a7ce6b..000000000 --- a/app/locale/nl_NL/Mage_Rating.csv +++ /dev/null @@ -1,29 +0,0 @@ -"1 star","1 ster" -"2 stars","2 sterren" -"3 stars","3 sterren" -"4 stars","4 sterren" -"5 stars","5 sterren" -"Add New Rating","Voeg Nieuwe Rating toe" -"Assigned Options","Toegewezen Opties" -"Be the first to review this product","Wees de eerste om dit product te waarderen" -"Default Value","Vaststaande Waarde" -"Delete Rating","Verwijder Rating" -"Edit Rating","Bewerk Rating" -"ID","ID" -"If you do not specify a rating title for a store, the default value will be used.","Als u geen rating titel voor een winkel specificeert, zal de vaststaande waarde worden gebruikt." -"Manage Ratings","Beheer Ratings" -"New Rating","Nieuwe beoordeling" -"Option Label","Optie Label" -"Option Title","Optie Tiel" -"Option Title:","Optie Titel:" -"Please select one of each ratings above","Selecteer een van bovenstaande ratings" -"Rating Information","Rating Informatie" -"Rating Name","Rating Naam" -"Rating Options","Rating Opties" -"Rating Title","Rating Titel" -"Rating Visibility","Rating Zichtbaarheid" -"Rating isn't Available","Rating is niet Beschikbaar" -"Rating with the same title","Beoordeling met dezelfde titel" -"Save Rating","Beoordeling opslaan" -"Sort Order","Sorteer Bestelling" -"Visible In","Zichtbaar in" diff --git a/app/locale/nl_NL/Mage_Reports.csv b/app/locale/nl_NL/Mage_Reports.csv deleted file mode 100644 index 4486d1ea1..000000000 --- a/app/locale/nl_NL/Mage_Reports.csv +++ /dev/null @@ -1,174 +0,0 @@ -"Abandoned Carts","Verlaten winkelwagens" -"Abandoned carts","Verlaten winkelmanden" -"Action","Actie" -"Add to Cart","Aan mandje toevoegen" -"Add to Compare","Voeg toe om te Vergelijken" -"Add to Wishlist","Aan verlanglijst toevoegen" -"Any","Iedere" -"Applied Coupon","Gebruikte kortingsbon" -"Applies to Any of the Specified Order Statuses","Van toepassing op elk van de gespecificeerde bestellingsstatussen" -"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Weet u zeker dat u de levensduur statistieken wilt verversen? Deze operatie kan de performantie negatief beïnvloeden." -"Are you sure?","Weet u het zeker?" -"Avg. Approved Rating","Gem. goede beoordeling" -"Avg. Rating","Gem. beoordeling" -"Bestsellers","Bestsellers" -"Bought from wishlists","Gekocht van verlanglijstjes" -"CSV","CSV" -"Carts","Mandjes" -"Catalog Category (Without Subcategories)","Catalogus categorie (zonder subcategorieën)" -"Compared Products Grid Template","Vergeleken producten rooster sjabloon" -"Compared Products List Template","Vergeleken producten lijst sjabloon" -"Coupons","Waardebonnen" -"Coupons Usage Report","Kortingsbonnengebruik verslag" -"Created At","Gecreëerd op" -"Current Month Starts","Huidige maand begint" -"Customer","Klant" -"Customer Name","Naam klant" -"Customer Tags","Klantenlabels" -"Customers","Klanten" -"Customers Report","Klantenverslag" -"Customers Reviews","Klantenrecensies" -"Customers Tags","Klantenlabels" -"Customers by Number of Orders","Klanten op volgorde van aantal bestellingen" -"Customers by Orders Total","Klanten op volgorde van totaal bestellingen" -"Customers by number of orders","Klanten op aantal bestellingen" -"Customers by orders total","Klanten op totaal bestellingen" -"Customers that have wishlist: %s%","Klanten die een verlanglijstje hebben: %s%" -"Dashboard","Dashboard" -"Day","Dag" -"Default Recently Compared Products Count","Standaard aantal recent vergeleken producten" -"Default Recently Viewed Products Count","Standaard aantal recent bekeken producten" -"Description","Beschrijving" -"Detail","Detail" -"Downloads","Downloads" -"Email","Email" -"Empty Rows","Lege rijen" -"Excel XML","Excel XML" -"Filter","Filter" -"First Name","Voornaam" -"From","Van" -"Guest","Gast" -"Hits","Bezoeken" -"ID","ID" -"IP Address","IP Adres" -"Index model name must be defined","Indexnaam van het model moet gedefinieerd worden." -"Invalid date specified.","Ongeldige datum opgegeven." -"Invoiced","Gefactureerd" -"Items in Cart","Items in Winkelwagentje" -"Last Name","Achternaam" -"Last Review","Laatste Beoordeling" -"Link","Link" -"List of Products Recently Compared and Removed from the Compare List by Visitor","Lijst van Producten die Recentelijk Vergeleken en Verwijderd zijn van de Vergelijkingslijst door de Bezoeker." -"List of Products Recently Viewed by Visitor","Lijst van Producten die Recentelijk Bekeken zijn door Bezoeker" -"Low Stock","Lage Voorraad" -"Low stock","Lage voorraad" -"Match Period To","Evenaar Periode Aan" -"Month","Maand" -"Most Viewed","Meest bekeken" -"Name","Naam" -"New Accounts","Nieuwe Accounts" -"No","Nee" -"Number Added","Aantal Toegevoegd" -"Number Fulfilled","Aantal Voldaan" -"Number Of Reviews","Aantal Beoordelingen" -"Number Purchased","Aantal Gekocht" -"Number Viewed","Aantal keer bekeken" -"Number of Items","Aantal artikelen" -"Number of New Accounts","Aantal nieuwe accounts" -"Number of Products to display","Aantal producten die u kunt laten zien" -"Number of Reviews","Aantal beoordelingen" -"Number of Times Deleted","Aantal keer verwijderd" -"Number of Total Tags","Totale hoeveelheid labels" -"Number of Unique Tags","Hoeveelheid unieke labels" -"Number of Views","Aantal keer bekeken" -"Number of items bought from a wishlist: %s","Hoeveelheid artikelen gekocht vanuit een wensenlijst: %s" -"Number of times wishlists have been shared (emailed): %s","Hoe vaak wensenlijsten gedeeld werden over e-mail: %s" -"Number of wishlist conversions: %s","Hoeveelheid van wensenlijst conversies: %s" -"Number of wishlist referrals: %s","Hoeveelheid wensenlijst verwijzingen: %s" -"Number of wishlists: %s","Hoeveelheid wensenlijsten: %s" -"Order Status","Status Bestelling" -"Order Taxes Report Grouped by Tax Rate","Bestelling Belasting Verslagen gesorteerd op Belastingtarief" -"Orders","Bestellingen" -"Out of stock","Uit voorraad" -"Period","Periode" -"Poducts Report","Product Verslag" -"Popular Tags","Populaire Tags" -"Popularity","Populariteit" -"Price","Prijs" -"Product Name","Productnaam" -"Product Reviews","Productbeoordelingen" -"Product SKU","Product SKU" -"Product Tags","Productlabels" -"Products","Producten" -"Products Ordered","Bestelde Producten" -"Products Report","Productverslag" -"Products Reviews","Productrecensies" -"Products Tags","Productenlabels" -"Products in carts","Producten in mandjes" -"Purchases","Aankopen" -"Quantity Ordered","Bestelde hoeveelheid" -"Quantity of Items","Hoeveelheid artikelen" -"Recently Compared","Recent vergeleken" -"Recently Compared Products","Recent vergeleken producten" -"Recently Viewed","Recent bekeken" -"Recently Viewed Products","Onlangs Bekeken Producten" -"Recently Viewed/Compared Products","Recent bekeken/vergeleken producten" -"Refresh Lifetime Statistics","Levensduur statistieken verversen" -"Refresh Statistics","Statistieken verversen" -"Refresh Statistics for the Last Day","Statistiek voor de laatste dag verversen" -"Refunds","Terugbetalingen" -"Report","Verslag" -"Reports","Verslagen" -"Results","Resultaten" -"Revenue","Omzet" -"Review","recensie" -"Reviews","Reviews" -"Reviews for %s","Reviews voor %s" -"Sales","Verkoop" -"Sales Report","Verkooprapport" -"Search Query","Zoek Query" -"Search Terms","Zoek Voorwaarden" -"Select day of the month.","Selecteer dag van de maand" -"Shipping","Verzending" -"Shopping Cart","Winkelmandje" -"Shopping Cart Price Rule","Winkelkarretje Prijs Regel" -"Show Actual Values","Toon Huidige Waarden" -"Show Report","Toon Rapport" -"Show for Current","Toon voor Huidige" -"Specified","Gespecificeerd" -"Statistics","Statistieken" -"Stock Qty","Voorraad Qty" -"Submitted In","Ingediend In" -"Submitted On","Ingediend Op" -"Subtotal","Subtotaal" -"Tag","Tag" -"Tag ""%s"" details","Tag ""%s"" gegevens" -"Tag Detail","Tag Detail" -"Tag Name","Tag Naam" -"Tag Use","Tag Gebruik" -"Tags Submitted by %s","Tags Ingediend door %s" -"Tags submitted to %s","Tags Ingediend In %s" -"Tax","Belasting" -"Title","Titel" -"To","Naar" -"Total","Totaal" -"Total Invoiced vs. Paid Report","Totaal gefactureerd vs. betaald verslag" -"Total Ordered Report","Totaal besteld verslag" -"Total Refunded Report","Totaal terugbetaald verslag" -"Total Shipped Report","Totaal verzonden verslag" -"Total Tags","Totaal labels" -"Total invoiced","Totaal gefactureerd" -"Total refunded","Totaal terugbetaald" -"Updated At","Geüpdate At" -"Viewed Products Grid Template","Toon productenrooster sjabloon" -"Viewed Products List Template","Toon productenlijst sjabloon" -"Visible In","Zichtbaar in" -"Wishlist Report","Wishlist Rapport" -"Wishlist vs. Regular Order","Verlanglijstje vs. normale bestelling" -"Wishlists","Verlanglijstje" -"Year","Jaar" -"Year-To-Date Starts","Jaar-tot-datum start" -"Yes","Ja" -"Your Recently Compared","Uw recent vergeleken producten" -"Your Recently Viewed","Uw recent bekeken producten" -"undefined","ongedefinieerd" diff --git a/app/locale/nl_NL/Mage_Review.csv b/app/locale/nl_NL/Mage_Review.csv deleted file mode 100644 index ed89d320b..000000000 --- a/app/locale/nl_NL/Mage_Review.csv +++ /dev/null @@ -1,104 +0,0 @@ -"%d Review(s)","%d Beoordeling(en)" -"%s Review(s)","%s Beoordeling(en)" -"(Posted on %s)","(Geplaatst op %s)" -"1 star","1 ster" -"2 star","2 sterren" -"2 stars","2 sterren" -"3 star","3 sterren" -"3 stars","3 sterren" -"4 star","4 sterren" -"4 stars","4 sterren" -"5 star","5 sterren" -"5 stars","5 sterren" -"%2$s %3$s (%4$s)","%2$s %3$s (%4$s)" -"Add New Review","Voeg Nieuwe Beoordeling toe" -"Add Your Review","Voeg Uw Beoordeling toe" -"Administrator","Administrator" -"All Reviews","Alle Recensies" -"All Reviews of Customer `%s`","Alle Beoordelingen van Klant %s" -"All Reviews of Product `%s`","Alle Recensies van Product `%s`" -"Allow Guests to Write Reviews","Sta Gasten toe om Beoordelingen te Schrijven" -"Approved","Goed Gekeurd" -"Are you sure you want to do this?","Weet je zeker dat je dit wilt doen?" -"Are you sure?","Weet u het zeker?" -"Average Customer Rating","Gemiddelde Waardering door Klant" -"Average Customer Rating:","Gemiddelde Waardering door Klant:" -"Back","Terug" -"Back to Main Product Info","Terug naar Belangrijkste Productinformatie" -"Back to My Reviews","Terug naar Mijn Beoordelingen" -"Back to Product Reviews","Terug naar Productbeoordelingen" -"Be the first to review this product","Wees de eerste om dit product te waarderen" -"Catalog Product Review View","Catalogus Product Beoordeling Bezichtiging" -"Catalog Product Reviews List","Catalogus Product Beoordelingenlijst" -"Created On","Gemaakt Op" -"Customer","Klant" -"Customer My Account Product Reviews","Klant Mijn Account Product Reviews" -"Customer My Account Review Details","Klant Mijn Account Review Details" -"Customer Reviews","Klantbeoordelingen" -"Customers Reviews","Klantenrecensies" -"Delete","Verwijderen" -"Delete Review","Verwijder Review" -"Detailed Rating","Gedetailleerde Rating" -"Edit Review '%s'","Bewerk Review '%s'" -"Guest","Gast" -"How do you rate this product?","Hoe heeft u dit product gewaardeerd?" -"ID","ID" -"Let us know your thoughts","Geef ons uw mening" -"Manage Ratings","Beheer Ratings" -"My Product Reviews","Mijn Product Reviews" -"My Recent Reviews","Mijn Recente Reviews" -"Name","Naam" -"Name in Store","Naam in Winkel" -"New Review","Nieuwe Review" -"Nickname","Bijnaam" -"Nickname can\'t be empty","Nickname kan niet leeg zijn" -"Not Approved","Niet Goedgekeurd" -"Only registered users can write reviews. Please, log in or register","Alleen geregistreerde gebruikers kunnen beoordelingen schrijven. Log in of registreer" -"Pending","In afwachting" -"Pending Reviews","In afwachting van beoordelingen" -"Pending Reviews of Customer `%s`","Nog gaande zijnde Reviews van Klant `%s`" -"Please select a product","Selecteer a.u.b. een product" -"Please select one of each of the ratings above","Selecteer a.u.b. een van bovenstaande ratings" -"Posted By","Door" -"Price","Prijs" -"Product","Product" -"Product Name","Productnaam" -"Product Rating","Productbeoordeling" -"Product Rating:","Productbeoordeling:" -"Product Review (submitted on %s):","Productrecensie (verzonden op %s):" -"Product Reviews","Productbeoordelingen" -"Product SKU","Product SKU" -"Products Reviews","Productrecensies" -"Qty","Hoeveelheid" -"Rating:","Beoordeling:" -"Review","recensie" -"Review (submitted on %s):","Recensie (verzonden op %s):" -"Review Details","Details recensie" -"Review Form Fields Before","Beoordeel formuliervelden voor" -"Review by %s","Review door %s" -"Review by %s","Recensie door %s" -"Review can\'t be empty","Beoordeling kan niet leeg zijn" -"Review summary can\'t be empty","Overzicht kan niet leeg zijn" -"Reviews and Ratings","Beoordelingen en waarderingen" -"SKU","SKU" -"Save Review","Recensie opslaan" -"Status","Status" -"Submit Review","Recensie insturen" -"Summary Rating","Beknopte beoordeling" -"Summary of Review","Samenvatting van recensie" -"Summary of Your Review","Overzicht van uw recensie" -"Title","Titel" -"Type","Type" -"Unable to post the review.","Kan recensie niet publiceren." -"Update Status","Status bijwerken" -"View All Reviews","Alle recensies bekijken" -"View Details","Details bekijken" -"Visible In","Zichtbaar in" -"Websites","Websites" -"What's your nickname?","Wat is uw bijnaam?" -"Write Your Own Review","Schrijf je eigen recensie" -"You have submitted no reviews.","U heeft geen recensies ingestuurd" -"You're reviewing:","U recenseert:" -"Your Rating:","Uw beoordeling:" -"Your Review (submitted on %s):","Uw recensie (verzonden op %s):" -"Your review has been accepted for moderation.","Uw beoordeling is geaccepteerd voor evaluatie." diff --git a/app/locale/nl_NL/Mage_Rss.csv b/app/locale/nl_NL/Mage_Rss.csv deleted file mode 100644 index 5b6bbc778..000000000 --- a/app/locale/nl_NL/Mage_Rss.csv +++ /dev/null @@ -1,56 +0,0 @@ -"%s - Discounts and Coupons","%s - Kortingen en Waardebonnen" -"%s - Special Products","%s - Speciale Producten" -"%s RSS Feed","%s RSS Feed" -"%s has reached a quantity of %s.","%s heeft een kwantiteit van %s bereikt." -"%s\'s Wishlist","%s\'s Wensenlijst" -"Cannot retrieve the wishlist","Kan de wensenlijst niet ontvangen" -"Catalog","Catalogus" -"Category Feeds","Categorie feeds" -"Click for price","Klik voor de prijs" -"Comment: %s
    ","Commentaar: %s
    " -"Coupons/Discounts","Waardebonnen/Kortingen" -"Current Status: %s
    ","Huidige Status: %s
    " -"Customer Name: %s","Klant Naam: %s" -"Customer Order Status Notification","Klant Bestelling Status Notificatie" -"Details for %s #%s","Details over %s #%s" -"Discount","Korting" -"Discount (%s)","Korting (%s)" -"Enable RSS","Schakel RSS in" -"Error in processing xml. %s","Fout in het verwerken van XML. %s" -"From:","Van:" -"Get Feed","Verkrijg Feed" -"Gift Message","Cadeauboodschap" -"Grand Total","Totaal" -"Low Stock Products","Lage Voorraad Producten" -"Message:","Bericht:" -"Miscellaneous Feeds","Diverse Feeds" -"New Orders","Nieuwe Bestellingen" -"New Products","Nieuwe Producten" -"New Products from %s","Nieuwe Producten van %s" -"Notified Date: %s
    ","Aangekondigde Datum: %s
    " -"Order # %s Notification(s)","Bestelling # %s Notificatie(s)" -"Order #%s created at %s","Bestelling #%s aangemaakt op %s" -"Pending product review(s)","In afwachting van productbeoordeling(en)" -"Product: ""%s"" review By: %s","Product: ""%s"" beoordeling door: %s" -"Product: %s
    ","Product: %s
    " -"Products tagged with %s","Producten getagd met %s" -"Purchased From: %s","Gekocht Van: %s" -"RSS","RSS" -"RSS Feeds","RSS Feeds" -"RSS Feeds List","RSS Feeds Lijst" -"RSS Feeds Section","RSS Feeds Sectie" -"Review: %s
    ","Beoordeling: %s
    " -"Rss Config","Rss Instellingen" -"Shipping & Handling","Verzending & in Behandeling" -"Special Products","Speciale Producten" -"Store: %s
    ","Winkel: %s
    " -"Subtotal","Subtotaal" -"Summary of review: %s
    ","Samenvatting van beoordeling: %s
    " -"Tags Products","Tags Producten" -"Tax","Belasting" -"There are no Rss Feeds","Er zijn geen RSS feeds" -"To:","Aan:" -"Top Level Category","Hoogste niveau categorie" -"Total: %s
    ","Totaal: %s
    " -"Wishlist","Verlanglijst" -"click here to view the review","klik hier om de beoordeling te bekijken" diff --git a/app/locale/nl_NL/Mage_Rule.csv b/app/locale/nl_NL/Mage_Rule.csv deleted file mode 100644 index 30792607e..000000000 --- a/app/locale/nl_NL/Mage_Rule.csv +++ /dev/null @@ -1,40 +0,0 @@ -"ALL","ALLE" -"ANY","ELKE" -"Add","Toevoegen" -"Apply","Toepassen" -"Conditions Combination","Voorwaarden Combinatie" -"Customer Groups must be specified.","Klanten groep moeten worden opgegeven." -"End Date must be greater than Start Date.","Einddatum moet later zijn dan Begindatum." -"FALSE","VALS" -"If %s of these conditions are %s:","Als %s van deze conditions %s zijn:" -"Invalid discount amount.","Ongeldige hoeveelheid korting." -"Open Chooser","Open Kiezer" -"Perform following actions","Voer volgende acties uit" -"Please choose a condition to add...","Kies een conditie om toe te voegen..." -"Please choose an action to add...","Kies een actie om toe te voegen..." -"Remove","Verwijderen" -"TRUE","WAAR" -"There is no information about associated entity type ""%s"".","Er is geen informatie over de bijbehorende entiteit type ""%s""." -"Websites must be specified.","Websites moeten worden opgegeven." -"by","door" -"contains","bevat" -"does not contain","Bevat niet" -"does not contains","Bevat niet" -"equals or greater than","Gelijk aan of minder dan" -"equals or less than","Gelijk aan of minder dan" -"for","voor" -"for greater than","indien groter dan" -"for or greater than","indien gelijk aan of groter dan" -"found","gevonden" -"from","van" -"greater than","groter dan" -"is","is" -"is not","is niet" -"is not one of","is niet een van de" -"is one of","is een van de" -"less than","minder dan" -"not found","niet gevonden" -"not from","niet van" -"to","naar" -"was","was" -"was not","was niet" diff --git a/app/locale/nl_NL/Mage_Sales.csv b/app/locale/nl_NL/Mage_Sales.csv deleted file mode 100644 index 12017cac4..000000000 --- a/app/locale/nl_NL/Mage_Sales.csv +++ /dev/null @@ -1,882 +0,0 @@ -"""%s"" coupon code is not valid.","""%s"" coupon code is niet geldig." -"%s","%s" -"%s / %s rate:","%s / %s ratio:" -"%s for %s","%s voor %s" -"%s order(s) cannot be canceled","%s bestelling(en) kunnen niet geannuleerd worden" -"%s order(s) have been canceled.","%s order(s) zijn geannuleerd." -"%s order(s) have been put on hold.","%s order(s) zijn in de wachtstand gezet." -"%s order(s) have been released from holding status.","%s order(s) zijn vrijgelaten uit wacht status." -"%s order(s) were not put on hold.","%s bestelling(en) zijn uitgesteld" -"%s order(s) were not released from holding status.","%s bestelling(en) zijn niet vrijgemaakt uit uitgestelde status" -"* - Enter custom price excluding tax","* - Voer aangepaste prijs exclusief belasting in" -"* - Enter custom price including tax","* - Voer aangepaste prijs inclusief belasting in" -"* Required Fields","* Vereiste velden" -"-- Please Select --","-- Selecteer Alstublieft --" -"-- Please Select Billing Agreement--","-- Selecteer a.u.b. rekeningovereenkomst --" -"About This Order:","Over deze bestelling:" -"About This Profile:","Over dit profiel:" -"About Your Invoice","Over Uw Factuur" -"About Your Order","Over uw bestelling" -"About Your Refund","Over Uw Terugbetaling" -"About Your Shipment","Over Uw Zending" -"Accept Payment","Accepteer betaling" -"Accept or Deny Payment","Accepteer of weiger betaling" -"Account Information","Account Gegevens" -"Action","actie" -"Actions","acties" -"Activate","Activeer" -"Active","Actief" -"Add","Toevoegen" -"Add New Address","Adres Toevoegen" -"Add Order Comments","Voeg bestelcommentaar toe" -"Add Package","Pakket toevoegen" -"Add Products","producten toevoegen" -"Add Selected Product(s) to Option","Voeg geselecteerde product(en) toe aan optie" -"Add Selected Product(s) to Order","Voeg geselecteerde product(en) toe aan bestelling" -"Add Selected Product(s) to Package","Geselecteerde product(en) aan pakket toevoegen" -"Add To Order","Voeg toe aan bestelling" -"Add Tracking Number","Voeg traceernummer toe" -"Add comment to order","Voeg commentaar toe aan bestelling." -"Add new comment to credit memo","Voeg een nieuwe reactie toe aan de creditnota" -"Add new comment to shipment","Voeg nieuw commentaar toe aan verzending." -"Add new tracking number","Voeg nieuw traceernummer toe." -"Add to Cart","Voeg toe aan winkelwagen" -"Additional Product Info","Verdere productinformatie" -"Address","Adres" -"Address model is not defined.","Adresmodel is niet gedefinieerd" -"Adjustment Fee","Aanpassingstoeslag" -"Adjustment Refund","Aanpassingsbetaling" -"Agreement Information","Overeenkomst informatie" -"Allow Reorder","Sta nabestelling toe" -"Amount","Aantal" -"Amount: %s.","Hoeveelheid: %s." -"An error occurred while assigning order status. Status has not been assigned.","Er is een fout opgetreden tijdens het toewijzen van uw orderstatus. Status is niet toegewezen." -"An error occurred while creating shipping label.","Er heeft zich een fout voorgedaan bij het aanmaken van het verzendingslabel." -"An error occurred while saving order status. The status has not been added.","Er is een fout opgetreden tijdens het opslaan van uw orderstatus. Status is niet toegevoegd." -"An error occurred while unassigning order status.","Er is een fout opgetreden tijdens het ongedaan maken van uw orderstatus." -"An error occurred while updating the order address. The address has not been changed.","Er is een fout opgetreden tijdens het bijwerken van het bestellingsadres. Het adres is niet veranderd." -"An item option with code %s already exists.","Er bestaat reeds een item optie met de code %s." -"Anchor Custom Title","Anker Custom Titel" -"Append Comments","Voeg commentaar toe" -"Apply","Invullen" -"Apply Coupon Code","Vul couponcode in" -"Approved the payment online.","De betaling is online goedgekeurd" -"Are you sure you want to accept this payment?","Weet u zeker dat u deze betaling wilt accepteren?" -"Are you sure you want to cancel this order?","Weet u zeker dat u deze bestelling wilt annuleren?" -"Are you sure you want to delete all items from shopping cart?","Bent u er zeker van om alle producten te verwijderen uit de winkelwagen?" -"Are you sure you want to deny this payment?","Weet u zeker dat u deze betaling wilt weigeren?" -"Are you sure you want to do this?","Weet u zeker dat u dit wilt doen?" -"Are you sure you want to send Creditmemo email to customer?","Weet u zeker dat u een credietmemo-mail naar de klant wilt sturen?" -"Are you sure you want to send Invoice email to customer?","Weet u zeker dat u een factuur-mail naar de klant wilt sturen?" -"Are you sure you want to send Shipment email to customer?","Weet u zeker dat u een verzendings-mail naar de klant wilt sturen?" -"Are you sure you want to send order email to customer?","Weet u zeker dat u een bestellings-mail naar de klant wilt sturen?" -"Are you sure you want to void the payment?","Weet u zeker dat u de betaling wilt leegmaken?" -"Are you sure?","Weet u het zeker?" -"Are you sure? This order will be canceled and a new one will be created instead","Weet u het zeker? Deze bestelling zal geannuleerd worden en er zal een nieuwe worden gemaakt." -"Assign Order Status to State","Zet Orderstatus als Staat" -"Assign Status to State","Zet Status als Staat" -"Assignment Information","Opdracht Informatie" -"At least a payment ID must be set.","Tenminste moet er een betaal-ID worden ingesteld." -"Authorization","Autorisatie" -"Authorized amount of %s.","Geautoriseerd bedrag van %s." -"Authorizing amount of %s is pending approval on gateway.","Te autoriseren bedrag van %s wacht op goedkeuring op toegangspoort." -"Back","Terug" -"Back to Billing Agreements","Terug naar Factureringsovereenkomsten" -"Back to My Orders","Terug naar Mijn Bestellingen" -"Back to Recurring Profiles","Terug naar Terugkomende Profielen" -"Backordered","Nabesteld" -"Bestsellers","Bestsellers" -"Bill to Name","Rekening op naam" -"Billing","Facturatie" -"Billing Address","Factuuradres" -"Billing Agreement","Factuurovereenkomst" -"Billing Agreement # %s","Factureringsovereenkomst # %s" -"Billing Agreement #%s","Factureringsovereenkomst #%s" -"Billing Agreement View","Factureringsovereenkomst Beeld" -"Billing Agreements","Facturering Overeenkomsten" -"Billing Last Name","Rekening Achternaam" -"Billing ZIP Code","Postcode betaling" -"Buy %s for price %s","Koop %s voor een prijs van %s" -"CSV","CSV" -"Cancel","annuleren" -"Cancel credit memo","Annuleer creditnota" -"Cancel invoice","Annuleren factuur" -"Cancel order","Annuleren bestelling" -"Canceled","Geannuleerd" -"Canceled order offline.","Geannuleerde bestelling offline" -"Canceled order online.","Geannuleerde bestelling online." -"Cannot add order history.","Kan bestellingsgeschiedenis niet toevoegen." -"Cannot create an empty shipment.","Kan geen lege zending aanmaken." -"Cannot determine the field name.","Kan de veldnaam niet bepalen." -"Cannot do invoice for order.","Kan geen factuur maken voor bestelling." -"Cannot do shipment for order.","Kan geen zending maken voor bestelling." -"Cannot get order instance","Kan bestelling instantie niet ophalen" -"Cannot get the order instance.","Kan de bestelling instantie niet ophalen." -"Cannot register an existing credit memo.","Kan een bestaande creditnota niet registeren." -"Cannot register existing invoice","Kan een bestaande factuur niet registreren" -"Cannot register existing shipment","Kan een bestaande zending niet registreren" -"Capture","Vastleggen" -"Capture Amount","Vastleggen Bedrag" -"Capture Offline","Offline Vastleggen" -"Capture Online","Online Vastleggen" -"Capture invoice","Vastleggen factuur" -"Captured amount of %s online.","Online vastgelegd bedrag van %s." -"Capturing amount of %s is pending approval on gateway.","Vast te leggen bedrag van %s wacht op goedkeuring op toegangspoort." -"Carrier","Drager" -"Carrier/Method","Vervoerder/Methode" -"Change status, add comments","Wijzig status, toevoegen opmerkingen" -"Changing address information will not recalculate shipping, tax or other order amount.","Bij het veranderen van adres informatie worden de verzendkosten, belastingskosten of andere bestellings hoeveelheden niet aangepast." -"Checkout Totals Sort Order","Kassa Totaalbedragen Sort Order" -"City","Stad" -"Clear Shopping Cart","Maak winkelwagen leeg" -"Click to change shipping method","Klik om verzendwijze te wijzigen" -"Close","Sluiten" -"Closed","Gesloten" -"Comma-separated.","Door komma's gescheiden." -"Comment","Commentaar" -"Comment Text","Opmerking Tekst" -"Comments","Opmerkingen" -"Comments History","Commentaargeschiedenis" -"Company","Bedrijf" -"Complete","Gereed" -"Configure","Configureren" -"Configure and Add to Order","Pas uw Order aan of Voeg een Order toe" -"Contents","Inhoud" -"Continue","Doorgaan" -"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","Controleer of de klant IP te zien is op de bestellingen, facturen, leveringen, creditnota's." -"Country","Land" -"Coupons","Waardebonnen" -"Create","Creëren" -"Create New Customer","Maak nieuwe klant aan" -"Create New Order","Maak nieuwe bestelling aan" -"Create New Order Status","Maak een Nieuwe Orderstatus" -"Create New Order for %s","Maak nieuwe bestelling aan voor %s" -"Create New Order for %s in %s","Maak nieuwe bestelling aan voor %s in %" -"Create New Order for New Customer","Maak nieuwe bestelling aan voor klant" -"Create New Order for New Customer in %s","Maar nieuwe bestelling aan voor nieuwe klant in %s" -"Create New Status","Stel een Nieuwe Status in" -"Create Order","Aanmaken Bestelling" -"Create Packages","Maak Pakketjes" -"Create Shipment","Maak verzending aan" -"Create Shipping Label","Maak Verschepingslabel" -"Create Shipping Label...","Maak Verschepingslabel..." -"Create new credit memo for order","Maak nieuwe creditnota voor bestelling aan" -"Create new invoice for order","Maak nieuw factuur aan voor bestelling" -"Create new shipment for order","Maak nieuwe verzending aan voor bestelling" -"Create...","Creëer..." -"Created At","Gemaakt op" -"Created billing agreement #%s.","Factuurovereenkomst #%s aangemaakt." -"Created:","Gemaakt:" -"Credit Memo","Credietmemo" -"Credit Memo #","Creditnota #" -"Credit Memo # ","Credit Memo # " -"Credit Memo #%1$s | %3$s | %2$s (%4$s)","Credietmemo #%1$s | %3$s | %2$s (%4$s)" -"Credit Memo Comment Email Sender","Credietmemo commentaar e-mail afzender" -"Credit Memo Comment Email Template","Credietmemo commentaar e-mail template" -"Credit Memo Comment Email Template for Guest","Credietmemo commentaar e-mail template voor gast" -"Credit Memo Comments","Credietmemo commentaar" -"Credit Memo Email Sender","Credietmemo e" -"Credit Memo Email Template","Credietmemo e-mail template" -"Credit Memo Email Template for Guest","Credietmemo e-mail template voor gast" -"Credit Memo Update","Credietmemo update" -"Credit Memo Update for Guest","Credietmemo update voor gast" -"Credit Memos","Creditnota's" -"Credit memo canceling problem.","Probleem bij annuleren van creditnota" -"Credit memo cannot be canceled.","Creditnota kan niet geannuleerd worden" -"Credit memo has been created automatically","Notitie van krediet is automatisch gemaakt" -"Custom Price","Aangepaste prijs" -"Custom Value","Aangepaste waarde" -"Customer","Klant" -"Customer Can Define Start Date","Klant kan begindatum definieren" -"Customer Email","Klant e-mail" -"Customer Group","Klantgroep" -"Customer Last Name","Klant Achternaam" -"Customer My Account Order Creditmemo View","Klant mijn rekening bestelling credietmemo weergave" -"Customer My Account Order History","Klant mijn rekening betellingsgeschiedenis" -"Customer My Account Order Invoice View","Klant mijn rekening bestelling factuur weergave" -"Customer My Account Order Shipment View","Klant mijn rekening bestelling verzending weergave" -"Customer My Account Order View","Klant mijn rekening bestelling weergave" -"Customer Name","Klant Naam" -"Customer\'s Current Activities","Recente bezigheden van de klant" -"Customs Value","Douanewaarde" -"Date","Datum" -"Date Shipped","Datum waarop Verstuurd" -"Default Status","Standaard Status" -"Default Template","Vaststaand Sjabloon" -"Default logo, will be used in PDF and HTML documents.
    (jpeg, tiff, png) If you see image distortion in PDF, try to use larger image","Standaardlogo zal gebruikt worden in PDF en HTML documenten.
    (jpg, tiff, png) Als afbeeldingen niet goed worden weergegeven in een PDF, probeer een grotere afbeelding te gebruiken." -"Delete","Verwijderen" -"Delete Package","Verwijder Pakket" -"Denied the payment online.","De betaling is online geweigerd." -"Deny Payment","Weiger betaling" -"Description Message","Omschrijvingsbericht" -"Discount","korting" -"Discount (%s)","Korting (%s)" -"Discount Amount","Kortingsbedrag" -"Display Order ID in Header","Toon Bestelling ID in Koptekst" -"Edit","Bewerk" -"Edit Order #%s","Bewerk bestelling #%s" -"Edit Order %s %s Address","Verander Order %s %s Adres" -"Edit Order Status","Verander Orderstatus" -"Email","E-mail" -"Email Address","e-mailadres" -"Email Copy of Credit Memo","E-mail een kopie van de credietmemo" -"Email Copy of Invoice","Kopie van factuur emailen" -"Email Copy of Shipment","E-mail een kopie van de verzending" -"Email Order Confirmation","Bevestiging van bestelling emailen" -"Enable","Stel in werking" -"Enabled","Ingeschakeld" -"Enter the billing last name and email/ZIP as in the order billing address","Voer de achternaam en email/postcode voor betaling in als het betalingsadres bij de bestelling" -"Entered data is incorrect. Please try again.","Ingevoerde gegevens zijn onjuist. Probeer het opnieuw." -"Error to Show in Shopping Cart","Fout om te laten zien in winkelwagen" -"Excel XML","Excel XML" -"Excl. Tax","Excl. BTW" -"Expired","Verlopen" -"Explanation","Verklaring" -"Failed to cancel the billing agreement.","Is er niet in geslaagd de facturering overeenkomst te ontbinden." -"Failed to create billing agreement for this order.","Niet in staat om een factuurovereenkomst voor deze bestelling te maken." -"Failed to finish billing agreement wizard.","Niet in staat om de factuur-wizard overeenkomst af te maken" -"Failed to send the order email.","Kon de bestellings-e-mail niet versturen." -"Failed to start billing agreement wizard.","Niet in staat om de factuur-wizard overeenkomst te starten" -"Failed to update the payment.","Kon de betaling niet updaten." -"Failed to update the profile.","Is er niet in geslaagd het profiel te updaten." -"Failed to void the payment.","Was niet in staat de betaling te vernietigen." -"Fetch","Halen" -"File extension not known or unsupported type in the following shipment: %s","Bestandsextensie niet bekend of niet ondersteund in de volgende bestelling: %s" -"Find Order By:","Vind een bestelling door:" -"First Name","Voornaam" -"From","Van" -"From Name","Vanaf naam" -"From:","Van:" -"G.T. (Base)","G.T. (basis)" -"G.T. (Purchased)","Bruto totaal (gekocht)" -"General","Algemeen" -"General Information","Algemene informatie" -"Get Payment Update","Verkrijg betalings-update" -"Get Update","Update verkrijgen" -"Get shipping methods and rates","Verkrijg verzendmethodes en verhoudingen" -"Gift Message","Cadeauboodschap" -"Gift Message for This Order","Cadeau-bericht voor deze bestelling" -"Gift Message for the Entire Order","Cadeauboodschap voor de gehele bestelling" -"Gift Message for this Order","Cadeau bericht voor deze Order" -"Gift Options","Cadeauopties" -"Gift Wrapping for the Entire Order","Cadeauverpakking voor gehele bestelling" -"Girth","Omtrek" -"Go to Home Page","Go to Home Page" -"Grand Total","Groot Totaal" -"Grand Total to be Charged","Totaalbedrag dat zal worden gefactureerd" -"Guest","Gast" -"Height","Hoogte" -"Hide Customer IP","Verberg klant IP" -"Hold","In de wacht" -"Hold action is not available.","Vasthoud-actie is niet beschikbaar" -"Hold order","Houd bestelling vast" -"Home","Home" -"ID","identiteit" -"ID #","ID #" -"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"". Credit Memo has not been created. Please create offline Credit Memo.","IPN ""Refunded"". Terugbetaling uitgegeven door handelaar. Aangetekende kennisgeving over terugbetaalde bedrag van% s.Transactie ID: ""%s"". Creditnota is nog niet gemaakt. Maak offline creditnota." -"If empty, the default description above will be used.","Indien leeg, zal de bovenstaande standaard omschrijving worden gebruikt." -"If empty, the default error above will be used.","Als het leeg is zal de standaard fout hierboven gebruikt worden." -"If the invoice was created offline, try creating an offline creditmemo.","Indien de factuur offline is aangemaakt, probeert u een offline credietmemo te maken." -"Incl. Tax","inclusief btw" -"Information","Informatie" -"Initial Fee","Initiële Kosten" -"Initial Fees","Initiële kosten" -"Initial period payment","Beginnende periode betaling" -"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","Onvoldoende informatie om verzendetiket(ten) te maken. Controleer uw Winkelgegevens en Verzendinstellingen." -"Invalid block: %s.","Ongeldig blok: %s" -"Invalid carrier specified.","Onjuiste drager gespecificeerd" -"Invalid draw line data. Please define ""lines"" array.","Ongeldige draw line data. Definieer ""lines"" collectie." -"Invalid entity model","Ongeldig eenheidsmodel" -"Invalid item option format.","Ongeldig artikelkeuze formaat." -"Invalid qty to invoice item ""%s""","Ongeldige qty om artikel ""%s"" te factureren" -"Invalid qty to refund item ""%s""","Ongeldige qty om artikel ""%s"" terug te betalen" -"Invalid qty to ship for item ""%s""","Ongeldige qty om artikel ""%s"" te verzenden" -"Invalid renderer model","Onjuist verkrijgsmodel" -"Invalid request for adding product to quote.","Ongeldig verzoek voor toevoegen van product aan quote." -"Invalid value(s) for Qty to Ship","Ongeldige waarde(n) voor Aantal om te Verzenden..." -"Invoice","Factuur" -"Invoice #","Factuur #" -"Invoice # ","Invoice # " -"Invoice #%1$s | %2$s | %4$s (%3$s)","Factuur #%1$s | %2$s | %4$s (%3$s)" -"Invoice #%s","Factuur #%s" -"Invoice Comment Email Sender","Factuur commentaar e-mail afzender" -"Invoice Comment Email Template","Factuur commentaar e-mail template" -"Invoice Comment Email Template for Guest","Factuur Opmerking E-mail Sjabloon voor Gast" -"Invoice Comments","Factuurcommentaar" -"Invoice Date","Factuurdatum" -"Invoice Email Sender","Facturatie E-mail Verzender" -"Invoice Email Template","Factuur e-mail template" -"Invoice Email Template for Guest","Factuur e-mail template voor gast" -"Invoice Update","Factuur-update" -"Invoice Update for Guest","Factuur-update voor gast" -"Invoice and Packing Slip Design","Facturatie en Verpakking Ontwerp" -"Invoice and Ship","Factureer en verzend" -"Invoice canceling problem.","Factuur annuleringsprobleem" -"Invoice cannot be canceled.","Facturatie kan niet geannuleerd worden." -"Invoice cannot be captured.","Factuur kan niet gevangen worden" -"Invoice cannot be voided.","Factuur kan niet leeggemaakt worden" -"Invoice capturing problem.","Facturatie opvraag probleem." -"Invoice void problem","Factuur leegmaak-probleem" -"Invoice will be created without communication with payment gateway.","Facturatie zal worden aangemaakt zonder communicatie met de betalingspoort." -"Invoiced","Gefactureerd." -"Invoices","Facturen" -"Is Closed","Is afgesloten" -"Item","item" -"Item Status","Artikel Status" -"Item object is not specified.","item object is niet gespecificeerd" -"Item options declaration error.","Artikel opties verklaring fout." -"Item ordered qty","item bestelde hoeveelheid" -"Item qty declaration error.","item hoeveelheidsdeclaratiefout" -"Items","Artikelen" -"Items Invoiced","items gefactureerd" -"Items Ordered","items besteld" -"Items Refunded","items geretourneerd" -"Items Shipped","Verzonden artikelen" -"Items in the Package","Items in het Pakket" -"Items maximum quantity or price do not allow checkout.","maximale hoeveelheid items of prijs staan afrekenen niet toe" -"Items options declaration error.","items optie declaratiefout" -"Items to Refund","items om te retourneren" -"Items to Ship","Items te Verzenden" -"Key","sleutel" -"Last Name","Achternaam" -"Last Ordered Items","laatst bestelde items" -"Last status can\'t be unassigned from state.","Laatste status kan niet vanuit staat herbenoemd worden." -"Length","Lengte" -"Link to the New Order","link naar de nieuwe bestelling" -"Link to the Previous Order","link naar de vorige bestelling" -"Logo for HTML Print View","Logo voor HTML Print Weergave" -"Logo for HTML documents only. If empty, default will be used.
    (jpeg, gif, png)","Logo uitsluitend voor HTML documenten. Indien leeg, zal de standaardwaarde gebruikt worden.
    (jpeg, gif, png)" -"Logo for PDF Print-outs (200x50)","Logo voor PDF Print-outs (200x50)" -"Make Check payable to:","Maak de Check betaalbaar aan:" -"Manage","Beheer" -"Maximum amount available to refund is %s","Maximale bedrag voor terugbetaling is %s" -"Maximum shipping amount allowed to refund is: %s","Maximale verzendhoeveelheid toegestaan om te retourneren is: %s" -"Message","Boodschap" -"Message:","Bericht:" -"Minimum Amount","Minimale hoeveelheid" -"Minimum Order Amount","Minimale bestel-hoeveelheid" -"Mixed","Gemengd" -"Most Viewed","Meest bekeken" -"Most Viewed Products Report","Meest bekeken product verslag" -"Move to Shopping Cart","Verplaats naar Winkelwagen" -"Move to Wishlist","ga naar verlanglijstje" -"Multi-address Description Message","Meerdere adres Beschrijving Bericht" -"Multi-address Error to Show in Shopping Cart","Meerdere adres Fout te tonen in Winkelwagen" -"My Orders","Mijn Bestellingen" -"My Orders - Details","Mijn bestellingen - details" -"N/A","n.v.t." -"Name","Naam" -"New","Nieuw" -"New Billing Agreement","Nieuwe factuurovereenkomst" -"New Credit Memo","Nieuwe credietmemo" -"New Credit Memo for Guest","Nieuwe creditnota voor Gast" -"New Credit Memo for Invoice #%s","Nieuwe Credit Memo voor Factuur #%s" -"New Credit Memo for Order #%s","Nieuwe Credit Memo voor Bestelling #%s" -"New Invoice","Nieuwe Factuur" -"New Invoice and Shipment for Order #%s","Nieuw factuur en verzending voor bestelling #%s" -"New Invoice for Guest","Nieuw factuur voor gast" -"New Invoice for Order #%s","Nieuwe factuur voor Order #%s" -"New Order","Nieuwe bestelling" -"New Order Confirmation Email Sender","Nieuwe bestelling confirmatie e-mail afzender" -"New Order Confirmation Template","New Order Bevestiging Sjabloon" -"New Order Confirmation Template for Guest","Nieuwe bestellingsconfirmatie template voor gast" -"New Order RSS","Nieuwe bestelling RSS" -"New Order Status","Nieuwe Status van de Bestelling" -"New Order for Guest","Nieuwe bestelling voor gast" -"New Shipment","Nieuwe Verzending" -"New Shipment for Guest","Nieuwe verzending voor gast" -"New Shipment for Order #%s","Nieuwe verzending voor bestelling #%s" -"Newsletter Subscription","Nieuwsbrief abonnement" -"No","Nee" -"No Items","Geen items" -"No Items To Refund","Geen items om te retourneren." -"No Payment Methods","Geen betalingsmethoden" -"No detail for number ""%s""","Geen details voor nummer ""%s""" -"No information available.","Geen informatie beschikbaar." -"No items","Geen artikelen" -"No order(s) were put on hold.","Er zijn geen beselling(en) uitgesteld." -"No order(s) were released from holding status.","Geen bestelling(en) zijn uit de wacht genomen." -"No ordered items","geen bestelde items" -"No shipping information available","Er is geen verzendinformatie beschikbaar" -"Nominal Items","Nominale items" -"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","Nominaal item kan alleen door standalone worden gekocht. Om door te gaan, verwijder a.u.b. andere items uit de quota." -"Nominal order registered.","Nominale bestelling geregistreerd." -"Not Capture","Niet vastleggen" -"Not Initialized","Niet geïnitialiseerd" -"Not Notified","Niet gemeld" -"Not enough valid data to save the parent transaction ID.","Niet genoeg geldige gegevens om de bovenliggende transactie-ID op te slaan." -"Notification Not Applicable","Kennisgeving Niet van Toepassing" -"Notified","Ingelicht" -"Notify Customer by Email","Licht klant in via e-mail" -"Number","Aantal" -"Number of Invoiced Orders","Aantal gefactureerde bestellingen" -"Number of Orders","Aantal Orders" -"Number of Refunded Orders","Aantal Terugbetaalde Bestellingen" -"OK","OK" -"Offline Refunded","Offline Teruggegeven" -"On Hold","In de wacht" -"Online Refunded","Online Terugbetaalde" -"Order","Bestelling" -"Order #","Bestelling #" -"Order # ","Order # " -"Order # %s","Bestelling # %s" -"Order # %s %s | %s","Bestelling # %s %s | %s" -"Order #%s","Bestelling #%s" -"Order #%s - %s","Bestelling #%s - %s" -"Order API","Bestel API" -"Order Address Information","Bestelling Adres Informatie" -"Order Comment","Reactie op Bestelling" -"Order Comment Email Sender","Bestelling Opmerking E-mail Verzender" -"Order Comment Email Template","Bestelling opmerking over Email Template" -"Order Comment Email Template for Guest","Bestelling opmerking van Email verzender Template voor de gast" -"Order Comments","Opmerkingen over de Bestellingen" -"Order Credit Memos","Kredietmemo's bestelling" -"Order Currency:","Valuta van de bestelling:" -"Order Date","Datum van de Bestelling" -"Order Date (%s)","Datum van de Bestelling (%s)" -"Order Date: ","Datum bestelling:" -"Order Date: %s","Datum van de Bestelling: %s" -"Order Details","Details van de Bestelling" -"Order Grand Total","Algemeen totaal van de Bestelling" -"Order History","Geschiedenis van de Bestelling" -"Order History Info","Bestelling Geschiedenis Info" -"Order ID","Bestelnummer" -"Order Information","Informatie over de Bestelling" -"Order Invoices","Facturen bestelling" -"Order Shipments","Verzendingen van de Bestelling" -"Order State","Status Bestelling" -"Order Status","Bestelling Status" -"Order Status Information","Bestelling Status Informatie" -"Order Statuses","Bestelling Statussen" -"Order Subtotal","Subtotaal van de Bestelling" -"Order Taxes Report Grouped by Tax Rates","Verzendingen Belastingen Verslag Gegroepeerd per Belastingtarieven" -"Order Total","Bestelling Totaalbedrag" -"Order Totals","Subtotaal" -"Order Update","Verzendings Update" -"Order Update for Guest","Verzendings Update voor gasten" -"Order View","Kijk naar de bestelling" -"Order credit memo","Creditnota van bestelling" -"Order does not allow to be canceled.","Niet mogelijk om bestelling the annuleren." -"Order invoice","Factuur van de bestelling" -"Order is suspended as its authorizing amount %s is suspected to be fraudulent.","Bestelling wordt opgeschort omdat het machtigingen bedrag wordt vermoed frauduleus te zijn." -"Order is suspended as its capture amount %s is suspected to be fraudulent.","Bestelling is opgeschort omdat er waarschijnlijk is gefraudeerd." -"Order object is not specified.","Bestellings object wordt niet gespecificeerd." -"Order saving error: %s","Fout bij het opslaan van bestelling: %s" -"Order shipments","Bestelling verschepingen" -"Order status does not exist.","Status bestelling bestaat niet." -"Order status with the same status code already exist.","Status bestelling bestaat al met dezelfde status code." -"Order was placed using %s","Bestelling werd geplaatst met behulp van %s" -"Ordered","Besteld" -"Ordered amount of %s.","Bestelde hoeveelheid van %s." -"Ordering amount of %s is pending approval on gateway.","In afwachting van goedkeuring bestelde hoeveelheid van %s." -"Orders","Bestellingen" -"Orders and Returns","Bestellingen en Teruggaven" -"Orders and Returns Search Form","Bestellingen en Teruggaven Zoekscherm" -"Original Price","Originele prijs" -"Original order item that recurring payment profile correspondss to.","Oorspronkelijke volgorde van item waar een terugkerend betalings profiel mee overeenkomt." -"PDF Credit Memos","PDF Kredietmemo's" -"PDF Invoices","PDF-facturen" -"PDF Packingslips","PDF Packingslips" -"PDF Print-outs","PDF Print-outs" -"PDF object is not specified.","PDF-object is niet gespecificeerd." -"PDF page object is not specified.","PDF-pagina object wordt niet gespecificeerd." -"PDF total model should extend Mage_Sales_Model_Order_Pdf_Total_Default","PDF totaal model moet het volgende uitbreiden: Mage_Sales_Model_Order_Pdf_Total_Default" -"Package","Pakket" -"Package types are disregarded for USPS domestic shipments.","Pakketten worden buiten beschouwing gelaten voor binnenlandse zendingen van USPS." -"Packages","Pakketen" -"Packingslip # ","Packingslip #" -"Paid","Betaald" -"Paid Amount","Betaald bedrag" -"Parent Transaction ID","Ouder transactie ID" -"Parent transaction ID must have a transaction ID.","Bovenliggende transactie-ID moeten beschikken over een transactie-ID." -"Partial","Gedeeltelijke" -"Payment Failed","Betaling Mislukt" -"Payment Information","Betaalinformatie" -"Payment Method","Betaalwijze" -"Payment Method Name","Naam betalingsmethode" -"Payment Method:","Betaalmethode:" -"Payment Review","Betalings Review" -"Payment disallow storing objects.","Betaling weigert opslag van objecten." -"Payment transactions disallow storing objects.","Betalingstransacties staan het opslaan van objecten niet toe." -"Payment type","Type betaling" -"Payment update has been made.","Betaling actualisering heeft plaatsgevonden." -"Pending","In behandeling" -"Pending Payment","In afwachting van betaling" -"Period","Periode" -"Place Order Using Billing Agreements","Plaats uw bestelling met behulp van Facturering overeenkomsten" -"Placed from IP","Geplaatst van IP" -"Please Select Products to Add","Selecteer producten om toe te voegen alstublieft" -"Please Select a Customer","Selecteer een klant" -"Please Select a Store","Selecteer een winkel" -"Please check billing address information. %s","Gelieve rekeningadres informatie te controleren. %s" -"Please check shipping address information. %s","Gelieve bezorgingsadres informatie te controleren, %s" -"Please define PDF object before using.","Gelieve PDF-object nader te omschrijven voor gebruik." -"Please enter positive number in this field.","Gelieve positief getal invullen in dit veld." -"Please select a valid payment method.","Gelieve een geldige betalingsmethode te selecteren." -"Please specify a shipping method.","Gelieve een bezorgingsmethode te specificeren." -"Please specify a valid grid column alias name that exists in grid table.","Geef een geldige rasterkolom alias naam die bestaat in raster tabel." -"Price","prijs" -"Print","Print" -"Print All","Alles afdrukken" -"Print All Invoices","Alle facturen printen" -"Print All Refunds","Print Alle restituties" -"Print All Shipments","Print alle zendingen" -"Print Credit Memos","Print Kredietmemo's" -"Print Invoice","Print Factuur" -"Print Invoices","Facturen afdrukken" -"Print Order","Print Order" -"Print Order # %s","Print Order # %s" -"Print Packingslips","Print Packingslips" -"Print Refund","Print Refund" -"Print Shipment","Print Zending" -"Print Shipping Label","Verzendingslabel printen" -"Print Shipping Labels","Print Verscheping Labels" -"Processing","Verwerken" -"Product","Product" -"Product Name","Product Naam" -"Products","producten" -"Products Bestsellers Report","Producten Bestsellers Verslag" -"Products in Comparison List","Producten in vergelijking Lijst" -"Products should be added to package(s)","Product moet worden toegevoegd aan het pakket/de pakketjes" -"Profile #%s","Profiel #%s" -"Profile Information","Profiel informatie" -"Profile State","Profiel Staat" -"Profit","Winst" -"Promotion Coupons Usage Report","Promotie Coupons Gebruiksrapport" -"Proper payment object must be set.","Correct betalingsobject moet worden ingesteld." -"Purchase Order Number:","Aankoop Bestellingsnummer:" -"Purchased From","Gekocht Van" -"Purchased From (Store)","Gekocht van (winkel)" -"Purchased Item","Gekocht artikel" -"Purchased On","Gekocht Op" -"Qty","hoeveelheid" -"Qty Invoiced","Aantal Gefactureerd" -"Qty Ordered","Aantal Besteld" -"Qty Shipped","Aantal verzonden" -"Qty To Add","Aantal om toe te voegen" -"Qty to Add","Qty toe te voegen" -"Qty to Invoice","Aantal op Factuur" -"Qty to Refund","Aantal om restitutie te geven" -"Qty to Ship","Hoeveelheid om te verzenden" -"Quantity Ordered","Bestelde hoeveelheid" -"Quote item id is not received.","I.D. van het quote product is niet ontvangen." -"Quote item is not loaded.","Quote product is niet geladen." -"Rate","Verhouding" -"Recent Orders","Recente Bestellingen" -"Recently Compared Products","Recent vergeleken producten" -"Recently Viewed","Recent bekeken" -"Recently Viewed Products","Recent bekeken producten" -"Recurring Profile # %s","Terugkerend Profiel # %s" -"Recurring Profile Initial Fee","Terugkerend Profiel Aanvangstarief" -"Recurring Profiles","Terugkerende Profielen" -"Recurring Profiles (beta)","Terugkerende Profielen (beta)" -"Reference ID","Referentie ID" -"Reference ID:","Referentie ID:" -"Refresh","Ververs" -"Refund","Terugbetaling" -"Refund #","Terugbetaling #" -"Refund #%s","Restitutie #%s" -"Refund Amount","Terugbetaling Bedrag" -"Refund Offline","Offline restitutie" -"Refund Shipping","Terugbetaling Verzendkosten" -"Refund Shipping (Excl. Tax)","Terugbetaling Verzendkosten (excl. BTW)" -"Refund Shipping (Incl. Tax)","Terugbetaling Verzendkosten (incl. BTW)" -"Refund Totals","Totale Terugbetalingen" -"Refunded","Geretourneerd." -"Refunded amount of %s offline.","Terugbetaald bedrag van %s offline." -"Refunded amount of %s online.","Terugbetaald bedrag van %s online." -"Refunds","Restituties" -"Registered a Void notification.","Geregistreerd als Leeg bericht." -"Registered notification about approved payment.","Notificatie over goedgekeurde betaling is opgeslagen." -"Registered notification about captured amount of %s.","Geregistreerde mededeling over bemachtigd bedrag van %s." -"Registered notification about denied payment.","Geregistreerde mededeling over geweigerde betaling." -"Registered notification about refunded amount of %s.","Geregistreerd bericht over terugbetaalde bedrag van %s." -"Registered update about approved payment.","Geregistreerde bijwerking over goedgekeurde betaling." -"Registered update about denied payment.","Update over geweigerde betaling." -"Regular Payment","Overboeking" -"Related Orders","Gerelateerde Bestellingen" -"Remove","weghalen" -"Remove Coupon Code","haal couponcode weg" -"Remove tracking number","Verwijder volgnummer" -"Reorder","Nabestelling" -"Retrieve credit memo info","Ophalen creditnota info" -"Retrieve credit memo information","Haal creditnota informatie op" -"Retrieve credit memo list","Ophalen creditnota lijst" -"Retrieve invoice info","Factuur informatie ohpalen" -"Retrieve invoice information","Ophalen factuur informatie" -"Retrieve list of credit memos by filters","Ophalen lijst van creditnota's door filters" -"Retrieve list of invoices by filters","Ophalen lijst van facturen gesorteerd op filters" -"Retrieve list of orders by filters","Ophalen lijst van bestellingen gesorteerd op filters" -"Retrieve list of shipments by filters","Lijst van verzendingen via filters ophalen" -"Retrieve order information","Ophalen bestelling informatie" -"Retrieve orders info","Ophalen bestellingen info" -"Retrieve shipment info","Ophalen info verzending" -"Retrieve shipment information","Ophalen zending informatie" -"Return to Stock","Keer terug naar Voorraad" -"Returned","Teruggestuurd" -"Returns","Teruggaven" -"Revenue","Inkomsten" -"Row Subtotal","rij van het subtotaal" -"Row Total","Rij Totaal" -"SKU","Sku" -"Sales","Verkoop" -"Sales Discount","Uitverkoop Korting" -"Sales Emails","Verkoopemails" -"Sales Emails Section","Uitverkoop E-mails Sectie" -"Sales Invoice Print View","Uitverkoop Factuur Print Weergave" -"Sales Items","Verkopen Artikelen" -"Sales Order Print View","Verkooporder afdrukweergave" -"Sales Section","Verkopen Sectie" -"Sales Shipment Print View","Verkoop verzending print aanblik" -"Sales Shipping","Verzend Verkoop" -"Sales Tax","Verkopen BTW" -"Sales Total","Verkopen Totaalbedrag" -"Same As Billing Address","Zelfde als Factuuradres" -"Save Order Address","Adres bestelling opslaan" -"Save Status","Status opslaan" -"Save Status Assignment","Opdracht status opslaan" -"Save in address book","Opslaan in adresboek" -"Schedule","Schema" -"Select","Selecteren" -"Select All","Selecteer Alles" -"Select from existing customer addresses:","Selecteer van bestaande klantadressen:" -"Selected option(s) or their combination is not currently available.","De geselecteerde optie(s) of de combinatie hiervan is/zijn op dit moment niet beschikbaar." -"Send Credit Memo Comment Email Copy To","Stuur Creditnota Opmerking E-mail Kopie naar" -"Send Credit Memo Comments Email Copy Method","Stuur Kredietnota Commentaar E-mail Kopieer Methode" -"Send Credit Memo Email Copy Method","Stuur Kredietnota E-mail Kopieer Methode" -"Send Credit Memo Email Copy To","Stuur Creditnota E-mail Kopie Naar" -"Send Email","Stuur E-mail" -"Send Invoice Comment Email Copy To","Stuur Factuur Opmerking E-mail Kopie Naar" -"Send Invoice Comments Email Copy Method","Verstuur factuur commentaren email kopieer methode" -"Send Invoice Email Copy Method","Verstuur factuur email kopieer methode" -"Send Invoice Email Copy To","Verstuur factuur email kopie naar" -"Send Order Comment Email Copy To","Stuur Bestelling Opmerking E-mail Kopie Naar" -"Send Order Comments Email Copy Method","Verstuur bestelling commentaar email kopie methode" -"Send Order Email","Verzend email over bestelling" -"Send Order Email Copy Method","Stuur Bestelling E-mail Kopie Methode" -"Send Order Email Copy To","Stuur Bestelling E-mail Kopie Naar" -"Send Sales Emails","Stuur Sales E-mails" -"Send Shipment Comment Email Copy To","Stuur Kopie van Verzendingsreactie-Email naar" -"Send Shipment Comments Email Copy Method","Stuur Verzending Commentaar E-mail Kopieer Methode" -"Send Shipment Email Copy Method","Verstuur verzending email kopie methode" -"Send Shipment Email Copy To","Verstuur verzending email kopie naar" -"Send Tracking Information","Stuur Volginformatie" -"Send shipment info","Stuur verzendgegevens" -"Set order for existing transactions not allowed","Volgorde voor bestaande transactie niet toegestaan" -"Ship","Verstuur" -"Ship To","Verzenden naar" -"Ship to Name","Verzenden naar Naam" -"Ship to:","Verstuur naar:" -"Shipment","Verzending" -"Shipment #","Zending #" -"Shipment #%1$s | %3$s (%2$s)","Zending #%1$s | %3$s (%2$s)" -"Shipment #%s","Zending #%s" -"Shipment Comment Email Sender","Zending Opmerking E-mail Verzender" -"Shipment Comment Email Template","Zending Opmerking E-mail Sjabloon" -"Shipment Comment Email Template for Guest","Zending Opmerking E-mail Sjabloon voor Gast" -"Shipment Comments","Verzendings Reacties" -"Shipment Email Sender","Zending E-mail Verzender" -"Shipment Email Template","Zending E-mail Sjabloon" -"Shipment Email Template for Guest","Zending E-mail Sjabloon voor Gast" -"Shipment Update","Verzending update" -"Shipment Update for Guest","Zending Bijwerking voor Gast" -"Shipments","Zendingen" -"Shipped","Verscheept" -"Shipped By","Verzonden door" -"Shipping","Transport" -"Shipping & Handling","Verzending & Transport" -"Shipping & Handling","Verzending & behandeling" -"Shipping & Handling Information","Verzending & administratie informatie" -"Shipping Address","Ontvangst Adres" -"Shipping Amount","Verzendingskosten" -"Shipping Information","Verzendinformatie" -"Shipping Method","Verzendingsmethode" -"Shipping Method:","Verzendmethode:" -"Shipping Refund","Terugbetaling Verzendkosten" -"Shipping and Tracking Information","Zending en Volg Informatie" -"Shopping Cart","Winkelmandje" -"Show Packages","Pakketten tonen" -"Signature Confirmation","Bevestiging handtekening" -"Signed Up From","Aangemeld vanaf" -"Size","Grote" -"Sku","Sku" -"Sold to:","Verkocht aan:" -"Some item options or their combination are not currently available.","Sommige artikel-opties of een combinatie hiervan zijn momenteel niet in uw land beschikbaar." -"Some of the products below do not have all the required options.","Sommige van de producten hieronder hebben niet alle gewenste opties." -"Some of the selected options are not currently available.","Sommige van de geselecteerde opties zijn in uw land niet beschikbaar." -"Sorry, no quotes are available for this order at this time.","Sorry, op dit moment zijn er geen offertes beschikbaar voor deze bestelling." -"Source object is not specified.","Bron object is niet gespecificeerd" -"Specified profile does not exist.","Opgegeven profiel bestaat niet." -"State Code [State Title]","Code staat [Titel staat]" -"State/Province","Staat/Provincie" -"Status","status" -"Status Code","Code status" -"Status Label","Label status" -"Status:","Status:" -"Store Credit","Sla Krediet op" -"Store View Specific Labels","Winkel toon specifieke labels" -"Street Address","Adres straat" -"Submit Comment","Verwerken Opmerking" -"Submit Credit Memo","Stuur creditnota" -"Submit Invoice","Factuur indienen" -"Submit Invoice and Shipment","Factuur en verzending indienen" -"Submit Order","Verwerken Bestelling" -"Submit Shipment","Stuur Verzending" -"Subscribe to Newsletter","Inschrijven voor nieuwsbrief" -"Subscribe to Order Status","Abonneren op Status van bestelling" -"Subtotal","subtotaal" -"Subtotal after discount.","Subtotaal na korting" -"Subtotal:","subtotaal" -"Suspected Fraud","Verdacht tot fraude" -"Suspend","Schorsen" -"Suspended","Uitgesteld" -"Tax","Belasting" -"Tax Amount","BTW Bedrag" -"Tax Percent","Belastingspercentage" -"Telephone","telefoon" -"The Order State ""%s"" must not be set manually.","De bestellingsstaat ""%s"" moet niet handmatig ingesteld worden." -"The address total model should be extended from Mage_Sales_Model_Quote_Address_Total_Abstract.","Het totale adresmodel moet uitgebreid worden van Mage_Sales_Model_Quote_Address_Total_Abstract." -"The billing agreement ""%s"" has been canceled.","De afrekeningsovereenkomst ""%s"" is geannuleerd." -"The billing agreement ""%s"" has been created.","De afrekeningsovereenkomst ""%s"" is aangemaakt." -"The coupon code has been accepted.","De kortingsboncode is geaccepteerd." -"The message has been sent.","Het bericht is verzonden" -"The message was sent.","Het bericht is verzonden." -"The order address has been updated.","Het bestellingsadres is bijgewerkt." -"The order email has been sent.","De bestellingsemail is verzonden." -"The order has been cancelled.","De bestelling is geannuleerd" -"The order has been created.","De bestelling is aangemaakt" -"The order has been put on hold.","De bestelling is uitgesteld" -"The order has been released from holding status.","De bestelling is vrijgemaakt uit uitgestelde status." -"The order has not been cancelled.","De bestelling is niet geannuleerd." -"The order status has been assigned.","De bestellingsstatus is toegewezen." -"The order status has been saved.","De bestellingsstatus is opgeslagen." -"The order status has been unassigned.","De toewijzing van de bestellingsstatus is ongedaan gemaakt." -"The order was not put on hold.","De bestelling is niet uitgesteld." -"The order was not unheld.","De bestelling is niet uit de wacht gehaald." -"The order was placed using %s","De bestelling is geplaatst, gebruik makende van %s" -"The order(s) cannot be canceled","De bestelling(en) kunnen niet geannuleerd worden." -"The payment has been accepted.","De betaling is geaccepteerd." -"The payment has been denied.","De betaling is geweigerd" -"The payment has been voided.","De betaling is leeggemaakt." -"The profile has been updated.","Het profiel is geüpdate." -"The profile has no changes.","Het profiel is niet veranderd." -"The profile state has been updated.","De profielstatus is geüpdate." -"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","De hoeveelheid die u wilt toevoegen is groter dan de totale verzonden hoeveelheid van een aantal van de geselecteerde producten." -"The requested Payment Method is not available.","De aangevraagde betaalmethode is niet beschikbaar." -"The shipping label has been created.","Het verzendingslabel is aangemaakt." -"The transaction ""%s"" (%s) is already closed.","De transactie ""%s"" (%s) is al gesloten." -"The transaction ""%s"" cannot be captured yet.","De transactie ""%s"" kan nog niet opgenomen worden." -"The value that you entered is not valid.","De door u ingevoerde waarde is niet juist." -"There are no billing agreements yet.","Er zijn nog geen facturatieovereenkomsten." -"There are no printable documents related to selected orders.","Er zijn geen printbare documenten gerelateerd aan de geselecteerde bestellingen." -"There are no shipping labels related to selected orders.","Er zijn geen verzendlabels gerelateerd aan de geselecteerde orders." -"There are no shipping labels related to selected shipments.","Er zijn geen verzendlabels gerelateerd aan geselecteerde zendingen." -"There is no need to approve this payment.","Er is geen nood om deze betaling te accepteren." -"There is no need to deny this payment.","Het is niet nodig om deze betaling te weigeren." -"There is no update for the payment.","Er is geen update voor de betaling." -"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","Dit bericht zal worden laten zien in de winkelwagen, wanneer het subtotaal na kortingen lager is dan de minimale hoeveelheid." -"This operation requires an existing transaction object.","Deze handeling vereist een bestaand transactie object" -"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","Deze order bevat (%s) items en kan daarom op dit moment niet bewerkt worden met de admin interface, als u door wilt gaan met bewerken worden de (%s) items verwijderd, de bestelling zal geannuleerd worden en een nieuwe bestelling zal worden geplaatst." -"This order no longer exists.","Deze bestelling bestaat niet meer." -"This product does not have any configurable options","Dit product heeft geen configureerbare opties" -"This profile state cannot be changed to ""%s"".","De profielstaat kan niet veranderd worden naar ""%s""." -"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","Dit zal een offline teruggaaf maken. Om een online teruggaaf te maken opent u een factuur en maakt u daar een credietmemo voor. Wilt u doorgaan?" -"Tier Pricing","Niveau Prijsstelling" -"Title","Titel" -"To","Aan" -"To Name","Te benoemen" -"To:","Aan:" -"Total","Totaal" -"Total %d product(s)","totaal ... producten" -"Total (ex)","Totaal (ex)" -"Total (inc)","Totaalbedrag (incl.)" -"Total Due","Totaalbedrag verwacht" -"Total Invoiced","Totale Gefactureerde" -"Total Invoiced Paid","Totaal Gefactureerd Betaald" -"Total Invoiced VS Paid Report","Totaal Gefactureerd VS Betaald Rapport" -"Total Invoiced not Paid","Totaal Gefactureerd niet Betaald" -"Total Ordered Report","Totaal besteld rapport" -"Total Paid","Totaal Betaald" -"Total Qty","Totaal Aant." -"Total Refund","Totaal restitutie" -"Total Refunded","Totaal Terugbetaalde" -"Total Refunded Report","Totaal geretourneerd rapport" -"Total Sales Shipping","De Totale Verzendings verkopen" -"Total Shipped Report","Totaal verzonden rapport" -"Total Shipping","Totaal Verzonden" -"Total Shipping Charges","Totaal Verzendkosten" -"Total Tax","Totale Belasting" -"Total Weight","Totaal Gewicht" -"Total model should be extended from Mage_Sales_Model_Order_Total_Abstract.","Totaal model moet worden uitgebreid van Mage_Sales_Model_Order_Total_Abstract." -"Track Order","Track zending" -"Track all shipment(s)","Volg alle zending(en)" -"Track all shipments","Alle verzendingen volgen" -"Track this shipment","Track deze zending" -"Track your order","Volg uw bestelling" -"Tracking","Volgen" -"Tracking Number","Volgnummer" -"Tracking Number(s):","Volgnummer(s):" -"Transaction ""%s"" was already processed.","Transactie ""%s"" was al verwerkt." -"Transaction # %s | %s","Transactie # %s | %s" -"Transaction ID","Transactie-ID" -"Transaction ID must not be empty.","Transactie ID mag niet leeg zijn." -"Transaction ID: ""%s"".","Transactie ID: ""%s""." -"Transaction Type","Type transactie" -"Transactions","Transacties" -"Trial ","Proef" -"Trial Payment","Proefbetaling" -"Trial Period","Trial Periode" -"Trial period payment","Proefperiode betaling" -"Type","Type" -"Unassign","Wijs niet toe" -"Unhold","Vrijgeven" -"Unhold action is not available.","Standby actie is niet beschikbaar." -"Unhold order","Vrijgeven bestelling" -"Unknown State","Onbekende Staat" -"Unknown Status","Onbekende Status" -"Unsupported transaction type ""%s"".","Niet ondersteund transactie type ""%s""." -"Update Changes","Bijwerken Veranderingen" -"Update Items and Qty\'s","aanpassen items en hoeveelheden" -"Update Qty\'s","Aantal(en) bijwerken" -"Updated At","Geüpdate op" -"Updated:","Bijgewerkt:" -"Use Aggregated Data (beta)","Gebruik Verzamelde Data (beta)" -"Use Order Status As Default","Gebruik Order Status Als Standaard" -"Validate Each Address Separately in Multi-address Checkout","Valideer Ieder Adress Apart in Multi-Adres Afrekening" -"Value","Waarde" -"View","Bekijk" -"View All","Bekijk Alles" -"View Another Order","Andere bestelling bekijken" -"View Order","Inzien Bestelling" -"Visible on Frontend","Zichtbaar op Voorkant" -"Void","Leeg" -"Void invoice","Lege Factuur" -"Voided authorization.","Nietig verklaarde autorisatie." -"Website","Website" -"Weight","Gewicht" -"Whether buyer can define the date when billing for the profile begins.","Of koper kan de datum kan bepalen wanneer de facturering voor het profiel begint." -"Width","Breedte" -"Wishlist","Verlanglijst" -"Wrong billing agreement ID specified.","Verkeerde factuur overeenkomst ID opgegeven." -"Wrong quote item id to update configuration.","Verkeerde quote artikel id voor update configuratie." -"Wrong state: ""%s"".","Verkeerde status: ""%s""." -"Yes","Ja" -"You can leave a box blank if you don\'t wish to add a gift message for whole order","U kunt een doos leeg laten als u geen cadeauboodschap voor de hele bestelling wilt toevoegen" -"You don\'t have permissions to manage this order because of one or more products are not permitted for your website.","U heeft geen machtiging om deze bestelling te beheren omdat een of meer producten niet zijn toegestaan voor uw website" -"You have placed no orders.","U heeft geen bestellingen geplaatst." -"You will be redirected to the payment system website.","U zal worden omgeleid naar de website van het betalingssysteem." -"Your credit card will be charged for","Uw creditcard zal in rekening gebracht worden voor" -"ZIP/Post Code","Postcode" -"Zip/Postal Code","Zip/Postcode" -"cm","cm" -"in","in" -"kg","KG" -"lb","Pond" -"the credit memo email is not sent","De creditnota e-mail is niet verzonden" -"the credit memo email was sent","De credietmemo e-mail is verzonden" -"the invoice email is not sent","De factureringsmail is niet verzonden" -"the invoice email was sent","De factureringsmail is verzonden" -"the order confirmation email is not sent","De bestellingsbevestiging-mail is niet verzonden" -"the order confirmation email was sent","De bestellingsbevestiging-mail is verzonden" -"the shipment email is not sent","de verzendbevestiging is niet verstuurd" -"the shipment email was sent","De verzendingsmail is verzonden" diff --git a/app/locale/nl_NL/Mage_SalesRule.csv b/app/locale/nl_NL/Mage_SalesRule.csv deleted file mode 100644 index 4e80aa5c3..000000000 --- a/app/locale/nl_NL/Mage_SalesRule.csv +++ /dev/null @@ -1,132 +0,0 @@ -"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","%d Winkelwagen Prijs Regels gebaseerd op ""%s"" attribuut zijn uitgeschakeld." -"%s Coupon(s) have been generated","%s Coupon(s) zijn gegenereerd" -"Actions","Acties" -"Active","actief" -"Add New Rule","voeg nieuwe regel toe" -"Alphabetical","Alfabetisch" -"Alphanumeric","Alfanumeriek" -"An error occurred while generating coupons. Please review the log and try again.","Er is een fout opgetreden bij het genereren van coupons. Lees het log en probeer het opnieuw." -"Apply","Aanbrengen" -"Apply To","Aanbrengen op" -"Apply the rule only if the following conditions are met (leave blank for all products)","Breng de regel aan, doch enkel wanneer aan de volgende voorwaarden zijn voldaan (laat leeg voor alle producten)" -"Apply the rule only to cart items matching the following conditions (leave blank for all items)","Breng de regel aan op winkelwagenproducten die voldoen aan de volgende voorwaarden (laat leeg voor alle producten)" -"Apply the rule to cart items matching the following conditions","Breng de regel aan op winkelwagenproducten die aan de volgende voorwaarden voldoen" -"Apply to Shipping Amount","Breng aan op verzendhoeveelheid" -"Are you sure you want to delete the selected coupon(s)?","Weet u zeker dat u de geselecteerde coupon(s) wilt verwijderen?" -"Auto","Auto" -"Auto Generated Specific Coupon Codes","Auto Gegenereerd Specifieke Coupon Codes" -"Buy X get Y free (discount amount is Y)","Koop X, krijg Y gratis (kortingsbedrag is Y)" -"By Fixed value","Bij gefixeerde waarde" -"By Percentage","Bij percentage" -"Can\'t acquire coupon.","Kan geen kortingsbon verkrijgen" -"Cart Attribute","Winkelwagen attribuut" -"Catalog","Catalogus" -"Code Format","Code Formaat" -"Code Length","Code Lengte" -"Code Prefix","Code Voorvoegsel" -"Code Suffix","Code Achtervoegsel" -"Conditions","Voorwaarden" -"Conditions combination","Voorwaarden combinatie" -"Coupon","Kortingsbon" -"Coupon Code","Kortingsboncode" -"Coupon Qty","Coupon Hoeveelheid" -"Coupon with the same code","Coupon met dezelfde code" -"Coupons Information","Coupons Informatie" -"Created On","Gemaakt Op" -"Customer Groups","Klantgroepen" -"Dash Every X Characters","Dash Alle X-tekens" -"Date Expire","Vervaldatum" -"Date Start","Startdatum" -"Default Label","Standaardlabel" -"Default Rule Label for All Store Views","Standaard regel label voor alle winkelweergaven" -"Description","Omschrijving" -"Discount Amount","Kortingsbedrag" -"Discount Qty Step (Buy X)","Kortingshoeveelheid stap (koop X)" -"Edit Rule","Bewerk regel" -"Edit Rule '%s'","Bewerk regel '%s'" -"Excluding prefix, suffix and separators.","Exclusief voorvoegsels, achtervoegsels en afscheiders." -"FOUND","GEVONDEN" -"Fixed amount discount","Gefixeerd bedrag korting" -"Fixed amount discount for whole cart","Gefixeerd bedrag korting voor de hele winkelwagen" -"For matching items only","Alleen voor passende producten" -"For shipment with matching items","Voor verzending met passende producten" -"Free Shipping","Gratis verzending" -"From Date","Vanaf datum" -"General Information","Algemene informatie" -"Generate","Aanmaken" -"ID","ID" -"If %s %s %s for a subselection of items in cart matching %s of these conditions:","Als %s %s %s voor een subselectie van producten in de winkelwagen overeenkomen met %s van deze condities:" -"If an item is %s in the cart with %s of these conditions true:","Als een product %s is in de winkelwagen met %s van deze ware condities:" -"If empty no separation.","Indien leeg geen scheiding." -"If you select and save the rule you will be able to generate multiple coupon codes.","Als u de regel selecteert en opslaat kunt u meerdere coupon codes genereren." -"Inactive","Inactief" -"Item totals are not set for rule.","Totalen voor producten zijn niet ingesteld voor regel." -"Labels","Labels" -"Manage Coupon Codes","Beheer Coupon Codes" -"Maximum Qty Discount is Applied To","Maximale hoeveelheid korting is ingesteld op" -"NOT FOUND","NIET GEVONDEN" -"NOT LOGGED IN","NIET INGELOGD" -"New Rule","Nieuwe regel" -"No","Nee" -"No Coupon","Geen kortingsbon" -"Not valid data provided","Niet geldig gegevens opgegeven" -"Number of Uses","Aantal gebruiken" -"Numeric","Numerieke" -"Payment Method","Betalingsmethode" -"Percent of product price discount","Procent van productprijs als korting" -"Period","Periode" -"Price in cart","Prijs in winkelwagen" -"Priority","Prioriteit" -"Product attribute combination","Product attributen combinatie" -"Products subselection","Producten subselectie" -"Promotions","Promoties" -"Public In RSS Feed","Publiekelijk in RSS Feed" -"Quantity in cart","Hoeveelheid in winkelwagen" -"Row total in cart","Rij totalen in winkelwagen" -"Rule Information","Regel informatie" -"Rule Name","Regel naam" -"Rule is not defined","Regel is niet gedefinieerd" -"Sales Discount Amount","Verkoop kortingshoeveelheid" -"Sales Subtotal Amount","Verkoop subtotaal hoeveelheid" -"Sales Total Amount","Verkoop totalen hoeveelheid" -"Save and Continue Edit","Bewaar en Ga Door met Bewerking" -"Shipping Country","Verzending land" -"Shipping Method","Bezorgmethode" -"Shipping Postcode","Verzending postcode" -"Shipping Region","Verzending regio" -"Shipping State/Province","Verzending provincie/staat" -"Shopping Cart Price Rule","Winkelmandje prijsregel" -"Shopping Cart Price Rules","Winkelmandje prijsregels" -"Special Price","Speciale prijs" -"Specific Coupon","Specifieke kortingsbon" -"Status","Status" -"Stop Further Rules Processing","Stop verdere verwerking van regels" -"Store View Specific Labels","Winkel bekijk specifieke labels" -"Subtotal","Subtotaal" -"Subtotal Amount","Subtotaal bedrag" -"The rule has been deleted.","De regel is verwijderd" -"The rule has been saved.","De regel is opgeslagen." -"This rule no longer exists.","Deze regel bestaat niet langer" -"Times Used","Tijd Gebruikt" -"To Date","Naar datum" -"To Fixed Value","Naar gefixeerde waarde" -"To Percentage","Naar percentage" -"Total","Totaal" -"Total Amount","Totaalbedrag" -"Total Items Quantity","Totale hoeveelheid producten" -"Total Weight","Totaalgewicht" -"Unable to create requested Coupon Qty. Please check settings and try again.","Niet in staat om het gevraagde Coupon Aantal te creëren. Controleer de instellingen en probeer het opnieuw." -"Unable to find a rule to delete.","Niet in staat om een regel te vinden om te verwijderen" -"Update prices using the following information","Update prijzen, gebruikmakende van de volgende informatie" -"Update product's %s %s: %s","Update producten %s %s: %s" -"Update the Product","Vernieuw het product" -"Use Auto Generation","Gebruik de Automatische Generatie" -"Used","Gebruikt" -"Uses per Coupon","Aantal gebruiken per kortingsbon" -"Uses per Customer","Aantal gebruiken per klant" -"Website","Website" -"Websites","Websites" -"Wrong rule specified.","Verkeerde regel gespecificeerd" -"Yes","ja" -"total amount","totaal bedrag" -"total quantity","totaal aantal" diff --git a/app/locale/nl_NL/Mage_Sendfriend.csv b/app/locale/nl_NL/Mage_Sendfriend.csv deleted file mode 100644 index 9ee822e14..000000000 --- a/app/locale/nl_NL/Mage_Sendfriend.csv +++ /dev/null @@ -1,38 +0,0 @@ -"Add Recipient","Voeg een Ontvanger toe" -"Allow for Guests","Toegestaan voor Gasten" -"An invalid email address for recipient was entered.","Een ongeldig e-mailadres was voor de ontvanger ingevuld." -"At least one recipient must be specified.","U moet tenminste een ontvanger kiezen." -"Back","Terug" -"Catalog Product Email to a Friend","Catalogus Product E-mail naar een Vriend" -"Email Address","e-mailadres" -"Email Address:","E-mailadres:" -"Email Templates","E-mail Sjabloon" -"Email to a Friend","E-mail Vriend" -"Email:","E-mail" -"Enabled","Aan" -"Invalid Sender Information","Ongeldige Verzender Informatie" -"Invalid sender email.","Ongeldige Verzender E-mail." -"Limit Sending By","Limiteer Versturen Door" -"Max Products Sent in 1 Hour","Maximum Aantal Producten Verstuurd in 1 Uur" -"Max Recipients","Maximum Hoeveelheid Ontvangers" -"Maximum %d email addresses allowed.","Maximum %s e-mailadressen toegestaan." -"Message:","Bericht:" -"Name","Naam" -"Name:","Naam:" -"No more than %d emails can be sent at a time.","Niet meer dan %d e-mails per keer versturen." -"Please define a correct Cookie instance.","Gelieve een correcte Cookie voorbeeld te definiëren." -"Please define a correct Product instance.","Gelieve een correct Product voorbeeld te definiëren." -"Please define the correct Sender information.","Gelieve een correct Verzender Informatie voorbeeld te definiëren." -"Recipient:","Ontvanger:" -"Remove Email","Verwijder E-mail" -"Select Email Template","Kies een E-mail Sjabloon" -"Send Email","Verstuur E-mail" -"Send product to a friend","Verstuur dit product naar een vriend" -"Sender:","Verzender:" -"Some emails were not sent.","Sommige emails zijn niet verzonden." -"The link to a friend was sent.","Deze link was naar een vriend verstuurd." -"The message cannot be empty.","Het bericht mag niet leeg zijn." -"The messages cannot be sent more than %d times in an hour","De berechten kunnen niet meer dan %d keer per uur worden verstuurd" -"The sender name cannot be empty.","De verzender naam mag niet leeg zijn." -"There were some problems with the data.","Er waren een aantal problemen met de gegevens." -"You have exceeded limit of %d sends in an hour","U heeft het limiet van %d verzendingen per uur bereikt" diff --git a/app/locale/nl_NL/Mage_Shipping.csv b/app/locale/nl_NL/Mage_Shipping.csv deleted file mode 100644 index b1562c670..000000000 --- a/app/locale/nl_NL/Mage_Shipping.csv +++ /dev/null @@ -1,93 +0,0 @@ -" for more information or ","Voor meer informatie of" -"# of Items (and above)","# Artikelen (en daarboven)" -"# of Items vs. Destination","# Artikelen en Lokaties" -"Allow Shipping to Multiple Addresses","Sta Verschepen naar Meerdere Adressen Toe" -"An error occurred while import table rates.","Er heeft zich een fout voorgedaan tijdens het importeren van tabelwaarden." -"Calculate Handling Fee","Bereken Behandelingskosten" -"Carrier:","Bode:" -"City","Stad" -"Close Window","Venster Sluiten" -"Condition","Voorwaarde" -"Country","Land" -"Custom Value","Klant Waarde" -"Date","Datum" -"Delivered on:","Geleverd op:" -"Delivered to:","Geleverd aan:" -"Description","Beschrijving" -"Displayed Error Message","Geef Foutmelding Weer" -"Divide to equal weight (one request)","Verdeel gewicht gelijkmatig (een verzoek)" -"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","Dubbele Rij #%s (Land ""%s"", Regio/Provincie ""%s"", Postcode ""%s"" en Waarde ""%s"")." -"Enabled","Aan" -"Error:","Four:" -"Export","Export" -"File has not been imported. See the following list of errors: %s","Bestand is niet geïmporteerd. Bekijk de volgende lijst met fouten: %s" -"Fixed","Gemaakt" -"Flat Rate","Plat Tarief" -"Free Shipping","Gratis Verzending" -"Google Sitemap Section","Google Sitemap Sectie" -"Handling Fee","Behandelingskosten" -"Import","Import" -"Include Virtual Products in Price Calculation","Tel Virtuele Producten Mee in de Prijs Berekening" -"Info:","Info:" -"Invalid %s ""%s"" in the Row #%s.","Ongeldige %s ""%s"" in rij #%s." -"Invalid Country ""%s"" in the Row #%s.","Ongeldig Land ""%s"" in rij #%s." -"Invalid Region/State ""%s"" in the Row #%s.","Ongeldig Regio/Provincie ""%s"" in rij #%s." -"Invalid Shipping Price ""%s"" in the Row #%s.","Ongeldig Verzendkosten ""%s"" in rij #%s." -"Invalid Table Rate code for type %s: %s","Ongeldige Tabel Tarief code voor type %s: %s" -"Invalid Table Rate code type: %s","Ongeldige Tabel Tarief code type: %s" -"Invalid Table Rates File Format","Ongeldige Tabel Tarief Bestandsformaat" -"Invalid Table Rates format in the Row #%s","Ongeldig Tabel Tarieven formaat in Rij #%s" -"Local Time","Lokale Tijd" -"Location","Locatie" -"Maximum Qty Allowed for Shipping to Multiple Addresses","Maximum Hoeveelheid Toegestaan voor het verschepen naar Meerdere Adressen" -"Method Name","Methode naam" -"Minimum Order Amount","Minimum Bestel Hoeveelheid" -"N/A","Nvt" -"None","Geen" -"Options","Opties" -"Order Subtotal (and above)","Bestelling Subtotaal (en hier boven)" -"Origin","Herkomst" -"Per Order","Per Bestelling" -"Per Package","Per Pakket" -"Percent","Procent" -"Price","Prijs" -"Price vs. Destination","Prijs en Bestemming" -"Region/State","Regio/Staat" -"Service Type:","Service Soort:" -"Ship to Applicable Countries","Verscheep naar Aanwendbare Landen" -"Ship to Specific Countries","Verscheep naar Gespecificeerde Landen" -"Shipment #","Versturing #" -"Shipment Tracking Popup","Verzending Tracking Pop-up" -"Shipped or billed on:","Verstuurd of gefactureerd op:" -"Shipping Methods","Versturing Methodes" -"Shipping Methods Section","Versturing Methodes Sectie" -"Shipping Settings","Versturing Instellingen" -"Shipping Settings Section","Versturing Instellingen Sectie" -"Show Method if Not Applicable","Laat Methode Zien indien Niet Mogelijk" -"Signed by:","Ondertekend door:" -"Sort Order","Sorteer Bestelling" -"Status:","Status:" -"Store Pickup","Ophalen in de Winkel" -"Street Address","Adres straat" -"Street Address Line 2","Adres Lijn 2" -"Table Rates","Tabel Tarieven" -"The shipping module is not available for selected delivery country.","Deze verzendingsmodule is niet beschikbaar voor het door uw geselecteerde bezorgingsland." -"The shipping module is not available.","Deze verzendingsmodule is niet beschikbaar." -"There is no tracking available for this shipment.","Er is geen tracking beschikbaar voor deze verzending." -"There is no tracking available.","Er is geen tracking beschikbaar." -"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","De verzendingmethode is op het moment niet beschikbaar. Indien u graag deze verzendingsmethode wilt gebruiken, neem alstublieft contact met ons op." -"This shipping method is not available, please specify ZIP-code","Deze verzendingsmethode is niet beschikbaar, vul alstublieft uw postcode in" -"Title","Titel" -"Track:","Track:" -"Tracking Information","Tracking Informatie" -"Tracking Number:","Tracking Nummer:" -"Tracking information is currently not available. Please ","Tracking informatie is momenteel niet beschikbaar. Alstublieft" -"Tracking information is currently unavailable.","Tracking informatie is momenteel niet beschikbaar." -"Type","Type" -"Use origin weight (few requests)","Gebruik herkomstgewicht (enkele aanvragen)" -"Weight (and above)","Gewicht (en daarboven)" -"Weight vs. Destination","Gewicht vs. Bestemming" -"Weight:","Gewicht:" -"ZIP/Postal Code","Postcode" -"contact us","neem contact met ons op" -"email us at ","email ons op" diff --git a/app/locale/nl_NL/Mage_Sitemap.csv b/app/locale/nl_NL/Mage_Sitemap.csv deleted file mode 100644 index 5258d304c..000000000 --- a/app/locale/nl_NL/Mage_Sitemap.csv +++ /dev/null @@ -1,46 +0,0 @@ -"Action","Actie" -"Add Sitemap","Sitekaart toevoegen" -"Always","Altijd" -"CMS Pages Options","CMS pagina's opties" -"Categories Options","Categorieopties" -"Daily","Dagelijks" -"Edit Sitemap","Sitekaart bewerken" -"Enabled","Aan" -"Error Email Recipient","Foutmelding Email Ontvanger" -"Error Email Sender","Foutmelding Email Verstuurder" -"Error Email Template","Foutmelding Email Template" -"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","Bestand ""%s"" kan niet worden opgeslagen. Zorg ervoor dat ""%s"" directory beschrijfbaar is door webserver." -"Filename","Bestandsnaam" -"Frequency","Frequentie" -"Generate","Aanmaken" -"Generation Settings","Aanmaakinstellingen" -"Google Sitemap","Google sitekaart" -"Hourly","Elk uur" -"ID","ID" -"Last Time Generated","Laatste maal aangemaakt" -"Link for Google","Link voor Google" -"Monthly","Maandelijks" -"Never","Nooit" -"New Sitemap","Nieuwe Sitemap" -"Path","Pad" -"Please create the specified folder ""%s"" before saving the sitemap.","Maak de specifieke map ""%s"" voor het opslaan van de sitemap." -"Please define correct path","Definieer a.u.b. correct pad" -"Please make sure that ""%s"" is writable by web-server.","Zorg ervoor dat ""%s"" beschrijfbaar is door webserver." -"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","Gebruik a.u.b. alleen letters (a-z of A-Z), nummers (0-9) or underscore (_) in de filenaam. Spaties or andere karakters zijn niet toegestaan." -"Priority","Prioriteit" -"Products Options","Product Opties" -"Sitemap","Sitemap" -"Sitemap generate Warnings","Sitemap genereert Waarschuwing" -"Start Time","Begintijd" -"Store View","Aanblik winkel" -"The priority must be between 0 and 1.","De prioriteit moet tussen 0 en 1 zijn." -"The sitemap ""%s"" has been generated.","De sitemap ""%s"" is gegenereerd." -"The sitemap has been deleted.","De sitemap is verwijderd." -"The sitemap has been saved.","De sitemap is opgeslagen." -"This sitemap no longer exists.","De sitemap bestaat niet langer." -"Unable to find a sitemap to delete.","Kan geen sitemap vinden om te verwijderen." -"Unable to find a sitemap to generate.","Kan geen sitemap vinden om te genereren." -"Unable to generate the sitemap.","Kan sitemap niet genereren." -"Valid values range: from 0.0 to 1.0.","Toegestane waardes reiken: van 0.0 tot 1.0." -"Weekly","Wekelijks" -"Yearly","Jaarlijks" diff --git a/app/locale/nl_NL/Mage_Tag.csv b/app/locale/nl_NL/Mage_Tag.csv deleted file mode 100644 index 2bf0e4dd8..000000000 --- a/app/locale/nl_NL/Mage_Tag.csv +++ /dev/null @@ -1,101 +0,0 @@ -"# of Uses","# Gebruiken" -"%s tag(s) have been accepted for moderation.","%s label(s) zijn geaccepteerd voor herziening." -"Tag Name: %s","Label Naam: %s" -"Action","Actie" -"Add","Toevoegen" -"Add New Tag","Voeg een Nieuw Label Toe" -"Add Tags","Voeg Label Toe" -"Add Your Tags:","Voeg Uw Labels Toe:" -"Add tag(s) to product","Voeg tag(s) aan product toe" -"Add to Cart","Aan mandje toevoegen" -"Add to Wishlist","Aan verlanglijst toevoegen" -"All Tags","Alle Labels" -"Approved","Goed Gekeurd" -"Are you sure you want to delete this tag?","Weet u zeker dat u dit Label wilt verwijderen?" -"Are you sure you want to do this?","Weet je zeker dat je dit wilt doen?" -"Are you sure?","Weet u het zeker?" -"Back","Terug" -"Back to Tags List","Terug naar de Label Lijst" -"Base Popularity","Basis Populariteit" -"Block Information","Blok Informatie" -"CSV","CSV" -"Catalog Product View","Aanblik product in catalogus" -"Change status","Verander status" -"Click on a tag to view your corresponding products.","Klik op een Label om uw overeenkomstige producten te zien." -"Country","Land" -"Customer My Account My Tags List","Klant Mijn Account Mijn Labels Lijst" -"Customer My Account Tag View","Klant Mijn Account Labels Zien" -"Customer Since","Klant sinds" -"Customers","Klanten" -"Customers Submitted this Tag","Klanten Verzonden deze Tag" -"Customers Tagged '%s'","Klanten Tagden '%s'" -"Delete","Verwijderen" -"Delete Tag","Verwijder Tag" -"Disabled","Uitgeschakeld" -"Edit Tag '%s'","Bewerk Tag '%s'" -"Email","Email" -"First Name","Voornaam" -"General Information","Algemene informatie" -"Grid","Rooster" -"ID","ID" -"Info","Info" -"Last Name","Achternaam" -"List","Lijst" -"Manage Tags","Beheer Tags" -"My Recent Tags","Mijn Recente Tags" -"My Tags","Mijn Tags" -"Name","Naam" -"New Tag","Nieuwe Tag" -"No matches found.","Geen matches gevonden." -"Other people marked this product with these tags:","Anderen hebben dit product gemarkeerd met deze tags:" -"Pending","In afwachting" -"Pending Tags","Nog niet actieve Tags" -"Popular","Populair" -"Popular Tags","Populaire Tags" -"Price","Prijs" -"Product Name","Productnaam" -"Product SKU","Product SKU" -"Product Tag API","Product Tag API" -"Product Tags","Productlabels" -"Products","Producten" -"Products Tagged by Administrators","Product Gelabeld door de Administrators" -"Products Tagged by Customers","Product Gelabeld door de Klanten" -"Products Tagged with '%s'","Product Gelabeld met '%s'" -"Products tagged with '%s'","Product gelabeld met '%s'" -"Rebuild Tag aggregation data","Herbouwen Label Aggregatie Data" -"Remove","Verwijderen" -"Remove product tag","Verwijder product tag" -"Retrieve list of tags by product","Ophalen lijst van labels op product" -"Retrieve product tag info","Ophalen product tag info" -"SKU","SKU" -"Save Tag","Sla Label Op" -"Save and Continue Edit","Opslaan en doorgaan met bewerken" -"Status","Status" -"Store View","Aanblik winkel" -"Tag","Tag" -"Tag ""%s"" has already been added to the product.","Label ""%s"" is al aan het product toegevoegd." -"Tag ""%s"" has been added to the product.","Label ""%s"" is aan het product toegevoegd." -"Tag ""%s"" has been rejected by administrator.","Label ""%s"" is afgekeurd door de beheerder." -"Tag Aggregation Data","Label Aggregatie Data" -"Tag Name","Tag Naam" -"Tagged Products List","Gelabelde Productlijsten" -"Tags","Labels" -"Tags List (All Available)","Labellijst (Indien Beschikbaar)" -"Tags List Before","Lijst labels voor" -"Tags:","Labels:" -"Telephone","Telefoon" -"The tag has been deleted.","Dit Label is verwijderd." -"There are no tags available.","Er zijn geen labels beschikbaar." -"Unable to find any products tagged with '%s' in the current store","Niet in staat om product met het label '%s' te vinden in de huidige winkel" -"Unable to remove tag. Please, try again later.","Niet instaat om het label te verwijderen. Gelieve het later nog eens te proberen." -"Unable to save tag(s).","Niet instaat om label(s) op te slaan." -"Update","Update" -"Update product tag","Update product label" -"Use spaces to separate tags. Use single quotes (') for phrases.","Gebruik spaties om verschillende labels te scheiden. Gebruik enkele aanhalingstekens (') voor zinnen." -"View All Tags","Zie Alle Labels" -"View Customers","Zie Klanten" -"View Products","Zie Producten" -"XML","XML" -"You have not tagged any products yet.","U heeft nog geen labels aan producten toegewezen." -"ZIP/Post Code","ZIP/Postcode" -"[STORE VIEW]","[WINKEL OVERZICHT]" diff --git a/app/locale/nl_NL/Mage_Tax.csv b/app/locale/nl_NL/Mage_Tax.csv deleted file mode 100644 index a6d1e801c..000000000 --- a/app/locale/nl_NL/Mage_Tax.csv +++ /dev/null @@ -1,163 +0,0 @@ -"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - komt overeen met alles; 'xyz*' - komt overeen met alles dat begint met 'xyz' en niet langer dan %d." -"-- Please Select --","-- Selecteer alstublieft --" -"Add New Class","Voeg Nieuwe Klasse toe" -"Add New Tax Rate","Voeg Nieuwe BTW Waarde toe" -"Add New Tax Rule","Voeg Nieuwe BTW Regel toe" -"After Discount","Na Korting" -"An error occurred while deleting this rate.","Er is een fout opgetreden tijdens het verwijderen van dit tarief." -"An error occurred while deleting this rate. Incorrect rate ID.","Er is een fout opgetreden tijdens het verwijderen van dit tarief. Incorrecte ID van tarief." -"An error occurred while deleting this tax class.","Er is een fout opgetreden tijdens het verwijderen van deze BTW klasse." -"An error occurred while deleting this tax rule.","Er is een fout opgetreden tijdens het verwijderen van dit BTW tarief." -"An error occurred while saving this tax class.","Er is een fout opgetreden tijdens het opslaan van deze BTW klasse." -"An error occurred while saving this tax class. A class with the same name","Er heeft zich een fout voorgedaan bij het opslaan van deze belasting groep. A groep met dezelfde naam" -"Apply Customer Tax","Pas Klant BTW toe" -"Apply Discount On Prices","Pas Korting toe Op Prijzen" -"Apply Tax On","Pas BTW toe Op" -"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Korting op de prijs inclusief b.t.w. is berekend op basis van winkel belasting, wanneer Apple Belasting na Korting"" is geselecteerd." -"Are you sure you want to do this?","Weet je zeker dat je dit wilt doen?" -"Back","Terug" -"Before Discount","Voor Korting" -"CSV","CSV" -"Calculate off subtotal only","Bereken uitsluitend van het subtotaal" -"Calculation Settings","Berekeningsinstellingen" -"Catalog Prices","Catalogusprijzen" -"Class Name","Naam Klasse" -"Click here to go to Tax configuration and change your settings.","Klik hier om naar BTW configuratie te gaan en uw instellingen te wijzigen." -"Code","Code" -"Country","Land" -"Custom price if available","Aangepaste prijs indien beschikbaar" -"Customer Tax Class","Klant BTW Klasse" -"Customer Tax Class Information","Klant Belastingklasse Informatie" -"Customer Tax Classes","Belastingtarieven klant" -"Default Country","Standaard Land" -"Default Post Code","Standaard Post Code" -"Default State","Standaard Staat" -"Default Tax Destination Calculation","Standaard Belastingbestemming Berekening" -"Delete Class","Verwijder Klasse" -"Delete Rate","Verwijder Tarief" -"Delete Rule","Verwijder Regel" -"Display Full Tax Summary","Laat Volledige Belastingsamenvatting zien" -"Display Prices","Laat Prijzen zien" -"Display Product Prices In Catalog","Laat Product Prijzen in Catalogus zien" -"Display Shipping Amount","Laat Verscheep Hoeveelheid zien" -"Display Shipping Prices","Laat Verscheep Prijs zien" -"Display Subtotal","Laat Subtotaal zien" -"Display Zero Tax Subtotal","Laat Geen Belasting Subtotaal zien" -"Edit Class","Pas Klasse aan" -"Edit Class '%s'","Pas Klasse '%s' aan" -"Edit Rule","Pas Regel aan" -"Edit Tax Rate","Pas Belastingtarief aan" -"Enable Cross Border Trade","Grensoverschrijdende Handel Inschakelen" -"Excel XML","Excel XML" -"Excl. Tax","Excl. BTW" -"Excl. Tax:","Excl. Belasting:" -"Excluding Tax","Exclusief Belasting" -"Export Tax Rates","Export Belasting Tarieven" -"Grand Total (Excl. Tax)","Totaal (Ex. Belasting)" -"Grand Total (Excl.Tax)","Algemeen Totaal (Excl. Belasting)" -"Grand Total (Incl. Tax)","Totaal (Incl. Belasting)" -"Grand Total (Incl.Tax)","Algemeen Totaal (Incl. Belasting)" -"Grand Total Excl. Tax","Algemeen Totaal Excl. Belasting" -"Grand Total Incl. Tax","Algemeen Totaal Incl. Belasting" -"Ignore this notification","Negeer deze melding" -"Import / Export Tax Rates","Import / Export Belasting Tarieven" -"Import Tax Rates","Import Belasting Tarieven" -"Inc. Tax","Incl. Belasting" -"Incl. Tax","Incl. BTW" -"Incl. Tax:","Incl. Belasting:" -"Include Tax In Grand Total","Neem Belasting mee in Algemeen Totaal" -"Including Tax","Inclusief Belasting" -"Including and Excluding Tax","Inclusief en Exclusief Belasting" -"Invalid file format upload attempt","Ongeldig bestandsformaat upload poging" -"Invalid file upload attempt","Ongeldig bestand upload poging" -"Manage Customer Tax Classes","Manage Klant Belasting Klassen" -"Manage Product Tax Classes","Manage Product Belasting Klassen" -"Manage Tax Rates","Manage Belasting Tarieven" -"Manage Tax Rules","Manage Belasting Regels" -"Manage Tax Zones & Rates","Beheer Belasting Zones en Tarieven" -"Maximum zip code length is 9.","Maximale postcode lengte is 9." -"Name","Naam" -"New Class","Nieuwe Klasse" -"New Rule","Nieuwe Regel" -"New Tax Rate","Nieuw Belastingtarief" -"No","Nee" -"None","Geen" -"One of the country has invalid code.","Een van de landen heeft een ongeldige code." -"Orders, Invoices, Credit Memos Display Settings","Bestellingen, Facturen, Kredietnota's Display Instellingen" -"Original price only","Alleen de oorspronkelijke prijs" -"Please fill all required fields with valid information.","Vul alle verplichte velden met geldige informatie in." -"Please see source for more details.","Zie bron voor meer informatie." -"Price Display Settings","Prijs Weergave Instellingen" -"Priority","Prioriteit" -"Product Tax Class","Product BTW Klasse" -"Product Tax Class Information","Product belasting Klasse Informatie" -"Product Tax Classes","Product Belasting Klassen" -"Range From","Vanaf" -"Range To","Tot" -"Range To should be equal or greater than Range From.","Range Naar moet gelijk of groter zijn dan Range Van." -"Rate","Tarief" -"Rate Percent","Tarief Percentage" -"Rate Percent should be a positive number.","Tarief Procent moet een positief getal zijn." -"Reset","Opnieuw" -"Row Total","Rij Totaal" -"Sales","Verkoop" -"Save Class","Sla Klasse Op" -"Save Rate","Sla Tarief Op" -"Save Rule","Sla Regel Op" -"Save and Continue Edit","Opslaan en doorgaan met bewerken" -"Shipping & Handling (Excl.Tax)","Verzending & Behandeling (Excl. Belasting)" -"Shipping & Handling (Incl.Tax)","Verzending & Behandeling (Incl. Belasting)" -"Shipping & Handling Tax","Verzending - en verwerkingstax" -"Shipping (Excl. Tax)","Verzending (Excl. Belasting)" -"Shipping (Incl. Tax)","Verzending (Incl. Belasting)" -"Shipping Excl. Tax (%s)","Verzending Excl. Belasting (%s)" -"Shipping Incl. Tax (%s)","Verzending Incl. Belasting (%s)" -"Shipping Prices","Verzendkosten" -"Shopping Cart Display Settings","Winkelwagentje Display Instellingen" -"Sort Order","Sorteer Bestelling" -"State","Provincie" -"State/Region","Provincie" -"Subtotal (Excl. Tax)","Subtotaal (exclusief belasting)" -"Subtotal (Excl.Tax)","Subtotaal (Excl.Belasting)" -"Subtotal (Incl. Tax)","Subtotaal (inclusief belasting)" -"Subtotal (Incl.Tax)","Subtotaal (Incl.Belasting)" -"Subtotal only","Alleen betaalbedrag" -"Tax","Belasting" -"Tax Calculation Based On","Belasting Berekening Gebaseerd Op" -"Tax Calculation Method Based On","Belasting Berekening Methode Gebaseerd Op" -"Tax Class for Shipping","Belastingklasse voor Verzending" -"Tax Classes","Belastingklasses" -"Tax Identifier","Belastingidentificeerder" -"Tax Rate","Belastingniveau" -"Tax Rate Information","Belastingniveau Informatie" -"Tax Rule Information","Belastingregel Informatie" -"Tax Rules","Belastingregels" -"Tax Section","Belastingsectie" -"Tax Titles","Belastingtitels" -"Tax rate cannot be removed. It exists in tax rule","Belastingverhouding kan niet verwijderd worden. Dit staat in de wet." -"Tax rates at the same priority are added, others are compounded.","Belastingniveau van dezelfde prioriteit zijn toegevoegd, anderen zijn verbonden." -"The tax class has been deleted.","De belastingklasse is verwijderd." -"The tax class has been saved.","De belastingklasse is opgeslagen." -"The tax rate has been deleted.","Het belastingniveau is verwijderd." -"The tax rate has been imported.","Het belastingniveau is geïmporteerd." -"The tax rate has been saved.","Het belastingniveau is opgeslagen." -"The tax rule has been deleted.","De belastingregel is verwijderd." -"This class no longer exists","Deze klasse bestaat niet meer" -"This rule no longer exists","Deze regel bestaat niet meer" -"This rule no longer exists.","Deze regel bestaat niet meer" -"Total","Totaal" -"Unit Price","Eenheidsprijs" -"Warning tax configuration can result in rounding errors","Waarschuwing fiscale configuratie kan leiden tot afrondingsverschillen" -"Warning tax configuration can result in unexpected FPT prices on applicable devices","Waarschuwing, belastingsconfiguratie kan leiden tot onverwachte FPT prijzen op toepasselijke apparaten" -"Warning tax discount configuration might result in different discounts than a customer might expect","Waarschuwing fiscale korting configuratie kan resulteren in andere kortingen dan een klant kan verwachten" -"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","Indien de catalogus prijs inclusief BTW is schakelt u deze optie in om een prijs vast te zetten ongeacht het BTW tarief van de klant." -"Whether catalog prices entered by admin include tax.","Of catalogusprijzen opgeschreven door admin inclusief belasting." -"Whether shipping amounts entered by admin or obtained from gateways include tax.","Of bezorghoeveelheden zijn opgeschreven door admin of verkregen voor gateways inclusief belasting." -"Yes","Ja" -"You cannot delete this tax class as it is used for %d customer groups.","U kunt deze belasting niet verwijderen als het is gebruikt voor %d klantgroepen." -"You cannot delete this tax class as it is used for %d products.","U kunt deze belastingklasse niet verwijderen als het is gebruikt voor %d producten." -"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","U kunt deze belastingklasse niet verwijderen als het is gebruikt in Belastingregels. U moet eerst de regels waarin het is gebruikt verwijderen." -"Zip code should not contain characters other than digits.","Postcode mag geen andere tekens dan cijfers bevatten." -"Zip/Post Code","Postcode" -"Zip/Post is Range","Post is Verscheiden" -"for store(s)","voor winkel(s)" diff --git a/app/locale/nl_NL/Mage_Usa.csv b/app/locale/nl_NL/Mage_Usa.csv deleted file mode 100644 index a36f2218d..000000000 --- a/app/locale/nl_NL/Mage_Usa.csv +++ /dev/null @@ -1,381 +0,0 @@ -" was not delivered nor scanned","was niet geleverd nog gescand" -"""Per Order"" allows single handling fee for entire order. ""Per Package"" allows individual handling fee for each package.","Met ""Per bestelling"" hoeft er slechts eenmaal verzendkosten te worden betaald voor de complete bestelling. Met ""Per Pakket"" dient er voor ieder pakket verzendkosten te worden betaald." -"1 Day Freight","1 Dag Vracht" -"2 Day","2 Dagen" -"2 Day AM","2 Dagen voor 12:00 uur" -"2 Day Freight","2 Dagen Vracht" -"2Day","Vandaag" -"2nd Day Air","Arriveert 2 werkdagen na verzenddatum" -"2nd Day Air AM","Arriveert 2 werkdagen na verzenddatum in de middag" -"2nd Day Air AM Letter","2de Dag Lucht AM Brief" -"2nd Day Air Letter","2de Dag Luchtpost" -"3 Day Freight","3 Dagen Vracht" -"3 Day Select","Levering aan het eind van de 3e werkdag" -"Access ID","Toegang ID" -"Access License Number","Toegang Licentie Nummer" -"Account ID","Account ID" -"Account Number","Account nummer" -"Additional Protection Configuration Value","Additionele Bescherming Configuratie Waarde" -"Additional Protection Enabled","Additionele Bescherming Ingesteld" -"Additional Protection Min Subtotal","Additionele Bescherming Min Subtotaal" -"Additional Protection Value","Additionele Bescherming Waarde" -"Additional Protection Value Rounding Method","Additionele Bescherming Waarde Afrond Methode" -"Adult","Volwassen" -"Adult Signature Required","Handtekening van een volwassene vereist." -"Allowed Methods","Toegestane Methoden" -"Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges.","Sta toe dat het totale bestelgewicht in kleinere stukken wordt opgedeeld als het %s %s overstijgt om voor een nauwkeurige berekening van de verzendkosten te zorgen." -"Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","Sta toe dat het totale bestelgewicht in kleinere stukken wordt opgedeeld als het de 70kg overstijgt om voor een nauwkeurige berekening van de verzendkosten te zorgen." -"Bound Printed Matter","Ingebonden Geprint Materiaal" -"Break bulk economy","Stukgoed economie" -"Break bulk express","Stukgoed expres" -"Business Service Center","Business Service Center" -"Calculate Handling Fee","Bereken Behandelingskosten" -"Canada Standard","Canada standaard" -"Cannot identify measure unit for %s","Kan meeteenheid voor %s niet vaststellen" -"Cannot identify weight unit for %s","Kan de weegeenheid voor %s niet vaststellen" -"Cannot retrieve shipping rates","Kan verzendkosten niet ophalen" -"Centimeters","Centimeters" -"Commercial","Reclame" -"Configuration","Configuratie" -"Container","Container" -"Content Type","Inhoudstype" -"Customer Packaging","Klant verpakking" -"Customer Supplied Package","Door klant geleverde verpakking" -"Customer services","Klantenservice" -"DHL","DHL" -"DHL (Deprecated)","DHL (Afgekeurd)" -"DHL service is not available at %s date","DHL service is not available at %s date" -"Debug","Debug" -"Default Package Height","Standaard pakkethoogte" -"Default Package Length","Standaard pakketlengte" -"Default Package Width","Standaard pakketbreedte" -"Delivered","Bezorgd" -"Delivery Confirmation","Afleveringsbevestiging" -"Depth","Diepte" -"Destination Type","Bestemmingstype" -"Destination facility code is empty","Voorzieningscode van de bestemming is leeg" -"Development","Ontwikkeling" -"Direct","Direct" -"Displayed Error Message","Geef Foutmelding Weer" -"Divide Order Weight","Verdeel Bestel Gewicht" -"Documents","Documenten" -"Domestic Shipment Days","Dagen voor binnenlandse verzending" -"Domestic economy select","Kies binnenlandse economie" -"Domestic express","Binnenlandse expres" -"Drop Box","Drop Box" -"Dropoff","Dropoff" -"Easy shop","Winkel gemakkelijk" -"Economy select","Kies economie" -"Empty response","Leeg antwoord" -"Enable Negotiated Rates","Onderhandelde tarieven aanzetten" -"Enabled for Checkout","Aangezet voor de afrekening" -"Enables/Disables SSL verification of Magento server by UPS.","Aanzetten/Uitzetten van SSL verificatie van de Magento server door UPS." -"Error #%s : %s","Fout #%s : %s" -"Error #%s : %s (%s)","Fout #%s : %s (%s)" -"Error #%s: %s","Fout #%s: %s" -"Europack","Europack" -"Europe First Priority","Europa Hoogste Prioriteit" -"Exchange rate %s (Base Currency) -> %s not found. DHL method %s skipped","Wisselkoers % s (basisvaluta) ->% s niet gevonden. DHL methode % s overgeslagen" -"Express","Expresse" -"Express 10:30","Express 10:30" -"Express 10:30 AM","Expresse 10:30" -"Express 12:00","Express 12:00" -"Express 9:00","Expres 9:00" -"Express Mail","Express Post" -"Express Saturday","Expresse Zaterdag" -"Express Saver","Express Bespaarder" -"Express easy","Expres easy" -"Express envelope","Expres envelop" -"Express worldwide","Expres wereldwijd" -"Failed to parse xml document: %s","Niet instaat om XML document: %s te ontleden" -"FedEx","FedEx" -"FedEx 10kg Box","FedEx 10kg Box" -"FedEx 25kg Box","FedEx 25kg Box" -"FedEx Box","FedEx Box" -"FedEx Envelope","FedEx Enveloppe" -"FedEx Pak","FedEx Pak" -"FedEx Tube","FedEx Buis" -"First Overnight","Levering eerstvolgende ochtend van een werkdag" -"First-Class","Eerste Klas" -"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope" -"First-Class Mail International Letter","First-Class Mail International Letter" -"First-Class Mail International Postcard","First-Class Mail International Postcard" -"First-Class Mail Large Envelope","First-Class Mail Large Envelope" -"First-Class Mail Large Postcards","First-Class Mail Large Postcards" -"First-Class Mail Letter","First-Class Mail Letter" -"First-Class Mail Parcel","First-Class Mail Parcel" -"First-Class Mail Postcards","First-Class Mail Postcards" -"First-Class Package International Service","First-Class Package International Service" -"First-Class Package Service","First-Class Package Service" -"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup" -"Flat","Plat" -"Flat-Rate Box","Plat Tarief Box" -"Flat-Rate Envelope","Plat Tarief Enveloppe" -"Free Method","Gratis Methode" -"Free Shipping with Minimum Order Amount","Gratis Verscheping met Minimale Bestel Grote" -"Freight","Vracht" -"Freight worldwide","Vrachtkosten wereldwijd" -"Gateway URL","Gateway URL" -"Gateway XML URL","Gateway XML URL" -"Gift","Geschenk" -"Girth","Omtrek" -"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)" -"Global Express Guaranteed Document","Global Express Guaranteed Document" -"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular" -"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular" -"Globalmail business","Zakelijke Globalmail" -"Ground","Grond" -"Ground Commercial","Grond reclame" -"Ground Residential","Grond woning" -"Handling Applied","Toegepaste behandeling" -"Handling Fee","Behandelingskosten" -"Height","Hoogte" -"Height, width and length should be equal or greater than %s","Hoogte, breedte en lengte moet gelijk of groter zijn dan% s" -"Home Delivery","Thuisbezorging" -"Hub ID","Hub ID" -"Inches","Inches (duimen)" -"Indirect","Indirect" -"International Economy","Internationaal economie" -"International Express","Internationaal express" -"International First","Internationaal eerst" -"International Ground","Internationaal grond" -"International Priority","Internationaal prioriteit" -"International Shipment Days","Internationaal aantal verzendingsdagen" -"Intl Economy Freight","Intl economie vracht" -"Intl Priority Freight","Intl prioriteit vracht" -"Jetline","Jetline" -"Jumbo box","Jumbo box" -"Key","Sleutel" -"Kilograms","Kilogram" -"Large","Groot" -"Large Express Box","Grote expres doos" -"Length","Lengte" -"Letter","Letter" -"Library","Bibliotheek" -"Library Mail","Library Mail" -"Live","Live" -"Machinable","Machinaal" -"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Pakket Gewicht (Neem alstublieft contact op met uw vervoerder voor het maximaal toegestane verstuur gewicht)" -"Media Mail","Mediapost" -"Medical express","Medische express" -"Medium Express Box","Medium Express Box" -"Merchandise","Handelswaar" -"Meter Number","Meter Nummer:" -"Minimum Order Amount for Free Shipping","Minimale Bestellingsgrootheid voor Gratis Versturing" -"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","Minimum Pakket Gewicht (Neem alstublieft contact op met uw vervoerder voor het minimaal toegestane verstuur gewicht)" -"Mode","Modus" -"National Freight","Nationale Vracht" -"Next Afternoon","Volgende Middag" -"Next Day Air","Levering volgende werkdag" -"Next Day Air Early AM","Levering volgende werkdag in de vroege ochtend" -"Next Day Air Early AM Letter","Morgen Vroege Ochtend Brief" -"Next Day Air Intra (Puerto Rico)","Morgen Lucht Intro (Puerto Rico)" -"Next Day Air Letter","Morgen Lucht Brief" -"Next Day Air Saver","Levering volgende werkdag" -"Next Day Air Saver Letter","Morgen Lucht Redder Brief" -"No","Nee" -"No packages for request","Geen Pakketjes gevraagd" -"Non Documents","Zonder documenten" -"Non documents","Zonder documenten" -"Non-rectangular","Niet Rechthoekig" -"None","Geen" -"Not Required","Niet Benodigd" -"Order","Bestelling" -"Order #%s","Bestelling #%s" -"Origin of the Shipment","Herkomst van de Verzending" -"Origin serviceAreaCode is missing","Kengetal van de herkomstdienst ontbreekt" -"Other","Andere" -"Others","Anders" -"PAK","PAK" -"Package","Pakket" -"Package Description","Pakketbeschrijving" -"Package content is missing","Inhoud van de verpakking ontbreekt" -"Packages Request Type","Pakket verzoektype" -"Packaging","Verpakking" -"Pallet","Pallet" -"Parcel","Pakje" -"Parcel Post","Pakketpost" -"Password","Wachtwoord" -"Pickup Method","Ophaalmethode" -"Piece Id barcode is missing","Stuk ID barcode ontbreekt" -"Piece number information is missing","Stuk nummer informatie ontbreekt" -"Please make sure to use only digits here. No dashes are allowed.","Gebruik alleen getallen hier. Streepjes zijn niet toegestaan." -"Please, specify origin country","Geef land van herkomst op" -"Pounds","Ponden" -"Priority Mail","Prioritaire Post" -"Priority Mail Express","Priority Mail Express" -"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes" -"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup" -"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope" -"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup" -"Priority Mail Express International","Priority Mail Express International" -"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes" -"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope" -"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope" -"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope" -"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope" -"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope" -"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery" -"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes" -"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope" -"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope" -"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope" -"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope" -"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup" -"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope" -"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup" -"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup" -"Priority Mail International","Priority Mail International" -"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box" -"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope" -"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope" -"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box" -"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box" -"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope" -"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box" -"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope" -"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box" -"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope" -"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope" -"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box" -"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup" -"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope" -"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup" -"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box" -"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup" -"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope" -"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup" -"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A" -"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup" -"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B" -"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup" -"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C" -"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup" -"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box" -"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup" -"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope" -"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup" -"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope" -"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup" -"Priority Overnight","Levering volgende werkdag" -"Product content code is invalid","Inhoudscode van het product is ongeldig" -"Product name is missing","Productnaam ontbreekt" -"Receiver","Ontvanger" -"Rectangular","Rechthoekig" -"Reference code is missing","Referentie-code ontbreekt" -"Regular","Gewoon" -"Regular Pickup","Gewone ophaal" -"Request Courier","Koerier aanvragen" -"Required","Benodigd" -"Required for negotiated rates; 6-character UPS.","Vereist voor onderhandelde tarieven; 6-karakter UPS." -"Residential","residentieel" -"Residential Delivery","Thuisbezorging" -"Response is in the wrong format","Antwoord is in het verkeerde formaat" -"Return","Retour" -"Round","Rond" -"Routing barcode is missing","Route barcode ontbreekt" -"Same day","Dezelfde dag" -"Sample","Monster" -"Sandbox Mode","Sandbox modus" -"Second Day Service","Tweede Dag Service" -"Secure Gateway URL","Veilige Poort URL" -"Secureline","Secureline" -"Sender","Verzender" -"Sender city info is missing","Info over de stad van de afzender ontbreekt" -"Sender contact name is missing","Contactnaam van de afzender ontbreekt" -"Sender country info is missing","Info over het land van de afzender ontbreekt" -"Service type does not match","Servicetype komt niet overeen" -"Ship to Applicable Countries","Verscheep naar Aanwendbare Landen" -"Ship to Specific Countries","Verscheep naar Gespecificeerde Landen" -"Shipment Contains Hazardous Materials","Verzending Bevat Gevaarlijke Materialen" -"Shipment Dutiable","Verzending Belastbaar" -"Shipment Duty Payment Type","Verzending Belasting Betaling Type" -"Shipment Type","Verzending Type" -"Shipment is not available.","Verzending niet beschikbaar" -"Shipment picked up","Verzending opgehaald" -"Shipper Number","Verzender Nummer" -"Shipping Accept XML URL","Accepteer Verzending XML URL" -"Shipping Confirm XML URL","Verzending Bevestigen XML URL" -"Shipping Key","Verzending Sleutel" -"Shipping Key (International)","Verzending Sleutel (Internationaal)" -"Show Method if Not Applicable","Laat Methode Zien indien Niet Mogelijk" -"Signature Required","Handtekening Benodigd" -"Size","Grote" -"Small Express Box","Kleine Express Box" -"Smart Post","Slimme Post" -"Sort Order","Sorteer Bestelling" -"Specific","specifiek" -"Sprintline","Sprintline" -"Standard Overnight","Standaard levering volgende werkdag" -"Standard Post","Standaard Verzending" -"Station","Station" -"Subtotal","Subtotaal" -"Subtotal With Discount","Subtotaal Met Korting" -"The field is applicable if the Smart Post method is selected.","Dit veld is van toepassing wanneer de Slimme Post methode is geselecteerd." -"The response is in wrong format.","Het antwoord is in een verkeerd formaat." -"There is no available method for selected shipping address.","Er is geen beschikbare verzending methode voor het geselecteerde adres" -"There is no items in this order","Er zijn geen artikelen in deze bestelling" -"Third Party","Derde Partij" -"Title","Titel" -"To Lower","Omlaag" -"To Upper","Omhoog" -"Tracking XML URL","Tracking XML URL" -"UPS","UPS" -"UPS Expedited","Versnelde UPS" -"UPS Express","UPS Express" -"UPS Express Box","UPS Express Box" -"UPS Express Early A.M.","UPS Express Vroege Levering" -"UPS Express Plus","UPS Express Plus" -"UPS Ground","UPS Over de weg" -"UPS Letter Envelope","UPS Brief Enveloppe" -"UPS Next Day Air","UPS Volgende Dag Lucht" -"UPS Next Day Air Early A.M.","UPS Volgende Dag Lucht Vroeg in de Ochtend" -"UPS Next Day Air Saver","UPS Volgende Dag Lucht Redder" -"UPS Saver","UPS Redder" -"UPS Second Day Air","UPS Tweede Dag Lucht" -"UPS Second Day Air A.M.","UPS Tweede Dag Lucht Vroeg in de Ochtend" -"UPS Standard","UPS Standaard" -"UPS Three-Day Select","UPS Derde Dag Selectie" -"UPS Today Dedicated Courrier","UPS Vandaag Toegewijde Bezorger" -"UPS Today Express","UPS Vandaag Express" -"UPS Today Express Saver","UPS Vandaag Express Redder" -"UPS Today Intercity","UPS Vandaag Intercity" -"UPS Today Standard","UPS Vandaag Standaard" -"UPS Tube","UPS Koker" -"UPS Type","UPS Type" -"UPS Worldwide 10 kilo","UPS Wereldwijd 10 kilo" -"UPS Worldwide 25 kilo","UPS Wereldwijd 25 kilo" -"UPS Worldwide Expedited","UPS Wereldwijd Versneld" -"UPS Worldwide Express","UPS Wereldwijd per Expresse" -"UPS Worldwide Express Plus","UPS Wereldwijd per Expresse Plus" -"UPS Worldwide Express PlusSM","UPS Wereldwijd per Expresse PlusSM" -"UPS Worldwide Saver","UPS Worldwide Saver" -"USPS","USPS" -"USPS GXG Envelopes","USPS GXG Envelopes" -"Unable to retrieve tracking","Kan de tracking niet terugvinden" -"United Parcel Service","United Pakketdienst" -"United Parcel Service XML","United Pakketdienst XML" -"Unknown error","Onbekende fout" -"Used only when ""Additional Protection Value"" is set to ""Configuration"". Can contain only numeric amount.","Wordt alleen gebruikt wanneer ""Additionele beschermingswaarde"" is ingesteld op ""Configuratie"". Kan alleen numerieke hoeveelheid bevatten." -"User ID","Gebruikers ID" -"Variable","Variabele" -"Waybill barcode information is missing","Vrachtbrief barcode informatie ontbreekt" -"Weight Unit","Gewicht Unit" -"Weight unit is invalid","Gewichtseenheid is ongeldig" -"Width","Breedte" -"Worldwide Expedited","Wereldwijd Versneld" -"Worldwide Express","Wereldwijd per Expresse" -"Worldwide Express Letter","Wereldwijd Brief per Expresse" -"Worldwide Express Plus","Wereldwijd per Expresse Plus" -"Worldwide Express Plus Letter","Wereldwijde expres plus brief" -"Worldwide Express Saver","Wereldwijde expres besparing" -"Wrong Content Type.","Verkeerd inhoudstype" -"Wrong Region.","Verkeerde regio" -"Yes","Ja" -"Your Packaging","Uw verpakking" -"Zero shipping charge for '%s'","Nul verzendkosten voor '% s'" -"cm","cm" -"inch","inch" diff --git a/app/locale/nl_NL/Mage_Weee.csv b/app/locale/nl_NL/Mage_Weee.csv deleted file mode 100644 index ce51c321a..000000000 --- a/app/locale/nl_NL/Mage_Weee.csv +++ /dev/null @@ -1,25 +0,0 @@ -"All Websites","Alle Websites" -"Apply Discounts To FPT","Pas Korting Toe op FPT" -"Apply Tax To FPT","Pas BTW Toe op FPT" -"Display Prices In Emails","Toon Prijzen In Emails" -"Display Prices In Product Lists","Toon Prijzen In Productlijsten" -"Display Prices In Sales Modules","Toon Prijzen in Verkoopmodules" -"Display Prices On Product View Page","Toon Prijzen Op Product Weergavepagina" -"Enable FPT","Activeer FPT" -"Excluding FPT","Met uitzondering van FPT" -"Excluding FPT, FPT description, final price","Met uitzondering van FPT, FPT omschrijving, definitieve prijs" -"FPT Tax Configuration","FPT Belastingsconfiguratie" -"Fixed Product Tax","Vaste Product Belasting" -"Fixed Product Taxes","Vaste Product Belastingen" -"Include FPT In Subtotal","Neem FPT mee in Subtotaal" -"Including FPT and FPT description","Inclusief FPT en FPT omschrijving" -"Including FPT and FPT description [incl. FPT VAT]","Inclusief FPT en FPT omschrijving [incl. FPT BTW]" -"Including FPT only","Inclusief alleen FPT" -"Loaded and Displayed with Tax","Geladen en weergegeven met Belasting" -"Not Taxed","Niet Belast" -"Taxed","Belast" -"Total","Totaal" -"Total Incl. Tax","Totale Inclusieve Belasting" -"Total excl. tax","Totaal exclusief belasting" -"Total incl. tax","Totaal incl. BTW" -"Total:","Totaal:" diff --git a/app/locale/nl_NL/Mage_Widget.csv b/app/locale/nl_NL/Mage_Widget.csv deleted file mode 100644 index 1b1e3936f..000000000 --- a/app/locale/nl_NL/Mage_Widget.csv +++ /dev/null @@ -1,75 +0,0 @@ -"%s","%s" -"-- Please Select --","-- Selecteer alstublieft --" -"Actions","Acties" -"Add Layout Update","Voeg Update Layout toe" -"Add New Widget Instance","Voeg Nieuwe Widgets toe" -"All","Alles" -"All Pages","Alle pagina's" -"All Product Types","Alle Product Types" -"An error occurred during saving a widget: %s","Er is een fout opgetreden tijdens het opslaan van een widget: %s" -"Anchor Categories","Anker Categorieën" -"Apply","Toepassen" -"Assign to Store Views","Wijs toe aan Store Views" -"Big Image","Grote Afbeelding" -"Block Reference","Block Referentie" -"CMS","CMS" -"Categories","Categoriën" -"Choose...","Kies..." -"Close","Sluiten" -"Continue","Doorgaan" -"Default Template","Vaststaand Sjabloon" -"Delete","Verwijderen" -"Design Package/Theme","Ontwerp Pakket/Thema" -"Export to:","Exporteer naar:" -"Frontend Properties","Front end Eigenschappen" -"Generic Pages","Generieke Pagina's" -"Images","Afbeeldingen" -"Insert Widget","Voeg Widget in" -"Insert Widget...","Voeg widget in..." -"Layout Updates","Lay-out Updates" -"Manage Widget Instances","Beheer Widget Gevallen" -"New Instance","Nieuw Voorbeeld" -"New Widget Instance","Nieuw Widget Voorbeeld" -"Next page","Volgende pagina" -"Non-Anchor Categories","Niet-Verankerde Categorieën" -"Not Selected","Niet Geselecteerd" -"Open Chooser","Open Kiezer" -"Page","Pagina" -"Please Select Block Reference First","Selecteer Alstublieft Eerst de Blokreferentie" -"Previous page","Vorige pagina" -"Products","Producten" -"Remove Layout Update","Verwijder Lay-out Update" -"Save and Continue Edit","Opslaan en doorgaan met bewerken" -"Select All","Selecteer Alles" -"Select Visible","Selecteer Zichtbaar" -"Settings","Instellingen" -"Sort Order","Sorteer Bestelling" -"Sort Order of widget instances in the same block reference","Sorteer Volgorde van widget instanties in dezelfde blokreferentie" -"Specific %s","Specifieke %s" -"Specified Page","Specifieke Pagina" -"Template","Sjabloon" -"The information in this tab has been changed.","De informatie in deze tab is veranderd." -"The widget instance has been deleted.","De widget instantie is verwijderd." -"The widget instance has been saved.","De widget instantie is opgeslagen." -"This tab contains invalid data. Please solve the problem before saving.","Deze tab bevat ongeldige data. Los alstublieft dit probleem op voor het opslaan." -"Thumbnail","Miniatuur" -"Total %d records found","In totaal %d verslagen gevonden." -"Type","Type" -"Unselect All","Deselecteer Alles" -"Unselect Visible","Deselecteer Zichtbaar" -"View","Bekijk" -"Widget","Widget" -"Widget ""%s""","Widget ""%s""" -"Widget ID","Widget ID" -"Widget Insertion","Widget Invoeging" -"Widget Instance","Widget instantie" -"Widget Instance Title","Widget instantie titel" -"Widget Options","Widget opties" -"Widget Type","Widget type" -"Widget Type is not specified","Widget type is niet gespecificeerd" -"Widget instance is not full complete to create.","Widget instantie is niet volledig compleet om het aan te maken" -"Widgets","Widgets" -"Wrong widget instance specified.","Verkeerd widget bijvoorbeeld gespecificeerd." -"items selected","geselecteerde artikelen" -"of %s pages","van %s pagina's" -"per page","per pagina" diff --git a/app/locale/nl_NL/Mage_Wishlist.csv b/app/locale/nl_NL/Mage_Wishlist.csv deleted file mode 100644 index b4fba6a06..000000000 --- a/app/locale/nl_NL/Mage_Wishlist.csv +++ /dev/null @@ -1,100 +0,0 @@ -"%1$s has been updated in your wishlist.","%1$s is geüpdatet in uw wensenlijst." -"%d product(s) have been added to shopping cart: %s.","%d product(en) zijn toegevoegd aan het winkelwagentje: %s." -"%s for ""%s"".","%s voor ""%s""." -"%s has been moved to wishlist %s","%s is verplaatst naar verlanglijstje %s" -"%s's Wishlist","%s's Verlanglijstje" -"* Required Fields","* Vereiste velden" -"Add All to Cart","Voeg Alles Toe aan Winkelwagentje" -"Add to Cart","Aan mandje toevoegen" -"Add to Compare","Voeg toe om te Vergelijken" -"Add to Wishlist","Aan verlanglijst toevoegen" -"Added From","Toegevoegd Vanuit" -"An error occurred while adding item to wishlist.","Er heeft een fout plaatsgevonden tijdens het toevoegen van dit voorwerp in uw wensenlijst." -"An error occurred while adding item to wishlist: %s","Er is een fout opgetreden bij het toevoegen van het item aan het verlanglijstje: %s" -"An error occurred while deleting the item from wishlist.","Er is een fout opgetreden bij het verwijderen van het item van het verlanglijstje: %s" -"An error occurred while deleting the item from wishlist: %s","Er is een fout opgetreden bij het verwijderen van het item van het verlanglijstje." -"An error occurred while updating wishlist.","Er is fout opgetreden in het updaten van uw wensenlijst." -"Are you sure you want to remove this product from your wishlist?","Weet u zeker dat u dit product wilt verwijderen van uw verlanglijstje?" -"Are you sure you would like to remove this item from the wishlist?","Weet u zeker dat u dit item graag van de verlanglijst wilt verwijderen?" -"Back","Terug" -"Can\'t delete item from wishlist","Kan het item niet verwijderen van het verlanglijstje" -"Can\'t save description %s","Kan omschrijving %s niet opslaan" -"Can\'t update wishlist","Kan het verlanglijstje niet updaten" -"Cannot add item to shopping cart","Kan het item niet toevoegen aan het winkelwagentje" -"Cannot add the following product(s) to shopping cart: %s.","Kan de volgende producten niet toevoegen aan winkelwagen: %s." -"Cannot add the item to shopping cart.","Kan het item niet toevoegen aan het winkelwagentje." -"Cannot configure product","Kan product niet aanpassen" -"Cannot load wishlist item","Kan wensenlijst voorwerp niet laden" -"Cannot move item to wishlist","Kan object niet verplaatsen naar verlanglijst" -"Cannot specify product.","Kan Product Niet Specificeren." -"Cannot specify wishlist item.","Kan dit wensenlijst voorwerpen specificeren." -"Cannot specify wishlist.","Kan Wensenlijst Niet Specificeren." -"Cannot update wishlist","Kan Wensenlijst Niet Updaten" -"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Klik op deze checkbox als u een link naar een RSS feed aan uw wensenlijst wilt toevoegen." -"Click for price","Klik voor de prijs" -"Comment","Commentaar" -"Comment:","Commentaar:" -"Configure Wishlist Item","Pas Wensenlijst Voorwerp aan" -"Configured Price:","Aangepaste Prijs:" -"Could not find such wishlist","Kan niet zo'n verlanglijstje vinden" -"Could not find wishlist","Kon verlanglijstje niet vinden" -"Customer My Account My Wishlist","Klant Mijn Account Mijn Wensenlijst" -"Customer My Account Wishlist Sharing Form","Klant Mijn Account Wensenlijst Deel Formulier" -"Customer Shared Wishlist View","Klant Gedeelde Wensenlijst Zien" -"Date Added","Datum Toegevoegd" -"Days in Wishlist","Dagen in Wensenlijst" -"Display Wishlist Summary","Laat Wensenlijst Samenvatting Zien" -"Edit","Bewerken" -"Email Sender","E-mail Verzender" -"Email Template","E-mail Sjabloon" -"Email address can\'t be empty.","E-mailadres mag niet leeg zijn." -"Email addresses, separated by commas","E-mailadressen, gedeeld door komma's" -"Enabled","Aan" -"General Options","Algemene opties" -"Go to Wishlist","Ga naar Verlanglijstje" -"Helper for wishlist options rendering doesn't implement required interface.","Helper voor wensenlijst instellingen weergave kan het benodigde interface niet implementeren." -"In stock","In voorraad" -"Last Added Items","Laatst Toegevoegde Items" -"Message","Boodschap" -"My Wishlist","Mijn verlanglijst" -"My Wishlist (%d item)","Mijn Verlanglijstje (%d item)" -"My Wishlist (%d items)","Mijn Verlanglijstje (%d items)" -"My Wishlist (%d)","Mijn Verlanglijstje (%d)" -"My Wishlist Link","Mijn Wensenlijst Link" -"Options Details","Instellingen Details" -"Out of stock","Uit voorraad" -"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Vul alstublieft geldige email adressen in, gescheiden door komma's. Bijvoorbeeld johndoe@domain.com, johnsmith@domain.com." -"Please input a valid email address.","Voer alstublieft een geldig email adres in." -"Please, enter your comments...","Alstublieft, vul uw commentaar in..." -"Price","Prijs" -"Product","Product" -"Product Details and Comment","Product Details en het Commentaar" -"Product(s) %s have required options. Each of them can be added to cart separately only.","Product(en) %s hebben verplichte opties. Elk van deze producten kan alleen afzonderlijk aan het winkelwagentje toegevoegd worden." -"Product(s) %s have required options. Each product can only be added individually.","Product(en) %s hebben vereiste opties. Elk product kan alleen afzonderlijk worden toegevoegd." -"Quantity","Hoevelheid" -"RSS Feed","RSS Feed" -"RSS link to %s's wishlist","RSS link naar %s's verlanglijstje" -"Remove Item","Artikel verwijderen" -"Remove This Item","Verwijder Dit Item" -"Remove item","Verwijder artikel" -"Requested cart item doesn't exist","Aangevraagde winkelwagen item bestaat niet" -"Requested wishlist doesn't exist","Aangevraagde verlanglijstje bestaat niet" -"Share Options","Deel Opties" -"Share Wishlist","Deel Verlanglijstje" -"Share Your Wishlist","Deel Uw Verlanglijstje" -"Sharing Information","Informatie over Delen" -"This Wishlist has no Items","Deze Verlanglijst bevat geen artikelen" -"This product(s) is currently out of stock","Dit product(en) is momenteel niet op voorraad" -"Unable to add the following product(s) to shopping cart: %s.","Niet mogelijk om het volgende product(en) toe te voegen aan uw bestelling: %s." -"Update Wishlist","Bijwerken Verlanglijst" -"User Description","Gebruikers Beschrijving" -"View Details","Details bekijken" -"View Product","Product Bekijken" -"What's this?","Wat is dit?" -"Wishlist","Verlanglijst" -"Wishlist Section","Onderdeel Verlanglijst" -"Wishlist Sharing","Verlanglijst Delen" -"Wishlist could not be created.","Verlanglijst kan niet worden gemaakt." -"Wishlist is empty now.","Verlanglijst is nu leeg." -"You have no items in your wishlist.","U heeft geen onderdelen in uw verlanglijst." -"Your Wishlist has been shared.","Uw Verlanglijst is gedeeld." diff --git a/app/locale/nl_NL/Mage_XmlConnect.csv b/app/locale/nl_NL/Mage_XmlConnect.csv deleted file mode 100644 index 656903521..000000000 --- a/app/locale/nl_NL/Mage_XmlConnect.csv +++ /dev/null @@ -1,1200 +0,0 @@ -" But cart has some errors.","Maar de winkelwagen heeft wat fouten." -" Note: Image size affects the performance of your app."," Note: Image size affects the performance of your app." -"""Description"" is more than %d characters long","""Description"" is langer dan %d tekens" -"""Title"" is more than %d characters long","""Title"" is langer dan %d tekens" -"""id"" attribute is required for a ""%s"" field.","""id"" attribuut is vereist voor een ""%s"" veld." -"""line_count"" attribute is required for ""multiline"" element.","""line_count"" attribuut is nodig voor een element dat bestaat uit meerdere regels." -"""message"" attribute is required for ""%s"" validator rule.","""message"" attribuut is vereist voor ""%s"" validatieregel." -"%1$s has been added to your wishlist.","%1$s is toegevoegd aan uw verlanglijst." -"%1$s incl tax.","%1$s incl. BTW." -"%@ is not correct","%@ is not correct" -"%s API Key required.","%s API Key vereist." -"%s Application ID required.","%s Toepassing ID vereist." -"%s Secret Key required.","%s Geheime Sleutel vereist." -"%s attribute is required.","%s attribuut is vereist." -"%s fields is required","%s fields is required" -"%s has been added to your cart.","%S is toegevoegd aan uw winkelwagen." -"%s id:","%s id:" -"%s was updated in your shopping cart.","%s was updated in your shopping cart." -"(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)","(Bevat meer landen dan hieronder aangegeven. U bent als eigenaar van de applicatie verantwoordelijk zich te schikken naar land-specifieke wetten gerelateerd aan de distributie of verkoop van uw applicatie in dat land, inclusief uw thuisland.)" -"* - field is required","* - field is required" -"*Subject to change","*Wijzigingen voorbehouden" -"1. Please select type of the action:","1. Please select type of the action:" -"10:40 AM","10:40 uur" -"2. Please select a page","2. Please select a page" -"2. Type Category Name","2. Type Category Name" -"2. Type Product Name","2. Type Product Name" -"80px x 80px","80 x 80 pixels" -"80x80 px","80 x 80 pixels" -"Login to Urabn Airship.","Login op Urabn Airship." -"Login to Urban Airship.","Login to Urban Airship." -"A Catalog Only App will not support functions such as add to cart, add to wishlist, or login.","Een Catalog Only App ondersteund functies als voeg toe aan winkelwagen, voeg toe aan verlanglijst, of login niet." -"A new password has been sent.","Een nieuw wachtwoord is verstuurd." -"About","About" -"Access forbidden","Access forbidden" -"Account","Account" -"Account Information","Account Information" -"Account Settings","Account Settings" -"Account confirmation is required. Please check your email for the confirmation link.","Account verificatie is vereist. Controleer uw e-mail voor de bevestigingslink." -"Account information has been saved.","Account informatie is opgeslagen." -"Action","Actie" -"Action type does\'t recognized","Action type does\'t recognized" -"Action type does\'t recognized.","Action type does\'t recognized." -"Action type doesn\'t recognized.","Action type doesn\'t recognized." -"Activate","Activeer" -"Activate PayPal Checkout","Activeer PayPal Uitchecken" -"Activate PayPal MECL","Activeer PayPal MECL" -"Activation Key","Activatie Sleutel" -"Add","Add" -"Add Action","Add Action" -"Add Address from Contacts","Add Address from Contacts" -"Add App","App Toevoegen" -"Add Custom","Add Custom" -"Add New Address","Add New Address" -"Add New Template","Nieuw Sjabloon Toevoegen" -"Add Page","Pagina Toevoegen" -"Add To Wishlist","Add To Wishlist" -"Add a billing address","Add a billing address" -"Add a shipping address","Add a shipping address" -"Add to Cart","Aan mandje toevoegen" -"Add to Wishlist","Aan verlanglijst toevoegen" -"Adding Product to Cart...","Adding Product to Cart..." -"Adding Product to WishList...","Adding Product to WishList..." -"Additional Address","Aanvullende adresgegevens." -"Additional Info","Additional Info" -"Address","Adres" -"Address 2","Adres 2" -"Address Book","Address Book" -"Address Book Updated","Address Book Updated" -"Address Info","Address Info" -"Address book is empty","Address book is empty" -"Address data not specified.","Adres data niet ingevuld." -"Address does not belong to this customer.","Adres behoort niet tot deze klant." -"Address has been deleted.","Adres is verwijderd." -"Address has been saved.","Adres is opgeslagen." -"Admin Application Settings","Admin Application Settings" -"Admin Mobile Application","Admin Mobile Application" -"Admin application has not been enabled","Admin application has not been enabled" -"Administrative contact for this app and for app submission issues.","Administratief contact voor deze app en voor app indieningskwesties." -"Advanced Settings","Geavanceerde instellingen" -"After submitting the App to Magento, please contact %1$s to receive the Application Key, Application Secret and Application Master Secret.","Nadat u de App hebt ingeleverd bij Magento, neemt u contact op met %1$s om de Application Key, Application Secret en Application Master Secret te krijgen." -"AirMail Message Queue","AirMail Berichten Wachtrij" -"AirMail Messages Queue","AirMail Berichten Wachtrij" -"AirMail Template Preview","AirMail Sjabloon Preview" -"AirMail message","AirMail Bericht" -"AirMail templates","AirMail sjablonen" -"All Allowed Countries","Alle Toegestane Landen" -"All Images","All Images" -"All locations","Alle locaties" -"Amount","Amount" -"Amount in %@","Amount in %@" -"Amounts","Amounts" -"An account with this email address already exists.","Een account met die e-mailadres bestaat al." -"An error occurred while adding item to wishlist.","Er heeft een fout plaatsgevonden tijdens het toevoegen van dit voorwerp in uw wensenlijst." -"An error occurred while deleting the address.","Een fout heeft plaats gevonden tijdens het verwijderen van het adres." -"An error occurred while loading categories.","Er is een fout onstaan terwijl we de categorieën probeerden op te halen." -"An error occurred while loading category filters.","Een fout heeft plaats gevonden tijdens het laden van de categoriefilters." -"An error occurred while loading configuration.","An error occurred while loading configuration." -"An error occurred while loading localization.","An error occurred while loading localization." -"An error occurred while loading login form.","An error occurred while loading login form." -"An error occurred while loading wishlist.","Er is een fout onstaan terwijl we de wensenlijst probeerden op te halen." -"An error occurred while processing your order. Please contact us or try again later.","Er heeft een fout plaats gevonden tijdens de verwerking van uw opdracht. Gelieve contact met ons op te nemen of probeer het later nogmaals." -"An error occurred while processing your request.","Er heeft een fout plaats gevonden tijdens het verwerken van uw verzoek." -"An error occurred while removing item from wishlist.","Er heeft een fout plaats gevonden tijdens het verwijderen van een voorwerp van uw wensenlijst." -"An error occurred while removing items from wishlist.","Er heeft een fout plaatsgevonden tijdens het verwijderen van voorwerpen van uw wensenlijst." -"Analytics","Analytics" -"Android","Android" -"Android doesn\'t support AirMail message type.","Android ondersteunt niet AirMail berichten." -"App Background","App Achtergrond" -"App Background (landscape mode)","App Background (landscape mode)" -"App Background (landscape mode).","App Achtergrond (landschap mode)." -"App Background (portrait mode)","App Background (portrait mode)" -"App Background (portrait mode).","App Achtergrond (portret mode)." -"App Background
    (landscape mode)","App Achtergrond
    (landschap mode)" -"App Background
    (portrait mode)","App Achtergrond
    (portret mode)" -"App Background image missing.","App Achtergrond afbeelding ontbreekt." -"App Code","App code" -"App Information","App Informatie" -"App Name","App Naam" -"App Stores","App Winkels" -"App Submission History","App Indiening Geschiedenis" -"App Title","App Titel" -"App code","App code" -"App code required.","App code vereist." -"App does not exist.","App bestaat niet." -"App has been deleted.","App is verwijderd." -"App has been saved.","App is opgeslagen." -"App has been submitted.","App is ingediend." -"App model not loaded.","App is niet geladen." -"App with specified code does not exist.","App met de geselecteerde code bestaat niet." -"Appears in the info section of your app (example: Copyright 2010 – Your Company, Inc.)","Verschijnt in de informatie sectie van uw app (Bijvoorbeeld: Copyright 2011 - Uw bedrijf, BV.)" -"Application","Applicatie" -"Application Key","Applicatie Sleutel" -"Application Master Secret","Toepassing meester geheim" -"Application Name","Naam toepassing" -"Application Secret","Geheim toepassing" -"Application doesn\'t exist.","Application doesn\'t exist." -"Apply","Apply" -"Applying Coupon Code","Applying Coupon Code" -"Applying Gift Card %@","Applying Gift Card %@" -"Are you sure you want to cancel a message?","Are you sure you want to cancel a message?" -"Are you sure you want to cancel selected records?","Are you sure you want to cancel selected records?" -"Are you sure you want to delete a message?","Are you sure you want to delete a message?" -"Are you sure you want to delete selected records?","Are you sure you want to delete selected records?" -"Are you sure you want to delete this theme? This change will affect all applications.","Bent u er zeker van dat u dit thema wilt verwijderen? Deze wijziging zal van invloed zijn op alle applicaties." -"Are you sure you want to do this?","Weet je zeker dat je dit wilt doen?" -"Are you sure you want to remove this item?","Are you sure you want to remove this item?" -"Are you sure you whant to cancel a message?","Weet u zeker dat u een boodschap wilt annuleren?" -"Are you sure you whant to delete a message?","Weet u zeker dat u een boodschap wilt verwijderen?" -"Are you sure you what to cancel selected records?","Weet u zeker dat u de geselecteerde dossiers wilt annuleren?" -"Are you sure you what to delete selected records?","Weet u zeker dat u de geselecteerde dossiers wilt verwijderen?" -"As Low As","As Low As" -"As Low Excl. Tax","As Low Excl. Tax" -"As Low Incl. Tax","As Low Incl. Tax" -"As a Magento customer, Urban Airship is offering you unlimited Push Notifications and Rich Push for $100/year* along with a 60 day free trial.","Als een Magento klant, Urban Airship biedt u een oneindig aantal Push Notificaties en Uitgebreide Push Notificaties aan voor $100/jaar samen met een 60 dagen probeerperiode." -"As low as","As low as" -"As low as excl. tax","As low as excl. tax" -"As low as incl. tax","As low as incl. tax" -"At last one application has to be created.","Tenminste één applicatie dient gemaakt te worden." -"At least one option should be selected","At least one option should be selected" -"Authentication complete.","Authenticatie voltooid." -"Authentication to %@ did failed...","Authentication to %@ did failed..." -"Average Order Amount","Average Order Amount" -"Average Orders","Average Orders" -"Average Rating","Average Rating" -"Back","Terug" -"Back to App Edit","Terug naar bewerken toepassingen" -"Background Color","Achtergrondkleur" -"Balance","Balans" -"Balance Change","Balansverandering" -"Balance History","Balansgeschiedenis" -"Banner on Home Screen","Banner op thuispagina" -"Banner on Home Screen (landscape mode)","Banner on Home Screen (landscape mode)" -"Banner on Home Screen (landscape mode) image missing.","Banner op beginscherm (horizontale modus) mist de afbeelding." -"Banner on Home Screen (portrait mode)","Banner on Home Screen (portrait mode)" -"Banner on Home Screen (portrait mode) image missing.","Banner op beginscherm (verticale modus) mist de afbeelding." -"Banner on Home Screen
    (landscape mode)","Banner op beginscherm
    (horizontale modus)" -"Banner on Home Screen
    (portrait mode)","Banner op Beginscherm
    (verticale modus)" -"Banner on Home Screen image missing.","Afbeelding banner op thuispagina ontbreekt." -"Banners on Home Screen","Banners on Home Screen" -"Best Sellers","Best Sellers" -"Billing","Billing" -"Billing Address","Facturatieadres" -"Billing address","Billing address" -"Billing address has been set.","Betalingadres is ingesteld." -"Bundle Products","Bundle Products" -"Buy %1$s for %2$s","Koop %1$s voor %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Koop %1$s voor %2$s (%3$s inclusief belasting) elk" -"Buy %1$s for %2$s each","Koop %1$s voor %2$s elk" -"Buy %1$s with %2$s discount each","Koop %1$s met %2$s korting elk" -"Buy More & Save","Buy More & Save" -"Buyer country is not allowed by store.","Land koper is niet toegestaan door winkel." -"CMS Page","CMS Page" -"CMS Pages haven\'t been found.","CMS Pages haven\'t been found." -"Cache Lifetime (seconds)","Levensduur cache (seconden)" -"Cache Management","Beheer cache" -"Can\'t add item to shopping cart.","Kan geen artikelen aan winkelmandje toevoegen." -"Can\'t apply the coupon code.","Kan vouchercode niet toepassen." -"Can\'t copy file ""%s"" to ""%s"".","Kan bestand ""%s""niet naar ""%s"" kopiëren." -"Can\'t create wishlist.","Kan verlanglijst niet aanmaken." -"Can\'t delete ""%s"" theme.","Kan ""%s"" thema niet verwijderen." -"Can\'t load XML.","Kan XML niet laden." -"Can\'t load admin application settings.","Can\'t load admin application settings." -"Can\'t load application with id ""%s""","Applicatie met id ""%s"" kan niet geladen worden." -"Can\'t load cart info.","We kunnen niet de winkelwageninformatie laden." -"Can\'t load cart.","We kunnen helaas niet de winkelwagen laden." -"Can\'t load customer form.","Kan het klantformulier niet laden." -"Can\'t load default themes.","Kan de standaard thema's niet laden." -"Can\'t load selected theme. Please check your media folder permissions.","Kan het geselecteerde thema niet laden. Kijk alstublieft naar de toestemmingen in uw mediamap." -"Can\'t load template with id ""%s""","Can\'t load template with id ""%s""" -"Can\'t open submission form.","Kan inzendingsformulier niet openen" -"Can\'t read file ""%s"".","Kan bestand ""%s"" niet lezen." -"Can\'t remove the item.","Kan artikel niet verwijderen." -"Can\'t reset theme.","Kan thema niet herstellen." -"Can\'t save address.","Kan adres niet opslaan." -"Can\'t save the customer.","Kan klant niet opslaan." -"Can\'t save theme.","Kan thema niet opslaan." -"Can\'t show configuration.","Kan configuratie niet tonen." -"Can\'t specify product.","Kan product niet specificeren." -"Can\'t submit application.","Kan applicatie niet inzenden." -"Can\'t update cart.","Kan mandje niet bijwerken." -"Can\'t write to file ""%s"".","Kan niet naar bestand ""%s"" schrijven." -"Cancel","Annuleren" -"Canceled","Geannuleerd" -"Canceling PayPal ...","Canceling PayPal ..." -"Cancelled","Geannuleerd" -"Cannot apply gift card.","Kan de cadeaubon niet uitvoeren." -"Cannot configure product.","Cannot configure product." -"Cannot load theme ""%s"".","Kan thema ""%s"" niet laden." -"Cannot redeem Gift Card.","Kan de cadeaubon niet innen." -"Cannot remove gift card.","Kan de cadeaubon niet verwijderen." -"Cannot save theme ""%s"". Incorrect data received","Kan thema ""%s"" niet opslaan. Onjuiste data ontvangen" -"Cannot update the item.","Cannot update the item." -"Card Verification Number","Kaartverificatienummer" -"Card verification number is wrong","Verificatienummer kaart is fout" -"Carrier","Provider" -"Cart","Winkelwagen" -"Cart Updated","Cart Updated" -"Cart has been updated.","Mandje is bijgewerkt." -"Cart has some errors.","Mandje bevat enkele fouten." -"Cart is empty.","Mandje is leeg." -"Catalog Only App?","Alleen catalogus applicatie?" -"Category","Category" -"Category Button Color","Kleur knop categorie" -"Category Item Background Color","Categorie artikel achtergrondkleur" -"Cc:","Cc:" -"Chairs","Zetels" -"Change Orientation","Verander Oriëntatie" -"Change Password","Verander wachtwoord" -"Changes have been saved to theme.","Veranderingen zijn bij het thema opgeslagen" -"Check","Check" -"Check Gift Card","Check Gift Card" -"Check Gift Card Promo Redeemed","Check Gift Card Promo Redeemed" -"Checking Gift Card %@","Checking Gift Card %@" -"Checkout","Checkout" -"Checkout Page Registration","Checkout Page Registration" -"Checkout as Guest","Checkout as Guest" -"Checkout as Guest or Register","Checkout as Guest or Register" -"Checkout has been initialized.","Afrekening is geïnitialiseerd." -"Checkout initialization...","Checkout initialization..." -"Checkout initialized!","Checkout initialized!" -"Choose Store View","Choose Store View" -"Choose amount","Choose amount" -"Choose file","Choose file" -"City","Stad" -"Clear","Clear" -"Close","Close" -"Color Themes","Kleurenthema's" -"Colors","Kleuren" -"Commiting updates...","Commiting updates..." -"Company","Bedrijf" -"Completed","Voltooid" -"Configuration data have been saved","Configuration data have been saved" -"Configure Cart Item","Configure Cart Item" -"Confirm New Password","Bevestig nieuw wachtwoord" -"Confirm Password","Bevestig wachtwoord" -"Connecting","Connecting" -"Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate.","Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate." -"Contact Email","Contact email" -"Contact Information","Contact Informatie" -"ContactsAreEmpty","ContactsAreEmpty" -"Container is not defined.","Container is niet gedefinieerd." -"Content","Inhoud" -"Continue","Continue" -"Copyright","Auteursrecht" -"Copyright Page Logo","Logo auteursrechtpagina" -"Copyright Page Logo (iPhone 4 retina)","Copyright Page Logo (iPhone 4 retina)" -"Copyright Page Logo
    (iPhone 4 retina)","Logo auteursrechtpagina < br />(iPhone 4 retina)" -"Copyright: Magento (c) 2010","Copyright: Magento (c) 2010" -"Countries","Countries" -"Countries Payment Applicable From","Landen Waaruit Betaling van Toepassing" -"Country","Land" -"Country options don\'t recognized for ""%s"".","Landopties niet herkend voor ""%s""." -"Coupon code %s is not valid.","Vouchercode %s is niet geldig." -"Coupon code %s was applied.","Vouchercode %s is toegepast." -"Coupon code is empty.","Vouchercode is leeg." -"Coupon code was canceled.","Vouchercode is geannuleerd." -"Create Account","Create Account" -"Create an Account","Create an Account" -"Creating a Template is allowed only for applications which have device type iPhone.","Het aanmaken van een sjabloon is alleen toegestaan voor applicaties met apparaattype iPhone." -"Credit Card","Creditcard" -"Credit Card %s","Credit Card %s" -"Credit Card Number","Nummer creditcard" -"Credit Card Type","Type credit card" -"Credit card number does not match credit card type.","Creditcard nummer komt niet overeen met creditcard type." -"Cross Sells","Cross Sells" -"Current Balance: %s","Huidige balans: %s" -"Current Password","Huidig wachtwoord" -"Currently, PayPal MEP is not available for the Android application","Momenteel is PayPal MEP niet beschikbaar voor Android toepassingen" -"Currently, the system does not support the viewing of the order detail.","Currently, the system does not support the viewing of the order detail." -"Custom App Icon","Aangepast applicatie-icoon" -"Custom App Icon (iPhone 4 retina)","Custom App Icon (iPhone 4 retina)" -"Custom App Icon
    (iPhone 4 retina)","Aangepast applicatie-icoon < br />(iPhone 4 retina)" -"Custom Colors","Gepersonaliseerde Kleuren" -"Custom amount","Custom amount" -"Customer","Customer" -"Customer Name","Customer Name" -"Customer authentication problem.","Probleem met klantauthenticatie." -"Customer balance available in enterprise version of Magento only.","Klantbalans is alleen beschikbaar in enterpriseversie van Magento." -"Customer balance is disabled for current store","Klantbalans is uitgeschakeld voor de huidige winkel." -"Customer email not specified.","Email klant niet gespecificeerd." -"Customer logout problem.","Probleem bij uitloggen klant." -"Customer not logged in.","Klant niet ingelogd." -"Customers","Customers" -"DD","DD" -"Date","Datum" -"Date Created","Aangemaakt op datum" -"Date Submitted","Ingezonden op datum" -"Date Updated","Bijgewerkt op datum" -"Date:","Date:" -"Day","Dag" -"Deeper Messaging and Engagement with Rich Push.","Diepere berichten sturen en betrokken zijn met Rich Push." -"Default Billing Address","Standaard betalingsadres" -"Default Shipping Address","Standaard verzendingsadres" -"Default Theme","Standaard thema" -"Default themes are missed.","Default themes are missed." -"Delete","Verwijderen" -"Delete Action","Delete Action" -"Delete theme","Thema verwijderen" -"Deleted","Verwijderd" -"Description","Beschrijving" -"Description that appears in Android Market. %s chars maximum. ","Beschrijving die in de Android Market verschijnt. Maximaal %s tekens." -"Description that appears in the iTunes App Store. %s chars maximum. ","Omschrijving die verschijnt in de iTunes App Store. %s tekens max." -"Deselect All","Alles Deselecteren" -"Design","Ontwerp" -"Device","Apparaat" -"Device Information","Apparaat Informatie" -"Device Type","Apparaat Type" -"Device doesn\'t recognized","Device doesn\'t recognized" -"Device doesn\'t recognized. Unable to load a template.","Apparaat niet herkend. Niet mogelijk sjabloon te laden." -"Device doesn\'t recognized: ""%s"". Unable to load a helper.","Apparaat niet herkend: ""%s"". Niet mogelijk een helper te laden." -"Device doesn\'t recognized: ""%s"". Unable to load preview model.","Apparaat niet herkend: ""%s"". Niet mogelijk preview model te laden." -"Device type doesn\'t recognized.","Device type doesn\'t recognized." -"Discount code is empty","Discount code is empty" -"Discount:","Discount:" -"Done","Done" -"Downloadable Products Updated","Downloadable Products Updated" -"Downloads limit:","Downloads limit:" -"E-mail","E-mail" -"Edit","Bewerken" -"Edit Action","Edit Action" -"Edit Address","Edit Address" -"Edit AirMail Message","Pas AirMail Bericht aan" -"Edit AirMail Message Queue #%s","Pas Airmail Bericht Rij #%s aan" -"Edit App ""%s""","Pas App ""%s"" aan" -"Edit Filter","Pas Filter aan" -"Edit Image","Edit Image" -"Edit Mail List","Edit Mail List" -"Edit Template ""%s""","Pas Sjabloon ""%s"" aan" -"Edit filter","Edit filter" -"Edit note","Edit note" -"Either remote URL or application code was not set. Please make sure you filled all the values and try again.","Either remote URL or application code was not set. Please make sure you filled all the values and try again." -"Element with id %s already exists","Element met id %s bestaat al" -"Email","Email" -"Email Address","e-mailadres" -"Email address you provided is not valid. Please provide a valid one.","Email address you provided is not valid. Please provide a valid one." -"Email is not correct","Email is not correct" -"Email is not specified","Email is not specified" -"Enable Admin Application","Enable Admin Application" -"Enable AirMail Message Push notification","Sta AirMail Bericht Push notificatie toe" -"Enable Facebook","Sta Facebook toe" -"Enable Flurry Analytics","Sta Flurry Analytics toe" -"Enable Flurry Analytics for the merchant.","Sta Flurry Analytics voor de verkoper toe." -"Enable LinkedIn","Sta LinkedIn toe" -"Enable Standard Checkout","Sta Standaard Betaling toe" -"Enable Twitter","Sta Twitter toe" -"Enter Name","Enter Name" -"Enter discount code first.","Enter discount code first." -"Enter discount code if any","Enter discount code if any" -"Enter e-mail","Enter e-mail" -"Enter giftcard promo code here","Enter giftcard promo code here" -"Enter text","Enter text" -"Enter the gift card code","Enter the gift card code" -"Error","Error" -"Error Loading Configuration Format","Error Loading Configuration Format" -"Error during shortening url","Error during shortening url" -"Error message text is missed.","Error message text is missed." -"Error while processing file ""%s"".","Er heeft zich een fout voorgedaan tijdens het processen van bestand ""%s""." -"Error while reading data from Payment Bridge. Please, try again.","Er is een fout opgetreden tijdens het lezen van de data van de Payment Bridge. Gelieve het nogmaals te proberen." -"Error while reading remote data","Error while reading remote data" -"Error while uploading file ""%s"".","Er is een fout opgetreden tijdens het uploaden van bestand ""%s""." -"Error while uploading file ""%s"". Disallowed file type. Only ""jpg"", ""jpeg"", ""gif"", ""png"" are allowed.","Fout bij het uploaden van bestand ""%s"". Niet toegestaan bestand type. Alleen ""jpg"", ""jpeg"", ""gif"", ""png"" zijn toegestaan." -"Error.","Fout." -"Excl. Tax","Excl. Tax" -"Expiration Date - Month","Vervaldatum - Maand" -"Expiration Date - Year","Vervaldatum - Jaar" -"Expires: %s","Verloopt: %s" -"Extend the life of your app with Urban Airship Push Notifications.","Maak uw app langer aantrekkelijk met Urban Airship Push Notificaties." -"Extensions","Uitbreidingen" -"FILTERS APPLIED","FILTERS TOEGEPAST" -"Facebook","Facebook" -"Facebook API","Facebook API" -"Facebook Application ID","Facebook Applicatie ID" -"Facebook post failed...","Facebook post failed..." -"Fax","Fax" -"File can\'t be uploaded.","Bestanden kunnen niet geüpload worden." -"File doesn\'t exist ""%s"".","Bestand ""%s"" bestaat niet." -"Filter","Filter" -"Filters","Filters" -"First Name","Voornaam" -"Fixed amounts","Fixed amounts" -"Flurry API Code","Flurry API Code" -"Flurry Analytics","Flurry Analytics" -"Flurry Analytics Site","Flurry Analytics Website" -"Fonts","Lettertypen" -"Forgot Password","Forgot Password" -"Forgot Password?","Forgot Password?" -"Forgot your password?","Forgot your password?" -"Form","Form" -"Free","Gratis" -"From","From" -"From Excl. Tax","From Excl. Tax" -"From Incl. Tax","From Incl. Tax" -"From excl. tax","From excl. tax" -"From incl. tax","From incl. tax" -"Full Description","Full Description" -"Funk Leaf","Funk Leaf" -"Gallery","Gallery" -"General","Algemeen" -"Generate Offline Catalog","Generate Offline Catalog" -"Get Content from CMS Page","Verkrijg Inhoud van CMS Pagina" -"Gift Card ""%s"" was added.","Geschenkbon ""%s"" werd toegevoegd." -"Gift Card ""%s"" was redeemed.","Geschenkbon ""%s"" werd ingelost." -"Gift Card ""%s"" was removed.","Geschenkbon ""%s"" werd verwijderd." -"Gift Card (%s)","Cadeaubon (%s)" -"Gift Card amount applied to order: %s","Cadeaubon toegepast voor de bestelling: %s" -"Gift Card code is empty.","Couponcode is leeg." -"Gift Card: %s","Cadeaubon: %s" -"Gift card account available in enterprise version of Magento only.","Cadeaubon account is alleen beschikbaar in enterpriseversie van Magento." -"Giftcard promo code","Giftcard promo code" -"Grand Total","Grand Total" -"Grand Total (Excl. Tax)","Totaal (Ex. Belasting)" -"Grand Total (Incl. Tax)","Totaal (Incl. Belasting)" -"Guest","Gast" -"Header Background Color","Aanhef Achtergrond Kleur" -"Header Font Color","Aanhef Letter Kleur" -"High Resolution Application Icon","Hoge Resolutie Applicatie Icoon" -"Home","Thuis" -"Hot Red","Heet Rood" -"How do you rate this product?","Hoe heeft u dit product gewaardeerd?" -"How to incorporate Urban Airship within your application:","Hoe kunt u Urban Airship invoegen in uw applicatie:" -"I Agree","I Agree" -"I agree to the Terms and Conditions","I agree to the Terms and Conditions" -"ID","ID" -"Icon that will appear on the user\'s device after they download your app.","Icon that will appear on the user\'s device after they download your app." -"Icon that will appear on the user\'s device after they download your app. Recommended size: 48px x 48px.","Icoon dat verschijnt op het apparaat van de gebruiker nadat hij uw app heeft gedownload. Aanbevolen grootte: 48 x 48 pixels." -"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 72px x 72px.","Icoon dat verschijnt op het apparaat van de gebruiker nadat hij uw app heeft gedownload. U hoeft geen gradient of soft edges toe te passen (Dit wordt automatisch door Apple gedaan). Aanbevolen grootte: 72 x 72 pixels." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 114px x 114px.","Icoon dat verschijnt op de telefoon van de gebruiker nadat hij uw app heeft gedownload. U hoeft geen gradient of soft edges toe te passen (Dit wordt automatisch door Apple gedaan). Aanbevolen grootte: 114 x 114 pixels." -"Icon that will appear on the user’s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 57px x 57px at 72 dpi.","Icoon dat verschijnt op de telefoon van de gebruiker nadat hij uw app heeft gedownload. U hoeft geen gradient of soft edges toe te passen (Dit wordt automatisch door Apple gedaan). Aanbevolen grootte: 57 x 57 pixels op 72 dpi." -"Icons","Iconen" -"If leave this field empty, the message will be sent immediately","Als u dit veld leeg laat, wordt het bericht automatisch verstuurd" -"If you want to disable the cache on the application side, leave the field empty. Warning! When disabling cache, the application will take time to load each page.","Als u de cache aan de applicatiezijde onbruikbaar wilt maken, laat het veld leeg. Waarschuwing! Als u dit doet, kost het de applicatie tijd elke pagina te laden." -"Image %s is required.","Image %s is required." -"Image action has been saved.","Image action has been saved." -"Image does not exist. Please reload this page.","Image does not exist. Please reload this page." -"Image file was not found.","Afbeelding bestand niet gevonden." -"Image has been deleted.","Image has been deleted." -"Image id is required.","Image id is required." -"Image limits don\'t recognized for ""%s"" image type","Image limits don\'t recognized for ""%s"" image type" -"Image that appears on first screen while your app is loading.","Image that appears on first screen while your app is loading." -"Image that appears on first screen while your app is loading. Required size: 1024px x 768px.","Afbeelding dat verschijnt op eerste scherm terwijl uw app laadt. Aanbevolen grootte: 1024 x 1024 pixels." -"Image that appears on first screen while your app is loading. Required size: 320px x 455px.","Afbeelding dat verschijnt op eerste scherm terwijl uw app laadt. Aanbevolen grootte: 320 x 455 pixels." -"Image that appears on first screen while your app is loading. Required size: 320px x 460px.","Afbeelding dat verschijnt op eerste scherm terwijl uw app laadt. Benodigde grootte: 320 x 460 pixels." -"Image that appears on first screen while your app is loading. Required size: 640px x 920px.","Afbeelding dat verschijnt op eerste scherm terwijl uw app laadt. Benodigde grootte: 640 x 920 pixels." -"Image that appears on first screen while your app is loading. Required size: 768px x 1024px.","Afbeelding dat verschijnt op eerste scherm terwijl uw app laadt. Benodigde grootte: 768 x 1024 pixels." -"Image type doesn\'t recognized: ""%s"".","Image type doesn\'t recognized: ""%s""." -"Image type is required.","Image type is required." -"Images","Afbeeldingen" -"Images order has been updated.","Images order has been updated." -"In Queue","In de wachtrij" -"In Stock","In voorraad" -"In addition, click here to review Urban Airship\'s Terms of Service: click here.","Klik hier om de servicevoorwaarden van Urban Airship te zien: klik hier." -"In order to resubmit your app, you need to first purchase a %s from MagentoCommerce","Om uw app te herbevestigen, moet u eerst een %s bij MagentoCommerce aanschaffen" -"In order to submit your app, you need to first purchase a %s from MagentoCommerce","Om uw app te bevestigen, moet u eerst een %s bij MagentoCommerce aanschaffen" -"Inactive Tabs","Inactieve Tabs" -"Incl. Tax","Incl. Tax" -"Incl. tax","Incl. tax" -"Initialization PayPal ...","Initialization PayPal ..." -"Initialization of the PayPal checkout failed!","Initialization of the PayPal checkout failed!" -"Invalid XML.","Ongeldige XML." -"Invalid current password.","Ongeldig huidig wachtwoord." -"Invalid customer data.","Ongeldige klantendata." -"Invalid data.","Ongeldige data." -"Invalid email address.","Ongeldig e-mailadres." -"Invalid item or wishlist.","Ongeldig artikel of verlanglijst." -"Invalid login or password.","Ongeldige login of wachtwoord" -"Invalid shipping method.","Ongeldige verzendmethode." -"Issue Number","Uitgave Nummer" -"It\'s not allowed to delete submitted application.","Het is niet toegestaan een bevestigde applicatie te verwijderen." -"Item","Item" -"Item Options","Item Options" -"Item has been added to cart.","Artikel is toegevoegd aan winkelwagentje." -"Item has been deleted from cart.","Artikel is verwijderd uit winkelwagentje." -"Item has been removed from wishlist.","Artikel is verwijderd van verlanglijst." -"Items","Items" -"Items were updated. But can\'t update wishlist.","Artikelen geüpdatet. Maar kan verlanglijst niet updaten." -"Keep your image size below %s KB for optimal performance.","Keep your image size below %s KB for optimal performance." -"Key","Sleutel" -"Keywords","Steekwoorden" -"Label","Label" -"Landscape app Background","Landscape app Background" -"Landscape banners on Home Screen","Landscape banners on Home Screen" -"Large iTunes Icon","Grote iTunes Icoon" -"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.","Groot icoon dat verschijnt in de iTunes App Store. U hoeft geen gradient of soft edges toe te passen (dit wordt automatisch door Apple gedaan). Gevraagde grootte: 512 x 512 pixels." -"Last 5 Orders","Last 5 Orders" -"Last 5 Search Terms","Last 5 Search Terms" -"Last Name","Achternaam" -"Last update: %@","Last update: %@" -"Lifetime Sales","Lifetime Sales" -"LindedIn","LindedIn" -"Link:","Link:" -"LinkedIn","LinkedIn" -"LinkedIn API","LinkedIn API" -"LinkedIn API Key","LinkedIn API Key" -"LinkedIn Authorization","LinkedIn Authorization" -"LinkedIn Autorization","LinkedIn Autorization" -"LinkedIn Secret Key","LinkedIn Secret Key" -"Linkedin post failed...","Linkedin post failed..." -"List of downloadable products is empty","List of downloadable products is empty" -"Load more items","Load more items" -"Loader Splash Screen","Loader Splash Scherm" -"Loader Splash Screen (iPhone 4 retina)","Loader Splash Screen (iPhone 4 retina)" -"Loader Splash Screen (landscape mode)","Loader Splash Screen (landscape mode)" -"Loader Splash Screen (portrait mode)","Loader Splash Screen (portrait mode)" -"Loader Splash Screen
    (iPhone 4 retina)","Loader Splash Scherm
    (iPhone 4 retina)" -"Loader Splash Screen
    (landscape mode)","Loader Splash Scherm
    (landscape mode)" -"Loader Splash Screen
    (portrait mode)","Loader Splash Scherm
    (portrait mode)" -"Loading %@...","Loading %@..." -"Loading Account Form...","Loading Account Form..." -"Loading Address Book...","Loading Address Book..." -"Loading Address Form...","Loading Address Form..." -"Loading CMS page ...","Loading CMS page ..." -"Loading Cart...","Loading Cart..." -"Loading Gallery...","Loading Gallery..." -"Loading Login Form...","Loading Login Form..." -"Loading My Downloadable Products...","Loading My Downloadable Products..." -"Loading Order Details","Loading Order Details" -"Loading Orders List...","Loading Orders List..." -"Loading Preview...","Preview Laden..." -"Loading Product Options...","Loading Product Options..." -"Loading Products...","Loading Products..." -"Loading Registration Form...","Loading Registration Form..." -"Loading Restore Password Form...","Loading Restore Password Form..." -"Loading Store Credit...","Loading Store Credit..." -"Loading WishList...","Loading WishList..." -"Loading Write Review Form...","Loading Write Review Form..." -"Loading category ...","Loading category ..." -"Loading more items...","Loading more items..." -"Loading product ...","Loading product ..." -"Loading shipping methods ...","Loading shipping methods ..." -"Loading...","Loading..." -"Locations","Locaties" -"Log In","Inloggen" -"Log Out","Log Out" -"Log in to Admin Panel","Log in to Admin Panel" -"Log into Account","Log into Account" -"Log into your account","Log into your account" -"Log out Account","Log out Account" -"LogInMessageTitle","LogInMessageTitle" -"Login and password are required.","Login en wachtwoord zijn noodzakelijk." -"Logo in Header","Logo in Koptekst" -"Logo in Header image missing.","Logo in Koptekst afbeelding mist" -"Logout complete.","Logout gelukt" -"M.I.","M.I." -"MEP is PayPal\'s native checkout experience for the iPhone. You can choose to use MEP alongside standard checkout, or use it as your only checkout method for Magento mobile. PayPal MEP requires a PayPal business account","MEP is PayPal\'s eigen betaalervaring voor de iPhone. U kunt er voor kiezen om MEP te gebruiken naast de standaard manier van afrekenen, of u kunt het als uw enige checkout methode voor Magento mobile gebruiken. PayPal MEP vereist een PayPal business account." -"MM","MM" -"Mailbox title","Mailbox titel" -"Main Tabs","Hoofdtabs" -"Make Inactive","Deactiveer" -"Make this app available in the following territories","Maak deze app beschikbaar in de volgende gebieden" -"Manage Apps","Beheer Apps" -"Manage Mobile App","Beheer Mobiele App" -"Maximum length is 140","Maximale lengte is 140" -"Maximum length is 255","Maximale lengte is 255" -"Maximum size: %s KB.","Maximum size: %s KB." -"Maximum: %.2f","Maximum: %.2f" -"Merchant Label","Verkoop Label" -"Merge","Merge" -"Message","Message" -"Message Queue","Berichtenrij" -"Message Settings","Instellingen Berichten" -"Message Templates","Sjablonen Berichten" -"Message Title","Titel Bericht" -"Message Type","Type Bericht" -"Message can be edited when status of the message is ""In Queue"" only.","Bericht kan niet worden bewerkt, wanneer de status van het bericht ""In de wachtrij"" is." -"Message content","Berichtinhoud" -"Message text is missed.","Message text is missed." -"Message title","Berichttitel" -"Message too long, please use 140 symbols","Message too long, please use 140 symbols" -"Message type doesn\'t recognized","Message type doesn\'t recognized" -"Minimize","Minimize" -"Minimum %@, maximum %@","Minimum %@, maximum %@" -"Minimum: %.2f","Minimum: %.2f" -"Mobile","Mobiel" -"Mobile Express Checkout has been canceled.","Mobile Express Checkout is geannuleerd geworden." -"Mobile Express Checkout processed successfully.","Mobile Express Checkout is succesvol voldaan." -"Month","Maand" -"More","Meer" -"More Info","Meer informatie" -"More Tabs","Meer Tabs" -"Most Viewed Products","Most Viewed Products" -"My Account","My Account" -"My Downloadable Products","My Downloadable Products" -"My Orders","My Orders" -"My Wishlist","My Wishlist" -"Name","Name" -"Name on Card","Naam Op Kaart" -"Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize. %s chars max.","De naam die onder uw app komt wanneer gebruikers het op hun toestel installeren. Wij raden u aan om een naam te kiezen tussen de 10-12 tekens die uw klanten herkennen. %s tekens maximaal." -"New AirMail Message","Nieuw AirMail Bericht" -"New AirMail Message Queue","Nieuw Airmail Berichten Wachrij" -"New App","Nieuw App" -"New Customers","New Customers" -"New Password","Nieuw Wachtwoord" -"New Template","Nieuw Sjabloon" -"New to Our Store?","New to Our Store?" -"Nickname","Bijnaam" -"No","No" -"No Payment Information Required","Geen Betalingsinformatie Nodig" -"No Ratings","No Ratings" -"No internet connection. Retry later ...","No internet connection. Retry later ..." -"No items were specifed to update.","Geen zaken waren geselecteerd om te updaten." -"No items were updated.","Geen zaken waren geüpdatet." -"No product selected.","Geen product geselecteerd." -"No products found. Please retry with other term","No products found. Please retry with other term" -"No shipping method required.","Geen verzendmethode vereist." -"No such file ""%s"".","Geen bestand ""%s""." -"Not Submitted","Niet ingediend" -"Note: Image size affects the performance of your app.","Note: Image size affects the performance of your app." -"Notice","Bericht" -"Number of Orders","Number of Orders" -"Number of Uses","Number of Uses" -"OK","OK" -"OR, Pay with Standard Checkout","OR, Pay with Standard Checkout" -"Offline Catalog","Offline Catalog" -"Offline cart stored on server","Offline cart stored on server" -"Offline catalog export complete.","Offline catalog export complete." -"Offline catalog export failed.","Offline catalog export failed." -"One or more keywords that describe your app. Keywords are matched to users\' searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum.","Een of meer sleutelwoorden die uw app beschrijven. Sleutelwoorden worden gematched aan de zoekopdrachten via de App Store en helpen met het leveren van nauwkeurige zoekresultaten. Afzonderlijke sleutelwoorden met komma's. 100 tekens is het maximum." -"Onepage checkout is disabled.","Onepage checkout is uitgeschakeld." -"Only custom theme can be deleted","Alleen een zelf gemaakt thema kan worden verwijderd" -"Only default theme can be reset","Alleen standaardthema's kunnen opnieuw worden ingesteld" -"Only free apps are allowed in this version.","Alleen gratis apps zijn toegstaan in deze versie." -"Only registered users can write reviews. Please, log in or register.","Alleen geregistreerde gebruikers kunnen beoordelingen schrijven. Gelieve in te loggen of te registreren." -"Open","Open" -"Options","Options" -"Options menu items","Items in opties menu" -"Order","Order" -"Order #","Order #" -"Order #%s - %s","Bestelling #%s - %s" -"Order Date: %s","Datum bestelling: %s" -"Order Details Updated","Order Details Updated" -"Order ID","Order ID" -"Order ID:","Order ID:" -"Order Info","Order Info" -"Order List Updated","Order List Updated" -"Order Number","Order Number" -"Order Review","Order Review" -"Order canceled","Order canceled" -"Order failed","Order failed" -"Order id is not specified.","Bestelling id is niet gegeven." -"Order is not available.","Bestelling is niet beschikbaar." -"Ordered","Besteld" -"Ordered Items","Ordered Items" -"Orders","Orders" -"Other amount","Other amount" -"Out of Stock","Out of Stock" -"Output format is not specified. Please, specify ""format"" key in constructor, or set it using setFormat().","Output-formaat is niet gespecificeerd. Gelieve een ""format""-toets in de constructor te specificeren, of stel deze in met gebruik van setFormat()." -"Overall Activity","Overall Activity" -"POST data is not valid.","POST data is niet geldig." -"Pages","Pagina's" -"Password","Wachtwoord" -"Password fields cannot be empty.","Wachtwoord velden mogen niet leeg zijn." -"Password is not specified","Password is not specified" -"Password:","Password:" -"PayPal","PayPal" -"PayPal Checkout","PayPal Checkout" -"PayPal MECL is the mobile version of PayPal\'s Express Checkout service. You can choose to use MECL alongside standard checkout, or use it as your only checkout method for Magento Mobile.","PayPal MECL is de mobiele versie van PayPal\'s Express Checkout service. U kunt er voor kiezen om MECL te gebruiken naast het normale afrekenen, of als enige betaalmethode voor Magento Mobile." -"PayPal MEP","Paypal MEP" -"PayPal Mobile Embedded Payment (MEP)","PayPal Mobile Embedded Payment (MEP)" -"PayPal Mobile Express Checkout","Paypal Mobile Express Checkout" -"PayPal Mobile Express Checkout Library (MECL)","PayPal Mobile Express Checkout Library (MECL)" -"PayPal Mobile Express Checkout Token does not exist.","PayPal Mobile Express Checkout Sleutel bestaat niet." -"Payer Email: %s","Betaler Email: %s" -"Payment Applicable From","Betaling van Toepassing Van" -"Payment Bridge module unavailable.","Betaling brugmodule niet beschikbaar." -"Payment Information","Payment Information" -"Payment Method","Betaalmethode" -"Payment Method has been set.","Betalingsmethode is ingesteld." -"Payment Methods","Betalingsmethoden" -"Payment method","Payment method" -"Payment method was successfully set.","Betalingsmethode is succesvol ingesteld." -"Paypal MEP doesn\'t support checkout with any discount.","Paypal MEP ondersteunt niet afrekenen met een bepaalde korting." -"Place Order","Place Order" -"Placing order ...","Placing order ..." -"Please click here to see how to setup and retrieve API credentials.","Klik hier om te zien hoe u de API gegevens dient in te stellen en te verkrijgen." -"Please Select Application","Selecteer alstublieft applicatie" -"Please Select Device Type","Selecteer alstublieft apparaattype" -"Please agree to all the terms and conditions before placing the order.","Ga alstublieft akkoord met alle voorwaarden voor het plaatsen van de bestelling." -"Please create and save an application first.","Maak en bewaar alstublieft eerst een applicatie." -"Please enter ""App Title"".","Voer alstublieft de ""Titel toepassing"" in." -"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Voer een geldige URL in. Protocol is vereist (http://, https:// of ftp://)" -"Please enter a valid date.","Voer a.u.b. een geldige datum in." -"Please enter a valid email address. For example johndoe@domain.com.","Voer a.u.b. een geldig e-mailadres in. Bijvoorbeeld johndoe@domain.com." -"Please enter at least one email recipient","Please enter at least one email recipient" -"Please enter issue number or start date for switch/solo card type.","Voer uitgavenummer in of start datum voor switch/solo kaarttype." -"Please enter the Activation Key.","Voer alstublieft de Activatiesleutel in." -"Please enter the Copyright.","Voer alstublieft het Auteursrecht in." -"Please enter the Description.","Voer alstublieft de Beschrijving in." -"Please enter the Price.","Voer alstublieft de Prijs in." -"Please enter the Resubmission Key.","Voer alstublieft de Herindieningssleutel in." -"Please enter the Title.","Voer alstublieft de Titel in." -"Please make sure your passwords match.","Let er alstublieft op dat de wachtwoorden overeenkomen." -"Please save application first.","Please save application first." -"Please select an option.","Selecteer alstublieft een optie." -"Please select at least one country.","Selecteer alstublieft ten minste een land." -"Please select payment method to cover a quote","Please select payment method to cover a quote" -"Please set email","Please set email" -"Please specify payment method","Please specify payment method" -"Please specify shipping method","Please specify shipping method" -"Please upload an image for ""App Background (landscape mode)"" field from Design Tab.","Upload alstublieft een afbeelding voor ""Applicatie achtergrond (landschap-modus)"" veld onder het Ontwerp tabblad." -"Please upload an image for ""App Background (portrait mode)"" field from Design Tab.","Upload alstublieft een afbeelding voor ""Applicatie achtergrond (portret-modus"" veld onder het Ontwerp tabblad." -"Please upload an image for ""App Background"" field from Design Tab.","Upload alstublieft een afbeelding voor het ""Applicatie achtergrond"" veld onder het Ontwerp tabblad." -"Please upload an image for ""Banner on Home Screen (landscape mode)"" field from Design Tab.","Gelieve een afbeelding te uploaden voor het veld ""Banner op beginscherm (horizontale modus)"" vanaf de Ontwerp Tab." -"Please upload an image for ""Banner on Home Screen (portrait mode)"" field from Design Tab.","Gelieve een afbeelding te uploaden voor het veld ""Banner op beginscherm (verticale modus)"" vanaf de Ontwerp Tab." -"Please upload an image for ""Banner on Home Screen"" field from Design Tab.","Upload a.u.b. een afbeelding voor het ""Banner on Home Screen"" veld van Design Tab." -"Please upload an image for ""Logo in Header"" field from Design Tab.","Upload a.u.b. een afbeelding voor het ""Logo in Header"" veld van Design Tab." -"Please use letters only (a-z or A-Z) in this field.","Gebruik a.u.b. alleen letters (a-z of A-Z) in dit veld." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Gebruik alleen getallen in dit veld. Vermijd spaties of andere tekens zoals punten of komma's." -"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Gebruik alleen letters (a-z of A-Z) of nummers (0-9) in dit veld. Spaties en andere karakters zijn niet toegestaan." -"Please wait...","Please wait..." -"Please, specify gift card amount!","Please, specify gift card amount!" -"Portrait app Background","Portrait app Background" -"Portrait banners on Home Screen","Portrait banners on Home Screen" -"Post data is empty.","Post data is empty." -"Post this product to your wall","Post this product to your wall" -"Posting to e-mails","Posting to e-mails" -"Preferred size: %spx x %spx.","Preferred size: %spx x %spx." -"Prefix","Prefixe" -"Preset Theme","Vooraf ingesteld thema" -"Preview","Preview" -"Price","Prijs" -"Price Font Color","Prijs Letter Kleur" -"Price excluding tax","Price excluding tax" -"Price including tax","Price including tax" -"Primary Color","Eerste Kleur" -"Primary Font Color","Eerste Letter Kleur" -"Problem changing or sending password.","Problemen bij het veranderen of verzenden wachtwoord." -"Proceed to Checkout","Proceed to Checkout" -"Product","Product" -"Product Added to Cart","Product Added to Cart" -"Product Added to Wishlist","Product Added to Wishlist" -"Product Gallery Updated","Product Gallery Updated" -"Product Name3 ","Productnaam3" -"Product Name3 1","Productnaam3 1" -"Product Name3 2","Productnaam3 2" -"Product Options Updated","Product Options Updated" -"Product Removed From Wishlist","Product Removed From Wishlist" -"Product Reviews Updated","Product Reviews Updated" -"Product SKU","Product SKU" -"Product Updated","Product Updated" -"Product added","Product added" -"Product is out of stock","Product is out of stock" -"Product is unavailable.","Product is niet beschikbaar." -"Product only available on the website.","Product only available on the website." -"Product succesfully added to cart","Product succesfully added to cart" -"Product was not specified.","Product is niet bepaald." -"Product(s) currently out of stock.","Product(en) niet meer op voorraad." -"Products","Products" -"Pull Down To Update..","Pull Down To Update.." -"Purchase Order Number","Aankoopnummer" -"Push Notification","Push Notificatie" -"Push Notifications allow you to send messages directly to the people who have installed your app on their device. Send messages to your full audience even when your app is closed. Push Notifications are one of the best ways to keep your app active by delivering valuable content directly to your customers. Learn more about Push Notifications - %1$s","Met push notificaties kunt u meteen berichten verzenden naar de gebruikers die uw app hebben geïnstalleerd op hun apparaat. Verstuur berichten naar alle gebruikers, zelfs wanneer ze de app niet hebben geopend. Push notificaties behoren tot de beste middelen om uw app actief te houden, door uw klanten waardevolle content aan te bieden. Meer info over Push Notificaties - %1$s" -"Push Title","Push Titel" -"Push message","Push bericht" -"Push title","Push titel" -"Qty","Qty" -"Qty:","Qty:" -"Quantity","Quantity" -"Quantity:","Quantity:" -"Queue Date","Rij Datum" -"Queue Message","Rij Bericht" -"Queue does not exist.","Wachtrij bestaat niet." -"Queue is allowed only for applications with enabled Push Notification.","Wachtrij is alleen toegestaan voor applicatie's die push notificaties ondersteunen." -"Quote instance is required.","Prijsopgave voorbeeld is noodzakelijk." -"Quote item is not found.","Quote item is not found." -"Range param doesn\'t recognized","Range param doesn\'t recognized" -"Ratings and Reviews","Ratings and Reviews" -"Read the Terms and Conditions","Read the Terms and Conditions" -"Recent Activity","Recent Activity" -"Recipient Information","Informatie Ontvanger" -"Recommended size %spx x %spx.","Recommended size %spx x %spx." -"Recommended size 1024px x 344px. Note: Image size affects the performance of your app.","Aanbevolen resolutie is 1024px x 344px. Let op: Afbeeldingsgrootte is van invloed op de prestaties van uw applicatie." -"Recommended size 1024px x 704px. Note: Image size affects the performance of your app.","Aanbevolen grootte 1024 x 704 pixels. Merk op: Grootte van de afbeelding beïnvloedt prestatie van uw app." -"Recommended size 320px x 230px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Aanbevolen grootte 320 x 230 pixels. Merk op: Grootte van de afbeelding beïnvloedt prestatie van uw app. Houd de grootte van de afbeelding onder de 50 KB voor optimale prestaties." -"Recommended size 320px x 258px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Aanbevolen grootte 320 x 258 pixels. Merk op: Grootte van de afbeelding beïnvloedt prestatie van uw app. Houd de grootte van de afbeelding onder de 50 KB voor optimale prestaties." -"Recommended size 320px x 367px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.","Aanbevolen grootte 320 x 367 pixels. Merk op: Grootte van de afbeelding beïnvloedt prestatie van uw app. Houd de grootte van de afbeelding onder de 75 KB voor optimale prestaties." -"Recommended size 35px x 35px.","Aanbevolen grootte 35 x 65 pixels." -"Recommended size 768px x 294px. Note: Image size affects the performance of your app.","Aanbevolen grootte 768 x 294 pixels. Merk op: Grootte van de afbeelding beïnvloedt prestatie van uw app." -"Recommended size 768px x 960px. Note: Image size affects the performance of your app.","Aanbevolen grootte 768 x 960 pixels. Merk op: Grootte van de afbeelding beïnvloedt prestatie van uw app." -"Recommended size: %spx x %spx at %s dpi.","Recommended size: %spx x %spx at %s dpi." -"Recommended size: %spx x %spx.","Recommended size: %spx x %spx." -"Recover","Recover" -"Redeem","Redeem" -"Redeeming Gift Card %@","Redeeming Gift Card %@" -"Redemption functionality is disabled.","Terugkoopfunctionaliteit is uitgeschakeld." -"Refunded","Terugbetaald" -"Regions","Regions" -"Register","Register" -"Registering cart ...","Registering cart ..." -"Registering user ...","Registering user ..." -"Regular","Regular" -"Regular and confirmation passwords must be equal","Reguliere en bevestigingswachtwoorden dienen gelijk te zijn." -"Related Product Background Color","Gerelateerde Product Achtergrond Kleur" -"Release To Update...","Release To Update..." -"Relevance","Relevance" -"Remaining downloads","Remaining downloads" -"Remove","Remove" -"Remove Address...","Remove Address..." -"Removing %@...","Removing %@..." -"Removing Coupon...","Removing Coupon..." -"Removing Gift Card...","Removing Gift Card..." -"Removing Product from WishList...","Removing Product from WishList..." -"Removing Store Credit...","Removing Store Credit..." -"Request internal error.","Interne fout ontstaan." -"Request param %s is missed","Request param %s is missed" -"Required size: %spx x %spx.","Required size: %spx x %spx." -"Reset theme to default","Herstel het standaardthema" -"Resubmission Key","Herbevestigingsknop" -"Resubmit App","Herbesvestig App" -"Resubmit App failure. %s","Resubmit App failure. %s" -"Results","Results" -"Revenue","Revenue" -"Revert","Revert" -"Revert Discount","Revert Discount" -"Review","recensie" -"Rich Push allows you to create and send engaging experiences by adding HTML and other rich media components to your push notifications. Moving beyond alerts and badge updates, Rich Push takes users into the app while displaying content in a customizable WebKit view. Create branded messages that engage your users with new content and information, all without having to update your app. Learn more about Rich Push - %1$s","Met Uitgebreide Push notificaties kunt u aansprekende push notificaties creëren, door HTML of andere media componenten toe te voegen aan uw push notificaties. Dit gaat veel verder dan een simpele herinerring sturen aan uw gebruikers, Uitgebreide Push notificaties sturen de bezoekers naar de app, terwijl ze de content gepresenteerd zien in een speciale WebKit variant. Maak berichten die volledig voldoen aan uw huisstijl en die uw gebruikers aanspreken met nieuwe informatie, zonder dat u de app zelf hoeft bij te werken. Meer informatie over Uitgebreide Push notificaties - %1$s." -"SORT BY:","SORTEREN OP:" -"Sample","Sample" -"Samples","Samples" -"Save","Opslaan" -"Save As","Opslaan Als" -"Save Theme","Thema opslaan" -"Save and Continue Edit","Opslaan en doorgaan met bewerken" -"Save and Submit App","Bewaar en Bevestig App" -"Save in address book","Sla op in adresboek" -"Saving Address...","Saving Address..." -"Saving changes ...","Saving changes ..." -"Saving shipping address ...","Saving shipping address ..." -"Saving shipping methods ...","Saving shipping methods ..." -"Screen resolution is not supported","Screen resolution is not supported" -"Screens:","Schermen:" -"Scroll Background Color","Scroll Achtergrond Kleur" -"Search","Zoeken" -"Search Term","Search Term" -"Search Updated","Search Updated" -"Searching for %@...","Searching for %@..." -"Secondary Color","Tweede Kleur" -"Secondary Font Color","Tweede Letter Kleur" -"See all","See all" -"Select %@","Select %@" -"Select All","Selecteer Alles" -"Select Chart","Select Chart" -"Select Links","Select Links" -"Select Options","Select Options" -"Select Payment Method","Select Payment Method" -"Select Range","Select Range" -"Select a","Select a" -"Select a Billing Address","Select a Billing Address" -"Select a Shipping Address","Select a Shipping Address" -"Select from Address Book","Select from Address Book" -"Select shipping method","Select shipping method" -"Selected product is unavailable.","Het geselecteerde product is niet beschikbaar." -"Send","Send" -"Sender Information","Informatie verzender" -"Sending e-mail failed...","Sending e-mail failed..." -"Set","Set" -"Settings","Instellingen" -"Shake device to reset the filter","Shake device to reset the filter" -"Share","Share" -"Share on LinkedIn","Share on LinkedIn" -"Share on Twitter","Share on Twitter" -"Ship method","Ship method" -"Shipped","Verzonden" -"Shipping","Shipping" -"Shipping Address","Verzendingsadres" -"Shipping Method","Verzendingsmethode" -"Shipping address","Shipping address" -"Shipping address has been set.","Het verzendingsadres is ingesteld." -"Shipping method","Shipping method" -"Shipping method has been set.","De verzendingsmethode is ingesteld." -"Shipping method is required","Verzendmethode is benodigd." -"Shipping method successfully updated","Verzendmethode is succesvol bijgewerkt" -"Shipping to this address is not possible.","Verzenden naar dit adres is niet mogelijk." -"Shop","Winkel" -"Shop All","Shop All" -"Shop Updated","Shop Updated" -"Shopping Cart","Shopping Cart" -"Shopping cart is empty.","Het winkelmandje is leeg." -"Show Password","Show Password" -"Sign In","Sign In" -"Signing In...","Signing In..." -"Signing Out ...","Signing Out ..." -"Sky Blue","Hemelblauw" -"Social Networking","Sociale netwerken" -"Some emails were not sent.","Sommige emails zijn niet verzonden." -"Sorry, no payment options are available for this order at this time.","Sorry, geen betalingsopties zijn beschikbaar voor deze bestelling op dit moment." -"Sorry, no quotes are available for this order at this time.","Sorry, geen prijsopgaven zijn beschikbaar voor deze bestelling op dit moment." -"Sorry, there are no items in this category.","Sorry, there are no items in this category." -"Special","Special" -"Special Excl. Tax","Special Excl. Tax" -"Special Incl. Tax","Special Incl. Tax" -"Specific Countries","Specifieke Landen" -"Specified address does not exist.","Het opgegeven adres bestaat niet." -"Specified invalid app code.","De opgegeven applicatiecode is ongeldig." -"Specified invalid data.","Ongeldige data opgegeven." -"Specified item does not exist in wishlist.","Het opgegeven artikel staat niet in het verlanglijstje." -"Standard Checkout","Standaard betaling" -"Standard Checkout uses the checkout methods provided by Magento. Only inline payment methods are supported. (e.g PayPal Direct, Authorize.Net, etc.)","Standaardafrekening gebruikt de afrekeningsmethoden die aangeboden worden door Magento. Alleen inline betalingsmethoden worden ondersteund (bv. PayPal Direct, Authorize.Net, etc.)" -"Start Date","Begindatum" -"Start Date - Month","Startdatum - Maand" -"Start Date - Year","Startdatum - Jaar" -"Starting At","Starting At" -"Starting At Excl. Tax","Starting At Excl. Tax" -"Starting At Incl. Tax","Starting At Incl. Tax" -"Starting at excl. tax","Starting at excl. tax" -"Starting at incl. tax","Starting at incl. tax" -"State/Province","Staat/Provincie" -"Status","Status" -"Storage of offline cart on server failed. Please retry later","Storage of offline cart on server failed. Please retry later" -"Store Credit Info Updated","Store Credit Info Updated" -"Store Credit payment is not being used in your shopping cart.","Winkel Krediet betaling wordt niet gebruikt in uw winkelwagen." -"Store View","Aanblik winkel" -"Store credit","Store credit" -"Store logo that is displayed on copyright page of app.","Store logo that is displayed on copyright page of app." -"Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.","Winkellogo dat wordt weergegeven op de auteursrechtpagina van de toepassing. Voorkeursgrootte: 100 px x 100 px." -"Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px.","Winkellogo dat wordt weergegeven op de auteursrechtpagina van de applicatie. Voorkeursgrootte: 200 px x 200 px." -"Store switcher hasn\'t been defined","Store switcher hasn\'t been defined" -"Street Address","Adres straat" -"Street Address 2","Adres straat 2" -"Subject:","Subject:" -"Submission","Inzending" -"Submission Fields","Inzendingsvelden" -"Submission History","Inzendingsgeschiedenis" -"Submit App","Applicatie inzenden" -"Submit App ""%s""","Applicatie ""%s"" inzenden" -"Submit App failure. %s","Applicatie inzenden mislukt. %s" -"Submit App failure. Invalid activation key provided","Applicatie inzenden mislukt. Ongeldige activatiesleutel opgegeven." -"Submit Review","Submit Review" -"Submitted","Ingezonden" -"Submitting Review...","Submitting Review..." -"Subtotal","Subtotal" -"Subtotal (Excl. Tax)","Subtotaal (exclusief belasting)" -"Subtotal (Incl. Tax)","Subtotaal (inclusief belasting)" -"Subtotal Excl. Tax","Subtotal Excl. Tax" -"Subtotal Incl. Tax","Subtotal Incl. Tax" -"Subtotal excluding tax","Subtotal excluding tax" -"Subtotal incl. tax:","Subtotal incl. tax:" -"Subtotal including tax","Subtotal including tax" -"Subtotal:","Subtotal:" -"Success","Success" -"Successfully posted to Facebook","Successfully posted to Facebook" -"Successfully posted to Linkedin","Successfully posted to Linkedin" -"Suffix","Uitgang" -"Summary of Your Review","Overzicht van uw recensie" -"Swipe a product to reveal more options","Swipe a product to reveal more options" -"T-Shirts","T-shirts" -"Tabs","Tabbladen" -"Tax","Belasting" -"Telephone","Telefoon" -"Tell a Friend","Aan een vriend vertellen" -"Tell a Friend is disabled.","Aan een vriend vertellen is uitgezet." -"Tell a Friend link has been sent.","Aan een vriend vertellen link is verstuurd." -"Template","Sjabloon" -"Template Content","Inhoud sjabloon" -"Template Name","Naam sjabloon" -"Template does not exist.","Sjabloon bestaat niet." -"Template for new AirMail Message does not exist.","Sjabloon voor nieuwe LuchtPost boodschap bestaat niet." -"Template has been deleted.","Sjabloon is verwijderd." -"Terms And Conditions","Terms And Conditions" -"Text length does not satisfy specified max text range.","Tekstlengte komt niet overeen met de gespecificeerde maximale tekstbereik." -"Text length does not satisfy specified min text range.","Tekstlengte komt niet overeen met de gespecificeerde minimale tekstbereik." -"Thank you for registering!","Dank u voor het registreren!" -"Thank you for your purchase! ","Dank u voor uw aankoop!" -"The %s field should be filled.","The %s field should be filled." -"The Mailbox title will be shown in the More Info tab. To understand more about the title, please click here","De Mailbox titel zal getoond worden in het Meer informatie tabblad. Om de titel beter te begrijpen, klik alstublieft hier" -"The application is currently inactive.\nPlease try again later.","The application is currently inactive.\nPlease try again later." -"The cart is empty","The cart is empty" -"The custom amount value should be higher than 0.","The custom amount value should be higher than 0." -"The custom amount value should not be higher than %s.","The custom amount value should not be higher than %s." -"The custom amount value should not be lower than %s.","The custom amount value should not be lower than %s." -"The following email(s) are either mistyped or have incorrect format. Check them and try again:\n","The following email(s) are either mistyped or have incorrect format. Check them and try again:\n" -"The icon that appears in the Android Market.","The icon that appears in the Android Market." -"The icon that appears in the Android Market. Recommended size: 512px x 512px. Maximum size: 1024 KB.","Het icoon dat getoond wordt in de Android Market. Aanbevolen grootte: 512 px x 512 px. Maximale grootte: 1024 KB." -"The length of the text in the %s field is too big. Please shorten the text.","The length of the text in the %s field is too big. Please shorten the text." -"The max length of the field ""%@"" is %d!","The max length of the field ""%@"" is %d!" -"The minimum password length is 6","The minimum password length is 6" -"The server responded with invalid data.","The server responded with invalid data." -"The shortening service returned status code %d indicating a client side error.","The shortening service returned status code %d indicating a client side error." -"The shortening service returned status code %d indicating a server side error.","The shortening service returned status code %d indicating a server side error." -"The store credit payment has been removed from shopping cart.","De Winkel Krediet betaling is verwijderd uit uw winkelwagen." -"The value is too big!","The value is too big!" -"The value should not be greater than %.2f!","The value should not be greater than %.2f!" -"The value should not be less than %.2f!","The value should not be less than %.2f!" -"Theme configurations are successfully reset.","Thema configuraties zijn hersteld." -"Theme has been created.","Thema is gemaakt." -"Theme has been delete.","Thema is verwijderd." -"Theme label can\'t be empty","Themalabel kan niet leeg zijn" -"Theme label:","Themalabel:" -"Theme name is not set.","Themanaam is niet ingesteld." -"There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?","There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?" -"There are no items here","There are no items here" -"There are no items in your cart","There are no items in your cart" -"There is an error in loading an app\'s configuration","There is an error in loading an app\'s configuration" -"There is an error in retrieving the data. Please try again later","There is an error in retrieving the data. Please try again later" -"There is no addresses for this contact","There is no addresses for this contact" -"There is no store credit history!","There is no store credit history!" -"There were some problems with the data.","Er waren een aantal problemen met de gegevens." -"This email address was not found in our records.","Het emailadres is niet in onze gegevens gevonden." -"This functionality disabled in offline mode","This functionality disabled in offline mode" -"This is a required field.","Dit is een verplicht veld." -"This product has no images.","This product has no images." -"Title","Titel" -"Title bar","Titel balk" -"To","To" -"To Excl. Tax","To Excl. Tax" -"To Incl. Tax","To Incl. Tax" -"To activate PayPal MEP payment method activate Express checkout first. ","Om de PayPal MEP betalingsmethode te activeren moet u eerst Expres afrekening activeren." -"To excl. tax","To excl. tax" -"To incl. tax","To incl. tax" -"To preview the newly uploaded images, please save your application first.","To preview the newly uploaded images, please save your application first." -"To:","To:" -"Token has not been set.","Sleutel is niet ingesteld." -"Too many recipients have been set. Max amount of recipients is:","Too many recipients have been set. Max amount of recipients is:" -"Top Search Terms","Top Search Terms" -"Total","Total" -"Total Order Amount","Total Order Amount" -"Total incl. Tax: %1$s","Totaal inclusief belasting: %1$s" -"Total incl. tax","Total incl. tax" -"Totals","Totals" -"Touch and hold a product to delete from shopping cart","Touch and hold a product to delete from shopping cart" -"Touch and hold a product to reveal more options","Touch and hold a product to reveal more options" -"Try Again","Try Again" -"Twitter","Twitter" -"Twitter API","Twitter API" -"Twitter API Key","Twitter API sleutel" -"Twitter Authorization","Twitter Authorization" -"Twitter Autorization","Twitter Autorization" -"Twitter Secret Key","Twitter geheime sleutel" -"Twitter post failed...","Twitter post failed..." -"Type","Type" -"Type and data is required","Type and data is required" -"URL","URL" -"Unable to cancel Mobile Express Checkout.","Niet instaat om Mobile Express Checkout te annuleren." -"Unable to cancel queue.","Kan rij niet annuleren" -"Unable to collect cart totals.","Kan totalen van mandje niet verzamelen." -"Unable to delete queue.","Kan rij niet verwijderen." -"Unable to find an app to delete.","Kan geen toepassing vinden om te verwijderen." -"Unable to find template to delete.","Kan geen sjabloon vinden om te verwijderen." -"Unable to get shipping methods list.","Kan lijst van verzendingsmethoden niet verkrijgen." -"Unable to initialize MEP Checkout.","Kan MEP afrekening niet initialiseren." -"Unable to initialize PayPal Mobile Express Checkout.","Niet instaat om PayPal Mobile Express Checkout op te starten." -"Unable to initialize express checkout review.","We konden helaas niet de snelle checkout starten." -"Unable to initialize express checkout shipping method list.","We konden helaas niet de snelle checkout verzendmethode lijst opstarten." -"Unable to initialize return action.","Niet instaat om de terugkeeractie uit te voeren." -"Unable to load addresses.","Niet instaat om het adres te laden." -"Unable to load application form.","Kan toepassingsformulier niet laden." -"Unable to load banners.","Unable to load banners." -"Unable to load billing address form.","Niet instaat om het formulier voor factuuradres te laden." -"Unable to load billing address.","Niet instaat om het factuuradres te laden." -"Unable to load categories.","Niet instaat om de categorieën te laden." -"Unable to load checkout.","Niet instaat om het afrekenen te laden." -"Unable to load localization.","Unable to load localization." -"Unable to load order list.","We konden helaas niet de bestellijst laden." -"Unable to load order review.","We konden helaas niet het besteloverzicht laden." -"Unable to load product gallery.","Niet instaat om de productgallerij te laden." -"Unable to load product info.","Kan productinformatie niet laden." -"Unable to load product options.","We konden helaas niet de productopties laden." -"Unable to load product review.","Niet instaat om de productevaluatie te laden." -"Unable to load product reviews.","Niet instaat om de productevaluaties te uploaden." -"Unable to load review form.","We konden helaas niet het overzichtsformulier laden." -"Unable to load search.","Niet instaat om de zoekopdracht te laden." -"Unable to load shipping address form.","We kunnen helaas niet het verzendadresformulier laden." -"Unable to place the order.","Kan bestelling niet plaatsen." -"Unable to post the review.","Kan recensie niet publiceren." -"Unable to process preview.","Kan voorbeeld niet verwerken." -"Unable to render a gift card account.","We konden helaas niet de cadeaubonaccount laden." -"Unable to render an order.","Niet instaat om bestelling te geven." -"Unable to render downloadable products.","Unable to render downloadable products." -"Unable to render the store credits.","Niet instaat om winkelkrediet op te halen." -"Unable to save app.","Kan applicatie niet opslaan." -"Unable to save message.","Kan boodschap niet opslaan." -"Unable to save shipping address.","Kan verzendingsadres niet opslaan." -"Unable to save shipping method.","Kan verzendingsmethode niet opslaan." -"Unable to save template.","Kan sjabloon niet opslaan." -"Unable to start MEP Checkout.","Kan MEP Afrekening niet starten." -"Unable to start Mobile Express Checkout.","Niet instaat om Mobile Express Checkout op te starten." -"Unable to update shipping method.","Niet in staat om de versturingsmethode de updaten." -"Undefined","Ongedefinieerd" -"Unit Price","Unit Price" -"Unit Price:","Unit Price:" -"Unknown Error","Onbekende fout" -"Unknown Error.","Onbekende fout." -"Unknown Payment Bridge Error","Unknown Payment Bridge Error" -"Unknown error ocured. Please retry later","Unknown error ocured. Please retry later" -"Unsupported character in path: ""%s""","Niet ondersteund karakter in path: ""%s""" -"Unsupported value type received","Niet ondersteunde waardetype ontvangen" -"Update Comment Error","Update Comment Error" -"Update Preview","Preview van update" -"Updating ...","Updating ..." -"Updating Cart...","Updating Cart..." -"Upon receiving these credentials, please fill in the corresponding fields.","Bij het ontvangen van deze referenties, vragen wij u de volgende overeenkomende velden in te vullen." -"Urban Airship Push Notification","Stedelijk Luchtschip Push Notificatie" -"Use Billing Address","Use Billing Address" -"Use Store Credit (%s available)","Gebruik winkelkrediet (%s beschikbaar)" -"Use as my default billing address","Gebruiken als mijn standaard factuuradres" -"Use as my default shipping address","Gebruik als mijn standaard verzendadres" -"Use billing address for shipping","Use billing address for shipping" -"User Name:","User Name:" -"User session is expired","User session is expired" -"Version","Version" -"View Cart","View Cart" -"View Details","Details bekijken" -"View Gallery","Galerij bekijken" -"View Wishlist","View Wishlist" -"Warning: All related AirMail messages will be deleted!","Waarschuwing: alle gerelateerde AirMail berichten zullen worden verwijderd!" -"Website is offline","Website is offline" -"Website is offline.","Website is offline." -"WishList Updated","WishList Updated" -"Wishlist has been cleared.","Verlanglijstje is geleegd." -"Wishlist has been updated.","Verlanglijstje is bijgewerkt." -"Wishlist has been updated. But there are accrued some errors while updating some items.","Verlanglijstje is bijgewerkt. Maar er hebben zich enkele fouten voorgedaan bij het bijwerken van sommige artikelen." -"Wishlist is empty.","Wishlist is empty." -"Write a Review","Write a Review" -"Write a review","Write a review" -"Wrong Ipad background image orientation has been specified: ""%s"".","Verkeerde oriëntatie iPad achtergrondafbeelding opgegeven: ""%s""." -"Wrong PayPal Mobile Express Checkout Token specified.","Verkeerde PayPal Mobile Express Checkout Token gespecificeerd." -"Wrong device type.","Verkeerd apparaattype." -"Wrong email format","Verkeerde format email" -"Wrong or expired Gift Card Code.","Foutieve of verlopen Couponcode" -"Wrong theme format.","Verkeerde format thema." -"YYYY","YYYY" -"Year","Jaar" -"Yes","Yes" -"You are already logged in.","U bent reeds ingelogd." -"You are not logged in","You are not logged in" -"You can watch statistics here.","U kunt hier de statistieken bekijken." -"You canceled your order. Touch ""Pay with PayPal"" to try again.","You canceled your order. Touch ""Pay with PayPal"" to try again." -"You have entered an incorrect decimal value in the custom amount field. Provide a valid value.","You have entered an incorrect decimal value in the custom amount field. Provide a valid value." -"You have placed no orders.","You have placed no orders." -"You have uncommitted actions. Commit?","You have uncommitted actions. Commit?" -"You may also like","You may also like" -"You must login first","You must login first" -"You must read and agree to the Terms and Conditions before placing your order.","You must read and agree to the Terms and Conditions before placing your order." -"You need to enable PayPal Express Checkout first from the Payment configuration before enabling PayPal MECL.","U moet PayPal Express Checkout vanuit de betalingsconfiguratie eerst inschakelen, voordat u PayPal MECL inschakelt." -"You will receive an order confirmation email with details of your order and a link to track its progress.","U ontvangt een bevestiging per email met uw bestelgegevens en een link om de voortgang te kunnen volgen." -"Your current balance is:","Uw huidige balans is:" -"Your order # is: %s. ","Uw bestelnummer is: %s." -"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it." -"Your order failed. Touch ""Pay with PayPal"" to try again.","Your order failed. Touch ""Pay with PayPal"" to try again." -"Your review has been accepted for moderation.","Uw beoordeling is geaccepteerd voor evaluatie." -"Your tweet has been sent. Thanks for sharing this product on Twitter","Your tweet has been sent. Thanks for sharing this product on Twitter" -"Zip/Postal Code","Zip/Postcode" -"\'%s\' exceeds the allowed file size: %d (bytes)","\'%s\' overschrijdt de toegestane bestandsgrootte: %d (bytes)" -"\'%s\' height exceeds allowed value of %d px","\'%s\' hoogte is meer dan de toegestane %d px" -"\'%s\' is not a valid file extension. Allowed extensions: %s","\'%s\' is geen geldige bestandsextensie. Toegestane extensies: %s" -"\'%s\' width exceeds allowed value of %d px","\'%s\' breedte overschrijdt de toegestane waarde van %d px" -"and","en" -"as Guest","as Guest" -"each","ieder" -"field is required","field is required" -"iPad","iPad" -"iPhone","iPhone" -"image_id is required","image_id is required" -"not set","not set" -"required","required" -"save","bewaar" -"ver. %s","ver. %s" diff --git a/app/locale/nl_NL/Phoenix_Moneybookers.csv b/app/locale/nl_NL/Phoenix_Moneybookers.csv deleted file mode 100644 index e1a55ebb5..000000000 --- a/app/locale/nl_NL/Phoenix_Moneybookers.csv +++ /dev/null @@ -1,42 +0,0 @@ -"All Credit Cards / Visa, Mastercard, AMEX, JCB, Diners (powered by Moneybookers) - International","Alle Credit Cards / Visa, Mastercard, AMEX, JCB, Diners (mogelijk gemaakt door Moneybookers) - Internationaal" -"CartaSi (powered by Moneybookers) - Italy","CartaSi (mogelijk gemaakt door Moneybookers) - Italië" -"Carte Bleue (powered by Moneybookers) - France","Carte Bleue (mogelijk gemaakt door Moneybookers) - Frankrijk" -"Customer ID","Klant ID" -"Dankort (powered by Moneybookers) - Denmark","Dankort (mogelijk gemaakt door Moneybookers) - Denemarken" -"EPS Online-Überweisung (powered by Moneybookers) - Austria","EPS Online-Überweisung (mogelijk gemaakt door Moneybookers) - Oostenrijk" -"Enabled","Aan" -"Find out more about Online Bank Transfer","Meer over Online Bank Transfer" -"Giropay (powered by Moneybookers) - Germany","Giropay (mogelijk gemaakt door Moneybookers) - Duitsland" -"Laser (powered by Moneybookers) - Ireland","Laser (mogelijk gemaakt door Moneybookers) - Ierland" -"Lastschrift (ELV) (powered by Moneybookers) - Germany","Lastschrift (ELV) (mogelijk gemaakt door Moneybookers) - Duitsland" -"Loading secure payment page (SSL)","Beveiligde betalingspagina wordt geladen (SSL)" -"Maestro (powered by Moneybookers) - United Kingdom, Austria, Spain","Maestro (mogelijk gemaakt door Moneybookers) - Verenigd Koninkrijk, Oostenrijk, Spanje" -"Moneybookers","Moneybookers" -"Moneybookers Settings","Moneybookers Instellingen" -"Moneybookers Transaction ID: %s","Moneybookers Transactie Identificatie: %s" -"Moneybookers eWallet","Moneybookers ePortemonnee" -"More information about Moneybookers","Meer informatie over Moneybookers" -"Nordea Solo (powered by Moneybookers) - Finland","Nordea Solo (mogelijk gemaakt door Moneybookers) - Finland" -"Nordea Solo (powered by Moneybookers) - Sweden","Nordea Solo (mogelijk gemaakt door Moneybookers) - Zweden" -"Online Bank Transfer (powered by Moneybookers)","Online Bank Tranfer (mogelijk gemaakt door Moneybookers)" -"Order ID","ID Bestelling" -"POLi (powered by Moneybookers) - Australia","POLi (mogelijk gemaakt door Moneybookers) - Australië" -"Payment failed.","Betaling mislukt." -"Payment from Applicable Countries","Betaling van Geëigende Landen" -"Payment from Specific Countries","Betaling van Specifieke Landen" -"Payment has not been processed yet.","Betaling is nog niet verwerkt." -"Payment was canceled.","Betaling is geannuleerd." -"Pending bank transfer created.","Nog onbesliste bankoverschrijving aangemaakt." -"Please pay your order now","Betaal nu a.u.b. uw bestelling" -"Postepay (powered by Moneybookers) - Italy","Postepay (mogelijk gemaakt door Moneybookers) - Italië" -"Powered by Moneybookers","Aangedreven door Moneybookers" -"Przelewy24 (powered by Moneybookers) - Poland","Przelewy24 (mogelijk gemaakt door Moneybookers) - Polen" -"Sofortüberweisung (powered by Moneybookers) - Germany","Sofortüberweisung (mogelijk gemaakt door Moneybookers) - Duitsland" -"Sort Order","Sorteer Bestelling" -"The amount has been authorized and captured by Moneybookers.","Het bedrag is geautoriseerd en aangenomen door Moneybookers." -"The customer was redirected to Moneybookers.","De klant is teruggestuurd naar Moneybookers." -"The order has been canceled.","De bestelling is geannuleerd." -"Title","Titel" -"You will be redirected to our secure payment page when you place an order.","U zult naar onze beveiligde betalingspagina worden gestuurd zodra u een bestelling heeft geplaatst." -"eNETS (powered by Moneybookers) - Singapore","eNETS (mogelijk gemaakt door Moneybookers) - Singapore" -"iDeal (powered by Moneybookers) - Netherlands","iDEAL (mogelijk gemaakt door Moneybookers) - Nederland" diff --git a/app/locale/nl_NL/template/email/account_new.html b/app/locale/nl_NL/template/email/account_new.html deleted file mode 100644 index c2009237e..000000000 --- a/app/locale/nl_NL/template/email/account_new.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}}
    -

    Beste {{htmlescape var=$customer.name}},

    -

    Welkom bij {{var store.getFrontendName()}}. Om in te loggen op onze website, klikt u op Inloggen of Mijn account boven aan de pagina en voert u vervolgens uw e-mailadres en wachtwoord in.

    -

    - Gebruik de volgende waarden om in te loggen:
    - E-mail: {{var customer.email}}
    - Wachtwoord: {{htmlescape var=$customer.password}}

    -

    Wanneer u inlogt op uw account, kunt u:

    -
      -
    • – sneller betalen bij het plaatsen van een bestelling
      • -
    • – de status van uw bestellingen controleren
      • -
    • – eerdere bestellingen bekijken
      • -
    • – uw account-informatie wijzigen
      • -
    • – uw wachtwoord wijzigen
      • -
    • – meerdere adressen opslaan (voor verzendingen naar meerdere familieleden en vrienden!)
      • -
    -

    Als u vragen hebt over uw account of andere zaken, kunt u contact met ons opnemen at {{config path='trans_email/ident_support/email'}} of per telefoon op {{config path='general/store_information/phone'}}.

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/account_new_confirmation.html b/app/locale/nl_NL/template/email/account_new_confirmation.html deleted file mode 100644 index a40b594e8..000000000 --- a/app/locale/nl_NL/template/email/account_new_confirmation.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Beste {{htmlescape var=$customer.name}},

    -

    Uw e-mail {{var customer.email}} moet bevestigd worden, voordat u deze kunt gebruiken om in te loggen bij onze winkel.

    -

    Gebruik deze bevestigingslink. om de e-mail te bevestigen en gelijk in te loggen. Deze link is maar één keer geldig.

    -

    - Gebruik de volgende waarden om in te loggen:
    - E-mail: {{var customer.email}}
    - Wachtwoord: {{htmlescape var=$customer.password}}

    -

    Als u vragen hebt over uw account of andere zaken, kunt u contact met ons opnemen at {{config path='trans_email/ident_support/email'}} of per telefoon op {{config path='general/store_information/phone'}}.

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/account_new_confirmed.html b/app/locale/nl_NL/template/email/account_new_confirmed.html deleted file mode 100644 index b930aa076..000000000 --- a/app/locale/nl_NL/template/email/account_new_confirmed.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Beste {{htmlescape var=$customer.name}},

    -

    Welkom bij Demo-winkel. Om in te loggen op onze website, klikt u op Inloggen of Mijn account boven aan de pagina en voert u vervolgens uw e-mailadres en wachtwoord in.

    -

    Wanneer u inlogt op uw account, kunt u:

    -
      -
    • – sneller betalen bij het plaatsen van een bestelling
      • -
    • – de status van uw bestellingen controleren
      • -
    • – eerdere bestellingen bekijken
      • -
    • – uw account-informatie wijzigen
      • -
    • – uw wachtwoord wijzigen
      • -
    • – meerdere adressen opslaan (voor verzendingen naar meerdere familieleden en vrienden!)
      • -
    -

    Als u vragen hebt over uw account of andere zaken, kunt u contact met ons opnemen at {{config path='trans_email/ident_support/email'}} of per telefoon op {{config path='general/store_information/phone'}}.

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/account_password_reset_confirmation.html b/app/locale/nl_NL/template/email/account_password_reset_confirmation.html deleted file mode 100644 index 3a39a8884..000000000 --- a/app/locale/nl_NL/template/email/account_password_reset_confirmation.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Beste {{htmlescape var=$customer.name}},

    -

    Er is een verzoek gemaakt tot het wijzigen van het wachtwoord voor uw account.

    -

    Als u deze wijziging heeft aangevraagd, klik dan op de volgende link om uw wachtwoord opnieuw in te stellen: {{store url="customer/account/resetpassword/" _query_id=$customer.id _query_token=$customer.rp_token}}

    -

    Als klikken op deze link niet werkt, kopieer dan de URL en plak deze in de adresbalk van uw browser.

    -
    -

    Mocht u geen wijziging hebben aangevraagd, dan kunt u dit bericht als niet verzonden beschouwen en blijft uw wachtwoord onveranderd.

    -

    Dank u wel, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/nl_NL/template/email/admin_password_new.html b/app/locale/nl_NL/template/email/admin_password_new.html deleted file mode 100644 index a0fc679a2..000000000 --- a/app/locale/nl_NL/template/email/admin_password_new.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Beste {{htmlescape var=$user.name}},

    -

    Uw nieuwe wachtwoord is: {{htmlescape var=$password}}

    -

    U kunt uw wachtwoord wijzigen door in te loggen op uw account.

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/admin_password_reset_confirmation.html b/app/locale/nl_NL/template/email/admin_password_reset_confirmation.html deleted file mode 100644 index bf729d2f6..000000000 --- a/app/locale/nl_NL/template/email/admin_password_reset_confirmation.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Geachte {{htmlescape var=$user.name}},

    -

    Er is een verzoek gemaakt tot het wijzigen van het wachtwoord voor uw account.

    -

    Als u deze wijziging heeft aangevraagd, klik dan op de volgende link om uw wachtwoord opnieuw in te stellen: {{store url="adminhtml/index/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}

    -

    Als klikken op deze link niet werkt, kopieer dan de URL en plak deze in de adresbalk van uw browser.

    -
    -

    Mocht u geen wijziging hebben aangevraagd, dan kunt u dit bericht als niet verzonden beschouwen en blijft uw wachtwoord onveranderd.

    -

    Dank u wel, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/nl_NL/template/email/amazonpayments_asp_notification_error.html b/app/locale/nl_NL/template/email/amazonpayments_asp_notification_error.html deleted file mode 100644 index 9b19ada4a..000000000 --- a/app/locale/nl_NL/template/email/amazonpayments_asp_notification_error.html +++ /dev/null @@ -1,12 +0,0 @@ - - -
    -
    __('Amazon Simple Pay notification message')__
    -
    __('Request')__:
    -
    {{var request}}
    -
    __('Error')__:
    -
    {{var error}}
    -
    \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/contact_form.html b/app/locale/nl_NL/template/email/contact_form.html deleted file mode 100644 index 996ef3fb3..000000000 --- a/app/locale/nl_NL/template/email/contact_form.html +++ /dev/null @@ -1,12 +0,0 @@ - - -Naam: {{var data.name}} -E-mail: {{var data.email}} -Telefoon: {{var data.telephone}} - -Opmerking: {{var data.comment}} \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/currency_update_warning.html b/app/locale/nl_NL/template/email/currency_update_warning.html deleted file mode 100644 index 399f57640..000000000 --- a/app/locale/nl_NL/template/email/currency_update_warning.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Notificatie koerswijziging: - - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/log_clean_warning.html b/app/locale/nl_NL/template/email/log_clean_warning.html deleted file mode 100644 index 28c7fcbcf..000000000 --- a/app/locale/nl_NL/template/email/log_clean_warning.html +++ /dev/null @@ -1,7 +0,0 @@ - - -Notificatie register opschonen: - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/moneybookers_activateemail.html b/app/locale/nl_NL/template/email/moneybookers_activateemail.html deleted file mode 100644 index 5b32bd3ab..000000000 --- a/app/locale/nl_NL/template/email/moneybookers_activateemail.html +++ /dev/null @@ -1,6 +0,0 @@ - -{{var store.getFrontendName()}}
    -Het e-mailadres van Moneybooker : {{var email_addr}}
    -Het klant ID van Moneybooker: {{var customer_id}}
    -URL: {{var url}}
    -Taal: {{var language}}
    diff --git a/app/locale/nl_NL/template/email/newsletter_subscr_confirm.html b/app/locale/nl_NL/template/email/newsletter_subscr_confirm.html deleted file mode 100644 index 9b5ecf0d8..000000000 --- a/app/locale/nl_NL/template/email/newsletter_subscr_confirm.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Dank u wel voor het aanmelden bij onze nieuwsbrief.

    -

    Om de nieuwsbrief te ontvangen, moet u eerst uw aanmelding bevestigen door op de volgende link te klikken:
    - {{var subscriber.getConfirmationLink()}}

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/newsletter_subscr_success.html b/app/locale/nl_NL/template/email/newsletter_subscr_success.html deleted file mode 100644 index 1bdb1906d..000000000 --- a/app/locale/nl_NL/template/email/newsletter_subscr_success.html +++ /dev/null @@ -1,2 +0,0 @@ - -Aanmelden bij nieuwsbrief geslaagd \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/newsletter_unsub_success.html b/app/locale/nl_NL/template/email/newsletter_unsub_success.html deleted file mode 100644 index a67d34cc4..000000000 --- a/app/locale/nl_NL/template/email/newsletter_unsub_success.html +++ /dev/null @@ -1,2 +0,0 @@ - -Afmelden bij nieuwsbrief geslaagd \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/password_new.html b/app/locale/nl_NL/template/email/password_new.html deleted file mode 100644 index 0fb4d9212..000000000 --- a/app/locale/nl_NL/template/email/password_new.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Beste {{htmlescape var=$customer.name}},

    -

    Uw nieuwe wachtwoord is: {{htmlescape var=$customer.password}}

    -

    U kunt uw wachtwoord wijzigen door in te loggen op uw account.

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/nl_NL/template/email/payment_failed.html b/app/locale/nl_NL/template/email/payment_failed.html deleted file mode 100644 index 3ee57b2aa..000000000 --- a/app/locale/nl_NL/template/email/payment_failed.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - -
    Betaling is mislukt.
    -

    - Reden
    - {{var reason}} -

    -

    - Type checkout
    - {{var checkoutType}} -

    -

    - Klant:
    - {{var customer}} <{{var customerEmail}}> -

    -

    - Artikelen
    - {{var items}} -

    -

    - Totaal:
    - {{var total}} -

    -

    - Betaaladres:
    - {{var billingAddress.format('html')}} -

    -

    - Verzendadres:
    - {{var shippingAddress.format('html')}} -

    -

    - Verzendmethode:
    - {{var shippingMethod}} -

    -

    - Betaalmethode:
    - {{var paymentMethod}} -

    -

    - Datum en tijd:
    - {{var dateAndTime}} -

    -
    \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/product_alert_cron_error.html b/app/locale/nl_NL/template/email/product_alert_cron_error.html deleted file mode 100644 index 6100bebec..000000000 --- a/app/locale/nl_NL/template/email/product_alert_cron_error.html +++ /dev/null @@ -1,7 +0,0 @@ - - -Notificatie cron productsignaleringen: - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/product_price_alert.html b/app/locale/nl_NL/template/email/product_price_alert.html deleted file mode 100644 index 2ec9da972..000000000 --- a/app/locale/nl_NL/template/email/product_price_alert.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Hallo {{var customerName}}, - -{{var alertGrid}} \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/product_share.html b/app/locale/nl_NL/template/email/product_share.html deleted file mode 100644 index 6e79009f7..000000000 --- a/app/locale/nl_NL/template/email/product_share.html +++ /dev/null @@ -1,13 +0,0 @@ - - - -Welkom, {{htmlescape var=$name}}

    Kijk op {{var product_name}}

    Hier is bericht:
    {{var message}}

    \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/product_stock_alert.html b/app/locale/nl_NL/template/email/product_stock_alert.html deleted file mode 100644 index adb67adb6..000000000 --- a/app/locale/nl_NL/template/email/product_stock_alert.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Hallo {{var customerName}}, - -{{var alertGrid}} \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/creditmemo_new.html b/app/locale/nl_NL/template/email/sales/creditmemo_new.html deleted file mode 100644 index 693c595e4..000000000 --- a/app/locale/nl_NL/template/email/sales/creditmemo_new.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo {{htmlescape var=$order.getCustomerName()}}

    -

    - Bedankt voor uw bestelling bij {{var store.getFrontendName()}}. - U kunt de status van uw bestelling volgen door in te loggen op uw account. - Als u vragen hebt over uw bestelling, kunt u contact met ons opnemen via {{config path='trans_email/ident_support/email'}} of per telefoon op {{config path='general/store_information/phone'}} maandag - vrijdag, van 08:00 - 17:00 uur (PST - Pacific Standard Time). -

    -
    -

    Uw creditmemo #{{var creditmemo.increment_id}} voor bestelling #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Betaalinformatie:Betaalmethode:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Verzendinformatie:Verzendmethode:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} -

    {{var comment}}

    -

    Dank u wel, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/creditmemo_new_guest.html b/app/locale/nl_NL/template/email/sales/creditmemo_new_guest.html deleted file mode 100644 index d1dec1dfe..000000000 --- a/app/locale/nl_NL/template/email/sales/creditmemo_new_guest.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo {{htmlescape var=$billing.getName()}}

    -

    - Bedankt voor uw bestelling bij {{var store.getFrontendName()}}. - Als u vragen hebt over uw bestelling, kunt u contact met ons opnemen via {{config path='trans_email/ident_support/email'}} of per telefoon op {{config path='general/store_information/phone'}} maandag - vrijdag, van 08:00 - 17:00 uur (PST - Pacific Standard Time). -

    -
    -

    Uw creditmemo #{{var creditmemo.increment_id}} voor bestelling #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Betaalinformatie:Betaalmethode:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Verzendinformatie:Verzendmethode:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} -

    {{var comment}}

    -

    Dank u wel, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/creditmemo_update.html b/app/locale/nl_NL/template/email/sales/creditmemo_update.html deleted file mode 100644 index 8bf7e45e8..000000000 --- a/app/locale/nl_NL/template/email/sales/creditmemo_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Beste {{htmlescape var=$order.getCustomerName()}},

    -

    - Uw bestelling # {{var order.increment_id}} is
    - {{var order.getStatusLabel()}}. -

    -

    U kunt de status van uw bestelling volgen door in te loggen op uw account.

    -

    {{var comment}}

    -

    - Als u vragen hebt, kunt u contact met ons opnemen via - {{config path='trans_email/ident_support/email'}} - of per telefoon op {{config path='general/store_information/phone'}}. -

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/creditmemo_update_guest.html b/app/locale/nl_NL/template/email/sales/creditmemo_update_guest.html deleted file mode 100644 index ddcf389c1..000000000 --- a/app/locale/nl_NL/template/email/sales/creditmemo_update_guest.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Beste {{htmlescape var=$billing.getName()}},

    -

    - Uw bestelling # {{var order.increment_id}} is
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Als u vragen hebt, kunt u contact met ons opnemen via - {{config path='trans_email/ident_support/email'}} - of per telefoon op {{config path='general/store_information/phone'}}. -

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/invoice_new.html b/app/locale/nl_NL/template/email/sales/invoice_new.html deleted file mode 100644 index 327dd9773..000000000 --- a/app/locale/nl_NL/template/email/sales/invoice_new.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo {{htmlescape var=$order.getCustomerName()}}

    -

    - Bedankt voor uw bestelling bij {{var store.getFrontendName()}}. - U kunt de status van uw bestelling volgen door in te loggen op uw account. - Als u vragen hebt over uw bestelling, kunt u contact met ons opnemen via {{config path='trans_email/ident_support/email'}} of per telefoon op {{config path='general/store_information/phone'}} maandag - vrijdag, van 08:00 - 17:00 uur (PST - Pacific Standard Time). -

    -
    -

    Uw factuur #{{var invoice.increment_id}} voor bestelling #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Betaalinformatie:Betaalmethode:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Verzendinformatie:Verzendmethode:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}}  -
    -
    - {{/depend}} - {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} -

    {{var comment}}

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/invoice_new_guest.html b/app/locale/nl_NL/template/email/sales/invoice_new_guest.html deleted file mode 100644 index 74b902198..000000000 --- a/app/locale/nl_NL/template/email/sales/invoice_new_guest.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo {{htmlescape var=$billing.getName()}}

    -

    - Bedankt voor uw bestelling bij {{var store.getFrontendName()}}. - Als u vragen hebt over uw bestelling, kunt u contact met ons opnemen via {{config path='trans_email/ident_support/email'}} of per telefoon op {{config path='general/store_information/phone'}} maandag - vrijdag, van 08:00 - 17:00 uur (PST - Pacific Standard Time). -

    -
    -

    Uw factuur #{{var invoice.increment_id}} voor bestelling #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Betaalinformatie:Betaalmethode:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Verzendinformatie:Verzendmethode:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} -

    {{var comment}}

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/invoice_update.html b/app/locale/nl_NL/template/email/sales/invoice_update.html deleted file mode 100644 index 87e804801..000000000 --- a/app/locale/nl_NL/template/email/sales/invoice_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Beste {{htmlescape var=$order.getCustomerName()}},

    -

    - Uw bestelling # {{var order.increment_id}} is
    - {{var order.getStatusLabel()}}. -

    -

    U kunt de status van uw bestelling volgen door in te loggen op uw account.

    -

    {{var comment}}

    -

    - Als u vragen hebt, kunt u contact met ons opnemen via - {{config path='trans_email/ident_support/email'}} - of per telefoon op {{config path='general/store_information/phone'}}. -

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/invoice_update_guest.html b/app/locale/nl_NL/template/email/sales/invoice_update_guest.html deleted file mode 100644 index 649fcb2ad..000000000 --- a/app/locale/nl_NL/template/email/sales/invoice_update_guest.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Beste {{htmlescape var=$billing.getName()}},

    -

    - __('Your order # {{var order.increment_id}} has been')__
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Als u vragen hebt, kunt u contact met ons opnemen via - {{config path='trans_email/ident_support/email'}} - of per telefoon op {{config path='general/store_information/phone'}}. -

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/order_new.html b/app/locale/nl_NL/template/email/sales/order_new.html deleted file mode 100644 index db852e864..000000000 --- a/app/locale/nl_NL/template/email/sales/order_new.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo {{htmlescape var=$order.getCustomerName()}}

    -

    - Bedankt voor uw bestelling bij {{var store.getFrontendName()}}. - Zodra uw pakket is verzonden, sturen we u een e-mail met een link waarmee u uw bestelling kunt volgen. - U kunt de status van uw bestelling volgen door in te loggen op uw account. - Als u vragen hebt over uw bestelling, kunt u contact met ons opnemen via {{config path='trans_email/ident_support/email'}} of per telefoon op {{config path='general/store_information/phone'}} maandag - vrijdag, van 08:00 - 17:00 uur (PST - Pacific Standard Time). -

    -

    Zie hieronder voor uw bestelbevestiging. Nogmaals bedankt voor uw aankoop.

    -
    -

    Uw bestelling #{{var order.increment_id}} (geplaatst op {{var order.getCreatedAtFormated('long')}})

    -
    - - - - - - - - - - - - - - - -
    Betaalinformatie:Betaalmethode:
    - {{var order.getBillingAddress().format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Verzendinformatie:Verzendmethode:
    - {{var order.getShippingAddress().format('html')}} -   -   - {{var order.getShippingDescription()}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_items" order=$order}} -

    {{var order.getEmailCustomerNote()}}

    -

    Dank u wel, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/order_new_guest.html b/app/locale/nl_NL/template/email/sales/order_new_guest.html deleted file mode 100644 index e24a307ac..000000000 --- a/app/locale/nl_NL/template/email/sales/order_new_guest.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo {{htmlescape var=$order.getBillingAddress().getName()}}

    -

    - Bedankt voor uw bestelling bij {{var store.getFrontendName()}}. - Zodra uw pakket is verzonden, sturen we u een e-mail met een link waarmee u uw bestelling kunt volgen. - Als u vragen hebt over uw bestelling, kunt u contact met ons opnemen via {{config path='trans_email/ident_support/email'}} of per telefoon op {{config path='general/store_information/phone'}} maandag - vrijdag, van 08:00 - 17:00 uur (PST - Pacific Standard Time). -

    -

    Zie hieronder voor uw bestelbevestiging. Nogmaals bedankt voor uw aankoop.

    -
    -

    Uw bestelling #{{var order.increment_id}} (geplaatst op {{var order.getCreatedAtFormated('long')}})

    -
    - - - - - - - - - - - - - - - -
    Betaalinformatie:Betaalmethode:
    - {{var order.getBillingAddress().format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Verzendinformatie:Verzendmethode:
    - {{var order.getShippingAddress().format('html')}} -   -   - {{var order.getShippingDescription()}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_items" order=$order}} -

    {{var order.getEmailCustomerNote()}}

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/order_update.html b/app/locale/nl_NL/template/email/sales/order_update.html deleted file mode 100644 index 8f189182a..000000000 --- a/app/locale/nl_NL/template/email/sales/order_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Beste {{htmlescape var=$order.getCustomerName()}},

    -

    - Uw bestelling # {{var order.increment_id}} is
    - {{var order.getStatusLabel()}}. -

    -

    U kunt de status van uw bestelling volgen door in te loggen op uw account.

    -

    {{var comment}}

    -

    - Als u vragen hebt, kunt u contact met ons opnemen via - {{config path='trans_email/ident_support/email'}} - of per telefoon op {{config path='general/store_information/phone'}}. -

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/order_update_guest.html b/app/locale/nl_NL/template/email/sales/order_update_guest.html deleted file mode 100644 index 150e8f40f..000000000 --- a/app/locale/nl_NL/template/email/sales/order_update_guest.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Beste {{htmlescape var=$billing.getName()}},

    -

    - Uw bestelling # {{var order.increment_id}} is
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Als u vragen hebt, kunt u contact met ons opnemen via - {{config path='trans_email/ident_support/email'}} - of per telefoon op {{config path='general/store_information/phone'}}. -

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/shipment_new.html b/app/locale/nl_NL/template/email/sales/shipment_new.html deleted file mode 100644 index 85ddc0a79..000000000 --- a/app/locale/nl_NL/template/email/sales/shipment_new.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo {{htmlescape var=$order.getCustomerName()}}

    -

    - Bedankt voor uw bestelling bij {{var store.getFrontendName()}}. - U kunt de status van uw bestelling volgen door in te loggen op uw account. - Als u vragen hebt over uw bestelling, kunt u contact met ons opnemen via {{config path='trans_email/ident_support/email'}} of per telefoon op {{config path='general/store_information/phone'}} maandag - vrijdag, van 08:00 - 17:00 uur (PST - Pacific Standard Time). -

    -

    - Zie hieronder voor uw verzendbevestiging. Nogmaals bedankt voor uw aankoop. -

    -
    -

    Uw verzending #{{var shipment.increment_id}} voor bestelling #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Betaalinformatie:Betaalmethode:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - - - - - - - - - - - - - - - -
    Verzendinformatie:Verzendmethode:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -

    {{var comment}}

    -

    Dank u wel, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/shipment_new_guest.html b/app/locale/nl_NL/template/email/sales/shipment_new_guest.html deleted file mode 100644 index 1a8be9195..000000000 --- a/app/locale/nl_NL/template/email/sales/shipment_new_guest.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Hallo {{htmlescape var=$billing.getName()}}

    -

    - Bedankt voor uw bestelling bij {{var store.getFrontendName()}}. - Als u vragen hebt over uw bestelling, kunt u contact met ons opnemen via {{config path='trans_email/ident_support/email'}} of per telefoon op {{config path='general/store_information/phone'}} maandag - vrijdag, van 08:00 - 17:00 uur (PST - Pacific Standard Time). -

    -

    - Zie hieronder voor uw verzendbevestiging. Nogmaals bedankt voor uw aankoop. -

    -
    -

    Uw verzending #{{var shipment.increment_id}} voor bestelling #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Betaalinformatie:Betaalmethode:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - - - - - - - - - - - - - - - -
    Verzendinformatie:Verzendmethode:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -

    {{var comment}}

    -

    Dank u wel, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/shipment_update.html b/app/locale/nl_NL/template/email/sales/shipment_update.html deleted file mode 100644 index e73c45619..000000000 --- a/app/locale/nl_NL/template/email/sales/shipment_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Beste {{htmlescape var=$order.getCustomerName()}},

    -

    - Uw bestelling # {{var order.increment_id}} is
    - {{var order.getStatusLabel()}}. -

    -

    U kunt de status van uw bestelling volgen door in te loggen op uw account.

    -

    {{var comment}}

    -

    - Als u vragen hebt, kunt u contact met ons opnemen via - {{config path='trans_email/ident_support/email'}} - of per telefoon op {{config path='general/store_information/phone'}}. -

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sales/shipment_update_guest.html b/app/locale/nl_NL/template/email/sales/shipment_update_guest.html deleted file mode 100644 index 2aba977af..000000000 --- a/app/locale/nl_NL/template/email/sales/shipment_update_guest.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Beste {{htmlescape var=$billing.getName()}},

    -

    - Uw bestelling # {{var order.increment_id}} is
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Als u vragen hebt, kunt u contact met ons opnemen via - {{config path='trans_email/ident_support/email'}} - of per telefoon op {{config path='general/store_information/phone'}}. -

    -

    Nogmaals bedankt, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/sitemap_generate_warning.html b/app/locale/nl_NL/template/email/sitemap_generate_warning.html deleted file mode 100644 index 11f34c5ca..000000000 --- a/app/locale/nl_NL/template/email/sitemap_generate_warning.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Notificatie sitemap maken: - - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/nl_NL/template/email/token.html b/app/locale/nl_NL/template/email/token.html deleted file mode 100644 index be98bb712..000000000 --- a/app/locale/nl_NL/template/email/token.html +++ /dev/null @@ -1,9 +0,0 @@ - - - -Hallo, {{htmlescape var=$userName}}

    -Uw toestemming voor {{htmlescape var=$applicationName}} is gewijzigd in {{htmlescape var=$status}} door het Admin team.

    diff --git a/app/locale/nl_NL/template/email/wishlist_share.html b/app/locale/nl_NL/template/email/wishlist_share.html deleted file mode 100644 index 550607d13..000000000 --- a/app/locale/nl_NL/template/email/wishlist_share.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Hé,
    Neem een kijkje bij mijn verlanglijst voor Demo-winkel.

    -

    {{var message}}

    - {{var items}} -
    - {{depend salable}}

    Voeg alle artikelen toe aan uw winkelwagen |{{/depend}} Alle verlanglijstartikelen bekijken

    -

    Dank u wel, {{htmlescape var=$customer.name}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/Mage_AdminNotification.csv b/app/locale/pt_BR/Mage_AdminNotification.csv deleted file mode 100644 index 1b40e3964..000000000 --- a/app/locale/pt_BR/Mage_AdminNotification.csv +++ /dev/null @@ -1,31 +0,0 @@ -"Actions","Ações" -"An error occurred while marking notification as read.","Ocorreu um erro ao marcar a notificação como lida." -"An error occurred while marking the messages as read.","Ocorreu um erro ao marcar as mensagens como lidas." -"An error occurred while removing messages.","Ocorreu um erro ao remover mensagens." -"An error occurred while removing the message.","Ocorreu um erro ao remover a mensagem." -"Are you sure?","Tem certeza?" -"Date Added","Data de Adição" -"Last Update","Última Atualização" -"Mark as Read","Marcar como Lida" -"Mark as read","Marcar como lida" -"Message","Mensagem" -"Messages Inbox","Caixa de Entrada de Mensagens" -"Notifications","Notificações" -"Please select messages.","Selecione mensagens." -"Read Details","Ler detalhes" -"Remove","Remover" -"Severity","Rigor" -"Show List","Mostrar Lista" -"Show Toolbar","Mostrar Barra de Ferramentas" -"The message has been marked as read.","A mensagem foi marcada como lida." -"The message has been removed.","A mensagem foi removida." -"Total of %d record(s) have been marked as read.","Foi(Foram) marcado(s) ao todo %d registro(s) como lido(s)." -"Total of %d record(s) have been removed.","Foi(Foram) removido(s) ao todo %d registro(s)." -"Unable to proceed. Please, try again.","Impossível prosseguir. Tente novamente." -"Update Frequency","Atualizar Frequência" -"Use HTTPS to Get Feed","Use HTTPS para Obter Comentários" -"Wrong message type","Tipo incorreto de mensagem" -"critical","crítico" -"major","maior" -"minor","menor" -"notice","aviso" diff --git a/app/locale/pt_BR/Mage_Adminhtml.csv b/app/locale/pt_BR/Mage_Adminhtml.csv deleted file mode 100644 index b4327b6c3..000000000 --- a/app/locale/pt_BR/Mage_Adminhtml.csv +++ /dev/null @@ -1,1215 +0,0 @@ -" The customer does not exist in the system anymore.","O cliente não existe mais no sistema." -" [deleted]"," [suprimido]" -" and "," e " -"%s (Default Template from Locale)","%s (Modelo Padrão de Locale)" -"%s cache type(s) disabled.","%s tipo(s) cache com deficiência." -"%s cache type(s) enabled.","%s tipo(s) cache habilitado." -"%s cache type(s) refreshed.","%s tipo(s) cache atualizado." -"(For Type ""Local Server"" need to use relative path to Magento install var/export or var/import, e.g. var/export, var/import, var/export/some/dir, var/import/some/dir)","(Para Tipo ""Servidor Local"" necessário utilizar caminho relativo para instalar Magento var/export ou var/import, por exemplo var/export, var/import, var/export/some/dir, var/import/some/dir)" -"(For US 2-letter state names)","(Para EUA nomes de 2 letras de estados)" -"(If left empty will be auto-generated)","(Se deixado vazio será gerado automaticamente)" -"(Leave empty for first spreadsheet)","(Deixe em branco para primeira folha de cálculo)" -"(Products will be added/updated to this store if 'store' column is blank or missing in the import file.)","(Os produtos serão adicionados/atualizados a esta loja, se a coluna 'loja' estiver em branco ou ausente no arquivo de importação.)" -"(Shift-)Click or drag to change value","(Shift-)Clique ou arraste para mudar o valor" -"(Starting with)","(Começando com)" -"(When 'No', only mapped fields will be imported. When mapping, use 'column1', 'column2', etc.)","(Quando 'Não', apenas campos mapeados serão importados. Quando mapeando, use 'coluna1', 'coluna2', etc.)" -"(You have to increase php memory_limit before changing this value)","(Você tem que aumentar o memory_limit php antes de alterar este valor)" -"(\\t for tab)","(\\t para tabulação)" -"* - If indexing is in progress, it will be killed and new indexing process will start.","* - Se a indexação está em andamento, será morta e novo processo de indexação vai começar." -"* Required Fields","* Campos obrigatórios" -"- Click on any of the time parts to increase it","- Clique em qualquer uma das partes da hora para a aumentar" -"- Hold mouse button on any of the above buttons for faster selection.","- Segure o botão do rato sobre qualquer um dos botões acima para selecionar rapidamente." -"- Use the %s buttons to select month","- Use os botões %s para selecionar o mês" -"- Use the %s, %s buttons to select year","- Use os botões %s, %s para selecionar o ano" -"- or Shift-click to decrease it","- Ou clique-Shift para diminuir" -"- or click and drag for faster selection.","- ou clique e arraste para uma seleção mais rápida." -"-- Not Selected --","-- Não selecionado --" -"-- Please Select --","- Por Favor Selecione -" -"-- Please Select Billing Agreement--","-- Por Favor, Escolha o Acordo de Cobrança--" -"-- Please Select a Category --","-- Por Favor, Escolha uma Categoria --" -"-- Please select --","-- Selecione --" -"--Please Select--","--Por Favor, Escolha--" -"1 Hour","1 Hora" -"12 Hours","12 Horas" -"12h AM/PM","12h/00h" -"2 Hours","2 Horas" -"24 Hours","24 Horas" -"24h","24h" -"2YTD","2YTD" -"6 Hours","6 Horas" -"

    404 Error

    Page not found.

    ","

    Erro 404

    Página não encontrada.

    " -"%s requests access to your account","%s requests access to your account" -"Attention: Captcha is case sensitive.","Attention: Captcha diferencia maiúsculas e minúsculas." -"A user with the same user name or email aleady exists.","Já existe um usuário com o mesmo nome ou e-mail." -"API Key","Chave API" -"API Key Confirmation","Confirmação de Chave API" -"ASCII","ASCII" -"Abandoned Carts","Carrinhos de Compras Abandonados" -"About the calendar","Sobre o calendário" -"Access Denied","Acesso negado" -"Access denied","Acesso negado" -"Access denied.","Acesso negado." -"Account Created in:","Conta criada em:" -"Account Created on (%s):","Conta criada em (%s):" -"Account Created on:","Conta criada em:" -"Account Information","Informações da Conta" -"Account Status","Status da conta" -"Account status","Status da conta" -"Action","Ação" -"Actions","Ações" -"Actions XML","Ações XML" -"Active","Ativo" -"Add","Adicionar" -"Add Exception","Adicionar exceção" -"Add Field Mapping","Adicionar mapeamento de campo" -"Add Field with URL:","Adicionar campo com o URL:" -"Add New","Adicione Novo" -"Add New Image","Adicionar nova imagem" -"Add New Profile","Adicionar novo perfil" -"Add New Role","Adicionar nova função" -"Add New Template","Adicionar novo modelo" -"Add New URL Rewrite","Adicionar Novo Rewrite de URL" -"Add New User","Adicionar Novo Usuário" -"Add New Variable","Adicionar Nova Variável" -"Add Products","Adicionar produtos" -"Add URL Rewrite","Adicionar Rewrite de URL" -"Add URL Rewrite for a Category","Adicionar Rewrite de URL para uma Categoria" -"Add URL Rewrite for a Product","Adicionar Rewrite de URL para um Produto" -"Add after","Adicionar depois" -"Additional Cache Management","Gerenciamento de Cache Adicional" -"Address Type:","Tipo de Endereço:" -"Admin","Admin" -"Advanced Admin Section","Seção de Administrador Avançado" -"Advanced Profiles","Perfis Avançados" -"Advanced Section","Seção Avançada" -"After authorization application will have access to you account.","After authorization application will have access to you account." -"All","Todos" -"All Allowed Countries","Todos os Países Permitidos" -"All Cache","Todo o Cache" -"All Files","Todos os Arquivos" -"All Reviews","Todas as Revisões" -"All Store Views","Todas as Visualizações da Loja" -"All Tags","Todas as Tags" -"All Websites","Todos os sites" -"All countries","Todos os países" -"All fields","Todos os campos" -"All possible rates were fetched, please click on ""Save"" to apply","Todas as tarifas possíveis foram obtidas, por favor clique em ""Salvar"" para aplicar" -"All rates were fetched, please click on ""Save"" to apply","Todas as tarifas foram obtidas, por favor clique em ""Salvar"" para aplicar" -"All valid rates have been saved.","Todas as tarifas válidas foram salvas." -"Always (during development)","Sempre (durante desenvolvimento)" -"Amounts","Quantidades" -"An error has occured while syncronizing media storages.","Ocorreu um erro enquanto sincronizando armazenamentos de mídia." -"An error occurred while clearing the JavaScript/CSS cache.","Ocorreu um erro ao limpar a cache JavaScript/CSS." -"An error occurred while clearing the image cache.","Ocorreu um erro ao limpar a cache de imagem." -"An error occurred while deleting URL Rewrite.","Ocorreu um erro ao excluir URL Escreva novamente" -"An error occurred while deleting email template data. Please review log and try again.","Ocorreu um erro durante a exclusão de dados modelo de e-mail. Por favor analise o registro e tente novamente." -"An error occurred while deleting record(s).","Ocorreu um erro ao excluir registro(s)." -"An error occurred while deleting this role.","Ocorreu um erro ao excluir este papel." -"An error occurred while deleting this set.","Ocorreu um erro ao excluir este conjunto." -"An error occurred while deleting this template.","Ocorreu um erro ao excluir este modelo." -"An error occurred while finishing process. Please refresh the cache","Ocorreu um erro ao finalizar o processo. Por favor atualize a cache" -"An error occurred while rebuilding the CatalogInventory Stock Status.","Ocorreu um erro durante a reconstrução do Catálogo INventário do estado das unidades." -"An error occurred while rebuilding the catalog index.","Ocorreu um erro durante a reconstrução do índice do catálogo." -"An error occurred while rebuilding the flat catalog category.","Ocorreu um erro durante a reconstrução da categoria plana do catálogo." -"An error occurred while rebuilding the flat product catalog.","Ocorreu um erro durante a reconstrução do produto plano do catálogo." -"An error occurred while rebuilding the search index.","Ocorreu um erro durante a reconstrução do índice de pesquisa." -"An error occurred while refreshing the Catalog Rewrites.","Ocorreu um erro durante a atualização do Catálogo Rewrites." -"An error occurred while refreshing the Layered Navigation indices.","Ocorreu um erro durante a atualização dos índices de Navegação em Camadas." -"An error occurred while refreshing the catalog rewrites.","Ocorreu um erro durante a atualização dos reescritos do catálogo." -"An error occurred while refreshing the layered navigation indices.","Ocorreu um erro ao atualizar os índices de navegação em camadas." -"An error occurred while saving URL Rewrite.","Ocorreu um erro ao salvar URL Escreva novamente." -"An error occurred while saving account.","Ocorreu um erro ao salvar conta." -"An error occurred while saving review.","Ocorreu um erro ao salvar revisão." -"An error occurred while saving the customer.","Ocorreu um erro ao salvar o cliente." -"An error occurred while saving this configuration:","Ocorreu um erro ao salvar esta configuração:" -"An error occurred while saving this role.","Ocorreu um erro ao salvar este papel." -"An error occurred while saving this template.","Ocorreu um erro ao salvar este modelo." -"An error occurred while updating the selected review(s).","Ocorreu um erro durante a atualização da revisão selecionada." -"Any","Qualquer um" -"Any Attribute Set","Qualquer Conjunto de Atributos" -"Any Group","Qualquer Grupo" -"Any Status","Qualquer Estado" -"Any Store","Qualquer Loja" -"Any Type","Qualquer Tipo" -"Any Visibility","Qualquer Visibilidade" -"Any data created since the backup was made will be lost including admin users, customers and orders.","Qualquer dado criado desde a realização do backup será perdido, incluindo usuários admin, clientes e pedidos." -"Archive file name:","Nome do ficheiro de arquivo:" -"Are you sure that you want to delete this template?","Tem certeza de que deseja apagar este modelo?" -"Are you sure that you want to strip tags?","Tem certeza que você quer retirar tags?" -"Are you sure you want to do this?","Tem certeza de que quer fazer isso?" -"Are you sure you want to proceed?","Você tem certeza que deseja continuar?" -"Area","Área" -"As low as:","A partir de:" -"Assigned","Atribuído" -"Associated Tags","Tags associadas" -"Attribute Set Name:","Atribuir Nome de Conjunto:" -"Attributes","Atributos" -"Authorization confirmed","Authorization confirmed" -"Authorize","Authorize" -"Authorize application","Authorize application" -"Authorized OAuth Tokens","Tokens OAuth autorizados" -"Automatic (equalize price ranges)","Automático (equalizar faixas de preços)" -"Automatic (equalize product counts)","Automático (equalizar contagens de produtos)" -"Average Order Amount","Total do pedido médio" -"Average Orders","Pedido médio" -"BINARY","BINÁRIO" -"Back","Voltar" -"Back to Login","Voltar à Entrada" -"Backup","Backup" -"Backup Name","Nome do Backup" -"Backup options","Opções de backup" -"Backups","Cópias de segurança" -"Base currency","Moeda base" -"Bcc","CCO" -"Bestsellers","Mais vendidos" -"Billing Address","Endereço de faturamento" -"Billing Address: ","Endereço de faturamento:" -"Billing Agreement","Contrato de faturamento" -"Billing Agreements","Contratos de faturamento" -"Block Information","Informações de bloco" -"Both (without and with tax)","Ambos (com e sem impostos)" -"Both IPN and PDT","IPN e PDT" -"Browse Files...","Pesquisar arquivos..." -"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","O pacote com preço dinâmico não pode incluir opções personalizadas definidas. As opções não serão salvas." -"CMS","SGC" -"CRITICAL","CRÍTICO" -"CSV","CSV" -"CSV / Tab separated","CSV / Tab separados" -"Cache Control","Controle de Cache" -"Cache Control (beta)","Controle de Cache (beta)" -"Cache Management","Gerenciamento de Cache" -"Cache Type","Tipo de Cache" -"Cancel","Cancelar" -"Cannot add new comment.","Não é possível adicionar um novo comentário." -"Cannot add tracking number.","Não é possível adicionar número de rastreamento." -"Cannot create an invoice without products.","Não é possível criar uma fatura sem produtos." -"Cannot create credit memo for the order.","Não é possível criar uma nota de crédito para a ordem." -"Cannot delete the design change.","Não é possível apagar a mudança de desenho." -"Cannot delete tracking number.","Não é possível apagar o número de rastreamento." -"Cannot do shipment for the order separately from invoice.","Não é possível fazer envio para a ordem separadamente da fatura." -"Cannot do shipment for the order.","Não é possível fazer envio para a ordem." -"Cannot initialize shipment for adding tracking number.","Não é possível inicializar envio para adicionar número de rastreamento." -"Cannot initialize shipment for delete tracking number.","Não é possível inicializar envio para apagar número de rastreamento." -"Cannot load track with retrieving identifier.","Não é possível carregar pista com identificador de recuperação." -"Cannot retrieve tracking number detail.","Não é possível recuperar detalhes do número de rastreamento." -"Cannot save shipment.","Não é possível salvar envio." -"Cannot save the credit memo.","Não é possível salvar a nota de crédito." -"Cannot send shipment information.","Não é possível enviar informações de envio." -"Cannot update item quantity.","Não é possível atualizar a quantidade do item." -"Cannot update the item\'s quantity.","Não é possível atualizar a quantidade do item." -"Card Verification Number","Número de Verificação do Cartão" -"Catalog","Catálogo" -"Catalog Price Rules","Regras de Preço do Catálogo" -"Catalog Rewrites","Reescrituras de Catálogo" -"Categories","Categorias" -"Category","Categoria" -"Category:","Categoria:" -"Chart is disabled. If you want to enable chart, click here.","A opção Tabela está desativada. Para ativá-la, clique aqui." -"Checkbox","Caixa de Seleção" -"Child Transactions","Transações Inferiores" -"Choose Store View:","Escolha a exibição de loja:" -"Choose an attribute","Escolha um atributo" -"Chosen category does not associated with any website, so url rewrite is not possible.","A categoria escolhida não está associada a nenhum website; não é possível, portanto, reescrever a url." -"Chosen product does not associated with any website, so url rewrite is not possible.","O produto escolhido não está associado a nenhum website; não é possível, portanto, reescrever a url." -"Clear","Limpar" -"Close","Fechar" -"Code","Code" -"Comment text field cannot be empty.","O campo de texto Comentário não pode ser deixado em branco." -"Complete","Completar" -"Config form fieldset clone model required to be able to clone fields","Modelo de clone do conjunto de campos do formulário de configuração necessário para clonar campos" -"Configuration","Configuração" -"Confirm New Password","Confirmar a nova senha" -"Confirm token authorization Pop Up for admin","Confirm token authorization Pop Up for admin" -"Confirm token authorization for admin","Confirm token authorization for admin" -"Confirmation Of Authorization","Confirmation Of Authorization" -"Confirmed email:","E-mail confirmado:" -"Connect with the Magento Community","Conecte-se com a Comunidade Magento" -"Continue","Continue" -"Convert to Plain Text","Converter para Texto Simples" -"Cookie (unsafe)","Cookie (não seguro)" -"Country","País" -"Country:","País:" -"Coupons","Cupons" -"Create","Criar" -"Create DB Backup","Criar DB Backup" -"Create New Attribute","Criar Novo Atributo" -"Create URL Rewrite:","Criar Reescritura de URL:" -"Created At","Criada Em" -"Credit Card %s","Cartão de Crédito %s" -"Credit Card Number","Número do Cartão de Crédito" -"Credit Card Number: xxxx-%s","Número do Cartão de Crédito: xxxx-%s" -"Credit Card Type","Tipo de Cartão de Crédito" -"Credit Card Type: %s","Tipo de Cartão de Crédito: %s" -"Credit Memo History","Histórico de Notas de Crédito" -"Credit Memo Totals","Totais da Nota de Crédito" -"Credit Memos","Notas de Crédito" -"Credit memo #%s comment added","Comentário de nota de crédito #%s adicionado" -"Credit memo #%s created","Nota de crédito #%s criada" -"Credit memo\'s total must be positive.","O total da nota de crédito deve ser positivo." -"Currency","Moeda" -"Currency ""%s"" is used as %s in %s.","Moeda ""%s"" é usada como %s em %s." -"Currency Information","Informação de moeda" -"Currency Setup Section","Seção de Configuração de Moeda" -"Current Configuration Scope:","Escopo da Configuração Atual:" -"Current Month","Mês corrente" -"Custom","Personalizado" -"Custom Variable ""%s""","Variável Personalizada ""%s""" -"Custom Variables","Variáveis de Personalização." -"Customer","Cliente" -"Customer Group:","Grupo do Cliente:" -"Customer Groups","Grupos do cliente" -"Customer Name","Nome do Cliente" -"Customer Reviews","Resenhas de Cliente" -"Customer Shopping Carts","Carrinhos de Compras dos Clientes" -"Customer Since:","Cliente desde:" -"Customer Tax Classes","Classes de Taxa do Cliente" -"Customer with the same email already exists.","Já existe um cliente com o mesmo email." -"Customers","Clientes" -"Customers by Number of Orders","Clientes por Número de Pedidos" -"Customers by Orders Total","Clientes por Total dos Pedidos" -"DHTML Date/Time Selector","Seletor de Data/Hora DHTML" -"Dashboard","Painel" -"Data Format","Formato dos Dados" -"Data transfer:","Transferência de Dados:" -"Database","Base de Dados" -"Dataflow - Advanced Profiles","Fluxo de Dados - Perfis Avançados" -"Dataflow - Profiles","Fluxo de Dados - Perfis" -"Date","Data" -"Date & Time","Data & Hora" -"Date Added","Data de Adição" -"Date Updated","Data de Atualização" -"Date selection:","Seleção de data:" -"Date selector","Seletor de data" -"Day","Dia" -"Decimal separator:","Separador decimal:" -"Default (Admin) Values","Valores (de Admin) Padrão" -"Default Billing Address","Endereço padrão de faturamento" -"Default Config","Config Padrão" -"Default Template from Locale","Modelo Padrão do Locale" -"Default Values","Valores padrão" -"Default display currency ""%s"" is not available in allowed currencies.","Moeda de exibição padrão ""%s"" não está disponível nas moedas permitidas." -"Default scope","Escopo padrão" -"Delete","Excluir" -"Delete %s","Apagar %s" -"Delete %s '%s'","Apagar %s '%s'" -"Delete File","Apagar Arquivo" -"Delete Image","Apagar Imagem" -"Delete Profile","Apagar Perfil" -"Delete Role","Apagar Papel" -"Delete Store","Apagar Loja" -"Delete Store View","Apagar Visão de Loja" -"Delete Template","Apagar Modelo" -"Delete User","Apagar Usuário" -"Delete Website","Apagar Site Web" -"Description","Descrição" -"Design","Design" -"Design Section","Seção de Design" -"Details","Detalhes" -"Developer Section","Seção de Desenvolvedor" -"Direction:","Direção:" -"Disable","Desativar" -"Disabled","Desativado" -"Display %s first","Mostrar primeiro %s" -"Display default currency","Mostrar moeda predifinida" -"Distributed under GNU LGPL. See %s for details.","Distribuído sob a GNU LGPL. Veja %s para detalhes." -"Do you really want to KILL parallel process and start new indexing process?","Você realmente quer MATAR o processo paralelo e iniciar um novo processo de indexação?" -"Do you really want to proceed?","Você realmente deseja continuar?" -"Download","Baixar" -"Downloads","Transferências" -"Drag to move","Arraste para mover" -"Drop-down","Suspenso" -"Edit","Editar" -"Edit Design Change","Editar alteração de design" -"Edit Email Template","Editar modelo de e-mail" -"Edit Order","Editar Ordem (Pedido)" -"Edit Poll","Editar votação" -"Edit Queue","Editar fila" -"Edit Review","Editar análise" -"Edit Role","Editar funçõa" -"Edit Store View","Editar visualização de loja" -"Edit System Template","Editar modelo de sistema" -"Edit Template","Editar modelo" -"Edit URL Rewrite","Editar o novo URL" -"Edit User","Editar usuário" -"Edit User '%s'","Editar usuário ""%s""" -"Edit Website","Editar site" -"Email","E-mail" -"Email Address:","Endereço de e-mail:" -"Email Preview","Visualização por e-mail" -"Email to a Friend","Enviar por e-mail a um amigo" -"Email:","E-mail:" -"Enable","Ativar" -"Enabled","Ativado" -"Enclose Values In:","Anexar valores:" -"Entity Attributes","Atributos da entidade" -"Entity Type","Tipo de entidade" -"Entity type:","Tipo de entidade:" -"Error","Erro" -"Excel XML","Excel XML" -"Excl. Tax","Excluir taxas" -"Exclude media folder from backup","Excluir pasta mídia do backup" -"Expiration Date","Data de Validade" -"Expiration Date: %s/%s","Data de expiração: %s/%s" -"Export","Exportar" -"Export CSV","Exportar CSV" -"Export Filters","Exportar filtros" -"Export to:","Exportar para:" -"Export:","Exportar:" -"FTP Host","Host FTP" -"FTP Host[:Port]","FTP Anfitrião[:Porta] (FTP Host[:Port])" -"FTP Login","Login FTP" -"FTP Password","Senha FTP" -"FTP credentials","Credenciais FTP" -"Failed","Falha" -"Failed to add a product to cart by id ""%s"".","Falha ao adicionar um produto ao carrinho de id ""%s""." -"Failed to cancel the billing agreement.","Falha ao cancelar o contrato de faturamento." -"Failed to clear the JavaScript/CSS cache.","Falha ao limpar acache JavaScript/CSS." -"Failed to delete the billing agreement.","Falha ao apagar o acordo de faturamento." -"Failed to update the profile.","Falha ao atualizar o perfil." -"Field","Campo" -"Field Mapping","Mapeamento de campo" -"File","Arquivo" -"File Information","Informação do Arquivo" -"File System","Arquivo de Sistema" -"File mode","Modo de Arquivo" -"File name:","Nome do arquivo:" -"File size should be more than 0 bytes","Tamanho do arquivo deve ser superior a 0 bytes" -"Finished profile execution.","Execução de perfil terminada." -"First Invoice Created Date","Data de criação do primeiro invoice" -"First Name","Primeiro nome" -"First Name is required field.","Nome Próprio é um campo obrigatório." -"First Name:","Primeiro nome:" -"Fixed","Fixado" -"Flush Catalog Images Cache","Limpar cache de imagens do catálogo" -"Flush JavaScript/CSS Cache","Limpar cache de JavaScript/CSS" -"For category","Para categoria" -"For latest version visit: %s","Para última versão, visitar: %s" -"For product","Para produto" -"Forgot Admin Password","Esqueci a senha de administrador" -"Forgot your password?","Esqueceu sua senha?" -"Forgot your user name or password?","Esqueceu seu nome de usuário ou senha?" -"From","De" -"GLOBAL","GLOBAL" -"Gb","Gb" -"General Information","Informações gerais" -"General Section","Seção Geral" -"Get Image Base64","Obter Imagem Base64" -"Get help for this page","Receber ajuda para esta página" -"Give the verifier code to application administrator","Give the verifier code to application administrator" -"Global Attribute","Atributo Global" -"Global Record Search","Busca Global de Registros" -"Global Search","Busca Global" -"Go Today","Ir Hoje" -"Go to messages inbox","Ir para caixa de entrada" -"Go to notifications","Ir para notificações" -"Google Base","Google Base" -"Google Content","Google Content" -"Google Sitemaps","Sitemaps Google" -"Grand Total","Total geral" -"Grid (default) / List","Grade (padrão) / Lista" -"Grid Only","Somente Grade" -"Group:","Grupo:" -"Guest","Convidado" -"HTTP (unsecure)","HTTP (inseguro)" -"HTTPS (SSL)","HTTPS (SSL)" -"Help Us Keep Magento Healthy - Report All Bugs","Ajude-nos a manter a Magento em forma - Informe qualquer defeito" -"Helper attributes should not be used in custom layout updates.","Não se devem usar atributos da ajuda em atualizações personalizadas de layout." -"Helper for options rendering doesn't implement required interface.","A ajuda para processamento de opções não implementa a interface necessária." -"Home","Início" -"ID","Identidade" -"ID Path","Caminho de identificação" -"IP Address","Endereço de IP" -"IPN (Instant Payment Notification) Only","Somente NIP (Notificação Instantânea de Pagamento)" -"Id","Id" -"If there is an account associated with %s you will receive an email with a link to reset your password.","Se houver uma conta associada a %s você receberá um email com um link para reconfigurar a sua senha." -"If this message persists, please contact the store owner.","Se esta mensagem persistir, favor contatar dono da loja." -"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Se não for especificado um valor para opção de visualização de loja específica, será usado o valor padrão (Admin)." -"Images (.gif, .jpg, .png)","Imagens (.gif, .jpg, .png)" -"Images Cache","Cache de Imagens" -"Import","Importar" -"Import Service","Serviço de Importação" -"Import and Export","Importação e Exportação" -"Import and Export Tax Rates","Alíquotas de Importação e Exportação" -"Import/Export","Importação/Exportação" -"Import/Export Advanced","Importação/Exportação Avançado" -"Import/Export Profile","Perfil de Importação/Exportação" -"Important: ","Importante:" -"Imported %s records","Registros %s importados" -"In","Em" -"In Database:","Na Base de Dados:" -"In File:","No Arquivo:" -"Inactive","Inativo" -"Incl. Tax","Incluir taxas" -"Incoming Message","Mensagem Nova" -"Insert Variable...","Inserir Variável..." -"Interactive","Interativo" -"Interface Locale: %s","Configuração Regional da Interface: %s" -"Invalid Form Key. Please refresh the page.","Chave de Formulário Inválida. Favor atualizar a página." -"Invalid Import Service Specified","Especificação Inválida de Serviço de Importação" -"Invalid POST data (please check post_max_size and upload_max_filesize settings in your php.ini file).","Dados inválidos POST (por favor verifique as configurações post_max_size e upload_max_filesize no seu arquivo php.ini)." -"Invalid Secret Key. Please refresh the page.","Chave secreta inválida. Atualize a página." -"Invalid User Name or Password.","Nome de Usuário ou Senha Inválido" -"Invalid directory: %s","Diretório inválido: %s" -"Invalid email address ""%s"".","Endereço de email inválido ""%s""." -"Invalid email address.","Endereço de e-mail inválido." -"Invalid file: %s","Arquivo inválido: %s" -"Invalid input data for %s => %s rate","Dados inválido de entrada para %s => taxa de %s" -"Invalid parent block for this block","Bloco pai inválido para este bloco" -"Invalid parent block for this block.","Bloco-pai inválido para este bloco." -"Invalid password reset token.","Senha inválida reconfigure vale." -"Invalid sender name ""%s"". Please use only visible characters and spaces.","Nome ""%s"" de remetente inválido. Por favor use apenas caracteres visíveis e espaços." -"Invalid timezone","Fuso horário inválido" -"Invalidated","Invalidado" -"Inventory Stock Status","Estado do Inventário de Estoque" -"Invoice #%s comment added","Comentário adicionado à fatura nº %s" -"Invoice #%s created","Fatura #%s criada" -"Invoice History","História da Fatura" -"Invoice Totals","Totais da Fatura" -"Invoice canceling error.","Erro de cancelamento da fatura." -"Invoice capturing error.","Erro ao registrar fatura." -"Invoice voiding error.","Erro ao anular fatura." -"Invoices","Faturas" -"Is Closed","Está Fechado" -"Is Default","É padrão" -"Issue Number","Número de Emissão" -"Items","Itens" -"JavaScript seems to be disabled in your browser.","O JavaScript parece estar desativado no seu navegador." -"JavaScript/CSS","JavaScript/CSS" -"JavaScript/CSS Cache","Cache JavaScript/CSS" -"Kb","Kb" -"Last 24 Hours","Últimas 24 Horas" -"Last 5 Orders","Últimos 5 Pedidos" -"Last 5 Search Terms","Últimos 5 Termos de Pesquisa" -"Last 7 Days","Últimos 7 Dias" -"Last Credit Memo Created Date","Data de Criação do Último Memorando de Crédito" -"Last Invoice Created Date","Data da Última Fatura Criada" -"Last Logged In (%s):","Último Login Em (%s):" -"Last Logged In:","Último Acesso:" -"Last Name","Último nome" -"Last Name is required field.","Sobrenome é um campo obrigatório." -"Last Name:","Último nome:" -"Last updated: %s. To refresh last day\'s statistics, click here.","Última actualização: %s. Para atualizar as estatísticas dos últimos dias, clique aqui." -"Latest Message:","Última Mensagem:" -"Layered Navigation Indices","Índices de Navegação por Camadas" -"Layered Navigation Indices were refreshed.","Índices de Navegação por Camadas foram atualizados." -"Leave empty to use tax identifier","Deixe em branco para usar identificador de impostos" -"Lifetime Sales","Vendas de Vida Inteira" -"Lifetime statistics have been updated.","Estatísticas de vida inteira foram atualizadas" -"Links","Ligações" -"Links with associated products will retain only after saving current product.","Ligações com produtos associados reterão apenas depois de salvar produto atual." -"List (default) / Grid","Lista (padrão) / Rede" -"List Only","Apenas Lista" -"Load Template","Carregar Modelo" -"Load default template","Carregar modelo predifinido" -"Loading...","Carregando..." -"Local Server","Servidor Local" -"Local/Remote Server","Servidor Local/Remoto" -"Locale","Locale" -"Log In","Entrar" -"Log Out","Sair" -"Log in to Admin Panel","Entrar no Painel de Administração" -"Log in to use %s","Log in to use %s" -"Log into Magento Admin Page","Entrar na Página de Administração Magento" -"Logged in as %s","Conetado como %s" -"Login","Conectar-se" -"Low Stock","Baixo Estoque" -"MAJOR","PRINCIPAL" -"MINOR","MENOR" -"MS Excel XML","MS Excel XML" -"Magento Admin","Administração Magento" -"Magento Commerce - Administrative Panel","Comércio Magento - Painel Administrativo" -"Magento Connect","Conexão Magento" -"Magento Connect Manager","Gerenciador de Conexão Magento" -"Magento Logo","Logo Magento" -"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento é uma marca comercial da Magento Inc.© Direitos Autorais©, %s Magento Inc." -"Magento root directory","Diretório raiz Magento" -"Magento ver. %s","Ver. %s Magento" -"Magento™ is a trademark of Magento Inc.
    Copyright © %s Magento Inc.","Magento ™ é uma marca comercial da Magento Inc.
    Copyright © %s Magento Inc." -"Make sure that data encoding in the file is consistent and saved in one of supported encodings (UTF-8 or ANSI).","Certifique-se que a codificação de dados no arquivo é consistente e salva em uma das codificações suportadas (UTF-8 ou ANSI)." -"Manage Attribute Sets","Gerenciar Conjuntos de Atributos" -"Manage Attributes","Gerenciar Atributos" -"Manage Categories","Gerenciar Categorias" -"Manage Content","Gerenciar conteúdo" -"Manage Currency Rates","Gerenciar Taxas de Câmbio" -"Manage Currency Symbols","Gerenciar símbolos de moeda" -"Manage Customers","Gerenciar clientes" -"Manage Options (values of your attribute)","Gerenciar Opções (valores de seu atributo)" -"Manage Ratings","Gerenciar Classificações" -"Manage Stores","Gerenciar Lojas" -"Manage Tax Rules","Gerenciar Regras de Imposto" -"Manage Tax Zones and Rates","Gerenciar Zonas de Imposto e Taxas" -"Manage Titles (Size, Color, etc.)","Gerenciar Títulos (Tamanho, Cor etc.)" -"Manual","Manual" -"Matched Expression","Expressão Combinada" -"Maximum sender name length is 255. Please correct your settings.","O comprimento máximo do nome do remetente é 255. Corrija suas configurações." -"Mb","Mb" -"Media (.avi, .flv, .swf)","Mídias (.avi, .flv, .swf)" -"Media storages synchronization has completed!","Concluída a sincronização dos armazenamentos de mídias!" -"Messages Inbox","Caixa de Entrada de Mensagens" -"Month","Mês" -"Most Viewed","Mais vistos" -"Most Viewed Products","Produtos Mais Vistos" -"Multiple Select","Múltipla escolha" -"My Account","Minha Conta" -"My Applications","My Applications" -"N/A","Indisponível" -"NOTICE","AVISO" -"Name","Nome" -"Name on Card","Nome no Cartão" -"Name on the Card: %s","Nome no Cartão: %s" -"Name:","Nome:" -"Never (production)","Nunca (produção)" -"New ","Novo" -"New API Key","Nova Chave API" -"New Accounts","Novas Contas" -"New Attribute","Novo atributo" -"New Block","Novo Bloco" -"New Category","Nova Categoria" -"New Class","Nova Classe" -"New Condition","Nova Condição" -"New Custom Variable","Nova Variável Personalizada" -"New Customer","Novo Cliente" -"New Customers","Novos clientes" -"New Design Change","Nova Alteração de Design" -"New Email Template","Novo Modelo de Email" -"New Group","Novo Grupo" -"New Invoice","Nova Fatura" -"New Item Type","Novo Tipo de Item" -"New Memo","Nova Nota" -"New Memo for #%s","Nova Nota para #%s" -"New Page","Nova página" -"New Password","Nova senha" -"New Poll","Nova Pesquisa" -"New Profile","Novo Perfil" -"New Rate","Nova Taxa" -"New Rating","Nova avaliação" -"New Review","Nova Resenha" -"New Role","Nova Função" -"New Rule","Nova Regra" -"New Search","Nova Busca" -"New Set","Novo Conjunto" -"New Shipment","Nova Remessa" -"New Sitemap","Novo Sitemap" -"New Store View","Nova Visualização de Loja" -"New System Template","Novo Modelo de Sistema" -"New Tag","Nova Etiqueta" -"New Template","Novo Modelo" -"New User","Novo Usuário" -"New Variable","Nova Variável" -"New Website","Novo Website" -"New attribute set mapping","New attribute set mapping" -"New password field cannot be empty.","O campo de preenchimento de nova senha não pode ser deixado em branco." -"Newsletter","Newsletter" -"Newsletter Problems","Problemas com Newsletter" -"Newsletter Queue","Fila do Boletim Informativo" -"Newsletter Subscribers","Assinantes do Boletim Informativo" -"Newsletter Templates","Modelos de Boletim Informativo" -"Next month (hold for menu)","Próximo mês (segurar para menu)" -"Next year (hold for menu)","Próximo ano (segurar para menu)" -"No","Não" -"No (price without tax)","Não (preço sem imposto)" -"No Data","Nenhum Dado" -"No Data Found","Nenhum Dado Encontrado" -"No Templates Found","Nenhum Modelo Encontrado" -"No change","Sem alterações" -"No customer id defined.","Não definida uma identificação de cliente." -"No information available.","Nenhuma informação disponível" -"No profile loaded...","Nenhum perfil carregado..." -"No records found for this period.","Nenhum registro encontrado para este período." -"No records found.","Nenhum registro encontrado." -"No report code specified.","Nenhum código de relatório especificado." -"No search keywords.","Nenhuma palavra-chave de busca." -"No search modules were registered","Não foram registrados módulos de busca." -"No wishlist item id defined.","Não foi definido item de lista de desejos." -"None","Nenhum" -"Note:","Observação:" -"Notes","Observações" -"Notifications","Notificações" -"Number of Orders","Número de pedidos" -"Number of Uses","Número de Usuários" -"Number of Views","Número de Visualizações" -"Number of records:","Número de registros:" -"OAuth Consumers","OAuth Consumers" -"OAuth authorization for admin","OAuth authorization for admin" -"OAuth authorization simple for admin","OAuth authorization simple for admin" -"OK","OK" -"Old rate:","Valor antigo:" -"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Depois de fazer login em sua Conta do PayPal Advanced, navegue até Configurações de serviços - Páginas de checkout hospedadas - menu Configurar e definas opções descritas a seguir" -"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Depois de fazer login em sua conta do PayPal Payflow Link, navegue até Configurações de serviços - Páginas de checkout hospedadas - menu Configurar e definas opções descritas a seguir" -"One or more media files failed to be synchronized during the media storages syncronization process. Refer to the log file for details.","Um ou mais arquivos de mídia deixaram de ser sincronizados durante o processo de sincronização de armazenamento de mídia. Consulte o arquivo de registro para obter detalhes." -"One or more of the Cache Types are invalidated:","Está invalidado um ou mais Tipo de Cache." -"Online Customers","Clientes Conectados" -"Only Once (version upgrade)","Somente Uma Vez (atualização da versão)" -"Only attributes with scope ""Global"", input type ""Dropdown"" and Use To Create Configurable Product ""Yes"" are available.","Apenas atributos de âmbito ""Global"", tipo de entrada ""Dropdown"" e ""Sim"" Use Para Criar Produto Configurável estão disponíveis." -"Only mapped fields","Somente campos mapeados" -"Optional","Opcional" -"Options","Opções" -"Options is required","Opções: obrigatório" -"Order","Pedido" -"Order #%s","Pedido #%s" -"Order #%s (%s)","Ordem #%s (%s)" -"Order Created Date","Data de Criação do Pedido" -"Order ID","ID da Ordem" -"Order Totals","Totais da Ordem" -"Order Updated Date","Data de Atualização do Pedido" -"Order Updated Date report is real-time, does not need statistics refreshing.","Relatório dos Dados de Atualização da Ordem em tempo real, não precisa de atualizar as estatísticas." -"Orders","Ordens" -"Original Magento attribute names in first row:","Nomes originais de atributo Magento na primeira linha:" -"Out of stock","Fora de estoque" -"PDT (Payment Data Transfer) Only","Apenas TDP (Transferência de Dados de Pagamento)" -"Package Extensions","Extensões da Embalagem" -"Pages","Páginas" -"Parent Product Thumbnail","Miniatura do Produto Parental" -"Parent Transaction ID","ID da Transação Parental" -"Passive mode","Modo passivo" -"Password","Senha" -"Password Confirmation","Confirmação de Senha" -"Password confirmation must be same as password.","Confirmação de senha tem de ser a mesma que a senha." -"Password must be at least of %d characters.","Senha deve ser de pelo menos %d caracteres." -"Password must include both numeric and alphabetic characters.","Senha deve conter caracteres numéricos e alfabéticos." -"Password:","Senha:" -"Path:","Caminho:" -"Payment method instance is not available.","Instância de método de pagamento não está disponível." -"Payment method is not available.","Método de pagamento não está disponível." -"Payment method must be specified.","Método de pagamento deve ser especificado." -"Pending Reviews","Comentários Pendentes" -"Pending Tags","Marcas Pendentes" -"Per Item","Por Item" -"Per Order","Por Ordem" -"Percent","Percentagem" -"Performed At","Realizado Em" -"Period","Período" -"Permanent (301)","Permanente (301)" -"Permissions","Permissões" -"Personal Information","Informações pessoais" -"Phone:","Telefone:" -"Please Select","Por Favor Selecione" -"Please confirm site switching. All data that hasn\'t been saved will be lost.","Por favor confirme a mudança de site. Todos os dados que não tenham sido salvos serão perdidos." -"Please enter 6 or more characters.","Por favor insira 6 ou mais caracteres." -"Please enter a number greater than 0 in this field.","Por favor insira um número maior que 0 neste campo." -"Please enter a valid $ amount. For example $100.00.","Por favor introduza uma quantidade válida de $. Por exemplo $100,00." -"Please enter a valid URL. For example http://www.example.com or www.example.com","Por favor insira uma URL válida. Por exemplo http://www.exemplo.com ou www.exemplo.com" -"Please enter a valid URL. http:// is required","Por favor insira uma URL válida. http:// é necessário" -"Please enter a valid credit card number.","Por favor insira um número válido de cartão de crédito." -"Please enter a valid date.","Por favor insira uma data válida." -"Please enter a valid email address. For example johndoe@domain.com.","Por favor insira um endereço de e-mail válido. Por exemplo joao@domain.com." -"Please enter a valid email.","Por favor insira um e-mail válido." -"Please enter a valid number in this field.","Por favor insira um número válido neste campo." -"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Por favor insira um número de telefone válido. Por exemplo (123) 456-7890 ou 123-456-7890." -"Please enter a valid social security number. For example 123-45-6789.","Por favor insira um número válido de segurança social. Por exemplo 123-45-6789." -"Please enter a valid value from list","Insira um valor válido da lista" -"Please enter a valid value, ex: 10,20,30","Por favor insira um valor válido, ex: 10,20,30" -"Please enter a valid zip code.","Por favor insira um código postal válido." -"Please enter a valid zip code. For example 90602 or 90602-1234.","Por favor insira um código postal válido. Por exemplo 90602 ou 90602-1234." -"Please enter another credit card number to complete your purchase.","Por favor insira outro número de cartão de crédito para concluir a sua compra." -"Please enter password","Por favor insira a senha" -"Please enter password to confirm rollback.","Por favor insira a senha para confirmar redução." -"Please enter valid password.","Por favor insira uma senha válida." -"Please make sure that all global admin search modules are installed and activated.","Por favor certifique-se que todos os módulos de pesquisa de administração global estão instalados e ativados." -"Please make sure that your changes were saved before running the profile.","Por favor certifique-se que suas alterações foram salvas antes de executar o perfil." -"Please make sure your passwords match.","Por favor certifique-se que suas senhas coincidem." -"Please select State/Province.","Por favor selecione Estado/Província." -"Please select a customer.","Por favor selecione um cliente." -"Please select a store.","Por favor selecione uma loja." -"Please select an option.","Por favor selecione uma opção." -"Please select catalog searches.","Por favor selecione pesquisas de catálogo." -"Please select customer(s).","Por favor selecione cliente(s)." -"Please select message(s).","Por favor selecione mensagem/mensagens." -"Please select one of the above options.","Por favor selecione uma das opções acima." -"Please select one of the options.","Por favor selecione uma das opções." -"Please select review(s).","Por favor selecione comentário(s)." -"Please select tag(s).","Por favor selecione marca(s)." -"Please specify backup creation options","Por favor especifique opções de criação de backup." -"Please specify the admin custom URL.","Por favor especifique o URL de administração personalizada." -"Please try to logout and sign in again.","Por favor tente sair e entrar novamente." -"Please type the letters from the image:","Por favor digite as letras da imagem:" -"Please use in this field only ""a-z,0-9,_"".","Por favor use neste campo apenas ""a-z,0-9,_""." -"Please use letters only (a-z) in this field.","Por favor use apenas letras (a-z) neste campo." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Por favor use apenas números nesse campo. Por favor evite espaços ou outros caracteres tais como pontos ou vírgulas." -"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","Por favor use somente letras (a-z ou A-Z), números (0-9) ou espaços neste campo." -"Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Por favor use apenas letras (a-z) ou números (0-9) apenas neste campo. Espaços ou outros caracteres não são permitidos." -"Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.","Por favor use apenas letras (a-z) ou números (0-9) ou espaços e # apenas neste campo." -"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Por favor utilize este formato de data: dd/mm/aaaa. Por exemplo 17/03/2006 para 17 de Março de 2006." -"Please wait while the indexes are being refreshed.","Por favor aguarde enquanto os índices estão sendo atualizados." -"Please wait, loading...","Por favor aguarde, carregando..." -"Please wait...","Por favor aguarde..." -"Please, add some answers to this poll first.","Por favor, adicione primeiro algumas respostas a esta pesquisa." -"Please, select ""Visible in Stores"" for this poll first.","Por favor, selecione primeiro ""Visível nas Lojas"" para esta pesquisa." -"Poll Manager","Gerente de Pesquisa" -"Polls","Pesquisas" -"Popular","Popular" -"Position","Posição" -"Position of Watermark for %s","Posição da Marca d'Água para %s" -"Pregenerated product images files.","Arquivos de imagens do produto pré-gerados." -"Prev. month (hold for menu)","Mês prévio (segure para menu)" -"Prev. year (hold for menu)","Ano anterior (segure para menu)" -"Preview","Visualizar" -"Preview Template","Visualização do Modelo" -"Price","Preço" -"Price alert subscription was saved.","Alerta de preço de subscrição foi salvo." -"Price:","Preço:" -"Processed %s%% %s/%d records","Registros %s%% %s/%d processados" -"Product","Produto" -"Product Name","Nome do produto" -"Product Reviews","Comentários sobre Produto" -"Product Tax Classes","Classe de Imposto do Produto" -"Product Thumbnail Itself","Miniatura do Produto em Si" -"Product is not loaded.","O produto não está carregado." -"Product:","Produto:" -"Products","Produtos" -"Products Bestsellers Report","Relatório dos Produtos Mais Vendidos" -"Products Most Viewed Report","Relatório dos produtos mais vistos" -"Products Ordered","Produtos Encomendados" -"Products in Carts","Produtos em Carrinhos" -"Profile Action","Ação de Perfil" -"Profile Actions XML","Perfil de Ações XML" -"Profile Direction","Direção de Perfil" -"Profile History","Histórico do Perfil" -"Profile Information","Informação do Perfil" -"Profile Name","Nome do Perfil" -"Profile Payments","Pagamentos de Perfil" -"Profile Schedule","Horário do Perfil" -"Profile Wizard","Wizard de Perfil" -"Profiles","Perfis" -"Promo","Promoção" -"Promotions","Promoções" -"Purchased Item","Item Comprado" -"Put store on the maintenance mode while backup creation","Colocar loja em modo de manutenção durante a criação do backup" -"Put store on the maintenance mode while rollback processing","Coloque a loja em modo de manutenção durante o processamento da reversão" -"Quantity","Quantidade" -"Queue Refresh","Atualizar a Fila de Espera" -"Queued... Cancel","Em fila de espera... Cancelar" -"REST Roles","Funções REST" -"Radio Buttons","Botões de Opção" -"Rates","Valores" -"Read details","Ler detalhes" -"Rebuild","Refazer" -"Rebuild Catalog Index","Refazer Índice de Catálogo" -"Rebuild Flat Catalog Category","Reconstruir Categoria de Catálogo Único" -"Rebuild Flat Catalog Product","Refazer Produto de Catálogo Simplificado" -"Recent Orders","Pedidos Recentes" -"Recent statistics have been updated.","As estatísticas recentes foram atualizadas." -"Recurring Profile View","Visualização de Perfil Recorrente" -"Recursive Dir","Diretório Recursivo" -"Redirect","Redirecionar" -"Reference","Referência" -"Reference ID","Identificação de Referência" -"Refresh","Atualizar" -"Refresh Now*","Atualizar Agora*" -"Refresh Statistics","Atualizar Estatísticas" -"Region/State","Região/Estado" -"Regular Price:","Preço Normal:" -"Reject","Rejeitar" -"Reject token authorization Pop Up for admin","Reject token authorization Pop Up for admin" -"Reject token authorization for admin","Reject token authorization for admin" -"Rejection Of Authorization","Rejection Of Authorization" -"Release","Lançamento" -"Release Stability","Liberar Estabilidade" -"Release Version","Versão de Lançamento" -"Reload captcha","Recarregar captcha" -"Remote FTP","FTP Remoto" -"Remove","Remover" -"Reports","Relatórios" -"Request Path","Solicitar Caminho" -"Required","Obrigatório" -"Reset","Redefinir" -"Reset Filter","Reiniciar Filtro" -"Reset Password","Reconfigurar Senha" -"Reset a Password","Redefinir uma senha" -"Resize","Redimensionar" -"Resource Access","Acesso a Recursos" -"Resources","Recursos" -"Results","Resultados" -"Retrieve Password","Recuperar Senha" -"Return Html Version","Retornar Versão HTML" -"Revenue","Receita" -"Reviews","Resenhas" -"Reviews and Ratings","Resenhas e Avaliações" -"Rewrite Rules","Regras de Rewrite" -"Role ID","Identidade de Função" -"Role Info","Informação de Função" -"Role Information","Informação de Função" -"Role Name","Nome de Função" -"Role Resources","Recursos de Função" -"Role Users","Usuários de Função" -"Roles","Funções" -"Roles Resources","Recursos de Funções" -"Root Category","Root Category" -"Rotate CCW","Girar em sentido anti-horário" -"Rotate CW","Girar em sentido horário" -"Run","Executar" -"Run Profile","Executar Perfil" -"Run Profile Inside This Window","Executar Perfil Dentro Desta Janela" -"Run Profile in Popup","Executar Perfil em Pop-up" -"Running... Kill","Executando... Parar" -"SKU","Unidade de Manutenção de Estoque" -"SKU:","SKU (Unidade de Manutenção de Estoque):" -"SSL Error: Invalid or self-signed certificate","Erro SSL: Certificado inválido ou autoassinado" -"Sales","Vendas" -"Sales Report","Relatório de Vendas" -"Samples","Amostras" -"Save","Salvar" -"Save & Generate","Salvar & Gerar" -"Save Account","Salvar Conta" -"Save Cache Settings","Salvar Configurações de Cache" -"Save Config","Salvar Configuração" -"Save Currency Rates","Salvar Taxas de Câmbio" -"Save Profile","Salvar Perfil" -"Save Role","Salvar Função" -"Save Template","Salvar Modelo" -"Save User","Salvar Usuário" -"Save and Continue Edit","Salvar e continuar a editar" -"Search","Pesquisa" -"Search Index","Buscar no Índice" -"Search Term","Buscar Termo" -"Search Terms","Buscar Termos" -"Select","Selecione" -"Select All","Selecionar Tudo" -"Select Category","Selecionar categoria" -"Select Date","Selecione Data" -"Select Range","Selecionar Intervalo" -"Select date","Selecione data" -"Selected allowed currency ""%s"" is not available in installed currencies.","Moeda selecionada permitida ""%s"" não está disponível nas moedas instaladas." -"Selected base currency is not available in installed currencies.","A moeda base selecionada não está disponível nas moedas instaladas." -"Selected default display currency is not available in allowed currencies.","Moeda predifinida de exibição selecionada não está disponível nas moedas permitidas." -"Selected default display currency is not available in installed currencies.","A moeda de exibição padrão selecionada não está disponível nas moedas instaladas." -"Self-assigned roles cannot be deleted.","Papéis auto-atribuídos não podem ser apagados." -"Sender","Remetente" -"Separate Email","Email Separado" -"Shipment #%s comment added","Comentário de envio #%s adicionado" -"Shipment #%s created","Criado embarque #%s" -"Shipment Comments","Comentários de Envio" -"Shipment History","Histórico de Entregas" -"Shipments","Envios" -"Shipping","Remessa" -"Shipping Address","Endereço de Envio" -"Shipping Address: ","Endereço de Envio:" -"Shipping Origin","Origem do Envio" -"Shipping Price","Valor do Frete" -"Shipping address selection is not applicable","Seleção de endereço de envio não é aplicável" -"Shipping method must be specified.","O método de entrega deve ser especificado." -"Shipping method selection is not applicable","Seleção de método de envio não é aplicável" -"Shopping Cart","Carrinho de compras" -"Shopping Cart Price Rules","Regras de Preços de Carrinho de Compras" -"Shopping Cart from %s","Carrinho de Compras de %s" -"Show By","Mostrar Por" -"Show Report For:","Mostrar relatório de:" -"Show Reviews","Mostrar Resenhas" -"Sitemap Information","Informações do Mapa do Site" -"Size for %s","Tamanho para %s" -"Skip Category Selection","Pular Seleção de Categoria" -"Some items in this order have different invoice and shipment types. You can create shipment only after the invoice is created.","Alguns itens nesta ordem têm diferentes notas fiscais e tipos de embarque. Você pode criar o embarque somente depois que a fatura é criada." -"Some of the ordered items do not exist in the catalog anymore and will be removed if you try to edit the order.","Alguns dos itens pedidos não existem mais no catálogo, e serão removidos se você tentar editar o pedido." -"Sorry, this feature is coming soon...","Desculpe, esta funcionalidade estará disponível em breve..." -"Special Price:","Preço Especial:" -"Specific Countries","Países Específicos" -"Specified","Especificado" -"Specified profile does not exist.","O perfil especificado não existe." -"Spreadsheet Name:","Nome da Planilha:" -"Start Date","Data de início" -"Starting profile execution, please wait...","Iniciando execução do perfil, por favor aguarde..." -"State/Province:","Estado/Província:" -"Static Blocks","Blocos Estáticos" -"Status","Status" -"Status:","Estado atual:" -"Stock Quantity:","Quantidade em Estoque:" -"Stock notification was saved.","A notificação de estoque foi salva." -"Store","Loja" -"Store Email Addresses Section","Seção de Endereços de Email da Loja" -"Store View","Visualização da loja" -"Store:","Loja:" -"Stores","Lojas" -"Subject","Assunto" -"Submit","Enviar" -"Subpackage cannot be conflicting.","Subpacote não pode gerar conflito." -"Subtotal","Subtotal" -"Switch/Solo card issue number: %s","Número de emissão do cartão Switch/Solo: %s" -"Switch/Solo card start Date: %s/%s","Data inicial de cartão Switch/Solo: %s/%s" -"Switch/Solo/Maestro Only","Somente Swith/Solo/Maestro" -"Switch/Solo/Maestro(UK Domestic) Only","Somente Swith/Solo/Maestro (nacional do RU)" -"Switch/Solo/Maestro(UK Domestic) card issue number: %s","Número de emissão do cartão Swith/Solo/Maestro (nacional do RU): %s" -"Switch/Solo/Maestro(UK Domestic) card start Date: %s/%s","Data inicial do cartão Swith/Solo/Maestro (nacional do RU): %s/%s" -"Symbol","Symbol" -"Synchronization is required.","Sincronização necessária." -"Synchronization of media storages has been successfully completed.","A sincronização dos armazenamentos em mídia foi concluída com sucesso." -"Synchronize","Sincronizar" -"Synchronizing %s to %s","Sincronização %s para %s" -"Synchronizing...","Sincronizando..." -"System","Sistema" -"System Section","Seção de Sistema" -"System busy","Sistema ocupado" -"Tags","Marcas" -"Target Path","Caminho Alvo" -"Tax","Taxas" -"Tb","Tb" -"Template","Modelo" -"Template Content","Conteúdo do Modelo" -"Template Information","Informação do Modelo" -"Template Name","Nome do Modelo" -"Template Styles","Estilos do Modelo" -"Template Subject","Assunto do Modelo" -"Template Type","Tipo de Modelo" -"Temporary (302)","Temporário (302)" -"Terms and Conditions","Termos e Condições" -"Text","Texto" -"The Catalog Rewrites were refreshed.","Os Reescritos do Catálogo foram atualizados." -"The CatalogInventory Stock Status has been rebuilt.","O Estado do Catálogo de Inventário de Estoque foi reconstruído." -"The Comment Text field cannot be empty.","O campo de texto do comentário não pode estar vazio." -"The Flat Catalog Product was rebuilt","O Catálogo Base de Produtos foi reconstruído" -"The JavaScript/CSS cache has been cleaned.","O cache JavaScript/CSS foi limpo." -"The JavaScript/CSS cache has been cleared.","O cache JavaScript/CSS foi limpo." -"The Layered Navigation indexing has been queued.","A indexação de navegação em camadas foi colocada na fila." -"The Layered Navigation indexing queue has been canceled.","A fila de indexação de navegação em camadas foi cancelada." -"The Layered Navigation indices were refreshed.","Os índices de Navegação por Camadas foram atualizados." -"The Layered Navigation process has been queued to be killed.","O processo de navegação em camadas foi colocado na fila para ser eliminado." -"The Magento cache storage has been flushed.","O armazenamento de cache Magento foi liberado." -"The URL Rewrite has been deleted.","O URL Reescrito foi apagado." -"The URL Rewrite has been saved.","O URL Reescrito foi salvo." -"The account has been saved.","A conta foi salva." -"The archive can be uncompressed with %s on Windows systems","O arquivo pode ser descompactado com %s nos sistemas Windows" -"The attribute set has been removed.","O conjunto de atributos foi removido." -"The backup's creation process will take time.","O processo de criação do backup levará algum tempo." -"The billing agreement has been canceled.","O acordo de cobrança foi cancelado." -"The billing agreement has been deleted.","O acordo de faturamento foi eliminado." -"The cache storage has been flushed.","O armazenamento de cache foi liberado." -"The carrier needs to be specified.","A transportadora deve ser especificada." -"The catalog index has been rebuilt.","O índice do catálogo foi reconstruído." -"The catalog rewrites have been refreshed.","Os reescritos do catálogo foram atualizados." -"The configuration has been saved.","A configuração foi salva." -"The credit memo has been canceled.","A nota de crédito foi cancelada." -"The credit memo has been created.","A nota de crédito foi criada." -"The credit memo has been voided.","A nota de crédito foi anulada." -"The custom variable has been deleted.","A variável personalizada foi apagada." -"The custom variable has been saved.","A variável personalizada foi salva." -"The customer has been deleted.","O cliente foi apagado." -"The customer has been saved.","O cliente foi salvo." -"The design change has been deleted.","A mudança de design foi apagada." -"The design change has been saved.","A mudança de design foi salva." -"The email address is empty.","O endereço de email está vazio." -"The email template has been deleted.","O modelo de e-mail foi apagado." -"The email template has been saved.","O modelo de e-mail foi salvo." -"The flat catalog category has been rebuilt.","A categoria catálogo plano foi reconstruída." -"The group node name must be specified with field node name.","O nome do nó de grupo deve ser especificado com o nome do nó de campo." -"The image cache was cleaned.","A cache de imagem foi limpa." -"The image cache was cleared.","A cache de imagem foi limpa." -"The invoice and shipment have been created.","A fatura e remessa foram criadas." -"The invoice and the shipment have been created. The shipping label cannot be created at the moment.","A factura e o envio foram criados. A etiqueta de remessa não pode ser criada no momento." -"The invoice has been canceled.","A fatura foi cancelada." -"The invoice has been captured.","A fatura foi capturada." -"The invoice has been created.","A fatura foi criada." -"The invoice has been voided.","A fatura foi cancelada." -"The invoice no longer exists.","A fatura não existe mais." -"The item %s (SKU %s) does not exist in the catalog anymore.","O item %s (SKU %s) não existe mais no catálogo." -"The order does not allow creating an invoice.","A ordem não permite a criação de uma fatura." -"The order no longer exists.","A ordem não existe mais." -"The poll has been deleted.","A pesquisa foi apagada." -"The poll has been saved.","A pesquisa foi salva." -"The profile has been deleted.","O perfil foi apagado." -"The profile has been saved.","O perfil foi salvo." -"The profile has been updated.","O perfil foi atualizado." -"The profile has no changes.","O perfil não tem alterações." -"The profile you are trying to save no longer exists","O perfil que você está tentando salvar não existe mais" -"The rating has been deleted.","A avaliação foi eliminada." -"The rating has been saved.","A avaliação foi salva." -"The role has been deleted.","O papel foi eliminado." -"The role has been saved.","O papel foi salvo." -"The role has been successfully saved.","O papel foi salvo com sucesso." -"The search index has been rebuilt.","O índice de pesquisa foi reconstruído." -"The shipment has been created.","A remessa foi criada." -"The shipment has been sent.","A remessa foi enviada." -"The shipping label has been created.","A etiqueta de envio foi criada." -"The tag has been deleted.","A marca foi eliminada." -"The tag has been saved.","A marca foi salva." -"The transaction details have been updated.","Os detalhes da transação foram atualizados." -"The user has been deleted.","O usuário foi apagado." -"The user has been saved.","O usuário foi salvo." -"Themes JavaScript and CSS files combined to one file.","Temas JavaScript e CSS combinados para um arquivo." -"There is an error in one of the option rows.","Há um erro em uma das linhas de opção." -"This Account is","Esta Conta é" -"This Email template no longer exists.","Este modelo de e-mail não existe mais." -"This Role no longer exists","Esse papel não existe mais" -"This Role no longer exists.","Esse Papel não existe mais." -"This account is","Esta conta é" -"This account is inactive.","Esta conta está inativa." -"This action cannot be undone.","Essa ação não pode ser desfeita." -"This attribute set does not have attributes which we can use for configurable product","Este conjunto de atributos não possui atributos que possamos utilizar para o produto configurável" -"This attribute shares the same value in all the stores","Este atributo partilha o mesmo valor em todas as lojas" -"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Esta é uma loja de demonstração. Qualquer ordem ou encomenda colocada nesta loja não será honrada ou completa." -"This is a required field.","Este é um campo obrigatório." -"This product is currently disabled.","Este produto está atualmente desativado." -"This report depends on timezone configuration. Once timezone is changed, the lifetime statistics need to be refreshed.","Este relatório depende da configuração de fuso horário. Uma vez que o fuso horário é alterado, as estatísticas de vida precisam ser atualizadas." -"This section is not allowed.","Esta seção não é permitida." -"This user no longer exists.","Este usuário não existe mais." -"Time","Tempo" -"Time selection:","Seleção de tempo:" -"Time:","Tempo:" -"Timeout limit for response from synchronize process was reached.","Tempo limite para a resposta do processo de sincronização foi alcançado." -"To","Para" -"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","Para cancelar autorizações pendentes e liberar quantidades que já foram processadas durante este pagamento, clique em Cancelar." -"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","Para usar o PayPal Payflow Link, é necessário configurar sua conta do PayPal Payflow Link no site do PayPal." -"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","Para usar o PayPal Advanced, é necessário configurar sua conta do PayPal Avanced no site do PayPal." -"Toggle Editor","Editor de Alternar" -"Tools","Ferramentas" -"Top 5 Search Terms","Top 5 de Termos de Pesquisa" -"Total","Total" -"Total Invoiced","Total Faturado" -"Total Order Amount","Valor Total da Ordem" -"Total Refunded","Total Reembolsado" -"Total of %d record(s) have been deleted.","No total %d registro(s) foi(foram) excluído(s)." -"Total of %d record(s) have been updated.","Total de %d registro(s) foram atualizados." -"Total of %d record(s) were canceled.","Total de %d registros foram cancelados" -"Total of %d record(s) were deleted","Total de %d registro(s) foram excluídos" -"Total of %d record(s) were deleted.","Total de %d registro(s) foram excluídos." -"Total of %d record(s) were updated","Total de %d registro(s) foram atualizados" -"Total of %d record(s) were updated.","Total de %d registro(s) foram atualizados." -"Track Order","Rastrear Ordem" -"Track this shipment","Acompanhar este envio" -"Tracking number %s for %s assigned","Atribuído número de rastreamento %s para %s" -"Tracking number cannot be empty.","Número de rastreamento não pode ser vazio." -"Transaction Data","Dados da Transação" -"Transaction Details","Detalhes da Transação" -"Transaction ID","ID da Transação" -"Transaction Type","Tipo de Transação" -"Transactional Emails","Emails de Transações" -"Transactions","Transações" -"Try Magento Go for Free","Teste o Magento Go grátis" -"Type","Tipo" -"Type:","Tipo:" -"URL Rewrite","Reescrever URL" -"URL Rewrite Information","Informação Reescrita de URL" -"URL Rewrite Management","Gestão Reescrita de URL" -"Unable to cancel the credit memo.","Não foi possível cancelar a nota de crédito." -"Unable to find a Email Template to delete.","Incapaz de encontrar um Modelo de Email para apagar." -"Unable to find a poll to delete.","Não foi possível encontrar uma enquete para apagar." -"Unable to find a tag to delete.","Incapaz de encontrar uma marca para apagar." -"Unable to find a user to delete.","Impossível encontrar usuário a ser apagado." -"Unable to initialize import model","Impossível iniciar modelo de importação" -"Unable to refresh lifetime statistics.","Impossível atualizar estatísticas do tempo de existência." -"Unable to refresh recent statistics.","Impossível atualizar estatísticas recentes." -"Unable to save Cron expression","Não foi possível salvar expressão Cron" -"Unable to save the cron expression.","Impossível salvar a expressão cron." -"Unable to save the invoice.","Não foi possível salvar a fatura." -"Unable to send the invoice email.","Impossível enviar email com a fatura." -"Unable to send the shipment email.","Não foi possível enviar o email de expedição." -"Unable to update transaction details.","Não foi possível atualizar as informações da transação." -"Unable to void the credit memo.","Não foi possível anular a nota de crédito." -"Unknown","Desconhecido" -"Unlimited","Ilimitado" -"Update","Atualizar" -"Updated At","Atualizado Em" -"Upload File","Carregar Arquivo" -"Upload Files","Carregar Arquivos" -"Upload HTTP Error","Carregar Erro HTTP" -"Upload I/O Error","Carregar Erro de E/S" -"Upload Security Error","Carregar Erro de Segurança" -"Upload import file","Carregar arquivo de importação" -"Uploaded file is larger than %.2f kilobytes allowed by server","O arquivo de upload é maior que os %.2f kilobytes permitidos pelo servidor" -"Use All Available Attributes","Usar Todos os Atributos Disponíveis" -"Use Config Settings","Utilizar opções de configuração" -"Use Default","Utilizar padrão" -"Use Default Value","Utilizar valor padrão" -"Use Default Variable Values","Usar Valores-Padrão para Variáveis" -"Use FTP Connection","Use Conexão FTP" -"Use Website","Usar Website" -"Used Currently For","Atualmente Usado(s) Para" -"Used as Default For","Usado(s) por Padrão Para" -"User Email","Email do Usuário" -"User ID","Identificação do Usuário" -"User Info","Informações do Usuário" -"User Information","Informações do Usuário" -"User Name","Nome do Usuário" -"User Name is required field.","Nome de Usuário é um campo obrigatório." -"User Name:","Nome do Usuário:" -"User Password","Senha do Usuário" -"User Role","Função do Usuário" -"User Roles","Funções do Usuário" -"User Roles Information","Informações sobre Papéis do Usuário" -"User Type Resources","Recursos de tipo de usuário" -"User name","Nome do Usuário" -"Users","Usuários" -"VAT Number is Invalid","O número VAT é inválido" -"VAT Number is Valid","O número VAT é válido" -"Validation Results","Resultados de Validação" -"Value","Valor" -"Value Delimiter:","Valor Delimitador:" -"Variable","Variável" -"Variable Code","Código de Variável" -"Variable HTML Value","Valor HTML de Variável" -"Variable ID","Identificação de Variável" -"Variable Name","Nome da Variável" -"Variable Plain Value","Valor PLAIN de Variável" -"Verifier code: %s","Verifier code: %s" -"View Actions XML","Visualizar XML de Ações" -"View Full Size","Visualizar Tamanho Completo" -"View Memo","Visualizar Memorando" -"View Memo for #%s","Ver Memo por #%s" -"View Shipment","Ver Remessa" -"View Statistics For:","Veja Estatísticas Para:" -"Visibility:","Visibilidade:" -"Warning","Aviso" -"Warning! Empty value can cause problems with CSV format.","Atenção! Valor vazio pode causar problemas com o formato CSV." -"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Aviso!\r\nEsta ação removerá este usuário do papel já atribuído\r\nVocê tem certeza?" -"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Atenção!\r\nEsta ação irá remover os usuários das funções já atribuídas\r\nVocê tem certeza?" -"Warning: Please do not close the window during importing/exporting data","Aviso: Por favor não feche a janela durante a importação/exportação de dados" -"Watermark File for %s","Arquivo Marca d'Água para %s" -"We appreciate our merchants\' feedback, please take our survey to provide insight on the features you would like included in Magento. Remove this notification","Agradecemos o feedback de nossos comerciantes, por favor responda a nosso inquérito para fornecer uma visão sobre as características que você gostaria de incluir no Magento. Remover esta notificação" -"We\'re in our typing table, coding away more features for Magento. Thank you for your patience.","Estamos em nossa tabela de digitação, codificando mais recursos para Magento. Obrigado pela sua paciência." -"Web Section","Seção Web" -"Web Services","Serviços Web" -"Web services","Serviços Web" -"Website","Website" -"What is this?","O que é isso?" -"Wishlist Report","Assinalar na Lista de Desejos" -"Wishlist item is not loaded.","O item da lista de presentes não foi carregado." -"Wrong account specified.","Conta errada especificada." -"Wrong billing agreement ID specified.","ID de acordo de faturamento especificado errado." -"Wrong column format.","Formato errado de coluna." -"Wrong newsletter template.","Modelo de newsletter errado." -"Wrong quote item.","Item de citação errado." -"Wrong tab configuration.","Configuração errada de tabulação." -"Wrong tag was specified.","Tabulação errada foi especificada." -"Wrong transaction ID specified.","ID errado de transação especificado." -"XML","XML" -"XML data is invalid.","Dados XML inválidos." -"XML object is not instance of ""Varien_Simplexml_Element"".","Objeto XML não é instância de ""Varien_Simplexml_Element""." -"YTD","YTD" -"Year","Ano" -"Yes","Sim" -"Yes (301 Moved Permanently)","Sim (301 movido permanentemente)" -"Yes (302 Found)","Sim (302 Encontrado)" -"Yes (only price with tax)","Sim (preço somente com impostos)" -"You cannot delete your own account.","Você não pode apagar sua própria conta." -"You have %s unread message(s).","Você tem %s mensagens não lidas." -"You have %s unread message(s). Go to messages inbox.","Você tem %s mensagem(s) não lidas. Ir para a caixa de entrada de mensagens." -"You have %s, %s and %s unread messages. Go to messages inbox.","Você tem %s, %s e %s mensagens não lidas. Ir para a caixa de entrada de mensagens." -"You have logged out.","Você se desconetou." -"You have not enough permissions to use this functionality.","Você não tem permissões suficientes para utilizar esta funcionalidade." -"You must have JavaScript enabled in your browser to utilize the functionality of this website.","Você deve ativar o Javascript no seu navegador para utilizar as funcionalidades deste site." -"You need to specify order items.","Você precisa especificar itens da ordem." -"You will need to wait when the action ends.","Será necessário aguardar quando a ação terminar." -"Your answers contain duplicates.","Suas respostas contêm duplicatas." -"Your password has been updated.","A sua senha foi atualizada." -"Your password reset link has expired.","Seu link de configuração de senha expirou." -"Your server PHP settings allow you to upload files not more than %s at a time. Please modify post_max_size (currently is %s) and upload_max_filesize (currently is %s) values in php.ini if you want to upload larger files.","As configurações do seu servidor PHP permitem que você faça o carregamento de arquivos não mais que %s de cada vez. Por favor modifique os valores post_max_size (atualmente é %s) e upload_max_filesize (atualmente é %s) em php.ini se você quiser fazer carregar arquivos maiores." -"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Seu servidor web está configurado incorretamente. Como resultado, os arquivos de configuração com informações confidenciais são acessíveis de fora. Entre em contato com seu provedor de hospedagem." -"Zip/Postal Code","Zip/Código Postal" -"Zip/Postal Code:","CEP/Código Postal:" -"[ deleted ]","[ apagado ]" -"[GLOBAL]","[GLOBAL]" -"[STORE VIEW]","[VISUALIZAR LOJA]" -"[WEBSITE]","[WEBSITE]" -"b","b" -"close","fechar" -"critical","crítico" -"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","exemplo: ""sitemap /"" ou ""/"" para o caminho base (caminho deve ser gravável)" -"example: sitemap.xml","exemplo: sitemap.xml" -"failed","fracassado" -"from","de" -"major","maior" -"minor","menor" -"notice","aviso" -"store(%s) scope","âmbito de loja (%s)" -"successful","bem sucedido" -"to","para" -"website(%s) scope","âmbito de site (%s)" -"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento configuration.","{{base_url}} não é recomendada para uso em um ambiente de produção para declarar Base URL Insegura/Base URL Segura. É altamente recomendável alterar este valor em suas configurações Magento." diff --git a/app/locale/pt_BR/Mage_AmazonPayments.csv b/app/locale/pt_BR/Mage_AmazonPayments.csv deleted file mode 100644 index 86e9b2094..000000000 --- a/app/locale/pt_BR/Mage_AmazonPayments.csv +++ /dev/null @@ -1,101 +0,0 @@ -" Select Shipping Method","Selecione a forma de envio" -"
    Trace confirmation request:
    %s","
    Rastrear pedido de confirmação:
    %s" -"Access Key","Chave de acesso" -"Access Key ID","ID da chave de acesso" -"Amazon Simple Pay","Amazon Simple Pay" -"Amazon Simple Pay notification error","Aviso de erro no Amazon Simple Pay" -"Amazon Simple Pay service capture confirmation error: confirmation request amount is not equal to the amount of order.","Erro na confirmação de recebimento do serviço Amazon Simple Pay: o total no pedido de confirmação não é igual ao total do pedido." -"Amazon Simple Pay service capture confirmation error: the amount in the existing invoice does not match the amount in the confirmation request.","Erro na confirmação de recebimento do serviço Amazon Simple Pay: o total na fatura existente não coincide com o total no pedido de confirmação." -"Amazon Simple Pay service capture confirmation error: the existing transaction ID does not match the transaction ID in the confirmation request.","Erro na confirmação de recebimento do serviço Amazon Simple Pay: o ID da transação existente não coincide com o ID da transação no pedido de confirmação." -"Amazon Simple Pay service capture confirmation. The invoice was captured automatically.","Confirmação de recebimento do serviço Amazon Simple Pay. A fatura foi criada automaticamente." -"Amazon Simple Pay service confirmation error: order states sequence violation.","Erro na confirmação do serviço Amazon Simple Pay: violação na sequência dos estados do pedido." -"Amazon Simple Pay service confirmation error: the order currency does not match the currency of the IPN request.","Erro na confirmação do serviço Amazon Simple Pay: a moeda do pedido não coincide com a moeda do pedido IPN." -"Amazon Simple Pay service confirmation error: the order specified in the IPN request cannot be found.","Erro na confirmação do serviço Amazon Simple Pay: o pedido especificado no pedido IPN não pode ser encontrado." -"Amazon Simple Pay service confirmation error: the payment method in the order is not Amazon Simple Pay.","Erro na confirmação do serviço Amazon Simple Pay: o método de pagamento no pedido não é Amazon Simple Pay." -"Amazon Simple Pay service confirmed capture for invoice %s.","O serviço Amazon Simple Pay confirmou o recebimento para a fatura %s." -"Amazon Simple Pay service confirmed refund for credit memo %s.","O serviço Amazon Simple Pay confirmou o reembolso para a nota de crédito %s." -"Amazon Simple Pay service has confirmed amount authorization.","O serviço Amazon Simple Pay confirmou a autorização do total." -"Amazon Simple Pay service has confirmed cancelation.","O serviço Amazon Simple Pay confirmou o cancelamento." -"Amazon Simple Pay service has confirmed capture for invoice %s. The invoice was automatically captured.","O serviço Amazon Simple Pay confirmou o recebimento para a fatura %s. A fatura foi recebida automaticamente." -"Amazon Simple Pay service has confirmed capture initiation.","O serviço Amazon Simple Pay confirmou a iniciação do recebimento." -"Amazon Simple Pay service has confirmed capture.","O serviço Amazon Simple Pay confirmou o recebimento." -"Amazon Simple Pay service has confirmed payment capture. Invoice %s was automatically created after confirmation.","O serviço Amazon Simple Pay confirmou o recebimento do pagamento. A fatura %s foi criada automaticamente após a confirmação." -"Amazon Simple Pay service has confirmed payment capture. Invoice was created automatically.","O serviço Amazon Simple Pay confirmou o recebimento do pagamento. Uma fatura foi criada automaticamente." -"Amazon Simple Pay service has confirmed payment refund. Credit memo %s was automatically created after confirmation.","O serviço Amazon Simple Pay confirmou o reembolso do pagamento. A nota de crédito %s foi criada automaticamente após a confirmação." -"Amazon Simple Pay service has confirmed payment refund. Credit memo was created automatically.","O serviço Amazon Simple Pay confirmou o reembolso do pagamento. Uma nota de crédito foi criada automaticamente." -"Amazon Simple Pay service has confirmed payment refund. The credit memo was created automatically.","O serviço Amazon Simple Pay confirmou o reembolso do pagamento. A nota de crédito foi criada automaticamente." -"Amazon Simple Pay service has confirmed refund.","O serviço Amazon Simple Pay confirmou o reembolso." -"Amazon Simple Pay service has confirmed refund. The credit memo was processed automatically.","O serviço Amazon Simple Pay confirmou o reembolso. A nota de crédito foi processada automaticamente." -"Amazon Simple Pay service has confirmed refunded credit memo %s. The credit memo was processed automatically.","O serviço Amazon Simple Pay confirmou o reembolso na nota de crédito %s. A nota de crédito foi processada automaticamente." -"Amazon Simple Pay service is not available. Payment was not processed.","O serviço Amazon Simple Pay não está disponível. O pagamento não foi processado." -"Amazon Simple Pay service payment confirmation has failed.","Falha na confirmação de pagamento do serviço Amazon Simple Pay." -"Amazon Simple Pay service refund confirmation error: the amount in the existing creditmemo does not match the amount in the confirmation request.","Erro na confirmação de reembolso do serviço Amazon Simple Pay; o total na nota de crédito existente não coincide com o total no pedido de confirmação." -"Amazon Simple Pay service refund confirmation error: the confirmation request amount does not match the order amount.","Erro na confirmação de reembolso do serviço Amazon Simple Pay; o total do pedido de confirmação não coincide com o total do pedido." -"Amazon Simple Pay service refund confirmation error: the transaction ID in the existing creditmemo does not match the transaction ID in the confirmation request.","Erro na confirmação de reembolso do serviço Amazon Simple Pay; o ID da transação na nota de crédito existente não coincide com o ID da transação no pedido de confirmação." -"Authorize Only","Somente Autorizar" -"Authorize and Capture","Autorizar e Controlar" -"Cancel Description","Descrição de Cancelamento" -"Cancel Order Notification received from Checkout by Amazon service.","Notificação de Cancelamento de Pedido recebida do serviço Checkout da Amazon." -"Checkout by Amazon","Checkout da Amazon" -"Continue Shopping","Continuar Comprando" -"Customer was redirected to Amazon Simple Pay site","O cliente foi redirecionado ao site do Amazon Simple Pay" -"Debug","Debug" -"Debug Log","Registro de debug" -"Email Sender","Remetente do e-mail:" -"Enable","Ativar" -"Error Log","Registro de erro" -"FPS Sandbox Service URI","Serviço de Sandbox FPS URI" -"FPS Service URI","Serviço FPS URI" -"Immediate Return","Retorno imediato" -"Invalid action code.","Código de ação inválido." -"Invalid request.","Pedido inválido." -"Invoice was created with Checkout by Amazon.","A fatura foi criada com o Checkout da Amazon." -"Merchant ID","Identificação do comerciante" -"Merchant Login","Login do comerciante" -"Merchant Name","Nome do do comerciante" -"Merchant Password","Senha do comerciante" -"Merchant Token","Token do comerciante" -"Method Choice Checkout Message","Mensagem do Checkout sobre Escolha de Método" -"New Order Notification received from Checkout by Amazon service.","Nova Notificação de Pedido recebido do serviço Checkout da Amazon." -"New Order Status","Status do Novo Pedido" -"Notification Error Transactional Email","E-mail de Transação de Erro em Notificação" -"Order Ready To Ship Notification received form Checkout by Amazon service.","Aviso de Pedido Pronto para Ser Despachado recebido do serviço Checkout da Amazon." -"Order was canceled with Checkout by Amazon.","O pedido foi cancelado com o Checkout da Amazon." -"Payment Action","Ação de Pagamento" -"Payment Description","Descrição do pagamento" -"Payment Sandbox Service URI","Serviço de Sandbox de Pagamento URI" -"Payment Service URI","Serviço de Pagamento URI" -"Payment authorization canceled with Amazon Simple Pay service.","Autorização de pagamento cancelada com o serviço Amazon Simple Pay." -"Pending Amazon Simple Pay","Amazon Simple Pay pendente" -"Redirect Message","Redirecionar mensagem" -"Refund Description","Descrição do reembolso" -"Refund was created with Checkout by Amazon.","O reembolso foi criado pelo Checkout da Amazon." -"Report Email","Relatar E-mail" -"Report Error to Email","Relatar Erro ao E-mail" -"Response body is not a valid FPS response.","O corpo da resposta não é uma resposta FPS válida." -"SUCCESS","SUCESSO" -"Sandbox","Sandbox" -"Secret Key","Chave secreta" -"Secret Key ID","ID da chave secreta" -"Shipment was created with Checkout by Amazon.","A remessa foi criada com o Checkout da Amazon." -"Thank you for your purchase!","Obrigado por sua compra!" -"The customer has canceled payment and successfully returned from Amazon Simple Pay site","O cliente cancelou o pagamento e foi retornado com sucesso do site do Amazon Simple Pay" -"The customer has successfully returned from Amazon Simple Pay site","O consumidor foi retornado com sucesso do site do Amazon Simple Pay" -"The invoice was created (online capture). Waiting for capture confirmation from Amazon Simple Pay service.","A fatura foi criada (recebimento on-line). Aguardando confirmação de recebimento do serviço Amazon Simple Pay." -"The invoice was not refunded. Amazon Simple Pay service error: [%s] %s","A fatura não foi reembolsada. Erro no serviço Amazon Simple Pay: [%s] %s" -"The item specified in callback request XML was not found in quote.","O item especificado no pedido de retorno XML não foi encontrado na citação." -"The order was not canceled. Amazon Simple Pay service error: [%s] %s","O pedido não foi cancelado. Erro no serviço Amazon Simple Pay: [%s] %s" -"The order was not captured online. Authorization confirmation is required.","O pedido não foi recebido on-line. É necessária uma confirmação de autorização." -"The order was not captured. Amazon Simple Pay service error: [%s] %s","O pedido não foi criado. Erro no serviço Amazon Simple Pay: [%s] %s" -"The payment was captured online with Amazon Simple Pay service. The invoice was created. Waiting for capture confirmation from the payment service.","O pagamento foi recebido on-line com o serviço Amazon Simple Pay. A fatura foi criada. Aguardando confirmação do recebimento do serviço de pagamento." -"The payment was refunded online with Amazon Simple Pay service. The credit memo was created. Waiting for refund confirmation from Amazon Simple Pay service.","O pagamento foi devolvido on-line com o serviço Amazon Simple Pay. A nota de crédito foi criada. Aguardando confirmação do reembolso do serviço Amazon Simple Pay." -"The payment was refunded online. Waiting for refund confirmation from Amazon Simple Pay service.","O pagamento foi reembolsado on-line. Aguardando pela confirmação do reembolso do serviço Amazon Simple Pay." -"The request is not a valid IPN request.","Este não é um pedido IPN válido." -"The request was signed incorrectly or the signature is missing.","O pedido foi assinado incorretamente ou não tem assinatura." -"Title","Título" -"Use Callback API","Use Callback API" -"You will be redirected to Checkout by Amazon in a few seconds.","Você será redirecionado para o Checkout pela Amazon em alguns segundos." -"You will receive an order confirmation email with details of your order and a link to track its progress.","Você irá receber um e-mail de confirmação de pedido com detalhes de seu pedido e um link para acompanhar o progresso." -"You will receive an order confirmation email with details of your order and a link to track its progress.
    ","Você receberá um e-mail de confirmação de pedido com detalhes do seu pedido e um link para acompanhar seu progresso.
    " -"Your billing address will be ignored and you will be redirected to Checkout by Amazon website.","Seu endereço de cobrança será ignorado e você será redirecionado para o Checkout pelo site da Amazon." -"Your order has been received.","Seu pedido foi recebido." diff --git a/app/locale/pt_BR/Mage_Api.csv b/app/locale/pt_BR/Mage_Api.csv deleted file mode 100644 index a1fd067b1..000000000 --- a/app/locale/pt_BR/Mage_Api.csv +++ /dev/null @@ -1,18 +0,0 @@ -"Access denied.","Acesso negado." -"Can not find webservice adapter.","Não pode encontrar o adaptador do serviço de web." -"Client Session Timeout (sec.)","Tempo Limite da Sessão de Cliente (seg.)" -"Default Response Charset","Conjunto de Caracteres Predefinido de Resposta" -"Email","E-mail" -"Enable WSDL Cache","Ativar cache WSDL" -"General Settings","Definições Gerais" -"Invalid webservice adapter specified.","Adaptador de serviço de rede especificado inválido." -"Invalid webservice handler specified.","Processador de serviço de rede especificado inválido." -"Magento Core API","Núcleo Magento API" -"Magento Core API Section","Seção Núcleo Magento API" -"SOAP/XML-RPC - Roles","SOAP/XML-RPC - Funções" -"SOAP/XML-RPC - Users","SOAP/XML-RPC - Usuários" -"Unable to login.","Incapaz de entrar." -"User Name","Nome do Usuário" -"WS-I Compliance","Conformidade WS-I" -"Web Services","Serviços Web" -"Your account has been deactivated.","Sua conta foi desativada." diff --git a/app/locale/pt_BR/Mage_Api2.csv b/app/locale/pt_BR/Mage_Api2.csv deleted file mode 100644 index 1ff2a8eb9..000000000 --- a/app/locale/pt_BR/Mage_Api2.csv +++ /dev/null @@ -1,238 +0,0 @@ -"%s","%s" -"%s role is a special one and can\'t be changed.","O papel % é especial e não pode ser alterado." -"%s role is a special one and can\'t be deleted.","O papel % é especial e não pode ser apagado." -"%s role is protected.","O papel % é protegido." -"ACL Attribute Rules","Regras de Atributo ACL" -"ACL Attributes Information","Informações de Atributos ACL" -"Add","Adicionar" -"Add Admin Role","Adicionar Função de Administrador" -"Add New Role","Adicionar nova função" -"Address Type","Tipo de endereço" -"Admin","Admin" -"Allow","Permitir" -"An error occurred while deleting the role.","Ocorreu um erro ao deletar a função." -"An error occurred while saving attribute rules.","Ocorreu um erro ao salvar as regras dos atributos." -"An error occurred while saving role.","Ocorreu um erro ao salvar a função." -"Api Rules Information","Informações das regras API" -"Assigned","Atribuído" -"Associate to Website","Associar ao site" -"Attribute Rules Information","Informações das regras de atributo" -"Attribute Set","Conjunto de Atributos" -"Attributes","Atributos" -"Automatically Return Credit Memo Item to Stock","Retornar Automaticamente a Nota de Crédito do Item para o Estoque" -"Back","Voltar" -"Backorders","Ordens em Atraso" -"Base Currency","Moeda Padrão" -"Base Customer Balance","Balanço do cliente base" -"Base Discount","Disconto de base" -"Base Discount Amount","Total do desconto de base" -"Base Item Subtotal","Subtotal do item de base" -"Base Item Subtotal Including Tax","Subtotal do item de base incluindo taxas" -"Base Original Price","Preço original de base" -"Base Price","Preço de base" -"Base Price Including Tax","Preço de base incluindo taxas" -"Base Shipping","Envio de base" -"Base Shipping Discount","Desconto do envio de base" -"Base Shipping Tax","Taxa do envio de base" -"Base Subtotal","Subtotal de base" -"Base Subtotal Including Tax","Subtotal de base incluindo taxa" -"Base Tax Amount","Total da taxa de base" -"Base Total Due","Total de base devido" -"Base Total Paid","Total de base pago" -"Base Total Refunded","Total de base reembolsado" -"Buy Now URL","URL Compre Agora" -"Can Be Divided into Multiple Boxes for Shipping","Pode ser dividido em várias caixas para envio" -"Canceled Qty","QTD cancelada" -"Catalog","Catálogo" -"Catalog Product","Catalogar produto" -"CatalogInventory","Catalogar inventário" -"Category ID","ID de categoria" -"City","Cidade" -"Company","Companhia" -"Country","País" -"Coupon Code","Código do cupom" -"Create","Criar" -"Create Permanent Redirect for old URL","Criar Redirecionamento Permanente para antiga URL" -"Created From","Criado a partir de" -"Customer","Cliente" -"Customer Address","Endereço do cliente" -"Customer Address ID","ID do endereço do cliente" -"Customer Balance","Saldo do cliente" -"Customer First Name","Primeiro Nome do Cliente" -"Customer ID","ID do Cliente" -"Customer Last Name","Último Nome do Cliente" -"Customer Middle Name","Nome do meio do cliente" -"Customer Prefix","Prefixo do cliente" -"Customer Suffix","Sufixo do cliente" -"Default Image","Imagem padrão" -"Delete","Excluir" -"Deny","Negar" -"Disable automatic group change based on VAT ID","Desativar mudança de grupo automática baseado no ID do VAT" -"Discount","Desconto" -"Discount Amount","Quantia de Desconto" -"Discount Description","Descrição do desconto" -"Edit","Editar" -"Edit %s ACL attribute rules","Editar regras do atributo ACL %s" -"Edit Role","Editar funçõa" -"Edit attribute rules for %s Role","Editar regras de atributo para a função %s" -"Email","E-mail" -"Enable Qty Increments","Habilitar Incrementos na Qtde." -"Exclude","Excluir" -"File Content","Conteúdo do arquivo" -"File MIME Type","Tipo MIME do arquivo" -"File Name","Nome do arquivo" -"Final Price With Tax","Preço final com impostos" -"Final Price Without Tax","Preço final sem imposto" -"First Name","Primeiro nome" -"Gift Message","Mensagem de presente" -"Grand Total","Total geral" -"Grand Total to Be Charged","Total geral a ser cobrado" -"Group","Grupo" -"Guest","Convidado" -"Has Custom Options","Tem opções de consumo" -"ID","Identidade" -"Inventory Data","Dados de inventário" -"Invoiced Qty","QTD faturada" -"Is Confirmed","Está confirmado" -"Is Default Billing Address","É o endereço de cobrança padrão" -"Is Default Shipping Address","É o endereço de cobrança padrão" -"Item ID","ID do item" -"Item Subtotal","Subtotal do item" -"Item Subtotal Including Tax","Subtotal do item incluindo imposto" -"Label","Etiqueta" -"Last Logged In","Último login em" -"Last Name","Último nome" -"Low Stock Date","Data da baixa" -"Manage Stock","Gerenciar Estoque" -"Maximum Qty Allowed in Shopping Cart","Qtde. Máxima Permitida no Carrinho" -"Minimum Qty Allowed in Shopping Cart","Qtde Mínima Permitida no Carrinho de Compras" -"New Role","Nova Função" -"Notify for Quantity Below","Notificar para Quantidade Abaixo" -"OAuth","OAuth" -"Order","Pedido" -"Order Addresses","Endereços do pedido" -"Order Comments","Comentários do pedido" -"Order Currency","Moeda do pedido" -"Order Date","Data do pedido" -"Order ID","ID da Ordem" -"Order ID (internal)","ID do pedido (interno)" -"Order Item ID","ID de item do pedido" -"Order Items","Items do pedido" -"Order Status","Status do pedido" -"Ordered Qty","QTD pedida" -"Orders","Ordens" -"Original Price","Preço Original" -"Parent Order Item ID","ID do item do pedido parente" -"Payment Method","Método de Pagamento" -"Phone Number","Número de telefone" -"Placed from IP","Situado no IP" -"Please enter a valid number in ""max_sale_qty"" field","Por favor, digite um número válido no campo ""max_sale_qty""" -"Please enter a valid number in ""min_qty"" field","Por favor, digite um número válido no campo ""min_qty""" -"Please enter a valid number in ""min_sale_qty"" field","Por favor, digite um número válido no campo ""min_sale_qty""" -"Please enter a valid number in ""notify_stock_qty"" field","Por favor, digite um número válido no campo ""notify_stock_qty""" -"Please use numbers only in ""category_id"" field.","Por favor, use apenas números no campo ""category_id""." -"Please use numbers only in ""qty_increments"" field. Please avoid spaces or other characters such as dots or commas.","Por favor, use apenas números no campo ""qty_increments"". Por favor, evite espaços ou outros caracteres especiais como pontos ou vírgulas." -"Position","Posição" -"Price","Preço" -"Price Including Tax","Preço incluindo impostos" -"Product","Produto" -"Product Category","Categoria do produto" -"Product ID","ID do Produto" -"Product Image","Imagem do produto" -"Product Type","Tipo de Produto" -"Product URL","URL do produto" -"Product Website","Site do produto" -"Product and Custom Options Name","Nome do produto e das opções do cliente" -"Qty","Quant." -"Qty Increments","Incrementos de Quantidade" -"Qty Uses Decimals","Qtde: Usa Decimais" -"Qty for Item's Status to Become Out of Stock","Quant. para Status do Item mudar para Fora de Estoque" -"REST - Attributes","REST - Atributos" -"REST - Roles","REST - Funções" -"REST ACL Attributes","REST Atributos ACL" -"REST Attributes","REST Atributos" -"REST Role","REST Função" -"REST Roles","Funções REST" -"REST Roles Information","REST Informações das Funções" -"Read","Ler" -"Refunded Qty","QTD reembolsada" -"Regular Price With Tax","Preço regular com impostos" -"Regular Price Without Tax","Preço regular sem impostos" -"Rest Roles","Funções Rest" -"Retrieve","Recuperar" -"Role ""%s"" no longer exists","A função ""%s"" não existe mais" -"Role ""%s"" not found.","Função ""%s"" não encontrada." -"Role API Resources","Recursos da função API" -"Role Info","Informação de Função" -"Role Information","Informação de Função" -"Role Name","Nome de Função" -"Role Users","Usuários de Função" -"Role has been deleted.","A função foi apagada." -"Roles","Funções" -"SKU","Unidade de Manutenção de Estoque" -"Salability Status","Status da vendabilidade" -"Sales","Vendas" -"Save","Salvar" -"Shipped Qty","QTD enviada" -"Shipping Amount","Valor do Frete" -"Shipping Discount","Desconto no envio" -"Shipping Including Tax","Envio incluindo impostos" -"Shipping Method","Tipo de Frete" -"Shipping Tax","Imposto do envio" -"State","Estado" -"Stock Availability","Disponibilidade de Estoque" -"Stock ID","ID do estoque" -"Stock Item","Item do estoque" -"Stock Status","Estado de Estoque" -"Store Currency to Order Currency Rate","Moeda da loja para taxa de moeda do pedido" -"Store Name","Nome da Loja" -"Street","Rua" -"Subtotal","Subtotal" -"Subtotal Including Tax","Subtotal incluindo imposto" -"System","Sistema" -"Tax Amount","Valor do Imposto" -"Tax Name","Nome de imposto" -"Tax Percent","Porcentagem de Imposto" -"Tax Rate","Taxa de Imposto" -"The ""enable_qty_increments"" field must be set to 0 or 1.","O campo ""enable_qty_increments"" deve ser marcado com 0 ou 1" -"The ""is_decimal_divided"" field must be set to 0 or 1.","O campo ""is_decimal_divided"" deve ser marcado com 0 ou 1." -"The ""is_in_stock"" field must be set to 0 or 1.","O campo ""is_in_stock"" deve ser marcado com 0 ou 1." -"The ""is_qty_decimal"" field must be set to 0 or 1.","O campo ""is_qty_decimal"" deve ser marcado com 0 ou 1." -"The ""is_qty_decimal"" field must be set to 0, 1, or 2.","O campo ""is_qty_decimal"" deve ser marcado com 0, 1 ou 2." -"The ""manage_stock"" field must be set to 0 or 1.","O campo ""manage_stock"" deve ser marcado com 0 ou 1." -"The ""stock_status_changed_auto"" field must be set to 0 or 1.","O campo ""stock_status_changed_auto"" deve ser marcado com 0 ou 1." -"The ""use_config_backorders"" field must be set to 0 or 1.","O campo ""use_config_backorders"" deve ser marcado com 0 ou 1." -"The ""use_config_enable_qty_inc"" field must be set to 0 or 1.","O campo ""use_config_enable_qty_inc"" deve ser marcado com 0 ou 1." -"The ""use_config_manage_stock"" field must be set to 0 or 1.","O campo ""use_config_manage_stock"" deve ser marcado com 0 ou 1." -"The ""use_config_max_sale_qty"" field must be set to 0 or 1.","O campo ""use_config_max_sale_qty"" deve ser marcado com 0 ou 1." -"The ""use_config_min_qty"" field must be set to 0 or 1.","O campo ""use_config_min_qty"" deve ser marcado com 0 ou 1." -"The ""use_config_min_sale_qty"" field must be set to 0 or 1.","o campo ""use_config_min_sale_qty"" deve ser marcado como 0 ou 1." -"The ""use_config_notify_stock_qty"" field must be set to 0 or 1.","O campo ""use_config_notify_stock_qty"" deve ser marcado com 0 ou 1." -"The ""use_config_qty_increments"" field must be set to 0 or 1.","O campo ""use_config_qty_increments"" deve ser marcado com 0 ou 1." -"The attribute rules were saved.","As regras para atributos foram salvas." -"The role has been saved.","O papel foi salvo." -"The role is a special one and not for assigning it to admin users.","Este papel é especial e não é para ser designado para usuários administradores." -"Total Due","Total Devido" -"Total Paid","Total Pago" -"Total Refunded","Total Reembolsado" -"Total Reviews Count","Contagem total de avaliações" -"Type","Tipo" -"URL","URL" -"Update","Atualizar" -"Use Config Settings for Allow Gift Message","Use as configurações para permitir mensagem de presente" -"Use Config Settings for Allow Gift Wrapping","Use as configurações para permitir embrulhos para presente" -"Use Config Settings for Backorders","Use as configurações para pedidos não atendidos" -"Use Config Settings for Enable Qty Increments","Use as configurações para ativar aumentos de QTD" -"Use Config Settings for Manage Stock","Use as configurações para gerenciar o estoque" -"Use Config Settings for Maximum Qty Allowed in Shopping Cart","Use as configurações para QTD máxima permitida no carrinho de compras" -"Use Config Settings for Minimum Qty Allowed in Shopping Cart","Use as configurações para QTD mínima permitida no carrinho de compras" -"Use Config Settings for Notify for Quantity Below","Use as configurações para notificar para quantidade abaixo" -"Use Config Settings for Qty Increments","Use as configurações para incrementos de QTD" -"Use Config Settings for Qty for Item's Status to Become Out of Stock","Use as configurações para QTD para status de itens que estão para sair de estoque" -"User Type","Tipo de usuário" -"User type ""%s"" no longer exists","Tipo de usuário ""%s"" não existe mais" -"User type ""%s"" not found.","Tipo de usuário ""%s"" não encontrado." -"Web Services","Serviços Web" -"Web services","Serviços Web" -"Write","Escrever" -"ZIP/Postal Code","CEP/Código Postal" diff --git a/app/locale/pt_BR/Mage_Authorizenet.csv b/app/locale/pt_BR/Mage_Authorizenet.csv deleted file mode 100644 index 4adf65437..000000000 --- a/app/locale/pt_BR/Mage_Authorizenet.csv +++ /dev/null @@ -1,41 +0,0 @@ -"--Please Select--","--Por Favor, Escolha--" -"API Login ID","ID de Login API" -"Accepted Currency","Moeda Aceita" -"Amount of %s approved by payment gateway. Transaction ID: ""%s"".","Total de %s aprovado pelo portal de pagamento. ID de transação: ""%s""." -"Authorize.net Direct Post","Postagem Direta da Authorize.net" -"Card Verification Number","Número de Verificação do Cartão" -"Card Verification Number Visual Reference","Referência Visual de Número de Verificação do Cartão" -"Close","Fechar" -"Credit Card Information","Informações do Cartão de Crédito" -"Credit Card Number","Número do Cartão de Crédito" -"Credit Card Type","Tipo de Cartão de Crédito" -"Credit Card Types","Tipos de Cartão de Crédito" -"Credit Card Verification","Verificação de Cartão de Crédito" -"Debug","Debug" -"Email Customer","Enviar Email ao Cliente" -"Enabled","Ativado" -"Expiration Date","Data de Validade" -"Gateway URL","URL do Gateway" -"Maximum Order Total","Total Máximo do Pedido" -"Merchant MD5","MD5 Vendedor" -"Merchant's Email","Email do Vendedor" -"Minimum Order Total","Total Mínimo do Pedido" -"New Order Status","Status do Novo Pedido" -"Order saving error: %s","Erro na gravação do pedido: %s" -"Payment Action","Ação de Pagamento" -"Payment authorization error.","Erro na autorização de pagamento." -"Payment authorization error. Transacion id is empty.","Erro de autorização de pagamento. ID de transação está vazio." -"Payment error. Order was not found.","Erro de pagamento. Ordem não foi encontrada." -"Payment error. Paid amount doesn\'t match the order amount.","Erro de pagamento. Valor pago não corresponde ao valor da ordem." -"Payment from Applicable Countries","Pagamento de Países Aplicáveis" -"Payment from Specific Countries","Pagamento de Países Específicos" -"Please, choose payment method","Por favor, escolha o método de pagamento" -"Response hash validation failed. Transaction declined.","Validação de resposta de mistura falhou. Transação recusada." -"Sort Order","Classificar pedido" -"Test Mode","Modo de Teste" -"The order has been created.","A ordem foi criada." -"There was an error processing your order. Please contact us or try again later.","Ocorreu um erro ao processar sua ordem. Entre em contato conosco ou tente novamente mais tarde." -"Title","Título" -"Transaction Key","Chave de Transação" -"What is this?","O que é isso?" -"You will be required to enter your payment details before you place an order.","Você será obrigado a inserir seus detalhes de pagamento antes de colocar uma ordem." diff --git a/app/locale/pt_BR/Mage_Backup.csv b/app/locale/pt_BR/Mage_Backup.csv deleted file mode 100644 index f5bca2415..000000000 --- a/app/locale/pt_BR/Mage_Backup.csv +++ /dev/null @@ -1,55 +0,0 @@ -"Action","Ação" -"An error occurred while creating the backup.","Ocorreu um erro ao criar o backup." -"An error occurred while writing to the backup file ""%s"".","Ocorreu um erro durante a gravação do arquivo de cópia de segurança ""%s""." -"Are you sure you want to delete the selected backup(s)?","Você tem certeza que quer deletar o(s) backup(s) selecionado(s)?" -"Backup Type","Tipo de backup" -"Backup file ""%s"" cannot be read from or written to.","Cópia de segurança do arquivo ""%s"" não pode ser lido ou gravado." -"Backup file ""%s"" does not exist.","Cópia de segurança do arquivo ""%s"" não existe." -"Backup file does not exist.","Cópia de segurança do arquivo não existe." -"Backup file handler was unspecified.","Processador de arquivo de cópia de segurança não foi especificado." -"Backup file not found","Arquivo de backup não encontrado" -"Backup file path was not specified.","Caminho do arquivo de cópia de segurança não foi especificado." -"Backups","Cópias de segurança" -"Cannot read backup file.","Não é possível ler arquivo de cópia de segurança." -"Create Backup","Criar Cópia de Segurança" -"Database","Base de Dados" -"Database Backup","Backup de banco de dados" -"Database and Media","Base de Dados e Mídia" -"Database and Media Backup","Backup de banco de dados e mídia" -"Database was successfuly backed up.","Foi feita com sucesso a cópia de segurança da base de dados." -"Download","Baixar" -"Enable Scheduled Backup","Ativar backup agendado" -"Failed to connect to FTP","Falha ao se conectar a FTP" -"Failed to delete one or several backups.","Falha ao deletar um ou mais backups." -"Failed to rollback","Falha ao restaurar" -"Failed to validate FTP","Falha ao validar FTP" -"Frequency","Freqüência" -"Invalid Password.","Senha inválida." -"Maintenance Mode","Modo de manutenção" -"Name","Nome" -"Not enough free space to create backup.","Sem espaço livre suficiente para criar backup." -"Not enough permissions to create backup.","Sem permissões suficientes para criar backup." -"Not enough permissions to perform rollback","Sem permissões suficientes para executar restauração" -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup.""","Desmarque a caixa de seleção ""Colocar loja no modo de manutenção"" ou atualize suas permissões para continuar com o backup.""" -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback.""","Desmarque a caixa de seleção ""Colocar loja no modo de manutenção"" ou atualize suas permissões para continuar com a redução de preços.""" -"Put store on the maintenance mode while backup's creation","Colocar loja em modo de manutenção durante a criação de backup" -"Rollback","Reversão" -"Scheduled Backup Settings","Configurações de backup agendado" -"Size, Bytes","Tamanho, Bytes" -"Start Time","Tempo de Início" -"System","Sistema" -"System (excluding Media)","Sistema (excluindo a Mídia)" -"System Backup","Backup do sistema" -"System couldn't put store on the maintenance mode","O sistema não conseguiu colocar a loja em modo de manutenção" -"The database and media backup has been created.","O backup do banco de dados e de mídia foi criado." -"The database backup has been created.","O backup do banco de dados foi criado." -"The file was compressed with Zlib, but this extension is not installed on server.","O arquivo foi compactado com Zlib, mas essa extensão não está instalada no servidor." -"The selected backup(s) has been deleted.","Backup(s) selecionado(s) deletado(s)." -"The system (excluding Media) backup has been created.","O backup do sistema (excluindo a Mídia) foi criado." -"The system backup has been created.","O backup do sistema foi criado." -"Time","Tempo" -"Type","Tipo" -"Unable to create backup. Please, try again later.","Não é possível criar cópia de segurança. Por favor, tente novamente mais tarde." -"Unable to save the cron expression.","Impossível salvar a expressão cron." -"Wrong order of creation for new backup.","Ordem errada de criação de nova cópia de segurança." -"You do not have sufficient permissions to enable Maintenance Mode during this operation.","Você não tem permissões suficientes para habilitar o Modo de Manutenção durante esta operação." diff --git a/app/locale/pt_BR/Mage_Bundle.csv b/app/locale/pt_BR/Mage_Bundle.csv deleted file mode 100644 index da71748ee..000000000 --- a/app/locale/pt_BR/Mage_Bundle.csv +++ /dev/null @@ -1,71 +0,0 @@ -"%1$s incl tax.","%1$s incl tax." -"* Required Fields","* Campos obrigatórios" -"-- Select --","-- Selecionar --" -"Add New Option","Adicione Nova Opção" -"Add Selection","Adicionar seleção" -"As Low as","A partir de" -"As low as","A partir de" -"Bundle Items","Empacotar itens" -"Bundle Product","Empacotar produto" -"Bundle Product View Summary","Resumo da visualização de produtos em lote" -"Buy %1$s","Buy %1$s" -"Buy %1$s for","Buy %1$s for" -"Buy %1$s for %2$s","Buy %1$s for %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Buy %1$s for %2$s (%3$s incl. tax) each" -"Buy %1$s for %2$s each","Buy %1$s for %2$s each" -"Buy %1$s with %2$s discount each","Comprar %1$s com %2$s de desconto cada" -"Catalog Product View (Bundle)","Visualização de produto de catálogo (pacote)" -"Checkbox","Caixa de Seleção" -"Choose a selection...","Escolha uma seleção..." -"Click for price","Click for price" -"Close","Fechar" -"Default","Predefinido" -"Default Qty","Quantidade padrão" -"Default Title","Título padrão" -"Drop-down","Suspenso" -"Dynamic","Dinâmico" -"Excl. Tax","Excluir taxas" -"Excl. Tax:","Excl. Tax:" -"Fixed","Fixado" -"From","De" -"From:","De:" -"Gift Message","Mensagem de presente" -"Incl. Tax","Incluir taxas" -"Incl. Tax:","Incl. Tax:" -"Input Type","Tipo de entrada" -"Is Required","É obrigatório" -"Message:","Mensagem:" -"Multiple Select","Múltipla escolha" -"N/A","Indisponível" -"No options of this product are available.","Nenhuma opção deste produto está disponível." -"None","Nenhum" -"Percent","Percentagem" -"Percent Discount","Percentual de desconto" -"Please Select Products to Add","Escolha os produtos a serem adicionados" -"Please enter a number greater 0 in this field.","Por favor, digite um número maior que 0 neste campo" -"Please enter search conditions to view products.","Insira as condições de pesquisa para visualizar os produtos." -"Please select options for product.","Escolha as opções do produto." -"Please specify product option(s).","Especifique a(s) opção(ões) do produto." -"Position","Posição" -"Price Range","Variação de preço" -"Price Type","Tipo de preço" -"Price as configured","Preço como configurado" -"Qty:","Quantidade:" -"Radio Buttons","Botões de Opção" -"Required options are not selected.","As opções exigidas não estão selecionadas." -"Selected required options are not available.","As opções exigidas selecionadas não estão disponíveis." -"Separately","Separadamente" -"Ship Bundle Items","Enviar itens do pacote" -"Shipment","Remessa" -"Store View Title","Título de visualização de loja" -"There is no defined renderer for ""%s"" option type.","Não há renderização definida para o tipo de opção ""%s""." -"This product is also part of bundle(s)","Esse produto também faz parte do(s) pacote(s)" -"To","Para" -"To:","Para:" -"Together","Junto" -"Total incl. Tax: %1$s","Total incl. Tax: %1$s" -"Use Default Value","Utilizar valor padrão" -"User Defined Qty","Quantidade definida pelo usuário" -"and","and" -"each","each" -"save","save" diff --git a/app/locale/pt_BR/Mage_Captcha.csv b/app/locale/pt_BR/Mage_Captcha.csv deleted file mode 100644 index 7f047d15b..000000000 --- a/app/locale/pt_BR/Mage_Captcha.csv +++ /dev/null @@ -1,22 +0,0 @@ -"Attention: Captcha is case sensitive.","Attention: Captcha diferencia maiúsculas e minúsculas." -"After number of attempts to login","Após de várias de tentativas de entrar" -"Always","Sempre" -"CAPTCHA","CAPTCHA" -"CAPTCHA Timeout (minutes)","Tempo limite do CAPTCHA (minutos)" -"CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen","CAPTCHA para os formulários ""Criar usuário"" e ""Esqueci a senha"" está sempre habilitado se escolhido" -"Case Sensitive","Sensível a maiúsculas e minúsculas" -"Displaying Mode","Modo de exibição" -"Enable CAPTCHA in Admin","Habilitar CAPTCHA em Admin" -"Enable CAPTCHA on Frontend","Habilitar CAPTCHA no Frontend" -"Font","Fonte" -"Forms","Formulários" -"If 0 is specified, CAPTCHA on the Login form will be always available.","Se 0 estiver especificado, CAPTCHA no formulário de login estará sempre disponível." -"Incorrect CAPTCHA.","CAPTCHA incorreto." -"Number of Symbols","Número de Símbolos" -"Number of Unsuccessful Attempts to Login","Número de Tentativas Ineficazes de Login" -"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Por favor especifique 8 símbolos no máximo. Faixa permitida (exemplo: 3-5)" -"Please type the letters below","Por favor digite as letras abaixo" -"Please type the letters from the image:","Por favor digite as letras da imagem:" -"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.
    Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Por favor use apenas letras (a-z ou A-Z) ou números (0-9) neste campo. Não são permitidos espaços entre os caracteres.
    Caracteres parecidos (como. ""i"", ""l"", ""1"") diminuem a chance de reconhecimento correto pelo cliente." -"Reload captcha","Recarregar captcha" -"Symbols Used in CAPTCHA","Símbolos Usados no CAPTCHA" diff --git a/app/locale/pt_BR/Mage_Catalog.csv b/app/locale/pt_BR/Mage_Catalog.csv deleted file mode 100644 index efd5bbaa2..000000000 --- a/app/locale/pt_BR/Mage_Catalog.csv +++ /dev/null @@ -1,848 +0,0 @@ -"# of Use","# de Uso" -"%1$s incl tax.","%1$s de imposto incluído" -"%s - %s","%s - %s" -"%s Item(s)","%s Item(s)" -"%s and above","%s ou mais" -"%s-%s of %s","%s-%s de %s" -"(%d)","(%d)" -"(Copy data from: %s)","(Copiar dados de: %s)" -"* Required Fields","* Campos obrigatórios" -"-- Please Select --","- Por Favor Selecione -" -"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","86400 por defeito, se não definido. Para atualizar instantaneamente, Limpar a Cache de Saída de Blocos HTML." -"Warning! Applying MAP by default will hide all product prices on the frontend.","Aviso! Aplicar MAP por defeito vai esconder todos os preços de produto no frontend." -"A group with the same name already exists.","Um grupo com o mesmo nome já existe." -"A name is required","Um nome é necessário" -"A product type is not defined for the indexer.","Um tipo de produto não está definido para o indexador." -"ALL GROUPS","TODOS OS GRUPOS" -"AM","AM" -"Action","Ação" -"Actual Price","Preço Real" -"Add","Adicionar" -"Add Attribute","Adicione Atributo" -"Add Design Change","Adicionar Mudança de Design" -"Add Group","Adicionar Grupo" -"Add Group Price","Adicionar preço de grupo" -"Add New","Adicione Novo" -"Add New Attribute","Adicionar Novo Atributo" -"Add New Attribute Set","Adicionar Novo Conjunto de Atributos" -"Add New Group","Adicionar Novo Grupo" -"Add New Images","Adicionar Novas Imagens" -"Add New Option","Adicione Nova Opção" -"Add New Row","Adicionar Nova Linha" -"Add New Search Term","Adicionar Novo Termo de Busca" -"Add New Set","Adicionar Novo Conjunto" -"Add Product","Adicionar Produto" -"Add Product To Websites","Adicionar Produto a Websites" -"Add Root Category","Adicionar Categoria Raiz" -"Add Subcategory","Adicionar Subcategoria" -"Add Tax","Adicionar Imposto" -"Add Tier","Adicionar Camada" -"Add attribute into attribute set","Adicionar atributo ao conjunto de atributos" -"Add group into attribute set","Adicionar grupo ao conjunto de atributos" -"Add new custom option into product","Adicionar nova opção personalizada ao produto" -"Add new values into custom option","Adicionar novos valores à opção personalizada" -"Add option","Adicionar opção" -"Add to Cart","Adicionar ao carrinho" -"Add to Compare","Adicionar para Comparar" -"Add to Wishlist","Adicionar à Lista de Desejos" -"Additional Information","Informações Adicionais" -"Alert Urls","Urls de Alerta" -"All","Todos" -"All Product Types","Todos Tipos de Produtos" -"All Websites","Todos os sites" -"All products","Todos os produtos" -"All products - recently added products, New products - products marked as new","Todos os produtos - produtos recém-adicionados, Novos produtos - produtos marcados como novos" -"All products of this set will be deleted! Are you sure you want to delete this attribute set?","Todos produtos deste conjunto serão excluídos! Tem certeza que quer excluir este conjunto de atributos?" -"Allow All Products per Page","Permitir Todos Produtos por Página" -"Allow Dynamic Media URLs in Products and Categories","Permitir URLs de Mídia Dinâmica em Produtos e Categorias" -"Allow HTML Tags on Frontend","Permitir Tags HTML no Frontend" -"Allowed File Extensions","Extensões de Arquivo Permitidas" -"Allowed file extensions to upload","Extensões de arquivo permitidas para upload" -"Amount","Valor" -"An error occurred while adding products to websites.","Ocorreu um erro durante a adição de produtos aos websites." -"An error occurred while clearing comparison list.","Ocorreu um erro durante a limpeza da lista de comparação." -"An error occurred while deleting this review.","Ocorreu um erro ao excluir essa resenha." -"An error occurred while removing products from websites.","Ocorreu um erro durante a retirada de produtos dos sites." -"An error occurred while saving the URL rewrite","Ocorreu um erro ao salvar o URL reescrito" -"An error occurred while saving the attribute set.","Ocorreu um erro ao salvar o conjunto de atributos." -"An error occurred while saving the collection, aborting. Error message: %s","Ocorreu um erro ao salvar a coleção. Abortando. Mensagem de erro: %s" -"An error occurred while saving the product. ","Ocorreu um erro ao salvar o produto." -"An error occurred while saving the search query.","Ocorreu um erro ao salvar a consulta de pesquisa." -"An error occurred while saving this group.","Ocorreu um erro ao salvar este grupo." -"An error occurred while saving this review.","Ocorreu um erro ao salvar a resenha." -"An error occurred while trying to delete the category.","Ocorreu um erro ao tentar eliminar a categoria." -"An error occurred while updating the product(s) attributes.","Ocorreu um erro durante a atualização do(s) atributo(s) do(s) produto(s)." -"An error occurred while updating the product(s) status.","Ocorreu um erro durante a atualização do status do(s) produto(s)." -"An invalid group ID is specified, skipping the record.","Um ID inválido de grupo é especificado, ignorando o registro." -"An invalid option ID is specified for %s (%s), skipping the record.","Um ID de opção inválido é especificado para %s (%s), ignorando o registro." -"An invalid store was specified.","Uma loja inválida foi especificada." -"Anchor Custom Text","Texto âncora personalizado" -"Anchor Custom Title","Título âncora personalizado" -"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","Aplicável ​​somente aos produtos de catálogo e categorias. Qualquer conteúdo de mídia será inserido no editor como um URL estático. Não é atualizado se o URL de sistema base de configurações mudar." -"Apply MAP (Default Value)","Aplicar MAP (Valor Padrão)" -"Apply To","Aplicar a" -"Approved","Aprovado" -"Are you sure you want to delete this category?","Tem certeza de que quer apagar esta categoria?" -"Are you sure you would like to remove all products from your comparison?","Tem certeza de que gostaria de remover todos os produtos de sua comparação?" -"Are you sure you would like to remove this item from the compare products?","Tem certeza de que deseja remover este item dos produtos comparados?" -"Are you sure?","Tem certeza?" -"As low as:","A partir de:" -"Assign","Atribuir" -"Assign product link","Atribuir link do produto" -"Assign product to category","Atribuir categoria ao produto" -"Assigned Products","Produtos Atribuídos" -"Associated Products","Produtos Associados" -"Attrib. Set Name","Nome do conjunto de atributos" -"Attribute ""%s"" is invalid.","O atributo ""%s"" não é válido." -"Attribute ""%s"" is required.","O atributo ""%s"" é obrigatório." -"Attribute Information","Informação do Atributo" -"Attribute Model","Modelo de Atributo" -"Attribute Name:","Nome do Atributo:" -"Attribute Set","Conjunto de Atributos" -"Attribute Sets","Conjuntos de atributos" -"Attribute add","Adicionar atributo" -"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","O código do atributo não é válido. Utilize apenas letras (a-z), números (0-9) ou sublinhado (_) neste campo, o primeiro caractere deve ser uma letra." -"Attribute group with the \"/name/\" name already exists","Já existe um grupo de atributos com o nome \"/name/\"" -"Attribute group with the \/name/\ name already exists","O grupo de atributo com o nome \/name/\ já existe." -"Attribute remove","Remover atributo" -"Attribute with the same code already exists","Atributo com o mesmo código já existe" -"Attributes","Atributos" -"Attrribute names can be specified per store.","Os nomes dos atributos podem ser especificados por loja." -"Autogenerate","Geração Automática" -"Availability:","Disponibilidade:" -"Back","Voltar" -"Backend Model","Modelo de Backend" -"Backend Table","Tabela de Backend" -"Backend Table Title","Título da Tabela de Backend" -"Backorders","Ordens em Atraso" -"Based On","Baseado Em" -"Before Order Confirmation","Antes de Confirmação de Ordem" -"Best Value","Melhor Preço" -"Block after Info Column","Bloco após Coluna de Informações" -"Bottom Block Options Wrapper","Envoltório de Opções do Bloco de Fundo" -"Bottom/Left","Fundo/Esquerdo" -"Bottom/Right","Fundo/Direito" -"Browse By","Procure Por" -"Bundle Items","Empacotar itens" -"Buy %1$s","Compre %1$s" -"Buy %1$s for","Compre %1$s por" -"Buy %1$s for %2$s","Compre %1$s por %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Compre %1$s por %2$s (%3$s incl. imposto) cada" -"Buy %1$s for %2$s each","Compre %1$s por %2$s cada" -"Cache Lifetime (Seconds)","Tempo de Vida de Cache (Segundos)" -"Cache refresh needed.","Necessária atualização de cache." -"Can be Divided into Multiple Boxes for Shipping","Pode ser dividido em várias caixas para envio" -"Can be used only with catalog input type Dropdown","Pode ser usado somente com o tipo de catálogo de entrada Dropdown" -"Can be used only with catalog input type Dropdown, Multiple Select and Price","Pode ser usado somente com o tipo de catálogo de entrada Dropdown, Seleção Múltipla e Preço" -"Can\'t create image.","Não é possível criar imagem." -"Cancel","Cancelar" -"Cannot create image.","Não é possível criar imagem." -"Cannot create writeable directory '%s'.","Não é possível criar diretório gravável ""%s"" ." -"Cart Item Attribute","Atributo do Item do Carrinho" -"Catalog","Catálogo" -"Catalog Category (Anchor)","Categoria de Catálogo (Âncora)" -"Catalog Category (Non-Anchor)","Categoria de Catálogo (Não-Âncora)" -"Catalog Category (Without Subcategories)","Categoria do catálogo (Sem subcategorias)" -"Catalog Category Link","Link da Categoria de Catálogo" -"Catalog New Products List","Lista de Novos Produtos de Catálogo" -"Catalog Price Scope","Limite do Preço de Catálogo" -"Catalog Product Compare List","Produto de Catálogo: Comparar Lista" -"Catalog Product Email to a Friend","Produto de Catálogo: Mandar E-Mail para Amigo" -"Catalog Product Image Gallery Popup","Produto de Catálogo: Pop-up da Galeria de Imagens" -"Catalog Product Link","Link do Produto de Catálogo" -"Catalog Product View (Any)","Visualizar Produto de Catálogo (Qualquer Um)" -"Catalog Product View (Configurable)","Visualizar Produto de Catálogo (Configurável)" -"Catalog Product View (Grouped)","Visualizar Produto de Catálogo (Agrupado)" -"Catalog Product View (Simple)","Visualizar Produto de Catálogo (Simples)" -"Catalog Product View (Virtual)","Visualizar Produto de Catálogo (Virtual)" -"Catalog Section","Seção de Catálogo" -"Catalog Seo Sitemap (Category List)","Sitemap Otimizado para Catálogo (Lista de Categorias)" -"Catalog Seo Sitemap (Category Tree)","Sitemap Otimizado para Catálogo (Árvore de Categorias)" -"Catalog Seo Sitemap (Common)","Sitemap Otimizado para Catálogo (Comum)" -"Catalog Seo Sitemap (Product List)","Sitemap Otimizado para Catálogo (Lista de Produtos)" -"Catalog URL Rewrites","Reedições da URL de Catálogo" -"Catalog product custom option values API","API de valores de opções personalizadas de produtos do catálogo" -"Catalog product custom options API","API de opções personalizadas de produtos do catálogo" -"Catalog, Search","Catálogo, Busca" -"Categories","Categorias" -"Categories Sitemap","Sitemap de Categorias" -"Category","Categoria" -"Category API","API de Categorias" -"Category Data","Dados da Categoria" -"Category Flat Data","Dados da Categoria Base" -"Category Link Block Template","Modelo de Categoria de Blocos de Ligação" -"Category Link Inline Template","Modelo de Categoria de Ligação Em Linha" -"Category Products","Categoria de Produtos" -"Category Top Navigation","Navegação de Melhores Categorias" -"Category URL Suffix","Sufixo URL de Categoria" -"Category attributes API","API Atributos de Categoria" -"Category move error","Erro de movimentação de categorias" -"Category move error %s","Erro de movimento de categoria %s" -"Category move operation is not possible: parent category is equal to child category.","Operação de mudança de categoria não é possível: categoria pai é igual a categoria infantil." -"Category move operation is not possible: the current category was not found.","Operação de mudança de categoria não é possível: a categoria atual não foi encontrada." -"Category move operation is not possible: the new parent category was not found.","Operação de mudança de categoria não é possível: a nova categoria pai não foi encontrada." -"Category must be an instance of Mage_Catalog_Model_Category.","Categoria deve ser uma instância de Mage_Catalog_Model_Category." -"Center","Centro" -"Change","Mudar" -"Change or Retrieve attribute store view","Alterar ou Recuperar vista atributo de loja" -"Change status","Alterar status" -"Check items to add to the cart or","Verificar itens a ser adicionados ao carrinho ou" -"Choose an Option...","Escolha uma Opção..." -"Clear All","Limpar Todos" -"Clear Price","Limpar preço" -"Click for price","Clique para o preço" -"Close Window","Fechar Janela" -"Collapse All","Fechar Tudo" -"Comma-separated.","Separados por vírgula." -"Comparable","Comparável" -"Comparable on Front-end","Comparável no Início do Processo" -"Comparable on the Frontend","Comparável no Início do Processo" -"Compare","Comparar" -"Compare Products","Comparar Produtos" -"Conditions Combination","Combinação de condições" -"Configurable Product","Produto Configurável" -"Configurable Product Settings","Características do Produto Configurável" -"Configure Product","Configurar Produto" -"Continue","Continue" -"Copy From Configurable","Copiar de Configurável" -"Country/State","País/Estado" -"Create","Criar" -"Create (Upload)","Criar (Carregar)" -"Create Empty","Criar Vazio" -"Create Permanent Redirect for URLs if URL Key Changed","Criar redirecionamento permanente para URLs em caso de alteração de chave de URL" -"Create Permanent Redirect for old URL","Criar Redirecionamento Permanente para antiga URL" -"Create Product Settings","Criar Configurações de Produto" -"Create Simple Associated Product","Criar Produto Associado Simples" -"Create attribute set based on another set","Criar conjunto de atributos baseado em outro conjunto" -"Create new attribute","Criar novo atributo" -"Create new category","Criar nova categoria" -"Create new product","Criar novo produto" -"Cross-sells","Vendas Cruzadas" -"Currently Shopping by:","Atualmente Comprando por:" -"Custom Design","Personalizar Design" -"Custom Options","Personalizar Opções" -"Custom options","Opções personalizadas" -"Customer Group","Grupo de Clientes" -"Customers Reviews","Análises dos clientes" -"Customers Tagged Product","Produtos marcados pelos clientes" -"Data Type for Saving in Database","Tipo de dado para salvar na base de dados" -"Date & Time Custom Options","Opções personalizadas de data e hora" -"Date Fields Order","Ordem de campos de data" -"Date Subscribed","Data de inscrição" -"Datetime","Data e hora" -"Decimal","Decimal" -"Declare attribute value saving scope","Declarar escopo de economia do valor do atributo" -"Default ""What's This"" Text Message","Mensagem de texto padrão ""O que é isso""" -"Default Popup Text Message","Mensagem de texto de popup padrão" -"Default Price","Preço padrão" -"Default Price Navigation Step","Preço padrão de passo de navegação" -"Default Qty","Quantidade padrão" -"Default Values","Valores padrão" -"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","Define o escopo de moeda base (""Configuração de moeda"" > ""Opções de moeda"" > ""Moeda base"")." -"Delete","Excluir" -"Delete Attribute","Apagar atributo" -"Delete Attribute Set","Excluir conjunto de atributos" -"Delete Category","Excluir categoria" -"Delete Group Price","Excluir preço de grupo" -"Delete Option","Excluir opção" -"Delete Row","Excluir linha" -"Delete Search","Excluir pesquisa" -"Delete Selected Group","Excluir grupo selecionado" -"Delete Tier","Excluir camada" -"Delete attribute","Excluir atributo" -"Delete category","Apagar categoria" -"Delete product","Apagar produto" -"Depends on design theme","Depende do tema do projeto (design)" -"Design","Design" -"Details","Detalhes" -"Disabled","Desativado" -"Disallowed file type.","Tipo de arquivo não permitido." -"Display Actual Price","Mostrar Preço Real" -"Display Page Control","Exibir Controle da Página" -"Display Price Interval as One Price","Exibir intervalo de preços como um preço" -"Display Product Count","Exibir contagem de produtos" -"Display Type","Tipo de Exibição" -"Display in Suggested Terms","Exibir em Termos Sugeridos" -"Double click on a group to rename it","Dê um duplo clique em um grupo para renomeá-lo" -"Double click on above image to view full picture","Dê um duplo clique na imagem acima para ver imagem completa" -"Downloadable Information","Informação Transferível" -"Duplicate","Duplicado" -"Duplicate amount found.","Quantia duplicada encontrada." -"Duplicate website group price customer group.","Duplicar preço de grupo do website grupo do cliente." -"Duplicate website tier price customer group and quantity.","Preço nível do sítio Web de grupo de clientes e quantidade duplicados." -"Duplicate website, country and state tax found.","Sítio Web, país e taxa de estado encontrados duplicados." -"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","Por exemplo, {{url mídia=""caminho/para/imagem.jpg""}} {{skin url=""caminho/para/picture.gif""}}. Análise dinâmica de directivas afeta o desempenho do catálogo." -"Edit","Editar" -"Edit Attribute Set '%s'","Editar Conjunto de Atributos ""%s""" -"Edit Product Attribute","Editar Atributo do Produto" -"Edit Product Attribute ""%s""","Editar Atributo do Produto ""%s""" -"Edit Search","Editar Pesquisa" -"Edit Search '%s'","Editar Pesquisa ""%s""" -"Edit Set Name","Editar Nome de Conjunto" -"Email","E-mail" -"Email to a Friend","Enviar por e-mail a um amigo" -"Empty","Vazio" -"Enable MAP","Habilitar MAP" -"Enable Qty Increments","Habilitar Incrementos na Qtde." -"Enable WYSIWYG","Habilitar WYSIWYG" -"Enable for reindexing a big number of SKUs.","Habilitar para reindexação de um grande número de SKUs." -"Enabled","Ativado" -"Error during retrieval of option value: %s","Erro ao recuperar valor de opção: %s" -"Exclude","Excluir" -"Expand All","Expandir Todos" -"Failed","Falha" -"Failed to copy file %s. Please, delete media with non-existing images and try again.","Falha ao copiar arquivo %s. Favor apagar mídia com imagens inexistentes e tentar de novo." -"Failed to move file: %s","Falha ao mover arquivo: %s" -"Feature Products","Produtos em Oferta" -"Field is not complete","O campo está incompleto." -"File options format is not valid.","O formato das opções de arquivo é inválido." -"File upload failed","Falha ao carregar arquivo" -"Filter","Filtrar" -"Filter model name must be declared.","É preciso declarar o nome do modelo de filtro." -"Filter must be an object. Please set correct filter.","O filtro tem de ser um objeto. Favor ajustar filtro correto." -"Filterable (no results)","Filtrável (sem resultados)" -"Filterable (with results)","Filtrável (com resultados)" -"First Name","Primeiro nome" -"Fixed","Fixado" -"For internal use.","Para uso interno." -"For the last time placed.","Colocado pela última vez." -"Frontend","Início do processo" -"Frontend Model","Modelo para Início de Processo" -"Frontend Properties","Propriedades de interface inicial" -"Gallery","Galeria" -"General Information","Informações gerais" -"Get full information about attribute with list of options","Obter informações completas sobre atributo com lista de opções" -"Get full information about custom option in product","Obter informações completas sobre opção personalizada em produto" -"Get list of available custom option types","Obter lista de tipos de opções personalizadas disponíveis" -"Get list of non-default attributes by product type and attributes set","Obter lista de atributos não-padrão por tipo de produto e atributos estabelecidos" -"Get list of possible attribute types","Obter lista de tipos de atributos possíveis" -"Get special price","Obter preço especial" -"Global","Global" -"Globally Editable","Globalmente Editável" -"Go to Home Page","Ir para Página Inicial" -"Grid","Grade" -"Group add","Adicionar em grupo" -"Group remove","Remover grupo" -"Grouped Product","Produto Agrupado" -"Groups","Grupos" -"Home","Início" -"ID","Identidade" -"ID: %s","ID: %s" -"If empty, the Category Name will be used","Se deixado em branco, será usado o Nome da Categoria." -"If empty, the Product Name will be used","Se deixado em branco, será usado o Nome do Produto." -"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","Se não for especificado um valor para opção de visualização de loja específica, será usado o valor padrão (Admin)." -"Image","Imagem" -"Image content is not valid base64 data.","O conteúdo da imagem não é um dado base64 válido." -"Image does not exist.","Imagem inexistente." -"Image file was not found.","Arquivo de imagem não encontrado." -"Image type and information need to be specified for each store view.","O tipo e as informações da imagem devem ser especificados para cada visualização de loja." -"In Cart","No Carrinho" -"In Stock","No Estoque" -"In stock","Em estoque" -"Incl. Tax","Incluir taxas" -"Index product and categories URL rewrites","Produto do índice e as URL reescritas de categorias" -"Index product attributes for layered navigation building","Índice de atributos de produtos para construção em camadas de navegação" -"Index product prices","Preços de produtos de índice" -"Indexed category/products association","Associação de categoria/produtos indexados" -"Info","Informações" -"Info Column Options Wrapper","Envoltório das Opções da Coluna de Informações" -"Input Type","Tipo de entrada" -"Integer","Número Inteiro" -"Interval Division Limit","Limite Divisão Intervalo" -"Invalid Tier Prices","Preços de Nível Inválidos" -"Invalid attribute %s","Atributo %s inválido" -"Invalid attribute option specified for attribute %s (%s), skipping the record.","Opção de atributo inválida para atributo %s (%s). Saltando o registro." -"Invalid attribute set specified, skipping the record.","Conjunto especificado de atributo inválido, ignorando o registro." -"Invalid block: %s.","Bloco inválido: %s." -"Invalid category IDs.","Identificações de categoria inválidas." -"Invalid category.","Categoria inválida." -"Invalid image file type.","Tipo de arquivo de imagem inválido." -"Invalid image type.","Tipo inválido de imagem." -"Invalid option ID specified for %s (%s), skipping the record.","ID especificado de opção inválido para %s (%s), ignorando o registro." -"Invalid product type specified, skipping the record.","Tipo inválido de produto especificado, ignorando o registro." -"Invalid store specified","Loja especificada inválida" -"Invalid store specified, skipping the record.","Loja especificada inválida, ignorando o registro." -"Invalid tier prices. The product is not associated to the requested website.","Faixas de preço inválidas. O produto não está associado ao website solicitado." -"Inventory","Inventário" -"Is Default","É padrão" -"Is Required","É obrigatório" -"Items %s to %s of %s total","Itens %s a %s de um total de %s" -"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","Itens que você não quer mostrar no catálogo ou resultados da pesquisa devem ter status de ""Inválido"" na loja desejada." -"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","Itens que você não quer mostrar no catálogo ou resultados da pesquisa devem ter status de ""Inválido"" na loja desejada." -"Keep your eyes open for our special Back to School items and save A LOT!","Fique atento a nossos itens da Volta às Aulas e economize BASTANTE!" -"Label","Etiqueta" -"Last Name","Último nome" -"Last Notification","Última Notificação" -"Layered Navigation","Navegação em Camadas" -"Learn More","Saiba Mais" -"Line %d, Email: %s","Linha %d, Email: %s" -"Line %d, SKU: %s","Linha %d, Unid. Manut. Estoque: %s" -"Link (Related, Up sell, Cross sell)","Link (Relacionados, Venda extra, Venda cruzada)" -"Link product does not exist.","Não existe o produto do link." -"Link to a Specified Category","Link para uma Categoria Especificada" -"Link to a Specified Product","Link para um Produto Especificado" -"List","Lista" -"List Mode","Modo de Lista" -"List of Products that are set as New","Lista de Produtos definidos como Novos" -"List of types","Lista de tipos" -"Manage Attribute Sets","Gerenciar Conjuntos de Atributos" -"Manage Attributes","Gerenciar Atributos" -"Manage Catalog Categories","Gerenciar Categorias de Catálogo" -"Manage Categories","Gerenciar Categorias" -"Manage Label / Options","Gerenciar etiqueta / opções" -"Manage Options (values of your attribute)","Gerenciar Opções (valores de seu atributo)" -"Manage Product Attributes","Gerenciar Atributos do Produto" -"Manage Product Sets","Gerenciar Conjuntos de Produtos" -"Manage Products","Gerenciar Produtos" -"Manage Stock","Gerenciar Estoque" -"Manage Titles (Size, Color, etc.)","Gerenciar Títulos (Tamanho, Cor etc.)" -"Max Characters","Máx. de Caracteres" -"Maximal Depth","Altura máxima" -"Maximum Image Size","Tamanho Máximo de Imagem" -"Maximum Number of Price Intervals","Número máximo de intervalos de preços" -"Maximum Qty Allowed in Shopping Cart","Qtde. Máxima Permitida no Carrinho" -"Maximum allowed image size for '%s' is %sx%s px.","Máximo tamanho de imagem permitido para '%s' é %sx%s px." -"Maximum image height","Altura máxima da imagem" -"Maximum image width","Largura máxima da imagem" -"Maximum number of characters:","Número máximo de caracteres:" -"Maximum number of price intervals is 100","O número máximo de intervalo de preços é 100" -"Media Image","Imagem de mídia" -"Minimum Advertised Price","Preço Mínimo Anunciado" -"Minimum Lines per Page","Número Mínimo de Linhas por Página" -"Minimum Qty Allowed in Shopping Cart","Qtde Mínima Permitida no Carrinho de Compras" -"Minimum Qty for Item\'s Status to be Out of Stock","Qtde. Mínima de Itens para Estado Atual como Fora do Estoque" -"Missing SKU, skipping the record.","Unid. Manut. Estoque ausente. Saltando o registro." -"More Views","Mais Visualizações" -"Move","Mover" -"Move category in tree","Mover categoria na árvore" -"Multi update product","Atualizar vários produtos" -"Must be in the allowed values list.","Tem(Têm) de estar na lista de valores permitidos." -"My Account","Minha Conta" -"N/A","Indisponível" -"Name","Nome" -"Name in %s","Nome em %s" -"New Product","Novo Produto" -"New Product Attribute","Novo Atributo de Produto" -"New Products","Novos Produtos" -"New Products Grid Template","Modelo de Nova Rede de Produtos" -"New Products List Template","Modelo para Lista de Novos Produtos" -"New Root Category","Nova Categoria de Raiz" -"New Search","Nova Busca" -"New Set Name","Nome do Conjunto Novo" -"New Subcategory","Nova Subcategoria" -"New products","Novos produtos" -"Next","Próximo" -"No","Não" -"No image","Nenhuma imagem" -"No layout updates","Nenhuma atualização de disposição (layout)" -"No options of this product are available.","Nenhuma opção deste produto está disponível." -"No product collections found.","Nenhuma coleção de produtos encontrada." -"None","Nenhum" -"Not Visible Individually","Não Visível Individualmente" -"Notify Low Stock RSS","Notificar RSS de Estoque Baixo" -"Notify for Quantity Below","Notificar em Caso de Quantidade Abaixo" -"Number of Products per Page","Número de Produtos por Página" -"Number of Products to Display","Número de Produtos a Ser Exibidos" -"Number of Uses","Número de Usuários" -"Number of results","Número de resultados" -"Number of results (For the last time placed)","Número de resultados (Colocados pela última vez)" -"OK","OK" -"OR","OU" -"Old Price:","Preço Antigo:" -"On Gesture","Sobre Gesticulação" -"Option validation failed to add product to cart.","Validação de opção falhou ao adicionar produto ao carrinho." -"Option values","Valores de opção" -"Option:","Opção:" -"Options","Opções" -"Options Control","Controle de Opções" -"Options is required","Opções: obrigatório" -"Our customer service is available 24/7. Call us at (555) 555-0123.","Nosso SAC funciona 24h, 7 dias/semana. Fale conosco: (555) 555-0123." -"Out of Stock","Esgotado" -"Out of stock","Fora de estoque" -"PM","PM" -"Page Title Separator","Separador de Título de Página" -"Parent Category","Categoria Pai" -"Pending","Pendente" -"Pending Reviews RSS","Comentários RSS Pendentes" -"Percentage","Percentagem" -"Please add rows to option.","Por favor adicione linhas à opção." -"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","Por favor tome cuidado pois quando você clica na linha ela vai carregar os dados do formulário do pacote, o arquivo selecionado, e todos os dados não guardados do formulário serão perdidos." -"Please click on the Close Window button if it is not closed automatically.","Por favor clique no botão Fechar Janela, se não for fechado automaticamente." -"Please enter a new group name","Por favor insira um novo nome do grupo" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Atualize ""Regravações de URLs de catálogos"" e ""Atributos de produtos"" em Sistema -> Gerenciamento de índices" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Por favor atualize ""URL de Catálogo Reescitos"" e ""Atributos de Produtos"" no Sistema -> Administração Índice " -"Please refresh ""Product Attributes"" in System -> Index Management","Atualize ""Atributos de produtos"" em Sistema -> Gerenciamento de índices" -"Please select a static block ...","Por favor selecione um bloco estático..." -"Please select items.","Favor selecionar itens." -"Please select one or more attributes.","Por favor selecione um ou mais atributos." -"Please select product(s).","Por favor selecione produto(s)." -"Please select products for attributes update","Por favor selecione produtos para os atributos de atualização" -"Please set up merge date/time","Por favor configure a fusão de data/hora" -"Please set up merge date/time later then present date","Por favor configure a fusão de data/hora para mais tarde que a presente data" -"Please specify date required option(s).","Favor especificar opção(ões) obrigatória(s) para data." -"Please specify the number of products, that will not be divided into subintervals.","Por favor especifique o número de produtos, que não será dividido em subintervalos." -"Please specify the product required option(s)","Favor especificar opção(ões) obrigatória(s) do produto" -"Please specify the product required option(s).","Favor especificar opção(ões) obrigatória(s) do produto." -"Please specify the product\'s option(s).","Por favor especifique a(s) opção/opções do produto." -"Please specify the product\'s required option(s).","Por favor especifique a(s) opção/opções necessária(s) do produto." -"Please specify the quantity of product(s).","Favor especificar a quantidade de produto(s)." -"Please specify time required option(s).","Favor especificar opção(ões) obrigatória(s) para hora." -"Please wait...","Por favor aguarde..." -"Position","Posição" -"Position in Layered Navigation","Posição na Navegação por Camadas" -"Position of attribute in layered navigation block","Posição de atributo em bloco de navegação em camadas" -"Prev","Prev" -"Previous","Anterior" -"Price","Preço" -"Price Navigation Step Calculation","Cálculo do Preço do Passo de Navegação" -"Price Type","Tipo de preço" -"Price is not available","Preço não está disponível" -"Price values for options should be specified in system base currency.","Os preços das opções devem ser especificados na moeda-base do sistema." -"Price:","Preço:" -"Price: %s","Preço: %s" -"Print This Page","Imprimir Esta Página" -"Product","Produto" -"Product API","API de Produto" -"Product Alerts","Alertas de Produto" -"Product Attribute","Atributo de Produto" -"Product Attributes","Atributos do produto" -"Product Categories","Categoria de Produtos" -"Product Description","Descrição do Produto" -"Product Extra Info","Dados Extras de Produto" -"Product Flat Data","Dados Base de Produto" -"Product ID","ID do Produto" -"Product Image Placeholders","Espaços Reservados a Imagem de Produto" -"Product Image Watermarks","Imagem Marca d'Água do Produto" -"Product Images","Imagens do Produto" -"Product Images API","API de Imagens de Produto" -"Product In Websites","Produto Em Websites" -"Product Info Column","Coluna de Info do Produto" -"Product Information","Informações de Produto" -"Product Link Block Template","Modelo para Link de Produto: Bloco Autônomo" -"Product Link Inline Template","Modelo para Link de Produto: Fluxo sem Quebra" -"Product Listing Sort by","LIstagem de Produto Ordenada por" -"Product Name","Nome do produto" -"Product Prices","Preços de Produto" -"Product Reviews","Comentários sobre Produto" -"Product Tags","Etiquetas de Produto" -"Product Tier Price API","API para Níveis de Preço do Produto" -"Product Type","Tipo de Produto" -"Product URL Suffix","Sufixo da URL de Produto" -"Product View Extra Hint","Visualização de Produto: Pista Adicional" -"Product attribute sets API","API para conjuntos de abributos do Produto" -"Product attributes API","API de atributos do Produto" -"Product collection expected.","Coleção de produtos esperada." -"Product is not loaded","O produto não está carregado" -"Product links API (related, cross sells, up sells)","API para links de produto (relacionados, vendas cruzadas, vendas extras)" -"Product types API","API para tipos de produto" -"Product with this combination of attributes already associated to configurable.","O produto com esta combinação de atributos já está associado aos configuráveis." -"Products","Produtos" -"Products Comparison List","Lista de Comparação de Produtos" -"Products Information","Informações de Produtos" -"Products Reviews","Comentários sobre Produtos" -"Products Sitemap","Sitemap de Produtos" -"Products only","Somente produtos" -"Products per Page on Grid Allowed Values","Produtos por Página nos Valores Permitidos na Grade" -"Products per Page on Grid Default Value","Produtos por Página no Valor-Padrão da Grade" -"Products per Page on List Allowed Values","Produtos por Página nos Valores Permitidos da Lista" -"Products per Page on List Default Value","Produtos por Página no Valor-Padrão da Lista" -"Properties","Propriedades" -"Qty","Quant." -"Qty Increments","Incrementos de Quantidade" -"Qty Uses Decimals","Qtde: Usa Decimais" -"Qty for Item\'s Status to Become Out of Stock","Quantidade para que o status do item se torne ""Fora de estoque""" -"Qty:","Quantidade:" -"Quantity","Quantidade" -"Quick Create","Criação Rápida" -"Quick Overview","Panorama Rápido" -"Quick simple product creation","Criação Rápida de Produto Simples" -"Records for ""%s"" store found.","Encontrados registros para a loja ""%s""." -"Redirect","Redirecionar" -"Redirect URL","Redirecionar URL" -"Regular Price:","Preço Normal:" -"Related Products","Produtos Relacionados" -"Remove","Remover" -"Remove Product From Websites","Remover Produto dos Websites" -"Remove This Item","Remover Este Item" -"Remove attribute from attribute set","Remover atributo do conjunto de atributos" -"Remove attribute set","Remover atributo estabelecido" -"Remove custom option","Remover opção customizada" -"Remove group from attribute set","Remova o grupo do conjunto de atributos" -"Remove option","Remover opção" -"Remove product assignment","Remover designação do produto" -"Remove product image","Remover Imagem de Produto" -"Remove product link","Remover link de produto" -"Remove value from custom option","Remover valor de opção personalizada" -"Rename existing group","Remover grupo existente" -"Rename group","Renomear grupo" -"Reorganize EAV category structure to flat structure","Reorganizar estrutura de categorias EAV como estrutura simplificada" -"Reorganize EAV product structure to flat structure","Reorganizar estrutura EAV de produto como estrutura simplificada" -"Reset","Redefinir" -"Results","Resultados" -"Results per page","Resultados por página" -"Retrieve attribute data","Recuperar dados de atributo" -"Retrieve attribute list","Recuperar lista de atributos" -"Retrieve attribute options","Recuperar opções de atributo" -"Retrieve categories tree","Recuperar árvore de categorias" -"Retrieve category attributes","Recuperar atributos de categoria" -"Retrieve category data","Recuperar dados de categoria" -"Retrieve hierarchical tree","Recuperar árvore hierárquica" -"Retrieve linked products","Recuperar produtos vinculados" -"Retrieve list of assigned products","Recuperar lista de produtos designados" -"Retrieve list of option values","Recuperar lista de valores de opções" -"Retrieve list of product custom options","Recuperar lista de opções personalizadas de produtos" -"Retrieve one level of categories by website/store view/parent category","Recuperar um nível de categorias por website/visualização de loja/categoria-pai" -"Retrieve option value info","Recuperar informações de valores de opções" -"Retrieve product","Recuperar produto" -"Retrieve product attribute sets","Recuperar conjuntos de atributos do produto" -"Retrieve product image","Recuperar imagem de produto" -"Retrieve product image list","Recuperar lista de imagens do produto" -"Retrieve product image types","Recuperar tipos de imagem do produto" -"Retrieve product link type attributes","Recuperar atributos do tipo de link do produto" -"Retrieve product link types","Recuperar tipos de link do produto" -"Retrieve product tier prices","Recuperar faixas de preço do produto" -"Retrieve product types","Recuperar tipos de produto" -"Retrieve products data","Recuperar dados de produtos" -"Retrieve products list by filters","Recuperar lista de produtos com filtros" -"Reviews","Resenhas" -"Roll Over for preview","Passe o mouse para visualizar" -"Root","Raiz" -"SKU","Unidade de Manutenção de Estoque" -"SKU length should be %s characters maximum.","A Unidade de Manutenção de Estoque deve ter no máximo %s caracteres." -"Save","Salvar" -"Save Attribute","Salvar atributo" -"Save Attribute Set","Salvar Conjunto de Atributos" -"Save Category","Salvar Categoria" -"Save Search","Salvar Busca" -"Save and Continue Edit","Salvar e continuar a editar" -"Saved %d record(s)","%d registro(s) salvo(s)" -"Scope","Limite" -"Scope must not be changed, because the attribute is used in configurable products.","O limite não pode ser alterado, porque o atributo é usado em produtos configuráveis." -"Search","Pesquisa" -"Search Engine Optimizations","Otimizações nos Mecanismos de Busca" -"Search Information","Buscar Informações" -"Search Query","Palavras-Chave da Busca" -"Search Term with such search query already exists.","Já existe termo de busca baseado nesse critério." -"Search Weight","Peso da Busca" -"Searchable","Passível de Busca" -"See price before order confirmation.","Ver preço antes de confirmar pedido." -"Select Category...","Seleciona Categoria..." -"Select Configurable Attributes ","Selecionar Atributos Configuráveis" -"Select Product...","Selecionar Produto..." -"Select type of option","Selecionar tipo de opção" -"Select type options required values rows.","Selecione as linhas de valores exigidas para opções de tipo." -"Selected Product Types","Tipos de Produto Selecionados" -"Send Count","Enviar Contagem" -"Set Ascending Direction","Ajustar Direção como Crescente" -"Set Descending Direction","Ajustar Direção como Decrescente" -"Set Name","Ajustar Nome" -"Set Root Category for Store","Definir Categoria Raíz para Loja" -"Set root category for this store in the configuration","Ajustar categoria de raiz para esta loja na configuração" -"Set special price","Definir preço especial" -"Set/Get current store view","Defina/Obtenha atual vista de armazenamento" -"Settings","Configurações" -"Share Facebook","Compartilhar Facebook" -"Share on Facebook","Compartilhar no Facebook" -"Share on Twitter","Compartilhar no Twitter" -"Shop By","Comprar Por" -"Shopping Options","Opções de Compra" -"Show","Mostrar" -"Show Details","Mostrar Detalhes" -"Show Tags","Mostrar Marcas" -"Simple Product","Produto Simples" -"Site Map","Mapa do Site" -"Sitemap","Mapa do Site" -"Skip import row, is not valid value ""%s"" for field ""%s""","Ignorar linha de importação, ""%s"" não é um valor válido para campo ""%s""" -"Skip import row, required field ""%s"" for the new customer is not defined.","Ignorar linha de importação, campo ""%s"" exigido não está definido para o novo cliente." -"Skip import row, the value ""%s"" is invalid for field ""%s""","Ignorar linha de importação, o valor ""%s"" é inválido para o campo ""%s""" -"Skipping import row, required field ""%s"" for new products is not defined.","Ignorando linha de importação. O campo obrigatório ""%s"" para novos produtos não foi definido." -"Skipping import row, required field ""%s"" is not defined.","Ignorar linha de importação, campo ""%s"" exigido não está definido." -"Skipping import row, store ""%s"" field does not exist.","Ignorando linha de importação, campo loja ""%s"" não existe." -"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Pular linha de importação, o valor ""%s"" não é válido para o campo ""%s""." -"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Alguns dos produtos processados ​​não têm valor SKU definido. Por favor preencha-o antes de executar operações sobre estes produtos." -"Some of the selected item options are not currently available.","Algumas das opções de itens selecionadas não estão disponíveis atualmente." -"Sort By","Classificar Por" -"Sort Order","Classificar pedido" -"Source Model","Modelo de Origem" -"Special Expires On: %s","Especial Expira Em: %s" -"Special Price:","Preço Especial:" -"Special Price: %s","Preço Especial: %s" -"Starting at:","A partir de:" -"Static","Estático" -"Static block and products","Bloco estático e produtos" -"Static block only","Só bloco estático" -"Status","Status" -"Stock Availability","Disponibilidade de Estoque" -"Store","Loja" -"Store View","Visualização da loja" -"Stretch","Extensão" -"Subscribe to RSS Feed","Subscrever RSS Feed" -"Super product attributes configuration","Configuração de atributos de super produto" -"Synonym For","Sinónimo Para" -"System Properties","Propriedades do Sistema" -"Tag Name","Nome de Marca" -"Tax","Taxas" -"Template","Modelo" -"Text","Texto" -"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","O módulo de Catálogo Simples tem um limite de %2\$d atributos filtráveis ​​e/ou classificáveis. Atualmente existem %1\$d deles. Por favor reduza o número de atributos filtráveis​​/classificáveis​​ a fim de usar este módulo" -"The From Date value should be less than or equal to the To Date value.","O valor Data Inicial deve ser menor que ou igual ao valor Data Final." -"The attribute code \'%s\' is reserved by system. Please try another attribute code","O código de atributo \'%s\' é reservado pelo sistema. Tente outro código de atributo" -"The attribute model is not defined","O modelo de atributo não está definido" -"The attribute set has been saved.","O conjunto de atributos foi salvo." -"The base directory to upload file is not specified.","O diretório base para fazer o carregamento do arquivo não está especificado." -"The category has been deleted.","A categoria foi apagada." -"The category has been saved.","A categoria foi salva." -"The comparison list was cleared.","A lista de comparação foi limpa." -"The file '%s' for '%s' has an invalid extension","O arquivo '%s' para '%s' possui uma extensão inválida" -"The file '%s' you uploaded is larger than %s Megabytes allowed by server","O arquivo '%s' que você carregou é maior que %s Megabites permitido pelo servidor" -"The file you uploaded is larger than %s Megabytes allowed by server","O arquivo carregado é maior do que os %s Megabytes permitidos pelo servidor" -"The filters must be an array.","Os filtros devem estar por ordem." -"The image contents is not valid base64 data.","O conteúdo da imagem não é um dado de base64 válido." -"The image is not specified.","A imagem não está especificada." -"The model collection resource name is not defined.","O nome do modelo de coleção de recurso não está definido." -"The product %s has been added to comparison list.","O produto %s foi adicionado à lista de comparação." -"The product %s has been removed from comparison list.","O produto %s foi removido da lista de comparação." -"The product attribute has been deleted.","O atributo do produto foi eliminado." -"The product attribute has been saved.","O atributo do produto foi salvo." -"The product has been created.","O produto foi criado." -"The product has been deleted.","O produto foi eliminado." -"The product has been duplicated.","O produto foi duplicado." -"The product has been saved.","O produto foi salvo." -"The product has required options","O produto requer opções" -"The review has been deleted","A análise foi apagada" -"The review has been saved.","A análise foi salva." -"The review was removed by another user or does not exist.","A análise foi removida por outro usuário ou não existe." -"The search was deleted.","A pesquisa foi apagada." -"The text is too long","O texto é muito longo" -"There are no %s available.","Não há %s disponíveis." -"There are no customers for this alert","Não há clientes para este alerta" -"There are no customers for this alert.","Não há clientes para este alerta." -"There are no products matching the selection.","Não há produtos que correspondam à seleção." -"There was an error while request processing.","Houve um erro ao processar o pedido." -"This Attribute no longer exists","Este atributo não existe mais" -"This attribute cannot be deleted.","Este atributo não pode ser apagado." -"This attribute cannot be edited.","Este atributo não pode ser editado." -"This attribute cannot be updated.","Este atributo não pode ser atualizado." -"This attribute is used in configurable products.","O atributo é usado em produtos configuráveis." -"This attribute is used in configurable products. You cannot remove it from the attribute set.","Este atributo é usado em produtos configuráveis​​. Você não pode removê-lo do conjunto de atributos." -"This attribute no longer exists","Este atributo não existe mais" -"This attribute set no longer exists.","Este conjunto de atributos não existe mais." -"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","Este grupo contém atributos, usados ​​em produtos configuráveis. Por favor mova esses atributos para outro grupo e tente novamente." -"This group contains system attributes. Please move system attributes to another group and try again.","Este grupo contém atributos do sistema. Por favor mova atributos do sistema para outro grupo e tente novamente." -"This is a required option","Esta é uma opção necessária" -"This product no longer exists.","Este produto não existe mais." -"This search no longer exists.","Esta pesquisa não existe mais." -"This setting will be applied when all prices in the specific price interval are equal.","Essa configuração será aplicada quando todos os preços no intervalo de preços específico forem iguais." -"Tier Pricing","Preços por Nível" -"Tile","Empilhar" -"Time Format","Formato de Tempo" -"Title","Título" -"To reindex the enabled product(s), the store or product must be specified","Para reindexar o(s) produto(s) ativado(s), a loja ou o(s) produto(s) deve(m) ser especificado(s)" -"To see product price, add this item to your cart. You can always remove it later.","Para ver o preço do produto, adicione este item ao seu carrinho. Você pode sempre removê-lo mais tarde." -"Top/Left","Topo/Esquerdo" -"Top/Right","Topo/Direita" -"Total Qty Base Items","Qtde Base Total de Itens" -"Total Qty Content Items","Total Qtd Conteúdo Itens" -"Total incl. Tax: %1$s","Total incl. Taxas: %1$s" -"Total of %d record(s) have been deleted.","No total %d registro(s) foi(foram) excluído(s)." -"Total of %d record(s) have been updated.","Total de %d registro(s) foram atualizados." -"Total of %d record(s) were updated","Total de %d registro(s) foram atualizados" -"Type","Tipo" -"URL Rewrite Management","Gestão Reescrita de URL" -"Unable to complete this request.","Não é possível concluir este pedido." -"Unable to find a search term to delete.","Não é possível encontrar um termo de pesquisa para excluir." -"Unable to find an attribute to delete.","Incapaz de encontrar um atributo a ser excluído." -"Unable to get the product ID.","Não é possível obter o ID do produto." -"Unassigned Attributes","Atributos Não Atribuídos" -"Unknown EAV indexer type ""%s"".","Tipo de indexador EAV ""%s"" desconhecido." -"Unknown attribute: %s.","Atributo desconhecido: %s." -"Unsupported product type ""%s"".","Não há suporte para tipo de produto ""%s""." -"Up-sells","Vendas Extras" -"Update","Atualizar" -"Update Attributes","Atualização de Atributos" -"Update Tier Price","Atualização de Preço por Nível" -"Update assigned product","Atualização do produto designado" -"Update attribute","Atualizar atributo" -"Update attributes","Atualizar atributos" -"Update category","Atualizar categoria" -"Update custom option of product","Atualizar opção customizada de produto" -"Update product","Atualizar produto" -"Update product image","Atualização da imagem do produto" -"Update product link","Atualização do link do produto" -"Update product tier prices","Atualização dos preços do nível do produto" -"Update value of custom option","Atualizar valor de opção personalizada" -"Upload new product image ","Carregar nova imagem do produto" -"Use Canonical Link Meta Tag For Categories","Use Meta Marca de Link Canônico Para as Categorias" -"Use Canonical Link Meta Tag For Products","Use Meta Marca Link Canônico Para Produtos" -"Use Categories Path for Product URLs","Use Caminho de Categorias para URLs de Produto" -"Use Config Settings","Utilizar opções de configuração" -"Use Default Value","Utilizar valor padrão" -"Use Flat Catalog Category","Use Categoria de Catálogo Base" -"Use Flat Catalog Product","Use Produto de Catálogo Base" -"Use In Layered Navigation","Use em Navegação em Camadas" -"Use In Search Results Layered Navigation","Use Em Resultados de Pesquisa de Navegação em Camadas" -"Use JavaScript Calendar","Use Calendário JavaScript" -"Use Static URLs for Media Content in WYSIWYG for Catalog","Use URLs Estáticos para Conteúdo Mídia em WYSIWYG para Catálogo" -"Use To Create Configurable Product","Use Para Criar Produto Configurável" -"Use Tree Like Category Sitemap","Use Categoria Mapa do Site Como Árvore" -"Use config","Use config" -"Use default","Use padrão" -"Use for Promo Rule Conditions","Use para as Condições de Regras de Promoção" -"Use four-digit year format.","Use formato de ano de quatro dígitos." -"Use in Advanced Search","Use em Busca Avançada" -"Use in Layered Navigation","Use em Navegação em Camadas" -"Use in Layered Navigation
    (Can be used only with catalog input type 'Dropdown')","Use em Navegação em Camadas
    (Pode ser usado apenas com o tipo de catálogo de entrada ""Suspenso"", ""Dropdown"")" -"Use in Quick Search","Use em Busca Rápida" -"Used for Sorting in Product Listing","Usado ​​para Classificar na Lista de Produtos" -"Used in Product Listing","Usado na Lista de Produtos" -"Value for ""%s"" is invalid.","Valor para ""%s"" é inválido." -"Value for ""%s"" is invalid: %s","Valor para ""%s"" é inválido: %s" -"Varchar","Varchar" -"View Details","Ver Detalhes" -"View as","Ver como" -"Virtual Product","Produto Virtual" -"Visibility","Visibilidade" -"Visible","Visível" -"Visible on Catalog Pages on Front-end","Visível em Páginas de Catálogo em Front-end" -"Visible on Product View Page on Front-end","Visível na Página de Visão do Produto no Front-end" -"WYSIWYG Editor","Editor WYSIWYG" -"Watermark","Marca d'água" -"Watermark Default Size","Tamanho Pedifinido de Marca D'Água" -"Watermark Opacity, Percent","Opacidade da Marca d'água, Percentagem" -"Watermark Position","Posição da Marca d'água" -"We Also Recommend","Também Recomendamos" -"Website","Website" -"Website Item Must be checked","Item do Site Deve ser Verificado" -"Website Store Must be checked","Site da Loja Deve ser verificado" -"Websites","Sites" -"What's this?","O que é isso?" -"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Se é para mostrar a opção ""Todos"" na listagem ""Mostrar X Por Página""." -"Will make search for the query above return results for this search.","Fará com que a pesquisa pela consulta acima gere resultados para esta pesquisa." -"Wrong BuyRequest instance in options group.","Instância BuyRequest errada no grupo de opções." -"Wrong configuration item instance in options group.","Instância de configuração errada de item no grupo de opções." -"Wrong configuration item option instance in options group.","Instância de opção de configuração de item errada no grupo de opções." -"Wrong option instance type in options group.","Tipo de instância de opção errada no grupo de opções." -"Wrong option type to get group instance.","Tipo de opção errado para obter instância de grupo." -"Wrong product instance type in options group.","Tipo de instância de produtos errada no grupo de opções." -"Wrong product type filter specified","Tipo de filtro de produto especificado errado" -"Wrong product type to extract configurable options.","Tipo de produto errado para extrair opções configuráveis." -"Year Range","Intervalo de Ano" -"Yes","Sim" -"You cannot remove system attribute from this set.","Você não pode remover atributo de sistema a partir deste conjunto." -"You have no items to compare.","Você não tem itens para comparar." -"You may also be interested in the following product(s)","Você também pode se interessar no(s) seguinte(s) produto(s)" -"Zoom In","Aumentar" -"Zoom Out","Diminuir o Zoom" -"and","e" -"and above","e acima" -"categories","categorias" -"each","cada" -"ex. http://domain.com","ex. http://domínio.com" -"leave blank if its not an image","deixe em branco se não for uma imagem" -"per page","por página" -"products","produtos" -"px.","px." -"save","salvar" -"select all","marcar todos" -"unselect all","desmarcar todos" -"x","x" diff --git a/app/locale/pt_BR/Mage_CatalogInventory.csv b/app/locale/pt_BR/Mage_CatalogInventory.csv deleted file mode 100644 index 0e7e2a9c7..000000000 --- a/app/locale/pt_BR/Mage_CatalogInventory.csv +++ /dev/null @@ -1,62 +0,0 @@ -"""%s"" is not available in the requested quantity. %s of the items will be backordered.","""%s"" não está disponível na quantidade solicitada. %s dos itens será encomendado." -"%s is available for purchase in increments of %s only.","%s está disponível para compra apenas em incrementos de %s." -"%s is not a correct comparsion method.","%s não é um método correto de comparação." -"Note that these settings are applicable to cart line items, not the whole cart.","Note que essas configurações são aplicáveis ​​aos itens de linha do carrinho, não o carrinho inteiro." -"Add Minimum Qty","Adicionar Qtde mínima" -"Allow Qty Below 0","Permitir Qtde Abaixo de 0" -"Allow Qty Below 0 and Notify Customer","Permitir Qtde Abaixo de 0 e Notificar o Cliente" -"Automatically Return Credit Memo Item to Stock","Retornar Automaticamente a Nota de Crédito do Item para o Estoque" -"Backorders","Ordens em Atraso" -"By Fixed value","Por Valor Fixo" -"By Percentage","Por Percentagem" -"Cannot specify product identifier for the order item.","Não é possível especificar identificador do produto para o item da ordem." -"Catalog Inventory","Inventário de Catálogo" -"Decrease Stock When Order is Placed","Reduzir Estoque Quando Colocada a Ordem" -"Display Out of Stock Products","Mostra Produtos Fora de Estoque" -"Display products availability in stock in the frontend","Exibir disponibilidade de produtos em estoque na frente" -"Enable Qty Increments","Habilitar Incrementos na Qtde." -"In Stock","No Estoque" -"Index Product Stock Status","Índice de Estado de Estoque do Produto" -"Inventory","Inventário" -"Inventory API","API Inventório" -"Inventory Section","Seção de Inventório" -"Manage Stock","Gerenciar Estoque" -"Maximum Qty Allowed in Shopping Cart","Qtde. Máxima Permitida no Carrinho" -"Minimum Qty","Qtde Mínima" -"Minimum Qty Allowed in Shopping Cart","Qtde Mínima Permitida no Carrinho de Compras" -"Multi update product stock data","Atualizar dados múltiplos de estoque de produtos" -"No Backorders","Sem Pedidos Retroativos" -"Not all products are available in the requested quantity","Nem todos os produtos estão disponíveis na quantidade solicitada" -"Notify for Quantity Below","Notificar para Quantidade Abaixo" -"Only %s left","Apenas %s restante(s)" -"Only X left Threshold","Apenas X restantes até o Limite" -"Out of Stock","Esgotado" -"Product Name","Nome do Produto" -"Product Stock Options","Opções de Estoque do Produto" -"Products will still be shown by direct product URLs.","Os produtos serão mostrados pelas URLs diretas dos produtos." -"Qty","Qtd" -"Qty Increments","Incrementos de Quantidade" -"Qty for Item's Status to Become Out of Stock","Quant. para Status do Item mudar para Fora de Estoque" -"Retrieve stock data","Recuperar dados de estoque" -"Retrieve stock data by product ids","Recuperar dados de estoque pelos IDs dos produtos" -"Rule price","Preço Regra" -"Set Items' Status to be In Stock When Order is Cancelled","Definir Estado dos Itens para ser Em Estoque Quando a Ordem é Cancelada" -"Some of the products are currently out of stock.","Alguns dos produtos estão atualmente fora de estoque." -"Some of the products cannot be ordered in requested quantity.","Alguns dos produtos não podem ser pedidos na quantidade solicitada." -"Some of the products cannot be ordered in the requested quantity.","Alguns dos produtos não podem ser encomendados na quantidade solicitada." -"Stock Options","Opções de Estoque" -"Stock Status","Estado de Estoque" -"The maximum quantity allowed for purchase is %s.","A quantidade máxima permitida para compra é %s." -"The minimum quantity allowed for purchase is %s.","A quantidade mínima permitida para compra é %s." -"The requested quantity for ""%s"" is not available.","A quantidade solicitada para ""%s"" não está disponível." -"The stock item for Product in option is not valid.","O item de estoque para o produto em opção não é válido." -"The stock item for Product is not valid.","O item de estoque para o produto não é válido." -"This product is available for purchase in increments of %s only.","Este produto está disponível para compra apenas em incrementos de %s." -"This product is currently out of stock.","Este produto está atualmente fora de estoque." -"This product is not available in the requested quantity. %s of the items will be backordered.","Este produto não está disponível na quantidade solicitada. %s dos itens será encomendado." -"To Fixed Value","Para Valor Fixo" -"To Percentage","Para Percentagem" -"Undefined product type.","Tipo de produto indefinido" -"Update","Atualizar" -"Update product stock data","Atualizar dados de produtos em estoque" -"Update the Product","Atualizar o Produto" diff --git a/app/locale/pt_BR/Mage_CatalogRule.csv b/app/locale/pt_BR/Mage_CatalogRule.csv deleted file mode 100644 index 6eb7084d4..000000000 --- a/app/locale/pt_BR/Mage_CatalogRule.csv +++ /dev/null @@ -1,64 +0,0 @@ -"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","Foram desativadas as Regras de Preço do Catálogo %d baseadas no atributo ""%s""." -"Actions","Ações" -"Active","Ativo" -"Add New Rule","Adicionar nova regra" -"An error occurred while deleting the rule. Please review the log and try again.","Ocorreu um erro ao apagar a regra. Reveja o relatório e tente novamente." -"An error occurred while saving the rule data. Please review the log and try again.","Ocorreu um erro ao salvar os dados da regra. Reveja o relatório e tente novamente." -"Apply","Solicitar" -"Apply Rules","Aplicar Regras" -"Attribute Set","Conjunto de Atributos" -"By Fixed Amount","Por Quantia Fixa" -"By Percentage of the Original Price","Por Percentagem do Preço Original" -"Catalog","Catálogo" -"Catalog Price Rule","Regra de Preço de Catálogo" -"Catalog Price Rules","Regras de Preço do Catálogo" -"Category","Categoria" -"Conditions","Condições" -"Conditions (leave blank for all products)","Condições (deixar em branco para todos os produtos)" -"Conditions Combination","Combinação de condições" -"Customer Groups","Grupos do cliente" -"Date Expire","Vencimento" -"Date From","Data Inicial" -"Date Start","Data Inicial" -"Date To","Data Final" -"Description","Descrição" -"Discount Amount","Quantia de Desconto" -"Edit Rule","Editar regra" -"Edit Rule '%s'","Editar regra ""s%""" -"Enable Discount to Subproducts","Habilitar Desconto para Subprodutos" -"Expiration Date","Data de Validade" -"From Date","A Partir da Data" -"General Information","Informações gerais" -"ID","Identidade" -"Inactive","Inativo" -"New Rule","Nova Regra" -"No","Não" -"Options","Opções" -"Priority","Prioridade" -"Product Attribute","Atributo de Produto" -"Promotions","Promoções" -"Rule Information","Informação da Regra" -"Rule Name","Nome da Regra" -"Save and Apply","Salvar e Aplicar" -"Save and Continue Edit","Salvar e continuar a editar" -"Start Date","Data de início" -"Status","Status" -"Stop Further Rules Processing","Parar Outras Regras de Processamento" -"The rule has been deleted.","A regra foi apagada." -"The rule has been saved.","A regra foi salva." -"The rules have been applied.","As regras foram aplicadas." -"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","Existem regras que foram alteradas, mas não aplicadas. Somente usuários com acesso exclusivo podem aplicar as regras." -"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","Existem regras que foram alteradas mas não foram aplicadas. Por favor, clique em Aplicar Regras para ver o efeito imediato no catálogo." -"This rule no longer exists.","Essa regra não existe mais." -"To Date","Até a Data Atual" -"To Fixed Amount","Para um Valor Fixo" -"To Percentage of the Original Price","Para uma Porcentagem do Preço Original" -"Type","Tipo" -"Unable to apply rules.","Incapaz de aplicar as regras." -"Unable to find a rule to delete.","Incapaz de encontrar uma regra para excluir." -"Update Prices Using the Following Information","Atualizar preços usando as seguintes informações" -"Update product's %s %s: %s","Atualização dos produtos %s %s: %s" -"Website","Website" -"Websites","Sites" -"Wrong rule specified.","Especificação de regra incorreta." -"Yes","Sim" diff --git a/app/locale/pt_BR/Mage_CatalogSearch.csv b/app/locale/pt_BR/Mage_CatalogSearch.csv deleted file mode 100644 index 89126566f..000000000 --- a/app/locale/pt_BR/Mage_CatalogSearch.csv +++ /dev/null @@ -1,49 +0,0 @@ -"%s and greater","%s e maior" -"%d item(s) were found using the following search criteria","%d item(s) foram encontrados utilizando os seguintes critérios de pesquisa" -"Advanced Search","Pesquisa Avançada" -"Advanced Search Form","Formulário de Pesquisa Avançada" -"Advanced Search Result","Resultado de Pesquisa Avançada" -"All","Todos" -"Applies for ""Like"" search type only.","Aplica-se apenas para o tipo de pesquisa ""Como""." -"Apply Layered Navigation if Search Results are Less Than","Aplicar Navegação em Camada se Resultados da Pesquisa são Menos Que" -"Attribute setting change related with Search Index. Please run Rebuild Search Index process.","Alterar a definição de atributos relacionados com o Índice de Pesquisa. Por favor execute o processo Reconstruir Índice de Pesquisa." -"Autogenerated Site Map","Mapa do Site Autogerado" -"Catalog Advanced Search","Pesquisa Avançada do Catálogo" -"Catalog Search","Busca de Catálogo" -"Catalog Search Index","Índice de Pesquisa do Catálogo" -"Don't see what you're looking for?","Não vê o que você está procurando?" -"Enter ""0"" to enable layered navigation for any number of results.","Insira ""0"" para permitir a navegação em camadas para qualquer número de resultados." -"Go","Ir" -"Go to Home Page","Ir para Página Inicial" -"Grid","Grade" -"Home","Início" -"List","Lista" -"Maximum Query Length","Comprimento Máximo de Consulta" -"Maximum Query Words Count","Contagem Máxima de Palavras de Consulta" -"Maximum Search query length is %s. Your query was cut.","O comprimento máximo de consulta de pesquisa é %s. Sua pesquisa foi cortada." -"Maximum words count is %1$s. In your search query was cut next part: %2$s.","A contagem máxima de palavras é %1$s. Na sua busca a próxima parte foi cortada: %2$s." -"Minimal Query Length","Comprimento Minímo de Consulta" -"Minimum Search query length is %s","Comprimento minímo de Pesquisa de consulta é %s." -"Modify your search","Modifique sua pesquisa" -"No","Não" -"No items were found using the following search criteria.","Nenhum item foi encontrado utilizando o seguinte critério de pesquisa." -"Please specify at least one search term.","Especifique ao menos um termo de pesquisa." -"Popular Search Terms","Termos populares de pesquisa" -"Quick Search Form","Formulário de pesquisa rápida" -"Rebuild Catalog product fulltext search index","Reconstruir índice de pesquisa de texto completo de produto do catálogo" -"Relevance","Relevância" -"Results","Resultados" -"Search","Pesquisa" -"Search Settings","Opções de pesquisa" -"Search Terms","Buscar Termos" -"Search Type","Tipo de pesquisa" -"Search entire store here...","Pesquise toda a loja aqui..." -"Search results for '%s'","Pesquisar resultados para ""%s""" -"Search results for: '%s'","Pesquisar resultados para: ""%s""" -"Search:","Pesquisa:" -"Specified date is invalid.","A data especificada é inválida." -"Subscribe to Feed","Endossar Feed" -"There are no search terms available.","Não há termos de pesquisa disponíveis." -"Yes","Sim" -"Your search returns no results.","Sua busca não retornou resultados." -"up to %s","até %s" diff --git a/app/locale/pt_BR/Mage_Centinel.csv b/app/locale/pt_BR/Mage_Centinel.csv deleted file mode 100644 index f1188e45d..000000000 --- a/app/locale/pt_BR/Mage_Centinel.csv +++ /dev/null @@ -1,33 +0,0 @@ -"3D Secure CAVV","3D Secure CAVV" -"3D Secure Card Validation","Validação de Cartão 3D Secure" -"3D Secure Cardholder Validation","Validação de Portador de Cartão 3D Secure" -"3D Secure Electronic Commerce Indicator","Indicador de Comércio Eletrônico 3D Secure" -"3D Secure Verification Result","Resultado de Verificação 3D Secure" -"3D Secure XID","3D Secure XID" -"Card Issuer Liability","Responsabilidade do Emissor do Cartão" -"Card Verification","Verificação de Cartão" -"Enrolled","Inscritos" -"Enrolled but Authentication Unavailable","Inscritos mas Autenticação Não Disponível" -"Failed","Falha" -"MasterCard SecureCode","MasterCard SecureCode" -"Merchant Liability","Responsabilidade do Comerciante" -"Not Enrolled","Não Inscrito" -"Order cannot be placed.","Pedido não pode ser realizado." -"Payment information error. Please start over.","Erro de informações de pagamento. Por favor comece de novo." -"Please continue with placing order.","Por favor continuem com a colocação da ordem." -"Please verify the card with the issuer bank before placing the order.","Por favor verifique o cartão com o banco emissor antes de colocar a ordem." -"Please verify the card with the issuer bank:","Por favor verifique o cartão com o banco emissor:" -"Start/Reset Validation...","Iniciar/Reiniciar Validação..." -"Successful","Bem sucedido" -"Successful attempt","Tentativa bem sucedida" -"The card has failed verification with the issuer bank.","O cartão falhou a verificação com o banco emissor." -"There has been wrong payment information submitted or the time limit has expired. Please, try again.","Houve informações de pagamento erradas apresentadas ou o prazo expirou. Por favor tente novamente." -"There has been wrong payment information submitted or time limit has expired. Please, try again.","Houve apresentação de informações erradas de pagamento ou prazo expirou. Por favor, tente novamente." -"This card has failed validation and cannot be used.","A validação do cartão falhou e ele não pode ser utilizado." -"To ensure the security of your transactions","Para garantir a segurança da sua transação" -"Unable to complete","Incapaz de completar" -"Validation failed.","Falha de validação." -"Verification Failed","Falha de Verificação" -"Verification Successful","Sucesso na Verificação" -"Verification cannot be processed","A verificação não pode ser processada" -"Verified by Visa","Verificado pela Visa" diff --git a/app/locale/pt_BR/Mage_Checkout.csv b/app/locale/pt_BR/Mage_Checkout.csv deleted file mode 100644 index d1cfd15ce..000000000 --- a/app/locale/pt_BR/Mage_Checkout.csv +++ /dev/null @@ -1,360 +0,0 @@ -"%s was added to your shopping cart.","%s foi adicionado ao seu carrinho de compras." -"%s was updated in your shopping cart.","%s foi atualizado no seu carrinho de compras." -"* Required Fields","* Campos obrigatórios" -"Add New Address","Adicionar Novo Endereço" -"Add New Condition","Adicionar Nova Condição" -"Add coupon code for shopping cart","Adicionar o código de cupom para carrinho de compras" -"Add gift messages to shopping cart","Adicionar mensagens de presente a carrinho de compras" -"Add product to shopping cart","Adicionar produto ao carrinho de compras" -"Add product(s) to shopping cart","Adicionar produto(s) ao carrinho de compras" -"Add to Cart","Adicionar ao carrinho" -"Add to Compare","Adicionar para Comparar" -"Add to Wishlist","Adicionar à Lista de Desejos" -"Additional Product Info","Informação Adicional do Produto" -"Address","Endereço" -"Address %s of %s","Endereço %s de %s" -"After Adding a Product Redirect to Shopping Cart","Após Adicionar um Produto Redirecionar para o Carrinho de Compras" -"Allow Guest Checkout","Permitir Caixa de Saída a Visitante" -"Already registered?","Já está registado?" -"An error occurred in the process of payment","Ocorreu um erro no processo de pagamento" -"An error occurred while deleting this condition.","Ocorreu um erro durante a exclusão desta condição." -"An error occurred while saving this condition.","Ocorreu um erro ao salvar esta condição." -"Apply","Aplicar" -"Apply Coupon","Aplicar Coupon" -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","Você tem certeza de que deseja sair desta página? Você precisará passar pelos passos de finalização da compra novamente." -"Are you sure you would like to remove this item from the shopping cart?","Tem certeza de que deseja remover este item do carrinho de compras?" -"Back","Voltar" -"Back to Billing Information","Voltar para Informações de Faturamento" -"Back to Select Addresses","Voltar para Selecionar Endereços" -"Back to Shipping Information","Voltar para Informações de Envio/Frete" -"Back to Shopping Cart","Voltar para Carrinho de Compras" -"Based on your selection, you may be interested in the following items:","Com base em sua seleção, você pode se interessar pelos seguintes itens:" -"Billing Address","Endereço de faturamento" -"Billing Information","Dados de Faturamento" -"Billing Information - %s","Dados de Faturamento - %s" -"Can not remove the item.","Não foi possível remover o item." -"Can not save item.","Não foi possível salvar o item." -"Cancel","Cancelar" -"Cancel Coupon","Cancelar Cupom" -"Cannot add item to the shopping cart.","Impossível adicionar item ao carrinho." -"Cannot add the item to shopping cart","Impossível adicionar o item ao carrinho" -"Cannot add the item to shopping cart.","Impossível adicionar item ao carrinho." -"Cannot apply the coupon code.","Impossível aplicar o código do cupom." -"Cannot configure product.","Impossível configurar produto." -"Cannot open the overview page","Impossível abrir a página de panorama" -"Cannot process the item.","Impossível processar o item." -"Cannot remove the item.","Impossível remover o item." -"Cannot update shopping cart.","Impossível atualizar carrinho de compras." -"Cannot update the item.","Impossível atualizar o item." -"Card Verification Number Visual Reference","Referência Visual de Número de Verificação do Cartão" -"Cart","Carrinho" -"Cart Product API","API para Produtos no Carrinho" -"Cart Subtotal:","Subtotal do Carrinho:" -"Change","Mudar" -"Change Billing Address","Alterar o endereço de faturamento" -"Checkbox Text","Texto para Caixa de Verificação" -"Checkout","Encerrar Compra" -"Checkout Conditions","Condições para Encerrar Compra" -"Checkout Forms Extra","Extras para Formulários de Finalização de Compra" -"Checkout Method","Método para Encerrar Compra" -"Checkout Options","Opções para Encerrar Compra" -"Checkout Progress Wrapper","Código referente ao Progresso do Encerramento da Compra" -"Checkout Section","Seção do Encerramento de Compra" -"Checkout Terms and Conditions","Verificação dos Termos e Condições" -"Checkout as Guest","Checkout como Visitante" -"Checkout as a Guest or Register","Checkout como um Visitante ou se Registe" -"Checkout with Multiple Addresses","Encerrar Compra com Vários Endereços" -"City","Cidade" -"Clear Shopping Cart","Limpar Carrinho de Compras" -"Click here to print a copy of your order confirmation.","Clique aqui para imprimir uma cópia da confirmação de seu pedido." -"Click here to continue shopping.","Clique aqui para continuar as compras." -"Close","Fechar" -"Company","Companhia" -"Condition Name","Nome de Condição" -"Configurable Product Image","Imagem Configurável de Produto" -"Configure Cart Item","Configurar Item de Carrinho" -"Confirm Password","Confirmar a senha" -"Content","Conteúdo" -"Content Height","Altura do Conteúdo" -"Content Height (css)","Altura do Conteúdo (CSS)" -"Continue","Continue" -"Continue Shopping","Continuar Comprando" -"Continue to Billing Information","Continuar para Dados de Faturamento" -"Continue to Review Your Order","Continuar para Rever Seu Pedido" -"Continue to Shipping Information","Continuar para Informações de Envio/Frete" -"Country","País" -"Coupon code ""%s"" is not valid.","O código de cupom ""%s"" é inválido." -"Coupon code ""%s"" was applied.","O código de cupom ""%s"" foi aplicado." -"Coupon code was canceled.","O código de cupom ""%s"" foi cancelado." -"Create Billing Address","Criar Endereço para Faturamento" -"Create Shipping Address","Criar Endereço para Entrega" -"Create an order from shopping cart","Criar pedido a partir do carrinho" -"Create shopping cart","Criar carrinho de compras" -"Customer Address is not valid.","O endereço do cliente não é válido." -"Customer Information","Dados do Cliente" -"Customer's information","Dados do Cliente" -"Data saving problem","Problema ao salvar dados" -"Default Billing","Faturamento-Padrão" -"Default Shipping","Frete-Padrão" -"Delete Condition","Apagar Condição" -"Details","Detalhes" -"Disabled","Desativado" -"Discount Codes","Códigos de Desconto" -"Display Cart Summary","Exibir Resumo de Carrinho" -"Display Shopping Cart Sidebar","Exibir Barra Lateral do Carrinho" -"Display item quantities","Exibir quantidades do item" -"Display number of items in cart","Exibir número de itens no carrinho" -"Display number of items in wishlist","Exibir número de itens na lista de desejos" -"Easy access to your order history and status","Fácil acesso ao seu histórico de pedidos e estado" -"Edit","Editar" -"Edit Address","Editar endereço" -"Edit Billing Address","Editar Endereço de Faturamento" -"Edit Condition","Editar condição" -"Edit Items","Editar Itens" -"Edit Shipping Address","Editar Endereço de Entrega" -"Edit Terms and Conditions","Editar Termos e Condições" -"Edit Your Cart","Editar Seu Carrinho" -"Edit item","Editar Item" -"Edit item parameters","Editar parâmetros de item" -"Email Address","Endereço de e-mail" -"Empty Cart","Esvaziar Carrinho" -"Empty Shopping Cart Content Before","Esvaziar Conteúdo do Carrinho de Compras Antes" -"Enable Onepage Checkout","Habilitar Encerramento de Conta Onepage" -"Enable Terms and Conditions","Habilitar Termos e Condições" -"Enabled","Ativado" -"Enter a New Address","Informar Endereço Novo" -"Enter your coupon code if you have one.","Informe seu código de cupom, caso o tenha." -"Enter your destination to get a shipping estimate.","Informe seu destino, para cálculo estimado do frete." -"Estimate","Estimar" -"Estimate Shipping and Tax","Cálculo Estimado de Frete e Imposto" -"Excl. Tax","Excluir taxas" -"Fast and easy check out","Checkout rápido e fácil" -"Fax","Fax" -"Forgot an Item?","Esqueceu algum item?" -"Forgot your password?","Esqueceu sua senha?" -"Get a Quote","Receber Orçamento" -"Get list of available payment methods","Receber lista de métodos de pagamento disponíveis" -"Get list of available shipping methods","Receber lista de formas de envio disponíveis" -"Get list of products in shopping cart","Receber lista de produtos no carrinho" -"Get terms and conditions","Receber Termos e Condições" -"Get total prices for shopping cart","Totalizar preços no carrinho de compras" -"Gift Message","Mensagem de presente" -"Grand Total:","Total geral:" -"Grouped Product Image","Imagem de Produto Agrupado" -"HTML","HTML" -"ID","Identidade" -"Incl. Tax","Incluir taxas" -"Invalid checkout type.","Tipo de checkout inválido." -"Invalid data.","Dados inválidos." -"Invalid email address ""%s""","Endereço de e-mail inválido ""%s""" -"Invalid method: %s","Método inválido: %s" -"Invalid shipping method.","Método de envio inválido." -"Item not found or already ordered","Item não encontrado ou já encomendado" -"Item was removed successfully.","O item foi removido com sucesso." -"Item was updated successfully.","O item foi atualizado com sucesso." -"Items","Itens" -"Items After","Itens Após" -"Items Before","Itens Antes" -"Load customer quote error","Carregar erro de orçamento do cliente" -"Loading next step...","Carregando próximo passo..." -"Login","Conectar-se" -"Login/Registration Before","Login/Registro Antes" -"Manage Terms and Conditions","Gerenciar Termos e Condições" -"Maximum Display Recently Added Item(s)","Item(ns) Adicionado(s) Recentemente Mais Exibido(s)" -"Maximum qty allowed for Shipping to multiple addresses is %s","Qtde. máxima permitida para entrega em vários endereços é %s" -"Mini-cart promotion block","Bloqueio de promoção do mini-carrinho" -"Minimum order amount is %s","A quantidade mínima de pedido é %s" -"Move","Mover" -"Move to Wishlist","Mover para lista de presentes" -"Move to wishlist","Mover para a lista de desejos" -"Multishipping Checkout","Encerramento de Compra com Várias Entregas" -"Multishipping Checkout Address (Any) Form","Encerrar Compra c/ Várias Entregas: Endereço (Qualquer um)" -"Multishipping Checkout Billing Address Creation","Encerrar Compra c/ Várias Entregas: Endereço de Faturamento" -"Multishipping Checkout Billing Address Edit Form","Encerrar Compra c/ Várias Entregas: Editar Endereço de Faturamento" -"Multishipping Checkout Billing Address Selection","Seleção de Endereço Multienvio de Faturamento de Saída" -"Multishipping Checkout Billing Information Step","Passo de Informação de Faturamento de Multienvio de Saída" -"Multishipping Checkout Customer Address Edit Form","Formulário de Edição do Endereço do Cliente de Multienvio de Saída" -"Multishipping Checkout Overview","Resumo de Caixa de Multienvio" -"Multishipping Checkout Shipping Address Creation","Criação do Endereço de Envio de Multienvio de Saída" -"Multishipping Checkout Shipping Address Edit Form","Formulário de Edição do Endereço de Envio de Multienvio de Saída" -"Multishipping Checkout Shipping Address Selection","Seleção do Endereço de Envio de Multienvio de Saída" -"Multishipping Checkout Shipping Information Step","Passo de Informação de Envio de Multienvio de Saída" -"Multishipping Checkout Success","Sucesso na Multisaída de Saída" -"My Cart","Meu Carrinho" -"My Cart (%s item)","Meu Carrinho (%s item)" -"My Cart (%s items)","Meu Carrinho (%s itens)" -"My Cart Extra Actions","Ações extra do Meu Carrinho" -"My Cart Link","Ligação do Meu Carrinho" -"New Address","Novo Endereço" -"New Condition","Nova Condição" -"New Terms and Conditions","Novos Termos e Condições" -"No Payment Methods","Nenhuma Forma de Pagamento" -"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","O TOTAL DO PEDIDO SERÁ EXIBIDO ANTES DE VOCÊ ENVIAR O PEDIDO" -"One Page Checkout","Saída de Uma Página" -"One Page Checkout Failure","Falha na Saída de Uma Página" -"One Page Checkout Overview","Resumo da Saída de Uma Página" -"One Page Checkout Success","Sucesso na Saída de Uma Página" -"One item of products do not have identifier or sku","Um item de produtos não têm identificador ou sku" -"One item of products is not belong any of quote item","Um item de produtos não pertence a qualquer item citado" -"Order #","Ordem #" -"Order Review","Revisão da Ordem" -"Order Success","Sucesso da Ordem" -"Order place error.","Erro de colocação da ordem." -"Other Items in Your Order","Outros itens em Sua Ordem" -"Overview Items After","Resumo Geral de Itens Depois" -"Password","Senha" -"Payment Failed Email Reciever","Recetor do Email de Pagamento Falhado" -"Payment Failed Email Sender","Remetente do Email de Pagamento Falhado" -"Payment Failed Emails","Emails de Pagamento Falhado" -"Payment Failed Template","Modelo de Pagamento Falhado" -"Payment Information","Informação de Pagamento" -"Payment Method","Método de Pagamento" -"Payment Methods After","Formas de Pagamento Depois" -"Payment Methods After Checkout Button","Método de Pagamento Após Botão de Checkout" -"Payment Methods Before","Formas de Pagamento Antes" -"Payment Methods Before Checkout Button","Método de Pagamento Antes de Botão de Checkout" -"Payment method information","Informação de método de pagamento" -"Payment method is not defined","Método de pagamento não definido" -"Payment methods in shopping cart","Método de pagamento no carrinho de compras" -"Payment profile # %s: ""%s"".","Perfil de pagamento # %s: ""%s""." -"Place Order","Colocar Ordem" -"Please agree to all Terms and Conditions before placing the order.","Por favor concorde com todos os Termos e Condições antes de colocar a ordem." -"Please agree to all Terms and Conditions before placing the orders.","Por favor concorde com todos os Termos e Condições antes de colocar as ordens." -"Please agree to all the terms and conditions before placing the order.","Por favor concorde com todos os Termos e Condições antes de colocar a ordem." -"Please check billing address information.","Por favor cheque as informações do endereço de cobrança." -"Please check shipping address information.","Por favor cheque as informações do endereço de envio." -"Please check shipping addresses information.","Por favor cheque as informações dos endereços de envio." -"Please choose to register or to checkout as a guest","Por favor escolha registrar ou fazer checkout como um convidado" -"Please log in below:","Por favor, faça o login abaixo:" -"Please select region, state or province","Selecione a região, estado ou província" -"Please select shipping address for applicable items","Por favor selecione endereço de entrega para os itens aplicáveis" -"Please select shipping methods for all addresses","Por favor selecione os métodos de transporte para todos os endereços" -"Please select valid payment method.","Por favor selecione uma forma de pagamento válida." -"Please specify payment method.","Por favor especifique o método de pagamento." -"Please specify shipping method.","Por favor especifique o método de envio." -"Please specify shipping methods for all addresses.","Por favor especifique as formas de envio para todos os endereços." -"Price","Preço" -"Proceed to Checkout","Prosseguir para a verificação" -"Product","Produto" -"Product Name","Nome do produto" -"Products","Produtos" -"Qty","Quant." -"Qty:","Quantidade:" -"Quantity was recalculated from %d to %d","A quantidade foi recalculada de %d para %d" -"Quote Lifetime (days)","Duração de cotação (dias)" -"Quote item does not exist.","O item da cotação não existe." -"Quote item is not found.","O item da cotação não foi encontrado." -"Recently added item(s)","Item(ns) adicionado(s) recentemente" -"Register","Registrar" -"Register and save time!","Cadastre-se e poupe tempo!" -"Register to Create an Account","Cadastre-se para Criar uma Conta" -"Register with us for future convenience:","Faça um cadastro conosco para ter comodidade no futuro:" -"Remove Item","Remover Item" -"Remove This Item","Remover Este Item" -"Remove coupon code from shopping cart","Remover código do cupom do carrinho de compras" -"Remove item","Remover item" -"Remove product from shopping cart","Remover produto do carrinho de compras" -"Remove product(s) from shopping cart","Remover produto(s) do carrinho de compras" -"Require Customer To Be Logged In To Checkout","Requerer que o cliente esteja logado para fazer checkout" -"Retrieve information about shopping cart","Recuperar informações sobre o carrinho de compras" -"Review Order","Analisar o pedido" -"Review Order - %s","Analisar o pedido - %s" -"SKU","SKU" -"Sales","Vendas" -"Save Condition","Salvar Condição" -"Save in address book","Salvar no catálogo de endereços" -"See price before order confirmation.","Ver preço antes de confirmar pedido." -"Select Address","Selecionar Endereço" -"Select Addresses","Selecionar Endereços" -"Select Shipping Method","Selecionar Tipo de Frete" -"Select State/Province...","Selecione Estado/Província..." -"Select a billing address from your address book or enter a new address.","Selecione um endereço de cobrança de seu catálogo de endereços ou insira um novo endereço" -"Select a shipping address from your address book or enter a new address.","Selecione um endereço para envio do seu livro de endereços ou insira um novo endereço." -"Send Payment Failed Email Copy Method","Falha no Envio de Pagamento - Enviar Por Email" -"Send Payment Failed Email Copy To","Falha no Envio de Pagamento - Enviar Por Email para" -"Send To","Enviar Para" -"Separate by "","".","Separados por "",""." -"Set customer for shopping cart","Configurar cliente para carrinho de compras" -"Set customer's addresses in shopping cart","Configurar endereços de clientes para carrinho de compras" -"Set payment method","Configurar método de pagamento" -"Set shipping method","Configurar tipo de frete" -"Ship to Multiple Addresses","Entregar em Vários Endereços" -"Ship to different address","Enviar para endereço diferente" -"Ship to this address","Enviar para este endereço" -"Shipping Address","Endereço de Envio" -"Shipping Information","Dados de Frete" -"Shipping Method","Tipo de Frete" -"Shipping Methods","Tipos de Frete" -"Shipping To","Enviar Para" -"Shipping information","Informação de Envio" -"Shipping method has not been selected yet","Método de envio ainda não foi selecionado" -"Shipping methods in shopping cart","Métodos de envio no carrinho de compras" -"Shipping selection is not applicable.","Seleção de envio não é aplicável" -"Shopping Cart","Carrinho de compras" -"Shopping Cart Form Before","Anterior Formulário de Carrinho de Compras" -"Shopping Cart Items After","Items do Carrinho de Compras Depois" -"Shopping Cart Items Before","Items do Carrinho de Compras Antes" -"Shopping Cart Sidebar","Barra Lateral do Carrinho de Compras" -"Shopping Cart Sidebar Extra Actions","Ações Extra da Barra Lateral do Carrinho de Compras" -"Shopping Cart is Empty","Carrinho de Compras está Vazio" -"Shopping cart ability to set coupon code","Capacidade do carrinho de compras para definir código de cupom" -"Show Content as","Mostrar Conteúdo como" -"Some of the requested products are not available in the desired quantity.","Alguns dos produtos solicitados não estão disponíveis na quantidade desejada." -"Some of the requested products are unavailable.","Alguns dos produtos solicitados não estão disponíveis." -"Some products quantities were recalculated because of quantity increment mismatch","Algumas quantidades de produtos foram recalculadas por causa de incompatibilidade no incremento da quantidade" -"Sorry, guest checkout is not enabled. Please try again or contact store owner.","Desculpe, o checkout de convidado não está ativado. Por favor tente novamente ou entre em contato com o proprietário da loja." -"Sorry, no quotes are available for this order at this time.","Desculpe, não há citações disponíveis neste momento para esta ordem." -"State/Province","Estado/Província" -"Status","Status" -"Store View","Visualização da loja" -"Street Address","Endereço da Rua" -"Street Address %s","Endereço da Rua %s" -"Submitting order information...","Enviando informações da ordem..." -"Subtotal","Subtotal" -"Subtotal must exceed minimum order amount","O subtotal precisa exceder a quantidade mínima de pedido" -"Telephone","Telefone" -"Terms and Conditions","Termos e Condições" -"Terms and Conditions Information","Informação de Termos e Condições" -"Terms and conditions","Termos e Condições" -"Text","Texto" -"Thank you for your purchase!","Obrigado por sua compra!" -"The condition has been deleted","A condição foi apagada" -"The condition has been saved.","A condição foi salva." -"The onepage checkout is disabled.","O checkout de uma página está desativado." -"The product could not be found.","O produto não pôde ser encontrado." -"The product does not exist.","O produto não existe." -"There are %s items in your cart.","Há %s itens no seu carrinho." -"There is 1 item in your cart.","Há 1 item no seu carrinho." -"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","Já há um usuário registrado usando esse endereço de e-mail. Por favor faça login usando esse endereço de e-mail ou informe um endereço de e-mail diferente para registrar a sua conta." -"There was an error processing your order. Please contact us or try again later.","Ocorreu um erro ao processar sua ordem. Entre em contato conosco ou tente novamente mais tarde." -"This condition no longer exists.","Esta condição não existe mais." -"Total","Total" -"Total for this address","Total para este endereço" -"Unable to set Payment Method.","Não é possível definir o Método de Pagamento." -"Unit Price","Preço Unitário" -"Update","Atualizar" -"Update Cart","Atualizar Carrinho" -"Update Qty & Addresses","Atualização de Quantidade e Endereços" -"Update Shopping Cart","Atualização do Carrinho de Compras" -"Update Total","Atualizar Total" -"Update product quantities in shopping cart","Atualizar quantidades de produtos no carrinho de compras" -"Update product(s) quantities in shopping cart","Atualizar quantidades de produto(s) no carrinho de compras" -"Use Billing Address","Use Endereço de Cobrança" -"VAT Number","Número VAT" -"View Shopping Cart","Ver Carrinho de Compras" -"Visible items in minicart","Items visíveis no mini-carrinho" -"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","Estamos processando o seu pedido e em breve você receberá um email com detalhes da ordem. Uma vez que o pedido seja enviado você receberá outro email com um link para acompanhar seu progresso." -"What's this?","O que é isto?" -"What's this?","O que é isso?" -"You have no items in your shopping cart.","Você não possui itens no carrinho de compras." -"You will receive an order confirmation email with details of your order and a link to track its progress.","Você irá receber um e-mail de confirmação de pedido com detalhes de seu pedido e um link para acompanhar o progresso." -"Your Checkout Progress","Progresso de seu Pagamento" -"Your billing agreement # is: %s.","Seu acordo de faturamento # está: %s." -"Your order # is: %s.","Seu pedido # está: %s." -"Your order cannot be completed at this time as there is no payment methods available for it.","Seu pedido não pode ser concluído neste momento pois não há métodos de pagamento disponíveis para ele." -"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","Seu pedido não pode ser concluído neste momento pois não há métodos de envio disponíveis para ele. Por favor faça as mudanças necessárias no seu endereço de envio." -"Your order has been received.","Seu pedido foi recebido." -"Your order number is ","O número do seu pedido é" -"Your recurring payment profiles:","Seus perfis de pagamentos recorrentes:" -"Zip/Postal Code","Zip/Código Postal" -"ok","ok" diff --git a/app/locale/pt_BR/Mage_Cms.csv b/app/locale/pt_BR/Mage_Cms.csv deleted file mode 100644 index 95ffb909c..000000000 --- a/app/locale/pt_BR/Mage_Cms.csv +++ /dev/null @@ -1,123 +0,0 @@ -"A block identifier with the same properties already exists in the selected store.","Já existe na loja selecionada um identificador de bloco com as mesmas propriedades." -"A directory with the same name already exists. Please try another folder name.","Já existe um diretório com o mesmo nome. Experimente outro nome de pasta." -"A page URL key for specified store already exists.","Já existe uma chave de URL para a loja especificada." -"Action","Ação" -"Add New Block","Adicionar Novo Bloco" -"Add New Page","Adicionar Nova Página" -"All Countries","Todos os Países" -"An error occurred while saving the page.","Ocorreu um erro ao salvar a página." -"Anchor Custom Text","Texto âncora personalizado" -"Anchor Custom Title","Título âncora personalizado" -"Are you sure you want to delete current folder?","Tem certeza de que deseja apagar a pasta atual?" -"Are you sure you want to delete the selected file?","Tem certeza de que deseja apagar o arquivo selecionado?" -"Block","Bloco" -"Block Information","Informações de bloco" -"Block Title","Título de Bloco" -"CMS","SGC" -"CMS Content Wrapper","Adaptador de conteúdo de SGC" -"CMS Home Page","Página inicial de SGC" -"CMS No Cookies Page","Página CMS para Bloqueio de Cookies" -"CMS No Route Page","Página CMS para Bloqueio de Rotas" -"CMS No-Route Page","Página sem rota de SGC" -"CMS Page","Página CMS" -"CMS Page Link","Link de Página CMS" -"CMS Page Link Block Template","Modelo de bloco de link da página de SGC" -"CMS Page Link Inline Template","Modelo Em Linha de Link de Página CMS" -"CMS Pages (All)","Páginas CMS (Todas)" -"CMS Static Block","Bloco Estático do CMS" -"CMS Static Block Default Template","Template Padrão do Bloco Estático do CMS" -"Cannot create new directory.","Não foi possível criar um novo diretório." -"Cannot delete directory %s.","Não foi possível apagar o diretório %s." -"Cannot delete root directory %s.","Não foi possível apagar o diretório raiz %s." -"Cannot upload file.","Não foi possível atualizar o arquivo." -"Collapse All","Fechar Tudo" -"Content","Conteúdo" -"Content Heading","Cabeçalho do conteúdo" -"Content Management","Gerenciamento do Conteúdo" -"Contents of a Static Block","Conteúdos de um Bloco Estático" -"Create Folder...","Criar Pasta..." -"Custom Design","Personalizar Design" -"Custom Design From","Design Personalizado De" -"Custom Design To","Modelo Personalizado Para" -"Custom Layout","Layout do Modelo" -"Custom Layout Update XML","XML de Atualização do Layout Personalizado" -"Custom Theme","Tema Personalizado" -"Customer Tax Class Information","Informação Sobre Escalão de Imposto do Cliente" -"Date Created","Data da Criação" -"Delete Block","Apagar Bloco" -"Delete File","Apagar Arquivo" -"Delete Folder","Apagar Pasta" -"Delete Page","Apagar Página" -"Description","Descrição" -"Design","Design" -"Disabled","Desativado" -"Disabled Completely","Completamente desativado" -"Disabled by Default","Desativada por Defeito" -"Edit Block","Editar bloco" -"Edit Block '%s'","Editar bloco ""%s""" -"Edit Page","Editar página" -"Edit Page '%s'","Editar página ""%s""" -"Enable WYSIWYG Editor","Ativar editor WYSIWYG" -"Enabled","Ativado" -"Enabled by Default","Habilitado como padrão" -"Expand All","Expandir Todos" -"General Information","Informações gerais" -"Go to Home Page","Ir para Página Inicial" -"Home","Início" -"ID","Identidade" -"Identifier","Identificador" -"If empty, the Page Title will be used","Caso esteja em branco, o título da página será utilizado" -"Images (%s)","Imagens (%s)" -"Insert File","Inserir arquivo" -"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","Nome de pasta inválido. Utilize caracteres alfanuméricos, sublinhado ou hífens." -"Keywords","Palavras-chave" -"Last Modified","Última alteração" -"Layout","Layout" -"Layout Update XML","Atualização de Layout XML" -"Link to a CMS Page","Links para uma Página CMS" -"Manage Pages","Gerenciar Páginas" -"Media Gallery","Galeria de Mídia" -"Media Storage","Armazenamento de Mídia" -"Meta Data","Metadados" -"Meta Description","Meta Descrição" -"Meta Keywords","Meta Keywords" -"New Block","Novo Bloco" -"New Folder Name:","Nome Nome da Pasta:" -"New Page","Nova página" -"No files found","Arquivos não encontrados" -"Page Information","Informação da Página" -"Page Layout","Layout da Página" -"Page Status","Status da Página" -"Page Title","Título da Página" -"Pages","Páginas" -"Product Tax Class Information","Informação do Escalão de Imposto do Produto" -"Redirect to CMS-page if Cookies are Disabled","Redirecionar para a página CMS se os Cookies estiverem Desabilitados" -"Relative to Website Base URL","Relativo a um Website com Base URL" -"Save Block","Salvar Bloco" -"Save Page","Salvar Página" -"Save Process","Salvar Progresso" -"Select Block...","Selecionar Bloco..." -"Select Page...","Selecionar Página..." -"Show Breadcrumbs for CMS Pages","Mostrar Caminho Completo para Páginas CMS" -"Show Notice if JavaScript is Disabled","Mostrar Notificação se Javascript estiver Desativado" -"Static Blocks","Blocos Estáticos" -"Status","Status" -"Storage Root","Raiz Tuberosa" -"Store View","Visualização da loja" -"Template","Modelo" -"The block has been deleted.","O bloco foi apagado." -"The block has been saved.","O bloco foi salvo." -"The directory %s is not writable by server.","O diretório %s não é editável pelo servidor." -"The page URL key cannot consist only of numbers.","A chave de URL não pode compor-se apenas de números." -"The page URL key contains capital letters or disallowed symbols.","A chave de URL contém letras maiúsculas ou símbolos desautorizados." -"The page has been deleted.","A página foi apagada." -"The page has been saved.","A página foi salva." -"The static block content cannot contain directive with its self.","O conteúdo do bloco estático não pode conter diretiva com seu próprio." -"This block no longer exists.","O bloco não existe mais." -"This page no longer exists.","A página não existe mais." -"Title","Título" -"URL Key","Chave URL" -"Unable to find a block to delete.","Impossível encontrar bloco a ser apagado." -"Unable to find a page to delete.","Impossível encontrar página a ser apagada." -"WYSIWYG Options","Opções WYSIWYG" -"px.","px." diff --git a/app/locale/pt_BR/Mage_Compiler.csv b/app/locale/pt_BR/Mage_Compiler.csv deleted file mode 100644 index 50e27c79c..000000000 --- a/app/locale/pt_BR/Mage_Compiler.csv +++ /dev/null @@ -1,21 +0,0 @@ -"Collected Files Count","Contagem de arquivos coletados" -"Compilation","Compilação" -"Compilation State","Estado de compilação" -"Compilation error","Erro de compilação" -"Compiled","Compilado" -"Compiled Scopes Count","Contagem de escopos compilados" -"Compiler Status","Status de compilador" -"Compiler include path is disabled.","O caminho de inclusão do compilador está desativado." -"Compiler include path is enabled.","O caminho de inclusão do compilador está ativado." -"Directory ""%s"" must be writeable","O diretório ""%s"" deve ser gravável" -"Disable","Desativar" -"Disabled","Desativado" -"Enable","Ativar" -"Enabled","Ativado" -"File ""%s"" must be writeable","O arquivo ""%s"" deve ser gravável" -"Not Compiled","Não compilado" -"Run Compilation Process","Executar o processo de compilação" -"Scopes Compilation Settings","Configurações de escopos de compilação" -"System","Sistema" -"The compilation has completed.","A compilação foi concluída." -"Tools","Ferramentas" diff --git a/app/locale/pt_BR/Mage_Connect.csv b/app/locale/pt_BR/Mage_Connect.csv deleted file mode 100644 index cd45c5af2..000000000 --- a/app/locale/pt_BR/Mage_Connect.csv +++ /dev/null @@ -1,58 +0,0 @@ -"1.5.0.0 & later","1.5.0.0 e posterior" -"Action","Ação" -"Add Author","Adicionar autor" -"Add Contents Path","Adicionar sequência de conteúdos" -"Add PHP Extension dependency","Adicionar dependência de Extensão PHP" -"Add Package dependency","Adicionar dependência de Pacote" -"Add files","Adicionar arquivos" -"Authors","Autores" -"Channel","Canal" -"Contents","Conteúdos" -"Create Extension Package","Criar pacote de expansão" -"Dependencies","Dependências" -"Description","Descrição" -"Edit Extension","Editar extensão" -"Email","E-mail" -"Extension","Extensão" -"Extensions","Extensões" -"Failed to create the package.","Ocorreu um erro ao tentar criar o pacote." -"Failed to load the package data.","Ocorreu um erro ao tentar carregar os dados do pacote." -"Failed to save the package.","Ocorreu um erro ao tentar salvar o pacote." -"Files","Arquivos" -"Folder","Pasta" -"Ignore","Ignorar" -"Include","Incluir" -"License","Licença" -"License URI","Licença de URI" -"Load Local Package","Carregar Pacote Local" -"Load local Package","Carregar Pacote Local" -"Magento Connect","Conexão Magento" -"Magento Connect Manager","Gerenciador de Conexão Magento" -"Max","Máximo" -"Maximum","Máximo" -"Min","Min" -"Minimum","Mínimo" -"Name","Nome" -"New Extension","Nova Extensão" -"PHP Version","Versão PHP" -"Package","Embalagem" -"Package Extensions","Extensões da Embalagem" -"Package File Name","Nome do Arquivo do Pacote" -"Package Info","Informação do Pacote" -"Packages","Embalagens" -"Path","Caminho" -"Pre-1.5.0.0","Pré-1.5.0.0" -"Release Info","Informação de Lançamento" -"Remove","Remover" -"Save As...","Salvar Como..." -"Save Data and Create Package","Salvar Dados e Criar Pacote" -"Save package with custom package file name","Salvar pacote com nome do arquivo de pacote personalizado" -"Summary","Sumário" -"Supported releases","Versões suportadas" -"System","Sistema" -"Target","Objetivo" -"The package %s data has been loaded.","Os dados do pacote %s foram carregados." -"The package data has been saved.","Os dados do pacote foram salvos." -"There was a problem saving package data","Houve um problema ao salvar dados do pacote" -"Type","Tipo" -"User","Usuário" diff --git a/app/locale/pt_BR/Mage_Contacts.csv b/app/locale/pt_BR/Mage_Contacts.csv deleted file mode 100644 index 2be1c698e..000000000 --- a/app/locale/pt_BR/Mage_Contacts.csv +++ /dev/null @@ -1,19 +0,0 @@ -"* Required Fields","* Campos obrigatórios" -"Comment","Comentário" -"Contact Form","Formulário de Contato" -"Contact Information","Informações de contato" -"Contact Us","Contate-nos" -"Contact Us Form","Formulário de Contato" -"Contacts","Contatos" -"Contacts Section","Seção de Contatos" -"Email","E-mail" -"Email Options","Opções de Email" -"Email Sender","Remetente do e-mail:" -"Email Template","Modelo de e-mail" -"Enable Contact Us","Ativar Contate-nos" -"Name","Nome" -"Send Emails To","Enviar Emails Para" -"Submit","Enviar" -"Telephone","Telefone" -"Unable to submit your request. Please, try again later","Não é possível submeter o seu pedido. Por favor tente novamente mais tarde" -"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","Seu pedido de informação foi submetido e será respondido o mais rapidamente possível. Obrigado por nos contatar." diff --git a/app/locale/pt_BR/Mage_Core.csv b/app/locale/pt_BR/Mage_Core.csv deleted file mode 100644 index 5c573401d..000000000 --- a/app/locale/pt_BR/Mage_Core.csv +++ /dev/null @@ -1,396 +0,0 @@ -"%s","%s" -"%s already exist.","%s já existe." -"%s already exists.","%s já existe." -"-- Please Select --","- Por Favor Selecione -" -"Warning! When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","Aviso! Ao usar CDN, em alguns casos JavaScript pode não funcionar corretamente se CDN não está na sua subdomínio" -"Warning! When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).","Aviso!Ao usar o Código de Loja em URLs, em alguns casos o sistema pode não funcionar corretamente se forem especificados URLs sem Códigos de Loja nos serviços de terceiros (por exemplo, PayPal, etc.)." -"A category object is required for determining the product request path.","Um objeto da categoria é necessário para determinar o caminho de solicitação do produto." -"Add Block Names to Hints","Adicione Nomes Bloqueados a Dicas" -"Add Secret Key to URLs","Adicione Chave Secreta a URLs" -"Add Store Code to Urls","Adicione Código de Loja a URLs" -"Admin","Admin" -"Admin Base URL","Base de Administração URL" -"Admin User Emails","E-mails do Usuário Administrador" -"Advanced","Avançado" -"After selecting a new media storage location, press the Synchronize button - to transfer all media to that location. Media will not be available in the new - location until the synchronization process is complete.","Depois de selecionar um novo local de armazenamento de mídia, pressione o botão Sincronizar -para transferir todos os mídia para esse local. Os mídia não estarão disponíveis no novo -local até que o processo de sincronização esteja completo." -"Allow Countries","Permitir Países" -"Allow Magento Backend to run in frame","Permitir execução em frame do Backend do Magento" -"Allow Magento Frontend to run in frame","Permitir execução em frame do Frontend do Magento" -"Allow Symlinks","Permitir Symlinks" -"Allowed IPs (comma separated)","IPs Permitidos (separados por vírgula)" -"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Tipos de arquivo permitidos: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Nem todos os navegadores suportam todos esses formatos!" -"Allows customers to stay logged in when switching between different stores.","Permite que os clientes permaneçam ligados enquanto alternam entre diferentes lojas." -"Alternative text for next link in pagination menu. If empty, default arrow image will used.","Texto alternativo para próximo link no menu de paginação. Se vazio, imagem de seta padrão será usada." -"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","Texto alternativo para link anterior no menu de paginação. Se vazio, imagem de seta padrão será usada." -"An error occurred while saving. Please review the error log.","Ocorreu um erro ao salvar. Por favor analise o registro de erro." -"Anchor Text for Next","Texto Âncora para Seguinte" -"Anchor Text for Previous","Texto Âncora para Anterior" -"Anchor symbol (#) is not supported in request path","Símbolo âncora (#) não é suportado no caminho pedido" -"Anchor symbol (#) is not supported in url rewrite suffix","Símbolo âncora (#) não é suportado no sufixo url reescrito" -"Are you sure?","Tem certeza?" -"Auto-redirect to Base URL","Auto-redirecionado para URL Base" -"Back","Voltar" -"Backup Options","Opções de Backup" -"Base JavaScript URL","URL JavaScript Base" -"Base Link URL","Link URL de Base" -"Base Media URL","URL Mídia Base" -"Base Secure URL","URL Base Segura" -"Base Skin URL","URL Skin Base" -"Base URL","URL Base" -"Base Unsecure URL","URL Base Não Segura" -"Before modifying the store view code please make sure that it is not used in index.php.","Antes de modificar o código de exibição da loja certifique-se que não é usado em index.php." -"Before modifying the website code please make sure that it is not used in index.php.","Antes de modificar o código do site por favor certifique-se que não é usado em index.php." -"Block with name ""%s"" already exists","Bloco com o nome ""%s"" já existe" -"Browser Capabilities Detection","Deteção de Capacidades do Navegador" -"CSS Settings","Configurações CSS" -"Cache Storage Management","Gerenciamento de Armazenamento de Cache" -"Cache storage may contain additional data. Are you sure that you want flush it?","Armazenamento na cache pode conter dados adicionais. Tem certeza de que deseja eliminá-lo?" -"Can not create invoice. Order was not found.","Não é possível criar fatura. Ordem não foi encontrada." -"Can't retrieve request object","Não é possível recuperar objeto do pedido" -"Can\'t retrieve entity config: %s","Não é possível recuperar configuração da entidade: %s" -"Cancel","Cancelar" -"Cannot complete this operation from non-admin area.","Não é possível concluir esta operação de área não administrativa." -"Card type does not match credit card number.","Tipo de cartão não corresponde ao número de cartão de crédito." -"Code","Código" -"Controller file was loaded but class does not exist","Controlador de arquivo foi carregado mas a classe não existe" -"Cookie Domain","Domínio de cookie" -"Cookie Lifetime","Duração de cookie" -"Cookie Path","Caminho de cookie" -"Cookie Restriction Mode","Modo de Restrição de Cookie" -"Copyright","Direitos autorais" -"Core","Núcleo" -"Countries Options","Opções de países" -"Country","País" -"Create Store","Criar loja" -"Create Store View","Criar visualização de loja" -"Create Website","Criar site" -"Credit card number does not match credit card type.","O número do cartão de crédito não é compatível com o tipo de cartão de crédito." -"Current Package Name","Nome do pacote atual" -"Custom Admin Path","Caminho personalizado de administração" -"Custom Admin URL","URL Custom Admin" -"Custom Design","Personalizar Design" -"Custom Email 1","E-mail personalizado 1" -"Custom Email 2","E-mail personalizado 2" -"Custom Variables","Variáveis de Personalização." -"Custom1 Contact Email","Email Contato Custom1" -"Custom1 Contact Name","Nome Contato Custom1" -"Custom2 Contact Email","Email Contato Custom2" -"Custom2 Contact Name","Nome Contato Custom2" -"Customer Support","Suporte personalizado" -"Dashboard","Painel" -"Date From","Data Inicial" -"Date To","Data Final" -"Date/time format ""%s"" is not supported.","O formato de data/hora ""%s"" não é suportado." -"Debug","Debug" -"Default","Predefinido" -"Default Country","País padrão" -"Default Description","Descrição padrão" -"Default Keywords","Palavras-chave padrão" -"Default No-route URL","URL sem rota padrão" -"Default Pages","Páginas padrão" -"Default Robots","Robots padrão" -"Default Store","Loja padrão" -"Default Store View","Visualização padrão de loja" -"Default Title","Título padrão" -"Default Web URL","URL padrão de rede" -"Delete","Excluir" -"Delete Store","Apagar Loja" -"Delete Store View","Apagar Visão de Loja" -"Delete Website","Apagar Site Web" -"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","Excluir um(a) %1$s não excluirá as informações associadas com o(a) %1$s (ex. categorias, produtos, etc.), mas o(a) %1$s não poderá ser reestabelecido. É aconselhavel criar uma base de dados de backup antes de excluir o(a) %1$s." -"Design","Design" -"Design Change","Alteração de design" -"Developer","Programador" -"Developer Client Restrictions","Restrições de cliente de programador" -"Disable Email Communications","Desativar comunicações de e-mail" -"Disable Modules Output","Desativar saída de módulos" -"Display Demo Store Notice","Exibir demonstração de aviso de loja" -"Duplicate Of Template Name","Nome de duplicata de modelo" -"Edit Design Change","Editar alteração de design" -"Edit Store","Editar loja" -"Edit Store View","Editar visualização de loja" -"Edit Website","Editar site" -"Empty identifier field name","Nome do campo do identificador em branco" -"Empty main table name","Nome da tabela principal em branco" -"Enable Charts","Habilitar Gráficos" -"Enabled","Ativado" -"Enabled for Admin","Habilitado para Admin" -"Enabled for Frontend","Habilitado para Front-end" -"Environment Update Time","Tempo de Atualização de Ambiente" -"Error in file: ""%s"" - %s","Erro no arquivo: ""%s"" - %s" -"European Union Countries","Países da União Europeia" -"Exceptions Log File Name","Log de Excessão do Nome do Arquivo" -"Favicon Icon","Ícone do Favicon" -"File %s does not exist","Arquivo %s não existe" -"File %s is not readable","Arquivo %s não legível" -"File not found","Arquivo não encontrado" -"File system","Sistema de arquivo" -"File with an extension ""%value%"" is protected and cannot be uploaded","O arquivo de extensão ""%value%"" está protegido, e seu upload não pode ser feito" -"First Day of Week","Primeiro Dia da Semana" -"Flush Cache Storage","Armazenamento do Fluxo de Cache" -"Flush Magento Cache","Limpeza de Cache do Magento" -"Footer","Rodapé" -"Forgot Password Email Sender","Enviador de Email para Senha Esquecida" -"Forgot Password Email Template","Template de Email para Senha Esquecida" -"General","Geral" -"General Contact","Contato Geral" -"General Contact Email","E-mail geral de contato" -"General Contact Name","Nome de Contato Geral" -"General Settings","Definições Gerais" -"Get info about current Magento installation","Obter informações sobre a instalação atual do Magento" -"Global","Global" -"HTML Head","Cabeçalho do HTML" -"HTML tags are not allowed","Não são permitidas tags HTML" -"Header","Cabeçalho" -"Host","Anfitrião" -"How many links to display at once.","Quantos links para mostrar de uma vez." -"ID Path for Specified Store","ID do Caminho da Loja Especificada" -"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","Se a posição do quadro atual não cobre o máximo de páginas, tornará o link para a posição atual mais/menos este valor." -"Incorrect credit card expiration date.","Data de validade do cartão de crédito incorreta." -"Input type ""%value%"" not found in the input types list.","Entrada do tipo ""%valor%"" não encontrada na lista de tipos de entrada." -"Invalid URL '%value%'.","URL '%value%' inválido." -"Invalid base url type","Tipo inválido url base" -"Invalid block name to set child %s: %s","Nome do bloco inválido para definir filho %s: %s" -"Invalid block type: %s","Tipo de bloco inválido: %s" -"Invalid block: %s","Bloco inválido: %s" -"Invalid connection","Conexão inválida" -"Invalid date","Invalid date" -"Invalid layout update handle","Atualização do plano identificador inválido" -"Invalid messages storage ""%s"" for layout messages initialization","Mensagens de armazenamento ""%s"" inválidas para inicialização de mensagens do plano" -"Invalid query","Consulta inválida" -"Invalid transactional email code: %s","Código de e-mail transacional inválido: %s" -"Invalid website\'s configuration path: %s","Caminho de configuração do site inválido: %s" -"JavaScript Settings","Configurações JavaScript" -"Layout","Layout" -"Leave empty for access from any location.","Deixe em branco para o acesso de qualquer local." -"List of stores","Lista de lojas" -"Locale","Locale" -"Locale Options","Opções Locais" -"Log Settings","Configurações de Registro" -"Logging from Mage::log(). File is located in {{base_dir}}/var/log","Registro de Mage::log(). Arquivo está localizado em {{base_dir}}/var/log" -"Logging from Mage::logException(). File is located in {{base_dir}}/var/log","Registro de Mage::logException(). Arquivo está localizado em {{base_dir}}/var/log" -"Login is Case Sensitive","Acesso (Login) Diferencia Maiúsculas e Minúsculas" -"Logo Image","Imagem da Logo" -"Logo Image Alt","Alt da Imagem do Logotipo" -"Logo Image Src","Src da Imagem do Logotipo" -"Magento info","Informações do Magento" -"Magento info API","API de informações do Magento" -"Mail Sending Settings","Configurações de Envio de Email" -"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Certifique-se que o URL base termina com '/' (barra), por exemplo http://yourdomain/magento/" -"Manage Stores","Gerenciar Lojas" -"Match expressions in the same order as displayed in the configuration.","Corresponder expressões na mesma ordem como mostrado na configuração." -"Media Storage","Armazenamento de Mídia" -"Merge CSS Files","Fusão de Arquivos CSS" -"Merge JavaScript Files","Fusão de Arquivos JavaScript" -"Miscellaneous HTML","Diversos HTML" -"Miscellaneous Scripts","Scripts Variados" -"Model collection resource name is not defined.","Não está definido o nome de recurso para a coleção de modelos." -"Module ""%1$s"" cannot depend on ""%2$s"".","Módulo ""%1$s"" não pode depender de ""%2$s""." -"Module ""%1$s"" requires module ""%2$s"".","O módulo ""%1$s"" exige o módulo ""%2$s""." -"Name","Nome" -"New Design Change","Nova Alteração de Design" -"New Store","Nova Loja" -"New Store View","Nova Visualização de Loja" -"New Website","Novo Website" -"No","Não" -"Offloader header","Cabeçalho do Offloader" -"PHP SOAP extension is required.","Extensão PHP SOAP é requerida." -"Package","Embalagem" -"Pagination","Paginação" -"Pagination Frame","Quadro de Paginação" -"Pagination Frame Skip","Pular Quadro de Paginação" -"Parent directory does not exist: %s","Diretório principal não existe: %s" -"Path ""%value%"" is not available and cannot be used.","Caminho ""%valor%"" não está disponível e não pode ser usado." -"Path ""%value%"" is protected and cannot be used.","Caminho ""%valor%"" é protegido e não pode ser usado." -"Path ""%value%"" may not include parent directory traversal (""../"", ""..\\).""","Caminho ""%valor%"" não pode incluir passagem pelo diretório principal (""../"", ""..\\).""" -"Please define flag code.","Por favor defina o código bandeira." -"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Por favor insira 6 ou mais caracteres. Espaços à esquerda ou à direita serão ignorados." -"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Por favor insira 7 ou mais caracteres. Senha deve conter caracteres numéricos e alfabéticos." -"Please enter a number 0 or greater in this field.","Por favor insira um número 0 ou maior neste campo." -"Please enter a number 1 or greater in this field.","Digite o número 1 ou maior neste campo." -"Please enter a number greater than 0 in this field.","Por favor insira um número maior que 0 neste campo." -"Please enter a number lower than 100.","Por favor insira um número inferior a 100." -"Please enter a valid $ amount. For example $100.00.","Por favor introduza uma quantidade válida de $. Por exemplo $100,00." -"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Por favor introduza uma chave de URL válida. Por exemplo, ""exemplo-pagina"", ""exemplo-pagina.html"" ou ""outronivel/exemplo-pagina""." -"Please enter a valid URL. For example http://www.example.com or www.example.com","Por favor insira uma URL válida. Por exemplo http://www.exemplo.com ou www.exemplo.com" -"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Por favor insira um URL válido. Protocolo é necessário (http://, https:// ou ftp://)" -"Please enter a valid XML-identifier. For example something_1, block5, id-4.","Por favor insira um identificador XML válido. Por exemplo qualquercoisa_1, bloco5, id-4." -"Please enter a valid credit card number.","Por favor insira um número válido de cartão de crédito." -"Please enter a valid credit card verification number.","Por favor insira um número de verificação de cartão de crédito válido." -"Please enter a valid date between %s and %s","Por favor insira uma data válida entre %s e %s" -"Please enter a valid date equal to or greater than %s","Por favor insira uma data válida igual ou superior a %s" -"Please enter a valid date less than or equal to %s","Por favor insira uma data válida menor ou igual a %s" -"Please enter a valid date.","Por favor insira uma data válida." -"Please enter a valid day (1-%d).","Por favor insira um dia válido (1-%d)." -"Please enter a valid email address. For example johndoe@domain.com.","Por favor insira um endereço de e-mail válido. Por exemplo joao@domain.com." -"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Por favor insira um número de fax válido. Por exemplo (123) 456-7890 ou 123-456-7890." -"Please enter a valid full date","Por favor insira uma data válida completa" -"Please enter a valid month (1-12).","Por favor insira um mês válido (1-12)." -"Please enter a valid number in this field.","Por favor insira um número válido neste campo." -"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Por favor insira um número de telefone válido. Por exemplo (123) 456-7890 ou 123-456-7890." -"Please enter a valid social security number. For example 123-45-6789.","Por favor insira um número válido de segurança social. Por exemplo 123-45-6789." -"Please enter a valid year (1900-%d).","Por favor insira um ano válido (1900-%d)." -"Please enter a valid zip code.","Por favor insira um código postal válido." -"Please enter a valid zip code. For example 90602 or 90602-1234.","Por favor insira um código postal válido. Por exemplo 90602 ou 90602-1234." -"Please enter issue number or start date for switch/solo card type.","Por favor insira o número de emissão ou data de início para tipo de cartão switch/solo." -"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","Por favor introduza um comprimento CSS válido. Por exemplo 100px ou 77pt ou 20em ou .5ex ou 50%." -"Please make sure your passwords match.","Por favor certifique-se que suas senhas coincidem." -"Please select State/Province.","Por favor selecione Estado/Província." -"Please select a file","Por favor selecione um arquivo" -"Please select an option.","Por favor selecione uma opção." -"Please select one of the above options.","Por favor selecione uma das opções acima." -"Please select one of the options.","Por favor selecione uma das opções." -"Please set available and/or protected paths list(s) before validation.","Por favor defina lista(s) de caminhos disponíveis e/ou protegidos antes da validação." -"Please specify either a category or a product, or both.","Por favor especifique uma categoria ou um produto, ou ambos." -"Please use letters only (a-z or A-Z) in this field.","Por favor use apenas letras (a-z ou A-Z) neste campo." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Por favor use apenas números nesse campo. Por favor evite espaços ou outros caracteres tais como pontos ou vírgulas." -"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Por favor use apenas letras (a-z ou A-Z) ou números (0-9) apenas neste campo. Espaços ou outros caracteres não são permitidos." -"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","Por favor use apenas letras (a-z ou A-Z) ou números (0-9) ou espaços e # apenas neste campo." -"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Por favor use somente letras (a-z ou A-Z), números (0-9) ou sublinhado (_) neste campo, e o primeiro caractere deve ser uma letra." -"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Por favor use apenas letras (a-z), números (0-9) ou underscore (_) neste campo, primeiro caractere deve ser uma letra." -"Please use only visible characters and spaces.","Por favor use somente espaços e caracteres visíveis." -"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Por favor utilize este formato de data: dd/mm/aaaa. Por exemplo 17/03/2006 para 17 de Março de 2006." -"Please wait, loading...","Por favor aguarde, carregando..." -"Polls","Pesquisas" -"Port (25)","Porta (25)" -"Profiler","Gerador de Perfil" -"Recovery Link Expiration Period (days)","Perído de validade do link de recuperação (dias)" -"Request Path for Specified Store","Solicitar Caminho para o Armazenamento Especificado" -"Request path length exceeds allowed %s symbols.","O comprimento do caminho da requisição excede os %s símbolos permitidos." -"Requested file may not include parent directory traversal (""../"", ""..\\ notation)""","Arquivo solicitado pode não incluir diretório parental de passagem (""../"", ""..\\ notação)""" -"Requested invalid store ""%s""","Armazenamento solicitado Inválido ""%s""" -"Resource is not set.","Recurso não definido." -"Retrieve info about current Magento installation","Recuperar informações sobre a instalação atual do Magento" -"Retrieve store data","Recuperar dados da loja" -"Retrieve store list","Recuperar lista da loja" -"Return-Path Email","E-mail de Devolução" -"Root Category","Categoria Raiz" -"Sales Representative","Representante de Vendas" -"Sales Representative Contact Email","E-mail de contato do representante de vendas" -"Sales Representative Contact Name","Nome do Contato Representante de Vendas" -"Save","Salvar" -"Save Store","Salvar Loja" -"Save Store View","Salvar Visualização da Loja" -"Save Website","Salvar Website" -"Search Engines Optimization","Otimização de Motores de Busca" -"Secure","Seguro" -"Security","Segurança" -"Select Date","Selecione Data" -"Select Media Database","Selecione a Base de Dados da Mídia" -"Sender Email","E-mail do remetente" -"Sender Name","Nome do remetente" -"Services","Serviços" -"Session Cookie Management","Gerenciamento de Cookies" -"Session Lifetime (seconds)","Duração da Sessão (segundos)" -"Session Validation Settings","Ajustes de Validação de Sessão" -"Set Return-Path","Ajustar Caminho de Retorno" -"Set as Default","Definir como Padrão" -"Skin (Images / CSS)","Skin (Imagens / CSS)" -"Small Logo Image Src","Busca de Imagems para Logo Pequeno" -"Sort Order","Classificar pedido" -"Specified date/time ""%1$s"" do not match format ""%2$s"".","Formato da data/hora especificada ""%1$s"" não coincidem ""%2$s""." -"Start date cannot be greater than end date.","Data de início não pode ser maior que a data do término." -"Startup Page","Página Inicial" -"Status","Status" -"Storage Configuration for Media","Configuração de Armazenamento para Mídia" -"Store","Loja" -"Store API","API da loja" -"Store Contact Address","Armazenar Endereço de Catálogo" -"Store Contact Information","Armazenar Informação de Contato" -"Store Contact Telephone","Armazenar Telefone de Contato" -"Store Email Addresses","Armazenar Endereço de Email" -"Store Information","Informação de Armazenamento" -"Store Name","Nome da Loja" -"Store View","Visualização da loja" -"Store View Information","Armazenar Informação de Visualização" -"Store View Name","Nome de Visualização da Loja" -"Store view doesn't exist","Informação de visualização não existe" -"Store with the same code","Loja com o mesmo código" -"System","Sistema" -"System Log File Name","Nome do Arquivo de Log do Sistema" -"Template Path Hints","Sugestões de Modelo de Caminho" -"Template Settings","Configurações do Template" -"Template Variables","Variáveis de Modelo" -"Templates","Modelos" -"Text length does not satisfy specified text range.","Comprimento do texto não satisfaz intervalo de texto especificado." -"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","O %s inserido é inválido. Certifique-se de que está no formato ""http://xn--domnio-5va.com/""." -"The From Date value should be less than or equal to the To Date value.","O valor Data Inicial deve ser menor que ou igual ao valor Data Final." -"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","O código da loja pode conter apenas letras (a-z), números (0-9) ou underscore (_), o primeiro caractere deve ser uma letra" -"The store does not exist","A loja não existe" -"The store has been deleted.","A loja foi eliminada." -"The store has been saved.","A loja foi salva." -"The store view has been deleted.","A visão da loja foi apagada." -"The store view has been saved","A visão da loja foi salva" -"The template Name must not be empty.","O Nome do modelo não deve estar vazio." -"The value is not within the specified range.","O valor não está dentro do intervalo especificado." -"The website does not exist.","O site não existe." -"The website has been deleted.","O site foi apagado." -"The website has been saved.","O site foi salvo." -"Themes","Temas" -"This category and all its child elements","Esta categoria e todos os seus elementos derivados" -"This category and its child categories only","Apenas nesta categoria e suas categorias derivadas" -"This category and its products only","Apenas nesta categoria e seus produtos" -"This category only","Apenas nesta categoria" -"This date is a required value.","Esta data é um valor necessário." -"This is a required field.","Este é um campo obrigatório." -"This store cannot be deleted.","Esta loja não pode ser apagada." -"This store view cannot be deleted.","Esta vista da loja não pode ser apagada." -"This website cannot be deleted.","Este site não pode ser apagado." -"This will be displayed just before body closing tag.","Isto será exibido antes da marca de fecho do corpo." -"This will be included before head closing tag in page HTML.","Isto será incluído antes da marca de fecho principal na página HTML." -"Timezone","Fuso Horário" -"Title Prefix","Prefixo do Título" -"Title Suffix","Sufixo do Título" -"Transactional Emails","Emails de Transações" -"Translate Inline","Traduzir Em Linha" -"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Traduzir, blocos e outras caches de saída devem ser desativadas para ambos os frontend e traduções em linha admin." -"Translations","Traduções" -"Two and more slashes together are not permitted in request path","Duas ou mais barras juntas não são permitidas no caminho pedido" -"Two and more slashes together are not permitted in url rewrite suffix","Duas ou mais barras juntas não são permitidas em sufixo url reescrito" -"Unable to create directory: %s","Não é possível criar diretório: %s" -"Unable to delete store view. Please, try again later.","Não é possível excluir a vista da loja. Por favor, tente novamente mais tarde." -"Unable to delete store. Please, try again later.","Não é possível apagar loja. Por favor, tente novamente mais tarde." -"Unable to delete website. Please, try again later.","Não é possível excluir site. Por favor, tente novamente mais tarde." -"Unable to proceed. Please, try again","Não é possível prosseguir. Por favor, tente novamente" -"Unable to proceed. Please, try again.","Impossível prosseguir. Tente novamente." -"Unable to save file ""%s"" at ""%s""","Impossível salvar arquivo ""%s"" em ""%s""" -"Unable to save file: %s","Não foi possível salvar o arquivo: %s" -"Unknown old style column type definition: {$definition}.","Definição desconhecida de tipo de coluna estilo antigo: {$definition}." -"Unknown scope ""%s"".","Limite ""%s"" não conhecido." -"Unsecure","Inseguro" -"Url Options","Opções URL" -"Use Custom Admin Path","Use Caminho Admin Personalizado" -"Use Custom Admin URL","Use URL do Custom Admin" -"Use HTTP Only","Usar apenas HTTP" -"Use SID on Frontend","Use SID no Frontend" -"Use Secure URLs in Admin","Usar URLs Seguras no Administrador" -"Use Secure URLs in Frontend","Use URLs seguras no Frontend" -"Use Web Server Rewrites","Use Servidor Web Reescrito" -"VAT Number","Número VAT" -"Validate HTTP_USER_AGENT","Validar HTTP_USER_AGENT" -"Validate HTTP_VIA","Validar HTTP_VIA" -"Validate HTTP_X_FORWARDED_FOR","Validar HTTP_X_FORWARDED_FOR" -"Validate REMOTE_ADDR","Validar REMOTE_ADDR" -"Validation has failed.","Validação falhou." -"Values less than 60 are ignored. Note that changes will apply after logout.","Valores inferiores a 60 são ignorados. Observe que as alterações serão aplicadas após sair." -"Variable Code must be unique.","Código da Variável deve ser único." -"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Aviso! Não se recomenda habilitar esta característica em ambientes de produção porque ela representa um potencial risco de segurança." -"Web","Web" -"Website","Website" -"Website Information","Informação do Site" -"Website Name","Nome do Website" -"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","Código do site pode conter apenas letras (a-z), números (0-9) ou underscore (_), o primeiro caractere deve ser uma letra" -"Website with the same code","Site com o mesmo código" -"Weekend Days","Dias do fim-de-semana" -"Welcome Text","Texto de Boas-Vindas" -"Wrong file info format","Formato de arquivo de informação errado" -"Wrong number of arguments for %s","Número errado de argumentos para %s" -"Wrong old style column type definition: {$definition}.","Definição errada para tipo de coluna de estilo antigo: {$definition}." -"Yes","Sim" -"You will have to log in after you save your custom admin path.","Você terá que entrar depois de salvar o seu caminho administrativo personalizado." -"Your design change for the specified store intersects with another one, please specify another date range.","Sua mudança de design para a loja especificada cruza com outra, por favor especifique outro intervalo de datas." -"database ""%s""","base de dados ""%s""" diff --git a/app/locale/pt_BR/Mage_Cron.csv b/app/locale/pt_BR/Mage_Cron.csv deleted file mode 100644 index 91765a90e..000000000 --- a/app/locale/pt_BR/Mage_Cron.csv +++ /dev/null @@ -1,24 +0,0 @@ -"10 minutes","10 minutos" -"15 minutes","15 minutos" -"20 minutes","20 minutos" -"30 minutes","30 minutos" -"5 minutes","5 minutos" -"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Tarefas Agendadas) - todos os tempos são em minutos" -"Daily","Diário" -"Failure History Lifetime","Falha no Historial de Vida" -"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","Para corrigir URLs gerados durante a execução do cron por favor certifique-se que URLs Base de Dados Seguros e Inseguros de Rede são explicitamente definidos." -"Generate Schedules Every","Gerar Todos os Horários" -"History Cleanup Every","Limpar Todo o Historial" -"Hourly","Horário" -"Invalid callback: %s::%s does not exist","Chamada inválida: %s::%s não existe" -"Invalid model/method definition, expecting ""model/class::method"".","Definição do modelo/método inválido, esperando ""modelo/classe::método""." -"Minute Intervals","Intervalos de Minutos" -"Missed if Not Run Within","Perdidos se Não Forem Executados Dentro" -"Monthly","Mensal" -"No callbacks found","Nenhuma chamada encontrada" -"Schedule Ahead for","Agenda Seguinte para" -"Success History Lifetime","Sucesso no Historial de Vida" -"Too late for the schedule.","Tarde demais para o horário." -"Unable to delete the cron task.","Não foi possível excluir a tarefa cron." -"Unable to save the cron expression.","Impossível salvar a expressão cron." -"Weekly","Semanalmente" diff --git a/app/locale/pt_BR/Mage_CurrencySymbol.csv b/app/locale/pt_BR/Mage_CurrencySymbol.csv deleted file mode 100644 index 68a220a7e..000000000 --- a/app/locale/pt_BR/Mage_CurrencySymbol.csv +++ /dev/null @@ -1,10 +0,0 @@ -"Currency","Moeda" -"Custom currency symbols were applied successfully.","Os símbolos de moeda personalizados foram aplicados com sucesso." -"Manage Currency","Gerenciar moeda" -"Manage Currency Rates","Gerenciar Taxas de Câmbio" -"Rates","Valores" -"Save Currency Symbols","Salvar símbolos de moeda" -"Symbol","Caracter" -"Symbols","Símbolos" -"System","Sistema" -"Use Standard","Usar padrão" diff --git a/app/locale/pt_BR/Mage_Customer.csv b/app/locale/pt_BR/Mage_Customer.csv deleted file mode 100644 index 2903799c3..000000000 --- a/app/locale/pt_BR/Mage_Customer.csv +++ /dev/null @@ -1,469 +0,0 @@ -" or ","ou" -"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' parece ser um nome de alojamento DNS mas não pode extrair parte TLD" -"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' parece ser um nome de alojamento DNS mas não consegue encontrar TLD contra a lista conhecida" -"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' parece ser um nome de alojamento DNS mas não pode ser comparado contra o esquema nome de alojamento para TLD '%tld%'" -"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' parece ser um nome de alojamento DNS mas contém um traço em uma posição inválida" -"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' parece ser um DNS de alojamento mas a notação punycode dada não pode ser descodificada" -"'%value%' appears to be a local network name but local network names are not allowed","'%value%' parece ser um nome de rede local mas nomes de rede local não são permitidos" -"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' parece ser um endereço IP, mas endereços IP não são permitidos" -"'%value%' does not appear to be a valid local network name","'%value%' não parece ser um nome de rede local válido" -"* Required Fields","* Campos obrigatórios" -"ALL GROUPS","TODOS OS GRUPOS" -"Account Dashboard","Painel de Conta" -"Account Information","Informações da Conta" -"Account Sharing Options","Opções de Compartilhamento de Conta" -"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please click here.","Confirmação da conta é necessária. Por favor, verifique seu email para o link de confirmação. Para reenviar email de confirmação, por favor clique aqui." -"Action","Ação" -"Add New Address","Adicionar Novo Endereço" -"Add New Customer","Adicionar Novo Cliente" -"Add New Customer Group","Adicionar Novo Grupo de Clientes" -"Added From","Adicionado De" -"Additional Address Entries","Entradas Adicionais de Endereço" -"Address","Endereço" -"Address Book","Livro de Endereços" -"Address Books","Livros de Endereço" -"Address Information","Informações de Endereço" -"Address Templates","Modelos de Endereço" -"Addresses","Endereços" -"Admin","Admin" -"All","Todos" -"All Store Views","Todas as Visualizações da Loja" -"All countries","Todos os países" -"Always optional.","Sempre opcional." -"Amount","Valor" -"An error occurred while deleting the address.","Ocorreu um erro enquanto apagando este endereço." -"An error occurred while retrieving the option value: %s.","Ocorreu um erro ao recuperar o valor da opção: %s." -"An error occurred while saving the collection, aborting. Error: %s","Ocorreu um erro ao salvar a coleção, abortando. Erro: %s" -"An invalid option ID is specified for %s (%s), skipping the record.","Um ID de opção inválido é especificado para %s (%s), ignorando o registro." -"Approved","Aprovado" -"Are you sure that you want to remove this item?","Tem certeza de que deseja remover este item?" -"Are you sure you want to cancel adding of this address?","Você tem certeza que quer cancelar a adição deste endereço?" -"Are you sure you want to delete this address?","Tem certeza de que deseja excluir este endereço?" -"Are you sure?","Tem certeza?" -"Array of Entity collections is expected.","Variedade de coleções de Entidades é esperado." -"Assign a Customer Group","Atribuir um Grupo de Clientes" -"Average Sale","Venda Média" -"Back","Voltar" -"Back - link to the previously viewed page","Voltar - link para a página anteriormente visualizada" -"Back to Login","Voltar à Entrada" -"Bad request.","Mau pedido." -"Based on the VAT ID, the customer would belong to the Customer Group %s.","Com base na ID do VAT, o cliente pertence ao Grupo de clientes %s." -"Bill to Name","Faturar para Nome" -"Bought From","Comprado De" -"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Ao criar uma conta na nossa loja, você será capaz de se mover através do processo de compra mais rapidamente, armazenar múltiplos endereços de envio, ver e rastrear seus pedidos em sua conta e muito mais." -"CSV","CSV" -"Cancel","Cancelar" -"Cannot save a new password.","Não foi possível salvar uma nova senha." -"Cannot save address.","Não é possível salvar endereços." -"Cannot save the customer.","Não é possível salvar o cliente." -"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Não é possível compartilhar contas de clientes globalmente porque alguns clientes existem em vários sites com mesmas contas de email e não podem ser misturados." -"Change Account Password","Alterar a Senha da Conta" -"Change Billing Address","Alterar o endereço de faturamento" -"Change Password","Alterar senha" -"Change Shipping Address","Alterar endereço de remessa" -"City","Cidade" -"Company","Companhia" -"Config","Config" -"Configure","Configurar" -"Confirm New Password","Confirmar a nova senha" -"Confirm Password","Confirmar a senha" -"Confirmation Link Email","Email de Link de Confirmação" -"Confirmed","Confirmado" -"Contact Information","Informações de contato" -"Continue Shopping","Continuar Comprando" -"Country","País" -"Create","Criar" -"Create New Account Options","Criar Novas Opções de Conta" -"Create New Customer Account","Criar Nova Conta de Cliente" -"Create Order","Criar Pedido" -"Create an Account","Criar uma conta" -"Create customer","Criar cliente" -"Create customer address","Criar endereço de cliente" -"Current Password","Senha atual" -"Customer","Cliente" -"Customer API","API de cliente" -"Customer Account Edit Form","Editar formulário da conta do cliente" -"Customer Account Login Form","Formulário de login da conta do cliente" -"Customer Account Logout Success","Saída com sucesso da conta do cliente" -"Customer Account Registration Form","Formulário de registro da conta do cliente" -"Customer Addresses","Endereços do cliente" -"Customer Configuration","Configuração do cliente" -"Customer Forgot Password Form","Formulário Esqueceu a senha do cliente" -"Customer Group","Grupo de Clientes" -"Customer Groups","Grupos do cliente" -"Customer Information","Dados do Cliente" -"Customer Login","Login do cliente" -"Customer My Account (All Pages)","Minha conta do cliente (Todas as páginas)" -"Customer My Account Address Book","Livro de endereço da Minha conta do cliente" -"Customer My Account Address Edit Form","Formulário de editar endereço da Minha conta do cliente" -"Customer My Account Dashboard","Painel da Minha conta do cliente" -"Customer Since","Cliente desde" -"Customer View","Visualização do cliente" -"Customer collection expected.","É esperada a coleta do cliente." -"Customer email is required","É necessário o e-mail do cliente" -"Customer website ID must be specified when using the website scope","O ID do site do cliente deve ser especificado ao utilizar o escopo do site" -"Customer will stay on the current page if ""No"" is selected.","O cliente irá permanecer na página atual se ""Não"" for selecionado." -"Customers","Clientes" -"Customers Only","Apenas Clientes" -"Customers Section","Seção de Clientes" -"DD","DD" -"Date","Data" -"Date Added","Data de Adição" -"Date of Birth","Data de aniversário" -"Day","Dia" -"Days in Wishlist","Dias na Lista de Desejos" -"Default Addresses","Endereço padrão" -"Default Billing Address","Endereço padrão de faturamento" -"Default Email Domain","Domínio de E-Mail Padrão" -"Default Group","Grupo Padrão" -"Default Shipping Address","Endereço padrão de entrega" -"Default Value for Disable Automatic Group Changes Based on VAT ID","Valor padrão para alterações automáticas desativadas de grupos com base na ID de VAT" -"Default Welcome Email","E-Mail de Boas-Vindas Padrão" -"Delete","Excluir" -"Delete Address","Apagar endereço" -"Delete Customer","Excluir Cliente" -"Delete Customer Group","Excluir Grupo de Clientes" -"Delete customer","Excluir cliente" -"Delete customer address","Excluir endereço do cliente" -"Deleted Stores","Excluir Lojas" -"Details","Detalhes" -"Disabled","Desativado" -"Edit","Editar" -"Edit Account Info","Editar Informações da Conta" -"Edit Account Information","Editar informações da conta" -"Edit Address","Editar endereço" -"Edit Address Entry","Editar entrada de endereço" -"Edit Customer Group ""%s""","Editar grupo de cliente ""%s""" -"Edit Customer Groups","Editar grupos de cliente" -"Edit Customer's Address","Editar o endereço do cliente" -"Edit Group","Editar grupo" -"Edit Newsletters","Editar boletins informativos" -"Email","E-mail" -"Email Address","Endereço de e-mail" -"Email Sender","Remetente do e-mail:" -"Email:","E-mail:" -"Enable Automatic Assignment to Customer Group","Ativar atribuição automática a um grupo de clientes" -"Entity collection is expected.","É esperada a coleta da entidade." -"Excel XML","Excel XML" -"Failed to confirm customer account.","Erro ao tentar confirmar a conta do cliente." -"Fax","Fax" -"First Name","Primeiro nome" -"Forgot Email Template","Esqueceu o modelo do e-mail" -"Forgot Password","Esqueceu a Senha?" -"Forgot Your Password","Esqueceu a senha" -"Forgot Your Password?","Esqueceu a senha?" -"Forgot and Remind Email Sender","Rementente de email lembrete e esquecimento" -"Form Fields Before","Campos do formulário antes" -"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","No Painel da Minha Conta é possível visualizar um resumo das atividades recentes da sua conta e atualizar as informações da conta. Selecione o link abaixo para visualizar ou editar as informações." -"Gender","Sexo" -"Gender is required.","Sexo necessário" -"General Subscription","Assinatura geral" -"Generate Human-Friendly Customer ID","Gerar ID de Cliente Humano-Amigável" -"Global","Global" -"Group","Grupo" -"Group Information","Informação de Grupo" -"Group Name","Nome de Grupo" -"Group for Invalid VAT ID","Grupo para ID de VAT inválida." -"Group for Valid VAT ID - Domestic","Grupo para ID de VAT válida - Doméstico" -"Group for Valid VAT ID - Intra-Union","Grupo para ID de VAT válida - Intra-União" -"Guest","Convidado" -"HTML","HTML" -"Hello, %s!","Olá, %s!" -"ID","Identidade" -"IP Address","Endereço de IP" -"If you believe this is an error, please contact us at %s","Se você considera isso um erro, entre em contato conosco em %s" -"If you have an account with us, please log in.","Se você possui uma conta conosco, por favor, faça seu login" -"Invalid attribute option specified for attribute %s (%s), skipping the record.","Opção de atributo inválida para atributo %s (%s). Saltando o registro." -"Invalid attribute set specified, skipping the record.","Conjunto especificado de atributo inválido, ignorando o registro." -"Invalid billing address for (%s)","Endereço de cobrança inválido para (%s)" -"Invalid current password","Senha atual inválida" -"Invalid customer data","Dados do cliente inválidos" -"Invalid email address ""%s"".","Endereço de email inválido ""%s""." -"Invalid email address.","Endereço de e-mail inválido." -"Invalid login or password.","Acesso ou senha inválida." -"Invalid password reset token.","Senha inválida reconfigure vale." -"Invalid shipping address for (%s)","Endereço de envio inválido para (%s)" -"Invalid store specified, skipping the record.","Loja especificada inválida, ignorando o registro." -"Invalid website, skipping the record, line: %s","Website inválido, ignorar registro, linha: %s" -"Last Activity","Última atividade" -"Last Date Subscribed","Última Data de Assinatura" -"Last Date Unsubscribed","Última Data de Cancelamento" -"Last Name","Último nome" -"Last URL","Último URL" -"Leave empty for default (15 minutes).","Deixar em branco por padrão (15 minutos)." -"Leave empty for default (2). Valid range: 1-4","Deixar em branco por padrão (2). Intervalo válido: 1-4" -"Lifetime Sales","Vendas de Vida Inteira" -"Log In","Entrar" -"Log Out","Sair" -"Login","Conectar-se" -"Login Information","Informações de login" -"Login Options","Opções de Acesso" -"Login and password are required.","Acesso e senha são obrigatórios." -"Login or Create an Account","Conectar-se ou criar conta" -"MM","MM" -"Manage Addresses","Gerenciar endereços" -"Manage Customers","Gerenciar clientes" -"Maximum length must be less then %s symbols","O comprimento máximo deve ser menos que %s símbolos." -"Missing email, skipping the record, line: %s","Falta o email, ignorar registro, linha: %s" -"Missing email, skipping the record.","Erro de e-mail, pular o registro" -"Missing first name, skipping the record, line: %s","Falta o primeiro nome, ignorar registro, linha: %s" -"Missing firstname, skipping the record.","Faltando nome próprio, ignorando o registro." -"Missing last name, skipping the record, line: %s","Falta o último nome, ignorar registro, linha: %s" -"Missing lastname, skipping the record.","Faltando apelido, ignorando o registro." -"Missing website, skipping the record, line: %s","Falta o website, ignorar registro, linha: %s" -"Month","Mês" -"My Account","Minha Conta" -"My Account Wrapper","Envoltório da Minha Conta" -"My Dashboard","Meu Painel" -"My Orders","Meus Pedidos" -"Name","Nome" -"Name and Address Options","Opções de Nome e Endereço" -"Never","Nunca" -"New Address","Novo Endereço" -"New Address Entry","Nova entrada de endereço" -"New Customer","Novo Cliente" -"New Customer Address","Endereço do Novo Cliente" -"New Customer Group","Novo grupo de cliente" -"New Customer Groups","Grupos do Novo Cliente" -"New Customers","Novos clientes" -"New Group","Novo Grupo" -"New Password","Nova senha" -"New account","Nova conta" -"New account confirmation key","Chave de confirmação da nova conta" -"New account confirmed","Nova conta confirmada" -"New password field cannot be empty.","O campo de preenchimento de nova senha não pode ser deixado em branco." -"Newsletter","Newsletter" -"Newsletter Finish","Final de boletim informativo" -"Newsletter Information","Informações de boletim à imprensa" -"Newsletter Received","Boletim informativo recebido" -"Newsletter Start","Início do boletim à imprensa" -"Newsletter Subscription","Assinatura do boletim informativo" -"Newsletters","Boletins informativos" -"No Items Found","Nenhum item encontrado" -"No Newsletter Found","Nenhum boletim informativo foi encontrado" -"No customer collections found","Nenhuma coleção de cliente encontrada" -"No item specified.","Nenhum item especificado." -"Not Sent","Não Enviado" -"Not confirmed, can login","Não confirmado, pode fazer o login" -"Not confirmed, cannot login","Não confirmado, não é possível conectar-se" -"Number of Lines in a Street Address ","Número de linhas em um endereço de rua" -"Offline","Offline" -"Online","Online" -"Online Customers","Clientes Conectados" -"Online Customers Options","Opções de clientes online" -"Online Minutes Interval","Invervalo de minutos online" -"Order #","Ordem #" -"Order Total","Total do Pedido" -"Orders","Ordens" -"PDF","PDF" -"Password","Senha" -"Password Management","Gerenciamento de senha" -"Password Options","Opções de Senha" -"Password forgotten","Senha esquecida" -"Password:","Senha:" -"Paused","Parado." -"Pending","Pendente" -"Per Website","Por Site Web" -"Personal Information","Informações pessoais" -"Please enter a number 1 or greater in this field.","Digite o número 1 ou maior neste campo." -"Please enter a valid date between %s and %s at %s.","Digite uma data válida entre %s e %s em %s." -"Please enter a valid date equal to or greater than %s at %s.","Digite uma data válida igual ou maior que %s em %s." -"Please enter a valid date less than or equal to %s at %s.","Digite uma data válida menor que ou igual a %s em %s." -"Please enter the city.","Insira a cidade." -"Please enter the country.","Insira o país." -"Please enter the first name.","Por favor informe o primeiro nome." -"Please enter the last name.","Por favor informe o último nome." -"Please enter the state/province.","Insira o estado." -"Please enter the street.","Insira a rua." -"Please enter the telephone number.","Insira o número de telefone." -"Please enter the zip/postal code.","Insira o CEP." -"Please enter your email address below. You will receive a link to reset your password.","Por favor informe o seu endereço de e-mail abaixo. Você receberá um link para redefinir sua senha." -"Please enter your email below and we\'ll send you confirmation link for it.","Digite seu e-mail abaixo e enviaremos o link de confirmação." -"Please enter your email.","Por favor insira seu email." -"Please make sure your passwords match.","Por favor certifique-se que suas senhas coincidem." -"Please select a website which contains store view","Selecione o website que contém visualização de loja" -"Please select region, state or province","Selecione a região, estado ou província" -"Please, check your email for confirmation key.","Por favor, verifique seu email para a chave de confirmação." -"Prefix Dropdown Options","Lista de opções de prefixo" -"Price","Preço" -"Product","Produto" -"Product ID","ID do Produto" -"Product Name","Nome do produto" -"Product Reviews","Comentários sobre Produto" -"Product Tags","Etiquetas de Produto" -"Purchase On","Compra Em" -"Purchased On","Comprado Em" -"Qty","Quant." -"Recent Orders","Pedidos Recentes" -"Records for %s store found.","Registros para loja %s encontrados." -"Recovery Link Expiration Period (days)","Perído de validade do link de recuperação (dias)" -"Redirect Customer to Account Dashboard after Logging in","Redirecione Cliente para o Painel de Conta após a Acessar" -"Refunded","Reembolsado" -"Register","Cadastrar" -"Registered Customers","Clientes cadastrados" -"Remind Email Template","Modelo de email lembrete" -"Remind Password","Lembrar senha" -"Remove","Remover" -"Require Emails Confirmation","Confirmação de e-mail obrigatória" -"Reset a Password","Redefinir uma senha" -"Retrieve address data","Recupere dados de endereço" -"Retrieve address info","Recupere informação de endereço" -"Retrieve customer addresses","Recuperar endereço do cliente" -"Retrieve customer data","Recupere dados do cliente" -"Retrieve customer groups","Recuperar grupos do cliente" -"Retrieve customer info","Recuperar informações do cliente" -"Retrieve customers","Recuperar clientes" -"Retrieve your confirmation link here","Recupere aqui o seu link de confirmação" -"Retrieve your password here","Recupere sua senha aqui" -"SKU","Unidade de Manutenção de Estoque" -"Sales Statistics","Estatísticas de vendas" -"Save","Salvar" -"Save Address","Salvar endereço" -"Save Customer","Salvar cliente" -"Save Customer Group","Salvar grupo de cliente" -"Save Password","Salvar senha" -"Save and Continue Edit","Salvar e continuar a editar" -"Saved %d record(s)","%d registro(s) salvo(s)" -"Semicolon (;) separated values.
    Put semicolon in the beginning for empty first option.
    Leave empty for open text field.","Valores separados por ponto e vírgula (;).
    Coloque ponto e vírgula no início para definir como vazia a primeira opção.
    Deixe em brando para abrir campo de texto." -"Send Auto-Generated Password","Enviar senha auto-gerada" -"Send From","Enviar De" -"Send Welcome Email","Enviar e-mail de boas-vindas" -"Send Welcome Email after Confirmation","Enviar e-mail de boas-vindas após confirmação" -"Send confirmation link","Enviar link de confirmação" -"Sending","Enviando" -"Sent","Enviado" -"Session Start Time","Horário de início da sessão" -"Set as Default Billing Address","Definir como endereço padrão de faturamento" -"Set as Default Shipping Address","Ajustar como endereço de entrega padrão" -"Share Customer Accounts","Compartilhar contas do cliente" -"Shipped to First Name","Enviado para o primeiro nome" -"Shipped to Last Name","Enviado para o último nome" -"Shipped to Name","Enviado para o nome" -"Shopping Cart","Carrinho de compras" -"Shopping Cart - %d item(s)","Carrinho de compras - %d item(ns)" -"Shopping Cart of %1$s - %2$d item(s)","Carrinho de compras de %1$s - %2$d item(ns)" -"Show Date of Birth","Exibir a data de aniversário" -"Show Gender","Exibir o gênero" -"Show Middle Name (initial)","Exibir nome do meio (inicial)" -"Show Prefix","Exibir o prefixo" -"Show Suffix","Exibir o sufixo" -"Show Tax/VAT Number","Exibir número fiscal" -"Show VAT Number on Frontend","Mostrar Número VAT na Frente" -"Sign Up for Newsletter","Assinar o boletim informativo" -"Skipping import row, required field ""%s"" is not defined.","Ignorar linha de importação, campo ""%s"" exigido não está definido." -"Skipping import row, website ""%s"" field does not exist.","Pular a fileira de importação, o campo ""%s"" do site não existe." -"State/Province","Estado/Província" -"Status","Status" -"Store","Loja" -"Store View","Visualização da loja" -"Street Address","Endereço da rua" -"Street Address %s","Endereço da Rua %s" -"Subject","Assunto" -"Submit","Enviar" -"Subscribe to Newsletter","Assinar o Boletim Informativo" -"Subscribed to Newsletter?","Já assinou o boletim informativo?" -"Suffix Dropdown Options","Opções de Sufixo Pendente" -"Tag Name","Nome de Marca" -"Tax Calculation Based On","Cálculo da Taxa Baseado em" -"Tax Class","Classe de Impostos" -"Tax/VAT number","Número de Taxas/IVA" -"Telephone","Telefone" -"Text","Texto" -"Text One Line","Texto Uma Linha" -"Thank you for registering with %s.","Obrigado por se registar com %s." -"The Date of Birth is required.","Necessária a data de nascimento." -"The TAX/VAT number is required.","Necessário o número de VAT/TAX." -"The VAT ID entered (%s) is not a valid VAT ID.","A ID de VAT inserida (%s) não é uma ID de VAT válida." -"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","A ID de VAT inserida (%s) não é uma ID de VAT válida. O cliente pertenceria o Grupo de clientes %s." -"The VAT ID is valid. The current Customer Group will be used.","A ID de VAT é válida. O grupo de clientes atual será usado." -"The account information has been saved.","As informações da conta foram salvas." -"The address does not belong to this customer.","O endereço não pertence a este cliente." -"The address has been deleted.","O endereço foi apagado." -"The address has been saved.","O endereço foi salvo." -"The customer ID and email did not match, skipping the record, line: %s","A ID e o email de cliente não correspondem," -"The customer does not have default billing address.","O cliente não tem endereço de cobrança predefinido." -"The customer email (%s) already exists, skipping the record, line: %s","O emal de cliente (%s) já existe, ignorar o registro, linha: %s" -"The customer group has been deleted.","O grupo de clientes foi apagado." -"The customer group has been saved.","O grupo de clientes foi salvo." -"The customer is currently assigned to Customer Group %s.","O cliente está atualmente atribuído ao grupo de clientes %s." -"The first name cannot be empty.","O primeiro nome não pode ficar vazio." -"The group ""%s"" cannot be deleted","O grupo ""%s"" não pode ser apagado" -"The last name cannot be empty.","O último nome não pode ficar vazio." -"The minimum password length is %s","O comprimento mínimo da senha é %s." -"The password cannot be empty.","A senha não pode ficar vazia." -"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","A senha deve ter pelo menos 6 caracteres. Espaços à esquerda ou à direita serão ignorados." -"The suffix that goes after name (Jr., Sr., etc.)","O sufixo que vai atrás do nome (Jr., Sr., etc.)" -"The title that goes before name (Mr., Mrs., etc.)","O título que vai antes do nome (Sr., Sra., etc.)" -"There are no items in customer's wishlist at the moment","No momento não há itens na lista de desejos do cliente" -"There are no items in customer\'s shopping cart at the moment","Não há itens no carrinho de compras do cliente no momento" -"There is already an account with this email address. If you are sure that it is your email address, click here to get your password and access your account.","Já existe uma conta com este endereço de email. Se você tem certeza que é o seu endereço de email, clique aqui para obter a sua senha e acessar sua conta." -"There was an error validating the VAT ID.","Ocorreu um erro ao validar a ID do VAT." -"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","Ocorreu um erro ao validar a ID do VAT. O cliente pertenceria ao grupo de clientes %s." -"This account is not confirmed.","Essa conta não está confirmada." -"This customer email already exists","Este email do cliente já existe" -"This customer has no saved addresses.","Este cliente não tem endereços guardados." -"This email does not require confirmation.","Este email não requer confirmação." -"This email will be sent instead of default welcome email, after account confirmation.","Este e-mail será enviado ao invés do e-mail predefinido de boas vindas, após a confirmação da conta." -"This is My Default %s Address","Este é o Meu Endereço %s Padrão" -"To Cart","Para Carrinho" -"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","Para mostrar o número VAT na frente, marque a opção Mostrar Número VAT na Frente como Sim." -"Total","Total" -"Type","Tipo" -"Unable to save the customer.","Não foi possível salvar o cliente." -"Unknown","Desconhecido" -"Unsubscribe from Newsletter","Cancelar a assinatura do boletim informativo" -"Update","Atualizar" -"Update customer address data","Atualizar os dados de endereço do cliente" -"Update customer data","Atualizar dados do cliente" -"Use as My Default %s Address","Use como Meu Endereço %s Padrão" -"Use as My Default Billing Address","Utilizar como endereço padrão de faturamento" -"Use as My Default Shipping Address","Use como Meu Endereço de Entrega Predefinido" -"Use as my default billing address","Use como meu endereço de cobrança padrão" -"Use as my default shipping address","Use como meu endereço de entrega padrão" -"VAT Number","Número VAT" -"VAT Request Date","Data de solicitação de VAT" -"VAT Request Identifier","Identificador de solicitação de VAT" -"Validate VAT Number","Validar número de VAT" -"Validate on Each Transaction","Validar em cada transação" -"Validation Error Group","Validar grupo de erro" -"View","Ver" -"View Order","Ver Solicitação" -"Visitor","Visitante" -"Visitors Only","Apenas visitantes" -"Website","Website" -"Welcome Email","E-mail de boas-vindas" -"Wishlist","Lista de presentes" -"Wishlist - %d item(s)","Lista de presentes - %d item(ns)" -"Would you like to change the Customer Group for this order?","Gostaria de alterar o grupo de cliente para este pedido?" -"Wrong confirmation key.","A chave de confirmação está errada." -"Wrong customer account specified.","Conta especificada de cliente errada." -"Wrong email.","E-mail errado." -"Wrong transactional account email type","O tipo de e-mail de conta transacional está errado" -"YYYY","AAAA" -"Year","Ano" -"You are currently not subscribed to any newsletter.","Você não está inscrito em nenhum boletim informativo." -"You are currently not subscribed to our newsletter.","Você ainda não assinou o nosso boletim informativo." -"You are currently subscribed to 'General Subscription'.","Você está atualmente inscrito em ""Assinatura Geral""." -"You are currently subscribed to our newsletter.","Você está atualmente inscrito em nosso boletim informativo." -"You are now logged out","Agora você está desconectado" -"You have logged out and will be redirected to our homepage in 5 seconds.","Você se desconectou e será redirecionado para a nossa página inicial em 5 segundos." -"You have no additional address entries in your address book.","Você não tem nenhuma entrada de endereço adicional no seu livro de endereços." -"You have no additional entries in your address book.","Você não tem entradas adicionais em seu livro de endereços." -"You have no default billing address in your address book.","Você não tem endereço de cobrança padrão no seu livro de endereços." -"You have no default entries in your address book.","Você não tem entradas padrão em seu livro de endereços." -"You have no default shipping address in your address book.","Você não tem endereço de entrega padrão no seu livro de endereços." -"You have not set a default billing address.","Você não configurou um endereço de faturamento padrão." -"You have not set a default shipping address.","Você não definiu um endereço de envio." -"You have placed no orders yet.","Você ainda não fez pedidos." -"You have placed no products yet.","Você ainda não colocou nenhum produto." -"You will be charged tax.","Imposto devido." -"You will not be charged tax.","Não é devido imposto." -"Your Tax ID cannot be validated.","Sua ID de imposto não pode ser validada." -"Your VAT ID was successfully validated.","Sua ID de VAT foi validada com sucesso." -"Your account balance is: %s","O saldo da sua conta é: %s" -"ZIP","CEP" -"ZIP/Post Code","Código Postal" -"Zip/Postal Code","Zip/Código Postal" -"n/a","n/d" -"or","ou" -"register","registrar" diff --git a/app/locale/pt_BR/Mage_Dataflow.csv b/app/locale/pt_BR/Mage_Dataflow.csv deleted file mode 100644 index 2f271ba4a..000000000 --- a/app/locale/pt_BR/Mage_Dataflow.csv +++ /dev/null @@ -1,32 +0,0 @@ -"Link","Link" -"Actions XML is not valid.","Ações XML não é válido." -"An error occurred while opening file: ""%s"".","Ocorreu um erro ao abrir o arquivo: ""%s""." -"Could not load file: ""%s"".","Não foi possível carregar o arquivo: ""%s""." -"Could not save file: %s.","Não foi possível salvar o arquivo: %s." -"Declared adapter %s was not found.","Adaptador declarado %s não foi encontrado." -"Destination folder ""%s"" is not a directory.","Pasta de destino ""%s"" não é um diretório." -"Destination folder ""%s"" is not writable.","Pasta de destino ""%s"" não é gravável." -"Done","Concluído" -"Dry run set, stopping execution.","Definição de funcionamento a seco, parando a execução." -"ETA: %s","ETA: %s" -"Error in field mapping: field list for mapping is not defined.","Erro no mapeamento de campo: lista de campos para o mapeamento não está definida." -"File ""%s"" does not exist.","Arquivo ""%s"" não existe." -"Found %d rows.","Encontradas %d linhas." -"Less than a minute","Menos de um minuto" -"Loaded successfully: ""%s"".","Carregado com sucesso: ""%s""." -"Memory Used: %s","Memória Usada: %s" -"Method ""%s"" not defined in adapter %s.","Método ""%s"" não definido no adaptador %s." -"Method ""%s"" was not defined in adapter %s.","Método ""%s"" não definido no adaptador %s." -"Please declare ""adapter"" and ""method"" nodes first.","Por favor declare em primeiro lugar os nós ""adaptador"" e ""método""." -"Processed records: %s","Registros processados​​: %s" -"Profile with the same name already exists.","Já existe um perfil com o mesmo nome." -"Saved successfully: ""%s"" [%d byte(s)].","Salvo com sucesso: ""%s"" [%d byte(s)]." -"Sheet 1","Folha 1" -"Skip undefined row.","Pule linha indefinida." -"Starting %s :: %s","Começando %s :: %s" -"The destination folder ""%s"" does not exist or there is no access to create it.","A pasta de destino ""%s"" não existe ou não existe acesso para criá-la." -"Total records: %s","Total de registros: %s" -"hour","hora" -"hours","horas" -"minute","minuto" -"minutes","minutos" diff --git a/app/locale/pt_BR/Mage_Directory.csv b/app/locale/pt_BR/Mage_Directory.csv deleted file mode 100644 index 0e344e218..000000000 --- a/app/locale/pt_BR/Mage_Directory.csv +++ /dev/null @@ -1,49 +0,0 @@ -"-- Please select --","-- Selecione --" -"Allowed Currencies","Moedas Permitidas" -"Base Currency","Moeda Padrão" -"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","A Moeda Padrão é usada em todas as transações de pagamento online. O escopo é definido pelo escopo do preço de catálogo (""Catálogo"" > ""Preço"" > ""Escopo do Preço de Catálogo"")." -"Can\'t convert rate from ""%s-%s"".","Não é possível converter taxa de ""%s-%s""." -"Cannot retrieve rate from %s.","Não foi possível recuperar a taxa do %s." -"Connection Timeout in Seconds","Duração da Conexão em Segundos" -"Continue »","Continuar »" -"Country","País" -"Country API","API do país" -"Country and Format Type combination should be unique","A combinação do tipo de formato e país devem ser única" -"Currency","Moeda" -"Currency Options","Opções de Moeda" -"Currency Setup","Configuração de Moeda" -"Currency Update Warnings","Alertas de Atualização de Moeda" -"Default Display Currency","Visualizar Moeda Padrão" -"Directory","Diretório" -"Display not required State","Exibição não requerida Estado" -"Enabled","Ativado" -"Error Email Recipient","Erro de Destinatário de Email" -"Error Email Sender","Erro de Remetente de Email" -"Error Email Template","Erro de Template de Email" -"FATAL ERROR:","ERRO CRÍTICO:" -"Frequency","Freqüência" -"Installed Currencies","Moedas Instaladas" -"Invalid Import Service specified.","Importação de Serviço Especificado Inválido." -"Invalid country code: %s","Código do país inválido: %s" -"Invalid rates received","Valores recebidos inválidos" -"Invalid target currency.","Moeda de destino inválida." -"List of countries","Lista de países" -"List of regions in specified country","Lista de regiões no país especificado" -"Postal Code is Optional for the following countries","Código Postal é Opcional nos seguintes países" -"Region","Região" -"Region API","API da região" -"Scheduled Import Settings","Configurações de Importação Programadas" -"Select Your Currency","Selecione sua moeda" -"Service","Serviço" -"Start Time","Tempo de Início" -"State is required for","O estado é requerido para" -"State/Province","Estado/Província" -"States Options","Opções de estados" -"Strikeiron Email Update Warnings","Avisos de atualização por e-mail Strikeiron" -"Unable to initialize the import model.","Não foi possível inicializar o modelo importado." -"Undefined rate from ""%s-%s"".","Taxa indefinida de ""%s-%s""." -"WARNING:","ATENÇÃO:" -"Webservicex","Webservicex" -"Your Currency","Sua Moeda" -"Your Currency:","Sua Moeda:" -"Your current currency is: %s","Sua moeda atual é: %s" diff --git a/app/locale/pt_BR/Mage_Downloadable.csv b/app/locale/pt_BR/Mage_Downloadable.csv deleted file mode 100644 index 8234119ae..000000000 --- a/app/locale/pt_BR/Mage_Downloadable.csv +++ /dev/null @@ -1,95 +0,0 @@ -"Add","Adicionar" -"Add New Row","Adicionar Nova Linha" -"Add links and samples to downloadable product","Adicionar links e amostras de produto para download" -"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.","Caracteres alfanuméricos, traço e sublinhado são recomendados para nomes de arquivos. Caracteres impróprios são substituídos por \'_\'." -"An error occurred while getting the requested content.","Ocorreu um erro ao obter o conteúdo solicitado." -"An error occurred while getting the requested content. Please contact the store owner.","Ocorreu um erro ao obter o conteúdo solicitado. Por favor contate o proprietário da loja." -"An error occurred while saving the file(s).","Ocorreu um erro ao salvar o(s) arquivo(s)." -"Availability:","Disponibilidade:" -"Back","Voltar" -"Canceled","Cancelado" -"Cannot connect to remote host, error: %s.","Não é possível conetar ao anfitrião remoto, erro: %s." -"Catalog Product View (Downloadable)","Ver Catálogo do Produto (descarregável)" -"Category API","API de Categorias" -"Customer My Account Downloadable Items","Minha Conta Cliente de Itens para Download" -"Date","Data" -"Default Link Title","Título do Link Predefinido" -"Default Maximum Number of Downloads","Número Máximo Predefinido de Transferências" -"Default Sample Title","Título da Amostra Predefinido" -"Delete","Excluir" -"Disable Guest Checkout if Cart Contains Downloadable Items","Desativar Caixa (Checkout) de Visitante se Carrinho Contém Itens para Transferência" -"Downloadable Information","Informação Transferível" -"Downloadable Product","Produto Descarregável" -"Downloadable Product Options","Opções de Produto Descarregável" -"Downloadable Product Section","Seção de produtos para download" -"Edit","Editar" -"Edit item parameters","Editar parâmetros de item" -"Excl. Tax","Excluir taxas" -"File","Arquivo" -"From:","De:" -"Gift Message","Mensagem de presente" -"Go to My Downloadable Products","Vá para Meus Produtos Disponíveis para Download" -"Guest checkout will only work with shareable.","A compra como visitante só funcionará com compartilháveis." -"In stock","Em estoque" -"Incl. Tax","Incluir taxas" -"Invalid download URL host.","Host de URL para download inválido." -"Invalid download URL scheme.","URL scheme para download inválido." -"Invalid download link type.","Tipo de link inválido para download." -"Invoiced","Faturado" -"Links can be purchased separately","Os links podem ser comprados separadamente" -"List","Lista" -"Max. Downloads","Máx. de Downloads" -"Message:","Mensagem:" -"Move","Mover" -"Move to wishlist","Mover para a lista de desejos" -"My Downloadable Products","Meus Produtos Disponíveis para Download" -"Open Links in New Window","Abrir Links em Nova Janela" -"Order #","Ordem #" -"Order Item Status to Enable Downloads","Solicitar Status de Item para Permitir Downloads" -"Order id cannot be null","Identificação de solicitação não pode ser nula" -"Order item id cannot be null","Identificação de solicitação de item não pode ser nula" -"Ordered","Solicitado" -"Out of stock","Fora de estoque" -"Pending","Pendente" -"Please log in to download your product or purchase %s.","Por favor faça login para download do seu produto ou compra %s." -"Please log in to download your product.","Por favor, efetue login para fazer o download de seu produto." -"Please set resource file and link type.","Por favor, estabeleça arquivo de pesquisa e tipo de link." -"Please specify product link(s).","Por favor, especifique link(s) do produto." -"Price","Preço" -"Product downloadable links","Links de produto para download." -"Qty","Quant." -"Refunded","Reembolsado" -"Remaining Downloads","Downloads restantes" -"Remove","Remover" -"Remove Item","Remover Item" -"Remove links and samples from downloadable product","Remover links e amostras de produto para download" -"Requested link does not exist.","O link solicitado não existe." -"Retrieve links and samples list from downloadable product","Recuperar lista de links e amostras de produto para download" -"SKU","SKU" -"Sample","Amostra" -"See price before order confirmation.","Ver preço antes de confirmar pedido." -"Shareable","Compartilhável" -"Shipped","Enviado" -"Sorry, there was an error getting requested content. Please contact the store owner.","Desculpe, houve um erro ao obter o conteúdo solicitado. Por favor, contate o dono da loja." -"Sort Order","Classificar pedido" -"Start Download","Começar Download" -"Status","Status" -"Subtotal","Subtotal" -"The file does not exist.","O arquivo não existe." -"The link has expired.","O link expirou." -"The link is not available.","O link não está disponível." -"There are files that were selected but not uploaded yet. Please upload or remove them first","Esses são arquivos que foram selecionados mas cujo upload ainda não foi feito. Por favor faça upload ou remova-os antes" -"Title","Título" -"To:","Para:" -"U","U" -"Unlimited","Ilimitado" -"Update","Atualizar" -"Use Content-Disposition","Usar Content-Disposition" -"Use Default Value","Utilizar valor padrão" -"View Order","Ver Solicitação" -"What's this?","O que é isso?" -"You have not purchased any downloadable products yet.","Você ainda não comprou nenhum produto para baixar." -"attachment","anexo" -"download","baixar" -"inline","em linha" -"sample","exemplo" diff --git a/app/locale/pt_BR/Mage_Eav.csv b/app/locale/pt_BR/Mage_Eav.csv deleted file mode 100644 index f9fa5194b..000000000 --- a/app/locale/pt_BR/Mage_Eav.csv +++ /dev/null @@ -1,124 +0,0 @@ -"""%s"" contains not only digit characters.","""%s"" não contém apenas caracteres de dígitos." -"""%s"" does not fit the entered date format.","""%s"" não se encaixa no formato de data inserida." -"""%s"" exceeds the allowed file size.","""%s"" excede o tamanho de arquivo permitido." -"""%s"" exceeds the allowed length.","""%s"" excede o tamanho permitido." -"""%s"" has not only alphabetic and digit characters.","""%s"" não tem apenas caracteres alfabéticos e dígitos." -"""%s"" has not only alphabetic characters.","""%s"" não tem apenas caracteres alfabéticos." -"""%s"" height exceeds allowed value of %s px.","A altura de ""%s"" excede o valor permitido de %s px." -"""%s"" invalid type entered.","tipo ""%s"" inválido entrou." -"""%s"" is a required value.","""%s"" é um valor necessário." -"""%s"" is an empty string.","""%s"" é um valor vazio." -"""%s"" is not a valid URL.","""%s"" não é um URL válido." -"""%s"" is not a valid date.","""%s"" não é uma data válida." -"""%s"" is not a valid email address.","""%s"" não é um endereço de e-mail válido." -"""%s"" is not a valid file","""%s"" não é um arquivo válido" -"""%s"" is not a valid file extension.","""%s"" não é uma extensão de arquivo válida." -"""%s"" is not a valid file.","""%s"" não é um arquivo válido." -"""%s"" is not a valid hostname.","""%s"" não é um nome de alojamento válido." -"""%s"" is not a valid image format","""%s"" não é um formato de imagem válido" -"""%s"" length must be equal or greater than %s characters.","Comprimento de ""%s"" deve ser igual ou maior que %s caracteres." -"""%s"" length must be equal or less than %s characters.","Comprimento de ""%s"" deve ser igual ou menor que %s caracteres." -"""%s"" width exceeds allowed value of %s px.","Largura de ""%s"" excede o valor permitido de %s px." -"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' parece ser um nome de alojamento DNS mas não pode extrair parte TLD" -"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' parece ser um nome de alojamento DNS mas não consegue encontrar TLD contra a lista conhecida" -"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' parece ser um nome de alojamento DNS mas não pode ser comparado contra o esquema nome de alojamento para TLD '%tld%'" -"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' parece ser um nome de alojamento DNS mas contém um traço em uma posição inválida" -"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' parece ser um DNS de alojamento mas a notação punycode dada não pode ser descodificada" -"'%value%' appears to be a local network name but local network names are not allowed","'%value%' parece ser um nome de rede local mas nomes de rede local não são permitidos" -"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' parece ser um endereço IP, mas endereços IP não são permitidos" -"'%value%' does not appear to be a valid URI hostname","'%value%' não parece ser um URI de alojamento válido" -"'%value%' does not appear to be a valid local network name","'%value%' não parece ser um nome de rede local válido" -"'%value%' does not match the expected structure for a DNS hostname","'%value%' não corresponde à estrutura esperada de um nome de alojamento DNS" -"A joint field with this alias (%s) is already declared","Um campo em conjunto com este pseudônimo (%s) já está declarado" -"Add Option","Adicionar Opção" -"An error occurred while loading a record, aborting. Error: %s","Ocorreu um erro ao carregar um registro, abortando. Erro: %s" -"An error occurred while loading the collection, aborting. Error: %s","Ocorreu um erro ao carregar a coleção, abortando. Erro: %s" -"An error occurred while saving a record, aborting. Error: ","Ocorreu um erro ao salvar um registro, abortando. Erro:" -"Attempt to add an invalid object","Tentativa de adicionar um objeto inválido" -"Attribute '%s' used in configurable products","Atributo '%s' usado em produtos configuráveis" -"Attribute Code","Código do Atributo" -"Attribute Label","Etiqueta do Atributo" -"Attribute Properties","Propriedades do Atributo" -"Attribute object is undefined","Objeto do atributo é indefinido" -"Attribute set with the ""%s"" name already exists.","Atributo definido com o nome ""%s"" já existe." -"Attribute with the same code","Atributo com o mesmo código" -"Can\'t create table: %s","Não é possível criar tabela: %s" -"Catalog Input Type for Store Owner","Catálogo de Tipo de Entrada para Dono da Loja" -"Current module EAV entity is undefined","Módulo de entidade EAV atual indefinido" -"Current module pathname is undefined","Nome do caminho do módulo atual indefinido" -"Data integrity: No header row found for attribute","Integridade dos dados: Linha de cabeçalho para o atributo não encontrada" -"Date","Data" -"Decimal Number","Número Decimal" -"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","A Classificação de Listagem por Produto Padrão não existe na Classificação de Listagem de Produto Disponível." -"Default Value","Valor Predifinido" -"Default option value is not defined","Valor de opção predifinida não foi definido" -"Delete","Excluir" -"Dropdown","Menu suspenso" -"Email","E-mail" -"Entity collection expected.","Coleção entidade esperada." -"Entity collections expected.","Coleções entidade esperadas." -"Entity instance is not defined","Instância da entidade não está definida" -"Entity is not initialized","Entidade não está inicializada" -"Entity object is undefined","Objeto de entidade indefinido" -"Failed to load node %s from config","Falha ao carregar nó %s de configuração" -"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","Para uso interno. Deve ser único, sem espaços. Comprimento máximo do código do atributo deve ter menos de %s símbolos" -"Form Element with the same attribute","Elemento de Formulário com o mesmo atributo" -"Form Fieldset with the same code","Fieldset de Formulário com o mesmo código" -"Form Type with the same code","Tipo de Formulário com o mesmo código" -"Form code is not defined","Código de Formulário não está definido" -"Frontend label is not defined","Rótulo frontend não está definido" -"Input Validation for Store Owner","Validação de Entrada para Dono da Loja" -"Integer Number","Número Inteiro" -"Invalid EAV attribute.","Atributo EAV inválido." -"Invalid alias, already exists in joint attributes","Apelido inválido, já existe em atributos comuns" -"Invalid attribute name: %s","Nome de atributo inválido: %s" -"Invalid attribute requested: %s","Pedido de atributo inválido: %s" -"Invalid attribute type","Tipo de atributo inválido" -"Invalid character encountered in increment ID: %s","Caractere inválido encontrado na identificação de incremento: %s" -"Invalid date","Data inválida" -"Invalid default date","Data-padrão inválida" -"Invalid default decimal value","Valor decimal-padrão inválido" -"Invalid entity specified","Entidade especificada inválida" -"Invalid entity supplied.","Entidade fornecida inválida." -"Invalid entity supplied: %s","Entidade fornecida inválida: %s" -"Invalid entity type","Tipo de entidade inválido" -"Invalid entity_id, skipping the record.","Identificação de entidade inválida. Saltando o registro." -"Invalid entity_type specified: %s","Tipo inválido de entidade especificado: %s" -"Invalid foreign key","Chave estrangeira inválida" -"Invalid form type.","Tipo inválido de formulário." -"Invalid joint fields","Campos conjuntos inválidos" -"Invalid store specified","Loja especificada inválida" -"Invalid type given. String expected","Tipo fornecido inválido. Esperado: cadeia de caracteres." -"Joined field with this alias is already declared","O campo acrescentado com este apelido já está declarado" -"Joint field or attribute expression with this alias is already declared","O campo conjunto ou expressão de atributos com este apelido já está declarado" -"Letters","Letras" -"Letters (a-z, A-Z) or Numbers (0-9)","Letras (a-z, A-Z) ou Números (0-9)" -"Loaded %d records","%d registros carregados" -"Maximum length of attribute code must be less then %s symbols","O código de atributo precisa ter menos de %s símbolos" -"Multiple Select","Múltipla escolha" -"No","Não" -"No options found in config node %s","Nenhuma opção encontrada no nó de configuração %s" -"None","Nenhum" -"Not shared with other products","Não compartilhado com outros produtos" -"Problem loading the collection, aborting. Error: %s","Problema ao carregar a coleção. Abortando. Erro: %s" -"Problem saving the collection, aborting. Error: %s","Problema ao salvar a coleção. Abortando. Erro: %s" -"Required","Obrigatório" -"Saved %d record(s).","%d registro(s) salvo(s)." -"Source model ""%s"" not found for attribute ""%s""","Modelo-fonte ""%s"" não encontrado para atributo ""%s""" -"System","Sistema" -"Text Area","Área de texto" -"Text Field","Campo de texto" -"The value of attribute ""%s"" must be unique","O valor do atributo ""%s"" tem de ser único." -"The value of attribute ""%s"" must be unique.","O valor do atributo ""%s"" tem de ser único." -"This attribute is used in configurable products","Este atributo é utilizado em produtos configuráveis" -"URL","URL" -"Unique Value","Valor Único" -"Unique Value (not shared with other products)","Valor Único (não compartilhado com outros produtos)" -"Unknown parameter","Parâmetro desconhecido" -"Values Required","Valores Obrigatórios" -"Wrong attribute group ID","Identificação errada para grupo de atributos" -"Wrong attribute set ID","Identificação errada para conjunto de atributos" -"Wrong entity ID","Identificação de entidade errada" -"Wrong type definition for %s","Definição de tipo errada para %s" -"Yes","Sim" -"Yes/No","Sim/Não" diff --git a/app/locale/pt_BR/Mage_GiftMessage.csv b/app/locale/pt_BR/Mage_GiftMessage.csv deleted file mode 100644 index f697686d0..000000000 --- a/app/locale/pt_BR/Mage_GiftMessage.csv +++ /dev/null @@ -1,38 +0,0 @@ -"Add","Adicionar" -"Add gift message for shopping cart","Adicionar mensagem de presente no carrinho de compras" -"Add gift messages for quote item of shopping cart","Adicionar mensagens de presente em item cotado carrinho de compras" -"Add gift messages to products of shopping cart","Adicionar mensagens de presente a produtos do carrinho de compras" -"Add gift options","Adicionar opções de presente" -"Add gift options for Individual Items","Adicionar opções de presente em Itens Individuais" -"Add gift options for the Entire Order","Adicionar opções de presente no Pedido Completo" -"Add gift options.","Adicionar opções de presente." -"Allow Gift Messages for Order Items","Permitir Mensagens de Presente em Itens do Pedido" -"Allow Gift Messages on Order Level","Permitir Mensagens de Presente em Nível de Pedido" -"An error occurred while saving the gift message.","Ocorreu um erro ao salvar a mensagem de presente." -"Are you sure?","Tem certeza?" -"Cancel","Cancelar" -"Do you have any gift items in your order?","Você tem algum item de presente em seu pedido?" -"Edit","Editar" -"From","De" -"Gift Message","Mensagem de presente" -"Gift Message API","API para Mensagens de Presente" -"Gift Options","Opções de presente" -"Gift Options for","Opções de Presente para" -"Gift Options for Individual Items","Opções de Presente para Itens Individuais" -"Gift Options for the Entire Order.","Opções de Presente para o Pedido Completo." -"Gift Options for this address.","Opções de presente para este endereço." -"Item %d of %d","Item %d de %d" -"Message","Mensagem" -"No","Não" -"OK","OK" -"Save Gift Message","Salvar mensagem de presente" -"The gift message has been removed","A mensagem de presente foi removida" -"The gift message has been saved","A mensagem de presente foi salva" -"The gift message has been saved.","A mensagem de presente foi salva." -"To","Para" -"Unknown entity type","Tipo de entidade desconhecido" -"Use config","Use config" -"Yes","Sim" -"You can leave this box blank if you do not wish to add a gift message for the item.","Você pode deixar este campo em branco se você não pretende adicionar uma mensagem de presente para o item." -"You can leave this box blank if you do not wish to add a gift message for this address.","Você pode deixar este campo em branco se você não pretende adicionar uma mensagem de presente para este endereço." -"You can leave this box blank if you do not wish to add a gift message for whole order.","Você pode deixar este campo em branco se você não pretende adicionar uma mensagem de presente para toda a ordem." diff --git a/app/locale/pt_BR/Mage_GoogleAnalytics.csv b/app/locale/pt_BR/Mage_GoogleAnalytics.csv deleted file mode 100644 index a7a034ac5..000000000 --- a/app/locale/pt_BR/Mage_GoogleAnalytics.csv +++ /dev/null @@ -1,5 +0,0 @@ -"Account Number","Número de Conta" -"Enable","Ativar" -"Enable IP anonymization","Ativar anonimização de IPs" -"Google API","Google API" -"Google Analytics","Google Analytics" diff --git a/app/locale/pt_BR/Mage_GoogleBase.csv b/app/locale/pt_BR/Mage_GoogleBase.csv deleted file mode 100644 index 26f9d60c5..000000000 --- a/app/locale/pt_BR/Mage_GoogleBase.csv +++ /dev/null @@ -1,78 +0,0 @@ -"Active","Ativo" -"Add Attribute Mapping","Adicionar Mapeamento de Atributo" -"Add New Attribute","Adicionar Novo Atributo" -"Add to Google Base","Adicionar à Base do Google" -"Are you sure?","Tem certeza?" -"Attribute","Atributo" -"Attribute Set","Conjunto de Atributos" -"Attribute Set and Item Type","Configuração de Atributo e Tipo de Item" -"Attributes","Atributos" -"Attributes Mapping","Mapeamento de Atributos" -"Attributes Set","Configuração de Atributos" -"AuthSub","AuthSub" -"Available Products","Produtos disponíveis" -"Base Currency should be set to %s for %s in system configuration. Otherwise item prices won't be correct in Google Base.","Moeda de referência deve ser alterada de %s para %s na configuração do sistema. De outra forma, os preços dos itens são estarão corretos na Base do Google." -"Cannot update Google Base Item for Store '%s'","Não foi possível atualizar Item Google Base para Loja '%s'" -"Captcha confirmation error: %s","Confirmação de erro Captcha: %s" -"Captcha has been confirmed.","Captcha foi confirmado." -"Catalog","Catálogo" -"Clicks","Cliques" -"ClientLogin","ClientLogin" -"Confirm","Confirmar" -"Current Mapping will be reloaded. Continue?","Mapeamento atual será recarregado. Continuar?" -"Custom attribute, no mapping","Atributo do cliente, sem mapeamento" -"Delete","Excluir" -"Delete Mapping","Deletar Mapeamento" -"Edit Item Type","Editar Tipo de Item" -"Edit Item Type ""%s""","Editar Tipo de Item ""%s""" -"Error: %s","Erro: %s" -"Expires","Expira" -"Google","Google" -"Google Base","Google Base" -"Google Base Attribute","Atributo da Base do Google" -"Google Base ID","ID da Base do Google" -"Google Base Item Type","Tipo de Item da Base do Google" -"Google Base Item type","Tipo de Item da Base do Google" -"Google Base Items","Itens da Base Google" -"Google base","Base do Google" -"Hide","Ocultar" -"Hosted","Hospedado" -"Hosted or Google","Hospedado ou Google" -"Impr.","Impr." -"Invalid Product Model for Google Base Item","Modelo Inválido de Produto para Item da Base do Google" -"Item Type was deleted","Tipo de Item foi deletado" -"Item Types","Tipos de Item" -"Item model is not specified to delete Google Base entry.","Modelo de item não foi especificado para deletar entrada na Base do Google." -"Items","Itens" -"Manage Attribute Mapping","Gerenciar Mapeamento de Atributo" -"Manage Attributes","Gerenciar Atributos" -"Manage Items","Gerenciar itens" -"New Item Type","Novo Tipo de Item" -"New ItemType","Novo Tipo de Item" -"No","Não" -"No items were deleted from Google Base","Nenhum item foi apagado do Google Base" -"No items were published","Nenhum item foi publicado" -"No items were saved as inactive items","Nenhum item foi salvo como item inativo" -"No products were added to Google Base","Nenhum produto foi adicionado ao Google Base" -"Object model is not specified to save Google Base entry.","Modelo de objeto não é especificado para salvar entrada no Google Base." -"Please, select Attribute Set and Google Item Type to load attributes","Por favor, selecione Conjunto de Atributos e Tipo de Item Google para carregar os atributos" -"Product Name","Nome do produto" -"Publish","Publicar" -"Published","Publicado" -"Remove","Remover" -"Save Mapping","Salvar Mapeamento" -"Session expired during export. Please revise exported products and repeat the process if necessary.","Sessão expirada durante a exportação. Por favor revise os produtos exportados e repita o processo se necessário." -"Synchronize","Sincronizar" -"Target Country","País Alvo" -"The item type has been saved.","O tipo de item foi salvo." -"This action will update items statistics and remove the items which are not available in Google Base. Continue?","Esta ação irá atualizar as estatísticas dos itens e remover os itens que não estão disponíveis no Google Base. Continuar?" -"Total of %d items(s) have been deleted; total of %d items(s) have been updated.","Um total de %d itens foi excluído; um total de %d itens foi atualizado." -"Total of %d items(s) have been published.","Um total de %d itens foi publicado." -"Total of %d items(s) have been removed from Google Base.","Um total de %d itens foi removido do Google Base." -"Total of %d items(s) have been saved as inactive items.","Um total de %d itens foi salvo como itens inativos." -"Total of %d product(s) have been added to Google Base.","Um total de %d produto(s) foi adicionado ao Google Base." -"Unable to connect to Google Base. Please, check Account settings in configuration.","Não é possível conetar com o Google Base. Por favor, verifique as configurações da Conta na configuração." -"Unable to select a Store View.","Não foi possível selecionar uma Vista de Loja." -"View Available Products","Ver Produtos Disponíveis" -"View Item in Google Base","Ver Artigo em Base Google" -"Yes","Sim" diff --git a/app/locale/pt_BR/Mage_GoogleCheckout.csv b/app/locale/pt_BR/Mage_GoogleCheckout.csv deleted file mode 100644 index 3ea4a092b..000000000 --- a/app/locale/pt_BR/Mage_GoogleCheckout.csv +++ /dev/null @@ -1,131 +0,0 @@ -"* Select shipping method","* Selecionar tipo de frete" -"2Day","2 dias" -"2nd Day Air","2º dia Aéreo" -"2nd Day Air AM","2º dia Aéreo manhã" -"3 Day Select","3 dias" -"
    Warning: %s
    ","
    Aviso: %s
    " -"Warning! This option disables the merchant calculated shipping. With this option, Google API ignores any attempt to affect shipping prices.","Aviso! Esta opção desativa o frete calculado pelo comerciante. Com esta opção, a API Google ignora qualquer tentativa de afetar valores do frete." -"A virtual item to reflect the discount total","Um item virtual para refletir o total de descontos" -"A virtual item to reflect the tax total","Um item virtual para refletir o total de impostos" -"AVS Status: %s","Estado Atual de AVS: %s" -"Add Shipping Method","Adicionar Tipo de Frete" -"Allowed Methods","Métodos Permitidos" -"Amount: %s","Quantia: %s" -"Auto-generated from GoogleCheckout Charge","Autogerado a partir de Cobrança GoogleCheckout" -"Buyer Account Age: %s days","Idade da Conta do Comprador: %s dia(s)" -"CC Partial: xxxx-%s","CC (Parte): xxxx-%s" -"CID Status: %s","Estado Atual de CID: %s" -"Carrier Calculated Methods","Métodos Calculados pela Transportadora" -"Cart Discount","Desconto no Carrinho" -"Checkout Image Style","Estilo de Imagem do Encerramento de Pedido" -"Commercial","Comercial" -"Continue Shopping URL","URL para Continuar as Compras" -"Credit memo has been created automatically","O memorando de crédito foi criado automaticamente" -"Debug","Debug" -"Default Package Height (in)","Altura-Padrão do Pacote (pol.)" -"Default Package Length (in)","Comprimento-Padrão do Pacote (pol.)" -"Default Package Width (in)","Largura-Padrão do Pacote (pol.)" -"Default Price for Methods","Preço-padrão para Métodos" -"Default price:","Preço-padrão:" -"Delivery Address Category","Categoria do Endereço de Entrega" -"Delivery Schedule","Programação da Entrega" -"Description-based delivery","Entrega com base na descrição" -"Disable Default Tax Tables","Desabilitar Tabelas Padronizadas de Impostos" -"Discount Tax","Descontar Imposto" -"Eligible for Protection: %s","Adequado para Proteção: %s" -"Email delivery","Entrega de email" -"Enable","Ativar" -"Enable Carrier Calculated","Permitir Cálculo de Transporte" -"Enable Digital Delivery","Permitir Entrega Digital" -"Enable Flat Rate","Permitir Taxa Fixa" -"Enable Merchant Calculated","Permitir Cálculo Comercial" -"Enable this if your checkout request is too big and being cut off.","Permitir isso se sua solicitação de verificação for muito extensa e for interrompida." -"Expiration: %s","Término: %s" -"Express Mail","Correio Expresso" -"Express Saver","Express Econômico" -"FedEx","FedEx" -"Financial: %s -> %s","Financeiro: %s -> %s" -"First Overnight","Primeira Pernoite" -"Free Shipping","Frete Grátis" -"Fulfillment: %s -> %s","Execução: %s -> %s" -"Google API","Google API" -"Google Authorization:","Autorização do Google:" -"Google Buyer ID: %s","Identificação do Comprador do Google: %s" -"Google Charge:","Tarifa do Google:" -"Google Chargeback:","Estorno do Google:" -"Google Checkout","Verificação do Google" -"Google Checkout Shipping - Carrier Calculated","Verificação de Frete do Google - Cálculo de Transporte" -"Google Checkout Shipping - Digital Delivery","Verificação de Frete do Google - Entrega Digital" -"Google Checkout Shipping - Flat Rate","Verificação de Frete do Google - Taxa Fixa" -"Google Checkout Shipping - Merchant Calculated","Verificação de Frete do Google - Cálculo Comercial" -"Google Checkout: %s","Verificação do Google: %s" -"Google Order Number: %s","Número de Solicitação do Google: %s" -"Google Order Status Change:","Mudança de Status na Solicitação do Google:" -"Google Refund:","Reembolso do Google:" -"Google Risk Information:","Informações de Risco do Google:" -"GoogleCheckout is not configured","O Google Checkout não está configurado" -"Ground","Terreno" -"Hide Cart Contents","Ocultar Conteúdo do Carrinho" -"Home Delivery","Entrega em Domicílio" -"IP Address: %s","Endereço IP: %s" -"If enabled, cart contents will be hidden after clicking on the Google Checkout button in the shopping cart, and restored if ""Edit Cart"" link was activated.","Se autorizado, o conteúdo do carrinho será ocultado depois de clicar no botão Verificação do Google no carrinho de compras e será reabilitado se o link ""Editar Carrinho"" for ativado." -"Inches","Polegadas" -"Invoice Auto-Created: %s","Fatura autogerada: %s" -"Is Buyer Willing to Receive Marketing Emails: %s","O Comprador quer Receber E-mails de Marketing: %s" -"Key/URL delivery","Entrega Chave/URL" -"Large - %s","Grande - %s" -"Latest Charge: %s","Última Tarifa: %s" -"Latest Chargeback: %s","Último Estorno: %s" -"Latest Refund: %s","Último Reembolso: %s" -"Location","Local" -"Media Mail","Correio de Mídia" -"Medium - %s","Médio - %s" -"Merchant ID","Identificação do comerciante" -"Merchant Key","Chave do Comerciante" -"Method","Método" -"New Order Status","Status do Novo Pedido" -"Next Day Air","Aéreo Dia Seguinte" -"Next Day Air Early AM","Aéreo Início da Manhã do Dia Seguinte" -"Next Day Air Saver","Aéreo Econômico Dia Seguinte" -"No","Não" -"No Comment","Sem comentários" -"No Reason","Sem motivo" -"Optimistic","Otimista" -"Optional, leave empty for home page.","Opcional, deixe em branco para home page." -"Order creation error","Erro na criação de pedido" -"Parcel Post","Encomenda Postal" -"Pessimistic","Pessimista" -"Priority Mail","Correio Prioritário" -"Priority Overnight","Prioridade durante a noite" -"Rate 1 Amount","Quantidade Taxa 1" -"Rate 1 Ship To Applicable Countries","Taxa 1 Transportar para Países Aplicáveis" -"Rate 1 Ship to Specific Countries","Taxa 1 Transportar para Países Específicos" -"Rate 1 Title","Título Taxa 1" -"Rate 2 Amount","Valor Taxa 2" -"Rate 2 Ship To Applicable Countries","Taxa 2 de Envio Para Países Aplicáveis" -"Rate 2 Ship to Specific Countries","Taxa 2 de Envio Para Países Específicos" -"Rate 2 Title","Título Taxa 2" -"Rate 3 Amount","Valor Taxa 3" -"Rate 3 Ship To Applicable Countries","Taxa 3 de Envio Para Países Aplicáveis" -"Rate 3 Ship to Specific Countries","Taxa 3 de Envio Para Países Específicos" -"Rate 3 Title","Título Taxa 3" -"Required for live Google Checkout transactions. Make sure that this option corresponds to Use Secure URLs in Frontend (""Web"" > ""Secure"").","Exigido para transações ao vivo do Google Checkout. Garante que esta opção corresponde ao Usar URLS Seguras no Começo e no Fim (""Rede"" > Segura"")." -"Residential","Residencial" -"Sandbox","Sandbox" -"Secure Callback URL","URL Seguro de Retorno" -"Small - %s","Pequeno - %s" -"Standard Overnight","Pernoite Padrão" -"The tax amount has been applied based on the information received from Google Checkout, because tax amount received from Google Checkout is different from the calculated tax amount","O valor do imposto tem sido aplicado com base nas informações recebidas de Google Checkout, porque valor do imposto recebido de Google Checkout é diferente do valor do imposto calculado" -"Title","Título" -"Total Chargeback: %s","Cobrança Retroativa Total: %s" -"Total Charged: %s","Total Cobrado: %s" -"Total Refunded: %s","Total Reembolsado: %s" -"Transparent","Transparente" -"UPS","UPS" -"USPS","USPS" -"United Kingdom","Reino Unido" -"United States","Estados Unidos" -"Unknown Reason","Razão desconhecida" -"White Background","Fundo Branco" -"Yes","Sim" -"You will be redirected to GoogleCheckout in a few seconds.","Você será redirecionado para GoogleCheckout em poucos segundos." diff --git a/app/locale/pt_BR/Mage_ImportExport.csv b/app/locale/pt_BR/Mage_ImportExport.csv deleted file mode 100644 index 48b9919b2..000000000 --- a/app/locale/pt_BR/Mage_ImportExport.csv +++ /dev/null @@ -1,93 +0,0 @@ -"%s file does not exists or is not readable","O arquivo % não existe ou não é legível" -"-- Please Select --","- Por Favor Selecione -" -"Adapter must be an instance of Mage_ImportExport_Model_Import_Adapter_Abstract","Adaptador deve ser uma instância de Mage_ImportExport_Model_Import_Adapter_Abstract" -"Adapter object must be an instance of %s","O objeto adaptador deve ser um exemplo de %s" -"Adapter type must be a non empty string","Tipo de adaptador deve ser uma sequência não vazia" -"Append Complex Data","Anexar Dados Complexos" -"Attribute Code","Código do Atributo" -"Attribute Label","Etiqueta do Atributo" -"Attribute does not has options, so filtering is impossible","O atributo não tem opções, portanto a filtragem é impossível" -"Begin data validation","Começar validação de dados" -"Begin export of %s","Começar importação de %s" -"Begin import of ""%s"" with ""%s"" behavior","Começar importação de ""%s"" com comportamento ""%s""" -"CSV","CSV" -"Can not determine attribute filter type","Não pode determinar o tipo de atributo de filtro" -"Can not find required columns: %s","Não pode encontrar colunas exigidas: %s" -"Cannot get autoincrement value","Não foi possível obter valor de auto-incremento" -"Check Data","Verificar Dados" -"Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d","Linhas checadas: %d, entidades checadas: %d, linhas inválidas: %d, erros totais: %d" -"Column names have duplicates","Nomes de coluna têm duplicados" -"Column names is empty or is not an array","Nomes de coluna estão vazios ou não em série" -"Column names: ""%s"" are invalid","Nomes de colunas: ""%s"" são inválidos" -"Customers","Clientes" -"Data is invalid or file is not uploaded","Dados são inválidos ou arquivo não está carregado" -"Delete Entities","Apagar entidades" -"Destination directory is not writable","Diretório de destino não é gravável" -"Destination file is not writable","Arquivo de destino não é gravável" -"Destination file path must be a string","Caminho do arquivo de destino deve ser uma sequência" -"Done import data validation","Validação de importação de dados feita" -"Duplicate Unique Attribute for '%s'","Duplicar atributo único para '%s'" -"Entity Type","Tipo de entidade" -"Entity adapter obejct must be an instance of Mage_ImportExport_Model_Export_Entity_Abstract","Objeto de adaptador de entidade deve ser um exemplo de Mage_ImportExport_Model_Export_Entity_Abstract" -"Entity adapter object must be an instance of Mage_ImportExport_Model_Import_Entity_Abstract","Objeto adaptador da entidade deve ser uma instância de Mage_ImportExport_Model_Import_Entity_Abstract" -"Entity is unknown","Entidade desconhecida" -"Entity type model must be an instance of Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract","Modelo de tipo de entidade deve ser uma instância de Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract" -"Entity type model must be an instance of Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract","Modelo de tipo de entidade deve ser uma instância de Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract" -"Error in data structure: behaviors are mixed","Erro na estrutura de dados: os comportamentos estão misturados" -"Error in data structure: entity codes are mixed","Erro na estrutura de dados: os códigos de entidade estão misturados" -"Errors limit (%d) reached. Please fix errors and re-upload file","Limite de erros (%d) alcançado. Por favor, conserte os erros e faça o upload do arquivo novamente" -"Export","Exportar" -"Export File Format","Exportar Formato de Arquivo" -"Export Settings","Exportar configurações" -"Export has been done.","A exportação foi feita" -"Exported %s rows.","Linhas %s exportadas." -"File does not contain data.","O arquivo não contém dados" -"File does not contain data. Please upload another one","Arquivo não contém dados. Por favor envie outro" -"File format is unknown","Formato de arquivo é desconhecido" -"File is partially valid, but import is not possible","Arquivo é parcialmente válido, mas a importação não é possível" -"File is totally invalid. Please fix errors and re-upload file","Arquivo é totalmente inválido. Por favor corrija os erros e recarregue arquivos" -"File is valid! To start import process press ""Import"" button","Arquivo é válido! Para iniciar o processo de importação carregue no botão ""Importar""" -"File is valid, but import is not possible","Arquivo é válido, mas a importação não é possível" -"File was not uploaded","Não foi feito o upload do arquivo" -"Filter","Filtro" -"From","De" -"Header column names already set","Nomes das colunas de cabeçalho já estão definidos" -"Import","Importar" -"Import Behavior","Comportamento da importação" -"Import Settings","Importar configurações" -"Import has been done successfuly.","A importação foi feita com sucesso." -"Import successfully done.","Importação feita com sucesso." -"Import/Export","Importação/Exportação" -"Input entity code is not equal to entity adapter code","Código de entrada da entidade não é igual ao código de adaptador da entidade" -"Invalid entity","Entidade inválida" -"Invalid entity model","Modelo de entidade inválido" -"Invalid file format","Formato de arquivo inválido" -"Invalid parameters","Parâmetros inválidos" -"Invalid seek position","Posição inválida de busca" -"Invalid value for '%s'","Valor inválido para ""%s""" -"Invalid value for '%s' column","Valor inválido para a coluna '%s'" -"No filter data provided","Dados fornecidos não filtrados" -"No source specified","Nenhuma fonte especificada" -"No valid data sent","Não há dados válidos de envio" -"No writer specified","Nenhum escritor especificado" -"Node does not has model token tag","Nó não tem modelo de marca simbólico" -"Not implemented yet","Ainda não implementado" -"Please fix errors and re-upload file","Corrija os erros e carregue novamente o arquivo" -"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Corrija os erros e carregue novamente o arquivo, ou simplesmente pressione o botão ""Importar"" para pular as linhas com erros" -"Products","Produtos" -"Replace Existing Complex Data","Substituir dados complexos existentes" -"Select File to Import","Escolher Arquivo para Importar" -"Skip","Pular" -"Source file moving failed","Falha na movimentação do arquivo fonte" -"Source file path must be a string","O caminho do arquivo fonte deve ser uma sequência de caracteres" -"Source is not set","A fonte não está definida" -"Status","Status" -"There are no product types available for export","Não há tipos de produto disponíveis para exportação" -"There is no data for export","Não há dados para exportar." -"To","Para" -"Total size of uploadable files must not exceed %s","O tamanho total dos arquivos a serem carregados não deve exceder %s" -"Unknown attribute filter type","Tipo de filtro para atributo desconhecido" -"Uploaded file has no extension","O arquivo carregado não possui extensão" -"Validation finished successfully","Validação finalizada com sucesso" -"in rows","em linhas" -"in rows:","em linhas:" diff --git a/app/locale/pt_BR/Mage_Index.csv b/app/locale/pt_BR/Mage_Index.csv deleted file mode 100644 index f5b1c7968..000000000 --- a/app/locale/pt_BR/Mage_Index.csv +++ /dev/null @@ -1,47 +0,0 @@ -"%s Index process is working now. Please try run this process later.","%s do processo de indexação está funcionando agora. Por favor, tente rodar esse processo mais tarde." -"%s index was rebuilt.","%s do índice foi reconstruído." -"'%s' Index Process Information","'%s' de Informações do Processo de Indexação" -"Action","Ação" -"Cannot initialize the indexer process.","Não é possível inicializar processo indexador." -"Change Index Mode","Alterar Modo de Indexação" -"Click here to go to Cache Management and refresh cache types.","Clique aqui para ir ao Gerenciador de Cache e atualizar tipos de cache." -"Click here to go to Index Management and rebuild required indexes.","Clique aqui para ir ao Gerenciador de Índice e reconstruir os índices necessários." -"Delete","Excluir" -"Description","Descrição" -"Disable","Desativar" -"Enable","Ativar" -"General","Geral" -"Index","Índice" -"Index Description","Descrição de Índice" -"Index Management","Gerenciamento de Índice" -"Index Mode","Modo de Índice" -"Index Name","Nome do Índice" -"Index mode","Modo de Índice" -"Indexer code is not defined.","Código Indexador não está definido." -"Indexer model is not defined.","Modelo indexador não está definido." -"Indexer model should extend Mage_Index_Model_Indexer_Abstract.","Modelo indexador deve incluir Mage_Index_Model_Indexer_Abstract." -"Manual Update","Atualização Manual" -"Mode","Modo" -"Never","Nunca" -"No","Não" -"One or more of the Indexes are not up to date:","Um ou mais dos índices não estão atualizados:" -"Please select Index(es)","Por favor, selecione índice(es)" -"Please select Indexes","Por favor, selecione índices" -"Process Information","Processar informação" -"Processing","Processando" -"Ready","Pronto" -"Refresh","Atualizar" -"Reindex Data","Reindexar Dados" -"Reindex Required","Obrigatório Reindexar" -"Revoke","Revogar" -"Status","Status" -"System","Sistema" -"The index has been saved.","O índice foi salvo" -"There was a problem with reindexing process.","Houve um problema com o processo de reindexação." -"There was a problem with saving process.","Houve um problema no processo de salvar." -"Total of %d index(es) have changed index mode.","Total de %d índice(es) mudaram o modo de índice." -"Total of %d index(es) have reindexed data.","Total de %d índice(es) reindexou dados." -"Update Required","Atualização necessária" -"Update on Save","Atualização em Salvar" -"Updated At","Atualizado Em" -"Yes","Sim" diff --git a/app/locale/pt_BR/Mage_Install.csv b/app/locale/pt_BR/Mage_Install.csv deleted file mode 100644 index 211ddee72..000000000 --- a/app/locale/pt_BR/Mage_Install.csv +++ /dev/null @@ -1,125 +0,0 @@ -"(Make sure you keep it in a safe place.)","(Certifique-se de o manter em um local seguro.)" -"(Optional. Leave blank for no prefix)","(Opcional. Deixe em branco para nenhum prefixo)" -"(ver. %s)","(ver. %s)" -"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","Caminho adicional acrescentado depois do URL Base para acessar o seu Painel Administrativo (por exemplo: admin, backend, controle, etc.)" -"Admin Path","Caminho Administrativo" -"After successfull installation please click the button below.","Após a instalação com sucesso por favor clique no botão abaixo." -"All packages were installed, click 'OK' to continue with installation.","Todos os pacotes foram instalados, clique em 'OK' para continuar a instalação." -"Alternatively you could try the 'Manual Downloads and Upgrades' method.","Alternativamente você poderia tentar o método""'Baixar e Atualizar Manualmente""." -"Base URL","URL Base" -"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Antes de continuar para sua loja, por favor, anote sua chave criptografada (Magento a utiliza para criptografar senhas, cartões de crédito e mais)." -"Check out our","Confira nosso" -"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","Marque esta caixa apenas se não é possível validar automaticamente o URL Seguro, por exemplo se a autenticação HTTP é necessária." -"Check this box only if it is not possible to automatically validate the Base URL.","Marque esta caixa apenas se não é possível validar automaticamente o URL Base." -"Choose this if you would like to test frontend and backend functionality.","Escolha esta opção se você gostaria de testar as funcionalidades frontend e backend." -"Configuration","Configuração" -"Confirm Password","Confirmar a senha" -"Connection","Conexão" -"Continue","Continue" -"Continue After Manual Download","Continue Depois de Baixar Manualmente" -"Continue Full Download / SVN Installation","Continue a Baixar Tudo/Instalação SVN" -"Create Admin Account","Crie uma Conta de Administrador" -"Currently this is the most stable state available for Magento packages.","Atualmente esse é o estado mais estável disponível para pacotes Magento." -"Database","Base de Dados" -"Database Connection","Conexão de Base de Dados" -"Database Name","Nome da Base de Dados" -"Database Name cannot be empty.","O nome do banco de dados não pode estar vazio." -"Database Type","Tipo de Banco de Dados" -"Database connection error.","Erro de conexão de banco de dados." -"Database host","Servidor de banco de dados" -"Database server does not support the InnoDB storage engine.","O servidor do banco de dados não suporta o mecanismo de armazenamento InnoDB." -"Database user name","Nome de usuário do banco de dados" -"Database user password","Senha de usuário do banco de dados" -"Default Currency","Moeda Padrão" -"Download","Baixar" -"Download Magento Core Modules and Updates","Download de atualizações e módulos centrais do Magento" -"Downloading and installing Magento, please wait...","Baixando e instalando o Magento, por favor, espere..." -"Email","E-mail" -"Email Address","Endereço de e-mail" -"Enable Charts","Habilitar Gráficos" -"Enable this option if you want the charts to be displayed on Dashboard.","Habilite esta opção se desejar que os gráficos sejam exibidos no painel de controle." -"Enable this option only if you have SSL available.","Habilite esta opção se tiver SSL disponível." -"Encryption Key","Chave criptografada." -"File System","Arquivo de Sistema" -"First Name","Primeiro nome" -"Full Download / SVN Installation","Download Completo / Instalação do SVN" -"Get ready to experience Open-Source eCommerce Evolved.","Prepare-se para experimentar o Open-Source eCommerce Evolved." -"Go to Backend","Ir para o Backend" -"Go to Frontend","Ir para o Frontend" -"Having trouble installing Magento?","Tendo problemas na instalação do Magento?" -"Help Us to Keep Magento Healthy","Ajude-nos a manter o Magento Saudável" -"Host","Anfitrião" -"I agree to the above terms and conditions.","Eu concordo com os termos e condições acima." -"If you are a developer and would like to have the latest public updates, choose this option.","Se você é um desenvolvedor e gostaria de ter as últimas atualizações públicas, escolha esta opção." -"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","Se você estiver executando o PHP como CGI, seus processos PHP podem ser executados sob o mesmo usuário como o usuário que você usou ao fazer o carregamento de arquivos Magento." -"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","Se você estiver executando o assistente de instalação sobre uma instalação anteriormente baixada e instalada de Magento, prossiga com este método." -"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","Se você não quiser ou não for capaz de ter pastas Magento graváveis para o processo web, você poderia usar PEAR executável localizado na raiz da instalação do Magento." -"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","Se você tiver baixado o pacote completo ou instalado Magento através de SVN, você deve pular pacotes de instalação e validação clicando no botão abaixo." -"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","Se você deseja gerenciar pacotes Magento através da interface de administração web, você precisará ter permissões web graváveis aplicadas a todas as pastas e arquivos Magento." -"If your server is running on MS Windows, most probably you will not need to change anything.","Se o servidor estiver correndo em MS Windows, muito provavelmente você não vai precisar mudar nada." -"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","Em outros casos, você vai precisar fazer arquivos Magento graváveis para o usuário em que o processo do servidor web está em execução." -"Installation","Instalação" -"Installation Guide","Guia de Instalação" -"Installer does not exist for %s database type","O Instalador não existe para %s tipos de banco de dados" -"Last Name","Último nome" -"License Agreement","Contrato de Licença" -"Locale","Locale" -"Locale settings","Configurações locais" -"Localization","Localização" -"Login Information","Informações de login" -"Magento","Magento" -"Magento Connect Manager Deployment","Implementação do Gerenciador de Conexão Magento" -"Magento Installation Wizard","Assistente de Instalação Magento" -"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento é uma marca comercial da Magento Inc.© Direitos Autorais©, %s Magento Inc." -"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento usa essa chave para criptografar senhas, cartões de crédito e muito mais. Se este campo é deixado em branco o sistema irá criar para você uma chave criptografada e vai exibi-la na próxima página." -"Manual Downloads and Upgrades","Transferências de Manual e Atualizações" -"No resource for %s DB model.","Nenhum recurso para o modelo %s DB." -"One of PHP Extensions ""%s"" must be loaded.","Uma das Extensões PHP ""%s"" deve ser carregada." -"PHP Extension '%s' loaded","Extensão PHP ""%s"" carregada" -"PHP Extensions ""%s"" must be loaded.","Extensões PHP ""%s"" devem ser carregadas." -"PHP extension ""%s"" must be loaded.","Extensão PHP ""%s'"" deve ser carregada." -"Package Management through the Web","Gerenciamento de Pacotes através da Web" -"Password","Senha" -"Password Confirmation","Confirmação de Senha" -"Path ""%s"" must be writable.","Caminho ""%s"" deve ser gravável." -"Personal Information","Informações pessoais" -"Please correct the user data and try again.","Por favor corrija os dados do usuário e tente novamente." -"Please make sure that mod_rewrite is enabled in Apache configuration.","Por favor, certifique-se que mod_rewrite está ativado na configuração Apache." -"Please note that it is much less stable than beta.","Por favor note que é muito menos estável do que o beta." -"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","Por favor note que apenas os sistemas operativos UNIX, Linux e Mac OS X são suportados atualmente. Para o Windows use a opção ""%s""." -"Please set all required settings before clicking Continue","Por favor defina todas as configurações necessárias antes de clicar em Continue" -"Preferred stability: %s","Estabilidade preferida: %s" -"Proceed With Automatic Download (%s)","Prossiga Com Baixamento Automático (%s)" -"Provide a complete base URL for SSL connection. For example: %s","Forneça um URL base completo para a conexão SSL. Por exemplo: %s" -"Report All Bugs","Reporte Todos os Erros" -"Required Fields","Campos Obrigatórios" -"Response from server isn\'t valid.","Resposta do servidor não é válida." -"Run admin interface with SSL","Execute a interface de administração com SSL" -"Run this in your shell from Magento root folder:","Execute isto em seu sistema operativo a partir da pasta raiz Magento:" -"Save Session Data In","Salve Dados de Sessão Em" -"Save Session Files In","Salve Arquivos de Sessão Em" -"Secure Base URL","URL Base Segura" -"Session Storage Options","Opções de Armazenamento de Sessão" -"Setting preferred state to: %s","Definição de estado preferido para: %s" -"Skip Base URL Validation Before the Next Step","Pular Validação URL Base Antes do Próximo Passo" -"Skip Secure URL validation before next step","Pular Validação URL Segura antes do Próximo Passo" -"Tables Prefix","Prefixo das Tabelas" -"The URL ""%s"" is invalid.","O URL ""%s"" é inválido." -"The URL ""%s"" is not accessible.","O URL ""%s"" não está acessível." -"The database server version doesn\'t match system requirements (required: %s, actual: %s).","A versão do servidor do banco de dados não combina com os requisitos de sistema (requerido: %s, atual: %s)." -"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","O prefixo da tabela deve conter somente letras (a-z), números (0-9) ou sublinhados (_), o primeiro caractere deve ser uma letra." -"There was a problem installing Magento packages. Please read the log, correct errors and try again.","Houve um problema ao instalar pacotes Magento. Por favor leia o registro, corrija erros e tente novamente." -"Time Zone","Fuso Horário" -"Use Secure URLs (SSL)","Use URLs (SSL) Seguros" -"Use Web Server (Apache) Rewrites","Use Servidor Web (Apache) Reescrito" -"User Name","Nome do Usuário" -"User Password","Senha do Usuário" -"Username","Nome do usuário" -"Validation","Validação" -"Web access options","Opções de acesso web" -"Welcome","Bem Vindo" -"Welcome to Magento's Installation Wizard","Bem-vindo ao Assistente de Instalação do Magento" -"You can specify server port, ex.: localhost:3307
    If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","Você pode especificar a porta do servidor, ex.: localhost:3307
    Se você não estiver usando o socket UNIX predefinido, você pode especificá-lo aqui em vez do host, ex.: /var/run/mysqld/mysqld.sock" -"You could enable this option to use web server rewrites functionality for improved search engines optimization.","Você pode ativar esta opção para usar a funcionalidade servidor web reescrita para melhor otimização dos motores de busca." -"You're All Set","Você Está Pronto" -"You're All Set!","Você Está Pronto!" diff --git a/app/locale/pt_BR/Mage_Log.csv b/app/locale/pt_BR/Mage_Log.csv deleted file mode 100644 index 88577062f..000000000 --- a/app/locale/pt_BR/Mage_Log.csv +++ /dev/null @@ -1,9 +0,0 @@ -"Enable Log Cleaning","Ativar Limpeza de Registro" -"Error Email Recipient","Erro de Destinatário de Email" -"Error Email Sender","Erro de Remetente de Email" -"Error Email Template","Erro de Template de Email" -"Frequency","Freqüência" -"Log Cleaning","Limpeza de Registro" -"Log cleanup Warnings","Avisos de Limpeza de Registro" -"Save Log, Days","Salvar Registro, Dias" -"Start Time","Tempo de Início" diff --git a/app/locale/pt_BR/Mage_Media.csv b/app/locale/pt_BR/Mage_Media.csv deleted file mode 100644 index d70e96c3a..000000000 --- a/app/locale/pt_BR/Mage_Media.csv +++ /dev/null @@ -1,3 +0,0 @@ -"An error occurred while creating the image.","Ocorreu um erro durante a criação da imagem." -"The image does not exist or is invalid.","A imagem não existe ou não é válida." -"This content requires last version of Adobe Flash Player. Get Flash","Este conteúdo requer a última versão do Adobe Flash Player. Obter Flash" diff --git a/app/locale/pt_BR/Mage_Newsletter.csv b/app/locale/pt_BR/Mage_Newsletter.csv deleted file mode 100644 index 804f1b66d..000000000 --- a/app/locale/pt_BR/Mage_Newsletter.csv +++ /dev/null @@ -1,137 +0,0 @@ -" Copy","Copiar" -"Action","Ação" -"Add New Template","Adicionar novo modelo" -"Add to Queue","Adicionar à Fila" -"Allow Guest Subscription","Permitir assinatura de convidado" -"An error occurred while saving your subscription.","Um erro ocorreu enquanto sua assinatura era salva." -"Are you sure that you want to delete this template?","Tem certeza de que deseja apagar este modelo?" -"Are you sure that you want to strip all tags?","Tem certeza de que deseja remover todas as tags?" -"Back","Voltar" -"Cancel","Cancelar" -"Cancelled","Cancelado" -"Cannot mark as received subscriber.","Não é possível marcar como assinante recebido." -"Confirmation Email Sender","Remetente do e-mail de confirmação" -"Confirmation Email Template","Modelo de e-mail de confirmação" -"Confirmation request has been sent.","O pedido de confirmação foi enviado." -"Convert to Plain Text","Converter para Texto Simples" -"Create Newsletter Template","Criar modelo de boletim informativo" -"Customer","Cliente" -"Customer First Name","Primeiro Nome do Cliente" -"Customer Last Name","Último Nome do Cliente" -"Customer My Account Newsletter Subscriptions","Assinatura do Boletim Informativo da Conta do Cliente" -"Date Added","Data de Adição" -"Date Updated","Data de Atualização" -"Delete","Excluir" -"Delete Selected Problems","Excluir Problemas Selecionados" -"Delete Template","Apagar Modelo" -"Do you really want to cancel the queue?","Você realmente quer cancelar a fila?" -"Duplicate template code.","Duplicar código de modelos" -"Edit Newsletter","Editar Boletim Informativo" -"Edit Newsletter Template","Editar Modelo do Boletim Informativo" -"Edit Queue","Editar fila" -"Edit Template","Editar modelo" -"Email","E-mail" -"Enter your email address","Digite seu endereço de e-mail" -"Error Code","Erro do código" -"Error Text","Erro do texto" -"Follow this link to unsubscribe {{var subscriber.getUnsubscriptionLink()}}","Siga esse link para cancelar assinatura {{var subscriber.getUnsubscriptionLink()}}" -"Guest","Convidado" -"ID","Identidade" -"Invalid queue selected.","Fila selecionada inválida" -"Invalid subscription ID.","ID de assinatura inválida" -"Invalid subscription confirmation code.","Código de confirmação de assinatura inválido." -"Message","Mensagem" -"Need to Confirm","Necessário confirmar" -"New Newsletter Template","Novo modelo de boletim informativo" -"New Template","Novo Modelo" -"Newsletter","Newsletter" -"Newsletter Message Preview","Visualização de mensagem do Boletim informativo" -"Newsletter Problem Reports","Reportar Problemas do Boletim Informativo." -"Newsletter Queue","Fila do Boletim Informativo" -"Newsletter Section","Seção do Boletim Informativo" -"Newsletter Sign-up:","Assinatura da newsletter:" -"Newsletter Styles","Estilos de Boletim Informativo" -"Newsletter Subscribers","Assinantes do Boletim Informativo" -"Newsletter Subscription","Assinatura do boletim informativo" -"Newsletter Subscription Form Before","Formulário Anterior de Assinatura do Boletim Informativo" -"Newsletter Subscriptions","Assinaturas do Boletim Informativo" -"Newsletter Templates","Modelos de Boletim Informativo" -"Newsletter subscription confirmation","Confirmação da assinatura do boletim informativo" -"Newsletter subscription success","Assinatura do boletim informativo confirmado com sucesso." -"Newsletter unsubscription success","Cancelamento de assinatura do boletim informativo confirmado com sucesso." -"No Templates Found","Nenhum Modelo Encontrado" -"No problems found.","Nenhum problema encontrado." -"No subscribers selected.","Nenhuma assinatura selecionada." -"Not Activated","Não ativado." -"Not Sent","Não Enviado" -"Pause","Parar." -"Paused","Parado." -"Please enter a valid email address.","Entre com um e-mail válido." -"Please enter new template name","Entre com um novo nome de modelo." -"Please refer to exeption.log","Por favor consulte exeption.log" -"Please select subscriber(s)","Selecione assinante(s)" -"Preview","Visualizar" -"Preview Template","Visualização do Modelo" -"Processed","Processado" -"Queue Date Start","Início da fila de dados" -"Queue Finish","Fim da Fila" -"Queue Information","Informações sobre a Fila" -"Queue Newsletter...","Newsletter da Fila..." -"Queue Start","Começo da Fila" -"Queue Subject","Assunto da Fila" -"Recipients","Destinatários" -"Reset","Redefinir" -"Resume","Reiniciar" -"Return HTML Version","Retornar Versão HTML" -"Save As","Salvar Como" -"Save Newsletter","Salvar Newsletter" -"Save Template","Salvar Modelo" -"Save and Resume","Salvar e Reiniciar" -"Selected problem subscribers have been unsubscribed.","Assinantes com problema selecionado tiveram assinatura cancelada." -"Selected problems have been deleted.","Problemas selecionados foram deletados." -"Sender","Remetente" -"Sender Email","E-mail do remetente" -"Sender Name","Nome do remetente" -"Sending","Enviando" -"Sent","Enviado" -"Sign Up for Our Newsletter:","Assinar Nossa Newsletter:" -"Sign up for our newsletter","Assinar nossa newsletter" -"Sorry, but administrator denied subscription for guests. Please register.","Desculpe, mas o administrador negou assinatura para visitantes. Por favor, registre-se." -"Start","Iniciar" -"Status","Status" -"Store","Loja" -"Store View","Visualização da loja" -"Subject","Assunto" -"Submit","Enviar" -"Subscribe","Assinar" -"Subscribed","Assinado" -"Subscriber","Assinante" -"Subscribers","Assinantes" -"Subscribers From","Formulário para assinantes" -"Subscription Options","Opções de assinaturas" -"Success Email Sender","Remetente para email de sucesso" -"Success Email Template","Modelo para email de sucesso" -"Template Content","Conteúdo do Modelo" -"Template Information","Informação do Modelo" -"Template Name","Nome do Modelo" -"Template Styles","Estilos do Modelo" -"Template Subject","Assunto do Modelo" -"Template Type","Tipo de Modelo" -"Thank you for your subscription.","Obrigado por sua assinatura." -"The subscription has been removed.","A assinatura foi removida." -"The subscription has been saved.","A assinatura foi salva." -"There was a problem with the subscription.","Houve um problema com a assinatura." -"There was a problem with the subscription: %s","Houve um problema com a assinatura: %s" -"There was a problem with the un-subscription.","Houve um problema no cancelamento da assinatura." -"This email address is already assigned to another user.","Este endereço de email já está atribuído a outro usuário." -"Type","Tipo" -"Unconfirmed","Não Confirmado" -"Unsubscribe","Desinscrever" -"Unsubscribe Selected","Desinscrever Selecionado" -"Unsubscribed","Desinscrito" -"Unsubscription Email Sender","Desinscrever Email do Remetente" -"Unsubscription Email Template","Desinscrição do Modelo de Email" -"View Newsletter","Ver Newsletter" -"Website","Website" -"You have been unsubscribed.","Sua inscrição foi cancelada." -"Your subscription has been confirmed.","Sua inscrição foi confirmada." diff --git a/app/locale/pt_BR/Mage_Oauth.csv b/app/locale/pt_BR/Mage_Oauth.csv deleted file mode 100644 index bfb8aae9d..000000000 --- a/app/locale/pt_BR/Mage_Oauth.csv +++ /dev/null @@ -1,118 +0,0 @@ -"%name% '%value%' is too long. It must has length %min% symbols.","%name% '%value%' é muito longo. Ele deve ter no máximo %min% caracteres." -"%name% '%value%' is too short. It must has length %min% symbols.","%name% '%value%' é muito curto. Ele deve ter pelo menos %min% caracteres." -"* Required Fields","* Campos obrigatórios" -"%s requests access to your account","%s pede acesso à sua conta" -"Admin","Admin" -"After authorization application will have access to you account.","Após a autorização, o aplicativo terá acesso à sua conta." -"An error occurred on confirm authorize.","Ocorreu um erro ao confirmar a autorização." -"An error occurred on delete action.","Ocorreu um erro ao apagar a ação." -"An error occurred on delete application.","Ocorreu um erro ao apagar o aplicativo." -"An error occurred on reject authorize.","Ocorreu um erro ao rejeitar a autorização." -"An error occurred on saving consumer data.","Ocorreu um erro ao salvar os dados do cliente." -"An error occurred on update revoke status.","Ocorreu um erro ao atualizar o status do cancelamento." -"An error occurred while deleting the consumer.","Ocorreu um erro ao deletar o cliente." -"An error occurred.","Ocorreu um erro." -"An error occurred. Your authorization request is invalid.","Ocorreu um erro. Seu pedido de autorização é inválido." -"App Name","Nome da Aplicação" -"Application ""%s"" has been deleted.","O aplicativo ""%s"" foi apagado." -"Application ""%s"" has been enabled.","O aplicativo ""%s"" foi ativado." -"Application ""%s"" has been revoked.","O aplicativo ""%s"" foi cancelado." -"Application Name","Nome da Aplicação" -"Application not found.","Aplicativo não encontrado." -"Are you sure you want to delete this application?","Tem certeza que quer apagar este aplicativo?" -"Are you sure you want to disable this application?","Tem certeza que quer desativar este aplicativo?" -"Are you sure you want to enable this application?","Tem certeza que quer ativar este aplicativo?" -"Authorization confirmed","Autorização confirmada." -"Authorization confirmed.","Autorização confirmada." -"Authorize","Autorizar" -"Authorize application","Autorizar aplicativo" -"Authorized Tokens","Tokens autorizados" -"Callback URL","URL de retorno" -"Cleanup Probability","Probabilidade de lucro" -"Cleanup Settings","Configurações de lucro" -"Close","Fechar" -"Confirm OAuth token authorization","Confirmar autorização OAuth" -"Confirm token authorization Pop Up for admin","Confirmar pop-up de autorização de token para administrador" -"Confirm token authorization for admin","Confirmar autorização de token para administrador" -"Confirmation Of Authorization","Confirmação de autorização" -"Consumer Information","Informações do cliente" -"Consumer Name","Nome do cliente" -"Consumers","Clientes" -"Created At","Criada Em" -"Customer","Cliente" -"Customer My Account My OAuth Applications","Cliente Minha Conta Meus Aplicativos OAuth" -"Delete","Excluir" -"Disable","Desativar" -"Disabled","Desativado" -"Edit","Editar" -"Edit Consumer","Editar cliente" -"Email","E-mail" -"Email Address","Endereço de e-mail" -"Enable","Ativar" -"Enabled","Ativado" -"Entry with ID #%s not found.","Entrada com ID #%s não encontrada." -"Expiration Period","Período de vencimento" -"Give the verifier code to application administrator","Dê o código verificador ao administrador do aplicativo" -"ID","Identidade" -"Invalid Callback URL","URL de retorno inválida" -"Invalid ID parameter.","Parâmetro de ID inválido." -"Invalid Rejected Callback URL","URL de retorno rejeitada inválida" -"Invalid entry ID.","ID de entrada inválido." -"Invalid revoke status.","Status de cancelamento inválido." -"Key","Senha" -"Log In","Entrar" -"Log in as a customer","Logar como cliente" -"Log in as admin","Logar como administrador" -"Log in as customer","Logar como cliente" -"Log in to use %s","Faça login para usar %s" -"Login","Conectar-se" -"My Applications","Meus aplicativos" -"Name","Nome" -"New Consumer","Novo cliente" -"OAuth","OAuth" -"OAuth Admin My Apps","Administrador OAuth Meus Aplicativos" -"OAuth Authorized Tokens","Tokens autorizados OAuth" -"OAuth Consumers","Clientes OAuth" -"OAuth authorization Pop Up for customer","Pop-up de autorização OAuth para cliente" -"OAuth authorization for admin","Autorização OAuth para administrador" -"OAuth authorization for customer","Autorização OAuth para consumidor" -"OAuth authorization simple for admin","Autorização OAuth simples para administrador" -"Password","Senha" -"Permissions","Permissões" -"Please login to proceed authorization.","Por favor, faça login para seguir com a autorização." -"Please select needed row(s).","Por favor, selecione a(s) fileira(s) necessária(s)." -"Please select revoke status.","Por favor, escolha o status de cancelamento." -"REST - My Apps","REST - Meus aplicativos" -"REST - OAuth Authorized Tokens","Tokens autorizados REST - OAuth" -"REST - OAuth Consumers","Clientes REST - OAuth" -"Reject","Rejeitar" -"Reject OAuth token authorization","Rejeitar autorização de token" -"Reject authorization","Rejeitar autorização" -"Reject token authorization Pop Up for admin","Rejeitar pop-up de autorização de token para administrador" -"Reject token authorization for admin","Rejeitar autorização de token para administrador" -"Rejected Callback URL","Retorno de URL rejeitada" -"Rejection Of Authorization","Rejeição de autorização" -"Revoked","Revogado" -"Role Name","Nome de Função" -"Save","Salvar" -"Save and Continue Edit","Salvar e continuar a editar" -"Secret","Secreto" -"Selected entries enabled.","Entradas selecionadas ativadas." -"Selected entries has been deleted.","As entradas selecionadas foram apagadas." -"Selected entries revoked.","Entradas selecionadas revogadas." -"Status","Status" -"System","Sistema" -"The application access request is rejected.","Pedido de acesso do aplicativo negado." -"The consumer has been deleted.","O cliente foi removido." -"The consumer has been saved.","O cliente foi salvo." -"Token Status Change","Troca no status do Token" -"Token Status Change Email Template","Template de e-mail da mudança de status do token" -"Unable to find a consumer.","Incapaz de encontrar um cliente." -"User ID","Identificação do Usuário" -"User Name","Nome do Usuário" -"User Type","Tipo de usuário" -"Verifier code: %s","Código verificador: %s" -"You have no applications.","Você não tem aplicativos." -"deleted","apagada" -"enabled","ativada" -"revoked","Revogada" diff --git a/app/locale/pt_BR/Mage_Page.csv b/app/locale/pt_BR/Mage_Page.csv deleted file mode 100644 index 2ed746653..000000000 --- a/app/locale/pt_BR/Mage_Page.csv +++ /dev/null @@ -1,81 +0,0 @@ -"%s Item(s)","%s Item(s)" -"%s-%s of %s","%s-%s de %s" -"© 2012 Magento Demo Store. All Rights Reserved.","©Loja Demo Magento. Todos os Direitos Reservados." -"© 2013 Magento Demo Store. All Rights Reserved.","© 2013 Magento Demo Store. Todos os direitos reservados." -"(Shift-)Click or drag to change value","(Shift-)Clique ou arraste para mudar o valor" -"(ver. %s)","(ver. %s)" -"- Click on any of the time parts to increase it","- Clique em qualquer uma das partes da hora para a aumentar" -"- Hold mouse button on any of the above buttons for faster selection.","- Segure o botão do rato sobre qualquer um dos botões acima para selecionar rapidamente." -"- Use the %s buttons to select month","- Use os botões %s para selecionar o mês" -"- Use the %s, %s buttons to select year","- Use os botões %s, %s para selecionar o ano" -"- or Shift-click to decrease it","- Ou clique-Shift para diminuir" -"- or click and drag for faster selection.","- ou clique e arraste para uma seleção mais rápida." -"-- Please Select --","- Por Favor Selecione -" -"1 column","1 coluna" -"2 columns with left bar","2 colunas com barra à esquerda" -"2 columns with right bar","2 colunas com barra à direita" -"3 columns","3 colunas" -"About the calendar","Sobre o calendário" -"Account","Conta" -"All Empty Layout Pages","Todas as Páginas de Layout estão Vazias" -"All One-Column Layout Pages","Todas as Páginas de Layout de Uma Coluna" -"All Pages","Todas as Páginas" -"All Pages (Print Version)","Todas as Páginas (Versão para Impressão)" -"All Three-Column Layout Pages","Todas as Páginas de Layout de Três Colunas" -"All Two-Column Layout Pages (Left Column)","Todas as Páginas de Layout de Duas Colunas (Coluna à Esquerda)" -"All Two-Column Layout Pages (Right Column)","Todas as Páginas de Layout de Duas Colunas (Coluna à Direita)" -"Allow","Permitir" -"Breadcrumbs","Migalhas" -"Click here if nothing has happened","Clique aqui se nada ocorreu" -"Close","Fechar" -"Close Window","Fechar Janela" -"DHTML Date/Time Selector","Seletor de Data/Hora DHTML" -"Date selection:","Seleção de data:" -"Default Description","Descrição padrão" -"Default welcome msg!","Mensagem de boas-vindas padrão!" -"Display %s first","Mostrar primeiro %s" -"Distributed under GNU LGPL. See %s for details.","Distribuído sob a GNU LGPL. Veja %s para detalhes." -"Drag to move","Arraste para mover" -"Empty","Vazio" -"For latest version visit: %s","Para última versão, visitar: %s" -"Free Shipping on orders over 50$","Entrega gratuita em pedidos acima de 50$" -"Go Today","Ir Hoje" -"Help Us to Keep Magento Healthy","Ajude-nos a manter o Magento Saudável" -"Interface Language","Linguagem da Interface" -"Items %s to %s of %s total","Itens %s a %s de um total de %s" -"JavaScript seems to be disabled in your browser.","O JavaScript parece estar desativado no seu navegador." -"Left Column","Coluna da esquerda" -"Left Column First (shows above main column on smaller screens)","Coluna da Esquerda Primeiro (mostra acima da coluna principal em telas menores)" -"Main Content Area","Área de Conteúdo Principal" -"Menu","Menu" -"Navigation Bar","Barra de Navegação" -"Next","Próximo" -"Next month (hold for menu)","Próximo mês (segurar para menu)" -"Next year (hold for menu)","Próximo ano (segurar para menu)" -"Page Bottom","Fim da Página" -"Page Footer","Rodapé da Página" -"Page Header","Cabeçalho da Página" -"Page Top","Topo da Página" -"Page:","Página:" -"Prev. month (hold for menu)","Mês prévio (segure para menu)" -"Prev. year (hold for menu)","Ano anterior (segure para menu)" -"Previous","Anterior" -"Redirecting...","Redirecionando..." -"Report All Bugs","Reporte Todos os Erros" -"Results per page","Resultados por página" -"Right Column","Coluna da direita" -"Search","Buscar" -"Select Store","Selecionar Loja" -"Select Store:","Selecionar Loja:" -"Select date","Selecione data" -"Show","Mostrar" -"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","Esta é uma loja de demonstração. Qualquer ordem ou encomenda colocada nesta loja não será honrada ou completa." -"This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our Privacy Policy page. To accept cookies from this site, please click the Allow button below.","Este site precisa de cookies para oferecer todos seus recursos. Para mais informações sobre quais dados são contidos nos cookies, por favor veja nossa p'agina de Política de Privacidade. Para aceitar cookies deste site, por favor clique no botão Allow (permitir) abaixo." -"Time selection:","Seleção de tempo:" -"Time:","Tempo:" -"View All ","View All" -"Welcome, %s!","Bem-vindo, %s!" -"You must have JavaScript enabled in your browser to utilize the functionality of this website.","Você deve ativar o Javascript no seu navegador para utilizar as funcionalidades deste site." -"Your Language","Seu Idioma" -"Your Language:","Seu Idioma:" -"per page","por página" diff --git a/app/locale/pt_BR/Mage_PageCache.csv b/app/locale/pt_BR/Mage_PageCache.csv deleted file mode 100644 index 53de767be..000000000 --- a/app/locale/pt_BR/Mage_PageCache.csv +++ /dev/null @@ -1,12 +0,0 @@ -"An error occurred while clearing the external full page cache.","Ocorreu um erro ao limpar o cache da página completa externa." -"Cookie Lifetime (seconds)","Tempo de vida do Cookie (segundos)" -"Enable External Cache","Permitir Cache Externo" -"External Cache Control","Controle de Cache Externo" -"External Full Page Cache Settings","Configurações do Cache Externo da Página Completa" -"External Page Cache","Cache de Página Externa" -"External full page cache.","Cache externo da página completa." -"Failed to load external cache control","Falha no carregamento de controle de cache externo" -"Flush External Page Cache","Libere Cache Externo de Página Completa." -"If empty, default value will be used.","Se vazio, será usado valor padrão." -"The external full page cache has been cleaned.","O cache externo da página completa foi limpo." -"Zend Full Page Cache","Cache Página Completa Zend" diff --git a/app/locale/pt_BR/Mage_Paygate.csv b/app/locale/pt_BR/Mage_Paygate.csv deleted file mode 100644 index 3cc0fff69..000000000 --- a/app/locale/pt_BR/Mage_Paygate.csv +++ /dev/null @@ -1,67 +0,0 @@ -"3D Secure","3D Secure" -"3D Secure Card Validation","Validação de Cartão 3D Secure" -"API Login ID","ID de Login API" -"Accepted Currency","Moeda Aceita" -"Allow Partial Authorization","Permitir Autorização Parcial" -"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","Tem certeza de que deseja cancelar o seu pagamento? Clique em OK para cancelar o seu pagamento e liberar o montante em espera. Clique em Cancelar para inserir outro cartão de crédito e continuar com o seu pagamento." -"Authorize Only","Somente Autorizar" -"Authorize and Capture","Autorizar e Controlar" -"Authorize.Net Transaction ID %s","ID Transação Authorize.Net %s" -"Authorize.net","Authorize.net" -"Cancel","Cancelar" -"Centinel API URL","URL Centinel API" -"Credit Card Types","Tipos de Cartão de Crédito" -"Credit Card Verification","Verificação de Cartão de Crédito" -"Credit Card: xxxx-%s","Cartão de crédito: xxxx-%s" -"Debug","Debug" -"Email Customer","Enviar Email ao Cliente" -"Enabled","Ativado" -"Error in payment gateway.","Erro no portal de pagamento." -"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","Ações de portal são bloqueadas porque o portal não consegue completar uma ou mais das transações. Por favor entre na sua conta Authorize.Net manualmente para resolver o(s) problema(s)." -"Gateway error: %s","Erro do portal: %s" -"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Se vazio, um valor definido será usado. URL personalizado pode ser fornecido por acordo CardinalCommerce." -"Invalid amount for authorization.","Valor inválido para autorização." -"Invalid amount for capture.","Valor inválido para captura." -"Invalid amount for partial authorization.","Valor inválido para autorização parcial." -"Invalid amount for refund.","Valor inválido para reembolso." -"Invalid split tenderId ID.","ID tenderId de divisão inválida." -"Invalid transaction ID.","ID de transação inválido." -"Maximum Order Total","Total Máximo do Pedido" -"Merchant's Email","Email do Vendedor" -"Minimum Order Total","Total Mínimo do Pedido" -"New Order Status","Status do Novo Pedido" -"Parent Authorize.Net transaction (ID %s) expired","Transação parentr Authorize.Net (ID %s) expirada" -"Payment Action","Ação de Pagamento" -"Payment authorization error.","Erro na autorização de pagamento." -"Payment canceling error.","Erro de cancelamento de pagamento." -"Payment capturing error.","Erro de captura de pagamento." -"Payment from Applicable Countries","Pagamento de Países Aplicáveis" -"Payment from Specific Countries","Pagamento de Países Específicos" -"Payment partial authorization error.","Erro de autorização de pagamento parcial." -"Payment refunding error.","Erro de reembolso de pagamento." -"Payment updating error.","Erro de atualização de pagamento." -"Payment voiding error.","Erro de anulamento de pagamento." -"Processed Amount","Valor Processado" -"Remaining Balance","Balanço Restante" -"Severe 3D Secure Card Validation","Validação de Cartão Severe 3D Secure" -"Severe Validation Removes Chargeback Liability on Merchant","Validação Severe Remove a Responsabilidade de Cobrança Retroativa no Comerciante" -"Shopping cart contents and/or address has been changed.","Conteúdo do carrinho de compras e/ou endereço foi alterado." -"Sort Order","Classificar pedido" -"Test Mode","Modo de Teste" -"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","O valor no seu cartão de crédito é insuficiente para concluir a compra. O montante disponível foi colocado em espera. Para concluir a sua compra, clique em OK e especifique o número do cartão de crédito adicional. Para cancelar a compra e liberar o montante em espera, clique em Cancelar." -"There was an error canceling transactions. Please contact us or try again later.","Ocorreu um erro ao cancelar as transações. Por favor entre em contato conosco ou tente novamente mais tarde." -"Title","Título" -"Transaction Key","Chave de Transação" -"You have reached the maximum number of credit card allowed to be used for the payment.","Você atingiu o número máximo de cartão de crédito autorizado a ser utilizado para o pagamento." -"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","Você atingiu o número máximo de cartões de crédito que pode ser usado para um único pagamento. Os montantes disponíveis em todos os cartões utilizados foram insuficientes para completar o pagamento. O pagamento foi cancelado e os valores em espera foram liberados." -"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","Seu cartão de crédito foi recusado. Clique em OK para especificar outro cartão de crédito para concluir a compra. Clique em Cancelar para liberar a quantia em espera e selecione outro método de pagamento." -"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","Seu pedido não tenha sido colocado, porque o conteúdo do carrinho de compras e/ou endereço foi alterado. Montantes autorizados a partir do seu pagamento anterior que ficaram pendentes são agora liberados. Por favor siga através do processo de compra para o seu conteúdo recente do carrinho." -"Your payment has been cancelled. All authorized amounts have been released.","O seu pagamento foi cancelado. Todos os valores autorizados foram liberados." -"amount %s","valor %s" -"authorize","autorizar" -"authorize and capture","autorizar e capturar" -"capture","capturar" -"failed","fracassado" -"refund","reembolso" -"successful","bem sucedido" -"void","vazio" diff --git a/app/locale/pt_BR/Mage_Payment.csv b/app/locale/pt_BR/Mage_Payment.csv deleted file mode 100644 index c42e57af8..000000000 --- a/app/locale/pt_BR/Mage_Payment.csv +++ /dev/null @@ -1,142 +0,0 @@ -"%s %s cycle.","Ciclo %s %s." -"* Required Fields","* Campos Obrigatórios" -"--Please Select--","--Por Favor, Escolha--" -"3D Secure Card Validation","Validação de Cartão 3D Secure" -"3D Secure Credit Card Validation","Validação de Cartão de Crédito 3D Secure" -" %s"," %s" -"A value is required for live mode. Refer to your CardinalCommerce agreement.","Um valor é necessário para o modo ao vivo. Consulte o seu contrato CardinalCommerce." -"Allow Initial Fee Failure","Permitir Falha de Taxa Inicial" -"An internal reference ID is required to save the payment profile.","Um ID interno de referência é necessário para salvar o perfil de pagamento." -"Authorize action is not available.","Ação de autorização não está disponível." -"Auto Bill on Next Cycle","Faturar Automaticamente no Próximo Ciclo" -"Automatically Invoice All Items","Faturar Automaticamente Todos os Itens" -"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","Faturar automaticamente o valor do balanço em destaque no próximo ciclo de faturamento (se houve falha de pagamentos)." -"Bank Transfer Payment","Pagamento por Transferência Bancária" -"Billing Agreement status is not set.","Acordo de estado de Faturamento não está definido." -"Billing Amount","Valor de Faturamento" -"Billing Frequency","Frequência de Faturamento" -"Billing Period","Período de Faturamento" -"Billing Period Unit","Unidade de Período de Faturamento" -"Billing period unit is not defined or wrong.","Unidade de período de faturamento não está definida ou errada." -"Cannot retrieve the payment info model object.","Não é possível recuperar a informação objeto modelo do pagamento." -"Cannot retrieve the payment information object instance.","Não foi possível recuperar instância de objeto de informações de pagamento." -"Cannot retrieve the payment method code.","Não foi possível recuperar o código de forma de pagamento." -"Cannot retrieve the payment method model object.","Não é possível recuperar o método objeto modelo do pagamento." -"Capture action is not available.","Ação de captura não está disponível." -"Card Verification Number","Número de Verificação do Cartão" -"Cash On Delivery Payment","Pagamento em Dinheiro na Entrega" -"Centinel API URL","URL Centinel API" -"Check / Money Order","Cheque/Ordem de Pagamento" -"Credit Card Number","Número do Cartão de Crédito" -"Credit Card Number: xxxx-%s","Número do Cartão de Crédito: xxxx-%s" -"Credit Card Type","Tipo de Cartão de Crédito" -"Credit Card Type: %s","Tipo de Cartão de Crédito: %s" -"Credit Card Types","Tipos de Cartão de Crédito" -"Credit card number mismatch with credit card type.","O número de cartão de crédito não corresponde ao tipo de cartão de crédito." -"Credit card type is not allowed for this payment method.","O tipo de cartão de crédito não é permitido para esta forma de pagamento." -"Currency","Moeda" -"Currency code is undefined.","Código de moeda indefinido" -"Customer ID is not set.","A ID do cliente não está definida" -"Day","Dia" -"Debug Mode","Modo de Depuração" -"Enabled","Ativado" -"Expiration Date","Data de Validade" -"Expiration Date: %s/%s","Data de expiração: %s/%s" -"Full name of the person receiving the product or service paid for by the recurring payment.","Nome completo da pessoa que recebe o produto ou serviço pago pelo pagamento recorrente." -"Incorrect credit card expiration date.","Data de validade do cartão de crédito incorreta." -"Initial Fee","Taxa inicial" -"Initial non-recurring payment amount due immediately upon profile creation.","Valor do pagamento inicial não-recorrentes imediatamente após a criação do perfil." -"Instructions","Instruções" -"Internal Reference ID","Identificação de referência interna" -"Invalid Credit Card Number","Número de cartão de crédito inválido" -"Issue Number","Número de Emissão" -"Make Check Payable to","Faça Cheque Nominal a" -"Make Check payable to:","Faça Cheque nominal a:" -"Make Check payable to: %s","Faça Cheque nominal a: %s" -"Maximum Billing Cycles","Ciclos de faturamento máximo" -"Maximum Order Total","Total Máximo do Pedido" -"Maximum Payment Failures","Falhas de pagamento máximo" -"Maximum Trial Billing Cycles","Ciclos de faturamento de avaliação máximo" -"Merchant ID","Identificação do comerciante" -"Minimum Order Total","Total Mínimo do Pedido" -"Month","Mês" -"N/A","Indisponível" -"Name on Card","Nome no Cartão" -"Name on the Card","Nome no Cartão" -"Name on the Card: %s","Nome no Cartão: %s" -"New Order Status","Status do Novo Pedido" -"Number of billing periods that make up one billing cycle.","Número de períodos de emissão de faturas que formam um ciclo de faturamento." -"Order action is not available.","Ação de pedido não está disponível." -"Overrides API URL that may be specified by a payment method.","Substitui URL da API que pode ser especificada por um método de pagamento." -"Password","Senha" -"Payment ID: %s","Identificação de Pagamento: %s" -"Payment Method","Método de Pagamento" -"Payment Methods","Métodos de Pagamento" -"Payment Methods Section","Seção de Métodos de Pagamento" -"Payment Reference ID","Identificação de Referência para Pagamento" -"Payment Services","Serviços de Pagamento" -"Payment from Applicable Countries","Pagamento de Países Aplicáveis" -"Payment from Specific Countries","Pagamento de Países Específicos" -"Payment method code is not set.","Código de método de pagamento não está configurado." -"Payment method code is undefined.","Código de método de pagamento não está definido." -"Payment profile is invalid:\n%s","Perfil de pagamento inválido: \n%s" -"Period frequency is wrong.","Frequência de período está errada." -"Please enter a valid credit card verification number.","Por favor insira um número de verificação de cartão de crédito válido." -"Processor ID","Identificação do Processador" -"Purchase Order","Ordem de Compra" -"Purchase Order Number","Número de Ordem de Compra" -"Purchase Order Number:","Número de Ordem de Compra:" -"Purchase Order Number: %s","Número do Pedido de Compra: %s" -"Recurring Profile Start Date","Data Inicial de Perfil Recorrente" -"Recurring profile start date has invalid format.","A data inicial de perfil recorrente tem formato inválido." -"Reference ID is not set.","A identificação da referência não está configurada." -"Refund action is not available.","Ação de reembolso não está disponível." -"Repeats %s time(s).","Repete %s vez(es)." -"Repeats until suspended or canceled.","Repete até suspensão ou cancelamento." -"Request Card Security Code","Solicitar Código de Segurança do Cartão" -"Saved CC","CC Salvo" -"Schedule Description","Descrição do Agendamento" -"Schedule description must be not empty.","A descrição de agendamento não pode estar vazia." -"Selected payment type is not allowed for billing country.","O tipo de pagamento selecionado não é permitido para o país de cobrança." -"Send Check to","Enviar Cheque para" -"Send Check to:","Enviar Cheque para:" -"Severe 3D Secure Card Validation","Validação de Cartão Severe 3D Secure" -"Severe validation removes chargeback liability on merchant.","A validação rigorosa isenta o comerciante da responsabilidade de desconto." -"Shipping Amount","Valor do Frete" -"Short description of the recurring payment. By default equals to the product name.","Breve descrição do pagamento recorrente. Por padrão, é igual ao nome do produto." -"Sort Order","Classificar pedido" -"Start Date","Data de início" -"Start date has invalid format.","A data inicial tem formato inválido." -"Start date is undefined.","A data inicial está indefinida." -"Subscriber Name","Nome do Assinante" -"Switch/Solo/Maestro Issue Number","Número de Emissão Switch/Solo/Maestro" -"Switch/Solo/Maestro Only","Somente Swith/Solo/Maestro" -"Switch/Solo/Maestro Start Date","Data Inicial do Switch/Solo/Maestro" -"Tax Amount","Valor do Imposto" -"Test Mode","Modo de Teste" -"The date when billing for the profile begins.","A data em que o faturamento para o perfil começa." -"The number of billing cycles for payment period.","O número de ciclos de faturamento para o período de pagamento." -"The number of scheduled payments that can fail before the profile is automatically suspended.","O número de pagamentos programados que podem falhar antes que o perfil seja automaticamente suspenso." -"The payment review action is unavailable.","A ação de revisão de pagamento não está disponível." -"The requested Payment Method is not available.","O Método de Pagamento solicitado não está disponível." -"Title","Título" -"Trial Billing Amount","Teste de Faturamento de Valor" -"Trial Billing Frequency","Teste de Faturamento de Frequência" -"Trial Billing Period Unit","Teste de Faturamento de Unidade de Período" -"Trial Period","Período Experimental" -"Trial billing amount is wrong.","Teste de faturamento de valor está errado." -"Trial billing period unit is wrong.","Teste de faturamento de unidade de período está errado." -"Trial period frequency is wrong.","Teste de faturamento de frequência está errado." -"Trial period max cycles is wrong.","Ciclo máximo de período experimental está errado." -"Two Weeks","Duas Semanas" -"Unable to save Billing Agreement:","Não foi possível salvar Acordo de Cobrança:" -"Unit for billing during the subscription period.","Unidade de faturamento durante o período de subscrição." -"Unsupported currency code: %s.","Código de moeda não suportada: %s." -"Void action is not available.","Ação de cancelamento não está disponível." -"Week","Semana" -"What is this?","O que é isso?" -"Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.","Quer se suspenda o perfil de pagamento se a taxa inicial falhar ou se adicione ao saldo devedor." -"Wrong %s specified.","%s errado especificado." -"Wrong or empty billing amount specified.","Montante de faturação especificado errado ou vazio." -"Year","Ano" -"Zero Subtotal Checkout","Subtotal Checkout Zero" diff --git a/app/locale/pt_BR/Mage_Paypal.csv b/app/locale/pt_BR/Mage_Paypal.csv deleted file mode 100644 index db8d8ba22..000000000 --- a/app/locale/pt_BR/Mage_Paypal.csv +++ /dev/null @@ -1,623 +0,0 @@ -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -"-OR-","-OU-" -"120 x 240","120 x 240" -"120 x 600","120 x 600" -"120 x 90","120 x 90" -"190 x 100","190 x 100" -"2-pixel perimeter around the header space.","Perímetro de 2 pixeis em torno do espaço do cabeçalho." -"234 x 400","234 x 400" -"234 x 60","234 x 60" -"250 x 250","250 x 250" -"300 x 50","300 x 50" -"3D Secure","3D Secure" -"3D Secure Card Validation","Validação de Cartão 3D Secure" -"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at http://www.paypal.com/amexupdate.","Validação Segura 3D é necessária para cartões Maestro. Suporte de cartões American Express exige um acordo adicional. Saiba mais em http://www.paypal.com/amexupdate." -"468 x 60","468 x 60" -"728 x 90","728 x 90" -"800 x 66","800 x 66" -"Start accepting payments via PayPal!","Comece a aceitar pagamentos via PayPal!" -"A case that has been resolved and close requires a reimbursement.","Um caso que foi resolvido e fechado exige um reembolso." -"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","Uma reversão ocorreu nesta transação por causa de uma disputa com cliente por suspeita de fraude não autorizada." -"A reversal has occurred on this transaction because you have given the customer a refund.","Um estorno ocorreu nesta transação porque você concedeu um reembolso ao cliente." -"A reversal has occurred on this transaction due to a chargeback by your customer.","Um estorno ocorreu nesta transação devido a um estorno do seu cliente." -"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","Um estorno ocorreu nesta transação devido a uma reclamação sobre a transação por parte do seu cliente." -"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","Um estorno ocorreu nesta transação porque seu cliente usou a garantia de devolução do dinheiro." -"A value is required for live mode. Refer to your CardinalCommerce agreement.","Um valor é necessário para o modo ao vivo. Consulte o seu contrato CardinalCommerce." -"ACH Deposit (Hold for Dispute or Other Investigation)","Depósito ACH (Apoio para Disputa ou Outra Investigação)" -"ACH Deposit (Reversal)","Depósito ACH (Reverso)" -"ACH Funding for Funds Recovery from Account Balance","Financiamento ACH para Recuperação de Fundos de Saldo da Conta" -"ACH Withdrawal","Levantamento ACH" -"API Authentication Methods","Métodos de Autenticação API" -"API Certificate","Certificado API" -"API Password","Senha API" -"API Signature","Assinatura API" -"API Username","Nome de usuário API" -"API Uses Proxy","API Usa Proxy" -"Ability for buyer to purchase without PayPal account.","Capacidade para o comprador comprar sem conta PayPal." -"Accept credit card and PayPal payments securely.","Aceita pagamentos por cartão de crédito e por PayPal seguramente." -"Accept credit cards, debit cards and PayPal payments securely.","Aceita pagamentos por cartões de crédito, cartões de débito e por PayPal seguramente." -"Accept payments in your shopping cart. PayPal will process your card payments through the Payflow Gateway.","Aceitam pagamentos em seu carrinho de compras. O PayPal irá processar seus pagamentos por cartão por meio do Payflow Gateway." -"Accept payments with a PCI compliant checkout that keeps customers on your site.","Aceitam pagamentos com checkout de acordo com PCI que mantém clientes em seu site." -"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Aceitam pagamentos com um checkout do padrão PCI que mantém clientes em seu site." -"Accept payments with a completely customizable checkout page.","Aceite pagamentos com uma página de checkout completamente customizável." -"Accept payments with a completely customizable checkout.","Aceite pagamentos com um checkout completamente customizável." -"Acceptance Mark","Marca de Aceitação" -"Acceptance Mark Image","Imagem de Marca de Aceitação" -"Account-to-Account Payment, initiated by PayPal","Pagamento Conta para Conta, iniciado por PayPal" -"Add PayPal as an additional payment method to your checkout page to increase your sales.","Adicione PayPal como um método de pagamento adicional em sua página de checkout para aumentar suas vendas." -"Add PayPal as an additional payment method to your checkout page.","Adicione PayPal como um método de pagamento adicional em sua página de checkout." -"Add another payment method to your existing solution or as a stand-alone option.","Adicionar outro método de pagamento à sua solução existente ou como uma opção independente." -"Additional Options","Opções Adicionais" -"Address","Endereço" -"Address Verification System Response","Resposta de Sistema de Verificação de Endereço" -"Advanced Settings","Configurações Avançadas" -"Advertise Bill Me Later","Divulgar Bill Me Later" -"All the address information matched","Todas as informações do endereço correspondem" -"Allow in Billing Agreement Wizard","Permitir no Assistente de Acordo de Faturamento" -"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Valores permitidos: ""paypal"", ""primário"" (padrão), your_custom_value (um estilo de página de pagamento personalizada do seu perfil conta de comerciante)." -"Allowed Credit Card Types","Tipos de Cartão de Crédito Permitido" -"Also affects mini-shopping cart.","Também afeta o mini carrinho de compras." -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","Você tem certeza de que deseja sair desta página? Você precisará passar pelos passos de finalização da compra novamente." -"Ask Customer","Pergunte ao cliente" -"Attempted Authentication, Bad Result","Autenticação Tentada, Mau Resultado" -"Attempted Authentication, Good Result","Autenticação Tentada, Bom Resultado" -"Auction Payment other than through eBay","Pagamento de Leilão que não seja através de eBay" -"Authenticated, Bad Result","Autenticado, Mau Resultado" -"Authenticated, Good Result","Autenticado, Bom Resultado" -"Authorization","Autorização" -"Authorization Honor Period (days)","Período de Honra da Autorização (dias)" -"Authorization expired.","Autorização expirou." -"Authorization transaction is required to void.","Autorização da transação é necessária para anular." -"Authorization was voided by merchant.","Autorização foi anulada pelo comerciante." -"Authorized amount of %s.","Valor autorizado de %s." -"Authorizing amount of %s is pending approval on gateway.","Autorização de valor %s está pendente de aprovação no portal." -"Auto","Auto" -"AutoSweep","AutoVarredura" -"Available Balance","Saldo Disponível" -"Balance Manager Account Bonus","Conta de Gerente Bônus de Balanço" -"Basic Settings - PayPal Express Checkout","Configurações Básicas - Checkout Expresso com PayPal" -"Basic Settings - PayPal Integral Evolution","Configurações Básicas - Evolução Integral do PayPal" -"Basic Settings - PayPal Pasarela integral","Configurações Básicas - Pasarela integral por PayPal" -"Basic Settings - PayPal Payflow Link","Configurações Básicas - Link para Payflow do Paypal" -"Basic Settings - PayPal Payflow Pro","Configurações Básicas - Payflow Pro do Paypal" -"Basic Settings - PayPal Payments Advanced","Configurações Básicas - Pagamentos por PayPal Avançado" -"Basic Settings - PayPal Payments Pro","Configurações Básicas - Pagamentos por PayPal Pro" -"Basic Settings - PayPal Payments Pro Hosted Solution","Configurações Básicas - Solução Hospedada Pagamentos por PayPal Pro" -"Basic Settings - PayPal Payments Standard","Configurações Básicas - Pagamentos por PayPal Padrão" -"Basic Settings - PayPal Pro","Configurações Básicas - PayPal Pro" -"Basic Settings - PayPal Website Payments Plus","Configurações Básicas - Pagamentos por Site PayPal Plus" -"Basic Settings - PayPal Website Payments Pro","Configurações Básicas - Pagamentos por Site PayPal Plus" -"Basic Settings - PayPal Website Payments Pro Hosted Solution","Configurações Básicas - Solução Hospedada Pagamentos por Site PayPal Pro" -"Basic Settings - PayPal Website Payments Pro Payflow Edition","Configurações Básicas - Pagamentos por Site PayPal Pro Edição Payflow" -"Basic Settings - PayPal Website Payments Standard","Configurações Básicas - Pagamentos por Site PayPal Padrão" -"Billing Address","Endereço de faturamento" -"Billing Agreement Signup","Aceitação do Contrato de Faturamento" -"Billing Information","Informações de Cobrança" -"Bonus for first ACH Use","Bônus pelo primeiro uso do ACH" -"Both section above must be complete. ","Ambas as seções acima devem estar completas." -"Buyer Credit Payment","Pagamento de Crédito do Comprador" -"Buyer claims that a possible duplicate payment was made to the merchant.","Compradores alegam que um possível pagamento duplicado foi feito para o comerciante." -"Buyer claims that he did not receive goods or service.","Comprador alega que não recebeu as mercadorias ou serviço." -"Buyer claims that he/she did not authorize transaction.","O comprador alega que ele/ela não autorizou a transação." -"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","O comprador alega que as mercadorias ou serviço recebido diferem da descrição do comerciante das mercadorias ou serviço." -"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","O comprador alega que a mercadoria recebida é insatisfatória, tem defeito ou está danificada." -"Buyer\'s Tax ID","CPF do Comprador" -"Buyer\'s Tax ID Type","Tipo de CPF/CNPJ do Comprador" -"By default it is ""reports.paypal.com"".","Por padrão, é ""reports.paypal.com""." -"CNPJ","CNPJ (Cadastro Nacional de Pessoas Jurídicas)" -"CPF","CPF (Cadastro de Contribuintes Pessoas Físicas)" -"CVV Entry is Editable","A entrada CVV é editável" -"CVV2 Check Result by PayPal","CVV2: Verificar Resultado pelo PayPal" -"Can not send new order email.","Não pode enviar e-mail com novo pedido." -"Cannot create target file for reading reports.","Não pode criar arquivo-alvo para relatórios de leitura." -"Catalog Category Page","Página de Categoria do Catálogo" -"Catalog Product Page","Página de Produto do Catálogo" -"Centinel API URL","URL Centinel API" -"Centinel Custom API URL","URL para API Personalizado da Centinel" -"Charge-off","Baixa contábil" -"Chargeback","Estorno" -"Checkout Cart Page","Página de Finalização do Carrinho" -"Checkout with PayPal","Fechar Pedido com o PayPal" -"Checkout with PayPal Bill Me Later","Finalização da Compra com o Bill Me Later do PayPal" -"Choose a secure bundled payment solution for your business.","Escolha um pacote de solução de pagamento seguro para sua empresa." -"City","Cidade" -"Click here if you are not redirected within 10 seconds...","Clique aqui se você não for redirecionado dentro de 10 segundos..." -"Close","Fechar" -"Company","Companhia" -"Complaint","Reclamação" -"Completion Date","Data da Conclusão" -"Configure","Configurar" -"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Conecte seu comércio com um portal do padrão PCI que permite que os consumidores paguem sem sair do seu site." -"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Conecte seu comércio com um portal totalmente customizável que permite que os consumidores paguem sem sair do seu site." -"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Conectando-se ao servidor SFTP do PayPal em busca de novos relatórios. Tem certeza de que deseja prosseguir?" -"Continue","Continue" -"Countries Payment Applicable From","Pagamento a Países Aplicável Desde" -"Country","País" -"Coupon Redemption","Resgate de Cupom" -"Credit","Crédito" -"Credit Card Settings","Configurações do Cartão de Crédito" -"Currency Conversion required to cover negative balance","Necessária a Conversão de Moeda para cobrir saldo negativo" -"Custom","Personalizado" -"Custom Endpoint Hostname or IP-Address","Nome de Terminal Servidor ou Endereço IP Personalizados" -"Custom Path","Caminho Personalizado" -"Customer Information","Dados do Cliente" -"Customer did not include a confirmed address.","O cliente não incluiu um endereço confirmado." -"Customer failed to pay.","Cliente não conseguiu pagar." -"Customer used non-confirmed address.","O cliente usou um endereço não confirmado." -"Daily","Diário" -"Debit","Débito" -"Debit Card Cash Back","Desconto em Uso de Cartão de Débito" -"Debit Card Transaction","Transação em Cartão de Débito" -"Debit or Credit","Débito ou Crédito" -"Debug Mode","Modo de Depuração" -"Direct Payment API","API de Pagamento Direto" -"Discount","Desconto" -"Display","Visualizar" -"Display Express Checkout in the Payment Information step","Exibe Checkout Expresso na etapa Informações de Pagamento" -"Displays on catalog pages and homepage.","Exibições em páginas de catálogo e na página inicial." -"Dispute","Disputa" -"Don't have a PayPal account? Simply enter your email address.","Não tem uma conta no PayPal? Basta digitar seu endereço de e-mail." -"Dynamic","Dinâmico" -"EFT Funding (German banking)","Financiamento com transação eletrônica (banco alemão)" -"Edit","Editar" -"Edit Payment Information","Editar Informações de Pagamento" -"Edit Shopping Cart","Editar Carrinho de Compras" -"Email Address","Endereço de e-mail" -"Email Associated with PayPal Merchant Account","E-mail Associado à Conta de Comerciante no PayPal" -"Email Associated with PayPal Merchant Account (Optional)","E-mail associado com a conta da loja no PayPal (opcional)" -"Enable Automatic Fetching","Habilitar Execução Automática" -"Enable Bill Me Later","Habilitar Bill Me Later" -"Enable Express Checkout","Permita Checkout Expresso" -"Enable PayPal Guest Checkout","Habilitar Conclusão de Pagamento pelo PayPal Sem Conta" -"Enable Payflow Link","Permita Link para Payflow" -"Enable SSL verification","Permita Verificação SSL" -"Enable this Solution","Ativar esta solução" -"Enabled","Ativado" -"Event","Evento" -"Event Code","Código de Evento" -"Every 10 days","A cada 10 dias" -"Every 14 days","A cada 14 dias" -"Every 3 days","A cada 3 dias" -"Every 30 days","A cada 30 dias" -"Every 40 days","A cada 40 dias" -"Every 7 days","A cada 7 dias" -"Exact Match. Address and Postal Code. International","Correspondência exata. Endereço e CEP. Internacional" -"Exact Match. Address and Postal Code. UK-specific","Correspondência exata. Endereço e CEP. Específicas do Reino Unido" -"Exact Match. Address and nine-digit ZIP code","Correspondência exata. Endereço e código postal CEP de nove dígitos" -"Explanation: %s.","Explicação: %s." -"Express Checkout","Caixa Expresso" -"Express Checkout APIs","APIs Caixa Expresso" -"Express Checkout and Order have been canceled.","Caixa Expresso e Ordem foram canceladas." -"Express Checkout has been canceled.","Caixa Expresso foi cancelada." -"Failed to fetch reports from '%s@%s'.","Falha ao buscar relatórios de ""%s@%s""." -"Fax","Fax" -"Fee Amount","Valor da Taxa" -"Fee Debit or Credit","Taxa de Débito ou de Crédito" -"Fee Reversal","Reversão de Taxa" -"Fee: Foreign ACH Withdrawal","Taxa: Retirada ACH Exterior" -"Fee: Mass Pay Request","Taxa: Pedido de Pagamento em Massa" -"Fee: Web Site Payments Pro Account Monthly","Taxa: Conta Pro de Pagamentos de Web Site Mensal" -"Fee: WorldLink Check Withdrawal","Taxa: Levantamento Verificado WorldLink" -"Fetch","Buscar" -"Fetch Updates","Buscar Atualizações" -"Fetched %s report rows from '%s@%s'.","%s Linhas de relatório buscadas de '%s@%s'." -"For Virtual Quotes Only","Somente para Orçamentos Virtuais" -"Frontend Experience Settings","Configurações de Experiência Frontend" -"Funding","Financiamento" -"General (Authorization)","Geral (Autorização)" -"General (Dividend)","Geral (Dividendo)" -"General (Funds Transfer from PayPal Account to Another)","Geral (Transferência de Fundos da Conta PayPal para Outra)" -"General (Purchase with a credit card)","Geral (Compra com Cartão de Crédito)" -"General Adjustment without businessrelated event","Ajuste Geral sem evento de negócios relacionado" -"General Currency Conversion","Conversão de Moeda em Geral" -"General Funding of PayPal Account ","Financiamento Geral de Conta PayPal" -"General Redemption","Redenção Geral" -"General Withdrawal from PayPal Account","Levantamento Geral a partir da Conta PayPal" -"General. Product no longer supported","Geral. Produto não é mais suportado" -"General: Use of PayPal account for purchasing as well as receiving payments","Geral: Uso de conta PayPal para a compra bem como para receber pagamentos" -"General: Withdrawal from PayPal Account","Geral: Levantamento a partir da Conta PayPal" -"General: Withdrawal to Non-Bank Entity","Geral: Levantamento de Entidade Não-Bancária" -"General: adjustment of a type not belonging to the other T12xx categories","Geral: ajuste de um tipo que não pertence às outras categorias T12xx" -"General: bonus of a type not belonging to the other T08xx categories","Geral: bônus de um tipo que não pertence às outras categorias T08xx" -"General: event not yet categorized","Geral: evento ainda não classificado" -"General: non-payment fee of a type not belonging to the other T01xx categories","Geral: taxa de não-pagamento de um tipo que não pertence às outras categorias T01xx" -"General: received payment of a type not belonging to the other T00xx categories","Geral: pagamento recebido de um tipo que não pertence às outras categorias T00xx" -"General: reversal of a type not belonging to the other T11xx categories","Geral: reversão de um tipo que não pertence às outras categorias T11xx" -"General: temporary hold of a type not belonging to the other T15xx categories","Geral: retenção temporária de um tipo que não pertence às outras categorias T15xx" -"Get Credentials from PayPal","Obter Credenciais do PayPal" -"Get Publisher ID from PayPal","Obter do PayPal o ID do Editor" -"Gift Certificate Payment: purchase of Gift Certificate","Pagamento de Vale Oferta: compra de Vale Oferta" -"Gift Certificate Redemption","Redenção de Vale Oferta" -"Gross Amount","Valor Bruto" -"Header (center)","Cabeçalho (centro)" -"Header Background Color","Cor de Fundo do Cabeçalho" -"Header Border Color","Cor da Margem do Cabeçalho" -"Header Image URL","URL da Imagem de Cabeçalho" -"Help","Ajuda" -"Hidden Virtual PayPal Debit Card Transaction","Transação Virtual Escondida com Cartão de Débito PayPal" -"Hold for Dispute Investigation","Espere por Investigação de Disputa" -"Home Page","Página Inicial" -"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","Desculpe-nos – mas não conseguimos completar a sua transação. Por favor, entre em contato conosco para que possamos ajudá-lo." -"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","Desculpe-nos – mas não conseguimos processar o seu pagamento. Por favor, tente outra forma de pagamento ou entre em contato conosco para que possamos ajudá-lo." -"IPN ""%s"".","IPN ""%s""." -"IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""","IPN ""%s"". %s Total da transação %s. Id da transação: ""%s""" -"IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s.","IPN ""%s"". Uma disputa foi resolvida e fechada. %s Total da transação %s." -"IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s","IPN ""%s"". Tipo de caso ""%s"". Id do caso ""%s"" %s" -"IPN verification ""%s"".","Verificação de IPN ""%s""." -"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","Se vazio, um valor definido será usado. URL personalizado pode ser fornecido por acordo CardinalCommerce." -"If not specified, Default Country from General Config will be used","Se não especificado, País Predefinido da Configuração Geral será usado" -"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","Se esta opção estiver ativada, o cliente pode mudar o endereço de entrega e a forma de envio no site PayPal. No modo ao vivo funciona via protocolo único HTTPS." -"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","Se você não tem usuários múltiplos configurados em sua conta, por favor digite novamente seu login de vendedor/comerciante aqui." -"Impossible to issue a refund transaction because the capture transaction does not exist.","Impossível emitir uma transação de reembolso porque a transação de captura não existe." -"Incentive","Incentivo" -"Initiation Date","Data de Início" -"Integral Evolution","Evolução Integral" -"Invoice ID","ID da fatura" -"Issuer Liability","Responsabilidade do Emissor" -"It is recommended to set this value to ""Debit or Credit Card"" per store views.","Recomenda-se definir este valor como ""Cartão de Débito ou de Crédito"" por visualizações de loja." -"It is recommended to set this value to ""PayPal"" per store views.","Recomenda-se definir este valor como ""PayPal"" por visualizações de loja." -"Items in Your Shopping Cart","Itens em seu carrinho de compras" -"Last Correlation ID","ID da Última Correlação" -"Last Transaction ID","ID da Última Transação" -"Learn More","Saiba Mais" -"Login","Conectar-se" -"Mass Pay Payment","Pagamento de Pagamento em Massa" -"Matched (CVV2)","Correspondido (CVV2)" -"Matched (CVV2CSC)","Correspondido (CVV2CSC)" -"Matched Address only (no ZIP)","Apenas Endereço Correspondido (sem ZIP)" -"Matched Address only (no ZIP). International","Apenas Enedereço Correspondido (sem ZIP). Internacional" -"Matched Postal Code only (no Address)","Apenas Código Postal Correspondido (sem Endereço)" -"Matched five-digit ZIP only (no Address)","Apenas ZIP de cinco dígitos correspondido (sem Endereço)" -"Matched whole nine-didgit ZIP (no Address)","ZIP total de nove dígitos correspondido (sem Endereço)" -"Merchant Account","Conta do Comerciante" -"Merchant Country","País do Comerciante" -"Merchant Liability","Responsabilidade do Comerciante" -"Merchant Location","Localização do comerciante" -"Merchant Protection Eligibility","Elegibilidade de Proteção do Comerciante" -"Merchant Referral Bonus","Bónus de Comerciante" -"Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Conta do comerciante não tem um mecanismo de levantamento. O comerciante deve aceitar ou recusar manualmente esse pagamento a partir de sua Visão Geral da conta." -"Merchant account is not verified.","Conta do comerciante não verificada." -"Merchant denied this pending payment.","Comerciante recusou o pagamento pendente." -"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","O comerciante é titular de uma conta fora dos EUA e não tem um mecanismo de levantamento." -"Merchant must upgrade account to Business or Premier status.","Comerciante deve atualizar a conta para status Business ou Premier." -"Merchant reference ID format is not supported.","Referência do formato ID do comerciante não é suportado." -"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Comerciantes necessitam se aplicar no PayPal para permitir a funcionalidade de acordos de faturamento. Não ative essa opção até que PayPal confirme que os acordos de faturamento estão ativados para a sua conta de comerciante." -"Mobile Payment (made via a mobile phone)","Pagamento Móvel (feito através de um celular)" -"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Questão multi-moeda. O comerciante deve manualmente aceitar ou recusar esse pagamento a partir da Visão Geral da Conta PayPal." -"N/A","Indisponível" -"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Endereço não verificado, ou comprador sem resposta. Serviço não disponível" -"N/A. Global Unavailable","N/A. Global Não Disponível" -"N/A. International Unavailable","N/A. Internacional Não Disponível" -"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Comerciante indicou que CVV2 não está presente no cartão" -"N/A. No response","N/A. Sem resposta" -"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. Não permitido para transações MOTO (Internet/Telefone)" -"N/A. Not processed","N/A. Não processado" -"N/A. Retry","N/A. Tentar novamente" -"N/A. Service not Supported","N/A. Serviço não Suportado" -"N/A. Service not available","N/A. Serviço não disponível" -"N/A. Service not supported","N/A. Serviço não suportado" -"N/A. The merchant did not provide AVS information","N/A. O comerciante não forneceu informação AVS" -"N/A. The merchant has not implemented CVV2 code handling","N/A. O comerciante não implementou manipulação de código CVV2" -"N/A. Unavailable","N/A. Indisponível" -"Near Bill Me Later checkout button","Próximo do botão de finalização de compra Bill Me Later" -"Negative Balance","Balanço Negativo" -"Never","Nunca" -"No","Não" -"No Details matched","Nenhuns Detalhes correspondem" -"No Details matched. International","Nenhuns Detalhes correspondem. Internacional" -"No Liability Shift","Nenhuma Mudança de Responsabilidade" -"No Logo","Nenhum Logo" -"No match","Nenhuma correspondência" -"None of the address information matched","Nenhuma das informações de endereço corresponderam" -"Not sure what PayPal payment method to use? Click here to learn more.","Não tem certeza sobre qual método de pagamento do PayPal usar? Clique aqui para saber mais." -"Note: %s","Nota: %s" -"Nothing to fetch because of an empty configuration.","Nada para buscar por causa de uma configuração vazia." -"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Observe que o PayPal pode lidar com até 10 opções de envio. É por isso que Magento irá transferir apenas as 10 primeiras opções mais baratas de envio se houver mais de 10 disponíveis." -"Notified customer about creditmemo #%s.","Cliente notificado sobre nota de crédito #%s." -"Notified customer about invoice #%s.","Cliente notificado sobre fatura #%s." -"Now accepting PayPal (150 X 40)","Aceitando agora PayPal (150 X 40)" -"Now accepting PayPal (150 X 60)","Aceitando agora PayPal (150 X 60)" -"Number of Child Authorizations","Número de Autorizações para Crianças" -"Open Authorization","Autorização Aberta" -"Order","Pedido" -"Order ID","ID da Ordem" -"Order Valid Period (days)","Período de Ordem Válida (dias)" -"Ordered amount of %s.","Valor ordenado de %s." -"Ordering amount of %s is pending approval on gateway.","Valor ordenado de %s está pendente de aprovação no gateway." -"Page Background Color","Cor de Fundo da Página" -"Page Style","Estilo da Página" -"Part of the address information matched","Parte das informações de endereço correspondeu" -"Partner","Parceiro" -"Pasarela integral","Pasarela integral" -"Password","Senha" -"PayPal All-in-One Payment Solutions  Accept and process credit cards and PayPal payments.","Soluções de Pagamento PayPal Todas-em-Uma  Aceite e processe pagamentos por cartões de crédito e PayPal." -"PayPal Balance Manager function of PayPal account","Função PayPal de Gerente de Saldo da conta PayPal" -"PayPal Billing Agreement Settings","Configurações do acordo de cobrança por PayPal" -"PayPal Buyer Warranty Bonus","Garantia Bonus de Comprador PayPal" -"PayPal Debit Card Cash Advance","Adiantamento de Dinheiro com Cartão de Débito PayPal" -"PayPal Debit Card Withdrawal from ATM","Levantamento de ATM com Cartão de Débito PayPal" -"PayPal Express Checkout","Checkout Expresso por PayPal" -"PayPal Express Checkout Shortcut Wrapper","Atalho Envoltório PayPal de Checkout Expresso" -"PayPal Express Checkout Token does not exist.","Fechar Pedido com PayPal Express: Token não existe" -"PayPal Express Checkout is not enabled.","O Checkout Expresso por PayPal não está ativado." -"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you. - You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®. - Learn More - ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you. - You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®. - Learn More" -"PayPal Express Order Review Form","PayPal Express: Revisar Pedido" -"PayPal Fee Information","Informação de Taxa PayPal" -"PayPal Merchant Pages Style","Páginas Estilo Comerciante PayPal" -"PayPal Payment Gateways","Portais de Pagamento por PayPal" -"PayPal Payment Solutions","Soluções de Pagamento por PayPal" -"PayPal Pro","PayPal Pro" -"PayPal Product Logo","Logo de Produto PayPal" -"PayPal Protection Bonus","Bônus de Proteção PayPal" -"PayPal Reference ID","ID de Referência PayPal" -"PayPal Reference ID Type","Tipo de ID de Referência PayPal" -"PayPal Settlement Reports","Relatórios de Pagamento PayPal" -"PayPal certificate does not exist.","Certificado PayPal não existe." -"PayPal certificate file is empty.","Arquivo de certificado PayPal está vazio." -"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal não oferece suporte a processamento de ordens com montante zero. Para concluir a sua compra, vá para o processo de compra standard." -"PayPal gateway has rejected request. %s","Portal PayPal rejeitou pedido. %s" -"PayPal recommends that you set up an additional User on your account at manager.paypal.com","O PayPal recomenda que você configure um usuário adicional em sua conta em manager.paypal.com" -"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","O PayPal recomenda que você configure um usuário adicional em sua conta em manager.paypal.com, em vez de digitar seu nome de usuário de administrador e sua senha aqui. Isso aumentará sua segurança e evitará interrupções de serviço se você alterar sua senha depois. Se não quiser configurar um usuário adicional, você pode digitar seu login de comerciante novamente aqui." -"PayPal response hasn't required fields.","Resposta PayPal não tem os campos obrigatórios." -"PayPal retains reports for 45 days.","PayPal retém relatórios por 45 dias." -"PayPal/Centinel Electronic Commerce Indicator","Indicador de Comércio Eletrônico PayPal/Centinel" -"PayPal/Centinel Visa Payer Authentication Service Result","Resultado do Serviço de Autenticação Pagador Visa PayPal/Centinel" -"Payer Address ID","Identificação do Endereço do Pagante" -"Payer Address Status","Estado Atual do Endereço do Pagante" -"Payer Email","E-mail do Pagante" -"Payer ID","Identificação do Pagante" -"Payer Status","Estado Atual do Pagante" -"Payer is not identified.","O pagante não está identificado." -"Payflow Link","Link para Payflow" -"Payflow Link (Includes Express Checkout)","Link para Payflow (inclui Checkout Expresso)" -"Payflow Pro","Payflow Pro" -"Payflow Pro (Includes Express Checkout)","Payflow Pro (inclui Checkout Expresso)" -"Payflow Pro and Express Checkout","Payflow Pro e Checkout Expresso" -"Payment Action","Ação de Pagamento" -"Payment Applicable From","Pagamento Aplicável Desde" -"Payment Method","Forma de Pagamento" -"Payment Refund initiated by merchant","Reembolso de Pagamento por iniciativa do Comerciante" -"Payment has been declined. Please try again.","O pagamento não foi realizado. Tente outra vez." -"Payment is being reviewed by PayPal for risk.","O pagamento está sendo revisado pelo PayPal quanto ao risco." -"Payment transactions disallow storing objects.","Transações de pagamento não permitem armazenar objetos." -"Payment was made to an email address that is not yet registered or confirmed.","O pagamento foi feito para um endereço de e-mail ainda não registrado ou confirmado." -"Payments Advanced","Pagamentos Avançados" -"Payments Advanced (Includes Express Checkout)","Pagamentos Avançados (inclui Checkout Expresso)" -"Payments Pro (Includes Express Checkout)","Pagamentos Pro (inclui Checkout Expresso)" -"Payments Pro Hosted Solution","Solução Hospedada Pagamentos Pro" -"Payments Pro and Express Checkout","Pagamentos Pro e Checkout Ex" -"Payments Standard","Pagamentos Padrão" -"Payments by PayPal (150 X 40)","Pagamentos por PayPal (150 x 40)" -"Payments by PayPal (150 X 60)","Pagamentos por PayPal (150 x 60)" -"Pending PayPal","Pendência com PayPal" -"Place Order","Colocar Ordem" -"Please agree to all the terms and conditions before placing the order.","Por favor concorde com todos os Termos e Condições antes de colocar a ordem." -"Please contact PayPal Customer Service.","Entre em contato com o Atendimento ao Cliente PayPal." -"Please do not refresh the page until you complete payment.","Por favor não atualize a página até concluir o pagamento." -"Please re-enable the previously enabled payment solutions.","Por favor, reative as soluções de pagamento previamente ativadas." -"Please select a shipping method...","Por favor selecione um método de envio..." -"Please select region, state or province","Selecione a região, estado ou província" -"Please update order data to get shipping methods and rates","Por favor atualize os dados do pedido para ver as formas de envio e tarifas" -"Points Incentive Redemption","Redenção de Pontos de Incentivo" -"Position","Posição" -"Postage Payment to either USPS or UPS","Pagamento de Porte quer para USPS ou UPS" -"Preapproved Payment (BillUser API), either sent or received","Pagamento Pré-aprovado (BillUser API), quer enviado ou recebido" -"Preapproved Payment ID","ID do Pagamento Pré-aprovado" -"Price","Preço" -"Pro","Pro" -"Process payments using your own internet merchant account.","Processe pagamentos usando sua própria conta de comerciante de internet." -"Product","Produto" -"Product Name","Nome do produto" -"Proxy Host","Anfitrião Proxy" -"Proxy Port","Porta Proxy" -"Publisher ID","ID do Editor" -"Qty","Quant." -"Reauthorization","Reautorização" -"Reference Information","Informação de Referência" -"Reimbursement for a chargeback.","Reembolso de uma cobrança retroativa." -"Reimbursement of Chargeback","Reembolso de Cobrança Retroativa." -"Report Date","Data do Relatório" -"Reports","Relatórios" -"Requested %s and configured %s merchant emails do not match.","%s solicitado e %s emails configurados do comerciante não coincidem." -"Require CVV Entry","Requer Entrada CVV" -"Require Customer's Billing Address","Solicitar endereço de cobrança do cliente" -"Required PayPal Settings","Configurações do PayPal exigidas" -"Required Settings","Configurações exigidas" -"Required to display a banner","Necessário para mostrar um banner" -"Reversal","Reversão" -"Reversal of General Account Hold","Reversão do Domínio da Conta Geral" -"Reversal of Points Usage","Reversão de Pontos de Uso" -"Reversal of an adjustment.","Reversão de um ajustamento." -"Reversal of hold for Dispute Investigation","Reversão de espera por Disputa de Investigação" -"Review Order","Analisar o pedido" -"Reward Voucher Redemption","Resgate de Voucher de Recompensa" -"SFTP Credentials","Credenciais SFTP" -"Sale","Venda" -"Sales","Vendas" -"Same as shipping","Mesmo de envio" -"Sandbox Credentials","Credenciais Sandbox" -"Sandbox Mode","Modo Sandbox" -"Schedule","Programa" -"Schedule description is too long.","A descrição do programa é muito longa" -"Scheduled Fetching","Buscando Programa" -"Select a Payment Solution","Escolha uma solução de pagamento" -"Send Email Confirmation","Envie confirmação por e-mail" -"Server Error. Please try again.","Erro do servidor. Por favor tente novamente." -"Settlement Consolidation","Consolidação de liquidação" -"Settlement Report Settings","Configurações de relatório de liquidação" -"Settlement of a chargeback.","Liquidação de um estorno." -"Severe 3D Secure Card Validation","Validação de Cartão Severe 3D Secure" -"Severe Validation Removes Chargeback Liability on Merchant","Validação Severe Remove a Responsabilidade de Cobrança Retroativa no Comerciante" -"Severe validation removes chargeback liability on merchant.","A validação rigorosa isenta o comerciante da responsabilidade de desconto." -"Shipping","Remessa" -"Shipping Address","Endereço de Envio" -"Shipping Information","Informações de Entrega" -"Shipping Method","Tipo de Frete" -"Shop now using (150 X 40)","Compre agora usando (150 X 40)" -"Shop now using (150 X 60)","Compre agora usando (150 X 60)" -"Shortcut","Atalho" -"Shortcut Buttons Flavor","Sabor botões de atalho" -"Shortcut on Product View","Atalho na Visão do Produto" -"Shortcut on Shopping Cart","Atalho no Carrinho de Compras" -"Sidebar (right)","Barra Lateral (direita)" -"Sign a billing agreement to streamline further purchases with PayPal.","Assine um acordo de faturamento para agilizar ainda mais as compras com o PayPal." -"Size","Tamanho" -"Skip Order Review Step","Pular Passo de Revisão do Pedido" -"Solo","Solo" -"Some PayPal solutions conflict.","Algumas soluções do PayPal são conflitantes." -"Sorry, no quotes are available for this order at this time.","Desculpe, não há citações disponíveis neste momento para esta ordem." -"Sort Order","Classificar pedido" -"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Especifica o que o Período de Honra de Autorização é na conta PayPal do comerciante. Deve espelhar a configuração no PayPal." -"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Especifica o que o Período de Ordem Válido é na conta PayPal do comerciante. Deve espelhar a configuração no PayPal." -"State/Province","Estado/Província" -"Static","Estático" -"Street Address","Endereço da Rua" -"Street Address %s","Endereço da Rua %s" -"Submitting order information...","Enviando informações da ordem..." -"Subscriber name is too long.","Nome do assinante é muito longo." -"Subscription ID","ID de Subscrição" -"Subscription Payment, either payment sent or payment received","Pagamento de Subscrição, ou de pagamento enviado ou pagamento recebido" -"Subtotal","Subtotal" -"Summary Text for Aggregated Cart","Texto Resumo para Carrinho Agregado" -"Supporting of American Express cards require additional agreement. Learn more at http://www.paypal.com/amexupdate.","Apoio de cartões American Express exige um acordo adicional. Saiba mais em http://www.paypal.com/amexupdate." -"Switch/Maestro","Switch/Maestro" -"Telephone","Telefone" -"Test Mode","Modo de Teste" -"The background color for the checkout page around the header and payment form.","A cor de fundo para a página de compra à volta do cabeçalho e formulário de pagamento." -"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","A cor de fundo para o cabeçalho da página de compra. Código de seis caracteres, sem diferença de minúsculas e maiúsculas, de cor hexadecimal HTML em ASCII." -"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","O número padrão de autorizações de criança em sua conta PayPal é 1. Para fazer autorizações múltiplas entre em contato com PayPal para pedir um aumento." -"The following error(s) occured:","Houve o(s) seguinte(s) erro(s):" -"The image at the top left of the checkout page. Max size is 750x90-pixel. https is highly encouraged.","A imagem no canto superior esquerdo da página de compra. Tamanho máximo é 750x90 pixels. https é altamente recomendado." -"The maximum number of child authorizations is reached.","O número máximo de autorizações de criança foi atingido." -"The merchant account is not yet verified.","A conta de comerciante ainda não foi confirmada." -"The payment curency does not match any of the merchant\'s balances currency.","A moeda de pagamento não corresponde a nenhuma das moedas dos balanços do comerciante." -"The payment eCheck is not yet cleared.","O pagamento eCheck ainda não está clarificado." -"The payment is authorized but not settled.","O pagamento está autorizado, mas não liquidado." -"The payment is pending because it was made to an email address that is not yet registered or confirmed.","O pagamento está pendente porque foi feito para um endereço de e-mail que ainda não está registrado ou confirmado." -"The payment is pending while it is being reviewed by PayPal for risk.","O pagamento está pendente enquanto ele está sendo revisado para o risco por PayPal." -"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","O pagamento foi feito via cartão de crédito. A fim de receber fundos o comerciante deve atualizar sua conta para status Business ou Premier." -"There is already another PayPal solution enabled. Enable this solution instead?","Já existe uma outra solução do PayPal ativada. Trocar por esta solução?" -"There was an error processing your order. Please contact us or try again later.","Ocorreu um erro ao processar sua ordem. Entre em contato conosco ou tente novamente mais tarde." -"This feature needs be enabled first for the merchant account through PayPal technical support.","Este recurso primeiro precisa ser ativado para a conta que aceita cartões de crédito através do suporte técnico PayPal ." -"This operation requires an existing transaction object.","Esta operação requer um objeto existente de transação." -"Time of Day","Hora do Dia" -"Title","Título" -"To proceed to Checkout, please log in using your email address.","Para proceder à finalização da compra, por favor, faça login usando seu endereço de e-mail." -"Transaction ID","ID da Transação" -"Transaction ID must not be empty.","A ID da transação não pode estar vazia." -"Transaction Information","Informação da Transação" -"Transaction reversal by PayPal administrators.","Estorno de transação pelos administradores do PayPal." -"Transaction reversal due to fraud detected by PayPal administrators.","Estorno de transação devido a fraude detectada pelos administradores do PayPal." -"Transfer Cart Line Items","Itens de Linha de Carrinho de Transferência" -"Transfer Shipping Options","Opções de Envio de Transferência" -"Triggered Fraud Filters","Desencadeados Filtros de Fraude" -"URL method for Cancel URL and Return URL","Método de URL para cancelar URL e retornar URL." -"Unable to cancel Express Checkout.","Impossível cancelar Fechamento de Pedido Expresso." -"Unable to change status. Current status is not correspond to real status.","Incapaz de mudar de status. Situação atual não corresponde ao estado real." -"Unable to communicate with the PayPal gateway.","Incapaz de se comunicar com o portal PayPal." -"Unable to initialize Express Checkout review.","Impossível iniciar revisão do Fechamento de Pedido Expresso." -"Unable to initialize Express Checkout.","Não é possível inicializar o Checkout Expresso." -"Unable to place the order.","Impossível realizar o pedido." -"Unable to process Express Checkout approval.","Impossível processar aprovação para Fechamento Expresso de Pedido." -"Unable to start Express Checkout.","Impossível iniciar Fechamento Expresso de Pedido." -"Unable to update Order data.","Incapaz de atualizar dados do Pedido." -"Unable to update shipping method.","Impossível atualizar tipo de frete." -"Unknown Error. Please try again later.","Erro Desconhecido. Por favor tente novamente mais tarde." -"Unknown reason. Please contact PayPal customer service.","Motivo desconhecido. Favor contactar o atendimento a clientes do PayPal." -"Update Order Data","Atualizar Dados do Pedido" -"Update Shipping Method","Atualizar Fomar de Entrega" -"Use Proxy","Usar Proxy" -"Use colon to specify port. For example: ""test.example.com:5224"".","Usar dois-pontos para especificar porta. Por ex.: ""teste.exemplo.com:5224""." -"User","Usuário" -"User-initiated Currency Conversion","Conversão de Moeda por Iniciativa do Usuário" -"Uses store frontend name by default.","Usa por padrão o nome do servidor front-end da loja." -"VAT Number","Número VAT" -"Vendor","Vendedor" -"View","Ver" -"View Demo","Visualizar Demonstração" -"View Transaction","Visualizar Transação" -"View Transaction Details","Visualizar Detalhes da Transação." -"Virtual PayPal Debit Card Transaction","Transação via Cartão de Débito Virtual PayPal" -"Virtual Terminal Payment","Pagamento via Terminal Virtual" -"Void","Anular" -"Waiting until Customer\'s eCheck will be cleared.","Aguardando eCheck do Cliente ser liberado." -"We prefer PayPal (150 X 40)","Preferimos PayPal (150 x 40)" -"We prefer PayPal (150 X 60)","Preferimos PayPal (150 x 60)" -"Website Payments Plus","Website Payments Plus" -"Website Payments Pro (Includes Express Checkout)","Pagamentos por Site Pro (inclui Checkout Expresso)" -"Website Payments Pro Hosted Solution","Website Payments Pro Hosted Solution" -"Website Payments Pro Hosted Solution (Includes Express Checkout)","Solução Hospedada Pagamentos por Site Pro (inclui Checkout Expresso)" -"Website Payments Pro Hosted Solution and Express Checkout","Solução Hospedada Pagamentos por Site Pro e Checkout Expresso" -"Website Payments Pro Payflow Edition (Includes Express Checkout)","Pagamentos por Site Pro Edição Payflow (inclui Checkout Expresso)" -"Website Payments Pro Payflow Edition and Express Checkout","Pagamentos por Site Pro Edição Payflow e Checkout Expresso" -"Website Payments Pro and Express Checkout","Pagamentos pelo Site e Checkout Expresso" -"Website Payments Standard","Pagamentos de Site Padrão" -"Website Payments Standard Payment","Pagamento de Pagamentos de Site Padrão" -"What is PayPal?","O que é o PayPal?" -"Whether to create a billing agreement, if there are no active billing agreements available.","Se deseja criar um acordo de faturamento, se não houver acordos de faturamento ativos disponíveis." -"Will appear as a payment option only for customers who have at least one active billing agreement.","Aparecerá como uma opção de pagamento apenas para os clientes que têm pelo menos um acordo de faturamento ativo." -"WorldLink Withdrawal","Levantamento WorldLink" -"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Gostaria de assinar um acordo de faturamento para agilizar ainda mais compras posteriores com o PayPal?" -"Wrong Order ID (%s) specified.","ID (%s) especificado da Ordem Errado ." -"Wrong PayPal Express Checkout Token specified.","Token errado p/ Fechamento Expresso de Pedido pelo PayPal." -"Yes","Sim" -"Yes. Matched Address and five-didgit ZIP","Sim. Endereço Correspondente e ZIP de cinco dígitos" -"You cannot void a verification transaction","Não é possível anular uma transação de verificação" -"You will be redirected to the PayPal website in a few seconds.","Você será redirecionado para a página do PayPal em alguns segundos." -"You will be redirected to the PayPal website when you place an order.","Você será redirecionado para o site PayPal quando você colocar uma ordem." -"You will be redirected to the PayPal website.","Você será redirecionado para o site PayPal." -"You will be required to enter your payment details after you place an order.","Você será obrigado a inserir seus detalhes de pagamento depois de colocar uma ordem." -"Zip/Postal Code","Zip/Código Postal" -"chargeback reimbursed","cobrança retroativa reembolsada" -"chargeback settled","cobrança retroativa resolvida" -"customer complaint","reclamação do cliente" -"customer triggered a chargeback","cliente provocou um cobrança retroativa" -"customer triggered money-back guarantee","cliente desencadeou garantia de reembolso" -"eBay Auction Payment","Pagamento do Leilão eBay" -"merchant refunded payment","pagamento do comerciante reembolsado" -"no reason","nenhuma razão" -"reversal of an adjustment","reversão de um ajuste" -"unknown reason","razão desconhecida" diff --git a/app/locale/pt_BR/Mage_PaypalUk.csv b/app/locale/pt_BR/Mage_PaypalUk.csv deleted file mode 100644 index 2b6cee81f..000000000 --- a/app/locale/pt_BR/Mage_PaypalUk.csv +++ /dev/null @@ -1,2 +0,0 @@ -"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","Fechar Pedido com PayPal Express (Edição Payflow): Wrapper Simplificado" -"PayPal Express Order Review Form","PayPal Express: Revisar Pedido" diff --git a/app/locale/pt_BR/Mage_Persistent.csv b/app/locale/pt_BR/Mage_Persistent.csv deleted file mode 100644 index 389fd97d7..000000000 --- a/app/locale/pt_BR/Mage_Persistent.csv +++ /dev/null @@ -1,74 +0,0 @@ -"""Remember Me"" Default Value","Valor-padrão ""Lembre-me""" -"(Not %s?)","(Não %s?)" -"* Required Fields","* Campos obrigatórios" -"Address","Endereço" -"Address Information","Informações de Endereço" -"Already registered?","Já está registado?" -"Back","Voltar" -"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","Ao criar uma conta na nossa loja, você será capaz de se mover através do processo de compra mais rapidamente, armazenar múltiplos endereços de envio, ver e rastrear seus pedidos em sua conta e muito mais." -"Cannot load configuration from file %s.","Não é possível carregar configuração do arquivo %s." -"Checkout as Guest","Checkout como Visitante" -"Checkout as a Guest","Finalizar Compra como Convidado" -"Checkout as a Guest or Register","Checkout como um Visitante ou se Registe" -"City","Cidade" -"Clear Persistence on Log Out","Remover Persistência ao Sair do Sistema" -"Close","Fechar" -"Company","Companhia" -"Confirm Password","Confirmar a senha" -"Continue","Continue" -"Country","País" -"Create an Account","Criar uma conta" -"Easy access to your order history and status","Fácil acesso ao seu histórico de pedidos e estado" -"Email Address","Endereço de e-mail" -"Enable ""Remember Me""","Permitir ""Lembre-me""" -"Enable Persistence","Permitir Persistência" -"Fast and easy check out","Checkout rápido e fácil" -"Faster checkout","Finalização de Compra Mais Rápida" -"Fax","Fax" -"Forgot Your Password?","Esqueceu a senha?" -"Forgot your password?","Esqueceu sua senha?" -"General Options","Opções gerais" -"If you have an account with us, please log in.","Se você possui uma conta conosco, por favor, faça seu login" -"Loading next step...","Carregando próximo passo..." -"Login","Conectar-se" -"Login Information","Informações de login" -"Login or Create an Account","Conectar-se ou criar conta" -"New Customers","Novos clientes" -"New Here?","Novo Por Aqui?" -"Password","Senha" -"Persist Shopping Cart","Processar o Carrinho de Compras" -"Persistence Lifetime (seconds)","Tempo de vida persistente(segundos)" -"Persistent Shopping Cart","Carrinho de Compras Persistente" -"Personal Information","Informações pessoais" -"Please enter the following information to create your account.","Por favor, forneça as seguintes informações para criar a sua conta." -"Please log in below:","Por favor, faça o login abaixo:" -"Please select region, state or province","Selecione a região, estado ou província" -"Register","Registrar" -"Register and Checkout","Cadastrar e Finalizar Compra" -"Register and save time!","Cadastre-se e poupe tempo!" -"Register to Create an Account","Cadastre-se para Criar uma Conta" -"Register with us for future convenience:","Faça um cadastro conosco para ter comodidade no futuro:" -"Registered Customers","Clientes cadastrados" -"Registration is free and easy!","O cadastro é gratuito e fácil!" -"Remember Me","Lembre-se de mim" -"Returning Customers","Clientes Cadastrados" -"Save in address book","Salvar no catálogo de endereços" -"Save multiple shipping addresses","Salvar endereços de entrega múltiplos" -"Select State/Province...","Selecione Estado/Província..." -"Select a billing address from your address book or enter a new address.","Selecione um endereço de cobrança de seu catálogo de endereços ou insira um novo endereço" -"Ship to different address","Enviar para endereço diferente" -"Ship to this address","Enviar para este endereço" -"Shopping cart has been updated with appropriate prices","O carrinho de compras foi atualizado com os preços apropriados" -"Sign Up for Newsletter","Assinar o boletim informativo" -"Sign in to speed up your checkout process","Faça login para agilizar o seu processo de finalização de compra" -"State/Province","Estado/Província" -"Street Address","Endereço da Rua" -"Street Address %s","Endereço da Rua %s" -"Submit","Enviar" -"Telephone","Telefone" -"To proceed to Checkout, please log in using your email address.","Para fazer checkout, por favor faça login usando o seu endereço de e-mail." -"VAT Number","Número VAT" -"View and track orders and more","Ver e rastrear pedidos e mais" -"Welcome, %s!","Bem-vindo, %s!" -"What\'s this?","O que é isso?" -"Zip/Postal Code","Zip/Código Postal" diff --git a/app/locale/pt_BR/Mage_Poll.csv b/app/locale/pt_BR/Mage_Poll.csv deleted file mode 100644 index aa88599e1..000000000 --- a/app/locale/pt_BR/Mage_Poll.csv +++ /dev/null @@ -1,42 +0,0 @@ -"Actions","Ações" -"Add Answer","Adicionar Resposta" -"Add New Answer","Adicionar Nova Resposta" -"Add New Poll","Adicionar Nova Enquete" -"Answer Title","Título da Resposta" -"Answer Title:","Título da Resposta:" -"Answer with the same title in this poll","Responder com o mesmo título nesta enquete" -"Are you sure you want to delete it?","Você tem certeza que deseja apagar isso?" -"Assigned Answers","Respostas Atribuídas" -"Closed","Fechar" -"Community Poll","Enquete comunitária" -"Date Closed","Dados Fechados" -"Date Posted","Dados Postados" -"Delete","Excluir" -"Delete Answer","Apagar Resposta" -"Delete Poll","Apagar Enquete" -"Disallow Voting in a Poll Multiple Times from Same IP-address","Não permitir que um mesmo endereço IP vote várias vezes em uma mesma enquete" -"Edit Answer '%s'","Editar Resposta '%s'" -"Edit Poll '%s'","Editar Enquete '%s'" -"Edit Poll Answer","Editar Resposta da Enquete" -"ID","Identidade" -"Invalid Answer.","Resposta Inválida" -"New Poll","Nova Pesquisa" -"Number of Responses","Número de Respostas" -"Open","Abrir" -"Poll Answers","Respostas da Pesquisa" -"Poll Information","Informações da Pesquisa" -"Poll Manager","Gerente de Pesquisa" -"Poll Question","Pergunta da Pesquisa" -"Poll information","Informações da pesquisa" -"Poll with the same question","Pesquisa com a mesma pergunta" -"Polls","Pesquisas" -"Save Answer","Salvar Resposta" -"Save Poll","Salvar Pesquisa" -"Status","Status" -"The answer has been saved.","A resposta foi salva." -"The poll does not exist.","A pesquisa não existe." -"Unable to find an answer to delete.","Não foi possível encontrar uma resposta para apagar." -"Visible In","Visível em" -"Vote","Votar" -"Votes Count","Contagem dos Votos" -"Votes Count:","Contagem dos Votos:" diff --git a/app/locale/pt_BR/Mage_ProductAlert.csv b/app/locale/pt_BR/Mage_ProductAlert.csv deleted file mode 100644 index 48f0c4df8..000000000 --- a/app/locale/pt_BR/Mage_ProductAlert.csv +++ /dev/null @@ -1,35 +0,0 @@ -"Alert Email Sender","Remetente de Email de Alerta" -"Alert subscription has been saved.","Alerta de assinatura foi salva." -"Allow Alert When Product Comes Back in Stock","Permitir Alerta Quando o Produto Voltar ao Estoque" -"Allow Alert When Product Price Changes","Permitir Alerta Quando o Preço do Produto Mudar" -"Click here not to receive alerts for this product","Clique aqui para não receber alertas para este produto" -"Error Email Recipient","Erro de Destinatário de Email" -"Error Email Sender","Erro de Remetente de Email" -"Error Email Template","Erro de Template de Email" -"Frequency","Freqüência" -"Not enough parameters.","Não há parâmetros suficientes." -"Price Alert Email Template","Modelo do Email de Alerta de Preço" -"Price:","Preço:" -"Product Alerts","Alertas de Produto" -"Product Alerts Run Settings","Executar Configurações de Alertas de Produto" -"Product alerts Cron error","Erro Cron de Alertas de Produto" -"Product price alert","Alerta de Preço de Produto" -"Product stock alert","Alerta de Estoque de Produto" -"Regular Price:","Preço Normal:" -"Sign up for price alert","Registe-se para alerta de preço" -"Sign up to get notified when this product is back in stock","Registe-se para ser notificado quando este produto estiver em estoque" -"Special price:","Preço especial:" -"Start Time","Tempo de Início" -"Stock Alert Email Template","Modelo de Email de Alerta de Estoque" -"The alert subscription has been deleted.","O alerta de subscrição foi apagado." -"The alert subscription has been saved.","O alerta de subscrição foi salvo." -"The product is not found.","Não se encontra o produto." -"The product was not found.","O produto não foi encontrado." -"Unable to update the alert subscription.","Não é possível atualizar a subscrição de alertas." -"Unsubscribe from all price alerts","Anular a subscrição de todos os alertas de preços" -"Unsubscribe from all stock alerts","Anular a subscrição do todos os alertas estoque" -"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","Você está recebendo esta notificação porque você se inscreveu para receber alertas quando os seguintes produtos estão de volta em estoque:" -"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","Você está recebendo esta notificação porque você se inscreveu para receber alertas quando os preços dos seguintes produtos se alterassem:" -"You will no longer receive price alerts for this product.","Você não receberá mais alertas de preço para este produto." -"You will no longer receive stock alerts for this product.","Você não receberá mais alertas de estoque para este produto." -"You will no longer receive stock alerts.","Você não receberá mais alertas de estoque." diff --git a/app/locale/pt_BR/Mage_Rating.csv b/app/locale/pt_BR/Mage_Rating.csv deleted file mode 100644 index a55408aee..000000000 --- a/app/locale/pt_BR/Mage_Rating.csv +++ /dev/null @@ -1,29 +0,0 @@ -"1 star","1 estrela" -"2 stars","2 estrelas" -"3 stars","3 estrelas" -"4 stars","4 estrelas" -"5 stars","5 estrelas" -"Add New Rating","Adicionar nova avaliação" -"Assigned Options","Opções especificadas" -"Be the first to review this product","Seja a primeira pessoa a avaliar este produto" -"Default Value","Valor Predifinido" -"Delete Rating","Exclui avaliação" -"Edit Rating","Editar avaliação" -"ID","Identidade" -"If you do not specify a rating title for a store, the default value will be used.","Caso o título de avaliação não seja especificado, o valor padrão será utilizado." -"Manage Ratings","Gerenciar Classificações" -"New Rating","Nova avaliação" -"Option Label","Marca de opção" -"Option Title","Título da opção" -"Option Title:","Título da opção:" -"Please select one of each ratings above","Escolha uma de cada avaliação acima" -"Rating Information","Informações de avaliação" -"Rating Name","Nome da avaliação" -"Rating Options","Opções de avaliação" -"Rating Title","Título da avaliação" -"Rating Visibility","Visibilidade da avaliação" -"Rating isn't Available","A avaliação não está disponível" -"Rating with the same title","Avaliar com o mesmo título" -"Save Rating","Salvar avaliação" -"Sort Order","Classificar pedido" -"Visible In","Visível em" diff --git a/app/locale/pt_BR/Mage_Reports.csv b/app/locale/pt_BR/Mage_Reports.csv deleted file mode 100644 index d3140b30c..000000000 --- a/app/locale/pt_BR/Mage_Reports.csv +++ /dev/null @@ -1,174 +0,0 @@ -"Abandoned Carts","Carrinhos de Compras Abandonados" -"Abandoned carts","Carrinhos de compra abandonados" -"Action","Ação" -"Add to Cart","Adicionar ao carrinho" -"Add to Compare","Adicionar para Comparar" -"Add to Wishlist","Adicionar à Lista de Desejos" -"Any","Qualquer um" -"Applied Coupon","Cupons aplicados" -"Applies to Any of the Specified Order Statuses","Aplica-se a qualquer um dos status de pedidos especificados" -"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","Tem certeza que deseja atualizar as estatísticas de tempo de vida útil? Pode ocorrer um impacto no desempenho durante esta operação." -"Are you sure?","Tem certeza?" -"Avg. Approved Rating","Taxa de aprovação média" -"Avg. Rating","Taxa média" -"Bestsellers","Mais vendidos" -"Bought from wishlists","Comprado da lista de presentes" -"CSV","CSV" -"Carts","Carrinhos de compra" -"Catalog Category (Without Subcategories)","Categoria do catálogo (Sem subcategorias)" -"Compared Products Grid Template","Modelo de grade de produtos comparados" -"Compared Products List Template","Modelo de lista de produtos comparados" -"Coupons","Cupons" -"Coupons Usage Report","Relatório de utilização de cupons" -"Created At","Criada Em" -"Current Month Starts","O mês atual começa" -"Customer","Cliente" -"Customer Name","Nome do Cliente" -"Customer Tags","Etiquetas do cliente" -"Customers","Clientes" -"Customers Report","Relatórios de clientes" -"Customers Reviews","Análises dos clientes" -"Customers Tags","Etiquetas de clientes" -"Customers by Number of Orders","Clientes por Número de Pedidos" -"Customers by Orders Total","Clientes por Total dos Pedidos" -"Customers by number of orders","Clientes por número de pedidos" -"Customers by orders total","Clientes por total de pedidos" -"Customers that have wishlist: %s%","Clientes que têm uma lista de presentes: %s%" -"Dashboard","Painel" -"Day","Dia" -"Default Recently Compared Products Count","Contagem padrão de produtos comparados recentemente" -"Default Recently Viewed Products Count","Contagem padrão de produtos visualizados recentemente" -"Description","Descrição" -"Detail","Detalhe" -"Downloads","Transferências" -"Email","E-mail" -"Empty Rows","Colunas vazias" -"Excel XML","Excel XML" -"Filter","Filtro" -"First Name","Primeiro nome" -"From","De" -"Guest","Convidado" -"Hits","Críticas" -"ID","Identidade" -"IP Address","Endereço de IP" -"Index model name must be defined","O nome do índice do modelo precisa ser definido" -"Invalid date specified.","Data especificada inválida." -"Invoiced","Faturado" -"Items in Cart","Itens no carrinho" -"Last Name","Último nome" -"Last Review","Última revisão" -"Link","Link" -"List of Products Recently Compared and Removed from the Compare List by Visitor","Lista de produtos comparados recentemente e removidos da lista de comparação pelo visitante" -"List of Products Recently Viewed by Visitor","Lista de produtos analisados recentemente pelo visitante" -"Low Stock","Baixo Estoque" -"Low stock","Estoque baixo" -"Match Period To","Igualar período a" -"Month","Mês" -"Most Viewed","Mais vistos" -"Name","Nome" -"New Accounts","Novas Contas" -"No","Não" -"Number Added","Número Adicionado" -"Number Fulfilled","Número Cumprido" -"Number Of Reviews","Número De Comentários" -"Number Purchased","Número Comprado" -"Number Viewed","Número Vistos" -"Number of Items","Número de Itens" -"Number of New Accounts","Número de Novas Contas" -"Number of Products to display","Números de Produtos para apresentar" -"Number of Reviews","Número de Comentários" -"Number of Times Deleted","Número de Tempos Apagados" -"Number of Total Tags","Número de Marcas Total" -"Number of Unique Tags","Número de Marcas Únicas" -"Number of Views","Número de Visualizações" -"Number of items bought from a wishlist: %s","Número de itens comprados a partir de uma lista de desejos: %s" -"Number of times wishlists have been shared (emailed): %s","Número de vezes que listas de desejos foram compartilhadas (por e-mail): %s" -"Number of wishlist conversions: %s","Número de conversões na lista de desejos: %s" -"Number of wishlist referrals: %s","Número de referências na lista de desejos: %s" -"Number of wishlists: %s","Número de listas de desejos: %s" -"Order Status","Status do pedido" -"Order Taxes Report Grouped by Tax Rate","Relatório de Impostos de Ordens Agrupados por Taxa de Imposto" -"Orders","Ordens" -"Out of stock","Fora de estoque" -"Period","Período" -"Poducts Report","Relatório do produto" -"Popular Tags","Tags Populares" -"Popularity","Popularidade" -"Price","Preço" -"Product Name","Nome do produto" -"Product Reviews","Comentários sobre Produto" -"Product SKU","SKU do Produto" -"Product Tags","Etiquetas de Produto" -"Products","Produtos" -"Products Ordered","Produtos Encomendados" -"Products Report","Relatórios de produtos" -"Products Reviews","Comentários sobre Produtos" -"Products Tags","Etiquetas de produtos" -"Products in carts","Produtos no carrinho" -"Purchases","Compras" -"Quantity Ordered","Quantidade pedida" -"Quantity of Items","Quantidade de itens" -"Recently Compared","Comparados recentemente" -"Recently Compared Products","Produtos Recentemente Comparados" -"Recently Viewed","Recentemente Visto" -"Recently Viewed Products","Produtos Recentemente Vistos" -"Recently Viewed/Compared Products","Produtos visualizados/comparados recentemente" -"Refresh Lifetime Statistics","Atualizar estatísticas de tempo de vida útil" -"Refresh Statistics","Atualizar Estatísticas" -"Refresh Statistics for the Last Day","Atualizar estatísticas para o Último dia" -"Refunds","Reembolsos" -"Report","Relatório" -"Reports","Relatórios" -"Results","Resultados" -"Revenue","Receita" -"Review","Análise" -"Reviews","Resenhas" -"Reviews for %s","Revisões para %s" -"Sales","Vendas" -"Sales Report","Relatório de Vendas" -"Search Query","Palavras-Chave da Busca" -"Search Terms","Buscar Termos" -"Select day of the month.","Escolher o dia do mês." -"Shipping","Remessa" -"Shopping Cart","Carrinho de compras" -"Shopping Cart Price Rule","Regra de Preço de Carrinho de Compras" -"Show Actual Values","Exibir valores reais" -"Show Report","Exibir relatório" -"Show for Current","Exibir atual" -"Specified","Especificado" -"Statistics","Estatísticas" -"Stock Qty","Quantidade em estoque" -"Submitted In","Enviado em" -"Submitted On","Enviado em" -"Subtotal","Subtotal" -"Tag","Tag" -"Tag ""%s"" details","Detalhes da etiqueta ""%s""" -"Tag Detail","Detalhe da etiqueta" -"Tag Name","Nome de Marca" -"Tag Use","Uso da etiqueta" -"Tags Submitted by %s","Etiquetas enviadas por %s" -"Tags submitted to %s","Etiquetas enviadas para %s" -"Tax","Taxas" -"Title","Título" -"To","Para" -"Total","Total" -"Total Invoiced vs. Paid Report","Total faturado versus Relatório de pagamento" -"Total Ordered Report","Relatório do Total Encomendado" -"Total Refunded Report","Relatório do total reembolsado" -"Total Shipped Report","Relatório do total remessado" -"Total Tags","Total de etiquetas" -"Total invoiced","Total faturado" -"Total refunded","Total reembolsado" -"Updated At","Atualizado Em" -"Viewed Products Grid Template","Modelo de grade de produtos visualizados" -"Viewed Products List Template","Modelo de lista de produtos visualizados" -"Visible In","Visível em" -"Wishlist Report","Assinalar na Lista de Desejos" -"Wishlist vs. Regular Order","Lista de presentes versus Pedidos normais" -"Wishlists","Lista de presentes" -"Year","Ano" -"Year-To-Date Starts","Início do acumulado anual" -"Yes","Sim" -"Your Recently Compared","Seus comparados recentemente" -"Your Recently Viewed","Seus visualizados recentemente" -"undefined","indefinido" diff --git a/app/locale/pt_BR/Mage_Review.csv b/app/locale/pt_BR/Mage_Review.csv deleted file mode 100644 index ad80926d3..000000000 --- a/app/locale/pt_BR/Mage_Review.csv +++ /dev/null @@ -1,104 +0,0 @@ -"%d Review(s)","%s comentário(s)" -"%s Review(s)","%s comentário(s)" -"(Posted on %s)","(Publicado em %s)" -"1 star","1 estrela" -"2 star","2 estrelas" -"2 stars","2 estrelas" -"3 star","3 estrelas" -"3 stars","3 estrelas" -"4 star","4 estrelas" -"4 stars","4 estrelas" -"5 star","5 estrelas" -"5 stars","5 estrelas" -"%2$s %3$s (%4$s)","%2$s %3$s (%4$s)" -"Add New Review","Adicionar novo comentário" -"Add Your Review","Adicionar seu comentário" -"Administrator","Administrador" -"All Reviews","Todas as Revisões" -"All Reviews of Customer `%s`","Todos os comentários do cliente '%s'" -"All Reviews of Product `%s`","Todas as Análises do Produto '%s'" -"Allow Guests to Write Reviews","Permitir que os clientes escrevam comentários" -"Approved","Aprovado" -"Are you sure you want to do this?","Tem certeza de que quer fazer isso?" -"Are you sure?","Tem certeza?" -"Average Customer Rating","Média de avaliação do cliente" -"Average Customer Rating:","Média de avaliação do cliente:" -"Back","Voltar" -"Back to Main Product Info","Voltar às principais informações do produto" -"Back to My Reviews","Voltar para Meus comentários" -"Back to Product Reviews","Voltar para Comentários do produto" -"Be the first to review this product","Seja a primeira pessoa a avaliar este produto" -"Catalog Product Review View","Visualizar Comentário do produto do catálogo" -"Catalog Product Reviews List","Lista de comentários do produto do catálogo" -"Created On","Criado Em" -"Customer","Cliente" -"Customer My Account Product Reviews","Avaliação do produto da Minha Conta do cliente" -"Customer My Account Review Details","Detalhes da avaliação da Minha Conta do cliente" -"Customer Reviews","Resenhas de Cliente" -"Customers Reviews","Análises dos clientes" -"Delete","Excluir" -"Delete Review","Excluir avaliação" -"Detailed Rating","Avaliação detalhada" -"Edit Review '%s'","Editar avaliação '%s'" -"Guest","Convidado" -"How do you rate this product?","Como você avalia este produto?" -"ID","Identidade" -"Let us know your thoughts","Conte-nos a sua opinião" -"Manage Ratings","Gerenciar Classificações" -"My Product Reviews","Análises dos meus produtos" -"My Recent Reviews","Minhas análises recentes" -"Name","Nome" -"Name in Store","Noma na loja" -"New Review","Nova Resenha" -"Nickname","Alcunha (Nickname)" -"Nickname can\'t be empty","O apelido não pode estar vazio" -"Not Approved","Não Aprovado" -"Only registered users can write reviews. Please, log in or register","Apenas usuários cadastrados podem escrever avaliações. Por favor, conecte-se ou cadastre-se" -"Pending","Pendente" -"Pending Reviews","Comentários Pendentes" -"Pending Reviews of Customer `%s`","Aguardando revisão do cliente '%s'" -"Please select a product","Escolha um produto" -"Please select one of each of the ratings above","Escolha uma das avaliações acima" -"Posted By","Publicado por" -"Price","Preço" -"Product","Produto" -"Product Name","Nome do produto" -"Product Rating","Avaliação do produto" -"Product Rating:","Avaliação do produto:" -"Product Review (submitted on %s):","Análise do produto (enviada em %s):" -"Product Reviews","Comentários sobre Produto" -"Product SKU","SKU do Produto" -"Products Reviews","Comentários sobre Produtos" -"Qty","Quant." -"Rating:","Avaliação:" -"Review","Análise" -"Review (submitted on %s):","Análise (enviada em %s):" -"Review Details","Detalhes de análise" -"Review Form Fields Before","Analisar antes os campos do formulário" -"Review by %s","Revisar por %s" -"Review by %s","Analisado por %s" -"Review can\'t be empty","Revisão não pode estar vazia" -"Review summary can\'t be empty","Resumo da revisão não pode estar vazio" -"Reviews and Ratings","Resenhas e Avaliações" -"SKU","Unidade de Manutenção de Estoque" -"Save Review","Salvar análise" -"Status","Status" -"Submit Review","Enviar análise" -"Summary Rating","Resumo de avaliação" -"Summary of Review","Resumo de análise" -"Summary of Your Review","Resumo da sua análise" -"Title","Título" -"Type","Tipo" -"Unable to post the review.","Não foi possível publicar a avaliação." -"Update Status","Atualizar status" -"View All Reviews","Visualizar todas as revisões" -"View Details","Visualizar Detalhes" -"Visible In","Visível em" -"Websites","Sites" -"What's your nickname?","Qual é o seu apelido?" -"Write Your Own Review","Escrever sua própria revisão" -"You have submitted no reviews.","Você não enviou nenhuma revisão." -"You're reviewing:","Você está revisando:" -"Your Rating:","Sua avaliação:" -"Your Review (submitted on %s):","Sua revisão (enviada em %s):" -"Your review has been accepted for moderation.","Sua avaliação foi aceita para moderação." diff --git a/app/locale/pt_BR/Mage_Rss.csv b/app/locale/pt_BR/Mage_Rss.csv deleted file mode 100644 index c55e21e50..000000000 --- a/app/locale/pt_BR/Mage_Rss.csv +++ /dev/null @@ -1,57 +0,0 @@ -"%s - Discounts and Coupons","%s - Descontos e cupons" -"%s - Special Products","%s - Produtos especiais" -"%s RSS Feed","%s RSS Feed" -"%s has reached a quantity of %s.","%s atingiu a quantia de %s." -"%s\'s Wishlist","Lista de presente de %s\" -Cannot retrieve the wishlist""" -"Cannot retrieve the wishlist","Não é possível recuperar a lista de permissões" -"Catalog","Catálogo" -"Category Feeds","Feeds da categoria" -"Click for price","Clique para o preço" -"Comment: %s
    ","Comentário: %s
    " -"Coupons/Discounts","Cupons/Descontos" -"Current Status: %s
    ","Status atual: %s
    " -"Customer Name: %s","Nome do cliente: %s" -"Customer Order Status Notification","Notificação de status do pedido do cliente" -"Details for %s #%s","Detalhes para %s #%s" -"Discount","Desconto" -"Discount (%s)","Desconto (%s)" -"Enable RSS","Habilitar RSS" -"Error in processing xml. %s","Erro ao processar xml. %s" -"From:","De:" -"Get Feed","Receber Feed" -"Gift Message","Mensagem de presente" -"Grand Total","Total geral" -"Low Stock Products","Produtos com estoque reduzido" -"Message:","Mensagem:" -"Miscellaneous Feeds","Feeds diversos" -"New Orders","Novos pedidos" -"New Products","Novos Produtos" -"New Products from %s","Novos produtos de %s" -"Notified Date: %s
    ","Data de notificação: %s
    " -"Order # %s Notification(s)","Notificação(ões) de pedido(s) # %s" -"Order #%s created at %s","Pedido #%s criado em %s" -"Pending product review(s)","Esperando avaliação(ões) do produto" -"Product: ""%s"" review By: %s","Produto: ""%s"" avaliado Por: %s" -"Product: %s
    ","Produto: %s
    " -"Products tagged with %s","Produtos marcados com %s" -"Purchased From: %s","Comprado de: %s" -"RSS","RSS" -"RSS Feeds","RSS Feeds" -"RSS Feeds List","Lista de RSS Feeds" -"RSS Feeds Section","Seção de Feeds RSS" -"Review: %s
    ","Avaliação: %s
    " -"Rss Config","Configuração de RSS" -"Shipping & Handling","Transporte & Manuseio" -"Special Products","Produtos especiais" -"Store: %s
    ","Loja: %s
    " -"Subtotal","Subtotal" -"Summary of review: %s
    ","Resumo de avaliação: %s
    " -"Tags Products","Produtos com marcas" -"Tax","Taxas" -"There are no Rss Feeds","Não há Rss Feeds" -"To:","Para:" -"Top Level Category","Categoria de nível máximo" -"Total: %s
    ","Total: %s
    " -"Wishlist","Lista de presentes" -"click here to view the review","clique aqui para visualizar a análise" diff --git a/app/locale/pt_BR/Mage_Rule.csv b/app/locale/pt_BR/Mage_Rule.csv deleted file mode 100644 index f9961dc13..000000000 --- a/app/locale/pt_BR/Mage_Rule.csv +++ /dev/null @@ -1,40 +0,0 @@ -"ALL","TUDO" -"ANY","QUALQUER UM" -"Add","Adicionar" -"Apply","Solicitar" -"Conditions Combination","Combinação de condições" -"Customer Groups must be specified.","Os Grupos de Clientes devem ser especificados." -"End Date must be greater than Start Date.","Data Final deve ser maior do que a Data de Início." -"FALSE","FALSO" -"If %s of these conditions are %s:","Se %s dessas condições são %s:" -"Invalid discount amount.","Quantidade de desconto inválida." -"Open Chooser","Abrir Seletor" -"Perform following actions","Executar seguintes ações" -"Please choose a condition to add...","Por favor escolha uma condição para adicionar..." -"Please choose an action to add...","Por favor, selecione uma ação para adicionar..." -"Remove","Remover" -"TRUE","VERDADEIRO" -"There is no information about associated entity type ""%s"".","Não há informações sobre o tipo de entidade associada ""%s""." -"Websites must be specified.","Os Websites devem ser especificados." -"by","por" -"contains","contém" -"does not contain","não contém" -"does not contains","não contêm" -"equals or greater than","é igual ou maior que" -"equals or less than","é igual ou menor que" -"for","para" -"for greater than","para mais de" -"for or greater than","para ou superior a" -"found","encontrado" -"from","de" -"greater than","superior a" -"is","é" -"is not","não é" -"is not one of","não é um de" -"is one of","é um de" -"less than","menos que" -"not found","não encontrado" -"not from","não de" -"to","para" -"was","era" -"was not","não era" diff --git a/app/locale/pt_BR/Mage_Sales.csv b/app/locale/pt_BR/Mage_Sales.csv deleted file mode 100644 index a9cc332cb..000000000 --- a/app/locale/pt_BR/Mage_Sales.csv +++ /dev/null @@ -1,882 +0,0 @@ -"""%s"" coupon code is not valid.","""%s"" o código do cupom não é válido" -"%s","%s" -"%s / %s rate:","%s / %s preço:" -"%s for %s","%s por %s" -"%s order(s) cannot be canceled","%s pedido(s) não pode ser cancelado" -"%s order(s) have been canceled.","%s ordens foram canceladas." -"%s order(s) have been put on hold.","%s ordens foram colocadas em espera." -"%s order(s) have been released from holding status.","%s ordens foram liberadas do estado de espera." -"%s order(s) were not put on hold.","%s pedido(s) não foi colocado em espera" -"%s order(s) were not released from holding status.","%s pedido(s) não foi tirado do estado de espera" -"* - Enter custom price excluding tax","* - Insira preço personalizado sem imposto" -"* - Enter custom price including tax","* - Insira preço personalizado com imposto" -"* Required Fields","* Campos obrigatórios" -"-- Please Select --","- Por Favor Selecione -" -"-- Please Select Billing Agreement--","-- Por Favor, Escolha o Acordo de Cobrança--" -"About This Order:","Sobre Este Pedido:" -"About This Profile:","Sobre Este Perfil:" -"About Your Invoice","Sobre Sua Fatura" -"About Your Order","Sobre Seu Pedido" -"About Your Refund","Sobre Sua Restituição" -"About Your Shipment","Sobre Seu Pagamento" -"Accept Payment","Pagamento Aceito" -"Accept or Deny Payment","Aceitar ou Recusar Pagamento" -"Account Information","Informações da Conta" -"Action","Ação" -"Actions","Ações" -"Activate","Ativar" -"Active","Ativo" -"Add","Adicionar" -"Add New Address","Adicionar Novo Endereço" -"Add Order Comments","Adicionar Comentários ao Pedido" -"Add Package","Adicionar Pacote" -"Add Products","Adicionar produtos" -"Add Selected Product(s) to Option","Adicionar Produto(s) Selecionado para Opção" -"Add Selected Product(s) to Order","Adicionar Produto(s) Selecionado ao Pedido" -"Add Selected Product(s) to Package","Adicionar Produto(s) Selecionado ao Pacote" -"Add To Order","Adicionar ao Pedido" -"Add Tracking Number","Adicionar Número de Rastreio" -"Add comment to order","Adicionar comentário ao pedido" -"Add new comment to credit memo","Adicionar novo comentário a memorando de crédito" -"Add new comment to shipment","Adicionar novo comentário para pagamento" -"Add new tracking number","Adicionar novo número de rastreio" -"Add to Cart","Adicionar ao carrinho" -"Additional Product Info","Informação Adicional do Produto" -"Address","Endereço" -"Address model is not defined.","Modelo de endereço não definido" -"Adjustment Fee","Taxa de ajustamento" -"Adjustment Refund","Restituição de ajustamento" -"Agreement Information","Informações do acordo" -"Allow Reorder","Permitir rearranjo" -"Amount","Valor" -"Amount: %s.","Total: %s." -"An error occurred while assigning order status. Status has not been assigned.","Ocorreu um erro ao atribuir status da ordem. Status não foi atribuído." -"An error occurred while creating shipping label.","Ocorreu um erro ao criar etiqueta de remessa." -"An error occurred while saving order status. The status has not been added.","Ocorreu um erro ao salvar o estado da encomenda. O status não foi adicionado." -"An error occurred while unassigning order status.","Ocorreu um erro ao remover a atribuição de status do pedido." -"An error occurred while updating the order address. The address has not been changed.","Ocorreu um erro durante a atualização do endereço da ordem. O endereço não foi alterado." -"An item option with code %s already exists.","Uma opção de item com o código %s já existe." -"Anchor Custom Title","Título âncora personalizado" -"Append Comments","Anexar Comentários" -"Apply","Solicitar" -"Apply Coupon Code","Solicitar código do cupom" -"Approved the payment online.","Aprovou o pagamento on-line." -"Are you sure you want to accept this payment?","Tem certeza de que deseja aceitar este pagamento?" -"Are you sure you want to cancel this order?","Tem certeza de que deseja cancelar esta ordem?" -"Are you sure you want to delete all items from shopping cart?","Você tem certeza que quer excluir todos os itens do carrinho de compras?" -"Are you sure you want to deny this payment?","Tem certeza que quer negar este pagamento?" -"Are you sure you want to do this?","Tem certeza de que quer fazer isso?" -"Are you sure you want to send Creditmemo email to customer?","Tem certeza de que quer enviar e-mail Creditmemo ao cliente?" -"Are you sure you want to send Invoice email to customer?","Tem certeza de que deseja enviar e-mail fatura ao cliente?" -"Are you sure you want to send Shipment email to customer?","Tem certeza de que deseja enviar e-mail de Remessa ao cliente?" -"Are you sure you want to send order email to customer?","Tem certeza de que deseja enviar e-mail de encomenda ao cliente?" -"Are you sure you want to void the payment?","Tem certeza de que deseja cancelar o pagamento?" -"Are you sure?","Tem certeza?" -"Are you sure? This order will be canceled and a new one will be created instead","Você tem certeza? Este pedido será cancelado e ao invés um novo será criado" -"Assign Order Status to State","Atribuir Status do Pedido para o Estado" -"Assign Status to State","Atribuir Status para o Estado" -"Assignment Information","Informação de Atribuição" -"At least a payment ID must be set.","Ao menos uma identificação de pagamento deve ser configurada." -"Authorization","Autorização" -"Authorized amount of %s.","Valor autorizado de %s." -"Authorizing amount of %s is pending approval on gateway.","Autorização de valor %s está pendente de aprovação no portal." -"Back","Voltar" -"Back to Billing Agreements","Voltar para Contratos de Faturamento" -"Back to My Orders","Voltar para Minhas Compras" -"Back to Recurring Profiles","Voltar para Perfis Recorrentes" -"Backordered","Pendente" -"Bestsellers","Mais vendidos" -"Bill to Name","Faturar para Nome" -"Billing","Faturamento" -"Billing Address","Endereço de faturamento" -"Billing Agreement","Contrato de faturamento" -"Billing Agreement # %s","Contrato de Faturamento # %s" -"Billing Agreement #%s","Contrato de Faturamento # %s" -"Billing Agreement View","Visualização de Contrato de Faturamento" -"Billing Agreements","Contratos de faturamento" -"Billing Last Name","Último Nome do Faturamento" -"Billing ZIP Code","Código Postal do Faturamento" -"Buy %s for price %s","Comprar %s pelo preço %s" -"CSV","CSV" -"Cancel","Cancelar" -"Cancel credit memo","Cancelar memorando de crédito" -"Cancel invoice","Cancelar fatura" -"Cancel order","Cancelar compra" -"Canceled","Cancelado" -"Canceled order offline.","Pedido cancelado offline." -"Canceled order online.","Pedido cancelado online." -"Cannot add order history.","Não é possível adicionar o histórico de pedidos." -"Cannot create an empty shipment.","Não é possível criar uma remessa vazia." -"Cannot determine the field name.","Não é possível determinar o nome do campo." -"Cannot do invoice for order.","Não é possível fazer a fatura para o pedido." -"Cannot do shipment for order.","Não é possível fazer a remessa para o pedido." -"Cannot get order instance","Não é possível obter a instância do pedido" -"Cannot get the order instance.","Não é possível obter a instância do pedido." -"Cannot register an existing credit memo.","Não é possível registrar uma nota de crédito existente." -"Cannot register existing invoice","Não é possível registrar fatura existente" -"Cannot register existing shipment","Não é possível registrar remessa existente" -"Capture","Captura" -"Capture Amount","Captura de Valor" -"Capture Offline","Captura Offline" -"Capture Online","Captura Online" -"Capture invoice","Captura de fatura" -"Captured amount of %s online.","Quantidade capturada de %s online." -"Capturing amount of %s is pending approval on gateway.","Captura de valor de %s está pendente de aprovação no portal." -"Carrier","Portador" -"Carrier/Method","Transportador/Método" -"Change status, add comments","Mudança de status, adicionar comentários" -"Changing address information will not recalculate shipping, tax or other order amount.","Mudança de informações de endereço não recalculará o transporte, taxa ou outro valor do pedido." -"Checkout Totals Sort Order","Verificação dos Totais de Ordem do Pedido" -"City","Cidade" -"Clear Shopping Cart","Limpar Carrinho de Compras" -"Click to change shipping method","Clique para alterar método de remessa" -"Close","Fechar" -"Closed","Fechar" -"Comma-separated.","Separados por vírgula." -"Comment","Comentário" -"Comment Text","Texto do comentário" -"Comments","Comentários" -"Comments History","Histórico de comentários" -"Company","Companhia" -"Complete","Completar" -"Configure","Configurar" -"Configure and Add to Order","Configurar e adicionar ao pedido" -"Contents","Conteúdos" -"Continue","Continue" -"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","Controlar se o IP do cliente é exibido nos pedidos, faturas, remessas e memorandos de crédito." -"Country","País" -"Coupons","Cupons" -"Create","Criar" -"Create New Customer","Criar novo cliente" -"Create New Order","Criar novo pedido" -"Create New Order Status","Criar novo status de pedido" -"Create New Order for %s","Criar novo pedido para %s" -"Create New Order for %s in %s","Criar novo pedido para %s em %s" -"Create New Order for New Customer","Criar novo pedido para novo cliente" -"Create New Order for New Customer in %s","Criar novo pedido para novo cliente em %s" -"Create New Status","Criar novo status" -"Create Order","Criar Pedido" -"Create Packages","Criar Pacotes" -"Create Shipment","Criar Frete" -"Create Shipping Label","Criar Rótulo de Frete" -"Create Shipping Label...","Criar Rótulo de Frete..." -"Create new credit memo for order","Criar novo memorando de crédito para o pedido" -"Create new invoice for order","Criar nova fatura para pedido" -"Create new shipment for order","Criar novo frete para pedido" -"Create...","Criar..." -"Created At","Criada Em" -"Created billing agreement #%s.","Criado o contrato de faturamento nº %s." -"Created:","Criada:" -"Credit Memo","Criar Memorando" -"Credit Memo #","Nº do memorando de crédito" -"Credit Memo # ","Credit Memo # " -"Credit Memo #%1$s | %3$s | %2$s (%4$s)","Criar Memorando Nº %1$s | %3$s | %2$s (%4$s)" -"Credit Memo Comment Email Sender","Criar Comentário de Memorando - Enviar E-mail" -"Credit Memo Comment Email Template","Criar Comentário de Memorando - Modelo de E-mail" -"Credit Memo Comment Email Template for Guest","Criar Comentário de Memorando - Modelo de E-mail para Convidado" -"Credit Memo Comments","Criar Comentários de Memorando" -"Credit Memo Email Sender","Comentário de Memorando de Crédito - Enviar E-mail" -"Credit Memo Email Template","Comentário de Memorando de Crédito - Modelo de E-mail" -"Credit Memo Email Template for Guest","Comentário de Memorando de Crédito - Modelo de E-mail para Convidado" -"Credit Memo Update","Memorando de Crédito: Atualizar" -"Credit Memo Update for Guest","Memorando de Crédito: Atualizar para Convidado" -"Credit Memos","Notas de Crédito" -"Credit memo canceling problem.","Problema de cancelamento do memorando de crédito." -"Credit memo cannot be canceled.","Memorando de crédito não pode ser cancelado." -"Credit memo has been created automatically","O memorando de crédito foi criado automaticamente" -"Custom Price","Preço Aduaneiro" -"Custom Value","Valor Aduaneiro" -"Customer","Cliente" -"Customer Can Define Start Date","O cliente pode definir a data de início" -"Customer Email","E-mail do Cliente" -"Customer Group","Grupo de Clientes" -"Customer Last Name","Último Nome do Cliente" -"Customer My Account Order Creditmemo View","Ver Pedido Creditmemo da Minha Conta do Cliente" -"Customer My Account Order History","Histórico de Pedido do Cliente" -"Customer My Account Order Invoice View","Ver Faturamento do Pedido do Cliente" -"Customer My Account Order Shipment View","Ver Pedidos Pagos do Cliente" -"Customer My Account Order View","Ver Pedido do Cliente" -"Customer Name","Nome do Cliente" -"Customer\'s Current Activities","Atividades Atuais do Cliente" -"Customs Value","Valores Aduaneiros" -"Date","Data" -"Date Shipped","Enviado dia" -"Default Status","Status Padrão" -"Default Template","Modelo padrão" -"Default logo, will be used in PDF and HTML documents.
    (jpeg, tiff, png) If you see image distortion in PDF, try to use larger image","O logotipo padrão será usado nos documentos PDF e HTML.
    (jpeg, tiff, png) Se você perceber uma distorção de imagem em um PDF, tente usar uma imagem maior" -"Delete","Excluir" -"Delete Package","Apagar Pacote" -"Denied the payment online.","Pagamento on-line recusado" -"Deny Payment","Recusar o Pagamento" -"Description Message","Mensagem de Descrição" -"Discount","Desconto" -"Discount (%s)","Desconto (%s)" -"Discount Amount","Quantia de Desconto" -"Display Order ID in Header","Mostrar ID da Ordem (Pedido) no Cabeçalho" -"Edit","Editar" -"Edit Order #%s","Editar Ordem (Pedido) #%s" -"Edit Order %s %s Address","Editar Endereço da Ordem (Pedido) %s %s" -"Edit Order Status","Editar Status da Ordem (Pedido)" -"Email","E-mail" -"Email Address","Endereço de e-mail" -"Email Copy of Credit Memo","Enviar Email Cópia da Nota de Crédito" -"Email Copy of Invoice","Enviar Email Cópia da Fatura" -"Email Copy of Shipment","Enviar Email Cópia da Expedição" -"Email Order Confirmation","Enviar EMail da Confirmação da Ordem (Pedido)" -"Enable","Ativar" -"Enabled","Ativado" -"Enter the billing last name and email/ZIP as in the order billing address","Insira o último nome do faturamento e email/CEP como no endereço de cobrança da ordem (pedido)" -"Entered data is incorrect. Please try again.","Dados inseridos incorretos. Por favor tente novamente." -"Error to Show in Shopping Cart","Erro ao Mostrar no Carrinho de Compras" -"Excel XML","Excel XML" -"Excl. Tax","Excluir taxas" -"Expired","Expirado" -"Explanation","Explicação" -"Failed to cancel the billing agreement.","Falha ao cancelar o contrato de faturamento." -"Failed to create billing agreement for this order.","Falha ao criar contrato de faturamento para este pedido." -"Failed to finish billing agreement wizard.","Falha ao concluir wizard do contrato de faturamento." -"Failed to send the order email.","Falha ao enviar e-mail do pedido." -"Failed to start billing agreement wizard.","Falha ao iniciar wizard do contrato de faturamento." -"Failed to update the payment.","Falha ao atualizar o pagamento." -"Failed to update the profile.","Falha ao atualizar o perfil." -"Failed to void the payment.","Falha ao anular o pagamento." -"Fetch","Buscar" -"File extension not known or unsupported type in the following shipment: %s","Extensão de arquivo desconhecida ou tipo incompatível no seguinte frete: %s" -"Find Order By:","Encontrar Pedido Por:" -"First Name","Primeiro nome" -"From","De" -"From Name","Nome do Remetente" -"From:","De:" -"G.T. (Base)","Total Geral (Moeda-Base)" -"G.T. (Purchased)","Total Geral (Moeda da Compra)" -"General","Geral" -"General Information","Informações gerais" -"Get Payment Update","Obter Atualização de Pagamento" -"Get Update","Obter Atualização" -"Get shipping methods and rates","Obter tipos e taxas de frete" -"Gift Message","Mensagem de presente" -"Gift Message for This Order","Mensagem de Presente para Este Pedido" -"Gift Message for the Entire Order","Mensagem de Presente para o Pedido Completo" -"Gift Message for this Order","Mensagem de Presente para Este Pedido" -"Gift Options","Opções de presente" -"Gift Wrapping for the Entire Order","Embrulho para o Pedido Total" -"Girth","Circunferência" -"Go to Home Page","Go to Home Page" -"Grand Total","Total geral" -"Grand Total to be Charged","Total a ser Cobrado" -"Guest","Convidado" -"Height","Altura" -"Hide Customer IP","Ocultar IP do Cliente" -"Hold","Suspender" -"Hold action is not available.","Ação de suspender não está disponível." -"Hold order","Suspender compra" -"Home","Home" -"ID","Identidade" -"ID #","Identificação #" -"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"". Credit Memo has not been created. Please create offline Credit Memo.","IPN ""Reembolsado"". Reembolso emitido pelo comerciante. Notificação registrada sobre o montante reembolsado de %s. ID da transação: ""%s"". O Memorando de Crédito não foi criado. Crie um Memorando de Crédito offline." -"If empty, the default description above will be used.","Se estiver em branco, a descrição-padrão acima será usada." -"If empty, the default error above will be used.","Se estiver em branco, o erro-padrão acima será usado." -"If the invoice was created offline, try creating an offline creditmemo.","Se a fatura foi criada offline, tente criar uma nota de crédito offline." -"Incl. Tax","Incluir taxas" -"Information","Informações" -"Initial Fee","Taxa inicial" -"Initial Fees","Taxas Iniciais" -"Initial period payment","Período Inicial de Pagamento" -"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","Informações insuficientes para criar etiqueta(s) de envio. Por favor verifique suas Informações de Loja e Configurações de Envio" -"Invalid block: %s.","Bloco inválido: %s." -"Invalid carrier specified.","Transportador especificado inválido." -"Invalid draw line data. Please define ""lines"" array.","Dados inválidos de linha de retirada. Por favor, defina matriz de ""linhas""." -"Invalid entity model","Modelo de entidade inválido" -"Invalid item option format.","Formato de opção de item inválido." -"Invalid qty to invoice item ""%s""","Qtde. inválida para faturar item ""%s""" -"Invalid qty to refund item ""%s""","Qtde. inválida para reembolsar item ""%s""" -"Invalid qty to ship for item ""%s""","Qtde. inválida para entregar item ""%s""" -"Invalid renderer model","Modelo de renderização inválido" -"Invalid request for adding product to quote.","Solicitação inválida para adicionar produto a orçamento." -"Invalid value(s) for Qty to Ship","Valor(es) inválido(s) para Qtd a enviar" -"Invoice","Fatura" -"Invoice #","Nº da fatura" -"Invoice # ","Invoice # " -"Invoice #%1$s | %2$s | %4$s (%3$s)","Fatura Nº %1$s | %2$s | %4$s (%3$s)" -"Invoice #%s","Fatura Nº %s" -"Invoice Comment Email Sender","Comentário sobre Fatura - Enviar E-mail" -"Invoice Comment Email Template","Comentário sobre Fatura - Modelo de E-mail" -"Invoice Comment Email Template for Guest","Comentário sobre Fatura - Modelo de E-mail para Convidado" -"Invoice Comments","Comentários sobre Fatura" -"Invoice Date","Data da Fatura" -"Invoice Email Sender","Enviar Fatura por E-mail" -"Invoice Email Template","Modelo de E-mail para Fatura" -"Invoice Email Template for Guest","Modelo de E-mail de Fatura para Convidado" -"Invoice Update","Atualizar Fatura" -"Invoice Update for Guest","Atualizar Fatura para Convidado" -"Invoice and Packing Slip Design","Design para Fatura e Guia de Remessa" -"Invoice and Ship","Fatura e Frete" -"Invoice canceling problem.","Problema no cancelamento da fatura." -"Invoice cannot be canceled.","A fatura não pode ser cancelada." -"Invoice cannot be captured.","A fatura não pode ser captada." -"Invoice cannot be voided.","A fatura não pode ser anulada." -"Invoice capturing problem.","Problema no recebimento da fatura" -"Invoice void problem","Problema na anulação da fatura" -"Invoice will be created without communication with payment gateway.","A fatura será criada sem comunicação com o gateway de pagamentos" -"Invoiced","Faturado" -"Invoices","Faturas" -"Is Closed","Está Fechado" -"Item","Item" -"Item Status","Status do item" -"Item object is not specified.","Objeto do item não especificado." -"Item options declaration error.","Erro na declaração de opções do item." -"Item ordered qty","Quantidade solicitada do item" -"Item qty declaration error.","Erro na declaração da quantidade do item" -"Items","Itens" -"Items Invoiced","Itens faturados" -"Items Ordered","Itens pedidos" -"Items Refunded","Itens reembolsados" -"Items Shipped","Itens remetidos" -"Items in the Package","Itens no pacote" -"Items maximum quantity or price do not allow checkout.","Quantidade máxima de itens ou preço não permitem o fechamento da compra." -"Items options declaration error.","Erro na declaração de opções dos itens." -"Items to Refund","Itens para reembolso" -"Items to Ship","Itens para remessa" -"Key","Senha" -"Last Name","Último nome" -"Last Ordered Items","Últimos itens pedidos" -"Last status can\'t be unassigned from state.","O último estado não pode ser revertido." -"Length","Comprimento" -"Link to the New Order","Link para o Novo Pedido" -"Link to the Previous Order","Link para o Pedido Anterior" -"Logo for HTML Print View","Logotipo para Visualização em HTML" -"Logo for HTML documents only. If empty, default will be used.
    (jpeg, gif, png)","Logotipo exclusivo para documentos HTML. Se vazio, será usado o padrão.
    (jpeg, gif, png)" -"Logo for PDF Print-outs (200x50)","Logotipo para Impressões em PDF (200x50)" -"Make Check payable to:","Faça Cheque nominal a:" -"Manage","Gerenciar" -"Maximum amount available to refund is %s","Quantia máxima a ser reembolsada: %s" -"Maximum shipping amount allowed to refund is: %s","Valor máximo do frete passível de reembolso: %s" -"Message","Mensagem" -"Message:","Mensagem:" -"Minimum Amount","Valor Mínimo" -"Minimum Order Amount","Valor Mínimo do Pedido" -"Mixed","Misto" -"Most Viewed","Mais vistos" -"Most Viewed Products Report","Relatório dos Produtos mais Vistos" -"Move to Shopping Cart","Mover para Carrinho de Compras" -"Move to Wishlist","Mover para lista de presentes" -"Multi-address Description Message","Mensagem Descritiva para Vários Endereços" -"Multi-address Error to Show in Shopping Cart","Erro Relativo a Vários Endereços Exibido no Carrinho" -"My Orders","Meus Pedidos" -"My Orders - Details","Meus Pedidos - Detalhes" -"N/A","Indisponível" -"Name","Nome" -"New","Novo" -"New Billing Agreement","Novo Contrato de Faturamento" -"New Credit Memo","Novo Memorando de Crédito" -"New Credit Memo for Guest","Novo Memorando de Crédito para Convidado" -"New Credit Memo for Invoice #%s","Novo Memorando de Crédito para Fatura #%s" -"New Credit Memo for Order #%s","Nota de Novo Crédito para Pedido nº %s" -"New Invoice","Nova Fatura" -"New Invoice and Shipment for Order #%s","Nova Fatura e Frete para Pedido Nº %s" -"New Invoice for Guest","Nova Fatura para Convidado" -"New Invoice for Order #%s","Nova Fatura para Pedido Nº %s" -"New Order","Novo Pedido" -"New Order Confirmation Email Sender","Novo Pedido - Enviar E-mail de Confirmação" -"New Order Confirmation Template","Novo Pedido - Modelo de Confirmação" -"New Order Confirmation Template for Guest","Novo Pedido - Modelo de Confirmação para Convidado" -"New Order RSS","Novo Pedido - RSS" -"New Order Status","Status do Novo Pedido" -"New Order for Guest","Novo Pedido para Convidado" -"New Shipment","Nova Remessa" -"New Shipment for Guest","Novo Frete para Convidado" -"New Shipment for Order #%s","Novo Frete para Pedido Nº %s" -"Newsletter Subscription","Assinatura do boletim informativo" -"No","Não" -"No Items","Nenhum Item" -"No Items To Refund","Nenhum Item para Reembolso" -"No Payment Methods","Nenhuma Forma de Pagamento" -"No detail for number ""%s""","Nenhum detalhe para número ""%s""" -"No information available.","Nenhuma informação disponível" -"No items","Nenhum item" -"No order(s) were put on hold.","Nenhum pedido suspenso temporariamente." -"No order(s) were released from holding status.","Nenhum pedido liberado do estado de espera." -"No ordered items","Nenhum item solicitado" -"No shipping information available","Não há informações de remessa" -"Nominal Items","Itens nominais" -"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","O item nominal deve ser comprado individualmente. Para continuar, remova os outros itens da cotação." -"Nominal order registered.","Pedido nominal registrado." -"Not Capture","Não capturado" -"Not Initialized","Não inicializado" -"Not Notified","Não notificado" -"Not enough valid data to save the parent transaction ID.","Não há dados válidos suficientes para salvar a ID de transação principal." -"Notification Not Applicable","Notificação não aplicável" -"Notified","Notificado" -"Notify Customer by Email","Notificar cliente por e-mail" -"Number","Número" -"Number of Invoiced Orders","Número de pedidos faturados" -"Number of Orders","Número de pedidos" -"Number of Refunded Orders","Número de pedidos reembolsados" -"OK","OK" -"Offline Refunded","Reembolsado offline" -"On Hold","Em espera" -"Online Refunded","Reembolsado online" -"Order","Pedido" -"Order #","Nº do pedido" -"Order # ","Order # " -"Order # %s","Pedido nº %s" -"Order # %s %s | %s","Order nº %s %s | %s" -"Order #%s","Pedido #%s" -"Order #%s - %s","Pedido nº %s - %s" -"Order API","API do pedido" -"Order Address Information","Informação de endereço do pedido" -"Order Comment","Comentário do pedido" -"Order Comment Email Sender","Comentário do pedido para remetente de email" -"Order Comment Email Template","Comentário do pedido para modelo de email" -"Order Comment Email Template for Guest","Comentário do pedido para modelo de email para convidado" -"Order Comments","Comentários do pedido" -"Order Credit Memos","Aviso de crédito do pedido" -"Order Currency:","Moeda do pedido:" -"Order Date","Data do pedido" -"Order Date (%s)","Data do pedido (%s)" -"Order Date: ","Data do pedido:" -"Order Date: %s","Data do pedido: %s" -"Order Details","Detalhes do pedido" -"Order Grand Total","Total geral do pedido" -"Order History","Histórico do pedido" -"Order History Info","Informação do histórico do pedido" -"Order ID","ID da Ordem" -"Order Information","Informação do pedido" -"Order Invoices","Faturas do pedido" -"Order Shipments","Remessas de pedidos" -"Order State","Situação do pedido" -"Order Status","Status do pedido" -"Order Status Information","Informação do status do pedido" -"Order Statuses","Estados Atuais de Pedidos" -"Order Subtotal","Subtotal do Pedido" -"Order Taxes Report Grouped by Tax Rates","Relação de Impostos do Pedido Agrupados por Alíquotas" -"Order Total","Total do Pedido" -"Order Totals","Totais da Ordem" -"Order Update","Atualização do Pedido" -"Order Update for Guest","Atualização do Pedido para Convidado" -"Order View","Visualizar Pedido" -"Order credit memo","Pedir memorando de crédito" -"Order does not allow to be canceled.","O pedido não permite ser cancelado." -"Order invoice","Fatura do pedido" -"Order is suspended as its authorizing amount %s is suspected to be fraudulent.","O pedido está suspenso pois há suspeita de que o montante de autorização %s seja fraudulento." -"Order is suspended as its capture amount %s is suspected to be fraudulent.","O pedido está suspenso devido à suspeita de seu valor processado %s ser fraudulento." -"Order object is not specified.","O objeto do pedido não está especificado." -"Order saving error: %s","Erro na gravação do pedido: %s" -"Order shipments","Fretes do pedido" -"Order status does not exist.","Não existe estado atual para o pedido." -"Order status with the same status code already exist.","Já existe estado atual de pedido com o mesmo código." -"Order was placed using %s","O pedido foi realizado com o uso de %s" -"Ordered","Solicitado" -"Ordered amount of %s.","Valor ordenado de %s." -"Ordering amount of %s is pending approval on gateway.","Valor ordenado de %s está pendente de aprovação no gateway." -"Orders","Ordens" -"Orders and Returns","Pedidos e Devoluções" -"Orders and Returns Search Form","Busca de Pedidos e Devoluções" -"Original Price","Preço Original" -"Original order item that recurring payment profile correspondss to.","Item de pedido original a que corresponde perfil de pagamento recorrente." -"PDF Credit Memos","Avisos de crédito em PDF" -"PDF Invoices","Faturas em PDF" -"PDF Packingslips","Guias de remessas em PDF" -"PDF Print-outs","Impressões de PDF" -"PDF object is not specified.","Objeto de PDF não especificado." -"PDF page object is not specified.","Página do objeto em PDF não especificado." -"PDF total model should extend Mage_Sales_Model_Order_Pdf_Total_Default","A extensão total do modelo de PDF deve ser Mage_Sales_Model_Order_Pdf_Total_Default" -"Package","Embalagem" -"Package types are disregarded for USPS domestic shipments.","Desconsidera-se o tipo de encomenda para frete doméstico do correio dos EUA." -"Packages","Embalagens" -"Packingslip # ","Guia de remessa nº" -"Paid","Pago" -"Paid Amount","Valor pago" -"Parent Transaction ID","ID da Transação Parental" -"Parent transaction ID must have a transaction ID.","ID de transação principal deve ter uma ID de transação." -"Partial","Parcial" -"Payment Failed","Falha no pagamento" -"Payment Information","Informação de Pagamento" -"Payment Method","Método de Pagamento" -"Payment Method Name","Nome do método de pagamento" -"Payment Method:","Método de pagamento" -"Payment Review","Revisão do pagamento" -"Payment disallow storing objects.","Pagamento não permite armazenar objetos." -"Payment transactions disallow storing objects.","Transações de pagamento não permitem armazenar objetos." -"Payment type","Tipo de pagamento" -"Payment update has been made.","Atualizações no pagamento foram feitas." -"Pending","Pendente" -"Pending Payment","Pagamento Pendente" -"Period","Período" -"Place Order Using Billing Agreements","Faça o Pedido Usando Acordos de Faturamento" -"Placed from IP","Situado no IP" -"Please Select Products to Add","Escolha os produtos a serem adicionados" -"Please Select a Customer","Selecione um Cliente" -"Please Select a Store","Selecione uma loja" -"Please check billing address information. %s","Verifique os dados do endereço de cobrança. %s" -"Please check shipping address information. %s","Verifique os dados do endereço de envio. %s" -"Please define PDF object before using.","Defina o objeto PDF antes do uso" -"Please enter positive number in this field.","Insira um número positivo neste campo." -"Please select a valid payment method.","Por favor selecione um método de pagamento válido." -"Please specify a shipping method.","Especifique um método de envio." -"Please specify a valid grid column alias name that exists in grid table.","Especifique um nome na coluna válida que exista na tabela." -"Price","Preço" -"Print","Imprimir" -"Print All","Imprimir tudo" -"Print All Invoices","Imprimir todas as faturas" -"Print All Refunds","Imprimir todos os reembolsos" -"Print All Shipments","Imprima todos os Envios" -"Print Credit Memos","Imprima Crédito Memos" -"Print Invoice","Imprima Faturamento" -"Print Invoices","Imprimir faturas" -"Print Order","Imprimir pedido" -"Print Order # %s","Imprimir pedido nº %s" -"Print Packingslips","Imprima Packinglips" -"Print Refund","Imprima Reembolso" -"Print Shipment","Imprimir expedição" -"Print Shipping Label","Imprima a Etiqueta de Envio" -"Print Shipping Labels","Imprimir Etiquetas de Envio" -"Processing","Processando" -"Product","Produto" -"Product Name","Nome do produto" -"Products","Produtos" -"Products Bestsellers Report","Relatório dos Produtos Mais Vendidos" -"Products in Comparison List","Produtos na Lista de Comparação" -"Products should be added to package(s)","Produtos devem ser adicionados ao(s) pacote(s)" -"Profile #%s","Perfil #%s" -"Profile Information","Informação do Perfil" -"Profile State","Estado do perfil" -"Profit","Lucro" -"Promotion Coupons Usage Report","Relatório de uso dos cupons promocionais" -"Proper payment object must be set.","O pagamento adequado deve ser definido" -"Purchase Order Number:","Número de Ordem de Compra:" -"Purchased From","Comprado de" -"Purchased From (Store)","Comprado de (Loja)" -"Purchased Item","Item Comprado" -"Purchased On","Comprado Em" -"Qty","Quant." -"Qty Invoiced","Quant. faturada" -"Qty Ordered","Qtde Pedida" -"Qty Shipped","Quantidade remessada" -"Qty To Add","Quant. a adicionar" -"Qty to Add","Quantidade para adicionar" -"Qty to Invoice","Qtde para Fatura" -"Qty to Refund","Quant. para reembolso" -"Qty to Ship","Qtde para Envio" -"Quantity Ordered","Quantidade pedida" -"Quote item id is not received.","A identidade do item cotado não foi recebida." -"Quote item is not loaded.","O item cotado não foi carregado." -"Rate","Taxa" -"Recent Orders","Pedidos Recentes" -"Recently Compared Products","Produtos Recentemente Comparados" -"Recently Viewed","Recentemente Visto" -"Recently Viewed Products","Produtos Recentemente Vistos" -"Recurring Profile # %s","Perfil Recorrente # %s" -"Recurring Profile Initial Fee","Taxa Inicial de Perfil Recorrente" -"Recurring Profiles","Perfis Recorrentes" -"Recurring Profiles (beta)","Perfis Recorrentes (beta)" -"Reference ID","Identificação de Referência" -"Reference ID:","ID de Referência:" -"Refresh","Atualizar" -"Refund","Reembolso" -"Refund #","Reembolso #" -"Refund #%s","Reembolso #%s" -"Refund Amount","Valor do Reembolso" -"Refund Offline","Reembolso Offline" -"Refund Shipping","Reembolso do Envio" -"Refund Shipping (Excl. Tax)","Reembolso do Envio (Imp. Excl.)" -"Refund Shipping (Incl. Tax)","Reembolso do Envio (Imp. Incl.)" -"Refund Totals","Totais de Reembolso" -"Refunded","Reembolsado" -"Refunded amount of %s offline.","Valor reembolsado de %s offline." -"Refunded amount of %s online.","Total de reembolso de %s on-line" -"Refunds","Reembolsos" -"Registered a Void notification.","Registrada uma notificação Void." -"Registered notification about approved payment.","Notificação registrada sobre pagamento aprovado" -"Registered notification about captured amount of %s.","Notificação registrada sobre quantia capturada de %s." -"Registered notification about denied payment.","Aviso sobre pagamento recusado registrado." -"Registered notification about refunded amount of %s.","Notificação registrada sobre quantia reembolsada de %s." -"Registered update about approved payment.","Atualização registrada sobre pagamento aprovado" -"Registered update about denied payment.","Atualização registrada sobre pagamento recusado." -"Regular Payment","Pagamento Regular" -"Related Orders","Pedidos Relacionados" -"Remove","Remover" -"Remove Coupon Code","Remover código do cupom" -"Remove tracking number","Remova número de rastreio" -"Reorder","Rearranjar" -"Retrieve credit memo info","Recuperar dados da nota de crédito" -"Retrieve credit memo information","Recuperar informações de memorando de crédito" -"Retrieve credit memo list","Recuperar lista de notas de crédito" -"Retrieve invoice info","Recuperar informações de fatura" -"Retrieve invoice information","Recuperar informações de fatura" -"Retrieve list of credit memos by filters","Recuperar lista de notas de crédito por filtros" -"Retrieve list of invoices by filters","Recuperar lista de fatura por filtros" -"Retrieve list of orders by filters","Recuperar lista de pedidos por filtros" -"Retrieve list of shipments by filters","Recuperar lista de envios por filtros" -"Retrieve order information","Recuperar informação de pedidos" -"Retrieve orders info","Recuperar informação de pedidos" -"Retrieve shipment info","Recuperar informação de envios" -"Retrieve shipment information","Recuperar informação de envios" -"Return to Stock","Retornar ao Estoque" -"Returned","Retornado" -"Returns","Receita" -"Revenue","Receita" -"Row Subtotal","Coluna de subtotal" -"Row Total","Total de Linha" -"SKU","Unidade de Manutenção de Estoque" -"Sales","Vendas" -"Sales Discount","Desconto Sobre Vendas" -"Sales Emails","E-mails de Vendas" -"Sales Emails Section","Seção de E-mails Comerciais" -"Sales Invoice Print View","Vista de Impressão da Fatura de Venda" -"Sales Items","Itens d e Vendas" -"Sales Order Print View","Vista de Impressão da Ordem de Venda" -"Sales Section","Seção de vendas" -"Sales Shipment Print View","Modo de exibição da remessa das vendas" -"Sales Shipping","Remessa de vendas" -"Sales Tax","Imposto sobre vendas" -"Sales Total","Total de vendas" -"Same As Billing Address","Mesmo endereço que o de cobrança" -"Save Order Address","Salvar Endereço do Pedido" -"Save Status","Salvar status" -"Save Status Assignment","Salvar atribuição de status" -"Save in address book","Salvar no catálogo de endereços" -"Schedule","Programa" -"Select","Selecione" -"Select All","Selecionar Tudo" -"Select from existing customer addresses:","Selecionar um endereço de cliente existente" -"Selected option(s) or their combination is not currently available.","A(s) opção(ões) selecionada(s) ou sua combinação não está(ão) disponível(is) atualmente." -"Send Credit Memo Comment Email Copy To","Enviar cópia do email de comentário de Aviso de Crédito para" -"Send Credit Memo Comments Email Copy Method","Método para enviar cópia do email de comentários de Aviso de Crédito" -"Send Credit Memo Email Copy Method","Método para enviar cópia de email de Aviso de Crédito" -"Send Credit Memo Email Copy To","Enviar cópia do email de Aviso de Crédito para" -"Send Email","Enviar email" -"Send Invoice Comment Email Copy To","Enviar cópia do email do comentário da fatura para" -"Send Invoice Comments Email Copy Method","Enviar cópia dos comentários da fatura por e-mail" -"Send Invoice Email Copy Method","Método para enviar cópia do email da fatura" -"Send Invoice Email Copy To","Enviar cópia da fatura por e-mail para" -"Send Order Comment Email Copy To","Enviar cópia do email de comentários do pedido para" -"Send Order Comments Email Copy Method","Método de envio do email de comentários do pedido" -"Send Order Email","Enviar email de pedido" -"Send Order Email Copy Method","Enviar cópia do pedido por e-mail" -"Send Order Email Copy To","Enviar Cópia do Pedido por e-mail para" -"Send Sales Emails","Enviar e-mail de vendas" -"Send Shipment Comment Email Copy To","Enviar Cópia dos Comentários de Envio para" -"Send Shipment Comments Email Copy Method","Método de envio da cópia do email de comentários de remessa" -"Send Shipment Email Copy Method","Método de envio da cópia do email de remessas" -"Send Shipment Email Copy To","Enviar Cópia do e-mail de envio para" -"Send Tracking Information","Enviar informações para rastreamento" -"Send shipment info","Enviar informações do despacho" -"Set order for existing transactions not allowed","Definir ordem de transações não permitidas existentes" -"Ship","Envio" -"Ship To","Enviar para" -"Ship to Name","Enviar em nome de" -"Ship to:","Enviar para:" -"Shipment","Remessa" -"Shipment #","Remessa #" -"Shipment #%1$s | %3$s (%2$s)","Remessa #%1$s | %3$s (%2$s)" -"Shipment #%s","Remessa #%s" -"Shipment Comment Email Sender","Remetente do E-mail de Comentários de Remessa" -"Shipment Comment Email Template","Modelo de E-mail de Comentários de Remessa" -"Shipment Comment Email Template for Guest","Modelo de email para comentário de remessas para convidado" -"Shipment Comments","Comentários de Envio" -"Shipment Email Sender","Remetente do email da remessa" -"Shipment Email Template","Modelo de E-mail de remessa" -"Shipment Email Template for Guest","Modelo de e-mail de remessa para convidado" -"Shipment Update","Atualização de Remessa" -"Shipment Update for Guest","Atualização de remessa para convidado" -"Shipments","Envios" -"Shipped","Enviado" -"Shipped By","Enviado por" -"Shipping","Remessa" -"Shipping & Handling","Transporte & Manuseio" -"Shipping & Handling","Transporte & Manuseio" -"Shipping & Handling Information","Informações sobre remessa e manuseio" -"Shipping Address","Endereço de Envio" -"Shipping Amount","Valor do Frete" -"Shipping Information","Dados de Frete" -"Shipping Method","Tipo de Frete" -"Shipping Method:","Método de Envio:" -"Shipping Refund","Reembolso da entrega" -"Shipping and Tracking Information","Informações de Envio e Rastreio" -"Shopping Cart","Carrinho de compras" -"Show Packages","Mostrar pacotes" -"Signature Confirmation","Confirmação de Assinatura" -"Signed Up From","Inscrição de" -"Size","Tamanho" -"Sku","SKU" -"Sold to:","Vendido para:" -"Some item options or their combination are not currently available.","Algumas opções do item ou sua combinação não estão disponíveis atualmente." -"Some of the products below do not have all the required options.","Alguns dos produtos abaixo não têm todas as opções necessárias." -"Some of the selected options are not currently available.","Algumas das opções selecionadas não estão disponíveis atualmente." -"Sorry, no quotes are available for this order at this time.","Desculpe, não há citações disponíveis neste momento para esta ordem." -"Source object is not specified.","Objeto de origem não está especificado." -"Specified profile does not exist.","O perfil especificado não existe." -"State Code [State Title]","Código do Estado [State Title]" -"State/Province","Estado/Província" -"Status","Status" -"Status Code","Código do status" -"Status Label","Etiqueta de status" -"Status:","Estado atual:" -"Store Credit","Credito da loja" -"Store View Specific Labels","Vista das Marcas Específicas da Loja" -"Street Address","Endereço da Rua" -"Submit Comment","Enviar Comentário" -"Submit Credit Memo","Enviar Nota de Crédito" -"Submit Invoice","Enviar fatura" -"Submit Invoice and Shipment","Enviar fatura e remessa" -"Submit Order","Enviar Pedido" -"Submit Shipment","Enviar Remessa" -"Subscribe to Newsletter","Assinar o Boletim Informativo" -"Subscribe to Order Status","Assinar status do pedido" -"Subtotal","Subtotal" -"Subtotal after discount.","Subtotal depois do desconto" -"Subtotal:","Subtotal:" -"Suspected Fraud","Suspeita de Fraude" -"Suspend","Suspenso" -"Suspended","Suspenso" -"Tax","Taxas" -"Tax Amount","Valor do Imposto" -"Tax Percent","Porcentagem de Imposto" -"Telephone","Telefone" -"The Order State ""%s"" must not be set manually.","O Estado do Pedido ""%s"" não pode ser alterado manualmente" -"The address total model should be extended from Mage_Sales_Model_Quote_Address_Total_Abstract.","O modelo de endereço total deve ser alargado de Mage_Sales_Model_Quote_Address_Total_Abstract." -"The billing agreement ""%s"" has been canceled.","O contrato de faturamento ""%s"" foi cancelado." -"The billing agreement ""%s"" has been created.","O contrato de faturamento ""%s"" foi criado." -"The coupon code has been accepted.","O código do cupão foi aceite." -"The message has been sent.","A mensagem foi enviada." -"The message was sent.","A mensagem foi enviada." -"The order address has been updated.","O endereço da ordem foi atualizado." -"The order email has been sent.","O e-mail de pedido foi enviado." -"The order has been cancelled.","A ordem foi cancelada." -"The order has been created.","A ordem foi criada." -"The order has been put on hold.","A ordem foi colocada em espera." -"The order has been released from holding status.","A ordem foi libertada do status de espera." -"The order has not been cancelled.","A ordem não foi cancelada." -"The order status has been assigned.","O status da ordem foi atribuído." -"The order status has been saved.","O status da ordem foi salvo." -"The order status has been unassigned.","O status da ordem foi atribuído." -"The order was not put on hold.","O pedido não foi suspenso." -"The order was not unheld.","O pedido não foi liberado." -"The order was placed using %s","A ordem foi feita usando %s" -"The order(s) cannot be canceled","A ordem(s) não pode ser cancelada" -"The payment has been accepted.","O pagamento foi aceite." -"The payment has been denied.","O pagamento foi negado." -"The payment has been voided.","O pagamento foi declarado nulo." -"The profile has been updated.","O perfil foi atualizado." -"The profile has no changes.","O perfil não tem alterações." -"The profile state has been updated.","O estado do perfil foi atualizado." -"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","A quantidade que você quer adicionar excede a quantidade total enviada de algum(ns) dos produtos selecionados" -"The requested Payment Method is not available.","O Método de Pagamento solicitado não está disponível." -"The shipping label has been created.","A etiqueta de envio foi criada." -"The transaction ""%s"" (%s) is already closed.","A transação ""%s"" (%s) já está fechada." -"The transaction ""%s"" cannot be captured yet.","A transação ""%s"" ainda não pode ser capturada." -"The value that you entered is not valid.","O valor informado não é válido." -"There are no billing agreements yet.","Ainda não existem acordos de faturamento." -"There are no printable documents related to selected orders.","Não existem documentos imprimíveis relacionados com as ordens selecionadas." -"There are no shipping labels related to selected orders.","Não há etiquetas de remessa relacionadas aos pedidos selecionados." -"There are no shipping labels related to selected shipments.","Não há etiquetas de remessa relacionadas aos despachos selecionados." -"There is no need to approve this payment.","Não há necessidade de aprovar esse pagamento." -"There is no need to deny this payment.","Não há necessidade de negar esse pagamento." -"There is no update for the payment.","Não há nenhuma atualização para o pagamento." -"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","Esta mensagem será mostrada no carrinho de compras quando subtotal após os descontos seja inferior a quantidade mínima." -"This operation requires an existing transaction object.","Esta operação requer um objeto existente de transação." -"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","Esta ordem contém (%s) itens e portanto não podem ser editados através da interface de administração neste momento, se você quiser continuar a editar os (%s) itens serão removidos, a ordem será cancelada e uma nova ordem será colocada." -"This order no longer exists.","Esta ordem não existe mais." -"This product does not have any configurable options","Este produto não tem quaisquer opções configuráveis" -"This profile state cannot be changed to ""%s"".","Este estado de perfil não pode ser alterado para ""%s""." -"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","Isso irá criar um reembolso offline. Para criar um reembolso online, abra uma fatura e crie uma nota de crédito para ela. Você deseja continuar?" -"Tier Pricing","Preços por Nível" -"Title","Título" -"To","Para" -"To Name","Para Nome" -"To:","Para:" -"Total","Total" -"Total %d product(s)","Total %d produto(s)" -"Total (ex)","Total (ex)" -"Total (inc)","Total (inc)" -"Total Due","Total Devido" -"Total Invoiced","Total Faturado" -"Total Invoiced Paid","Total Faturado Pago" -"Total Invoiced VS Paid Report","Total Faturado VS. Relatório Pago" -"Total Invoiced not Paid","Total Faturado não Pago" -"Total Ordered Report","Relatório do Total Encomendado" -"Total Paid","Total Pago" -"Total Qty","Quantidade Total" -"Total Refund","Total do Reembolso" -"Total Refunded","Total Reembolsado" -"Total Refunded Report","Relatório do total reembolsado" -"Total Sales Shipping","Remessa do total de vendas" -"Total Shipped Report","Relatório do total remessado" -"Total Shipping","Envio Total" -"Total Shipping Charges","Total dos Gastos de Envio" -"Total Tax","Total dos Impostos" -"Total Weight","Peso Total" -"Total model should be extended from Mage_Sales_Model_Order_Total_Abstract.","O modelo de total deve ser ampliado a partir de Mage_Sales_Model_Order_Total_Abstract." -"Track Order","Rastrear Ordem" -"Track all shipment(s)","Rastrear todas as remessas" -"Track all shipments","Rastrear todos os envios" -"Track this shipment","Acompanhar este envio" -"Track your order","Rastrear o seu pedido" -"Tracking","Rastreamento" -"Tracking Number","Número de Rastreamento" -"Tracking Number(s):","Número(s) de rastreamento:" -"Transaction ""%s"" was already processed.","A transação ""%s"" já foi processada." -"Transaction # %s | %s","Transação # %s | %s" -"Transaction ID","ID da Transação" -"Transaction ID must not be empty.","A ID da transação não pode estar vazia." -"Transaction ID: ""%s"".","Nº da Transação: ""%s""." -"Transaction Type","Tipo de Transação" -"Transactions","Transações" -"Trial ","Teste" -"Trial Payment","Pagamento do Teste" -"Trial Period","Período Experimental" -"Trial period payment","Pagamento do período de avaliação" -"Type","Tipo" -"Unassign","Desconsiderar" -"Unhold","Liberar" -"Unhold action is not available.","A ação suspender não está disponível." -"Unhold order","Liberar pedido" -"Unknown State","Estado desconhecido" -"Unknown Status","Status desconhecido" -"Unsupported transaction type ""%s"".","O tipo de transação ""%s"" não é suportado." -"Update Changes","Atualizar alterações" -"Update Items and Qty\'s","Atualizar Itens e Quantidades" -"Update Qty\'s","Atualizar qtde." -"Updated At","Atualizado Em" -"Updated:","Atualizado:" -"Use Aggregated Data (beta)","Usar dados agregados (beta)" -"Use Order Status As Default","Usar status do pedido como padrão" -"Validate Each Address Separately in Multi-address Checkout","Validar cada endereço separadamente em verificações de vários endereços" -"Value","Valor" -"View","Ver" -"View All","Visualizar todos" -"View Another Order","Visualizar outro pedido" -"View Order","Ver Solicitação" -"Visible on Frontend","Visível no Frontend" -"Void","Anular" -"Void invoice","Fatura vazia" -"Voided authorization.","Autorização anulada." -"Website","Website" -"Weight","Peso" -"Whether buyer can define the date when billing for the profile begins.","Se o comprador pode definir a data para começar o faturamento do perfil." -"Width","Largura" -"Wishlist","Lista de presentes" -"Wrong billing agreement ID specified.","ID de acordo de faturamento especificado errado." -"Wrong quote item id to update configuration.","ID da cotação do item errada para atualizar configuração." -"Wrong state: ""%s"".","Estado inadequado: ""%s""." -"Yes","Sim" -"You can leave a box blank if you don\'t wish to add a gift message for whole order","Você pode deixar um quadro em branco se não desejar adicionar uma mensagem pessoal para todo o pedido" -"You don\'t have permissions to manage this order because of one or more products are not permitted for your website.","Você não tem permissões para gerenciar este pedido porque um ou mais produtos não são permitidos para seu site." -"You have placed no orders.","Não há pedidos feitos." -"You will be redirected to the payment system website.","Você será redirecionado para o site de sistema de pagamentos." -"Your credit card will be charged for","O seu cartão de crédito será cobrado por" -"ZIP/Post Code","Código Postal" -"Zip/Postal Code","Zip/Código Postal" -"cm","cm" -"in","pol" -"kg","kg" -"lb","libras" -"the credit memo email is not sent","o email de aviso de crédito não foi enviado" -"the credit memo email was sent","o email de aviso de crédito não foi enviado" -"the invoice email is not sent","o email de fatura não é enviado" -"the invoice email was sent","o email de fatura não foi enviado" -"the order confirmation email is not sent","o email de confirmação de pedido não é enviado" -"the order confirmation email was sent","o email de confirmação de pedido foi enviado" -"the shipment email is not sent","o e-mail de expedição não foi enviado" -"the shipment email was sent","o e-mail de expedição foi enviado" diff --git a/app/locale/pt_BR/Mage_SalesRule.csv b/app/locale/pt_BR/Mage_SalesRule.csv deleted file mode 100644 index b33302c18..000000000 --- a/app/locale/pt_BR/Mage_SalesRule.csv +++ /dev/null @@ -1,132 +0,0 @@ -"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","%d Regras de Preço de Carrinho de Compras baseado em atributo ""%s"" ter sido desativado." -"%s Coupon(s) have been generated","%s Cupom(s) foram gerados" -"Actions","Ações" -"Active","Ativo" -"Add New Rule","Adicionar nova regra" -"Alphabetical","Alfabético" -"Alphanumeric","Alfanumérico" -"An error occurred while generating coupons. Please review the log and try again.","Ocorreu um erro ao gerar os cupons. Por favor reveja a sessão e tente novamente." -"Apply","Solicitar" -"Apply To","Aplicar a" -"Apply the rule only if the following conditions are met (leave blank for all products)","Aplicar a regra apenas se as seguintes condições forem atendidas (deixe em branco para todos os produtos)" -"Apply the rule only to cart items matching the following conditions (leave blank for all items)","Aplicar a regra apenas para itens do carrinho correspondendo às seguintes condições (deixe em branco para todos os itens)" -"Apply the rule to cart items matching the following conditions","Aplicar a regra para itens do carrinho correspondendo às seguintes condições" -"Apply to Shipping Amount","Aplicar a Valor de Envio" -"Are you sure you want to delete the selected coupon(s)?","Tem certeza que quer apagar o(s) cupom(s) escolhido(s)?" -"Auto","Auto" -"Auto Generated Specific Coupon Codes","Códigos de Cupom Específicos Auto Gerados" -"Buy X get Y free (discount amount is Y)","Compre X obtenha Y grátis (valor do desconto é Y)" -"By Fixed value","Por Valor Fixo" -"By Percentage","Por Percentagem" -"Can\'t acquire coupon.","Não é possível adquirir cupons." -"Cart Attribute","Atributo do Carrinho" -"Catalog","Catálogo" -"Code Format","Formato do código" -"Code Length","Tamanho do código" -"Code Prefix","Prefixo Código" -"Code Suffix","Sufixo Código" -"Conditions","Condições" -"Conditions combination","Combinação de Condições" -"Coupon","Cupom" -"Coupon Code","Código do cupom" -"Coupon Qty","Qtd. de Cupom" -"Coupon with the same code","Cupom com o mesmo código" -"Coupons Information","Informação dos cupons" -"Created On","Criado Em" -"Customer Groups","Grupos do cliente" -"Dash Every X Characters","Trace Cada X Caracteres" -"Date Expire","Vencimento" -"Date Start","Data Inicial" -"Default Label","Etiqueta padrão" -"Default Rule Label for All Store Views","Etiqueta de regra padrão para todas as visualizações da loja" -"Description","Descrição" -"Discount Amount","Quantia de Desconto" -"Discount Qty Step (Buy X)","Etapa de Desconto por Quantidade (Comprar X)" -"Edit Rule","Editar regra" -"Edit Rule '%s'","Editar regra ""s%""" -"Excluding prefix, suffix and separators.","Excluindo sufixo, prefixo e separadores." -"FOUND","ENCONTRADO" -"Fixed amount discount","Valor de desconto fixo" -"Fixed amount discount for whole cart","Valor de desconto fixo para todo o carrinho" -"For matching items only","Apenas para itens correspondentes" -"For shipment with matching items","Para o envio de itens correspondentes" -"Free Shipping","Frete Grátis" -"From Date","A Partir da Data" -"General Information","Informações gerais" -"Generate","Gerar" -"ID","Identidade" -"If %s %s %s for a subselection of items in cart matching %s of these conditions:","Se %s %s %s para uma subseleção de itens no carrinho correspondendo a %s destas condições:" -"If an item is %s in the cart with %s of these conditions true:","Se um item está %s no carrinho com %s destas condições verdadeiras:" -"If empty no separation.","Se vazio sem separação." -"If you select and save the rule you will be able to generate multiple coupon codes.","Se você selecionar e salvar a regra, será capaz de gerar múltiplos códigos de cupom." -"Inactive","Inativo" -"Item totals are not set for rule.","Os totais dos itens não são configurados via de regra." -"Labels","Etiquetas" -"Manage Coupon Codes","Gerenciar Códigos de Cupom" -"Maximum Qty Discount is Applied To","A Quantidade Máxima de Desconto é Aplicada A" -"NOT FOUND","NÃO ENCONTRADO" -"NOT LOGGED IN","NÃO LIGADO" -"New Rule","Nova Regra" -"No","Não" -"No Coupon","Sem Cupom" -"Not valid data provided","Não há dados válidos" -"Number of Uses","Número de Usuários" -"Numeric","Numérico" -"Payment Method","Método de Pagamento" -"Percent of product price discount","Porcentagem do desconto sobre o preço do produto" -"Period","Período" -"Price in cart","Preço no carrinho" -"Priority","Prioridade" -"Product attribute combination","Combinação de atributos do produto" -"Products subselection","Sub-seleção de produtos" -"Promotions","Promoções" -"Public In RSS Feed","Público No Feed RSS" -"Quantity in cart","Quantidade no carrinho" -"Row total in cart","Total de linhas no carrinho" -"Rule Information","Informação da Regra" -"Rule Name","Nome da Regra" -"Rule is not defined","A regra não está definida" -"Sales Discount Amount","Valor do Desconto de Venda" -"Sales Subtotal Amount","Subtotal do Valor de Vendas" -"Sales Total Amount","Total do Valor de Vendas" -"Save and Continue Edit","Salvar e continuar a editar" -"Shipping Country","País de Envio" -"Shipping Method","Tipo de Frete" -"Shipping Postcode","Código Postal de Envio" -"Shipping Region","Região de Envio" -"Shipping State/Province","Estado/Província de Envio" -"Shopping Cart Price Rule","Regra de Preço de Carrinho de Compras" -"Shopping Cart Price Rules","Regras de Preços de Carrinho de Compras" -"Special Price","Preço Especial" -"Specific Coupon","Cupom Específico" -"Status","Status" -"Stop Further Rules Processing","Parar Outras Regras de Processamento" -"Store View Specific Labels","Vista das Marcas Específicas da Loja" -"Subtotal","Subtotal" -"Subtotal Amount","Valor Subtotal" -"The rule has been deleted.","A regra foi apagada." -"The rule has been saved.","A regra foi salva." -"This rule no longer exists.","Essa regra não existe mais." -"Times Used","Vezes usadas" -"To Date","Até a Data Atual" -"To Fixed Value","Para Valor Fixo" -"To Percentage","Para Percentagem" -"Total","Total" -"Total Amount","Valor Total" -"Total Items Quantity","Quantidade total de itens" -"Total Weight","Peso Total" -"Unable to create requested Coupon Qty. Please check settings and try again.","Não poi possível criar a Quantidade de Cupons solicitada. Por favor cheque as configurações e tente novamente." -"Unable to find a rule to delete.","Incapaz de encontrar uma regra para excluir." -"Update prices using the following information","Atualizar preços usando as seguintes informações" -"Update product's %s %s: %s","Atualização dos produtos %s %s: %s" -"Update the Product","Atualizar o Produto" -"Use Auto Generation","Usar Auto Geração" -"Used","Utilizado" -"Uses per Coupon","Uso por cupom" -"Uses per Customer","Uso por cliente" -"Website","Website" -"Websites","Sites" -"Wrong rule specified.","Especificação de regra incorreta." -"Yes","Sim" -"total amount","quantia total" -"total quantity","quantidade total" diff --git a/app/locale/pt_BR/Mage_Sendfriend.csv b/app/locale/pt_BR/Mage_Sendfriend.csv deleted file mode 100644 index 32b823a4d..000000000 --- a/app/locale/pt_BR/Mage_Sendfriend.csv +++ /dev/null @@ -1,38 +0,0 @@ -"Add Recipient","Adicione Destinatário" -"Allow for Guests","Permitir para convidados" -"An invalid email address for recipient was entered.","Um endereço de e-mail de destinatário foi inserido é inválido." -"At least one recipient must be specified.","Pelo menos um destinatário deve ser especificado." -"Back","Voltar" -"Catalog Product Email to a Friend","Produto de Catálogo: Mandar E-Mail para Amigo" -"Email Address","Endereço de e-mail" -"Email Address:","Endereço de e-mail:" -"Email Templates","Modelos de e-mail" -"Email to a Friend","Enviar por e-mail a um amigo" -"Email:","E-mail:" -"Enabled","Ativado" -"Invalid Sender Information","Informações inválidas de remetente" -"Invalid sender email.","E-mail de remetente inválido." -"Limit Sending By","Limitar os envios por" -"Max Products Sent in 1 Hour","Número máximo de produtos enviados em 1 hora" -"Max Recipients","Máximo de destinatários" -"Maximum %d email addresses allowed.","Só são permitidos %d endereços de e-mail." -"Message:","Mensagem:" -"Name","Nome" -"Name:","Nome:" -"No more than %d emails can be sent at a time.","No máximo %d e-mails podem ser enviados de uma vez." -"Please define a correct Cookie instance.","Defina um elemento de Cookie correto." -"Please define a correct Product instance.","Defina um elemento de Produto correto." -"Please define the correct Sender information.","Defina as informações corretas do Remetente." -"Recipient:","Destinatário:" -"Remove Email","Remover Email" -"Select Email Template","Escolha o modelo de e-mail" -"Send Email","Enviar email" -"Send product to a friend","Envie o produto para um amigo" -"Sender:","Remetente:" -"Some emails were not sent.","Alguns e-mails não foram enviados." -"The link to a friend was sent.","O link para um amigo foi enviado." -"The message cannot be empty.","A mensagem não pode estar vazia." -"The messages cannot be sent more than %d times in an hour","As mensagens não podem ser enviadas mais de %s vezes em uma hora" -"The sender name cannot be empty.","O nome do remetente não pode estar em branco." -"There were some problems with the data.","Ocorreram alguns problemas com os dados." -"You have exceeded limit of %d sends in an hour","Você excedeu o limite de %d envios em uma hora" diff --git a/app/locale/pt_BR/Mage_Shipping.csv b/app/locale/pt_BR/Mage_Shipping.csv deleted file mode 100644 index 1046b5ad4..000000000 --- a/app/locale/pt_BR/Mage_Shipping.csv +++ /dev/null @@ -1,93 +0,0 @@ -" for more information or ","para mais informações ou" -"# of Items (and above)","nº de Itens (e acima)" -"# of Items vs. Destination","nº de Itens vs. Destino" -"Allow Shipping to Multiple Addresses","Permitir Envio a Múltiplos Endereços" -"An error occurred while import table rates.","Ocorreu um erro ao importar as tabelas de tarifas." -"Calculate Handling Fee","Calcular a Taxa de Manuseio" -"Carrier:","Transportadora:" -"City","Cidade" -"Close Window","Fechar Janela" -"Condition","Estado" -"Country","País" -"Custom Value","Valor Aduaneiro" -"Date","Data" -"Delivered on:","Entregado dia:" -"Delivered to:","Entregado a:" -"Description","Descrição" -"Displayed Error Message","Mensagem de Erro Apresentada" -"Divide to equal weight (one request)","Dividir para peso igual (um pedido)" -"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","Duplicar Linha #%s (País ""%s"", Região/Estado ""%s"", CEP ""%s"" e Valor ""%s"")." -"Enabled","Ativado" -"Error:","Erro:" -"Export","Exportar" -"File has not been imported. See the following list of errors: %s","O arquivo não foi importado. Veja a lista de erros a seguir: %s" -"Fixed","Fixado" -"Flat Rate","Taxa Fixa" -"Free Shipping","Frete Grátis" -"Google Sitemap Section","Seção Google Sitemap" -"Handling Fee","Taxa de Manuseio" -"Import","Importar" -"Include Virtual Products in Price Calculation","Incluir Produtos Virtuais no Cálculo de Preço" -"Info:","Informação:" -"Invalid %s ""%s"" in the Row #%s.","%s ""%s"" Inválido na Linha #%s." -"Invalid Country ""%s"" in the Row #%s.","País Inválido ""%s"" na Linha #%s." -"Invalid Region/State ""%s"" in the Row #%s.","Região/Estado Inválido ""%s"" na Linha #%s." -"Invalid Shipping Price ""%s"" in the Row #%s.","Custo de Entrega Inválido ""%s"" na Linha #%s." -"Invalid Table Rate code for type %s: %s","Código da Tabela de Tarifa inválido para tipo %s: %s" -"Invalid Table Rate code type: %s","Código da Tabela de Tarifa tipo: %s" -"Invalid Table Rates File Format","Formato de Arquivo da Tabela de Tarifas Inválido" -"Invalid Table Rates format in the Row #%s","Formato Inválido de Taxas de Tabela na Linha #%s" -"Local Time","Hora Local" -"Location","Local" -"Maximum Qty Allowed for Shipping to Multiple Addresses","Quant. Máxima Permitida para Envio a Múltiplos Endereços" -"Method Name","Nome do Método" -"Minimum Order Amount","Valor Mínimo do Pedido" -"N/A","Indisponível" -"None","Nenhum" -"Options","Opções" -"Order Subtotal (and above)","Subtotal do Pedido (e acima)" -"Origin","Origem" -"Per Order","Por Ordem" -"Per Package","Por Embalagem" -"Percent","Percentagem" -"Price","Preço" -"Price vs. Destination","Preço vs. Destino" -"Region/State","Região/Estado" -"Service Type:","Tipo de Serviço:" -"Ship to Applicable Countries","Enviar a Países Aplicáveis" -"Ship to Specific Countries","Enviar a Países Específicos" -"Shipment #","Remessa #" -"Shipment Tracking Popup","Popup de Rastreamento de Entrega" -"Shipped or billed on:","Enviado ou faturado em:" -"Shipping Methods","Tipos de Frete" -"Shipping Methods Section","Seção de Métodos de Entrega" -"Shipping Settings","Configurações de Entrega" -"Shipping Settings Section","Seção de Configurações de Entrega" -"Show Method if Not Applicable","Mostrar Método se Não Aplicável" -"Signed by:","Assinado por:" -"Sort Order","Classificar pedido" -"Status:","Estado atual:" -"Store Pickup","Retirada na Loja" -"Street Address","Endereço da Rua" -"Street Address Line 2","Endereço Linha 2" -"Table Rates","Taxas de Tabela" -"The shipping module is not available for selected delivery country.","O módulo de entrega não está disponível para o país de entrega selecionado." -"The shipping module is not available.","O módulo de entrega não está disponível." -"There is no tracking available for this shipment.","Não há disponibilidade de rastreamento para este método de entrega." -"There is no tracking available.","Não há disponibilidade de rastreamento." -"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","Este método de entrega está atualmente indisponível. Se você deseja utilizar este método de entrega, por favor, entre em contato conosco." -"This shipping method is not available, please specify ZIP-code","Este método de entrega não está disponível, por favor, especifique o CEP" -"Title","Título" -"Track:","Rastrear:" -"Tracking Information","Informações de Rastreamento" -"Tracking Number:","Número de Rastreamento:" -"Tracking information is currently not available. Please ","O rastreamento de informações não está disponível no momento. Por favor" -"Tracking information is currently unavailable.","O rastreamento de informações não está disponível no momento." -"Type","Tipo" -"Use origin weight (few requests)","Usar peso de origem (poucos pedidos)" -"Weight (and above)","Peso (e acima)" -"Weight vs. Destination","Peso vs. Destino" -"Weight:","Peso:" -"ZIP/Postal Code","CEP/Código Postal" -"contact us","entre em contato conosco" -"email us at ","envie um email para nós -" diff --git a/app/locale/pt_BR/Mage_Sitemap.csv b/app/locale/pt_BR/Mage_Sitemap.csv deleted file mode 100644 index c752da7ee..000000000 --- a/app/locale/pt_BR/Mage_Sitemap.csv +++ /dev/null @@ -1,46 +0,0 @@ -"Action","Ação" -"Add Sitemap","Adicionar Mapa do Site" -"Always","Sempre" -"CMS Pages Options","Opções de páginas CMS" -"Categories Options","Opções de Categorias" -"Daily","Diário" -"Edit Sitemap","Editar Mapa do Site" -"Enabled","Ativado" -"Error Email Recipient","Erro de Destinatário de Email" -"Error Email Sender","Erro de Remetente de Email" -"Error Email Template","Erro de Template de Email" -"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","O arquivo ""%s"" não pode ser salvo. Certifique-se de que o diretório ""%s"" é gravável pelo servidor web." -"Filename","Nome do arquivo" -"Frequency","Freqüência" -"Generate","Gerar" -"Generation Settings","Configurações de Geração" -"Google Sitemap","Google Sitemap" -"Hourly","Horário" -"ID","Identidade" -"Last Time Generated","Último Momento Gerado" -"Link for Google","Link para o Google" -"Monthly","Mensal" -"Never","Nunca" -"New Sitemap","Novo Sitemap" -"Path","Caminho" -"Please create the specified folder ""%s"" before saving the sitemap.","Por favor crie a pasta especificada ""%s"" antes de salvar o mapa do site." -"Please define correct path","Por favor defina o caminho correto" -"Please make sure that ""%s"" is writable by web-server.","Por favor certifique-se que ""%s"" é gravável pelo servidor web." -"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","Por favor use apenas letras (a-z ou A-Z), números (0-9) ou underscore (_) no nome do arquivo. Nenhuns espaços ou outros caracteres são permitidos." -"Priority","Prioridade" -"Products Options","Opções de Produtos" -"Sitemap","Mapa do Site" -"Sitemap generate Warnings","Mapa do site gera Avisos" -"Start Time","Tempo de Início" -"Store View","Visualização da loja" -"The priority must be between 0 and 1.","A prioridade deve ser entre 0 e 1." -"The sitemap ""%s"" has been generated.","O mapa do site ""%s"" foi gerado." -"The sitemap has been deleted.","O mapa do site foi apagado." -"The sitemap has been saved.","O mapa do site foi salvo." -"This sitemap no longer exists.","Este mapa do site não existe mais." -"Unable to find a sitemap to delete.","Incapaz de encontrar um mapa do site para apagar." -"Unable to find a sitemap to generate.","Incapaz de encontrar um mapa do site para gerar." -"Unable to generate the sitemap.","Incapaz de gerar o mapa do site." -"Valid values range: from 0.0 to 1.0.","Valores válidos variam: de 0,0 a 1,0." -"Weekly","Semanalmente" -"Yearly","Anualmente" diff --git a/app/locale/pt_BR/Mage_Tag.csv b/app/locale/pt_BR/Mage_Tag.csv deleted file mode 100644 index 66cd55645..000000000 --- a/app/locale/pt_BR/Mage_Tag.csv +++ /dev/null @@ -1,101 +0,0 @@ -"# of Uses","dos usos" -"%s tag(s) have been accepted for moderation.","%s tag(s) foi aceita pela moderação." -"Tag Name: %s","Nome da Tag: %s" -"Action","Ação" -"Add","Adicionar" -"Add New Tag","Adicionar Nova Tag" -"Add Tags","Adicionar Tags" -"Add Your Tags:","Adicione Suas Tags:" -"Add tag(s) to product","Adicionar tag(s) ao produto" -"Add to Cart","Adicionar ao carrinho" -"Add to Wishlist","Adicionar à Lista de Desejos" -"All Tags","Todas as Tags" -"Approved","Aprovado" -"Are you sure you want to delete this tag?","Você tem certeza que deseja apagar essa tag?" -"Are you sure you want to do this?","Tem certeza de que quer fazer isso?" -"Are you sure?","Tem certeza?" -"Back","Voltar" -"Back to Tags List","Voltar à Lista de Tags" -"Base Popularity","Popularidade de base" -"Block Information","Informações de bloco" -"CSV","CSV" -"Catalog Product View","Ver Catálogo de Produtos" -"Change status","Alterar status" -"Click on a tag to view your corresponding products.","Clique na tag para ver o produto correspondente" -"Country","País" -"Customer My Account My Tags List","Lista de Tags da Conta do Cliente" -"Customer My Account Tag View","Ver Tags da Minha Conta do Cliente" -"Customer Since","Cliente desde" -"Customers","Clientes" -"Customers Submitted this Tag","Clientes submeteram essa Tag" -"Customers Tagged '%s'","Tags dos Clientes '%s'" -"Delete","Excluir" -"Delete Tag","Apagar Tag" -"Disabled","Desativado" -"Edit Tag '%s'","Editar Tag '%s'" -"Email","E-mail" -"First Name","Primeiro nome" -"General Information","Informações gerais" -"Grid","Grade" -"ID","Identidade" -"Info","Informações" -"Last Name","Último nome" -"List","Lista" -"Manage Tags","Gerenciar Tags" -"My Recent Tags","Minhas Tags Recentes" -"My Tags","Minhas Tags" -"Name","Nome" -"New Tag","Nova Etiqueta" -"No matches found.","Nenhuma correspondência encontrada." -"Other people marked this product with these tags:","Outra pessoa marcou este produto com essas tags:" -"Pending","Pendente" -"Pending Tags","Marcas Pendentes" -"Popular","Popular" -"Popular Tags","Tags Populares" -"Price","Preço" -"Product Name","Nome do produto" -"Product SKU","SKU do Produto" -"Product Tag API","API de tag de produto" -"Product Tags","Etiquetas de Produto" -"Products","Produtos" -"Products Tagged by Administrators","Produto marcado pelos Administradores" -"Products Tagged by Customers","Produto marcado pelos clientes" -"Products Tagged with '%s'","Produto Marcado com '%s'" -"Products tagged with '%s'","Produto marcado com '%s'" -"Rebuild Tag aggregation data","Reconstruir dados de agregação de Tag" -"Remove","Remover" -"Remove product tag","Remover tag de produto" -"Retrieve list of tags by product","Recuperar lista de tags por produto" -"Retrieve product tag info","Recuperar informações de tags de produto" -"SKU","Unidade de Manutenção de Estoque" -"Save Tag","Salvar Tag" -"Save and Continue Edit","Salvar e continuar a editar" -"Status","Status" -"Store View","Visualização da loja" -"Tag","Tag" -"Tag ""%s"" has already been added to the product.","A Tag ""%s"" já foi adicionada ao produto." -"Tag ""%s"" has been added to the product.","A Tag ""%s"" foi adicionada ao produto." -"Tag ""%s"" has been rejected by administrator.","A Tag ""%s"" foi rejeitada pelo administrador" -"Tag Aggregation Data","Dados de Agregação de Tag" -"Tag Name","Nome de Marca" -"Tagged Products List","Lista de Produtos Marcados" -"Tags","Marcas" -"Tags List (All Available)","Lista de Tags (Todas Disponíveis)" -"Tags List Before","Lista de Tags Anteriores" -"Tags:","Tags:" -"Telephone","Telefone" -"The tag has been deleted.","A marca foi eliminada." -"There are no tags available.","Não há tags disponíveis" -"Unable to find any products tagged with '%s' in the current store","Não é possível encontrar todos os produtos marcados com '%s' no armazenamento atual" -"Unable to remove tag. Please, try again later.","Não é possível remover a tag. Tente novamente mais tarde." -"Unable to save tag(s).","Não é possível salvar a tag(s)" -"Update","Atualizar" -"Update product tag","Atualizar tag de produto" -"Use spaces to separate tags. Use single quotes (') for phrases.","Use espaço para separar as tags. Use aspas simples (') para frases." -"View All Tags","Ver Todas as Tags" -"View Customers","Ver Clientes" -"View Products","Ver Produtos" -"XML","XML" -"You have not tagged any products yet.","Você ainda não marcou nenhum produto." -"ZIP/Post Code","Código Postal" -"[STORE VIEW]","[VISUALIZAR LOJA]" diff --git a/app/locale/pt_BR/Mage_Tax.csv b/app/locale/pt_BR/Mage_Tax.csv deleted file mode 100644 index 16ee7a8f9..000000000 --- a/app/locale/pt_BR/Mage_Tax.csv +++ /dev/null @@ -1,163 +0,0 @@ -"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - corresponde a qualquer; 'xyz*' - corresponde a qualquer que se inicie em 'xyz' e não mais longo que %d." -"-- Please Select --","- Por Favor Selecione -" -"Add New Class","Adicionar Nova Classe" -"Add New Tax Rate","Adicionar Nova Taxa de Imposto" -"Add New Tax Rule","Adicionar Nova Taxa de Imposto" -"After Discount","Depois de Desconto" -"An error occurred while deleting this rate.","Ocorreu um erro ao excluir essa taxa." -"An error occurred while deleting this rate. Incorrect rate ID.","Ocorreu um erro ao excluir essa taxa. ID incorreto da taxa." -"An error occurred while deleting this tax class.","Ocorreu um erro ao excluir essa classe de impostos." -"An error occurred while deleting this tax rule.","Ocorreu um erro ao excluir esta regra fiscal." -"An error occurred while saving this tax class.","Ocorreu um erro ao salvar esta classe de impostos." -"An error occurred while saving this tax class. A class with the same name","Ocorreu um erro ao salvar esta classe de taxa. Há uma classe com o mesmo nome" -"Apply Customer Tax","Aplicar Imposto de Cliente" -"Apply Discount On Prices","Aplicar Desconto Nos Preços" -"Apply Tax On","Aplicar Imposto Sobre" -"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","Aplicação de desconto sobre o preço incluindo o imposto é calculado com base no imposto da loja, se ""Aplicar Imposto depois do Desconto"" for selecionado." -"Are you sure you want to do this?","Tem certeza de que quer fazer isso?" -"Back","Voltar" -"Before Discount","Antes do Desconto" -"CSV","CSV" -"Calculate off subtotal only","Calcular somente no subtotal" -"Calculation Settings","Configurações de Cálculo" -"Catalog Prices","Preços de Catálogo" -"Class Name","Nome da Classe" -"Click here to go to Tax configuration and change your settings.","Clique aqui para ir para Configuração de impostos e alterar suas configurações." -"Code","Código" -"Country","País" -"Custom price if available","Se disponível, preço aduaneiro" -"Customer Tax Class","Classe Fiscal do Cliente" -"Customer Tax Class Information","Informação Sobre Escalão de Imposto do Cliente" -"Customer Tax Classes","Classes de Taxa do Cliente" -"Default Country","País padrão" -"Default Post Code","Código Postal Padrão" -"Default State","Estado Padrão" -"Default Tax Destination Calculation","Cálculo Padrão da Taxa de Destino" -"Delete Class","Apagar Classe" -"Delete Rate","Apagar Preço" -"Delete Rule","Apagar Regra" -"Display Full Tax Summary","Mostrar Resumo do Imposto Total" -"Display Prices","Exibir Preços" -"Display Product Prices In Catalog","Exibir Preço dos Produtos em Catálogo" -"Display Shipping Amount","Exibir Total Enviado" -"Display Shipping Prices","Exibir Preços Enviados" -"Display Subtotal","Exibir Subtotal" -"Display Zero Tax Subtotal","Mostrar Zero de Taxa no Subtotal" -"Edit Class","Editar Classe" -"Edit Class '%s'","Editar Classe '%s'" -"Edit Rule","Editar regra" -"Edit Tax Rate","Editar Taxa de Imposto" -"Enable Cross Border Trade","Habilitar Comércio Transfronteiras" -"Excel XML","Excel XML" -"Excl. Tax","Excluir taxas" -"Excl. Tax:","Excluindo Taxa" -"Excluding Tax","Excluindo Taxa" -"Export Tax Rates","Taxa de Imposto de Exportação" -"Grand Total (Excl. Tax)","Total (Exluindo Taxa)" -"Grand Total (Excl.Tax)","Total (Exluindo Taxa)" -"Grand Total (Incl. Tax)","Total (IncluindoTaxa)" -"Grand Total (Incl.Tax)","Total (IncluindoTaxa)" -"Grand Total Excl. Tax","Total ExcluindoTaxa" -"Grand Total Incl. Tax","Total Incluindo Taxa" -"Ignore this notification","Ignorar esta notificação" -"Import / Export Tax Rates","Taxa de Imposto de Importação / Exportação" -"Import Tax Rates","Taxa de Imposto de Importação" -"Inc. Tax","Incluir Taxa" -"Incl. Tax","Incluir taxas" -"Incl. Tax:","Incluir Taxa:" -"Include Tax In Grand Total","Incluir Taxa no Total" -"Including Tax","Incluindo Taxa" -"Including and Excluding Tax","Incluindo e Excluindo Taxa" -"Invalid file format upload attempt","Tentativa de carregamento de formato de arquivo inválido" -"Invalid file upload attempt","Tentativa de carregamento de arquivo inválido" -"Manage Customer Tax Classes","Gerenciar Classes de imposto do cliente" -"Manage Product Tax Classes","Gerenciar Classes de imposto do produto" -"Manage Tax Rates","Gerenciar Taxa de Impostos" -"Manage Tax Rules","Gerenciar Regras de Imposto" -"Manage Tax Zones & Rates","Gerenciar Zonas de Impostos & Taxas" -"Maximum zip code length is 9.","O comprimento máximo do CEP é 9." -"Name","Nome" -"New Class","Nova Classe" -"New Rule","Nova Regra" -"New Tax Rate","Nova Taxa de Imposto" -"No","Não" -"None","Nenhum" -"One of the country has invalid code.","O país tem código inválido." -"Orders, Invoices, Credit Memos Display Settings","Encomendas, Faturas, Configurações de Vídeo de Notas de Crédito" -"Original price only","Apenas Preço Original" -"Please fill all required fields with valid information.","Preencha todos os campos necessários com informações válidas." -"Please see source for more details.","Consulte fonte para obter mais detalhes." -"Price Display Settings","Definições de visualização de preço" -"Priority","Prioridade" -"Product Tax Class","Classe de Imposto sobre Produtos" -"Product Tax Class Information","Informação do Escalão de Imposto do Produto" -"Product Tax Classes","Classe de Imposto do Produto" -"Range From","Faixa de" -"Range To","Faixa Para" -"Range To should be equal or greater than Range From.","O Intervalo Para deve ser igual ou maior que o Intervalo De." -"Rate","Taxa" -"Rate Percent","Taxa Percentual" -"Rate Percent should be a positive number.","A Taxa Percentual deve ser um número positivo." -"Reset","Redefinir" -"Row Total","Total de Linha" -"Sales","Vendas" -"Save Class","Salvar Classe" -"Save Rate","Salvar Preço" -"Save Rule","Salvar Regra" -"Save and Continue Edit","Salvar e continuar a editar" -"Shipping & Handling (Excl.Tax)","Transporte & Manuseio (Excl.Taxa)" -"Shipping & Handling (Incl.Tax)","Transporte % Manuseio (Inc.Taxa)" -"Shipping & Handling Tax","Taxa de Envio & Manuseio" -"Shipping (Excl. Tax)","Remessa (Exc. Taxa)" -"Shipping (Incl. Tax)","Remessa (Inc. Taxa)" -"Shipping Excl. Tax (%s)","Remessa Exc. Taxa (%s)" -"Shipping Incl. Tax (%s)","Remessa Inc. Taxa (%s)" -"Shipping Prices","Preços de Remessa" -"Shopping Cart Display Settings","Definições de visualização do carrinho de compras" -"Sort Order","Classificar pedido" -"State","Estado" -"State/Region","Estado/Região" -"Subtotal (Excl. Tax)","Subtotal (Excl. Taxa)" -"Subtotal (Excl.Tax)","Subtotal (Excl. Taxa)" -"Subtotal (Incl. Tax)","Subtotal (Inc. Taxa)" -"Subtotal (Incl.Tax)","Subtotal (Inc. Taxa)" -"Subtotal only","Somente subtotal" -"Tax","Taxas" -"Tax Calculation Based On","Cálculo da Taxa Baseado em" -"Tax Calculation Method Based On","Método de Cálculo da Taxa Baseado em" -"Tax Class for Shipping","Classe da Taxa para Remessa" -"Tax Classes","Classes de Taxas" -"Tax Identifier","Identificador de Taxa" -"Tax Rate","Taxa de Imposto" -"Tax Rate Information","Informação de Taxa de Imposto" -"Tax Rule Information","Informações de regras fiscais" -"Tax Rules","Regras de Impostos" -"Tax Section","Seção de Imposto" -"Tax Titles","Títulos de Impostos" -"Tax rate cannot be removed. It exists in tax rule","Taxa de imposto não pode ser removida. Ela existe em regra fiscal" -"Tax rates at the same priority are added, others are compounded.","Taxas de imposto com a mesma prioridade são adicionadas, outras são compostas." -"The tax class has been deleted.","A classe fiscal foi eliminada." -"The tax class has been saved.","A classe fiscal foi salva." -"The tax rate has been deleted.","A taxa de imposto foi eliminada." -"The tax rate has been imported.","A taxa de imposto foi importada." -"The tax rate has been saved.","A taxa de imposto foi salva." -"The tax rule has been deleted.","A regra fiscal foi eliminada." -"This class no longer exists","Esta classe não existe mais" -"This rule no longer exists","A regra não existe mais." -"This rule no longer exists.","Essa regra não existe mais." -"Total","Total" -"Unit Price","Preço Unitário" -"Warning tax configuration can result in rounding errors","A configuração de alerta de impostos pode resultar em erros de arrendondamento" -"Warning tax configuration can result in unexpected FPT prices on applicable devices","A configuração de alerta de impostos pode resultar em preços FPT inesperados em dispositivos aplicáveis" -"Warning tax discount configuration might result in different discounts than a customer might expect","A configuração de alerta de desconto de impostos pode resultar em descontos diferentes dos esperados por um cliente" -"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","Quando o preço do catálogo incluir impostos, habilitar esta configuração corrigirá o preço independentemente de qual seja a taxa de impostos do cliente." -"Whether catalog prices entered by admin include tax.","Se os preços do catálogo entraram por administrador incluem impostos." -"Whether shipping amounts entered by admin or obtained from gateways include tax.","Se as quantias transportadas entraram por administrador ou obtidas a partir de portais incluem impostos." -"Yes","Sim" -"You cannot delete this tax class as it is used for %d customer groups.","Você não pode apagar esta classe de imposto uma vez que é utilizada para %d grupos de clientes." -"You cannot delete this tax class as it is used for %d products.","Você não pode excluir esta classe de imposto uma vez que é usada para %d produtos." -"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","Você não pode apagar esta classe de imposto uma vez que é usada em Regras Fiscais. Você tem que eliminar em primeiro lugar as regras com que é usada." -"Zip code should not contain characters other than digits.","O CEP não deve conter caracteres diversos de dígitos." -"Zip/Post Code","Zip/Código Postal" -"Zip/Post is Range","Faixa de Zip/Postal" -"for store(s)","para loja(s)" diff --git a/app/locale/pt_BR/Mage_Usa.csv b/app/locale/pt_BR/Mage_Usa.csv deleted file mode 100644 index 4271ebd82..000000000 --- a/app/locale/pt_BR/Mage_Usa.csv +++ /dev/null @@ -1,381 +0,0 @@ -" was not delivered nor scanned","não foi entregue ou verificado" -"""Per Order"" allows single handling fee for entire order. ""Per Package"" allows individual handling fee for each package.","""Por Ordem"" permite uma única taxa de manuseio para o pedido inteiro. ""Por Pacote"" permite taxa de manuseio individual para cada pacote." -"1 Day Freight","Frete 1 dia" -"2 Day","2 dias" -"2 Day AM","2 dias AM" -"2 Day Freight","Frete 2 dias" -"2Day","2 dias" -"2nd Day Air","2º dia Aéreo" -"2nd Day Air AM","2º dia Aéreo manhã" -"2nd Day Air AM Letter","Carta 2º dia Aéreo Manhã" -"2nd Day Air Letter","Carta 2º dia Aéreo" -"3 Day Freight","Frete 3 dias" -"3 Day Select","3 dias" -"Access ID","ID de acesso" -"Access License Number","Acessar número de licença" -"Account ID","ID da conta" -"Account Number","Número de Conta" -"Additional Protection Configuration Value","Valor da configuração da proteção adicional" -"Additional Protection Enabled","Proteção adicional habilitada" -"Additional Protection Min Subtotal","Subtotal mín. da proteção adicional" -"Additional Protection Value","Valor da proteção adicional" -"Additional Protection Value Rounding Method","Método de arredondamento do valor da proteção adicional" -"Adult","Adulto" -"Adult Signature Required","Exigida Assinatura de Adulto" -"Allowed Methods","Métodos Permitidos" -"Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges.","Permitir que o peso total do pedido seja dividido em partes menores se exceder %s %s para assegurar cálculos corretos de taxas de remessa." -"Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","Permitir que o peso total do pedido seja dividido em partes menores se exceder 70 kg para assegurar cálculos corretos de taxas de remessa." -"Bound Printed Matter","Encadernar materiais impressos" -"Break bulk economy","Carga fracionada econômica" -"Break bulk express","Carga fracionada expressa" -"Business Service Center","Centro de serviço de negócios" -"Calculate Handling Fee","Calcular a Taxa de Manuseio" -"Canada Standard","Padrão Canadá" -"Cannot identify measure unit for %s","Não foi possível indentificar unidade de medida para %s" -"Cannot identify weight unit for %s","Não foi possível identificar unidade de peso para %s" -"Cannot retrieve shipping rates","Não é possível recuperar taxas de embarque" -"Centimeters","Centímetros" -"Commercial","Comercial" -"Configuration","Configuração" -"Container","Recipiente" -"Content Type","Tipo de Conteúdo" -"Customer Packaging","Acondicionamento do Cliente" -"Customer Supplied Package","Pacote Fornecido pelo Cliente" -"Customer services","Atendimento ao cliente" -"DHL","DHL" -"DHL (Deprecated)","DHL (Não aconselhado)" -"DHL service is not available at %s date","DHL service is not available at %s date" -"Debug","Debug" -"Default Package Height","Altura Padrão do Pacote" -"Default Package Length","Comprimento Padrão do Pacote" -"Default Package Width","Largura Padrão do Pacote" -"Delivered","Entregue" -"Delivery Confirmation","Confirmação de entrega" -"Depth","Profundidade" -"Destination Type","Tipo de Destino" -"Destination facility code is empty","O código do local de destino está vazio" -"Development","Desenvolvimento" -"Direct","Direto" -"Displayed Error Message","Mensagem de Erro Apresentada" -"Divide Order Weight","Dividir Peso do Pedido" -"Documents","Documentos" -"Domestic Shipment Days","Dias de Embarque Doméstico" -"Domestic economy select","Seleção econômica doméstica" -"Domestic express","Expresso doméstico" -"Drop Box","Caixa Suspensa" -"Dropoff","Caixa de correio" -"Easy shop","Compre fácil" -"Economy select","Seleção econômica" -"Empty response","Resposta vazia" -"Enable Negotiated Rates","Habilitar Taxas Negociadas" -"Enabled for Checkout","Habilitado para checkout" -"Enables/Disables SSL verification of Magento server by UPS.","Habilita/Desabilita verificação SSL de servidor Magento por UPS." -"Error #%s : %s","Erro #%s : %s" -"Error #%s : %s (%s)","Erro #%s : %s (%s)" -"Error #%s: %s","Erro #%s: %s" -"Europack","Europack" -"Europe First Priority","Europa Prioridade" -"Exchange rate %s (Base Currency) -> %s not found. DHL method %s skipped","Taxa de câmbio %s (Moeda Base) -> %s não encontrada. Método DHL %s omitido" -"Express","Expresso" -"Express 10:30","Expressa 10:30" -"Express 10:30 AM","Expresso 10:30 AM" -"Express 12:00","Expressa 12:00" -"Express 9:00","Express 9:00" -"Express Mail","Correio Expresso" -"Express Saturday","Expresso de Sábado" -"Express Saver","Express Econômico" -"Express easy","Expresso fácil" -"Express envelope","Envelope expresso" -"Express worldwide","Expresso mundial" -"Failed to parse xml document: %s","Falha ao analisar documento xml: %s" -"FedEx","FedEx" -"FedEx 10kg Box","FedEx 10kg Box" -"FedEx 25kg Box","FedEx 25kg Box" -"FedEx Box","FedEx Box" -"FedEx Envelope","FedEx Envelope" -"FedEx Pak","FedEx Pak" -"FedEx Tube","FedEx Tube" -"First Overnight","Primeira Pernoite" -"First-Class","Primeira Classe" -"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope" -"First-Class Mail International Letter","First-Class Mail International Letter" -"First-Class Mail International Postcard","First-Class Mail International Postcard" -"First-Class Mail Large Envelope","First-Class Mail Large Envelope" -"First-Class Mail Large Postcards","First-Class Mail Large Postcards" -"First-Class Mail Letter","First-Class Mail Letter" -"First-Class Mail Parcel","First-Class Mail Parcel" -"First-Class Mail Postcards","First-Class Mail Postcards" -"First-Class Package International Service","First-Class Package International Service" -"First-Class Package Service","First-Class Package Service" -"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup" -"Flat","Plano" -"Flat-Rate Box","Caixa fixa" -"Flat-Rate Envelope","Envelope Fixo" -"Free Method","Método grátis" -"Free Shipping with Minimum Order Amount","Envio grátis com Valor Mínimo de Encomenda" -"Freight","Frete" -"Freight worldwide","Frete mundial" -"Gateway URL","URL do Gateway" -"Gateway XML URL","Porta de Entrada XML URL" -"Gift","Presente" -"Girth","Circunferência" -"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)" -"Global Express Guaranteed Document","Global Express Guaranteed Document" -"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular" -"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular" -"Globalmail business","Negócios de remessa global" -"Ground","Terreno" -"Ground Commercial","Terreno Comercial" -"Ground Residential","Terreno Residencial" -"Handling Applied","Manuseio Aplicado" -"Handling Fee","Taxa de Manuseio" -"Height","Altura" -"Height, width and length should be equal or greater than %s","Altura, largura e comprimento devem ser iguais ou maiores que %s" -"Home Delivery","Entrega em Domicílio" -"Hub ID","Id do eixo" -"Inches","Polegadas" -"Indirect","Indireto" -"International Economy","Economia Internacional" -"International Express","Expresso Internacional" -"International First","Internacional Primeiro" -"International Ground","Terreno Internacional" -"International Priority","Prioridade Internacional" -"International Shipment Days","Dias de Remessa Internacional" -"Intl Economy Freight","Frete de Economia Internacional" -"Intl Priority Freight","Frete de Prioridade Internacional" -"Jetline","Jetline" -"Jumbo box","Caixa jumbo" -"Key","Senha" -"Kilograms","Quilogramas" -"Large","Grande" -"Large Express Box","Caixa Expressa Grande" -"Length","Comprimento" -"Letter","Carta" -"Library","Biblioteca" -"Library Mail","Library Mail" -"Live","Ao Vivo" -"Machinable","Maquinável" -"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Peso Máximo do Pacote (Por favor consulte a sua operadora de transporte para o peso máximo de transporte suportado)" -"Media Mail","Correio de Mídia" -"Medical express","Expresso médico" -"Medium Express Box","Caixa Expresso Média" -"Merchandise","Merchandise" -"Meter Number","Número Medidor" -"Minimum Order Amount for Free Shipping","Valor do Pedido Mínimo para Frete Grátis" -"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","Peso Mínimo do Pacote (Por favor consulte a sua operadora de transporte para o peso mínimo de transporte suportado)" -"Mode","Modo" -"National Freight","Frete Nacional" -"Next Afternoon","Tarde Seguinte" -"Next Day Air","Aéreo Dia Seguinte" -"Next Day Air Early AM","Aéreo Início da Manhã do Dia Seguinte" -"Next Day Air Early AM Letter","Carta Aérea Início da Manhã do Dia Seguinte" -"Next Day Air Intra (Puerto Rico)","Aéreo Interno Dia Seguinte (Porto Rico)" -"Next Day Air Letter","Carta Aérea Dia Seguinte" -"Next Day Air Saver","Aéreo Econômico Dia Seguinte" -"Next Day Air Saver Letter","Carta Aérea Econômica Dia Seguinte" -"No","Não" -"No packages for request","Nenhum pacote para o pedido" -"Non Documents","Não documentos" -"Non documents","Não documentos" -"Non-rectangular","Não retangular" -"None","Nenhum" -"Not Required","Não é Necessário" -"Order","Pedido" -"Order #%s","Pedido #%s" -"Origin of the Shipment","Origem da Remessa" -"Origin serviceAreaCode is missing","O Código de origem da área de serviço está faltando" -"Other","Outra" -"Others","Outros" -"PAK","PAK" -"Package","Embalagem" -"Package Description","Descrição do pacote" -"Package content is missing","O conteúdo do pacote está faltando" -"Packages Request Type","Tipo de Solicitação de Pacotes" -"Packaging","Acondicionamento" -"Pallet","Paleta" -"Parcel","Pacote" -"Parcel Post","Encomenda Postal" -"Password","Senha" -"Pickup Method","Método de Coleta" -"Piece Id barcode is missing","O código de barras da peça está faltando" -"Piece number information is missing","Faltam informações sobre o número da peça" -"Please make sure to use only digits here. No dashes are allowed.","Por favor, certifique-se de usar somente dígitos aqui. Travessões não são permitidos." -"Please, specify origin country","Por favor, especifique o país de origem" -"Pounds","Libras" -"Priority Mail","Correio Prioritário" -"Priority Mail Express","Priority Mail Express" -"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes" -"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup" -"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope" -"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup" -"Priority Mail Express International","Priority Mail Express International" -"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes" -"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope" -"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope" -"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope" -"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope" -"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope" -"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery" -"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes" -"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope" -"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope" -"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope" -"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope" -"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup" -"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope" -"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup" -"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup" -"Priority Mail International","Priority Mail International" -"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box" -"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope" -"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope" -"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box" -"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box" -"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope" -"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box" -"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope" -"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box" -"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope" -"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope" -"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box" -"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup" -"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope" -"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup" -"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box" -"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup" -"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope" -"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup" -"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A" -"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup" -"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B" -"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup" -"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C" -"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup" -"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box" -"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup" -"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope" -"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup" -"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope" -"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup" -"Priority Overnight","Prioridade durante a noite" -"Product content code is invalid","O código do conteúdo do produto é inválido" -"Product name is missing","O nome do produto está faltando" -"Receiver","Destinatário" -"Rectangular","Retangular" -"Reference code is missing","O código de referência está faltando" -"Regular","Regular" -"Regular Pickup","Coleta Regular" -"Request Courier","Solicitar correio" -"Required","Obrigatório" -"Required for negotiated rates; 6-character UPS.","Requerido para taxas negociadas; UPS de 6 caracteres." -"Residential","Residencial" -"Residential Delivery","Entrega Residencial" -"Response is in the wrong format","A resposta está em formato errado" -"Return","Retorno" -"Round","Arredondado" -"Routing barcode is missing","O código de barras de direcionamento está faltando" -"Same day","Mesmo dia" -"Sample","Amostra" -"Sandbox Mode","Modo Sandbox" -"Second Day Service","Serviço de Segundo Dia" -"Secure Gateway URL","Porta de Entrada URL Segura" -"Secureline","Linha segura" -"Sender","Remetente" -"Sender city info is missing","A informação cidade do remetente está faltando" -"Sender contact name is missing","O nome do remetente está faltando" -"Sender country info is missing","O país do remetente está faltando" -"Service type does not match","O tipo de serviço não combina" -"Ship to Applicable Countries","Enviar a Países Aplicáveis" -"Ship to Specific Countries","Enviar a Países Específicos" -"Shipment Contains Hazardous Materials","A remessa contém materiais perigosos" -"Shipment Dutiable","Remessa tributável" -"Shipment Duty Payment Type","Tipo de Pagamento Oficial da Remessa" -"Shipment Type","Tipo de Remessa" -"Shipment is not available.","A remessa não está disponível" -"Shipment picked up","Remessa coletada" -"Shipper Number","Número do Expedidor" -"Shipping Accept XML URL","URL de Envio Aceito XML" -"Shipping Confirm XML URL","URL de Confirmação de Envio XML" -"Shipping Key","Chave de Expedição" -"Shipping Key (International)","Chave de Expedição (Internacional)" -"Show Method if Not Applicable","Mostrar Método se Não Aplicável" -"Signature Required","Assinatura Requerida" -"Size","Tamanho" -"Small Express Box","Caixa Expressa Pequena" -"Smart Post","Postagem Inteligente" -"Sort Order","Classificar pedido" -"Specific","Específico" -"Sprintline","Sprintline" -"Standard Overnight","Pernoite Padrão" -"Standard Post","Correio Padrão" -"Station","Estação" -"Subtotal","Subtotal" -"Subtotal With Discount","Subtotal com desconto" -"The field is applicable if the Smart Post method is selected.","Este campo se aplica se a forma Correio Esperto for selecionado." -"The response is in wrong format.","A resposta está em formato errado." -"There is no available method for selected shipping address.","Não há método disponível para o endereço de entrega selecionado." -"There is no items in this order","Não há itens neste pedido" -"Third Party","Terceiros" -"Title","Título" -"To Lower","mais abaixo" -"To Upper","mais acima" -"Tracking XML URL","Rastreamento XML URL" -"UPS","UPS" -"UPS Expedited","UPS Acelerado" -"UPS Express","UPS Expresso" -"UPS Express Box","UPS Caixa Expressa" -"UPS Express Early A.M.","UPS Expresso Manhã" -"UPS Express Plus","UPS Expresso Plus" -"UPS Ground","UPS Por terra" -"UPS Letter Envelope","UPS Envelope de Carta" -"UPS Next Day Air","UPS Dia Seguinte" -"UPS Next Day Air Early A.M.","UPS Manhã do Dia Seguinte" -"UPS Next Day Air Saver","UPS Dia Seguinte Econômico" -"UPS Saver","UPS Econômico" -"UPS Second Day Air","UPS Segundo Dia" -"UPS Second Day Air A.M.","UPS Manhã do Segundo Dia" -"UPS Standard","UPS Padrão" -"UPS Three-Day Select","UPS Três dias" -"UPS Today Dedicated Courrier","UPS Correio de Entrega Hoje" -"UPS Today Express","UPS Expresso Hoje" -"UPS Today Express Saver","UPS Expresso Hoje Econômico" -"UPS Today Intercity","UPS Hoje Interurbano" -"UPS Today Standard","UPS Hoje Padrão" -"UPS Tube","UPS Tubo" -"UPS Type","UPS Tipo" -"UPS Worldwide 10 kilo","UPS Mundial 10kg" -"UPS Worldwide 25 kilo","UPS Mundial 25kg" -"UPS Worldwide Expedited","UPS Mundial Acelerado" -"UPS Worldwide Express","UPS Mundial Expresso" -"UPS Worldwide Express Plus","UPS Mundial Expresso Plus" -"UPS Worldwide Express PlusSM","UPS Mundial Expresso PlusSM" -"UPS Worldwide Saver","UPS Mundial Econômico" -"USPS","USPS" -"USPS GXG Envelopes","USPS GXG Envelopes" -"Unable to retrieve tracking","Não é possível recuperar o rastreamento" -"United Parcel Service","United Parcel Service" -"United Parcel Service XML","United Parcel Service XML" -"Unknown error","Erro desconhecido" -"Used only when ""Additional Protection Value"" is set to ""Configuration"". Can contain only numeric amount.","Usado somente quando ""Valor de Proteção Adicional"" é acionado em ""Configuração"". Só é possível conter quantidade numérica." -"User ID","Identificação do Usuário" -"Variable","Variável" -"Waybill barcode information is missing","As informações do código de barra da guia de mercadorias estão faltando" -"Weight Unit","Unidade de Peso" -"Weight unit is invalid","Unidade de peso inválida" -"Width","Largura" -"Worldwide Expedited","Mundial Acelerado" -"Worldwide Express","Mundial Expresso" -"Worldwide Express Letter","Carta Mundial Expressa" -"Worldwide Express Plus","Mundial Expresso Plus" -"Worldwide Express Plus Letter","Carta Mundial Express Plus" -"Worldwide Express Saver","Economizador Mundial Express" -"Wrong Content Type.","Tipo de Conteúdo Errado." -"Wrong Region.","Região Errada." -"Yes","Sim" -"Your Packaging","Sua Embalagem" -"Zero shipping charge for '%s'","Taxa de remessa zero para %s'" -"cm","cm" -"inch","polegada" diff --git a/app/locale/pt_BR/Mage_Weee.csv b/app/locale/pt_BR/Mage_Weee.csv deleted file mode 100644 index 63a47b5f7..000000000 --- a/app/locale/pt_BR/Mage_Weee.csv +++ /dev/null @@ -1,25 +0,0 @@ -"All Websites","Todos os sites" -"Apply Discounts To FPT","Aplicar descontos ao FPT" -"Apply Tax To FPT","Aplicar imposto ao FPT" -"Display Prices In Emails","Exibir preços em Emails" -"Display Prices In Product Lists","Exibir preços em listas de produtos" -"Display Prices In Sales Modules","Exibir preços em módulos de vendas" -"Display Prices On Product View Page","Exibir Preços em Página de Visualização do Produto" -"Enable FPT","Habilitar FPT" -"Excluding FPT","Excluindo FPT" -"Excluding FPT, FPT description, final price","Excluindo FPT, descrição de FPT, preço final" -"FPT Tax Configuration","Configuração de impostos FPT" -"Fixed Product Tax","Imposto fixo do produto" -"Fixed Product Taxes","Impostos fixos do produto" -"Include FPT In Subtotal","Incluir FPT no subtotal" -"Including FPT and FPT description","Incluindo FPT e descrição de FPT" -"Including FPT and FPT description [incl. FPT VAT]","Incluindo FPT e descrição de FPT [incluindo FPT IVA]" -"Including FPT only","Incluindo somente FPT" -"Loaded and Displayed with Tax","Carregado e exibido com imposto" -"Not Taxed","Não tributado" -"Taxed","Tributado" -"Total","Total" -"Total Incl. Tax","Total incluindo imposto" -"Total excl. tax","Total sem impostos" -"Total incl. tax","Total incluindo taxas" -"Total:","Total:" diff --git a/app/locale/pt_BR/Mage_Widget.csv b/app/locale/pt_BR/Mage_Widget.csv deleted file mode 100644 index 7c3014a27..000000000 --- a/app/locale/pt_BR/Mage_Widget.csv +++ /dev/null @@ -1,75 +0,0 @@ -"%s","%s" -"-- Please Select --","- Por Favor Selecione -" -"Actions","Ações" -"Add Layout Update","Adicionar Atualização de Layout" -"Add New Widget Instance","Adicionar Novo Exemplo de Widget" -"All","Todos" -"All Pages","Todas as Páginas" -"All Product Types","Todos Tipos de Produtos" -"An error occurred during saving a widget: %s","Ocorreu um erro ao salvar um widget:%s" -"Anchor Categories","Categorias Âncora" -"Apply","Solicitar" -"Assign to Store Views","Atribuir a visualizações da loja" -"Big Image","Imagem grande" -"Block Reference","Bloco de Referência" -"CMS","SGC" -"Categories","Categorias" -"Choose...","Escolha..." -"Close","Fechar" -"Continue","Continue" -"Default Template","Modelo padrão" -"Delete","Excluir" -"Design Package/Theme","Pacote de Design/Tema" -"Export to:","Exportar para:" -"Frontend Properties","Propriedades de interface inicial" -"Generic Pages","Páginas genéricas" -"Images","Imagens" -"Insert Widget","Inserir Widget" -"Insert Widget...","Insira o Widget..." -"Layout Updates","Atualizações de layout" -"Manage Widget Instances","Gerenciar exemplos de widget" -"New Instance","Novo exemplo" -"New Widget Instance","Novo exemplo de Widget" -"Next page","Próxima página" -"Non-Anchor Categories","Categorias Não-Âncoras" -"Not Selected","Não selecionado" -"Open Chooser","Abrir Seletor" -"Page","Página" -"Please Select Block Reference First","Por favor, primeiramente selecione bloco de referência" -"Previous page","Página anterior" -"Products","Produtos" -"Remove Layout Update","Remover atualização do layout" -"Save and Continue Edit","Salvar e continuar a editar" -"Select All","Selecionar Tudo" -"Select Visible","Selecione Visível" -"Settings","Configurações" -"Sort Order","Classificar pedido" -"Sort Order of widget instances in the same block reference","Classificar a ordem de exemplos de widget no mesmo bloco de referência" -"Specific %s","%s Específico" -"Specified Page","Página especificada" -"Template","Modelo" -"The information in this tab has been changed.","As informações contidas neste guia foram alteradas." -"The widget instance has been deleted.","O exemplo de widget foi deletado." -"The widget instance has been saved.","O exemplo de widget foi salvo." -"This tab contains invalid data. Please solve the problem before saving.","Este guia contém dados inválidos. Por favor resolva o problema antes de salvar." -"Thumbnail","Miniatura" -"Total %d records found","Total de %d registros encontrados" -"Type","Tipo" -"Unselect All","Desselecionar Todos" -"Unselect Visible","Desselecionar Visíveis" -"View","Ver" -"Widget","Widget" -"Widget ""%s""","Widget ""%s""" -"Widget ID","ID do Widget" -"Widget Insertion","Inserção de Widget" -"Widget Instance","Widget Exemplo" -"Widget Instance Title","Widget Exemplo Título" -"Widget Options","Widget Opções" -"Widget Type","Widget Tipo" -"Widget Type is not specified","Tipo de Widget não foi especificado" -"Widget instance is not full complete to create.","O exemplo de Widget não foi completo totalmente para criar" -"Widgets","Widgets" -"Wrong widget instance specified.","Exemplo de widget errado especificado." -"items selected","itens selecionados" -"of %s pages","de %s páginas" -"per page","por página" diff --git a/app/locale/pt_BR/Mage_Wishlist.csv b/app/locale/pt_BR/Mage_Wishlist.csv deleted file mode 100644 index f0cb3f49d..000000000 --- a/app/locale/pt_BR/Mage_Wishlist.csv +++ /dev/null @@ -1,100 +0,0 @@ -"%1$s has been updated in your wishlist.","%1$s foi atualizado em sua lista de desejos." -"%d product(s) have been added to shopping cart: %s.","%d produto(s) foram adicionados ao carrinho de compras: %s." -"%s for ""%s"".","%s para ""%s""." -"%s has been moved to wishlist %s","%s foi movido para a lista de desejos" -"%s's Wishlist","Lista de Desejos %s" -"* Required Fields","* Campos obrigatórios" -"Add All to Cart","Adicione Todos ao Carrinho de Compras" -"Add to Cart","Adicionar ao carrinho" -"Add to Compare","Adicionar para Comparar" -"Add to Wishlist","Adicionar à Lista de Desejos" -"Added From","Adicionado De" -"An error occurred while adding item to wishlist.","Ocorreu um erro enquanto adicionando item na lista de desejos." -"An error occurred while adding item to wishlist: %s","Ocorreu um erro enquanto adicionando item na lista de desejos: %s" -"An error occurred while deleting the item from wishlist.","Ocorreu um erro enquanto excluindo item na lista de desejos" -"An error occurred while deleting the item from wishlist: %s","Ocorreu um erro enquanto excluindo item na lista de desejos: %s" -"An error occurred while updating wishlist.","Ocorreu um erro enquanto atualizando lista de desejos" -"Are you sure you want to remove this product from your wishlist?","Tem certeza de que deseja remover este produto da sua lista de desejos?" -"Are you sure you would like to remove this item from the wishlist?","Você tem certeza de que deseja remover este item da lista de desejos?" -"Back","Voltar" -"Can\'t delete item from wishlist","Não é possível excluir item da lista de desejos" -"Can\'t save description %s","Não é possível salvar descrição %s" -"Can\'t update wishlist","Não é possível atualizar sua lista de desejos" -"Cannot add item to shopping cart","Não é possível adicionar item ao carrinho de compras" -"Cannot add the following product(s) to shopping cart: %s.","Não foi possível adicionar o(s) seguinte(s) produto(s) ao carrinho de compras: %s" -"Cannot add the item to shopping cart.","Impossível adicionar item ao carrinho." -"Cannot configure product","Não é possível configurar o produto" -"Cannot load wishlist item","Não é possível carregar o item da Lista de Desejos" -"Cannot move item to wishlist","Não foi possível mover item para a lista de desejos" -"Cannot specify product.","Não é possível especificar produto." -"Cannot specify wishlist item.","Não é possível especificar item da Lista de Desejos." -"Cannot specify wishlist.","Não é possível especificar Lista de Desejos." -"Cannot update wishlist","Não é possível carregar Lista de Desejos" -"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Checar esta caixa de verificação se você quiser adicionar um link a um feed rss para sua Lista de Desejos." -"Click for price","Clique para o preço" -"Comment","Comentário" -"Comment:","Comentário:" -"Configure Wishlist Item","Configurar item da Lista de Desejos" -"Configured Price:","Preço Configurado:" -"Could not find such wishlist","Não foi possível encontrar essa lista de desejos" -"Could not find wishlist","Não foi possível encontrar lista de desejos" -"Customer My Account My Wishlist","Cliente Minha Conta Minha Lista de Desejos" -"Customer My Account Wishlist Sharing Form","Cliente Minha Conta Lista de Desejos Formulário Compartilhado" -"Customer Shared Wishlist View","Panorama da Lista de Favoritos Compartilhada do Cliente" -"Date Added","Data de Adição" -"Days in Wishlist","Dias na Lista de Desejos" -"Display Wishlist Summary","Mostrar Resumo da Lista de Desejos" -"Edit","Editar" -"Email Sender","Remetente do e-mail:" -"Email Template","Modelo de e-mail" -"Email address can\'t be empty.","O endereço de email não pode ficar vazio." -"Email addresses, separated by commas","Endereços de email, separados por vírgulas" -"Enabled","Ativado" -"General Options","Opções gerais" -"Go to Wishlist","Ir para a lista de presentes" -"Helper for wishlist options rendering doesn't implement required interface.","A intepretação de opções de ajudante para lista de presentes não implementa a interface exigida." -"In stock","Em estoque" -"Last Added Items","Últimos itens adicionados" -"Message","Mensagem" -"My Wishlist","Minha lista de presentes" -"My Wishlist (%d item)","Minha lista de presentes (%d item)" -"My Wishlist (%d items)","Minha lista de presente (%d itens)" -"My Wishlist (%d)","Minha lista de presentes (%d)" -"My Wishlist Link","Link da minha lista de presentes" -"Options Details","Detalhes de opções" -"Out of stock","Fora de estoque" -"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Digite endereços de e-mail válidos, separados por vírgula. Por exemplo: johndoe@domain.com, johnsmith@domain.com." -"Please input a valid email address.","Por favor coloque um email válido." -"Please, enter your comments...","Insira seus comentários..." -"Price","Preço" -"Product","Produto" -"Product Details and Comment","Detalhes de produto e comentários" -"Product(s) %s have required options. Each of them can be added to cart separately only.","O(s) Produto(s) %s exige(m) opções. Cada um deles só pode ser adicionado ao carrinho de compras separadamente." -"Product(s) %s have required options. Each product can only be added individually.","O(s) produto(s) %s tem opções requeridas. Cada produto só pode ser adicionado individualmente." -"Quantity","Quantidade" -"RSS Feed","Lista RSS" -"RSS link to %s's wishlist","Link RSS para a lista de presentes de %s" -"Remove Item","Remover Item" -"Remove This Item","Remover Este Item" -"Remove item","Remover item" -"Requested cart item doesn't exist","O item de carrinho solicitado não existe" -"Requested wishlist doesn't exist","A lista de desejos solicitada não existe." -"Share Options","Compartilhar opções" -"Share Wishlist","Compartilhar Lista de Desejos" -"Share Your Wishlist","Compartilhar a sua lista de presentes" -"Sharing Information","Compartilhando Informação" -"This Wishlist has no Items","A Lista de Desejos não contém itens" -"This product(s) is currently out of stock","Este(s) produto(s) está(estão) esgotado(s)" -"Unable to add the following product(s) to shopping cart: %s.","Não é possível adicionar o(s) seguinte(s) produto(s) ao carrinho de compras: %s." -"Update Wishlist","Atualizar Lista de Desejos" -"User Description","Descrição do Usuário" -"View Details","Visualizar Detalhes" -"View Product","Ver Produto" -"What's this?","O que é isso?" -"Wishlist","Lista de presentes" -"Wishlist Section","Seção da Lista de Desejos" -"Wishlist Sharing","Compartilhamento da Lista de Desejos" -"Wishlist could not be created.","A lista de desejos não pôde ser criada." -"Wishlist is empty now.","A lista de desejos está vazia agora." -"You have no items in your wishlist.","Você não tem itens na sua lista de desejos." -"Your Wishlist has been shared.","A sua Lista de Desejos foi compartilhada." diff --git a/app/locale/pt_BR/Mage_XmlConnect.csv b/app/locale/pt_BR/Mage_XmlConnect.csv deleted file mode 100644 index 0098cafc3..000000000 --- a/app/locale/pt_BR/Mage_XmlConnect.csv +++ /dev/null @@ -1,1200 +0,0 @@ -" But cart has some errors.","Mas carrinho tem alguns erros." -" Note: Image size affects the performance of your app."," Note: Image size affects the performance of your app." -"""Description"" is more than %d characters long","""Descrição"" é mais longo do que %d caracteres" -"""Title"" is more than %d characters long","""Título"" é mais longo do que %d caracteres" -"""id"" attribute is required for a ""%s"" field.","atributo ""id"" é necessário para um campo ""%s""." -"""line_count"" attribute is required for ""multiline"" element.","atributo ""line_count"" é necessário para elemento ""multiline""." -"""message"" attribute is required for ""%s"" validator rule.","atributo ""mensagem"" é necessário para regra de validação ""%s""." -"%1$s has been added to your wishlist.","%1$s foi adicionado à sua lista de desejos." -"%1$s incl tax.","%1$s de imposto incluído" -"%@ is not correct","%@ is not correct" -"%s API Key required.","%s Chave API necessária." -"%s Application ID required.","%s ID da Aplicação necessária." -"%s Secret Key required.","%s Chave Secreta necessária." -"%s attribute is required.","%s atributo é necessário." -"%s fields is required","%s fields is required" -"%s has been added to your cart.","%s foi adicionado ao seu carrinho." -"%s id:","%s id:" -"%s was updated in your shopping cart.","%s was updated in your shopping cart." -"(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)","(Inclui mais países do que os listados abaixo. Como o proprietário do aplicativo, você é responsável pelo cumprimento de leis específicas para cada país relacionadas com a distribuição ou venda de seu aplicativo para o país, incluindo o seu país de origem.)" -"* - field is required","* - field is required" -"*Subject to change","*Sujeito a alteração" -"1. Please select type of the action:","1. Please select type of the action:" -"10:40 AM","10:40" -"2. Please select a page","2. Please select a page" -"2. Type Category Name","2. Type Category Name" -"2. Type Product Name","2. Type Product Name" -"80px x 80px","80px x 80px" -"80x80 px","80x80 px" -"Login to Urabn Airship.","Fazer Login em Urban Airship." -"Login to Urban Airship.","Login to Urban Airship." -"A Catalog Only App will not support functions such as add to cart, add to wishlist, or login.","Uma Aplicação Só Catálogo não irá suportar funções como adicionar ao carrinho, adicionar à lista de desejos, ou login." -"A new password has been sent.","Uma nova senha foi enviada." -"About","About" -"Access forbidden","Access forbidden" -"Account","Conta" -"Account Information","Account Information" -"Account Settings","Account Settings" -"Account confirmation is required. Please check your email for the confirmation link.","Confirmação da conta é necessária. Por favor verifique seu email para o link de confirmação." -"Account information has been saved.","Informações de conta foram salvas." -"Action","Ação" -"Action type does\'t recognized","Action type does\'t recognized" -"Action type does\'t recognized.","Action type does\'t recognized." -"Action type doesn\'t recognized.","Action type doesn\'t recognized." -"Activate","Ativar" -"Activate PayPal Checkout","Ativar Caixa PayPal" -"Activate PayPal MECL","Ativar PayPal MECL" -"Activation Key","Chave de Ativação" -"Add","Add" -"Add Action","Add Action" -"Add Address from Contacts","Add Address from Contacts" -"Add App","Adicionar Aplicação" -"Add Custom","Add Custom" -"Add New Address","Add New Address" -"Add New Template","Adicionar novo modelo" -"Add Page","Adicionar Página" -"Add To Wishlist","Add To Wishlist" -"Add a billing address","Add a billing address" -"Add a shipping address","Add a shipping address" -"Add to Cart","Adicionar ao carrinho" -"Add to Wishlist","Adicionar à Lista de Desejos" -"Adding Product to Cart...","Adding Product to Cart..." -"Adding Product to WishList...","Adding Product to WishList..." -"Additional Address","Endereço Adicional" -"Additional Info","Additional Info" -"Address","Endereço" -"Address 2","Endereço 2" -"Address Book","Address Book" -"Address Book Updated","Address Book Updated" -"Address Info","Address Info" -"Address book is empty","Address book is empty" -"Address data not specified.","Dados de endereço não especificados." -"Address does not belong to this customer.","Endereço não pertence a este cliente." -"Address has been deleted.","Endereço foi apagado." -"Address has been saved.","Endereço foi salvo." -"Admin Application Settings","Admin Application Settings" -"Admin Mobile Application","Admin Mobile Application" -"Admin application has not been enabled","Admin application has not been enabled" -"Administrative contact for this app and for app submission issues.","Contato administrativo para este app e para questões de submissão do app." -"Advanced Settings","Configurações Avançadas" -"After submitting the App to Magento, please contact %1$s to receive the Application Key, Application Secret and Application Master Secret.","Depois de enviar o Aplicativo a Magento, por favor, entre em contato com %1$s para receber a Chave do Aplicativo, o Segredo do Aplicativo e o Segredo Master do Aplicativo." -"AirMail Message Queue","Fila de Mensagens AirMail" -"AirMail Messages Queue","Fila de Mensagens AirMail" -"AirMail Template Preview","Pré-visualização do Modelo do AirMail" -"AirMail message","Mensagem AirMail" -"AirMail templates","Modelos AirMail" -"All Allowed Countries","Todos os Países Permitidos" -"All Images","All Images" -"All locations","Todos os locais" -"Amount","Amount" -"Amount in %@","Amount in %@" -"Amounts","Amounts" -"An account with this email address already exists.","Já existe uma conta com este endereço email." -"An error occurred while adding item to wishlist.","Ocorreu um erro enquanto adicionando item na lista de desejos." -"An error occurred while deleting the address.","Ocorreu um erro enquanto apagando este endereço." -"An error occurred while loading categories.","Ocorreu um erro durante o carregamento das categorias." -"An error occurred while loading category filters.","Ocorreu um erro enquanto carregando os filtros de categoria." -"An error occurred while loading configuration.","An error occurred while loading configuration." -"An error occurred while loading localization.","An error occurred while loading localization." -"An error occurred while loading login form.","An error occurred while loading login form." -"An error occurred while loading wishlist.","Ocorreu um erro durante o carregamento da lista de desejos." -"An error occurred while processing your order. Please contact us or try again later.","Ocorreu um erro enquanto processando a sua ordem. Por favor nos contate ou tente novamente mais tarde." -"An error occurred while processing your request.","Ocorreu um erro enquanto processando o seu pedido." -"An error occurred while removing item from wishlist.","Ocorreu um erro enquanto removendo o item da lista de desejos." -"An error occurred while removing items from wishlist.","Um erro ocorreu durante a remoção de itens da sua lista de desejos." -"Analytics","Analítica" -"Android","Android" -"Android doesn\'t support AirMail message type.","O Android não suporta o tipo de mensagem AirMail." -"App Background","Plano de fundo da Aplicação" -"App Background (landscape mode)","App Background (landscape mode)" -"App Background (landscape mode).","Plano de fundo da Aplicação (modo paisagem)." -"App Background (portrait mode)","App Background (portrait mode)" -"App Background (portrait mode).","Plano de fundo da Aplicação (modo retrato)." -"App Background
    (landscape mode)","Plano de fundo
    (modo paisagem)" -"App Background
    (portrait mode)","Plano de fundo
    (modo retrato)" -"App Background image missing.","Falta imagem do Plano de fundo da Aplicação." -"App Code","Código da Aplicação" -"App Information","Informações da Aplicação" -"App Name","Nome da Aplicação" -"App Stores","Lojas de Aplicação" -"App Submission History","Histórico de Envio de Aplicação" -"App Title","Título da Aplicação" -"App code","App code" -"App code required.","Código da Aplicação solicitado." -"App does not exist.","Aplicação inexistente." -"App has been deleted.","Aplicação excluída." -"App has been saved.","Aplicação salva." -"App has been submitted.","Aplicação enviada." -"App model not loaded.","Modelo de aplicação não carregado." -"App with specified code does not exist.","Aplicação, com código especificado, inexistente." -"Appears in the info section of your app (example: Copyright 2010 – Your Company, Inc.)","Aparece na seção de informações da sua aplicação (exemplo: Copyright 2010 - Sua Empresa, Inc.)" -"Application","Aplicação" -"Application Key","Chave de Aplicação" -"Application Master Secret","Segredo Mestre da Aplicação" -"Application Name","Nome da Aplicação" -"Application Secret","Segredo da Aplicação" -"Application doesn\'t exist.","Application doesn\'t exist." -"Apply","Apply" -"Applying Coupon Code","Applying Coupon Code" -"Applying Gift Card %@","Applying Gift Card %@" -"Are you sure you want to cancel a message?","Are you sure you want to cancel a message?" -"Are you sure you want to cancel selected records?","Are you sure you want to cancel selected records?" -"Are you sure you want to delete a message?","Are you sure you want to delete a message?" -"Are you sure you want to delete selected records?","Are you sure you want to delete selected records?" -"Are you sure you want to delete this theme? This change will affect all applications.","Você tem certeza que quer apagar este tema? Essa mudança afetará todos os aplicativos." -"Are you sure you want to do this?","Tem certeza de que quer fazer isso?" -"Are you sure you want to remove this item?","Are you sure you want to remove this item?" -"Are you sure you whant to cancel a message?","Tem certeza de que deseja cancelar uma mensagem?" -"Are you sure you whant to delete a message?","Tem certeza de que deseja apagar uma mensagem?" -"Are you sure you what to cancel selected records?","Tem certeza de que você quer cancelar os registros selecionados?" -"Are you sure you what to delete selected records?","Tem certeza de que você quer apagar os registros selecionados?" -"As Low As","As Low As" -"As Low Excl. Tax","As Low Excl. Tax" -"As Low Incl. Tax","As Low Incl. Tax" -"As a Magento customer, Urban Airship is offering you unlimited Push Notifications and Rich Push for $100/year* along with a 60 day free trial.","Como cliente Magento, a Urban Airship está lhe oferecendo Notificações de Empurrões ilimitadas e Empurrões Ricos por $100/ano*, juntamente com um período de teste gratuito por 60 dias." -"As low as","As low as" -"As low as excl. tax","As low as excl. tax" -"As low as incl. tax","As low as incl. tax" -"At last one application has to be created.","Ao menos um aplicativo precisa ser criado." -"At least one option should be selected","At least one option should be selected" -"Authentication complete.","Autenticação concluída." -"Authentication to %@ did failed...","Authentication to %@ did failed..." -"Average Order Amount","Average Order Amount" -"Average Orders","Average Orders" -"Average Rating","Average Rating" -"Back","Voltar" -"Back to App Edit","Voltar ao Editar da App" -"Background Color","Cor de Fundo" -"Balance","Saldo" -"Balance Change","Mudança no saldo" -"Balance History","Histórico do saldo" -"Banner on Home Screen","Banner na Tela Inicial" -"Banner on Home Screen (landscape mode)","Banner on Home Screen (landscape mode)" -"Banner on Home Screen (landscape mode) image missing.","Imagem de Banner na Tela Inicial (modo paisagem) está ausente." -"Banner on Home Screen (portrait mode)","Banner on Home Screen (portrait mode)" -"Banner on Home Screen (portrait mode) image missing.","Imagem de Banner na Tela Inicial (modo retrato) está ausente." -"Banner on Home Screen
    (landscape mode)","Banner na Tela inicial
    (modo paisagem)" -"Banner on Home Screen
    (portrait mode)","Banner na Tela inicial
    (modo retrato)" -"Banner on Home Screen image missing.","Banner faltando na imagem da Tela Inicial." -"Banners on Home Screen","Banners on Home Screen" -"Best Sellers","Best Sellers" -"Billing","Billing" -"Billing Address","Endereço de faturamento" -"Billing address","Billing address" -"Billing address has been set.","Endereço de cobrança foi definido." -"Bundle Products","Bundle Products" -"Buy %1$s for %2$s","Compre %1$s por %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Compre %1$s por %2$s (%3$s incl. imposto) cada" -"Buy %1$s for %2$s each","Compre %1$s por %2$s cada" -"Buy %1$s with %2$s discount each","Comprar %1$s com %2$s de desconto cada" -"Buy More & Save","Buy More & Save" -"Buyer country is not allowed by store.","País comprador não é permitido pela loja." -"CMS Page","CMS Page" -"CMS Pages haven\'t been found.","CMS Pages haven\'t been found." -"Cache Lifetime (seconds)","Tempo de Vida da Cache (segundos)" -"Cache Management","Gerenciamento de Cache" -"Can\'t add item to shopping cart.","Não é possível adicionar itens ao carrinho de compras." -"Can\'t apply the coupon code.","Não é possível aplicar o código do cupom." -"Can\'t copy file ""%s"" to ""%s"".","Não é possível copiar o arquivo ""%s"" para ""%s""." -"Can\'t create wishlist.","Não é possível criar lista de desejos." -"Can\'t delete ""%s"" theme.","Não é possível apagar o tema ""%s""." -"Can\'t load XML.","Não é possível carregar XML." -"Can\'t load admin application settings.","Can\'t load admin application settings." -"Can\'t load application with id ""%s""","Não é possível carregar o aplicativo com a id ""%s""" -"Can\'t load cart info.","Não é possível carregar a informação do carrinho." -"Can\'t load cart.","Não é possível carregar o carrinho." -"Can\'t load customer form.","Não é possível carregar o formulário de cliente." -"Can\'t load default themes.","Não é possível carregar os temas padrão." -"Can\'t load selected theme. Please check your media folder permissions.","Não é possível carregar o tema selecionado. Por favor, verifique suas permissões da pasta de mídia." -"Can\'t load template with id ""%s""","Can\'t load template with id ""%s""" -"Can\'t open submission form.","Não é possível abrir o formulário de inscrição." -"Can\'t read file ""%s"".","Não é possível ler o arquivo ""%s""." -"Can\'t remove the item.","Não é possível remover o item." -"Can\'t reset theme.","Não é possível redefinir o tema." -"Can\'t save address.","Não é possível gravar o endereço." -"Can\'t save the customer.","Não é possível gravar o cliente." -"Can\'t save theme.","Não é possível gravar o tema." -"Can\'t show configuration.","Não é possível mostrar a configuração." -"Can\'t specify product.","Não é possível especificar o produto." -"Can\'t submit application.","Não é possível submeter a aplicação." -"Can\'t update cart.","Não é possível atualizar o carrinho." -"Can\'t write to file ""%s"".","Não é possível escrever no arquivo ""%s""." -"Cancel","Cancelar" -"Canceled","Cancelado" -"Canceling PayPal ...","Canceling PayPal ..." -"Cancelled","Cancelado" -"Cannot apply gift card.","Não é possível aplicar o cartão de presente." -"Cannot configure product.","Cannot configure product." -"Cannot load theme ""%s"".","Não é possível carregar o tema ""%s""." -"Cannot redeem Gift Card.","Não é possível resgatar o Cartão de presente." -"Cannot remove gift card.","Não é possível remover o cartão de presente." -"Cannot save theme ""%s"". Incorrect data received","Não é possível gravar o tema ""%s"". Dado incorreto recebido." -"Cannot update the item.","Cannot update the item." -"Card Verification Number","Número de Verificação do Cartão" -"Card verification number is wrong","Número de verificação do cartão incorreto." -"Carrier","Portador" -"Cart","Carrinho" -"Cart Updated","Cart Updated" -"Cart has been updated.","O carrinho foi atualizado." -"Cart has some errors.","O carrinho apresenta erros." -"Cart is empty.","O carrinho está vazio." -"Catalog Only App?","Catalogar somente aplicativo?" -"Category","Category" -"Category Button Color","Categoria Botão Cor" -"Category Item Background Color","Categoria Item Cor de fundo" -"Cc:","Cc:" -"Chairs","Cadeiras" -"Change Orientation","Alterar Orientação" -"Change Password","Alterar senha" -"Changes have been saved to theme.","As alterações no tema foram salvas." -"Check","Check" -"Check Gift Card","Check Gift Card" -"Check Gift Card Promo Redeemed","Check Gift Card Promo Redeemed" -"Checking Gift Card %@","Checking Gift Card %@" -"Checkout","Checkout" -"Checkout Page Registration","Checkout Page Registration" -"Checkout as Guest","Checkout as Guest" -"Checkout as Guest or Register","Checkout as Guest or Register" -"Checkout has been initialized.","O Checkout foi inicializado" -"Checkout initialization...","Checkout initialization..." -"Checkout initialized!","Checkout initialized!" -"Choose Store View","Choose Store View" -"Choose amount","Choose amount" -"Choose file","Choose file" -"City","Cidade" -"Clear","Clear" -"Close","Close" -"Color Themes","Temas das Cores" -"Colors","Cores" -"Commiting updates...","Commiting updates..." -"Company","Companhia" -"Completed","Concluído" -"Configuration data have been saved","Configuration data have been saved" -"Configure Cart Item","Configure Cart Item" -"Confirm New Password","Confirmar a nova senha" -"Confirm Password","Confirmar a senha" -"Connecting","Connecting" -"Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate.","Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate." -"Contact Email","Email de contato" -"Contact Information","Informações de contato" -"ContactsAreEmpty","ContactsAreEmpty" -"Container is not defined.","O recipiente não foi definido." -"Content","Conteúdo" -"Continue","Continue" -"Copyright","Direitos autorais" -"Copyright Page Logo","Direitos Autorais Página Logotipo" -"Copyright Page Logo (iPhone 4 retina)","Copyright Page Logo (iPhone 4 retina)" -"Copyright Page Logo
    (iPhone 4 retina)","Direitos Autorais Logotipo
    (retina do iPhone 4)" -"Copyright: Magento (c) 2010","Copyright: Magento (c) 2010" -"Countries","Countries" -"Countries Payment Applicable From","Pagamento a Países Aplicável Desde" -"Country","País" -"Country options don\'t recognized for ""%s"".","Opções de país não foram reconhecidas para ""%s""." -"Coupon code %s is not valid.","Código do cupom %s não é válido." -"Coupon code %s was applied.","O código do cupom %s foi aplicado" -"Coupon code is empty.","O código do cupom está em branco." -"Coupon code was canceled.","O código de cupom ""%s"" foi cancelado." -"Create Account","Create Account" -"Create an Account","Create an Account" -"Creating a Template is allowed only for applications which have device type iPhone.","Criar um modelo é permitido apenas para aplicativos que tenham dispositivo do tipo iPhone." -"Credit Card","Cartão de Crédito" -"Credit Card %s","Cartão de Crédito %s" -"Credit Card Number","Número do Cartão de Crédito" -"Credit Card Type","Tipo de Cartão de Crédito" -"Credit card number does not match credit card type.","O número do cartão de crédito não é compatível com o tipo de cartão de crédito." -"Cross Sells","Cross Sells" -"Current Balance: %s","Balanço Atual: %s" -"Current Password","Senha atual" -"Currently, PayPal MEP is not available for the Android application","Atualmente, o MEP do PayPal não está disponível para aplicativos de Android" -"Currently, the system does not support the viewing of the order detail.","Currently, the system does not support the viewing of the order detail." -"Custom App Icon","Icone personalizado de aplicativo" -"Custom App Icon (iPhone 4 retina)","Custom App Icon (iPhone 4 retina)" -"Custom App Icon
    (iPhone 4 retina)","Icone personalizado de aplicativo
    (iPhone 4 retina)" -"Custom Colors","Cores Personalizadas" -"Custom amount","Custom amount" -"Customer","Customer" -"Customer Name","Customer Name" -"Customer authentication problem.","Problema de autenticação personalizada" -"Customer balance available in enterprise version of Magento only.","O saldo do cliente está disponível apenas na versão enterprise do Magento." -"Customer balance is disabled for current store","O saldo do cliente está desabilitado para a loja atual" -"Customer email not specified.","E-mail do cliente não especificado." -"Customer logout problem.","Problema de logout do cliente." -"Customer not logged in.","Cliente não conectado." -"Customers","Customers" -"DD","DD" -"Date","Data" -"Date Created","Data da Criação" -"Date Submitted","Data de enviada." -"Date Updated","Data de Atualização" -"Date:","Date:" -"Day","Dia" -"Deeper Messaging and Engagement with Rich Push.","Melhor troca de mensagens e compromisso com o Rich Push." -"Default Billing Address","Endereço padrão de faturamento" -"Default Shipping Address","Endereço padrão de entrega" -"Default Theme","Tema padrão" -"Default themes are missed.","Default themes are missed." -"Delete","Excluir" -"Delete Action","Delete Action" -"Delete theme","Apagar tema" -"Deleted","Excluído" -"Description","Descrição" -"Description that appears in Android Market. %s chars maximum. ","Descrição que aparece no Mercado Android. No máximo %s caracteres." -"Description that appears in the iTunes App Store. %s chars maximum. ","Descrição que aparece na App Store do iTunes. Máximo de %s caracteres." -"Deselect All","Desmarcar Todos" -"Design","Design" -"Device","Dispositivo" -"Device Information","Informação do Dispositivo" -"Device Type","Tipo de Dispositivo" -"Device doesn\'t recognized","Device doesn\'t recognized" -"Device doesn\'t recognized. Unable to load a template.","Dispositivo não reconhecido. Não é possível carregar um modelo." -"Device doesn\'t recognized: ""%s"". Unable to load a helper.","Dispositivo não reconhecido: ""%s"". Não é possível carregar um ajudante." -"Device doesn\'t recognized: ""%s"". Unable to load preview model.","Dispositivo não reconhecido: ""%s"". Não é possível carregar a pré-visualização do modelo." -"Device type doesn\'t recognized.","Device type doesn\'t recognized." -"Discount code is empty","Discount code is empty" -"Discount:","Discount:" -"Done","Done" -"Downloadable Products Updated","Downloadable Products Updated" -"Downloads limit:","Downloads limit:" -"E-mail","E-mail" -"Edit","Editar" -"Edit Action","Edit Action" -"Edit Address","Edit Address" -"Edit AirMail Message","Editar Mensagem de Correio Aéreo" -"Edit AirMail Message Queue #%s","Editar Mensagem de Correio Aéreo Fila #%s" -"Edit App ""%s""","Editar App ""%s""" -"Edit Filter","Editar filtro" -"Edit Image","Edit Image" -"Edit Mail List","Edit Mail List" -"Edit Template ""%s""","Editar Modelo ""%s""" -"Edit filter","Edit filter" -"Edit note","Edit note" -"Either remote URL or application code was not set. Please make sure you filled all the values and try again.","Either remote URL or application code was not set. Please make sure you filled all the values and try again." -"Element with id %s already exists","Já existe um elemento com id %s" -"Email","E-mail" -"Email Address","Endereço de e-mail" -"Email address you provided is not valid. Please provide a valid one.","Email address you provided is not valid. Please provide a valid one." -"Email is not correct","Email is not correct" -"Email is not specified","Email is not specified" -"Enable Admin Application","Enable Admin Application" -"Enable AirMail Message Push notification","Ativar Notificação Push de Mensagem de Correio Aéreo" -"Enable Facebook","Ativar Facebook" -"Enable Flurry Analytics","Ativar Flurry Analytics" -"Enable Flurry Analytics for the merchant.","Ativar Flurry Analytics para o comerciante." -"Enable LinkedIn","Ativar LinkedIn" -"Enable Standard Checkout","Ativar Caixa Standard" -"Enable Twitter","Ativar Twitter" -"Enter Name","Enter Name" -"Enter discount code first.","Enter discount code first." -"Enter discount code if any","Enter discount code if any" -"Enter e-mail","Enter e-mail" -"Enter giftcard promo code here","Enter giftcard promo code here" -"Enter text","Enter text" -"Enter the gift card code","Enter the gift card code" -"Error","Error" -"Error Loading Configuration Format","Error Loading Configuration Format" -"Error during shortening url","Error during shortening url" -"Error message text is missed.","Error message text is missed." -"Error while processing file ""%s"".","Erro ao processar arquivo ""%s""." -"Error while reading data from Payment Bridge. Please, try again.","Erro ao ler dados da Ponte de Pagamento. Por favor, tente novamente." -"Error while reading remote data","Error while reading remote data" -"Error while uploading file ""%s"".","Erro ao fazer upload do arquivo ""%s""." -"Error while uploading file ""%s"". Disallowed file type. Only ""jpg"", ""jpeg"", ""gif"", ""png"" are allowed.","Erro ao fazer upload do arquivo ""%s"". Tipo de arquivo não permitido. Somente ""jpg"", ""jpeg, ""gif"", ""png"" são permitidos." -"Error.","Erro." -"Excl. Tax","Excl. Tax" -"Expiration Date - Month","Data de Validade - Mês" -"Expiration Date - Year","Data de Validade - Ano" -"Expires: %s","Expira: %s" -"Extend the life of your app with Urban Airship Push Notifications.","Aumente a vida do seu aplicativo com as Notificações de Empurrões do Urban Airship." -"Extensions","Extensões" -"FILTERS APPLIED","FILTROS APLICADOS" -"Facebook","Facebook" -"Facebook API","API do Facebook" -"Facebook Application ID","ID do Aplicativo de Facebook" -"Facebook post failed...","Facebook post failed..." -"Fax","Fax" -"File can\'t be uploaded.","O arquivo não pode ser carregado." -"File doesn\'t exist ""%s"".","O arquivo não existe ""%s""." -"Filter","Filter" -"Filters","Filters" -"First Name","Primeiro nome" -"Fixed amounts","Fixed amounts" -"Flurry API Code","Agitar Código de API" -"Flurry Analytics","Agitar analíticos" -"Flurry Analytics Site","Agitar site de análises" -"Fonts","Fontes" -"Forgot Password","Forgot Password" -"Forgot Password?","Forgot Password?" -"Forgot your password?","Forgot your password?" -"Form","Form" -"Free","Grátis" -"From","From" -"From Excl. Tax","From Excl. Tax" -"From Incl. Tax","From Incl. Tax" -"From excl. tax","From excl. tax" -"From incl. tax","From incl. tax" -"Full Description","Full Description" -"Funk Leaf","Evitar Folha" -"Gallery","Gallery" -"General","Geral" -"Generate Offline Catalog","Generate Offline Catalog" -"Get Content from CMS Page","Obter conteúdo de uma página de CMS" -"Gift Card ""%s"" was added.","Cartão Oferta ""%s"" foi adicionado." -"Gift Card ""%s"" was redeemed.","Cartão Oferta ""%s"" foi resgatado." -"Gift Card ""%s"" was removed.","Cartão Oferta ""%s"" foi removido." -"Gift Card (%s)","Cartão Oferta (%s)" -"Gift Card amount applied to order: %s","Valor do Cartão Oferta aplicado à ordem: %s" -"Gift Card code is empty.","O código do Cartão-Presente está vazio." -"Gift Card: %s","Cartão Oferta: %s" -"Gift card account available in enterprise version of Magento only.","A conta de cartão-presente está disponível apenas na versão enterprise do Magento." -"Giftcard promo code","Giftcard promo code" -"Grand Total","Grand Total" -"Grand Total (Excl. Tax)","Total (Exluindo Taxa)" -"Grand Total (Incl. Tax)","Total (IncluindoTaxa)" -"Guest","Convidado" -"Header Background Color","Cor de Fundo do cabeçalho" -"Header Font Color","Cor da Fonte do Cabeçalho" -"High Resolution Application Icon","Ícone da Aplicação de Alta Resolução" -"Home","Início" -"Hot Red","Vermelho Quente" -"How do you rate this product?","Como você avalia este produto?" -"How to incorporate Urban Airship within your application:","Como incorporar o Urban Airship no seu aplicativo:" -"I Agree","I Agree" -"I agree to the Terms and Conditions","I agree to the Terms and Conditions" -"ID","Identidade" -"Icon that will appear on the user\'s device after they download your app.","Icon that will appear on the user\'s device after they download your app." -"Icon that will appear on the user\'s device after they download your app. Recommended size: 48px x 48px.","O ícone que aparecerá no dispositivo do usuário depois que baixar o seu aplicativo. Tamanho recomendado: 48px x 48px." -"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 72px x 72px.","Ícone que aparecerá no dispositivo do usuário depois que baixar o seu aplicativo. Você não precisa aplicar um gradiente ou bordas suaves (isso é feito automaticamente pela Apple). Tamanho recomendado: 72px x 72px." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 114px x 114px.","Ícone que aparecerá no telefone do usuário depois que baixar o seu aplicativo. Você não precisa aplicar um gradiente ou bordas suaves (isso é feito automaticamente pela Apple). Tamanho recomendado: 114px x 114px." -"Icon that will appear on the user’s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 57px x 57px at 72 dpi.","Ícone que aparecerá no telefone do usuário depois que baixar o aplicativo. Você não precisa aplicar um gradiente ou bordas suaves (isso é feito automaticamente pela Apple). Tamanho recomendado: 57px x 57px em 72 dpi." -"Icons","Ícones" -"If leave this field empty, the message will be sent immediately","Se deixar este campo em branco, a mensagem será enviada imediatamente" -"If you want to disable the cache on the application side, leave the field empty. Warning! When disabling cache, the application will take time to load each page.","Se você quiser desativar a cache no lado da aplicação, deixe o campo vazio. Atenção! Ao desativar a cache, o aplicativo vai levar tempo para carregar cada página." -"Image %s is required.","Image %s is required." -"Image action has been saved.","Image action has been saved." -"Image does not exist. Please reload this page.","Image does not exist. Please reload this page." -"Image file was not found.","Arquivo de imagem não encontrado." -"Image has been deleted.","Image has been deleted." -"Image id is required.","Image id is required." -"Image limits don\'t recognized for ""%s"" image type","Image limits don\'t recognized for ""%s"" image type" -"Image that appears on first screen while your app is loading.","Image that appears on first screen while your app is loading." -"Image that appears on first screen while your app is loading. Required size: 1024px x 768px.","Imagem que aparece na primeira tela, enquanto o seu aplicativo está carregando. Tamanho necessário: 1024px x 768px." -"Image that appears on first screen while your app is loading. Required size: 320px x 455px.","Imagem que aparece na primeira tela, enquanto o seu aplicativo está carregando. Tamanho necessário: 320px x 455px." -"Image that appears on first screen while your app is loading. Required size: 320px x 460px.","Imagem que aparece na primeira tela, enquanto o seu aplicativo está carregando. Tamanho necessário: 320px x 460px." -"Image that appears on first screen while your app is loading. Required size: 640px x 920px.","Imagem que aparece na primeira tela, enquanto o seu aplicativo está carregando. Tamanho necessário: 640px x 920px." -"Image that appears on first screen while your app is loading. Required size: 768px x 1024px.","Imagem que aparece na primeira tela, enquanto o seu aplicativo está carregando. Tamanho necessário: 768px x 1024px." -"Image type doesn\'t recognized: ""%s"".","Image type doesn\'t recognized: ""%s""." -"Image type is required.","Image type is required." -"Images","Imagens" -"Images order has been updated.","Images order has been updated." -"In Queue","Na Fila" -"In Stock","No Estoque" -"In addition, click here to review Urban Airship\'s Terms of Service: click here.","Além disso, clique aqui para ver os Termos de Serviço do Urban Airship: clique aqui." -"In order to resubmit your app, you need to first purchase a %s from MagentoCommerce","A fim de reenviar o seu aplicativo, você precisa primeiro adquirir um %s da MagentoCommerce" -"In order to submit your app, you need to first purchase a %s from MagentoCommerce","A fim de submeter o seu aplicativo, você precisa primeiro adquirir um %s da MagentoCommerce" -"Inactive Tabs","Abas Inativas" -"Incl. Tax","Incl. Tax" -"Incl. tax","Incl. tax" -"Initialization PayPal ...","Initialization PayPal ..." -"Initialization of the PayPal checkout failed!","Initialization of the PayPal checkout failed!" -"Invalid XML.","XML inválido." -"Invalid current password.","Senha atual inválida." -"Invalid customer data.","Dados de clientes inválidos." -"Invalid data.","Dados inválidos." -"Invalid email address.","Endereço de e-mail inválido." -"Invalid item or wishlist.","Item inválido ou lista de desejos." -"Invalid login or password.","Acesso ou senha inválida." -"Invalid shipping method.","Método de envio inválido." -"Issue Number","Número de Emissão" -"It\'s not allowed to delete submitted application.","Não é permitido apagar pedido apresentado." -"Item","Item" -"Item Options","Item Options" -"Item has been added to cart.","Item foi adicionado ao carrinho." -"Item has been deleted from cart.","Item foi apagado do carrinho." -"Item has been removed from wishlist.","Item foi removido da lista de desejos." -"Items","Items" -"Items were updated. But can\'t update wishlist.","Itens foram atualizados. Mas não pode atualizar lista de desejos." -"Keep your image size below %s KB for optimal performance.","Keep your image size below %s KB for optimal performance." -"Key","Senha" -"Keywords","Palavras-chave" -"Label","Etiqueta" -"Landscape app Background","Landscape app Background" -"Landscape banners on Home Screen","Landscape banners on Home Screen" -"Large iTunes Icon","Ícone iTunes Grande" -"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.","Grande ícone que aparece na Loja App do iTunes. Você não precisa aplicar um gradiente ou bordas suaves (isso é feito automaticamente pela Apple). Tamanho necessário: 512px x 512px." -"Last 5 Orders","Last 5 Orders" -"Last 5 Search Terms","Last 5 Search Terms" -"Last Name","Último nome" -"Last update: %@","Last update: %@" -"Lifetime Sales","Lifetime Sales" -"LindedIn","LindedIn" -"Link:","Link:" -"LinkedIn","LinkedIn" -"LinkedIn API","LinkedIn API" -"LinkedIn API Key","Chave LinkedIn API" -"LinkedIn Authorization","LinkedIn Authorization" -"LinkedIn Autorization","LinkedIn Autorization" -"LinkedIn Secret Key","Chave Secreta LinkedIn" -"Linkedin post failed...","Linkedin post failed..." -"List of downloadable products is empty","List of downloadable products is empty" -"Load more items","Load more items" -"Loader Splash Screen","Carregador de Tela de Abertura" -"Loader Splash Screen (iPhone 4 retina)","Loader Splash Screen (iPhone 4 retina)" -"Loader Splash Screen (landscape mode)","Loader Splash Screen (landscape mode)" -"Loader Splash Screen (portrait mode)","Loader Splash Screen (portrait mode)" -"Loader Splash Screen
    (iPhone 4 retina)","Carregador de Tela de Abertura
    (iPhone 4 retina)" -"Loader Splash Screen
    (landscape mode)","Carregador Tela Inicial
    (modo paisagem)" -"Loader Splash Screen
    (portrait mode)","Carregador Tela Inicial
    (modo retrato)" -"Loading %@...","Loading %@..." -"Loading Account Form...","Loading Account Form..." -"Loading Address Book...","Loading Address Book..." -"Loading Address Form...","Loading Address Form..." -"Loading CMS page ...","Loading CMS page ..." -"Loading Cart...","Loading Cart..." -"Loading Gallery...","Loading Gallery..." -"Loading Login Form...","Loading Login Form..." -"Loading My Downloadable Products...","Loading My Downloadable Products..." -"Loading Order Details","Loading Order Details" -"Loading Orders List...","Loading Orders List..." -"Loading Preview...","Carregando Visualização..." -"Loading Product Options...","Loading Product Options..." -"Loading Products...","Loading Products..." -"Loading Registration Form...","Loading Registration Form..." -"Loading Restore Password Form...","Loading Restore Password Form..." -"Loading Store Credit...","Loading Store Credit..." -"Loading WishList...","Loading WishList..." -"Loading Write Review Form...","Loading Write Review Form..." -"Loading category ...","Loading category ..." -"Loading more items...","Loading more items..." -"Loading product ...","Loading product ..." -"Loading shipping methods ...","Loading shipping methods ..." -"Loading...","Loading..." -"Locations","Locais" -"Log In","Entrar" -"Log Out","Log Out" -"Log in to Admin Panel","Log in to Admin Panel" -"Log into Account","Log into Account" -"Log into your account","Log into your account" -"Log out Account","Log out Account" -"LogInMessageTitle","LogInMessageTitle" -"Login and password are required.","Acesso e senha são obrigatórios." -"Logo in Header","Logotipo no Cabeçalho" -"Logo in Header image missing.","Faltando imagem no Logotipo no Cabeçalho" -"Logout complete.","Saída (logout) completa." -"M.I.","M.I." -"MEP is PayPal\'s native checkout experience for the iPhone. You can choose to use MEP alongside standard checkout, or use it as your only checkout method for Magento mobile. PayPal MEP requires a PayPal business account","O MEP é a experiência nativa de checkout para iPhone. Você pode escolher usar o MEP junto com o checkout padrão, ou usá-lo como sua única forma de checkout para o Magento móvel. O PayPal MEP exige uma conta de negócios do PayPal" -"MM","MM" -"Mailbox title","Título de caixa de correio" -"Main Tabs","Tabulações Principais" -"Make Inactive","Tornar Inativo" -"Make this app available in the following territories","Fazer esta aplicação disponível nos seguintes territórios" -"Manage Apps","Gerenciar Apps" -"Manage Mobile App","Gerenciar App Móvel" -"Maximum length is 140","Comprimento máximo é de 140" -"Maximum length is 255","Comprimento máximo é de 255" -"Maximum size: %s KB.","Maximum size: %s KB." -"Maximum: %.2f","Maximum: %.2f" -"Merchant Label","Etiqueta do Comerciante" -"Merge","Merge" -"Message","Message" -"Message Queue","Fila de Mensagens" -"Message Settings","Configurações de Mensagem" -"Message Templates","Modelos de Mensagem" -"Message Title","Título de Mensagem" -"Message Type","Tipo de Mensagem" -"Message can be edited when status of the message is ""In Queue"" only.","A mensagem pode ser editada apenas quando o status da mensagem for ""Na Fila""." -"Message content","Conteúdo da mensagem" -"Message text is missed.","Message text is missed." -"Message title","Título da mensagem" -"Message too long, please use 140 symbols","Message too long, please use 140 symbols" -"Message type doesn\'t recognized","Message type doesn\'t recognized" -"Minimize","Minimize" -"Minimum %@, maximum %@","Minimum %@, maximum %@" -"Minimum: %.2f","Minimum: %.2f" -"Mobile","Móvel" -"Mobile Express Checkout has been canceled.","O Checkout Expresso Móvel foi cancelado." -"Mobile Express Checkout processed successfully.","Checkout Expresso Móvel processado com sucesso." -"Month","Mês" -"More","Mais" -"More Info","Mais Informação" -"More Tabs","Mais Abas" -"Most Viewed Products","Most Viewed Products" -"My Account","My Account" -"My Downloadable Products","My Downloadable Products" -"My Orders","My Orders" -"My Wishlist","My Wishlist" -"Name","Name" -"Name on Card","Nome no Cartão" -"Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize. %s chars max.","Nome que aparece abaixo do seu aplicativo quando os usuários o instalam no seu dispositivo. Recomendamos que escolha um nome que tenha entre 10-12 caracteres e que os seus clientes irão reconhecer. %s caracteres no máximo." -"New AirMail Message","Nova Mensagem AirMail" -"New AirMail Message Queue","Fila de Nova Mensagem AirMail" -"New App","Novo Aplicativo" -"New Customers","New Customers" -"New Password","Nova senha" -"New Template","Novo Modelo" -"New to Our Store?","New to Our Store?" -"Nickname","Alcunha (Nickname)" -"No","No" -"No Payment Information Required","Nenhuma Informação de Pagamento Necessária" -"No Ratings","No Ratings" -"No internet connection. Retry later ...","No internet connection. Retry later ..." -"No items were specifed to update.","Nenhum item foi especificado para ser atualizado." -"No items were updated.","Nenhum item foi atualizado." -"No product selected.","Nenhum produto selecionado." -"No products found. Please retry with other term","No products found. Please retry with other term" -"No shipping method required.","Não é necessária forma de envio." -"No such file ""%s"".","Nenhum arquivo ""%s""." -"Not Submitted","Não Submetido" -"Note: Image size affects the performance of your app.","Note: Image size affects the performance of your app." -"Notice","Aviso" -"Number of Orders","Number of Orders" -"Number of Uses","Number of Uses" -"OK","OK" -"OR, Pay with Standard Checkout","OR, Pay with Standard Checkout" -"Offline Catalog","Offline Catalog" -"Offline cart stored on server","Offline cart stored on server" -"Offline catalog export complete.","Offline catalog export complete." -"Offline catalog export failed.","Offline catalog export failed." -"One or more keywords that describe your app. Keywords are matched to users\' searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum.","Uma ou mais palavras-chave que descrevem sua aplicação. Palavras-chave são combinados para as buscas dos usuários na App Store (Loja de Aplicativos) e ajudam ao retorno de resultados de busca precisos. Separe várias palavras-chave com vírgulas. 100 caracteres é o máximo." -"Onepage checkout is disabled.","Saída de uma página está desativada." -"Only custom theme can be deleted","Apenas o tema personalizado pode ser apagado" -"Only default theme can be reset","Somente o tema padrão pode ser restaurado" -"Only free apps are allowed in this version.","Apenas aplicativos gratuitos são permitidos nesta versão." -"Only registered users can write reviews. Please, log in or register.","Somente usuários registrados podem escrever comentários. Por favor, entre ou registre-se." -"Open","Open" -"Options","Options" -"Options menu items","Menu de itens de opções" -"Order","Order" -"Order #","Order #" -"Order #%s - %s","Pedido nº %s - %s" -"Order Date: %s","Data do pedido: %s" -"Order Details Updated","Order Details Updated" -"Order ID","Order ID" -"Order ID:","Order ID:" -"Order Info","Order Info" -"Order List Updated","Order List Updated" -"Order Number","Order Number" -"Order Review","Order Review" -"Order canceled","Order canceled" -"Order failed","Order failed" -"Order id is not specified.","A id do pedido não foi especificada." -"Order is not available.","O pedido não está disponível." -"Ordered","Solicitado" -"Ordered Items","Ordered Items" -"Orders","Orders" -"Other amount","Other amount" -"Out of Stock","Out of Stock" -"Output format is not specified. Please, specify ""format"" key in constructor, or set it using setFormat().","O formato de saída não foi especificado. Por favor defina a chave de ""formato"" no construtor, ou configure-a usando setFormat()." -"Overall Activity","Overall Activity" -"POST data is not valid.","Dados POST não são válidos." -"Pages","Páginas" -"Password","Senha" -"Password fields cannot be empty.","Campos de senha não podem estar vazios." -"Password is not specified","Password is not specified" -"Password:","Password:" -"PayPal","PayPal" -"PayPal Checkout","PayPal Checkout" -"PayPal MECL is the mobile version of PayPal\'s Express Checkout service. You can choose to use MECL alongside standard checkout, or use it as your only checkout method for Magento Mobile.","O MECL PayPal é a versão móvel do serviço de Checkout expresso do PayPal. Você pode escolher usar o MECL junto com o checkout padrão, ou usá-lo como sua única forma de checkout para o Magento Móvel." -"PayPal MEP","PayPal MEP" -"PayPal Mobile Embedded Payment (MEP)","Pagamento Móvel Incorporado PayPal (PayPal Mobile Embedded Payment, MEP)" -"PayPal Mobile Express Checkout","Checkout Expresso Móvel PayPal" -"PayPal Mobile Express Checkout Library (MECL)","Biblioteca Checkout Expresso Móvel PayPal (MECL)" -"PayPal Mobile Express Checkout Token does not exist.","Token de Checkout Expresso Móvel PayPal não existe." -"Payer Email: %s","E-mail do Pagante: %s" -"Payment Applicable From","Pagamento Aplicável Desde" -"Payment Bridge module unavailable.","Módulo de Pagamento Ponte indisponível." -"Payment Information","Payment Information" -"Payment Method","Método de Pagamento" -"Payment Method has been set.","Método de pagamento foi definido." -"Payment Methods","Métodos de Pagamento" -"Payment method","Payment method" -"Payment method was successfully set.","Método de pagamento foi definido com sucesso." -"Paypal MEP doesn\'t support checkout with any discount.","MEP PayPal não suporta checkout com qualquer desconto." -"Place Order","Place Order" -"Placing order ...","Placing order ..." -"Please click here to see how to setup and retrieve API credentials.","Por favor, clique aqui para ver como configurar e recuperar credenciais API." -"Please Select Application","Por Favor Selecione Aplicação" -"Please Select Device Type","Por Favor Selecione Tipo de Dispositivo" -"Please agree to all the terms and conditions before placing the order.","Por favor concorde com todos os Termos e Condições antes de colocar a ordem." -"Please create and save an application first.","Por favor, primeiro crie e salve um aplicativo." -"Please enter ""App Title"".","Por favor insira ""Título App""." -"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Por favor insira um URL válido. Protocolo é necessário (http://, https:// ou ftp://)" -"Please enter a valid date.","Por favor insira uma data válida." -"Please enter a valid email address. For example johndoe@domain.com.","Por favor insira um endereço de e-mail válido. Por exemplo joao@domain.com." -"Please enter at least one email recipient","Please enter at least one email recipient" -"Please enter issue number or start date for switch/solo card type.","Por favor insira o número de emissão ou data de início para tipo de cartão switch/solo." -"Please enter the Activation Key.","Por favor insira a Chave de Ativação." -"Please enter the Copyright.","Por favor insira o Copyright (Direitos Autorais)." -"Please enter the Description.","Por favor insira a Descrição." -"Please enter the Price.","Por favor insira o Preço." -"Please enter the Resubmission Key.","Por favor insira o Código de Reenvio." -"Please enter the Title.","Por favor insira o Título." -"Please make sure your passwords match.","Por favor certifique-se que suas senhas coincidem." -"Please save application first.","Please save application first." -"Please select an option.","Por favor selecione uma opção." -"Please select at least one country.","Por favor selecione pelo menos um país." -"Please select payment method to cover a quote","Please select payment method to cover a quote" -"Please set email","Please set email" -"Please specify payment method","Please specify payment method" -"Please specify shipping method","Please specify shipping method" -"Please upload an image for ""App Background (landscape mode)"" field from Design Tab.","Por favor carregue uma imagem para o campo ""Fundo do App (modo paisagem)"" do Separador Design." -"Please upload an image for ""App Background (portrait mode)"" field from Design Tab.","Por favor carregue uma imagem para o campo ""Fundo do App (modo retrato)"" do Separador Design." -"Please upload an image for ""App Background"" field from Design Tab.","Por favor carregue uma imagem para o campo ""Fundo do App"" do Separador Design." -"Please upload an image for ""Banner on Home Screen (landscape mode)"" field from Design Tab.","Por favor, envie uma imagem para o campo ""Banner na Tela Inicial (modo paisagem)"" na Aba Design." -"Please upload an image for ""Banner on Home Screen (portrait mode)"" field from Design Tab.","Por favor, envie uma imagem para o campo ""Banner na Tela Inicial (modo retrato)"" na Aba Design." -"Please upload an image for ""Banner on Home Screen"" field from Design Tab.","Por favor, faça o upload de uma imagem para o campo ""Banner na Tela Inicial"" na Aba de Design." -"Please upload an image for ""Logo in Header"" field from Design Tab.","Por favor, faça o upload de uma imagem para o campo ""Logotipo no Cabeçalho"" na Aba de Design." -"Please use letters only (a-z or A-Z) in this field.","Por favor use apenas letras (a-z ou A-Z) neste campo." -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Por favor use apenas números nesse campo. Por favor evite espaços ou outros caracteres tais como pontos ou vírgulas." -"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Por favor use apenas letras (a-z ou A-Z) ou números (0-9) apenas neste campo. Espaços ou outros caracteres não são permitidos." -"Please wait...","Please wait..." -"Please, specify gift card amount!","Please, specify gift card amount!" -"Portrait app Background","Portrait app Background" -"Portrait banners on Home Screen","Portrait banners on Home Screen" -"Post data is empty.","Post data is empty." -"Post this product to your wall","Post this product to your wall" -"Posting to e-mails","Posting to e-mails" -"Preferred size: %spx x %spx.","Preferred size: %spx x %spx." -"Prefix","Prefixo" -"Preset Theme","Tema Predefinido" -"Preview","Visualizar" -"Price","Preço" -"Price Font Color","Cor da Fonte de Preço" -"Price excluding tax","Price excluding tax" -"Price including tax","Price including tax" -"Primary Color","Cor Primária" -"Primary Font Color","Cor da Fonte Primária" -"Problem changing or sending password.","Senha de envio ou de mudança de problema." -"Proceed to Checkout","Proceed to Checkout" -"Product","Product" -"Product Added to Cart","Product Added to Cart" -"Product Added to Wishlist","Product Added to Wishlist" -"Product Gallery Updated","Product Gallery Updated" -"Product Name3 ","Nome do Produto 3" -"Product Name3 1","Nome do Produto" -"Product Name3 2","Nome do Produto 3 2" -"Product Options Updated","Product Options Updated" -"Product Removed From Wishlist","Product Removed From Wishlist" -"Product Reviews Updated","Product Reviews Updated" -"Product SKU","Product SKU" -"Product Updated","Product Updated" -"Product added","Product added" -"Product is out of stock","Product is out of stock" -"Product is unavailable.","O Produto está indisponível" -"Product only available on the website.","Product only available on the website." -"Product succesfully added to cart","Product succesfully added to cart" -"Product was not specified.","O produto não foi especificado" -"Product(s) currently out of stock.","O(s) produto(s) estão atualmente fora do estoque" -"Products","Products" -"Pull Down To Update..","Pull Down To Update.." -"Purchase Order Number","Número de Ordem de Compra" -"Push Notification","Pressionar Notificação" -"Push Notifications allow you to send messages directly to the people who have installed your app on their device. Send messages to your full audience even when your app is closed. Push Notifications are one of the best ways to keep your app active by delivering valuable content directly to your customers. Learn more about Push Notifications - %1$s","As Notificações de Empurrões permitem enviar mensagens diretamente às pessoas que instalaram seu aplicativo no aparelho delas. Envie mensagens para a sua audiência inteira mesmo quando seu aplicativo estiver fechado. Notificações de Empurrões são uma das melhores formas de manter o seu aplicativo ativo, entregando conteúdos valiosos diretamente aos seus clientes. Saiba mais sobre as Notificações de Empurrões - %1$s" -"Push Title","Pressionar Título" -"Push message","Pressionar Mensagem" -"Push title","Pressionar título" -"Qty","Qty" -"Qty:","Qty:" -"Quantity","Quantity" -"Quantity:","Quantity:" -"Queue Date","Enfileirar Data" -"Queue Message","Enfileirar Mensagem" -"Queue does not exist.","A fila não existe" -"Queue is allowed only for applications with enabled Push Notification.","Fila é permitida apenas para aplicativos com Notificação Push habilitada." -"Quote instance is required.","Indicar o exemplo é requerido" -"Quote item is not found.","Quote item is not found." -"Range param doesn\'t recognized","Range param doesn\'t recognized" -"Ratings and Reviews","Ratings and Reviews" -"Read the Terms and Conditions","Read the Terms and Conditions" -"Recent Activity","Recent Activity" -"Recipient Information","Informações sobre o destinatário" -"Recommended size %spx x %spx.","Recommended size %spx x %spx." -"Recommended size 1024px x 344px. Note: Image size affects the performance of your app.","Tamanho recomendado 1024px x 344px. Nota: O tamanho da imagem afeta a performance do seu aplicativo." -"Recommended size 1024px x 704px. Note: Image size affects the performance of your app.","Tamanho recomendado 1024px x 704px. Nota: Tamanho da imagem afeta o desempenho do seu aplicativo." -"Recommended size 320px x 230px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Tamanho recomendado 320px x 230px. Nota: Tamanho da imagem afeta o desempenho do seu aplicativo. Mantenha o tamanho da imagem abaixo de 50 KB para um ótimo desempenho." -"Recommended size 320px x 258px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Tamanho recomendado 320px x 258px. Nota: Tamanho da imagem afeta o desempenho do seu aplicativo. Mantenha o tamanho da imagem abaixo de 50 KB para um ótimo desempenho." -"Recommended size 320px x 367px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.","Tamanho recomendado 320px x 367px. Nota: Tamanho da imagem afeta o desempenho do seu aplicativo. Mantenha o tamanho da imagem abaixo de 75 KB para um ótimo desempenho." -"Recommended size 35px x 35px.","Tamanho recomendado 35px x 35px." -"Recommended size 768px x 294px. Note: Image size affects the performance of your app.","Tamanho recomendado 768px x 294px. Nota: Tamanho da imagem afeta o desempenho do seu aplicativo." -"Recommended size 768px x 960px. Note: Image size affects the performance of your app.","Tamanho recomendado 768px x 960px. Nota: Tamanho da imagem afeta o desempenho do seu aplicativo." -"Recommended size: %spx x %spx at %s dpi.","Recommended size: %spx x %spx at %s dpi." -"Recommended size: %spx x %spx.","Recommended size: %spx x %spx." -"Recover","Recover" -"Redeem","Redeem" -"Redeeming Gift Card %@","Redeeming Gift Card %@" -"Redemption functionality is disabled.","A função de restituição está desativada." -"Refunded","Reembolsado" -"Regions","Regions" -"Register","Register" -"Registering cart ...","Registering cart ..." -"Registering user ...","Registering user ..." -"Regular","Regular" -"Regular and confirmation passwords must be equal","Senha normal e de confirmação deve ser igual" -"Related Product Background Color","Cor de Fundo do Produto Relacionado" -"Release To Update...","Release To Update..." -"Relevance","Relevance" -"Remaining downloads","Remaining downloads" -"Remove","Remove" -"Remove Address...","Remove Address..." -"Removing %@...","Removing %@..." -"Removing Coupon...","Removing Coupon..." -"Removing Gift Card...","Removing Gift Card..." -"Removing Product from WishList...","Removing Product from WishList..." -"Removing Store Credit...","Removing Store Credit..." -"Request internal error.","Erro interno de solicitação." -"Request param %s is missed","Request param %s is missed" -"Required size: %spx x %spx.","Required size: %spx x %spx." -"Reset theme to default","Restaurar o tema padrão" -"Resubmission Key","Chave de Resubmissão" -"Resubmit App","Reenviar Aplicativo" -"Resubmit App failure. %s","Resubmit App failure. %s" -"Results","Results" -"Revenue","Revenue" -"Revert","Revert" -"Revert Discount","Revert Discount" -"Review","Análise" -"Rich Push allows you to create and send engaging experiences by adding HTML and other rich media components to your push notifications. Moving beyond alerts and badge updates, Rich Push takes users into the app while displaying content in a customizable WebKit view. Create branded messages that engage your users with new content and information, all without having to update your app. Learn more about Rich Push - %1$s","O Empurrão Rico permite criar e enviar experiências envolventes acrescentando HTML e outros componentes de mídia rica às suas notificações de empurrões. Indo além dos alertas e atualizações de distintivos, o Empurrão Rico leva os usuários para dentro do aplicativo ao exibir o conteúdo em uma visualização WebKit personalizável. Crie mensagens marcadas envolventes para seus usuários, com novos conteúdos e informações, tudo isso sem precisar atualizar seu aplicativo. Saiba mais sobre Empurrão Rico - %1$s" -"SORT BY:","ORDENAR POR:" -"Sample","Sample" -"Samples","Samples" -"Save","Salvar" -"Save As","Salvar Como" -"Save Theme","Salvar Tema" -"Save and Continue Edit","Salvar e continuar a editar" -"Save and Submit App","Salvar e Enviar Apçicativo" -"Save in address book","Salvar no catálogo de endereços" -"Saving Address...","Saving Address..." -"Saving changes ...","Saving changes ..." -"Saving shipping address ...","Saving shipping address ..." -"Saving shipping methods ...","Saving shipping methods ..." -"Screen resolution is not supported","Screen resolution is not supported" -"Screens:","Telas:" -"Scroll Background Color","Cor de Fundo de Rolagem" -"Search","Pesquisa" -"Search Term","Search Term" -"Search Updated","Search Updated" -"Searching for %@...","Searching for %@..." -"Secondary Color","Cor Secundária" -"Secondary Font Color","Cor Secundária da Fonte" -"See all","See all" -"Select %@","Select %@" -"Select All","Selecionar Tudo" -"Select Chart","Select Chart" -"Select Links","Select Links" -"Select Options","Select Options" -"Select Payment Method","Select Payment Method" -"Select Range","Select Range" -"Select a","Select a" -"Select a Billing Address","Select a Billing Address" -"Select a Shipping Address","Select a Shipping Address" -"Select from Address Book","Select from Address Book" -"Select shipping method","Select shipping method" -"Selected product is unavailable.","Produto selecionado não está disponível." -"Send","Send" -"Sender Information","Informações do Remetente" -"Sending e-mail failed...","Sending e-mail failed..." -"Set","Set" -"Settings","Configurações" -"Shake device to reset the filter","Shake device to reset the filter" -"Share","Share" -"Share on LinkedIn","Share on LinkedIn" -"Share on Twitter","Share on Twitter" -"Ship method","Ship method" -"Shipped","Enviado" -"Shipping","Shipping" -"Shipping Address","Endereço de Envio" -"Shipping Method","Tipo de Frete" -"Shipping address","Shipping address" -"Shipping address has been set.","Endereço de entrega foi definido." -"Shipping method","Shipping method" -"Shipping method has been set.","Método de envio foi definido." -"Shipping method is required","Método de envio é necessário." -"Shipping method successfully updated","Forma de envio atualizada com sucesso" -"Shipping to this address is not possible.","O envio a este endereço não é possível." -"Shop","Compre" -"Shop All","Shop All" -"Shop Updated","Shop Updated" -"Shopping Cart","Shopping Cart" -"Shopping cart is empty.","Carrinho de compras está vazio." -"Show Password","Show Password" -"Sign In","Sign In" -"Signing In...","Signing In..." -"Signing Out ...","Signing Out ..." -"Sky Blue","Sky Blue" -"Social Networking","Redes Sociais" -"Some emails were not sent.","Alguns e-mails não foram enviados." -"Sorry, no payment options are available for this order at this time.","Desculpe, nenhuma opção de pagamento está disponível para esta ordem neste momento." -"Sorry, no quotes are available for this order at this time.","Desculpe, não há citações disponíveis neste momento para esta ordem." -"Sorry, there are no items in this category.","Sorry, there are no items in this category." -"Special","Special" -"Special Excl. Tax","Special Excl. Tax" -"Special Incl. Tax","Special Incl. Tax" -"Specific Countries","Países Específicos" -"Specified address does not exist.","Endereço especificado não existe." -"Specified invalid app code.","Código app especificado inválido." -"Specified invalid data.","Dados especificados inválidos." -"Specified item does not exist in wishlist.","Item especificado não existe na lista de desejos." -"Standard Checkout","Caixa Padrão" -"Standard Checkout uses the checkout methods provided by Magento. Only inline payment methods are supported. (e.g PayPal Direct, Authorize.Net, etc.)","Caixa Padrão usa os métodos de caixa (saída) fornecidos pelo Magento. Apenas os métodos de pagamento em linha são suportados. (por exemplo PayPal Direct, Authorize.Net, etc.)" -"Start Date","Data de início" -"Start Date - Month","Data de Início - Mês" -"Start Date - Year","Data de Início - Ano" -"Starting At","Starting At" -"Starting At Excl. Tax","Starting At Excl. Tax" -"Starting At Incl. Tax","Starting At Incl. Tax" -"Starting at excl. tax","Starting at excl. tax" -"Starting at incl. tax","Starting at incl. tax" -"State/Province","Estado/Província" -"Status","Status" -"Storage of offline cart on server failed. Please retry later","Storage of offline cart on server failed. Please retry later" -"Store Credit Info Updated","Store Credit Info Updated" -"Store Credit payment is not being used in your shopping cart.","Pagamento de Crédito da Loja não está sendo usado em seu carrinho de compras." -"Store View","Visualização da loja" -"Store credit","Store credit" -"Store logo that is displayed on copyright page of app.","Store logo that is displayed on copyright page of app." -"Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.","Logotipo da loja que é exibido na página de direitos autorais da app. Tamanho preferido: 100px x 100px." -"Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px.","O logotipo da loja é exibido na página de direitos autorais do aplicativo. Tamanho preferencial: 200px x 200px." -"Store switcher hasn\'t been defined","Store switcher hasn\'t been defined" -"Street Address","Endereço da Rua" -"Street Address 2","Endereço de rua 2" -"Subject:","Subject:" -"Submission","Envio" -"Submission Fields","Campos de envio" -"Submission History","Histórico de envio" -"Submit App","Enviar aplicativo" -"Submit App ""%s""","Enviar aplicativo ""%s""" -"Submit App failure. %s","Falha ao enviar o aplicativo. %s" -"Submit App failure. Invalid activation key provided","Falha ao enviar o aplicativo. A chave de ativação fornecida é inválida" -"Submit Review","Submit Review" -"Submitted","Enviado" -"Submitting Review...","Submitting Review..." -"Subtotal","Subtotal" -"Subtotal (Excl. Tax)","Subtotal (Excl. Taxa)" -"Subtotal (Incl. Tax)","Subtotal (Inc. Taxa)" -"Subtotal Excl. Tax","Subtotal Excl. Tax" -"Subtotal Incl. Tax","Subtotal Incl. Tax" -"Subtotal excluding tax","Subtotal excluding tax" -"Subtotal incl. tax:","Subtotal incl. tax:" -"Subtotal including tax","Subtotal including tax" -"Subtotal:","Subtotal:" -"Success","Success" -"Successfully posted to Facebook","Successfully posted to Facebook" -"Successfully posted to Linkedin","Successfully posted to Linkedin" -"Suffix","Sufixo" -"Summary of Your Review","Resumo da sua análise" -"Swipe a product to reveal more options","Swipe a product to reveal more options" -"T-Shirts","Camisetas" -"Tabs","Guias" -"Tax","Taxas" -"Telephone","Telefone" -"Tell a Friend","Conte a um Amigo" -"Tell a Friend is disabled.","Conte a um amigo está desativado." -"Tell a Friend link has been sent.","O link Conte a um amigo foi enviado." -"Template","Modelo" -"Template Content","Conteúdo do Modelo" -"Template Name","Nome do Modelo" -"Template does not exist.","O modelo não existe." -"Template for new AirMail Message does not exist.","Modelo para nova Mensagem AirMail não existe." -"Template has been deleted.","Modelo foi apagado." -"Terms And Conditions","Terms And Conditions" -"Text length does not satisfy specified max text range.","A extensão do texto ultrapassa o limite máximo especificado." -"Text length does not satisfy specified min text range.","A extensão do texto é menor que o limite mínimo especificado." -"Thank you for registering!","Obrigado por se registar!" -"Thank you for your purchase! ","Obrigado por sua compra!" -"The %s field should be filled.","The %s field should be filled." -"The Mailbox title will be shown in the More Info tab. To understand more about the title, please click here","O título da Mailbox será mostrado na aba Mais Info. Para entender mais sobre o título, por favor clique aqui " -"The application is currently inactive.\nPlease try again later.","The application is currently inactive.\nPlease try again later." -"The cart is empty","The cart is empty" -"The custom amount value should be higher than 0.","The custom amount value should be higher than 0." -"The custom amount value should not be higher than %s.","The custom amount value should not be higher than %s." -"The custom amount value should not be lower than %s.","The custom amount value should not be lower than %s." -"The following email(s) are either mistyped or have incorrect format. Check them and try again:\n","The following email(s) are either mistyped or have incorrect format. Check them and try again:\n" -"The icon that appears in the Android Market.","The icon that appears in the Android Market." -"The icon that appears in the Android Market. Recommended size: 512px x 512px. Maximum size: 1024 KB.","O ícone que aparece no Android Market. Tamanho recomendado: 512px x 512px. Tamanho máximo: 1024 KB." -"The length of the text in the %s field is too big. Please shorten the text.","The length of the text in the %s field is too big. Please shorten the text." -"The max length of the field ""%@"" is %d!","The max length of the field ""%@"" is %d!" -"The minimum password length is 6","The minimum password length is 6" -"The server responded with invalid data.","The server responded with invalid data." -"The shortening service returned status code %d indicating a client side error.","The shortening service returned status code %d indicating a client side error." -"The shortening service returned status code %d indicating a server side error.","The shortening service returned status code %d indicating a server side error." -"The store credit payment has been removed from shopping cart.","O pagamento de crédito da loja foi removido do carrinho de compras." -"The value is too big!","The value is too big!" -"The value should not be greater than %.2f!","The value should not be greater than %.2f!" -"The value should not be less than %.2f!","The value should not be less than %.2f!" -"Theme configurations are successfully reset.","Configurações do tema foram redefinidas com sucesso." -"Theme has been created.","O tema foi criado." -"Theme has been delete.","O tema foi apagado." -"Theme label can\'t be empty","Rótulo de tema não pode ficar vazio" -"Theme label:","Rótulo do tema:" -"Theme name is not set.","Nome do tema não está definido." -"There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?","There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?" -"There are no items here","There are no items here" -"There are no items in your cart","There are no items in your cart" -"There is an error in loading an app\'s configuration","There is an error in loading an app\'s configuration" -"There is an error in retrieving the data. Please try again later","There is an error in retrieving the data. Please try again later" -"There is no addresses for this contact","There is no addresses for this contact" -"There is no store credit history!","There is no store credit history!" -"There were some problems with the data.","Ocorreram alguns problemas com os dados." -"This email address was not found in our records.","Este endereço de e-mail não foi encontrado em nossos registros." -"This functionality disabled in offline mode","This functionality disabled in offline mode" -"This is a required field.","Este é um campo obrigatório." -"This product has no images.","This product has no images." -"Title","Título" -"Title bar","Barra de título" -"To","To" -"To Excl. Tax","To Excl. Tax" -"To Incl. Tax","To Incl. Tax" -"To activate PayPal MEP payment method activate Express checkout first. ","Para ativar o método de pagamento PayPal MEP activar primeiro o check-out expresso." -"To excl. tax","To excl. tax" -"To incl. tax","To incl. tax" -"To preview the newly uploaded images, please save your application first.","To preview the newly uploaded images, please save your application first." -"To:","To:" -"Token has not been set.","O token não foi enviado." -"Too many recipients have been set. Max amount of recipients is:","Too many recipients have been set. Max amount of recipients is:" -"Top Search Terms","Top Search Terms" -"Total","Total" -"Total Order Amount","Total Order Amount" -"Total incl. Tax: %1$s","Total incl. Taxas: %1$s" -"Total incl. tax","Total incl. tax" -"Totals","Totals" -"Touch and hold a product to delete from shopping cart","Touch and hold a product to delete from shopping cart" -"Touch and hold a product to reveal more options","Touch and hold a product to reveal more options" -"Try Again","Try Again" -"Twitter","Twitter" -"Twitter API","Twitter API" -"Twitter API Key","Chave Twitter API" -"Twitter Authorization","Twitter Authorization" -"Twitter Autorization","Twitter Autorization" -"Twitter Secret Key","Chave Secreta Twitter" -"Twitter post failed...","Twitter post failed..." -"Type","Type" -"Type and data is required","Type and data is required" -"URL","URL" -"Unable to cancel Mobile Express Checkout.","Não foi possível cancelar o Checkout Móvel Expresso." -"Unable to cancel queue.","Incapaz de cancelar fila." -"Unable to collect cart totals.","Incapaz de coletar totais do carrinho." -"Unable to delete queue.","Não é possível apagar fila." -"Unable to find an app to delete.","Incapaz de encontrar um aplicativo para apagar." -"Unable to find template to delete.","Incapaz de encontrar modelo para apagar." -"Unable to get shipping methods list.","Não foi possível obter lista de métodos de transporte." -"Unable to initialize MEP Checkout.","Não é possível inicializar MEP Check-out." -"Unable to initialize PayPal Mobile Express Checkout.","Não foi possível inicializar o Checkout Móvel Expresso do PayPal." -"Unable to initialize express checkout review.","Não foi possível iniciar a revisão de checkout expresso." -"Unable to initialize express checkout shipping method list.","Não foi possível iniciar a lista de método de envio do checkout expresso." -"Unable to initialize return action.","Não foi possível inicializar a ação de voltar." -"Unable to load addresses.","Não foi possível carregar os endereços." -"Unable to load application form.","Não é possível carregar formulário de candidatura." -"Unable to load banners.","Unable to load banners." -"Unable to load billing address form.","Não foi possível carregar o formulário de endereço de cobrança." -"Unable to load billing address.","Não foi possível carregar o endereço de cobrança." -"Unable to load categories.","Não foi possível carregar categorias." -"Unable to load checkout.","Não foi possível carregar o checkout." -"Unable to load localization.","Unable to load localization." -"Unable to load order list.","Não foi possível carregar a lista de pedidos." -"Unable to load order review.","Não foi possível carregar a revisão do pedido." -"Unable to load product gallery.","Não foi possível carregar galeria de produtos." -"Unable to load product info.","Não foi possível carregar as informações do produto." -"Unable to load product options.","Não foi possível carregar as opções de produto." -"Unable to load product review.","Não foi possível carregar resenha de produto." -"Unable to load product reviews.","Não foi possível carregar resenhas de produtos." -"Unable to load review form.","Não foi possível carregar a revisão do formulário." -"Unable to load search.","Não foi possível carregar busca." -"Unable to load shipping address form.","Não foi possível carregar o formulário de endereço para envio." -"Unable to place the order.","Impossível realizar o pedido." -"Unable to post the review.","Não foi possível publicar a avaliação." -"Unable to process preview.","Não foi possível processar a visualização." -"Unable to render a gift card account.","Não foi possível processar uma conta de cartão-presente." -"Unable to render an order.","Não foi possível executar um pedido." -"Unable to render downloadable products.","Unable to render downloadable products." -"Unable to render the store credits.","Não foi possível executar os créditos da loja." -"Unable to save app.","Não foi possível salvar o aplicativo." -"Unable to save message.","Não foi possível salvar a mensagem." -"Unable to save shipping address.","Não foi possível salvar o endereço de entrega." -"Unable to save shipping method.","Não foi possível salvar o método de entrega." -"Unable to save template.","Não foi possível salvar o modelo." -"Unable to start MEP Checkout.","Não foi possível iniciar a verificação MEP." -"Unable to start Mobile Express Checkout.","Não foi possível iniciar o Checkout Móvel Expresso." -"Unable to update shipping method.","Impossível atualizar tipo de frete." -"Undefined","Indefinido" -"Unit Price","Unit Price" -"Unit Price:","Unit Price:" -"Unknown Error","Erro Desconhecido" -"Unknown Error.","Erro Desconhecido." -"Unknown Payment Bridge Error","Unknown Payment Bridge Error" -"Unknown error ocured. Please retry later","Unknown error ocured. Please retry later" -"Unsupported character in path: ""%s""","Caractere não suportado no caminho: ""%s""" -"Unsupported value type received","A digitação do valor recebida não é suportada" -"Update Comment Error","Update Comment Error" -"Update Preview","Atualizar Previsão" -"Updating ...","Updating ..." -"Updating Cart...","Updating Cart..." -"Upon receiving these credentials, please fill in the corresponding fields.","Ao receber essas credenciais, por favor preencher os campos correspondentes." -"Urban Airship Push Notification","Notificação automática Urban Airship" -"Use Billing Address","Use Billing Address" -"Use Store Credit (%s available)","Use Crédito da Loja (%s disponível)" -"Use as my default billing address","Use como meu endereço de cobrança padrão" -"Use as my default shipping address","Use como meu endereço de entrega padrão" -"Use billing address for shipping","Use billing address for shipping" -"User Name:","User Name:" -"User session is expired","User session is expired" -"Version","Version" -"View Cart","View Cart" -"View Details","Visualizar Detalhes" -"View Gallery","Ver Galeria" -"View Wishlist","View Wishlist" -"Warning: All related AirMail messages will be deleted!","Aviso: Todas a mensagens AirMail relacionadas serão apagadas!" -"Website is offline","Website is offline" -"Website is offline.","O site está offline." -"WishList Updated","WishList Updated" -"Wishlist has been cleared.","A lista de presentes foi limpada." -"Wishlist has been updated.","A lista de presentes foi atualizada." -"Wishlist has been updated. But there are accrued some errors while updating some items.","A lista de presentes foi atualizada. Mas alguns erros ocorreram ao atualizar alguns itens." -"Wishlist is empty.","Wishlist is empty." -"Write a Review","Write a Review" -"Write a review","Write a review" -"Wrong Ipad background image orientation has been specified: ""%s"".","Uma orientação errada de imagem de plano de fundo do Ipad foi especificada: ""%s""." -"Wrong PayPal Mobile Express Checkout Token specified.","Token do Checkout Móvel Expresso do PayPal incorreto." -"Wrong device type.","Tipo errado de dispositivo." -"Wrong email format","Formato de e-mail incorreto." -"Wrong or expired Gift Card Code.","O código do cartão de presente está expirado ou errado." -"Wrong theme format.","Formato de tema incorreto." -"YYYY","AAAA" -"Year","Ano" -"Yes","Yes" -"You are already logged in.","Você já está logado." -"You are not logged in","You are not logged in" -"You can watch statistics here.","Você pode observar as estatísticas aqui." -"You canceled your order. Touch ""Pay with PayPal"" to try again.","You canceled your order. Touch ""Pay with PayPal"" to try again." -"You have entered an incorrect decimal value in the custom amount field. Provide a valid value.","You have entered an incorrect decimal value in the custom amount field. Provide a valid value." -"You have placed no orders.","You have placed no orders." -"You have uncommitted actions. Commit?","You have uncommitted actions. Commit?" -"You may also like","You may also like" -"You must login first","You must login first" -"You must read and agree to the Terms and Conditions before placing your order.","You must read and agree to the Terms and Conditions before placing your order." -"You need to enable PayPal Express Checkout first from the Payment configuration before enabling PayPal MECL.","Você precisa ativar o Checkout Expresso do PayPal na configuração do pagamento antes de ativar o MECL PayPal." -"You will receive an order confirmation email with details of your order and a link to track its progress.","Você irá receber um e-mail de confirmação de pedido com detalhes de seu pedido e um link para acompanhar o progresso." -"Your current balance is:","Seu saldo atual é:" -"Your order # is: %s. ","Seu pedido # está: %s." -"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it." -"Your order failed. Touch ""Pay with PayPal"" to try again.","Your order failed. Touch ""Pay with PayPal"" to try again." -"Your review has been accepted for moderation.","Sua avaliação foi aceita para moderação." -"Your tweet has been sent. Thanks for sharing this product on Twitter","Your tweet has been sent. Thanks for sharing this product on Twitter" -"Zip/Postal Code","Zip/Código Postal" -"\'%s\' exceeds the allowed file size: %d (bytes)","\'%s\' ultrapassa o tamanho permitido de arquivos: %d (bytes)" -"\'%s\' height exceeds allowed value of %d px","altura de \'%s\ excede o valor permitido de %d px" -"\'%s\' is not a valid file extension. Allowed extensions: %s","\'%s\' não é uma extensão de arquivo válida. Extensões permitidas: %s" -"\'%s\' width exceeds allowed value of %d px","O comprimento de \'%s\ ultrapassa o valor permitido de %d px" -"and","e" -"as Guest","as Guest" -"each","cada" -"field is required","field is required" -"iPad","iPad" -"iPhone","iPhone" -"image_id is required","image_id is required" -"not set","not set" -"required","required" -"save","salvar" -"ver. %s","ver. %s" diff --git a/app/locale/pt_BR/Phoenix_Moneybookers.csv b/app/locale/pt_BR/Phoenix_Moneybookers.csv deleted file mode 100644 index c95bbd5fe..000000000 --- a/app/locale/pt_BR/Phoenix_Moneybookers.csv +++ /dev/null @@ -1,42 +0,0 @@ -"All Credit Cards / Visa, Mastercard, AMEX, JCB, Diners (powered by Moneybookers) - International","Todos os Cartões de Crédito / Visa, Mastercard, AMEX, JCB, Diners (suportado por Moneybookers) - Internacional" -"CartaSi (powered by Moneybookers) - Italy","CartaSi (suportado por Moneybookers) - Itália" -"Carte Bleue (powered by Moneybookers) - France","Carte Bleue (suportado por Moneybookers) - França" -"Customer ID","ID do Cliente" -"Dankort (powered by Moneybookers) - Denmark","Dankort (suportado por Moneybookers) - Dinamarca" -"EPS Online-Überweisung (powered by Moneybookers) - Austria","EPS Online-Überweisung (suportado por Moneybookers) - Áustria" -"Enabled","Ativado" -"Find out more about Online Bank Transfer","Saiba mais sobre a Transferência Bancária Online" -"Giropay (powered by Moneybookers) - Germany","Giropay (suportado por Moneybookers) - Alemanha" -"Laser (powered by Moneybookers) - Ireland","Laser (suportado por Moneybookers) - Irlanda" -"Lastschrift (ELV) (powered by Moneybookers) - Germany","Lastschrift (ELV) (suportado por Moneybookers) - Alemanha" -"Loading secure payment page (SSL)","Carregando página de pagamento seguro (SSL)" -"Maestro (powered by Moneybookers) - United Kingdom, Austria, Spain","Maestro (suportado por Moneybookers) - Reino Unido, Áustria, Espanha" -"Moneybookers","Moneybookers" -"Moneybookers Settings","Configurações Moneybookers" -"Moneybookers Transaction ID: %s","ID da Transação Moneybookers: %s" -"Moneybookers eWallet","eWallet Moneybookers" -"More information about Moneybookers","Mais informações sobre Moneybookers" -"Nordea Solo (powered by Moneybookers) - Finland","Nordea Solo (suportado por Moneybookers) - Finlândia" -"Nordea Solo (powered by Moneybookers) - Sweden","Nordea Solo (suportado por Moneybookers) - Suécia" -"Online Bank Transfer (powered by Moneybookers)","Transferência Bancária Online (suportado por Moneybookers)" -"Order ID","ID da Ordem" -"POLi (powered by Moneybookers) - Australia","POLi (suportado por Moneybookers) - Austrália" -"Payment failed.","Pagamento falhou." -"Payment from Applicable Countries","Pagamento de Países Aplicáveis" -"Payment from Specific Countries","Pagamento de Países Específicos" -"Payment has not been processed yet.","Pagamento ainda não foi processado." -"Payment was canceled.","Pagamento foi cancelado." -"Pending bank transfer created.","Transferência bancária criada pendente." -"Please pay your order now","Por favor pague sua encomenda agora" -"Postepay (powered by Moneybookers) - Italy","Postepay (mantido por Moneybookers) - Itália" -"Powered by Moneybookers","Mantido por Moneybookers" -"Przelewy24 (powered by Moneybookers) - Poland","Przelewy24 (mantido por Moneybookers) - Polônia" -"Sofortüberweisung (powered by Moneybookers) - Germany","Sofortüberweisung (mantido por Moneybookers) - Alemanha" -"Sort Order","Classificar pedido" -"The amount has been authorized and captured by Moneybookers.","O montante foi autorizado e capturado por Moneybookers." -"The customer was redirected to Moneybookers.","O cliente foi redirecionado para Moneybookers." -"The order has been canceled.","A ordem foi cancelada." -"Title","Título" -"You will be redirected to our secure payment page when you place an order.","Você será redirecionado para nossa página de pagamento seguro quando você colocar uma ordem." -"eNETS (powered by Moneybookers) - Singapore","eNETS (mantido por Moneybookers) - Singapura" -"iDeal (powered by Moneybookers) - Netherlands","iDeal (mantido por Moneybookers) - Holanda" diff --git a/app/locale/pt_BR/template/email/account_new.html b/app/locale/pt_BR/template/email/account_new.html deleted file mode 100644 index 2ed1fdc43..000000000 --- a/app/locale/pt_BR/template/email/account_new.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}}
    -

    Prezado(a) {{htmlescape var=$customer.name}},

    -

    Bem-vindo a {{var store.getFrontendName()}}. Para fazer log in ao visitar o nosso site basta clicar Conectar-se ou Minha Conta no topo de cada página, e então inserir seu endereço de e-mail e senha.

    -

    - Use os seguintes valores quando fizer o login:
    - E-mail: {{var customer.email}}
    - Senha: {{htmlescape var=$customer.password}}

    -

    Ao fazer login na sua conta, você poderá fazer o seguinte:

    -
      -
    • – Passe pelo caixa mais rapidamente ao fazer uma compra
      • -
    • – Verificar a situação dos pedidos
      • -
    • – Visualizar pedidos anteriores
      • -
    • – Alterar informações da sua conta
      • -
    • – Mudar sua senha
      • -
    • – Armazenar endereços alternativos (para enviar para vários membros da família e amigos!)
      • -
    -

    Se você tiver alguma dúvida sobre a sua conta ou qualquer outra coisa, entre em contato conosco em {{config path='trans_email/ident_support/email'}} ou pelo telefone {{config path='general/store_information/phone'}}.

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/account_new_confirmation.html b/app/locale/pt_BR/template/email/account_new_confirmation.html deleted file mode 100644 index c19240062..000000000 --- a/app/locale/pt_BR/template/email/account_new_confirmation.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Prezado(a) {{htmlescape var=$customer.name}},

    -

    Seu e-mail {{var customer.email}} deve ser confirmado antes de ser utilizado para acessar nossa loja.

    -

    Para confirmar o e-mail e ter acesso instantâneo, utilize este link de confirmação. Este link pode ser utilizado somente uma vez.

    -

    - Use os seguintes valores quando fizer o login:
    - E-mail: {{var customer.email}}
    - Senha: {{htmlescape var=$customer.password}}

    -

    Se você tiver alguma dúvida sobre a sua conta ou qualquer outra coisa, entre em contato conosco em {{config path='trans_email/ident_support/email'}} ou pelo telefone {{config path='general/store_information/phone'}}.

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/account_new_confirmed.html b/app/locale/pt_BR/template/email/account_new_confirmed.html deleted file mode 100644 index 45d71dd4f..000000000 --- a/app/locale/pt_BR/template/email/account_new_confirmed.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Prezado(a) {{htmlescape var=$customer.name}},

    -

    Bem-vindo a {{var store.getFrontendName()}}. Para fazer log in ao visitar o nosso site basta clicar Conectar-se ou Minha Conta no topo de cada página, e então inserir seu endereço de e-mail e senha.

    -

    Ao fazer login na sua conta, você poderá fazer o seguinte:

    -
      -
    • – Passe pelo caixa mais rapidamente ao fazer uma compra
      • -
    • – Verificar a situação dos pedidos
      • -
    • – Visualizar pedidos anteriores
      • -
    • – Alterar informações da sua conta
      • -
    • – Mudar sua senha
      • -
    • – Armazenar endereços alternativos (para enviar para vários membros da família e amigos!)
      • -
    -

    Se você tiver alguma dúvida sobre a sua conta ou qualquer outra coisa, entre em contato conosco em {{config path='trans_email/ident_support/email'}} ou pelo telefone {{config path='general/store_information/phone'}}.

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/account_password_reset_confirmation.html b/app/locale/pt_BR/template/email/account_password_reset_confirmation.html deleted file mode 100644 index f05d83acd..000000000 --- a/app/locale/pt_BR/template/email/account_password_reset_confirmation.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Prezado(a) {{htmlescape var=$customer.name}},

    -

    Houve uma solicitação recente para alterar a senha de sua conta.

    -

    Se você solicitou esta alteração de senha, clique no seguinte link para reconfigurar a sua senha: {{store url="customer/account/resetpassword/" _query_id=$customer.id _query_token=$customer.rp_token}}

    -

    Se o link não funcionar, copie e cole a URL no seu navegador.

    -
    -

    Se você não fez essa solicitação, você pode ignorar esta mensagem e a sua senha permanecerá a mesma.

    -

    Obrigado, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/pt_BR/template/email/admin_password_new.html b/app/locale/pt_BR/template/email/admin_password_new.html deleted file mode 100644 index 8df331c1b..000000000 --- a/app/locale/pt_BR/template/email/admin_password_new.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Caro {{htmlescape var=$user.name}},

    -

    Sua nova senha é: {{htmlescape var=$password}}

    -

    Você pode alterar sua senha a qualquer momento acessando sua conta.

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/admin_password_reset_confirmation.html b/app/locale/pt_BR/template/email/admin_password_reset_confirmation.html deleted file mode 100644 index 5672e258f..000000000 --- a/app/locale/pt_BR/template/email/admin_password_reset_confirmation.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Caro {{htmlescape var=$user.name}},

    -

    Houve uma solicitação recente para alterar a senha de sua conta.

    -

    Se você solicitou esta alteração de senha, clique no seguinte link para reconfigurar a sua senha: {{store url="adminhtml/index/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}

    -

    Se o link não funcionar, copie e cole a URL no seu navegador.

    -
    -

    Se você não fez essa solicitação, você pode ignorar esta mensagem e a sua senha permanecerá a mesma.

    -

    Obrigado, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/pt_BR/template/email/amazonpayments_asp_notification_error.html b/app/locale/pt_BR/template/email/amazonpayments_asp_notification_error.html deleted file mode 100644 index 9b19ada4a..000000000 --- a/app/locale/pt_BR/template/email/amazonpayments_asp_notification_error.html +++ /dev/null @@ -1,12 +0,0 @@ - - -
    -
    __('Amazon Simple Pay notification message')__
    -
    __('Request')__:
    -
    {{var request}}
    -
    __('Error')__:
    -
    {{var error}}
    -
    \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/contact_form.html b/app/locale/pt_BR/template/email/contact_form.html deleted file mode 100644 index 8fcf6d6d2..000000000 --- a/app/locale/pt_BR/template/email/contact_form.html +++ /dev/null @@ -1,12 +0,0 @@ - - -Nome: {{var data.name}} -E-mail: {{var data.email}} -Telefone: {{var data.telephone}} - -Comentários: {{var data.comment}} \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/currency_update_warning.html b/app/locale/pt_BR/template/email/currency_update_warning.html deleted file mode 100644 index d13d8e099..000000000 --- a/app/locale/pt_BR/template/email/currency_update_warning.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Avisos de atualização de moeda: - - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/log_clean_warning.html b/app/locale/pt_BR/template/email/log_clean_warning.html deleted file mode 100644 index 06ddf48fc..000000000 --- a/app/locale/pt_BR/template/email/log_clean_warning.html +++ /dev/null @@ -1,7 +0,0 @@ - - -Alertas de Limpeza de Registro: - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/moneybookers_activateemail.html b/app/locale/pt_BR/template/email/moneybookers_activateemail.html deleted file mode 100644 index d7435259a..000000000 --- a/app/locale/pt_BR/template/email/moneybookers_activateemail.html +++ /dev/null @@ -1,6 +0,0 @@ - -{{var store.getFrontendName()}}
    -Endereço de e-mail do Moneybookers: {{var email_addr}}
    -ID do cliente Moneybookers: {{var customer_id}}
    -URL: {{var url}}
    -Idioma: {{var language}}
    diff --git a/app/locale/pt_BR/template/email/newsletter_subscr_confirm.html b/app/locale/pt_BR/template/email/newsletter_subscr_confirm.html deleted file mode 100644 index 0f2d48cb1..000000000 --- a/app/locale/pt_BR/template/email/newsletter_subscr_confirm.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Obrigado por assinar nosso boletim informativo.

    -

    Para começar a receber o boletim informativo, é preciso primeiro confirmar sua assinatura clicando no seguinte link:
    - {{var subscriber.getConfirmationLink()}}

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/newsletter_subscr_success.html b/app/locale/pt_BR/template/email/newsletter_subscr_success.html deleted file mode 100644 index d4e965fcd..000000000 --- a/app/locale/pt_BR/template/email/newsletter_subscr_success.html +++ /dev/null @@ -1,2 +0,0 @@ - -Assinatura do boletim informativo confirmado com sucesso \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/newsletter_unsub_success.html b/app/locale/pt_BR/template/email/newsletter_unsub_success.html deleted file mode 100644 index fad02de74..000000000 --- a/app/locale/pt_BR/template/email/newsletter_unsub_success.html +++ /dev/null @@ -1,2 +0,0 @@ - -Cancelamento de assinatura do boletim informativo confirmado com sucesso \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/password_new.html b/app/locale/pt_BR/template/email/password_new.html deleted file mode 100644 index 9b6e6805b..000000000 --- a/app/locale/pt_BR/template/email/password_new.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Prezado(a) {{htmlescape var=$customer.name}},

    -

    Sua nova senha é: {{htmlescape var=$customer.password}}

    -

    Você pode alterar sua senha a qualquer momento acessando sua conta.

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/pt_BR/template/email/payment_failed.html b/app/locale/pt_BR/template/email/payment_failed.html deleted file mode 100644 index 026ca735d..000000000 --- a/app/locale/pt_BR/template/email/payment_failed.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - -
    Operação de pagamento não realizada.
    -

    - Motivo
    - {{var reason}} -

    -

    - Tipo de checkout
    - {{var checkoutType}} -

    -

    - Cliente:
    - {{var customer}} <{{var customerEmail}}> -

    -

    - Itens
    - {{var items}} -

    -

    - Total:
    - {{var total}} -

    -

    - Endereço de faturamento:
    - {{var billingAddress.format('html')}} -

    -

    - Endereço de Envio:
    - {{var shippingAddress.format('html')}} -

    -

    - Tipo de Frete:
    - {{var shippingMethod}} -

    -

    - Método de Pagamento:
    - {{var paymentMethod}} -

    -

    - Data & Hora:
    - {{var dateAndTime}} -

    -
    \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/product_alert_cron_error.html b/app/locale/pt_BR/template/email/product_alert_cron_error.html deleted file mode 100644 index ee8d0ef4c..000000000 --- a/app/locale/pt_BR/template/email/product_alert_cron_error.html +++ /dev/null @@ -1,7 +0,0 @@ - - -Alertas de produto - Avisos cron: - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/product_price_alert.html b/app/locale/pt_BR/template/email/product_price_alert.html deleted file mode 100644 index 6a85b4c67..000000000 --- a/app/locale/pt_BR/template/email/product_price_alert.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Olá, {{var customerName}}, - -{{var alertGrid}} \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/product_share.html b/app/locale/pt_BR/template/email/product_share.html deleted file mode 100644 index 0faabb524..000000000 --- a/app/locale/pt_BR/template/email/product_share.html +++ /dev/null @@ -1,13 +0,0 @@ - - - -Benvindo, {{htmlescape var=$nome}}

    Por favor olhe em {{var product_name}}

    Aqui está uma mensagem:
    {{var message}}

    \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/product_stock_alert.html b/app/locale/pt_BR/template/email/product_stock_alert.html deleted file mode 100644 index 0cabedbbc..000000000 --- a/app/locale/pt_BR/template/email/product_stock_alert.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Olá, {{var customerName}}, - -{{var alertGrid}} \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/creditmemo_new.html b/app/locale/pt_BR/template/email/sales/creditmemo_new.html deleted file mode 100644 index 16105c6af..000000000 --- a/app/locale/pt_BR/template/email/sales/creditmemo_new.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Olá, {{htmlescape var=$order.getCustomerName()}}

    -

    - Obrigado por seu pedido no(a) {{var store.getFrontendName()}}. - Você pode verificar o status do seu pedido ao efetuando o registro em sua conta. - Se você tiver quaisquer dúvidas sobre seu pedido, entre em contato conosco em {{config path='trans_email/ident_support/email'}} ou ligue para {{config path='general/store_information/phone'}} Segunda à Sexta - das 8 às 5 - horário do Pacífico (PST). -

    -
    -

    Sua nota de crédito #{{var creditmemo.increment_id}} para o pedido #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Dados de Faturamento:Método de Pagamento:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Dados de Frete:Tipo de Frete:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} -

    {{var comment}}

    -

    Obrigado, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/creditmemo_new_guest.html b/app/locale/pt_BR/template/email/sales/creditmemo_new_guest.html deleted file mode 100644 index 71297430d..000000000 --- a/app/locale/pt_BR/template/email/sales/creditmemo_new_guest.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Olá, {{htmlescape var=$billing.getName()}}

    -

    - Obrigado por seu pedido no(a) {{var store.getFrontendName()}}. - Se você tiver quaisquer dúvidas sobre seu pedido, entre em contato conosco em {{config path='trans_email/ident_support/email'}} ou ligue para {{config path='general/store_information/phone'}} Segunda à Sexta - das 8 às 5 - horário do Pacífico (PST). -

    -
    -

    Sua nota de crédito #{{var creditmemo.increment_id}} para o pedido #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Dados de Faturamento:Método de Pagamento:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Dados de Frete:Tipo de Frete:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} -

    {{var comment}}

    -

    Obrigado, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/creditmemo_update.html b/app/locale/pt_BR/template/email/sales/creditmemo_update.html deleted file mode 100644 index 3c0fa93fe..000000000 --- a/app/locale/pt_BR/template/email/sales/creditmemo_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Caro {{htmlescape var=$order.getCustomerName()}},

    -

    - Seu pedido n° {{var order.increment_id}} foi
    - {{var order.getStatusLabel()}}. -

    -

    Você pode verificar o status do seu pedido ao efetuando o registro em sua conta.

    -

    {{var comment}}

    -

    - Em caso de dúvidas, entre em contato conosco em - {{config path='trans_email/ident_support/email'}} - ou pelo telefone {{config path='general/store_information/phone'}}. -

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/creditmemo_update_guest.html b/app/locale/pt_BR/template/email/sales/creditmemo_update_guest.html deleted file mode 100644 index 0de8575c8..000000000 --- a/app/locale/pt_BR/template/email/sales/creditmemo_update_guest.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Caro {{htmlescape var=$billing.getName()}},

    -

    - Seu pedido n° {{var order.increment_id}} foi
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Em caso de dúvidas, entre em contato conosco em - {{config path='trans_email/ident_support/email'}} - ou pelo telefone {{config path='general/store_information/phone'}}. -

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/invoice_new.html b/app/locale/pt_BR/template/email/sales/invoice_new.html deleted file mode 100644 index 1c2f017a1..000000000 --- a/app/locale/pt_BR/template/email/sales/invoice_new.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Olá, {{htmlescape var=$order.getCustomerName()}}

    -

    - Obrigado por seu pedido no(a) {{var store.getFrontendName()}}. - Você pode verificar o status do seu pedido ao efetuando o registro em sua conta. - Se você tiver quaisquer dúvidas sobre seu pedido, entre em contato conosco em {{config path='trans_email/ident_support/email'}} ou ligue para {{config path='general/store_information/phone'}} Segunda à Sexta - das 8 às 5 - horário do Pacífico (PST). -

    -
    -

    Sua fatura nº {{var invoice.increment_id}} para o pedido nº {{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Dados de Faturamento:Método de Pagamento:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Dados de Frete:Tipo de Frete:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}}  -
    -
    - {{/depend}} - {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} -

    {{var comment}}

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/invoice_new_guest.html b/app/locale/pt_BR/template/email/sales/invoice_new_guest.html deleted file mode 100644 index 8739dcce5..000000000 --- a/app/locale/pt_BR/template/email/sales/invoice_new_guest.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Olá, {{htmlescape var=$billing.getName()}}

    -

    - Obrigado por seu pedido no(a) {{var store.getFrontendName()}}. - Se você tiver quaisquer dúvidas sobre seu pedido, entre em contato conosco em {{config path='trans_email/ident_support/email'}} ou ligue para {{config path='general/store_information/phone'}} Segunda à Sexta - das 8 às 5 - horário do Pacífico (PST). -

    -
    -

    Sua fatura nº {{var invoice.increment_id}} para o pedido nº {{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    Dados de Faturamento:Método de Pagamento:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Dados de Frete:Tipo de Frete:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} -

    {{var comment}}

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/invoice_update.html b/app/locale/pt_BR/template/email/sales/invoice_update.html deleted file mode 100644 index 9da764f94..000000000 --- a/app/locale/pt_BR/template/email/sales/invoice_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Caro {{htmlescape var=$order.getCustomerName()}},

    -

    - Seu pedido n° {{var order.increment_id}} foi
    - {{var order.getStatusLabel()}}. -

    -

    Você pode verificar o status do seu pedido ao efetuando o registro em sua conta.

    -

    {{var comment}}

    -

    - Em caso de dúvidas, entre em contato conosco em - {{config path='trans_email/ident_support/email'}} - ou pelo telefone {{config path='general/store_information/phone'}}. -

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/invoice_update_guest.html b/app/locale/pt_BR/template/email/sales/invoice_update_guest.html deleted file mode 100644 index e326c1f14..000000000 --- a/app/locale/pt_BR/template/email/sales/invoice_update_guest.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Caro {{htmlescape var=$billing.getName()}},

    -

    - __('Your order # {{var order.increment_id}} has been')__
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Em caso de dúvidas, entre em contato conosco em - {{config path='trans_email/ident_support/email'}} - ou pelo telefone {{config path='general/store_information/phone'}}. -

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/order_new.html b/app/locale/pt_BR/template/email/sales/order_new.html deleted file mode 100644 index 5ca61d56d..000000000 --- a/app/locale/pt_BR/template/email/sales/order_new.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Olá, {{htmlescape var=$order.getCustomerName()}}

    -

    - Obrigado por seu pedido no(a) {{var store.getFrontendName()}}. - Assim que a sua encomenda for expedida, enviaremos um e-mail com um link para rastrear o seu pedido. - Você pode verificar o status do seu pedido ao efetuando o registro em sua conta. - Se você tiver quaisquer dúvidas sobre seu pedido, entre em contato conosco em {{config path='trans_email/ident_support/email'}} ou ligue para {{config path='general/store_information/phone'}} Segunda à Sexta - das 8 às 5 - horário do Pacífico (PST). -

    -

    Segue abaixo a confirmação do seu pedido. Agradecemos novamente pela preferência.

    -
    -

    Seu Pedido #{{var order.increment_id}} (realizado em {{var order.getCreatedAtFormated('long')}})

    -
    - - - - - - - - - - - - - - - -
    Dados de Faturamento:Método de Pagamento:
    - {{var order.getBillingAddress().format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Dados de Frete:Tipo de Frete:
    - {{var order.getShippingAddress().format('html')}} -   -   - {{var order.getShippingDescription()}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_items" order=$order}} -

    {{var order.getEmailCustomerNote()}}

    -

    Obrigado, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/order_new_guest.html b/app/locale/pt_BR/template/email/sales/order_new_guest.html deleted file mode 100644 index 98306346b..000000000 --- a/app/locale/pt_BR/template/email/sales/order_new_guest.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Olá, {{htmlescape var=$order.getBillingAddress().getName()}}

    -

    - Obrigado por seu pedido no(a) {{var store.getFrontendName()}}. - Assim que a sua encomenda for expedida, enviaremos um e-mail com um link para rastrear o seu pedido. - Se você tiver quaisquer dúvidas sobre seu pedido, entre em contato conosco em {{config path='trans_email/ident_support/email'}} ou ligue para {{config path='general/store_information/phone'}} Segunda à Sexta - das 8 às 5 - horário do Pacífico (PST). -

    -

    Segue abaixo a confirmação do seu pedido. Agradecemos novamente pela preferência.

    -
    -

    Seu Pedido #{{var order.increment_id}} (realizado em {{var order.getCreatedAtFormated('long')}})

    -
    - - - - - - - - - - - - - - - -
    Dados de Faturamento:Método de Pagamento:
    - {{var order.getBillingAddress().format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    Dados de Frete:Tipo de Frete:
    - {{var order.getShippingAddress().format('html')}} -   -   - {{var order.getShippingDescription()}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_items" order=$order}} -

    {{var order.getEmailCustomerNote()}}

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/order_update.html b/app/locale/pt_BR/template/email/sales/order_update.html deleted file mode 100644 index fd9ffdad0..000000000 --- a/app/locale/pt_BR/template/email/sales/order_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Caro {{htmlescape var=$order.getCustomerName()}},

    -

    - Seu pedido n° {{var order.increment_id}} foi
    - {{var order.getStatusLabel()}}. -

    -

    Você pode verificar o status do seu pedido ao efetuando o registro em sua conta.

    -

    {{var comment}}

    -

    - Em caso de dúvidas, entre em contato conosco em - {{config path='trans_email/ident_support/email'}} - ou pelo telefone {{config path='general/store_information/phone'}}. -

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/order_update_guest.html b/app/locale/pt_BR/template/email/sales/order_update_guest.html deleted file mode 100644 index 4acb4ab70..000000000 --- a/app/locale/pt_BR/template/email/sales/order_update_guest.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Caro {{htmlescape var=$billing.getName()}},

    -

    - Seu pedido n° {{var order.increment_id}} foi
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Em caso de dúvidas, entre em contato conosco em - {{config path='trans_email/ident_support/email'}} - ou pelo telefone {{config path='general/store_information/phone'}}. -

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/shipment_new.html b/app/locale/pt_BR/template/email/sales/shipment_new.html deleted file mode 100644 index 125fc6435..000000000 --- a/app/locale/pt_BR/template/email/sales/shipment_new.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Olá, {{htmlescape var=$order.getCustomerName()}}

    -

    - Obrigado por seu pedido no(a) {{var store.getFrontendName()}}. - Você pode verificar o status do seu pedido ao efetuando o registro em sua conta. - Se você tiver quaisquer dúvidas sobre seu pedido, entre em contato conosco em {{config path='trans_email/ident_support/email'}} ou ligue para {{config path='general/store_information/phone'}} Segunda à Sexta - das 8 às 5 - horário do Pacífico (PST). -

    -

    - A confirmação do seu envio está logo abaixo. Obrigado mais uma vez pela sua transação. -

    -
    -

    Sua Remessa # {{var remessa.incremento_id}} para Pedido # {{var pedido.incremento_id}}

    -
    - - - - - - - - - - - - - - - -
    Dados de Faturamento:Método de Pagamento:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - - - - - - - - - - - - - - - -
    Dados de Frete:Tipo de Frete:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -

    {{var comment}}

    -

    Obrigado, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/shipment_new_guest.html b/app/locale/pt_BR/template/email/sales/shipment_new_guest.html deleted file mode 100644 index d732ae889..000000000 --- a/app/locale/pt_BR/template/email/sales/shipment_new_guest.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Olá, {{htmlescape var=$billing.getName()}}

    -

    - Obrigado por seu pedido no(a) {{var store.getFrontendName()}}. - Se você tiver quaisquer dúvidas sobre seu pedido, entre em contato conosco em {{config path='trans_email/ident_support/email'}} ou ligue para {{config path='general/store_information/phone'}} Segunda à Sexta - das 8 às 5 - horário do Pacífico (PST). -

    -

    - A confirmação do seu envio está logo abaixo. Obrigado mais uma vez pela sua transação. -

    -
    -

    Sua Remessa # {{var remessa.incremento_id}} para Pedido # {{var pedido.incremento_id}}

    -
    - - - - - - - - - - - - - - - -
    Dados de Faturamento:Método de Pagamento:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - - - - - - - - - - - - - - - -
    Dados de Frete:Tipo de Frete:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -

    {{var comment}}

    -

    Obrigado, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/shipment_update.html b/app/locale/pt_BR/template/email/sales/shipment_update.html deleted file mode 100644 index 07f06b150..000000000 --- a/app/locale/pt_BR/template/email/sales/shipment_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Caro {{htmlescape var=$order.getCustomerName()}},

    -

    - Seu pedido n° {{var order.increment_id}} foi
    - {{var order.getStatusLabel()}}. -

    -

    Você pode verificar o status do seu pedido ao efetuando o registro em sua conta.

    -

    {{var comment}}

    -

    - Em caso de dúvidas, entre em contato conosco em - {{config path='trans_email/ident_support/email'}} - ou pelo telefone {{config path='general/store_information/phone'}}. -

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sales/shipment_update_guest.html b/app/locale/pt_BR/template/email/sales/shipment_update_guest.html deleted file mode 100644 index a0f17ded1..000000000 --- a/app/locale/pt_BR/template/email/sales/shipment_update_guest.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    Caro {{htmlescape var=$billing.getName()}},

    -

    - Seu pedido n° {{var order.increment_id}} foi
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - Em caso de dúvidas, entre em contato conosco em - {{config path='trans_email/ident_support/email'}} - ou pelo telefone {{config path='general/store_information/phone'}}. -

    -

    Obrigado novamente, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/sitemap_generate_warning.html b/app/locale/pt_BR/template/email/sitemap_generate_warning.html deleted file mode 100644 index b63165fbb..000000000 --- a/app/locale/pt_BR/template/email/sitemap_generate_warning.html +++ /dev/null @@ -1,8 +0,0 @@ - - -Avisos sobre geração de sitemap: - - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/pt_BR/template/email/token.html b/app/locale/pt_BR/template/email/token.html deleted file mode 100644 index 2312a430a..000000000 --- a/app/locale/pt_BR/template/email/token.html +++ /dev/null @@ -1,9 +0,0 @@ - - - -Olá, {{htmlescape var=$userName}}

    -Sua autorização para {{htmlescape var=$applicationName}} foi alterada para {{htmlescape var=$status}} pela equipe de Administração.

    diff --git a/app/locale/pt_BR/template/email/wishlist_share.html b/app/locale/pt_BR/template/email/wishlist_share.html deleted file mode 100644 index 2bbbec609..000000000 --- a/app/locale/pt_BR/template/email/wishlist_share.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    Ei!,
    Dê uma olhada em minha lista de desejos em {{var store.getFrontendName()}}.

    -

    {{var message}}

    - {{var items}} -
    - {{depend salable}}

    Adicionar todos os itens ao carrinho de compras |{{/depend}} Visualizar todos os itens da lista de desejos

    -

    Obrigado, {{htmlescape var=$customer.name}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/Mage_AdminNotification.csv b/app/locale/zh_CN/Mage_AdminNotification.csv deleted file mode 100644 index 2db01bd8e..000000000 --- a/app/locale/zh_CN/Mage_AdminNotification.csv +++ /dev/null @@ -1,31 +0,0 @@ -"Actions","操作" -"An error occurred while marking notification as read.","标记通知为已读时遇到了错误。" -"An error occurred while marking the messages as read.","标记信息为已读时遇到了错误。" -"An error occurred while removing messages.","删除信息时遇到了错误。" -"An error occurred while removing the message.","删除该信息时遇到了错误。" -"Are you sure?","您是否确认？" -"Date Added","添加日期" -"Last Update","最后更新" -"Mark as Read","标记为已读" -"Mark as read","标记为已读" -"Message","信息" -"Messages Inbox","收件箱" -"Notifications","通知" -"Please select messages.","请选择一条信息。" -"Read Details","阅读详情" -"Remove","删除" -"Severity","严重程度" -"Show List","显示列表" -"Show Toolbar","显示工具栏" -"The message has been marked as read.","该信息已标记为已读。" -"The message has been removed.","该信息已被删除。" -"Total of %d record(s) have been marked as read.","共 %d 条信息标记为已读。" -"Total of %d record(s) have been removed.","共 %d 条信息被删除。" -"Unable to proceed. Please, try again.","无法处理。请重试。" -"Update Frequency","更新频率" -"Use HTTPS to Get Feed","使用HTTPS获取源" -"Wrong message type","错误的消息类型" -"critical","重要" -"major","主要" -"minor","次要" -"notice","注意" diff --git a/app/locale/zh_CN/Mage_Adminhtml.csv b/app/locale/zh_CN/Mage_Adminhtml.csv deleted file mode 100644 index 56c7abe02..000000000 --- a/app/locale/zh_CN/Mage_Adminhtml.csv +++ /dev/null @@ -1,1215 +0,0 @@ -" The customer does not exist in the system anymore.","系统中不存在该客户。" -" [deleted]","[已删除]" -" and ","并且" -"%s (Default Template from Locale)","%s （不同地区的默认模板）" -"%s cache type(s) disabled.","%s个缓存类型被禁用。" -"%s cache type(s) enabled.","%s个缓存类型被启用。" -"%s cache type(s) refreshed.","%s个缓存类型被刷新。" -"(For Type ""Local Server"" need to use relative path to Magento install var/export or var/import, e.g. var/export, var/import, var/export/some/dir, var/import/some/dir)","（对于类型 ""Local Server"" 需要使用到 Magento install var/export 或 var/import 的相对路径，例如 var/export、var/import、var/export/some/dir、var/import/some/dir）" -"(For US 2-letter state names)","（用于美国两个字母代表的州名称）" -"(If left empty will be auto-generated)","（如果留空将自动生成）" -"(Leave empty for first spreadsheet)","（第一个表格可留空）" -"(Products will be added/updated to this store if 'store' column is blank or missing in the import file.)","（如果“店铺”一栏为空或在导入的文件中不存在，则产品会被添加/更新到该店铺中。）" -"(Shift-)Click or drag to change value","（Shift-）点击或拖拽即可更改值" -"(Starting with)","（始于）" -"(When 'No', only mapped fields will be imported. When mapping, use 'column1', 'column2', etc.)","（如果为“否”，则只有映射的文件会被导入。在映射时，请使用 'column1'、'column2'等。）" -"(You have to increase php memory_limit before changing this value)","（更改该值之前您需要增大php的memory_limit）" -"(\\t for tab)","（\\t 可打开选项卡）" -"* - If indexing is in progress, it will be killed and new indexing process will start.","* - 如果正在创建索引，则会被停止，并重新开始新的索引进程。" -"* Required Fields","*必要字段" -"- Click on any of the time parts to increase it","- 点击时间的任何部分即可更改" -"- Hold mouse button on any of the above buttons for faster selection.","- 在任何按钮上按下鼠标按键即可选中。" -"- Use the %s buttons to select month","- 使用%s 按钮选择月份" -"- Use the %s, %s buttons to select year","- 使用%s，%s按钮选择年份" -"- or Shift-click to decrease it","- 或Shift-点击以减小" -"- or click and drag for faster selection.","- 或点击并拖拽以快速选中。" -"-- Not Selected --","-- 未选择 --" -"-- Please Select --","-- 请选择 --" -"-- Please Select Billing Agreement--","-- 请选择记账协议 --" -"-- Please Select a Category --","-- 请选择一个分类 --" -"-- Please select --","--请选择--" -"--Please Select--","-- 请选择 --" -"1 Hour","1小时" -"12 Hours","12小时" -"12h AM/PM","21h AM/PM" -"2 Hours","2小时" -"24 Hours","24小时" -"24h","24h" -"2YTD","2YTD" -"6 Hours","6小时" -"

    404 Error

    Page not found.

    ","

    404 错误

    页面未找到。

    " -"%s requests access to your account","%s 请求访问您的账户" -"Attention: Captcha is case sensitive.","注意：验证码为大小写敏感的。" -"A user with the same user name or email aleady exists.","使用相同名称或邮件地址的用户已存在。" -"API Key","API Key" -"API Key Confirmation","API Key配置" -"ASCII","ASCII" -"Abandoned Carts","放弃购物车" -"About the calendar","关于日历" -"Access Denied","访问被拒绝" -"Access denied","访问被拒绝" -"Access denied.","访问被拒绝" -"Account Created in:","帐户创建于：" -"Account Created on (%s):","帐户创建于（%s）：" -"Account Created on:","帐户创建于：" -"Account Information","帐户信息" -"Account Status","帐户状态" -"Account status","帐户状态" -"Action","操作" -"Actions","操作" -"Actions XML","操作XML" -"Active","活动" -"Add","添加" -"Add Exception","添加例外" -"Add Field Mapping","添加字段映射" -"Add Field with URL:","添加带URL的字段：" -"Add New","添加新内容" -"Add New Image","添加新图像" -"Add New Profile","添加新配置文件" -"Add New Role","添加新角色" -"Add New Template","添加新模板" -"Add New URL Rewrite","添加新URL重写" -"Add New User","添加新用户" -"Add New Variable","添加新变量" -"Add Products","添加产品" -"Add URL Rewrite","添加URL重写" -"Add URL Rewrite for a Category","为分类添加URL重写" -"Add URL Rewrite for a Product","为产品添加URL重写" -"Add after","随后添加" -"Additional Cache Management","额外的缓存管理" -"Address Type:","地址类型：" -"Admin","管理员" -"Advanced Admin Section","高级管理区域" -"Advanced Profiles","高级配置文件" -"Advanced Section","高级区域" -"After authorization application will have access to you account.","授权后，应用程序将可访问您的账户。" -"All","全部" -"All Allowed Countries","所有允许的国家" -"All Cache","所有缓存" -"All Files","所有文件" -"All Reviews","所有评测" -"All Store Views","所有店铺视图" -"All Tags","所有标签" -"All Websites","所有网站" -"All countries","所有国家" -"All fields","所有字段" -"All possible rates were fetched, please click on ""Save"" to apply","将自动获取所有可能的费率，请单击“保存”以应用" -"All rates were fetched, please click on ""Save"" to apply","所有费率已获取，请单击“保存”已应用" -"All valid rates have been saved.","所有有效的评级均已保存。" -"Always (during development)","总是（在开发过程中）" -"Amounts","数量" -"An error has occured while syncronizing media storages.","同步媒体存储时遇到了错误。" -"An error occurred while clearing the JavaScript/CSS cache.","清空 JavaScript/CSS 缓存时发生错误。" -"An error occurred while clearing the image cache.","清空图像缓存时发生错误。" -"An error occurred while deleting URL Rewrite.","删除 URL 重写时出错。" -"An error occurred while deleting email template data. Please review log and try again.","删除电子邮件模板数据时发生错误。请查看日志并重试。" -"An error occurred while deleting record(s).","删除记录时出错。" -"An error occurred while deleting this role.","删除该角色时发生错误。" -"An error occurred while deleting this set.","删除该集合时发生错误。" -"An error occurred while deleting this template.","删除该模板时发生错误。" -"An error occurred while finishing process. Please refresh the cache","完成进程时发生错误。请刷新缓存" -"An error occurred while rebuilding the CatalogInventory Stock Status.","重建目录库存状态时发生错误。" -"An error occurred while rebuilding the catalog index.","重建目录索引时发生错误。" -"An error occurred while rebuilding the flat catalog category.","重建平面目录类别时发生错误。" -"An error occurred while rebuilding the flat product catalog.","重建平面产品目录时发生错误。" -"An error occurred while rebuilding the search index.","重建搜索索引时发生错误。" -"An error occurred while refreshing the Catalog Rewrites.","刷新目录重写时发生错误。" -"An error occurred while refreshing the Layered Navigation indices.","刷新分层导航指标时发生错误。" -"An error occurred while refreshing the catalog rewrites.","刷新目录重写时遇到了错误。" -"An error occurred while refreshing the layered navigation indices.","刷新层次式导航索引时遇到了错误。" -"An error occurred while saving URL Rewrite.","保存 URL 重写时出错。" -"An error occurred while saving account.","保存账户时发生错误。" -"An error occurred while saving review.","保存评价时出错。" -"An error occurred while saving the customer.","保存客户时发生错误。" -"An error occurred while saving this configuration:","保存该配置时发生错误：" -"An error occurred while saving this role.","保存该角色时出现了错误。" -"An error occurred while saving this template.","保存该模板时出现了错误。" -"An error occurred while updating the selected review(s).","更新所选评测时出现了错误。" -"Any","任意" -"Any Attribute Set","任何属性集" -"Any Group","任何组" -"Any Status","任何状态" -"Any Store","任何店铺" -"Any Type","任何类型" -"Any Visibility","任何可见性" -"Any data created since the backup was made will be lost including admin users, customers and orders.","备份完成后创建的任何数据都将丢失，包括管理员用户、顾客，以及订单。" -"Archive file name:","存档文件名：" -"Are you sure that you want to delete this template?","您是否确认要删除该模板？" -"Are you sure that you want to strip tags?","您是否确认要取消标签？" -"Are you sure you want to do this?","您是否确认要这样做？" -"Are you sure you want to proceed?","你是否确定要继续？" -"Area","区域" -"As low as:","低至：" -"Assigned","已分配" -"Associated Tags","已分配的标签" -"Attribute Set Name:","属性集名称：" -"Attributes","属性" -"Authorization confirmed","授权已确认" -"Authorize","授权" -"Authorize application","授权应用程序" -"Authorized OAuth Tokens","已授权的 OAuth 令牌" -"Automatic (equalize price ranges)","自动（均等化价格区间）" -"Automatic (equalize product counts)","自动（均等化产品数量）" -"Average Order Amount","平均订单量" -"Average Orders","平均订单" -"BINARY","二进制" -"Back","返回" -"Back to Login","返回到登录界面" -"Backup","备份" -"Backup Name","备份名称" -"Backup options","备份选项" -"Backups","备份" -"Base currency","基本汇率" -"Bcc","Bcc" -"Bestsellers","最佳销量" -"Billing Address","账单地址" -"Billing Address: ","账单地址：" -"Billing Agreement","记账协议" -"Billing Agreements","记账协议" -"Block Information","块信息" -"Both (without and with tax)","都有（含税和不含税）" -"Both IPN and PDT","IPN和PDT" -"Browse Files...","浏览文件..." -"Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.","与动态价格的捆绑不能包含自定义的选项。选项将无法保存。" -"CMS","CMS" -"CRITICAL","重要" -"CSV","CSV" -"CSV / Tab separated","CSV / Tab分隔" -"Cache Control","缓存控制" -"Cache Control (beta)","缓存控制（测试版）" -"Cache Management","缓存管理" -"Cache Type","缓存类型" -"Cancel","取消" -"Cannot add new comment.","无法添加新评论。" -"Cannot add tracking number.","无法追踪编号。" -"Cannot create an invoice without products.","无法在没有产品时创建发票。" -"Cannot create credit memo for the order.","无法为该订单创建信用记录。" -"Cannot delete the design change.","无法删除该设计变动。" -"Cannot delete tracking number.","无法删除追踪编号。" -"Cannot do shipment for the order separately from invoice.","无法将产品与发票分开发送。" -"Cannot do shipment for the order.","无法对该订单发货。" -"Cannot initialize shipment for adding tracking number.","无法初始化订单以添加追踪编号。" -"Cannot initialize shipment for delete tracking number.","无法初始化发货以删除追踪编号。" -"Cannot load track with retrieving identifier.","无法用获取的标识符加载追踪。" -"Cannot retrieve tracking number detail.","无法获取追踪编号详情。" -"Cannot save shipment.","无法保存运送。" -"Cannot save the credit memo.","无法保存信用记录。" -"Cannot send shipment information.","无法发送运行信息。" -"Cannot update item quantity.","无法更新商品数量。" -"Cannot update the item\'s quantity.","无法更新商品的数量。" -"Card Verification Number","卡片验证号码" -"Catalog","分类" -"Catalog Price Rules","分类价格规则" -"Catalog Rewrites","分类重写" -"Categories","分类" -"Category","分类" -"Category:","分类：" -"Chart is disabled. If you want to enable chart, click here.","图表被禁用。如果希望启用图表，请点击 这里。" -"Checkbox","复选框" -"Child Transactions","子交易" -"Choose Store View:","选择店铺视图：" -"Choose an attribute","选择一个属性" -"Chosen category does not associated with any website, so url rewrite is not possible.","所选分类没有关联给任何网站，因此URL重写不可用。" -"Chosen product does not associated with any website, so url rewrite is not possible.","所选产品没有关联给任何网站，因此URL重写不可用。" -"Clear","清空" -"Close","关闭" -"Code","Code" -"Comment text field cannot be empty.","评论文本字段不能为空。" -"Complete","完成" -"Config form fieldset clone model required to be able to clone fields","需要配置形式字段集克隆模型，以克隆字段" -"Configuration","配置" -"Confirm New Password","确认新密码" -"Confirm token authorization Pop Up for admin","适用于管理员的确认令牌授权弹出窗口" -"Confirm token authorization for admin","适用于管理员的确认令牌授权" -"Confirmation Of Authorization","授权确认" -"Confirmed email:","确认邮件：" -"Connect with the Magento Community","连接到Magento社区" -"Continue","继续" -"Convert to Plain Text","转换为纯文本" -"Cookie (unsafe)","Cookie（不安全）" -"Country","国家" -"Country:","国家：" -"Coupons","折价券" -"Create","创建" -"Create DB Backup","创建DB备份" -"Create New Attribute","新建属性" -"Create URL Rewrite:","创建URL重写：" -"Created At","创建于" -"Credit Card %s","信用卡 %s" -"Credit Card Number","信用卡号码" -"Credit Card Number: xxxx-%s","信用卡号码：xxxx-%s" -"Credit Card Type","信用卡类型" -"Credit Card Type: %s","信用卡类型：%s" -"Credit Memo History","信用记录历史" -"Credit Memo Totals","信用记录总数" -"Credit Memos","信用记录" -"Credit memo #%s comment added","信用记录 #%s 评论已添加" -"Credit memo #%s created","信用记录 #%s 已创建" -"Credit memo\'s total must be positive.","信用记录的总数必须为正数。" -"Currency","币种" -"Currency ""%s"" is used as %s in %s.","货币 ""%s"" 被用作 %s 中的 %s。" -"Currency Information","币种信息" -"Currency Setup Section","币种设置区域" -"Current Configuration Scope:","当前配置范围：" -"Current Month","当前月份" -"Custom","自定义" -"Custom Variable ""%s""","自定义变量 ""%s""" -"Custom Variables","自定义变量" -"Customer","客户" -"Customer Group:","顾客组：" -"Customer Groups","客户组" -"Customer Name","顾客姓名" -"Customer Reviews","顾客评测" -"Customer Shopping Carts","顾客购物车" -"Customer Since:","顾客注册于：" -"Customer Tax Classes","客户税率" -"Customer with the same email already exists.","使用相同邮件地址的顾客已存在。" -"Customers","客户" -"Customers by Number of Orders","按订单编号排列顾客" -"Customers by Orders Total","按订单数量排列顾客" -"DHTML Date/Time Selector","DHTML 日期/时间选择器" -"Dashboard","仪表板" -"Data Format","数据格式" -"Data transfer:","数据传输：" -"Database","数据库" -"Dataflow - Advanced Profiles","Dataflow - 高级配置文件" -"Dataflow - Profiles","Dataflow - 配置文件" -"Date","日期" -"Date & Time","日期与时间" -"Date Added","添加日期" -"Date Updated","更新日期" -"Date selection:","选择日期：" -"Date selector","日期选择器" -"Day","天" -"Decimal separator:","十进制分隔符：" -"Default (Admin) Values","默认（管理）值" -"Default Billing Address","默认账单地址" -"Default Config","默认配置" -"Default Template from Locale","不同地区的默认模板" -"Default Values","默认值" -"Default display currency ""%s"" is not available in allowed currencies.","默认显示的币种 ""%s"" 不属于允许使用的币种。" -"Default scope","默认范围" -"Delete","删除" -"Delete %s","萨哈拿出 %s" -"Delete %s '%s'","删除 %s '%s'" -"Delete File","删除文件" -"Delete Image","删除图像" -"Delete Profile","删除配置文件" -"Delete Role","删除角色" -"Delete Store","删除店铺" -"Delete Store View","删除店铺视图" -"Delete Template","删除模板" -"Delete User","删除用户" -"Delete Website","删除网站" -"Description","描述" -"Design","设计" -"Design Section","设计区域" -"Details","详情" -"Developer Section","开发人员区域" -"Direction:","指导：" -"Disable","禁用" -"Disabled","已禁用" -"Display %s first","显示前 %s个" -"Display default currency","显示默认币种" -"Distributed under GNU LGPL. See %s for details.","在GNU LGPL下分发。详情请参考 %s。" -"Do you really want to KILL parallel process and start new indexing process?","您是否想要结束并发进程并重新开始索引进程？" -"Do you really want to proceed?","你是否真的要继续？" -"Download","下载" -"Downloads","下载" -"Drag to move","拖拽以移动" -"Drop-down","下拉菜单" -"Edit","编辑" -"Edit Design Change","编辑设计变动" -"Edit Email Template","编辑邮件模板" -"Edit Order","编辑订单" -"Edit Poll","编辑投票" -"Edit Queue","编辑队列" -"Edit Review","编辑评测" -"Edit Role","编辑角色" -"Edit Store View","编辑店铺视图" -"Edit System Template","编辑系统模板" -"Edit Template","编辑模板" -"Edit URL Rewrite","编辑URL重写" -"Edit User","编辑用户" -"Edit User '%s'","编辑用户'%s'" -"Edit Website","编辑网站" -"Email","电子邮件" -"Email Address:","电子邮件地址：" -"Email Preview","邮件预览" -"Email to a Friend","给朋友发邮件" -"Email:","电子邮件：" -"Enable","启用" -"Enabled","已启用" -"Enclose Values In:","将值包含于：" -"Entity Attributes","编辑属性" -"Entity Type","实体类型" -"Entity type:","实体类型：" -"Error","错误" -"Excel XML","Excel XML" -"Excl. Tax","不含税" -"Exclude media folder from backup","从备份中排除媒体文件夹" -"Expiration Date","过期日期" -"Expiration Date: %s/%s","过期日期：%s/%s" -"Export","导出" -"Export CSV","导出CSV" -"Export Filters","导出筛选器" -"Export to:","导出到：" -"Export:","导出：" -"FTP Host","FTP 主机" -"FTP Host[:Port]","FTP主机[:端口]" -"FTP Login","FTP 登录" -"FTP Password","FTP密码" -"FTP credentials","FTP 凭据" -"Failed","已失败" -"Failed to add a product to cart by id ""%s"".","按照编号 ""%s"" 向购物车添加商品时失败。" -"Failed to cancel the billing agreement.","取消记账协议时出错。" -"Failed to clear the JavaScript/CSS cache.","清空JavaScript/CSS缓存时出错。" -"Failed to delete the billing agreement.","删除记账协议时出错。" -"Failed to update the profile.","更新配置文件时出错。" -"Field","字段" -"Field Mapping","字段映射" -"File","文件" -"File Information","文件信息" -"File System","文件系统" -"File mode","文件模式" -"File name:","文件名：" -"File size should be more than 0 bytes","文件大小应超过0字节。" -"Finished profile execution.","配置文件执行完毕。" -"First Invoice Created Date","第一张发票的创建日期" -"First Name","名字" -"First Name is required field.","名称是必要字段。" -"First Name:","名字：" -"Fixed","固定" -"Flush Catalog Images Cache","清理分类图像缓存" -"Flush JavaScript/CSS Cache","清理JavaScript/CSS缓存" -"For category","分类" -"For latest version visit: %s","最新版访问：%s" -"For product","产品" -"Forgot Admin Password","忘记管理员密码" -"Forgot your password?","忘记您的密码？" -"Forgot your user name or password?","忘记了您的用户名或密码？" -"From","来自" -"GLOBAL","全局" -"Gb","Gb" -"General Information","常规信息" -"General Section","常规区域" -"Get Image Base64","获取Image Base64" -"Get help for this page","获得有关本页面的帮助" -"Give the verifier code to application administrator","将验证器代码提供给应用程序管理员" -"Global Attribute","全局属性" -"Global Record Search","全局记录搜索" -"Global Search","全局搜索" -"Go Today","转到今天" -"Go to messages inbox","进入信息收件箱" -"Go to notifications","打开通知" -"Google Base","Google Base" -"Google Content","搜索内容" -"Google Sitemaps","Google站点结构图" -"Grand Total","总计" -"Grid (default) / List","网格（默认）/列表" -"Grid Only","仅网格" -"Group:","组：" -"Guest","来宾" -"HTTP (unsecure)","HTTP（不安全）" -"HTTPS (SSL)","HTTPS（SSL）" -"Help Us Keep Magento Healthy - Report All Bugs","帮助我们保持Magento的健康 - 汇报所有Bug" -"Helper attributes should not be used in custom layout updates.","自定义布局更新时不能使用 Helper 属性。" -"Helper for options rendering doesn't implement required interface.","渲染选项的 Helper 无法在不使用界面时实施。" -"Home","主页" -"ID","ID" -"ID Path","ID路径" -"IP Address","IP地址" -"IPN (Instant Payment Notification) Only","仅IPN（即时支付通知）" -"Id","Id" -"If there is an account associated with %s you will receive an email with a link to reset your password.","如果有关联给 %s 的账户，你将收到一封包含重设密码链接的电子邮件。" -"If this message persists, please contact the store owner.","如果该信息持续显示，请联系店铺所有者。" -"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","如果您不为特定商店视图指定一个选项值，则使用默认 (Admin) 值。" -"Images (.gif, .jpg, .png)","图像（.gif、.jpg、.png）" -"Images Cache","图像缓存" -"Import","导入" -"Import Service","导入服务" -"Import and Export","导入和导出" -"Import and Export Tax Rates","导入和导出税率" -"Import/Export","导入/导出" -"Import/Export Advanced","高级导入/导出" -"Import/Export Profile","导入/导出配置文件" -"Important: ","重要：" -"Imported %s records","导入%s 的记录" -"In","位于" -"In Database:","在数据库：" -"In File:","在文件：" -"Inactive","未激活" -"Incl. Tax","含税" -"Incoming Message","收到的信息" -"Insert Variable...","插入变量..." -"Interactive","交互" -"Interface Locale: %s","界面区域：%s" -"Invalid Form Key. Please refresh the page.","来源密钥无效，请刷新本页面。" -"Invalid Import Service Specified","指定的导入服务无效。" -"Invalid POST data (please check post_max_size and upload_max_filesize settings in your php.ini file).","POST数据无效（请检查您php.ini文件中的 post_max_size 与 upload_max_filesize 设置）。" -"Invalid Secret Key. Please refresh the page.","密钥无效。请刷新该页面。" -"Invalid User Name or Password.","无效的用户名或密码。" -"Invalid directory: %s","无效目录：%s" -"Invalid email address ""%s"".","电子邮件地址 ""%s"" 无效。" -"Invalid email address.","邮件地址无效。" -"Invalid file: %s","无效文件：%s" -"Invalid input data for %s => %s rate","%s的输入数据无效 => %s" -"Invalid parent block for this block","该块的父块无效" -"Invalid parent block for this block.","本块的父块无效。" -"Invalid password reset token.","无效的密码重设令牌。" -"Invalid sender name ""%s"". Please use only visible characters and spaces.","发送方姓名 ""%s"" 无效。请只使用可见字符与空格。" -"Invalid timezone","时区无效" -"Invalidated","撤销" -"Inventory Stock Status","盘点库存状态" -"Invoice #%s comment added","发票 #%s的评论已添加" -"Invoice #%s created","发票 #%s 已创建" -"Invoice History","发票历史" -"Invoice Totals","发票总数" -"Invoice canceling error.","发票取消时出错。" -"Invoice capturing error.","发票获取出错。" -"Invoice voiding error.","发票撤销出错。" -"Invoices","发票" -"Is Closed","已关闭" -"Is Default","为默认值" -"Issue Number","问题编号" -"Items","项目" -"JavaScript seems to be disabled in your browser.","你的浏览器似乎禁用了 JavaScript。" -"JavaScript/CSS","JavaScript/CSS" -"JavaScript/CSS Cache","JavaScript/CSS缓存" -"Kb","Kb" -"Last 24 Hours","过去24小时" -"Last 5 Orders","上五个订单" -"Last 5 Search Terms","上五个搜索条件" -"Last 7 Days","上七天" -"Last Credit Memo Created Date","上次信用记录创建日期" -"Last Invoice Created Date","上一个发票创建日期" -"Last Logged In (%s):","上次登录于（%s）：" -"Last Logged In:","上次登录：" -"Last Name","姓氏" -"Last Name is required field.","姓氏是必要字段。" -"Last Name:","姓氏：" -"Last updated: %s. To refresh last day\'s statistics, click here.","上次更新： %s。要刷新最新一天的 状态，请点击这里。" -"Latest Message:","最新信息：" -"Layered Navigation Indices","层次式导航目录" -"Layered Navigation Indices were refreshed.","层次式导航目录已恢复。" -"Leave empty to use tax identifier","留空即可使用传真标识符" -"Lifetime Sales","终生销售" -"Lifetime statistics have been updated.","有效期状态已更新。" -"Links","链接" -"Links with associated products will retain only after saving current product.","关联产品的链接只有在保存当前产品后才能维持。" -"List (default) / Grid","列表（默认）/网格" -"List Only","仅列表" -"Load Template","加载模板" -"Load default template","加载默认模板" -"Loading...","正在加载..." -"Local Server","本地服务器" -"Local/Remote Server","本地/远程服务器" -"Locale","区域" -"Log In","登录" -"Log Out","注销" -"Log in to Admin Panel","登录到管理面板" -"Log in to use %s","登录以使用 %s" -"Log into Magento Admin Page","登录到Magento管理页面" -"Logged in as %s","登录为 %s" -"Login","登录" -"Low Stock","库存量低" -"MAJOR","主要" -"MINOR","少量" -"MS Excel XML","MS Excel XML" -"Magento Admin","Magento管理" -"Magento Commerce - Administrative Panel","Magento Commerce - 管理面板" -"Magento Connect","Magento内容" -"Magento Connect Manager","Magento连接管理器" -"Magento Logo","Magento徽标" -"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento是Magento Inc.的商标， Copyright © %s Magento Inc." -"Magento root directory","Magento 根目录" -"Magento ver. %s","Magento ver.%s" -"Magento™ is a trademark of Magento Inc.
    Copyright © %s Magento Inc.","Magento™ 是Magento Inc.的商标
    Copyright © %s Magento Inc." -"Make sure that data encoding in the file is consistent and saved in one of supported encodings (UTF-8 or ANSI).","确保该字段编码方式的一致，并使用可支持的编码方式保存（UTF-8或ANSI）。" -"Manage Attribute Sets","管理属性集" -"Manage Attributes","管理属性" -"Manage Categories","管理分类" -"Manage Content","管理内容" -"Manage Currency Rates","管理汇率" -"Manage Currency Symbols","管理货币符号" -"Manage Customers","管理客户" -"Manage Options (values of your attribute)","Manage Options (values of your attribute)" -"Manage Ratings","管理评级" -"Manage Stores","管理店铺" -"Manage Tax Rules","管理税务规则" -"Manage Tax Zones and Rates","管理税务区域与税率" -"Manage Titles (Size, Color, etc.)","管理名称（尺寸，颜色等）" -"Manual","手工" -"Matched Expression","匹配的表达式" -"Maximum sender name length is 255. Please correct your settings.","发送者名字最大长度为 255。请更正您的设置。" -"Mb","Mb" -"Media (.avi, .flv, .swf)","多媒体（.avi、.flv、.swf）" -"Media storages synchronization has completed!","媒体存储的同步已完成！" -"Messages Inbox","收件箱" -"Month","月" -"Most Viewed","最受欢迎" -"Most Viewed Products","最受关注商品" -"Multiple Select","多选" -"My Account","我的帐户" -"My Applications","我的应用程序" -"N/A","N/A" -"NOTICE","注意" -"Name","姓名" -"Name on Card","卡片上的名字" -"Name on the Card: %s","卡片上的名字：%s" -"Name:","姓名：" -"Never (production)","从未（生产）" -"New ","新" -"New API Key","新API Key" -"New Accounts","新帐户" -"New Attribute","新属性" -"New Block","新块" -"New Category","新分类" -"New Class","新类" -"New Condition","新条件" -"New Custom Variable","新自定义变量" -"New Customer","新顾客" -"New Customers","新客户" -"New Design Change","新设计变动" -"New Email Template","新组" -"New Group","新组" -"New Invoice","新发票" -"New Item Type","新项目类型" -"New Memo","新纪录" -"New Memo for #%s","#%s的新纪录" -"New Page","新页面" -"New Password","新密码" -"New Poll","新投票" -"New Profile","新配置文件" -"New Rate","新比例" -"New Rating","新评级" -"New Review","新评测" -"New Role","新角色" -"New Rule","新规则" -"New Search","新搜索" -"New Set","新集" -"New Shipment","新运单" -"New Sitemap","新站点结构图" -"New Store View","新店铺视图" -"New System Template","新系统模板" -"New Tag","新标签" -"New Template","新模板" -"New User","新用户" -"New Variable","新变量" -"New Website","新网站" -"New attribute set mapping","新属性集映射" -"New password field cannot be empty.","新密码字段不能为空。" -"Newsletter","新闻邮件" -"Newsletter Problems","新闻邮件问题" -"Newsletter Queue","新闻邮件队列" -"Newsletter Subscribers","新闻邮件订阅者" -"Newsletter Templates","新闻邮件模板" -"Next month (hold for menu)","下个月（按下可打开菜单）" -"Next year (hold for menu)","明年（按下可打开菜单）" -"No","否" -"No (price without tax)","无（不含税价格）" -"No Data","无数据" -"No Data Found","数据未找到" -"No Templates Found","模板未找到" -"No change","无变动" -"No customer id defined.","未定义自定义 ID。" -"No information available.","无可用信息。" -"No profile loaded...","未加载配置文件..." -"No records found for this period.","这段时期内未找到记录。" -"No records found.","未找到记录。" -"No report code specified.","未指定报告代码。" -"No search keywords.","无搜索关键字。" -"No search modules were registered","未注册搜索模块" -"No wishlist item id defined.","未定义愿望清单项目 ID。" -"None","无" -"Note:","注意：" -"Notes","注意" -"Notifications","通知" -"Number of Orders","订单数量" -"Number of Uses","用户数" -"Number of Views","浏览数量" -"Number of records:","记录数量：" -"OAuth Consumers","OAuth 消费者" -"OAuth authorization for admin","适用于管理员的 OAuth 授权" -"OAuth authorization simple for admin","适用于管理员的 OAuth 简单授权" -"OK","确定" -"Old rate:","原本的比例：" -"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","当您登录到您的 PayPal Advanced 账户后，前往 Service Settings - Hosted Checkout Pages - Set Up 菜单，并对下方描述的选项进行设置" -"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","当您登录到您的 PayPal Payflow Link 账户后，前往 Service Settings - Hosted Checkout Pages - Set Up 菜单，并对下方描述的选项进行设置" -"One or more media files failed to be synchronized during the media storages syncronization process. Refer to the log file for details.","在媒体存储同步过程中，有一个或多个媒体文件的同步失败。详情请参考日志文件。" -"One or more of the Cache Types are invalidated:","一个或多个缓存类型已失效：" -"Online Customers","在线客户" -"Only Once (version upgrade)","仅一次（版本升级）" -"Only attributes with scope ""Global"", input type ""Dropdown"" and Use To Create Configurable Product ""Yes"" are available.","只有范围为 ""Global""、输入类型为 ""Dropdown""，并“允许”用于创建可配置产品的属性可以使用。" -"Only mapped fields","只映射字段" -"Optional","可选" -"Options","选项" -"Options is required","选项是必须的" -"Order","订单" -"Order #%s","订单# %s" -"Order #%s (%s)","订单 #%s(%s)" -"Order Created Date","订单创建日期" -"Order ID","订单 ID" -"Order Totals","订单总数" -"Order Updated Date","订单更新日期" -"Order Updated Date report is real-time, does not need statistics refreshing.","订单更新日期报告是实时的，不需要刷新状态。" -"Orders","订单" -"Original Magento attribute names in first row:","原始Magento属性名位于第一行：" -"Out of stock","缺货" -"PDT (Payment Data Transfer) Only","仅限PDT（支付数据传输）" -"Package Extensions","包括扩展" -"Pages","页面" -"Parent Product Thumbnail","父产品缩略图" -"Parent Transaction ID","父交易ID" -"Passive mode","主动模式" -"Password","密码" -"Password Confirmation","密码确认" -"Password confirmation must be same as password.","密码确认的密码必须一致。" -"Password must be at least of %d characters.","密码必须至少为 %s 个字符。" -"Password must include both numeric and alphabetic characters.","密码必须包含数字和字母字符。" -"Password:","密码：" -"Path:","路径：" -"Payment method instance is not available.","支付方式不可用。" -"Payment method is not available.","支付方法不可用。" -"Payment method must be specified.","必须指定支付方法。" -"Pending Reviews","挂起的评测" -"Pending Tags","挂起的标记" -"Per Item","每商品" -"Per Order","每订单" -"Percent","百分之" -"Performed At","执行于" -"Period","周期" -"Permanent (301)","永久 (301)" -"Permissions","权限" -"Personal Information","个人信息" -"Phone:","电话：" -"Please Select","请选择" -"Please confirm site switching. All data that hasn\'t been saved will be lost.","请确认网站参数。所有未保存数据都将丢失。" -"Please enter 6 or more characters.","请输入 6 个或更多个字符。" -"Please enter a number greater than 0 in this field.","请在该字段中输入大于0的数字。" -"Please enter a valid $ amount. For example $100.00.","请输入有效的金额，例如$100.00。" -"Please enter a valid URL. For example http://www.example.com or www.example.com","请输入有效的URL，例如http://www.example.com 或 www.example.com" -"Please enter a valid URL. http:// is required","请输入有效URL，需要包含 http://" -"Please enter a valid credit card number.","请输入有效的信用卡卡号。" -"Please enter a valid date.","请输入有效日期" -"Please enter a valid email address. For example johndoe@domain.com.","请输入有效邮件地址。例如johndoe@domain.com。" -"Please enter a valid email.","请输入有效邮件。" -"Please enter a valid number in this field.","请在此区域输入有效的数字。" -"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","请输入有效的电话号码。例如 (123) 456-7890 或 123-456-7890。" -"Please enter a valid social security number. For example 123-45-6789.","请输入有效社会安全号码，例如123-45-6789。" -"Please enter a valid value from list","请从列表中输入有效的数值" -"Please enter a valid value, ex: 10,20,30","请输入有效值，例如10、20、30" -"Please enter a valid zip code.","请输入有效的邮政编码。" -"Please enter a valid zip code. For example 90602 or 90602-1234.","请输入有效邮编，例如90602或90602-1234。" -"Please enter another credit card number to complete your purchase.","请输入其他信用卡号码以完成您的购买。" -"Please enter password","请输入密码" -"Please enter password to confirm rollback.","请输入密码以确认回滚。" -"Please enter valid password.","请输入有效密码。" -"Please make sure that all global admin search modules are installed and activated.","请确保所有全球管理员搜索模块已安装并已激活。" -"Please make sure that your changes were saved before running the profile.","请确保在运行个人资料前，您的更改已保存。" -"Please make sure your passwords match.","请确保密码匹配。" -"Please select State/Province.","请选择州/省。" -"Please select a customer.","请选择一位客户。" -"Please select a store.","请选择一个店铺。" -"Please select an option.","请选择一个选项。" -"Please select catalog searches.","请选择类别搜索。" -"Please select customer(s).","请选择客户。" -"Please select message(s).","请选择信息。" -"Please select one of the above options.","请选择上列选项中的一个。" -"Please select one of the options.","请选择下列一个选项。" -"Please select review(s).","请选择评论。" -"Please select tag(s).","请选择标签。" -"Please specify backup creation options","请指定备份创建选项" -"Please specify the admin custom URL.","请指定管理用的自定义URL。" -"Please try to logout and sign in again.","请尝试注销并重新登录。" -"Please type the letters from the image:","请输入图像中的字母：" -"Please use in this field only ""a-z,0-9,_"".","请在该字段中只使用 ""a-z,0-9,_""。" -"Please use letters only (a-z) in this field.","请在此区域仅使用字母 (a-z)。" -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","请在该字段中只使用数字。请不要使用空格或其它字符，例如句点或逗号。" -"Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.","在此字段内请仅使用字母（az或AZ）、数字（0-9）或空格。" -"Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","请在该字段中只使用字母（a-z）或数字（0-9）。不能使用空格或其它字符。" -"Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.","请在此区域仅使用字母 (a-z) 或数字 (0-9) 或空格以及 #。" -"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","请使用这样的日期格式：dd/mm/yyyy。例如17/03/2006代表2006年3月17日。" -"Please wait while the indexes are being refreshed.","索引正在刷新，请等待。" -"Please wait, loading...","请稍候，正在加载..." -"Please wait...","请稍候..." -"Please, add some answers to this poll first.","请首先给该投票中添加一些问题。" -"Please, select ""Visible in Stores"" for this poll first.","请首先为该投票选择 “店铺中可见”。" -"Poll Manager","投票管理器" -"Polls","投票" -"Popular","流行" -"Position","位置" -"Position of Watermark for %s","%s 的水印位置" -"Pregenerated product images files.","预先生成产品图像文件。" -"Prev. month (hold for menu)","上个月（按下菜单）" -"Prev. year (hold for menu)","去年（按下可打开菜单）" -"Preview","预览" -"Preview Template","预览模板" -"Price","价格" -"Price alert subscription was saved.","价格警报订阅已保存。" -"Price:","价格：" -"Processed %s%% %s/%d records","已处理 %s%% %s/%d 记录" -"Product","产品" -"Product Name","产品名" -"Product Reviews","产品评测" -"Product Tax Classes","产品税率" -"Product Thumbnail Itself","产品缩略图本身" -"Product is not loaded.","产品未被加载。" -"Product:","产品：" -"Products","产品" -"Products Bestsellers Report","产品最佳销量报告" -"Products Most Viewed Report","浏览最多产品报告" -"Products Ordered","产品已下单" -"Products in Carts","购物车中的产品" -"Profile Action","配置文件操作" -"Profile Actions XML","配置文件操作XML" -"Profile Direction","配置文件指导" -"Profile History","配置文件历史" -"Profile Information","配置文件信息" -"Profile Name","配置文件名称" -"Profile Payments","配置文件支付" -"Profile Schedule","配置文件计划" -"Profile Wizard","配置文件向导" -"Profiles","配置文件" -"Promo","促销" -"Promotions","促销" -"Purchased Item","已购买内容" -"Put store on the maintenance mode while backup creation","创建备份时，将商店以维护模式运行" -"Put store on the maintenance mode while rollback processing","在进行回滚时将店铺置于维护模式" -"Quantity","数量" -"Queue Refresh","队列刷新" -"Queued... Cancel","已添加队列...取消" -"REST Roles","REST 角色" -"Radio Buttons","单选按钮" -"Rates","费率" -"Read details","阅读详情" -"Rebuild","重建" -"Rebuild Catalog Index","重建分类索引" -"Rebuild Flat Catalog Category","重建平坦分类类别" -"Rebuild Flat Catalog Product","重建平坦分类产品" -"Recent Orders","近期订单" -"Recent statistics have been updated.","最近更新的统计信息。" -"Recurring Profile View","循环配置文件视图" -"Recursive Dir","递归目录" -"Redirect","重定向" -"Reference","参考" -"Reference ID","参考ID" -"Refresh","刷新" -"Refresh Now*","立刻刷新*" -"Refresh Statistics","刷新状态" -"Region/State","地区/州" -"Regular Price:","常规价格：" -"Reject","拒绝" -"Reject token authorization Pop Up for admin","适用于管理员的拒绝令牌授权弹出窗口" -"Reject token authorization for admin","适用于管理员的拒绝令牌授权" -"Rejection Of Authorization","拒绝授权" -"Release","发布" -"Release Stability","释放稳定性" -"Release Version","发布版本" -"Reload captcha","刷新验证码" -"Remote FTP","远程FTP" -"Remove","删除" -"Reports","报告" -"Request Path","请求路径" -"Required","必须" -"Reset","重置状态" -"Reset Filter","重置筛选器" -"Reset Password","重设密码" -"Reset a Password","重置密码" -"Resize","调整大小" -"Resource Access","资源访问" -"Resources","资源" -"Results","结果" -"Retrieve Password","找回密码" -"Return Html Version","返回Html版本" -"Revenue","收入" -"Reviews","评测" -"Reviews and Ratings","评测与评级" -"Rewrite Rules","重写规则" -"Role ID","角色ID" -"Role Info","角色信息" -"Role Information","角色信息" -"Role Name","角色名称" -"Role Resources","角色资源" -"Role Users","角色用户" -"Roles","角色" -"Roles Resources","角色资源" -"Root Category","Root Category" -"Rotate CCW","轮换CCW" -"Rotate CW","循环CW" -"Run","运行" -"Run Profile","运行配置文件" -"Run Profile Inside This Window","在该窗口内运行配置文件" -"Run Profile in Popup","在弹出窗口内运行配置文件" -"Running... Kill","正在运行...结束" -"SKU","SKU" -"SKU:","SKU：" -"SSL Error: Invalid or self-signed certificate","SSL错误：无效的或自签名的证书" -"Sales","销售" -"Sales Report","销售报告" -"Samples","样本" -"Save","保存" -"Save & Generate","保存并生成" -"Save Account","保存帐户" -"Save Cache Settings","保存缓存设置" -"Save Config","保存配置" -"Save Currency Rates","保存汇率" -"Save Profile","保存配置文件" -"Save Role","保存角色" -"Save Template","保存模板" -"Save User","保存用户" -"Save and Continue Edit","保存并继续编辑" -"Search","搜索" -"Search Index","搜索索引" -"Search Term","搜索条件" -"Search Terms","搜索条件" -"Select","选择" -"Select All","全选" -"Select Category","选择分类" -"Select Date","选择日期" -"Select Range","选择范围" -"Select date","选择日期" -"Selected allowed currency ""%s"" is not available in installed currencies.","所选的允许币种 ""%s"" 不属于可使用币种。" -"Selected base currency is not available in installed currencies.","已按装的汇率中无法按照汇率进行选择。" -"Selected default display currency is not available in allowed currencies.","允许的币种中部允许选择默认显示的币种。" -"Selected default display currency is not available in installed currencies.","已安装的汇率无法选择默认显示的币种。" -"Self-assigned roles cannot be deleted.","无法选择自分配角色。" -"Sender","发送方" -"Separate Email","单独的邮件" -"Shipment #%s comment added","运单 #%s添加了评论" -"Shipment #%s created","运单 #%s已创建" -"Shipment Comments","运单评论" -"Shipment History","运送历史" -"Shipments","发货" -"Shipping","运送" -"Shipping Address","送货地址" -"Shipping Address: ","送货地址：" -"Shipping Origin","送货源头" -"Shipping Price","运费" -"Shipping address selection is not applicable","所选送货地址不可用" -"Shipping method must be specified.","必须指定运送方法。" -"Shipping method selection is not applicable","所选送货方法不可用" -"Shopping Cart","购物车" -"Shopping Cart Price Rules","购物车价格规则" -"Shopping Cart from %s","%s 的购物车" -"Show By","显示条件" -"Show Report For:","显示报告：" -"Show Reviews","显示评测" -"Sitemap Information","站点结构图信息" -"Size for %s","%s的大小" -"Skip Category Selection","跳过分类的选择" -"Some items in this order have different invoice and shipment types. You can create shipment only after the invoice is created.","该订单中的某些项目具有不同的发票和送货类型。您只能在创建发票后创建运单。" -"Some of the ordered items do not exist in the catalog anymore and will be removed if you try to edit the order.","订购的某些商品已经不再包含在分类中，如果尝试修改订单，将会被删除。" -"Sorry, this feature is coming soon...","对不起，该功能尚未发布..." -"Special Price:","特殊价格：" -"Specific Countries","指定国家" -"Specified","已指定" -"Specified profile does not exist.","指定的配置文件不存在。" -"Spreadsheet Name:","表格名称：" -"Start Date","开始日期" -"Starting profile execution, please wait...","开始执行配置文件，请稍候..." -"State/Province:","州/省：" -"Static Blocks","静态块" -"Status","状态" -"Status:","状态：" -"Stock Quantity:","存货数量：" -"Stock notification was saved.","库存通知已保存。" -"Store","商店" -"Store Email Addresses Section","店铺邮件地址区域" -"Store View","店铺视图" -"Store:","店铺：" -"Stores","店铺" -"Subject","主题" -"Submit","提交" -"Subpackage cannot be conflicting.","子包不能冲突。" -"Subtotal","小计" -"Switch/Solo card issue number: %s","Switch/Solo卡发卡号：%s" -"Switch/Solo card start Date: %s/%s","切换/专用卡开始日期：%s/%s" -"Switch/Solo/Maestro Only","仅限 Switch/Solo/Maestro" -"Switch/Solo/Maestro(UK Domestic) Only","仅限Switch/Solo/Maestro（UK Domestic）" -"Switch/Solo/Maestro(UK Domestic) card issue number: %s","Switch/Solo/Maestro(UK Domestic)卡发卡号：%s" -"Switch/Solo/Maestro(UK Domestic) card start Date: %s/%s","Switch/Solo/Maestro(UK Domestic) 卡发卡日期：%s/%s" -"Symbol","符号" -"Synchronization is required.","需要进行同步。" -"Synchronization of media storages has been successfully completed.","媒体存储的同步已经成功完成。" -"Synchronize","同步" -"Synchronizing %s to %s","同步 %s 到 %s" -"Synchronizing...","正在同步..." -"System","系统" -"System Section","系统区域" -"System busy","系统忙碌" -"Tags","标签" -"Target Path","目标路径" -"Tax","传真" -"Tb","Tb" -"Template","模板" -"Template Content","模板内容" -"Template Information","模板信息" -"Template Name","模板名称" -"Template Styles","模板风格" -"Template Subject","模板主题" -"Template Type","模板类型" -"Temporary (302)","临时（302）" -"Terms and Conditions","条款和条件" -"Text","文字" -"The Catalog Rewrites were refreshed.","该分类重写已重建。" -"The CatalogInventory Stock Status has been rebuilt.","CatalogInventory库存状态已重建。" -"The Comment Text field cannot be empty.","该评论文本框不能为空。" -"The Flat Catalog Product was rebuilt","Flat分类产品已重建" -"The JavaScript/CSS cache has been cleaned.","JavaScript/CSS缓存已清空。" -"The JavaScript/CSS cache has been cleared.","JavaScript/CSS 缓存已被清空。" -"The Layered Navigation indexing has been queued.","分层导航索引已排入队列。" -"The Layered Navigation indexing queue has been canceled.","分层导航索引队列已被删除。" -"The Layered Navigation indices were refreshed.","层次式导航目录已恢复。" -"The Layered Navigation process has been queued to be killed.","已排入队列的分层导航进程将被中止。" -"The Magento cache storage has been flushed.","Magento缓存存储已清理。" -"The URL Rewrite has been deleted.","URL 重写已被删除。" -"The URL Rewrite has been saved.","URL 重写已保存。" -"The account has been saved.","帐户已保存。" -"The archive can be uncompressed with %s on Windows systems","Windows系统下存档的解压缩可使用 %s" -"The attribute set has been removed.","属性集已删除。" -"The backup's creation process will take time.","备份创建过程需要一些时间。" -"The billing agreement has been canceled.","账单协议已被取消。" -"The billing agreement has been deleted.","记账协议已删除。" -"The cache storage has been flushed.","缓存存储已清理。" -"The carrier needs to be specified.","需要指定承运人。" -"The catalog index has been rebuilt.","分类索引已重建。" -"The catalog rewrites have been refreshed.","分类重写已恢复。" -"The configuration has been saved.","配置已保存。" -"The credit memo has been canceled.","贷项凭单已被取消。" -"The credit memo has been created.","信用记录已创建。" -"The credit memo has been voided.","贷项凭单已作废。" -"The custom variable has been deleted.","自定义变量已删除。" -"The custom variable has been saved.","自定义变量已保存。" -"The customer has been deleted.","客户已被删除。" -"The customer has been saved.","客户已保存。" -"The design change has been deleted.","设计变动已删除。" -"The design change has been saved.","设计变更已保存。" -"The email address is empty.","电子邮件地址为空。" -"The email template has been deleted.","电子邮件模版已被删除。" -"The email template has been saved.","邮件模板已保存。" -"The flat catalog category has been rebuilt.","平面目录类别已重建。" -"The group node name must be specified with field node name.","群组节点名称并需以域节点名称指定。" -"The image cache was cleaned.","图片缓存已被清空。" -"The image cache was cleared.","图像缓存已清理。" -"The invoice and shipment have been created.","发票与运送已创建。" -"The invoice and the shipment have been created. The shipping label cannot be created at the moment.","发票与运送已创建。目前无法更改发货标签。" -"The invoice has been canceled.","发票已被取消。" -"The invoice has been captured.","发票已被捕获。" -"The invoice has been created.","发票已创建。" -"The invoice has been voided.","发票已作废。" -"The invoice no longer exists.","清单不存在。" -"The item %s (SKU %s) does not exist in the catalog anymore.","项目 %s (SKU %s) 已不在该编录中。" -"The order does not allow creating an invoice.","该订单不允许创建发票。" -"The order no longer exists.","该订单已不存在。" -"The poll has been deleted.","调查已被删除。" -"The poll has been saved.","调查已保存。" -"The profile has been deleted.","个人资料已被删除。" -"The profile has been saved.","个人资料已保存。" -"The profile has been updated.","个人资料已更新。" -"The profile has no changes.","个人资料无变化。" -"The profile you are trying to save no longer exists","您尝试保存的配置文件不存在" -"The rating has been deleted.","评级已被删除。" -"The rating has been saved.","评级已保存。" -"The role has been deleted.","角色已被删除。" -"The role has been saved.","角色已保存。" -"The role has been successfully saved.","角色已成功保存。" -"The search index has been rebuilt.","搜索索引已重建。" -"The shipment has been created.","货物已被创建。" -"The shipment has been sent.","货物已发送。" -"The shipping label has been created.","运送标签已创建。" -"The tag has been deleted.","标签已被删除。" -"The tag has been saved.","标签已保存。" -"The transaction details have been updated.","已更新交易详情。" -"The user has been deleted.","用户已被删除。" -"The user has been saved.","用户已保存。" -"Themes JavaScript and CSS files combined to one file.","主题 JavaScript 和 CSS 文件已合并为单个文件。" -"There is an error in one of the option rows.","选项行之一出现错误。" -"This Account is","该账户为" -"This Email template no longer exists.","电子邮件模板已不存在。" -"This Role no longer exists","该角色已不存在" -"This Role no longer exists.","该角色已不存在。" -"This account is","该帐户为" -"This account is inactive.","该账户未被激活。" -"This action cannot be undone.","该行为不可取消。" -"This attribute set does not have attributes which we can use for configurable product","该属性集不具有我们可用于可配置产品的属性" -"This attribute shares the same value in all the stores","该属性在所有商店中共享同样的数值" -"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","这是一个演示商店。任何在此商店下的订单将无法被兑现或履行。" -"This is a required field.","这是必填区域。" -"This product is currently disabled.","该产品当前已被禁用。" -"This report depends on timezone configuration. Once timezone is changed, the lifetime statistics need to be refreshed.","该报告取决于时区配置。一旦时区发生变更，有效期统计数据即需要被刷新。" -"This section is not allowed.","该单元不被允许。" -"This user no longer exists.","该用户已不存在。" -"Time","时间" -"Time selection:","时间选择：" -"Time:","时间：" -"Timeout limit for response from synchronize process was reached.","同步操作中的响应超时限制已达到。" -"To","发送至" -"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","要取消挂起的授权，并释放支付过程中已经被处理的授权，请点击取消。" -"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","要使用 PayPal Payflow Link，您必须前往 PayPal 网站配置您的 PayPal Payflow Link 账户。" -"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","要使用 PayPal Payment Advanced，您必须前往 PayPal 网站配置您的 PayPal Payment Advanced 账户。" -"Toggle Editor","切换编辑器" -"Tools","工具" -"Top 5 Search Terms","前五位搜索条件" -"Total","总数" -"Total Invoiced","发票总量" -"Total Order Amount","订单总数量" -"Total Refunded","退款总量" -"Total of %d record(s) have been deleted.","总共%d记录已被删除。" -"Total of %d record(s) have been updated.","总共%d记录已被更新。" -"Total of %d record(s) were canceled.","总共取消了 %d 条记录。" -"Total of %d record(s) were deleted","共删除 %d 条记录" -"Total of %d record(s) were deleted.","共删除 %d 条记录。" -"Total of %d record(s) were updated","共更新 %d 条记录" -"Total of %d record(s) were updated.","共更新 %d 条记录。" -"Track Order","追踪订单" -"Track this shipment","追踪该运单" -"Tracking number %s for %s assigned","为%s分配的追踪号 %s" -"Tracking number cannot be empty.","追踪号不能为空。" -"Transaction Data","交易数据" -"Transaction Details","交易详情" -"Transaction ID","交易ID" -"Transaction Type","交易类型" -"Transactional Emails","交易邮件" -"Transactions","交易" -"Try Magento Go for Free","免费试用 Magento Go" -"Type","类型" -"Type:","类型：" -"URL Rewrite","URL重写" -"URL Rewrite Information","URL重写信息" -"URL Rewrite Management","URL重写管理" -"Unable to cancel the credit memo.","无法取消信用记录。" -"Unable to find a Email Template to delete.","无法找到要删除的邮件模板。" -"Unable to find a poll to delete.","无法找到要删除的投票。" -"Unable to find a tag to delete.","无法找到要删除的标签。" -"Unable to find a user to delete.","无法找到要删除的用户。" -"Unable to initialize import model","无法初始化导入模块。" -"Unable to refresh lifetime statistics.","无法刷新有效期状态。" -"Unable to refresh recent statistics.","无法刷新最新状态。" -"Unable to save Cron expression","无法保存Cron扩展" -"Unable to save the cron expression.","无法保存Cron表达式。" -"Unable to save the invoice.","无法保存该发票。" -"Unable to send the invoice email.","无法发送发票邮件。" -"Unable to send the shipment email.","无法发送运送邮件。" -"Unable to update transaction details.","无法更新交易详情。" -"Unable to void the credit memo.","无法避免信用记录。" -"Unknown","未知" -"Unlimited","无限" -"Update","更新" -"Updated At","更新于" -"Upload File","上传文件" -"Upload Files","上传文件" -"Upload HTTP Error","上传HTTP错误" -"Upload I/O Error","上传I/O错误" -"Upload Security Error","上传安全错误" -"Upload import file","上传导入文件" -"Uploaded file is larger than %.2f kilobytes allowed by server","上传文件过大，超过服务器许可值 %.2f 千字节" -"Use All Available Attributes","使用全部可用属性" -"Use Config Settings","使用配置设置" -"Use Default","使用默认值" -"Use Default Value","使用默认值" -"Use Default Variable Values","使用默认变量值" -"Use FTP Connection","使用 FTP 连接" -"Use Website","使用网站" -"Used Currently For","当前用于" -"Used as Default For","用作默认值" -"User Email","用户邮件" -"User ID","用户ID" -"User Info","用户信息" -"User Information","用户信息" -"User Name","用户名" -"User Name is required field.","用户名是必要字段。" -"User Name:","用户名：" -"User Password","用户密码" -"User Role","用户角色" -"User Roles","用户角色" -"User Roles Information","用户角色信息" -"User Type Resources","用户类型资源" -"User name","用户名" -"Users","用户" -"VAT Number is Invalid","VAT 号码无效" -"VAT Number is Valid","VAT 号码有效" -"Validation Results","验证结果" -"Value","值" -"Value Delimiter:","值界定符：" -"Variable","变量" -"Variable Code","变量代码" -"Variable HTML Value","变量HTML值" -"Variable ID","变量ID" -"Variable Name","变量名称" -"Variable Plain Value","变量平坦值" -"Verifier code: %s","验证器代码：%s" -"View Actions XML","查看操作XML" -"View Full Size","查看完整尺寸" -"View Memo","查看记录" -"View Memo for #%s","查看 #%s的记录" -"View Shipment","查看运送" -"View Statistics For:","查看统计：" -"Visibility:","可见性：" -"Warning","警告" -"Warning! Empty value can cause problems with CSV format.","警告！空值将导致CSV格式出问题。" -"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","警告！\r\n该操作会将用户从已分配的角色中删除\r\n是否继续？" -"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","警告！\r\n该操作将从已分配的角色中将这些用户删除\r\n您是否真要这样做？" -"Warning: Please do not close the window during importing/exporting data","警告：请不要在导入/导出数据过程中关闭该窗口" -"Watermark File for %s","%s的水印文件" -"We appreciate our merchants\' feedback, please take our survey to provide insight on the features you would like included in Magento. Remove this notification","我们要感谢所用的银行\' 若有反馈，请 参与我们的调查 以便告诉我们您希望在以后的Magento中看到哪些新功能。 删除该通知" -"We\'re in our typing table, coding away more features for Magento. Thank you for your patience.","我们正在辛苦工作中，为Magento添加更多功能。感谢您的耐心。" -"Web Section","Web区域" -"Web Services","Web服务" -"Web services","Web服务" -"Website","网站" -"What is this?","这是什么？" -"Wishlist Report","愿望清单报告" -"Wishlist item is not loaded.","愿望清单项编号未被加载。" -"Wrong account specified.","指定的账户有误。" -"Wrong billing agreement ID specified.","指定的记账协议ID有误。" -"Wrong column format.","栏格式有误。" -"Wrong newsletter template.","错误的新闻邮件模板。" -"Wrong quote item.","引用项有误。" -"Wrong tab configuration.","选项卡配置有误。" -"Wrong tag was specified.","指定的选项卡有误。" -"Wrong transaction ID specified.","指定的交易ID有误。" -"XML","XML" -"XML data is invalid.","XML数据无效。" -"XML object is not instance of ""Varien_Simplexml_Element"".","XML对象并非“Varien_Simplexml_Element”的实例。" -"YTD","YTD" -"Year","年" -"Yes","是" -"Yes (301 Moved Permanently)","是（301 永久移动）" -"Yes (302 Found)","是（302找到）" -"Yes (only price with tax)","是（只显示含税价格）" -"You cannot delete your own account.","您无法删除自己的帐户。" -"You have %s unread message(s).","您有 %s 封未读邮件。" -"You have %s unread message(s). Go to messages inbox.","你有 %s 条未读信息。 转向收件箱。" -"You have %s, %s and %s unread messages. Go to messages inbox.","你有 %s、%s 以及 %s 条未读信息。 转向收件箱。" -"You have logged out.","您已注销。" -"You have not enough permissions to use this functionality.","您没有使用该功能所需的足够权限。" -"You must have JavaScript enabled in your browser to utilize the functionality of this website.","您必须在浏览器中启用JavaScript才能使用本网站的功能。" -"You need to specify order items.","您必须指定订单项。" -"You will need to wait when the action ends.","该行为终止时需要等待。" -"Your answers contain duplicates.","您的回答包含重复内容。" -"Your password has been updated.","你的密码已更新。" -"Your password reset link has expired.","你的密码重设链接已过期。" -"Your server PHP settings allow you to upload files not more than %s at a time. Please modify post_max_size (currently is %s) and upload_max_filesize (currently is %s) values in php.ini if you want to upload larger files.","您的服务器PHP设置使您可以同时上传不超过 %s 文件。如果想上传大文件，请修改php.ini文件中的 post_max_size （当前为 %s）与 upload_max_filesize （当前为 %s）值。" -"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","您的Web服务器配置有误。因此，包含敏感信息的配置文件将能从外部访问。请联系您的主机托管商。" -"Zip/Postal Code","邮政编码" -"Zip/Postal Code:","邮编：" -"[ deleted ]","[已删除]" -"[GLOBAL]","[全局]" -"[STORE VIEW]","[店铺视图]" -"[WEBSITE]","[网站]" -"b","b" -"close","关闭" -"critical","重要" -"example: ""sitemap/"" or ""/"" for base path (path must be writeable)","例如： ""sitemap/"" 或 ""/"" 可代表路径根（路径必须可写）" -"example: sitemap.xml","例如：sitemap.xml" -"failed","失败" -"from","来自" -"major","主要" -"minor","次要" -"notice","注意" -"store(%s) scope","店铺 （%s）范围" -"successful","成功" -"to","至" -"website(%s) scope","网站（%s）范围" -"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento configuration.","不建议在生产环境中使用 {{base_url}} 检测 Base Unsecure URL / Base Secure URL。强烈建议在您的 Magento 配置中更改该值。" diff --git a/app/locale/zh_CN/Mage_AmazonPayments.csv b/app/locale/zh_CN/Mage_AmazonPayments.csv deleted file mode 100644 index 74739277e..000000000 --- a/app/locale/zh_CN/Mage_AmazonPayments.csv +++ /dev/null @@ -1,101 +0,0 @@ -" Select Shipping Method","选择送货方式" -"
    Trace confirmation request:
    %s","
    追踪确认请求：
    %s" -"Access Key","访问密钥" -"Access Key ID","访问密钥 ID" -"Amazon Simple Pay","Amazon Simple Play" -"Amazon Simple Pay notification error","Amazon Simple Pay 通知错误" -"Amazon Simple Pay service capture confirmation error: confirmation request amount is not equal to the amount of order.","Amazon Simple Pay 服务捕获到确认错误：确认请求数量与订单数量不一致。" -"Amazon Simple Pay service capture confirmation error: the amount in the existing invoice does not match the amount in the confirmation request.","Amazon Simple Pay 服务捕获到确认错误：已存在的发票数量与确认请求数量不匹配。" -"Amazon Simple Pay service capture confirmation error: the existing transaction ID does not match the transaction ID in the confirmation request.","Amazon Simple Pay 服务捕获到确认错误：现有交易 ID 与确认请求中的交易 ID 不匹配。" -"Amazon Simple Pay service capture confirmation. The invoice was captured automatically.","Amazon Simple Pay 服务捕获确认。发票已自动捕获。" -"Amazon Simple Pay service confirmation error: order states sequence violation.","Amazon Simple Pay 服务确认错误：订单状态序列违规。" -"Amazon Simple Pay service confirmation error: the order currency does not match the currency of the IPN request.","Amazon Simple Pay 服务确认错误：订单货币与 IPN 请求中的货币不匹配。" -"Amazon Simple Pay service confirmation error: the order specified in the IPN request cannot be found.","Amazon Simple Pay 服务确认错误：无法找到 IPN 中指定的订单请求。" -"Amazon Simple Pay service confirmation error: the payment method in the order is not Amazon Simple Pay.","Amazon Simple Pay 服务确认错误：订单中的支付方法不是 Amazon Simple Pay。" -"Amazon Simple Pay service confirmed capture for invoice %s.","Amazon Simple Pay 服务已确认捕获到发票 %s。" -"Amazon Simple Pay service confirmed refund for credit memo %s.","Amazon Simple Pay 服务已确认贷项凭证 %s 的退款。" -"Amazon Simple Pay service has confirmed amount authorization.","Amazon Simple Pay service 已确认金额授权。" -"Amazon Simple Pay service has confirmed cancelation.","Amazon Simple Pay 服务已确认了取消操作。" -"Amazon Simple Pay service has confirmed capture for invoice %s. The invoice was automatically captured.","Amazon Simple Pay 服务已确认捕获到发票 %s。发票已自动捕获。" -"Amazon Simple Pay service has confirmed capture initiation.","Amazon Simple Pay 服务已确认捕获到启动操作。" -"Amazon Simple Pay service has confirmed capture.","Amazon Simple Pay 服务已确认捕获。" -"Amazon Simple Pay service has confirmed payment capture. Invoice %s was automatically created after confirmation.","Amazon Simple Pay 服务已确认支付捕获。发票 %s 已在确认后自动生成。" -"Amazon Simple Pay service has confirmed payment capture. Invoice was created automatically.","Amazon Simple Pay 服务已确认支付捕获。发票已自动生成。" -"Amazon Simple Pay service has confirmed payment refund. Credit memo %s was automatically created after confirmation.","Amazon Simple Pay 服务已确认退款。贷项凭证 %s 已在确认后自动生成。" -"Amazon Simple Pay service has confirmed payment refund. Credit memo was created automatically.","Amazon Simple Pay 服务已确认退款。贷项凭证已自动生成。" -"Amazon Simple Pay service has confirmed payment refund. The credit memo was created automatically.","Amazon Simple Pay 服务已确认退款。贷项凭证已自动生成。" -"Amazon Simple Pay service has confirmed refund.","Amazon Simple Pay 已确认退款。" -"Amazon Simple Pay service has confirmed refund. The credit memo was processed automatically.","Amazon Simple Pay 已确认退款。此贷项凭证已自动处理。" -"Amazon Simple Pay service has confirmed refunded credit memo %s. The credit memo was processed automatically.","Amazon Simple Pay 已确认退款了贷项凭证 %s。此贷项凭证已自动处理。" -"Amazon Simple Pay service is not available. Payment was not processed.","Amazon Simple Pay 服务不可用。支付未被处理。" -"Amazon Simple Pay service payment confirmation has failed.","Amazon Simple Pay 服务支付确认失败。" -"Amazon Simple Pay service refund confirmation error: the amount in the existing creditmemo does not match the amount in the confirmation request.","Amazon Simple Pay 退款确认错误：现有贷项凭证中的金额与确认请求中的金额不匹配。" -"Amazon Simple Pay service refund confirmation error: the confirmation request amount does not match the order amount.","Amazon Simple Pay 服务退款确认错误：确认请求金额与订单金额不匹配。" -"Amazon Simple Pay service refund confirmation error: the transaction ID in the existing creditmemo does not match the transaction ID in the confirmation request.","Amazon Simple Pay 退款确认错误：现有贷项凭证中的交易 ID 与确认请求中的交易 ID 不匹配。" -"Authorize Only","仅供授权" -"Authorize and Capture","授权和捕获" -"Cancel Description","取消描述" -"Cancel Order Notification received from Checkout by Amazon service.","从 Checkout by Amazon 服务处接收到取消订单通知。" -"Checkout by Amazon","Checkout by Amazon" -"Continue Shopping","继续购物" -"Customer was redirected to Amazon Simple Pay site","客户已被跳转至 Amazon Simple Pay 网站" -"Debug","调试" -"Debug Log","故障调试日志" -"Email Sender","电子邮件发送人" -"Enable","启用" -"Error Log","错误日志" -"FPS Sandbox Service URI","FPS 沙盒服务 URI" -"FPS Service URI","FPS 服务 URI" -"Immediate Return","立即返回" -"Invalid action code.","无效的操作代码。" -"Invalid request.","无效的请求。" -"Invoice was created with Checkout by Amazon.","发票以通过 Checkout by Amazon 生成。" -"Merchant ID","分行ID" -"Merchant Login","商家登录" -"Merchant Name","商家名称" -"Merchant Password","商家密码" -"Merchant Token","商家令牌" -"Method Choice Checkout Message","方法选择结账消息" -"New Order Notification received from Checkout by Amazon service.","从 Checkout by Amazon 服务接收到新订单通知。" -"New Order Status","新订单状态" -"Notification Error Transactional Email","通知错误交易电子邮件" -"Order Ready To Ship Notification received form Checkout by Amazon service.","从 Checkout by Amazon 服务收到订单已准备好运送的通知。" -"Order was canceled with Checkout by Amazon.","订单已通过 Checkout by Amazon 取消。" -"Payment Action","支付操作" -"Payment Description","支付描述" -"Payment Sandbox Service URI","支付沙盒服务 URI" -"Payment Service URI","支付服务 URI" -"Payment authorization canceled with Amazon Simple Pay service.","支付授权已通过 Amazon Simple Pay 服务取消。" -"Pending Amazon Simple Pay","未决的 Amazon Simple Pay" -"Redirect Message","重定向消息" -"Refund Description","退款描述" -"Refund was created with Checkout by Amazon.","已通过 Checkout by Amazon 创建退款。" -"Report Email","报告电子邮件" -"Report Error to Email","报告错误到电子邮件" -"Response body is not a valid FPS response.","响应 body 部分不是有效的 FPS 响应。" -"SUCCESS","成功" -"Sandbox","沙箱" -"Secret Key","秘密密钥" -"Secret Key ID","秘密密钥 ID" -"Shipment was created with Checkout by Amazon.","已通过 Checkout by Amazon 创建运送" -"Thank you for your purchase!","感谢您的购买！" -"The customer has canceled payment and successfully returned from Amazon Simple Pay site","客户已取消支付，并以从 Amazon Simple Pay 网站成功返回" -"The customer has successfully returned from Amazon Simple Pay site","客户已通过 Amazon Simple Pay 网站成功完成退款" -"The invoice was created (online capture). Waiting for capture confirmation from Amazon Simple Pay service.","发票已生成（在线捕获）。正在等待来自 Amazon Simple Pay 服务的捕获确认。" -"The invoice was not refunded. Amazon Simple Pay service error: [%s] %s","此发票未退款。Amazon Simple Pay 服务错误：[%s] %s" -"The item specified in callback request XML was not found in quote.","未在引用中找到回调请求 XML 指定的商品。" -"The order was not canceled. Amazon Simple Pay service error: [%s] %s","订单未被取消。Amazon Simple Pay 服务错误：[%s] %s" -"The order was not captured online. Authorization confirmation is required.","此订单未被在线捕获。需要授权确认。" -"The order was not captured. Amazon Simple Pay service error: [%s] %s","订单未被捕获。Amazon Simple Pay 服务错误：[%s] %s" -"The payment was captured online with Amazon Simple Pay service. The invoice was created. Waiting for capture confirmation from the payment service.","此支付已使用 Amazon Simple Pay 服务在线捕获成功。发票已生成。正在等待来自支付服务的捕获确认。" -"The payment was refunded online with Amazon Simple Pay service. The credit memo was created. Waiting for refund confirmation from Amazon Simple Pay service.","此支付已使用 Amazon Simple Pay 服务在线退款。贷项凭证已创建。正在等待来自 Amazon Simple Pay 服务的退款确认。" -"The payment was refunded online. Waiting for refund confirmation from Amazon Simple Pay service.","此支付已在线退款。正在等待来自 Amazon Simple Pay 服务的退款确认。" -"The request is not a valid IPN request.","该请求不是有效的 IPN 请求。" -"The request was signed incorrectly or the signature is missing.","该请求签署不正确或签名已丢失。" -"Title","标题" -"Use Callback API","使用回调 API" -"You will be redirected to Checkout by Amazon in a few seconds.","您将在几秒钟后被跳转至 Checkout by Amazon。" -"You will receive an order confirmation email with details of your order and a link to track its progress.","您将会收到一份内含订单详细信息和可查询进展情况链接的确认邮件" -"You will receive an order confirmation email with details of your order and a link to track its progress.
    ","您将收到一封订单确认电子邮件，包含您的订单详情以及追踪其进度的链接。
    " -"Your billing address will be ignored and you will be redirected to Checkout by Amazon website.","您的账单地址将被忽略，您将被跳转至 Checkout by Amazon 网站。" -"Your order has been received.","我们已经收到您的订单。" diff --git a/app/locale/zh_CN/Mage_Api.csv b/app/locale/zh_CN/Mage_Api.csv deleted file mode 100644 index 71658cd82..000000000 --- a/app/locale/zh_CN/Mage_Api.csv +++ /dev/null @@ -1,18 +0,0 @@ -"Access denied.","访问被拒绝" -"Can not find webservice adapter.","无法找到 Web 服务适配器。" -"Client Session Timeout (sec.)","客户端会话超时（秒。）" -"Default Response Charset","默认响应字符集" -"Email","电子邮件" -"Enable WSDL Cache","启用 WSDL 缓存" -"General Settings","常规设置" -"Invalid webservice adapter specified.","指定的Web服务适配器无效。" -"Invalid webservice handler specified.","指定的Web服务处理程序无效。" -"Magento Core API","Magento Core API" -"Magento Core API Section","Magento Core API 部分" -"SOAP/XML-RPC - Roles","SOAP/XML-RPC - 角色" -"SOAP/XML-RPC - Users","SOAP/XML-RPC - 用户" -"Unable to login.","无法登录。" -"User Name","用户名" -"WS-I Compliance","WS-I 兼容" -"Web Services","Web服务" -"Your account has been deactivated.","您的帐户已被撤销。" diff --git a/app/locale/zh_CN/Mage_Api2.csv b/app/locale/zh_CN/Mage_Api2.csv deleted file mode 100644 index 92f3f4896..000000000 --- a/app/locale/zh_CN/Mage_Api2.csv +++ /dev/null @@ -1,238 +0,0 @@ -"%s","%s" -"%s role is a special one and can\'t be changed.","%s 是特殊职位，不可更改。" -"%s role is a special one and can\'t be deleted.","%s 是特殊职位，不可删除。" -"%s role is protected.","%s 职位受到保护。" -"ACL Attribute Rules","访问控制列表属性规则" -"ACL Attributes Information","访问控制列表属性信息" -"Add","添加" -"Add Admin Role","增设管理员职位" -"Add New Role","添加新角色" -"Address Type","地址类型" -"Admin","管理员" -"Allow","允许" -"An error occurred while deleting the role.","删除职位时发生错误。" -"An error occurred while saving attribute rules.","保存属性设置时发生错误。" -"An error occurred while saving role.","保存职位时发生错误。" -"Api Rules Information","API 规则信息" -"Assigned","已分配" -"Associate to Website","连接到网站" -"Attribute Rules Information","属性规则信息" -"Attribute Set","属性集" -"Attributes","属性" -"Automatically Return Credit Memo Item to Stock","自动返回信用备忘项目到库存" -"Back","返回" -"Backorders","缺货" -"Base Currency","基准货币" -"Base Customer Balance","用户基础余额" -"Base Discount","基础折扣" -"Base Discount Amount","基础折扣金额" -"Base Item Subtotal","基础项目小计" -"Base Item Subtotal Including Tax","基础项目含税小计" -"Base Original Price","基础原价" -"Base Price","基价" -"Base Price Including Tax","含税基价" -"Base Shipping","基础运费" -"Base Shipping Discount","基础运费折扣" -"Base Shipping Tax","基础航运税" -"Base Subtotal","基础小计" -"Base Subtotal Including Tax","基础含税小计" -"Base Tax Amount","基础税额" -"Base Total Due","应付基础总额" -"Base Total Paid","已付基础总额" -"Base Total Refunded","已退基础总额" -"Buy Now URL","立即购买 URL" -"Can Be Divided into Multiple Boxes for Shipping","可拆分发货" -"Canceled Qty","已取消数量" -"Catalog","分类" -"Catalog Product","目录产品" -"CatalogInventory","产品目录" -"Category ID","分类ID" -"City","城市" -"Company","公司" -"Country","国家" -"Coupon Code","折扣券代码" -"Create","创建" -"Create Permanent Redirect for old URL","为老URL创建永久重定向" -"Created From","创建来自" -"Customer","客户" -"Customer Address","客户地址" -"Customer Address ID","客户地址 ID" -"Customer Balance","顾客余额" -"Customer First Name","客户名字" -"Customer ID","客户ID" -"Customer Last Name","客户姓氏" -"Customer Middle Name","客户中间名" -"Customer Prefix","客户前缀" -"Customer Suffix","客户后缀" -"Default Image","默认图片" -"Delete","删除" -"Deny","拒绝" -"Disable automatic group change based on VAT ID","禁用基于增值税发票号的自动小组更改" -"Discount","折扣" -"Discount Amount","折扣帐户" -"Discount Description","折扣描述" -"Edit","编辑" -"Edit %s ACL attribute rules","编辑 %s 访问控制列表属性规则" -"Edit Role","编辑角色" -"Edit attribute rules for %s Role","为 %s 职位编辑属性规则" -"Email","电子邮件" -"Enable Qty Increments","启用数量增量" -"Exclude","排除" -"File Content","文件内容" -"File MIME Type","多用途互联网邮件扩展类型" -"File Name","文件名" -"Final Price With Tax","最终含税价格" -"Final Price Without Tax","最终不含税价格" -"First Name","名字" -"Gift Message","礼品消息" -"Grand Total","总计" -"Grand Total to Be Charged","应付总额" -"Group","分组" -"Guest","来宾" -"Has Custom Options","有自定义选项" -"ID","ID" -"Inventory Data","库存数据" -"Invoiced Qty","开票数量" -"Is Confirmed","已确认" -"Is Default Billing Address","是默认帐单地址" -"Is Default Shipping Address","是默认送货地址" -"Item ID","项目代码" -"Item Subtotal","项目小计" -"Item Subtotal Including Tax","含税项目小计" -"Label","标签" -"Last Logged In","最近登录时间" -"Last Name","姓氏" -"Low Stock Date","库存稀少日期" -"Manage Stock","库存管理" -"Maximum Qty Allowed in Shopping Cart","购物车数量上限" -"Minimum Qty Allowed in Shopping Cart","购物车里允许的最少数量" -"New Role","新角色" -"Notify for Quantity Below","存量过低通知" -"OAuth","OAuth" -"Order","订单" -"Order Addresses","订单地址" -"Order Comments","订单评论" -"Order Currency","订单货币" -"Order Date","订单日期" -"Order ID","订单 ID" -"Order ID (internal)","订单号（内部）" -"Order Item ID","订购项目编号" -"Order Items","订购项目" -"Order Status","订单状态" -"Ordered Qty","订购数量" -"Orders","订单" -"Original Price","原始价格" -"Parent Order Item ID","上级订单号" -"Payment Method","支付方式" -"Phone Number","电话号码" -"Placed from IP","下单用的IP" -"Please enter a valid number in ""max_sale_qty"" field","请在“最大销售数量”字段输入一个有效数值" -"Please enter a valid number in ""min_qty"" field","请在“最小数量”字段输入一个有效数值" -"Please enter a valid number in ""min_sale_qty"" field","请在“最小销售数量”字段输入一个有效数值" -"Please enter a valid number in ""notify_stock_qty"" field","请在“通知库存数量”字段输入一个有效数值" -"Please use numbers only in ""category_id"" field.","请在“类别代码”字段输入一个有效数值" -"Please use numbers only in ""qty_increments"" field. Please avoid spaces or other characters such as dots or commas.","“数量增加”字段只能使用数字。请勿输入空格或点、逗号等字符。" -"Position","位置" -"Price","价格" -"Price Including Tax","含税价" -"Product","产品" -"Product Category","产品类别" -"Product ID","产品 ID" -"Product Image","产品图片" -"Product Type","产品类型" -"Product URL","产品链接" -"Product Website","产品网站" -"Product and Custom Options Name","产品和自定义选项名称" -"Qty","数量" -"Qty Increments","数量增量" -"Qty Uses Decimals","数量使用小数" -"Qty for Item's Status to Become Out of Stock","产品状态变为缺货时的数量" -"REST - Attributes","REST - 属性" -"REST - Roles","REST - 职位" -"REST ACL Attributes","REST - ACL 属性" -"REST Attributes","REST 属性" -"REST Role","REST 职位" -"REST Roles","REST 角色" -"REST Roles Information","REST 职位信息" -"Read","阅读" -"Refunded Qty","退款金额" -"Regular Price With Tax","含税原价" -"Regular Price Without Tax","不含税原价" -"Rest Roles","其他职位" -"Retrieve","检索" -"Role ""%s"" no longer exists","职位 ""%s"" 已不存在" -"Role ""%s"" not found.","职位 ""%s"" 无法找到。" -"Role API Resources","职位 API 资源" -"Role Info","角色信息" -"Role Information","角色信息" -"Role Name","角色名称" -"Role Users","角色用户" -"Role has been deleted.","职位已被删除。" -"Roles","角色" -"SKU","SKU" -"Salability Status","销售状况" -"Sales","销售" -"Save","保存" -"Shipped Qty","发货数量" -"Shipping Amount","运送量" -"Shipping Discount","运费折扣" -"Shipping Including Tax","含税运费" -"Shipping Method","运送方式" -"Shipping Tax","航运税" -"State","州" -"Stock Availability","库存状况" -"Stock ID","库存代码" -"Stock Item","库存项目" -"Stock Status","库存状态" -"Store Currency to Order Currency Rate","保存货币以稳定货币汇率" -"Store Name","店铺名称" -"Street","街道" -"Subtotal","小计" -"Subtotal Including Tax","含税小计" -"System","系统" -"Tax Amount","税额" -"Tax Name","税名" -"Tax Percent","税率" -"Tax Rate","税率" -"The ""enable_qty_increments"" field must be set to 0 or 1.","“允许数量增加”字段必须设置为 0 或 1 。" -"The ""is_decimal_divided"" field must be set to 0 or 1.","“十进位小数”字段必须设置为 0 或 1 。" -"The ""is_in_stock"" field must be set to 0 or 1.","“有库存”字段必须设置为 0 或 1 。" -"The ""is_qty_decimal"" field must be set to 0 or 1.","“数量_小数”字段必须设置为 0 或 1 。" -"The ""is_qty_decimal"" field must be set to 0, 1, or 2.","“数量_小数”字段必须设置为 0 或 1 。" -"The ""manage_stock"" field must be set to 0 or 1.","“管理_库存”字段必须设置为 0 或 1 。" -"The ""stock_status_changed_auto"" field must be set to 0 or 1.","“库存状态自动更改”字段必须设置为 0 或 1 。" -"The ""use_config_backorders"" field must be set to 0 or 1.","“使用设置管理缺货订单”字段必须设置为 0 或 1 。" -"The ""use_config_enable_qty_inc"" field must be set to 0 or 1.","“使用设置启用数量增加”字段必须设置为 0 或 1 。" -"The ""use_config_manage_stock"" field must be set to 0 or 1.","“使用参数管理库存”字段必须设置为 0 或 1 。" -"The ""use_config_max_sale_qty"" field must be set to 0 or 1.","“使用设置最大化销售数量”字段必须设置为 0 或 1 。" -"The ""use_config_min_qty"" field must be set to 0 or 1.","“使用设置最小化销售数量”字段必须设置为 0 或 1 。" -"The ""use_config_min_sale_qty"" field must be set to 0 or 1.","“使用_最小销售数量_配置”字段必须设置为 0 或 1 。" -"The ""use_config_notify_stock_qty"" field must be set to 0 or 1.","“使用_ 通知库存数量_配置”字段必须设置为 0 或 1 。" -"The ""use_config_qty_increments"" field must be set to 0 or 1.","“使用_数量增加_配置”字段必须设置为 0 或 1 。" -"The attribute rules were saved.","属性设置已保存。" -"The role has been saved.","角色已保存。" -"The role is a special one and not for assigning it to admin users.","这是一个特殊权限，不可分配给管理员使用。" -"Total Due","总额" -"Total Paid","同付款额" -"Total Refunded","退款总量" -"Total Reviews Count","总评论数" -"Type","类型" -"URL","URL" -"Update","更新" -"Use Config Settings for Allow Gift Message","使用“允许礼品留言”配置设置。" -"Use Config Settings for Allow Gift Wrapping","使用“允许礼品包装”配置设置。" -"Use Config Settings for Backorders","使用“缺货订单”配置设置" -"Use Config Settings for Enable Qty Increments","使用“启用数量增加”配置设置" -"Use Config Settings for Manage Stock","使用“管理库存”配置设置" -"Use Config Settings for Maximum Qty Allowed in Shopping Cart","使用参数设置购物车可装载的最大数量" -"Use Config Settings for Minimum Qty Allowed in Shopping Cart","使用“允许购物车可装载的最小数量”配置设置" -"Use Config Settings for Notify for Quantity Below","使用“以下数量通知”配置设置" -"Use Config Settings for Qty Increments","使用""数量增加""配置设置" -"Use Config Settings for Qty for Item's Status to Become Out of Stock","使用“脱销货物状况数量”配置设置" -"User Type","User Type" -"User type ""%s"" no longer exists","用户类型“%s”已不存在" -"User type ""%s"" not found.","用户类型“%s”未找到。" -"Web Services","Web服务" -"Web services","Web服务" -"Write","写" -"ZIP/Postal Code","邮政编码" diff --git a/app/locale/zh_CN/Mage_Authorizenet.csv b/app/locale/zh_CN/Mage_Authorizenet.csv deleted file mode 100644 index ccebdf935..000000000 --- a/app/locale/zh_CN/Mage_Authorizenet.csv +++ /dev/null @@ -1,41 +0,0 @@ -"--Please Select--","-- 请选择 --" -"API Login ID","API 登录 ID" -"Accepted Currency","接受的汇率" -"Amount of %s approved by payment gateway. Transaction ID: ""%s"".","%s 的金额已由支付网关批准。交易 ID：""%s""。" -"Authorize.net Direct Post","Authorize.net 直接发表" -"Card Verification Number","卡片验证号码" -"Card Verification Number Visual Reference","信用卡验证号码 视觉参考" -"Close","关闭" -"Credit Card Information","信用卡信息" -"Credit Card Number","信用卡号码" -"Credit Card Type","信用卡类型" -"Credit Card Types","信用卡类型" -"Credit Card Verification","信用卡验证" -"Debug","调试" -"Email Customer","发送电子邮件给客户" -"Enabled","已启用" -"Expiration Date","过期日期" -"Gateway URL","网关 URL" -"Maximum Order Total","最大订单总数" -"Merchant MD5","商家 MD5" -"Merchant's Email","商家电子邮件" -"Minimum Order Total","最小订单总数" -"New Order Status","新订单状态" -"Order saving error: %s","订单保存错误：%s" -"Payment Action","支付操作" -"Payment authorization error.","支付授权错误。" -"Payment authorization error. Transacion id is empty.","支付授权出错。交易编号为空。" -"Payment error. Order was not found.","支付出错，订单未找到。" -"Payment error. Paid amount doesn\'t match the order amount.","支付错误。付款金额与订单金额不匹配。" -"Payment from Applicable Countries","从可接受的国家支付" -"Payment from Specific Countries","从指定的国家支付" -"Please, choose payment method","请选择支付方式" -"Response hash validation failed. Transaction declined.","响应哈希验证失败。交易被拒绝。" -"Sort Order","排序顺序" -"Test Mode","测试模式" -"The order has been created.","订单已创建。" -"There was an error processing your order. Please contact us or try again later.","处理您的订单时遇到了错误。请联系我们，或稍后再试。" -"Title","标题" -"Transaction Key","交易密钥" -"What is this?","这是什么？" -"You will be required to enter your payment details before you place an order.","您将需要输入您的支付详情，随后才能下单。" diff --git a/app/locale/zh_CN/Mage_Backup.csv b/app/locale/zh_CN/Mage_Backup.csv deleted file mode 100644 index 3011a02f2..000000000 --- a/app/locale/zh_CN/Mage_Backup.csv +++ /dev/null @@ -1,55 +0,0 @@ -"Action","操作" -"An error occurred while creating the backup.","创建备份时发生错误。" -"An error occurred while writing to the backup file ""%s"".","写入备份文件 ""%s"" 时遇到了一个错误。" -"Are you sure you want to delete the selected backup(s)?","你是否确定要删除所选备份？" -"Backup Type","备份类型" -"Backup file ""%s"" cannot be read from or written to.","备份文件 ""%s"" 不能读取或写入。" -"Backup file ""%s"" does not exist.","备份文件 ""%s"" 不存在。" -"Backup file does not exist.","备份文件不存在。" -"Backup file handler was unspecified.","未指定备份文件的处理程序。" -"Backup file not found","备份文件未找到" -"Backup file path was not specified.","备份文件路径未指定。" -"Backups","备份" -"Cannot read backup file.","无法读取备份文件。" -"Create Backup","创建备份" -"Database","数据库" -"Database Backup","数据库备份" -"Database and Media","数据库和媒体" -"Database and Media Backup","数据库与媒体备份" -"Database was successfuly backed up.","数据库已成功备份。" -"Download","下载" -"Enable Scheduled Backup","启用计划备份" -"Failed to connect to FTP","连接到 FTP 失败" -"Failed to delete one or several backups.","删除一个或多个备份失败。" -"Failed to rollback","回滚失败" -"Failed to validate FTP","验证 FTP 失败" -"Frequency","频率" -"Invalid Password.","无效密码。" -"Maintenance Mode","维护模式" -"Name","姓名" -"Not enough free space to create backup.","没有创建备份所需的足够空间。" -"Not enough permissions to create backup.","没有创建备份所需的权限。" -"Not enough permissions to perform rollback","没有执行回滚所需的权限" -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup.""","请取消选择“将商店设置为维护模式”复选框或更新您的权限以进行备份操作。”" -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback.""","请取消选择“将商店设置为维护模式”复选框或更新您的权限以进行回滚操作。”" -"Put store on the maintenance mode while backup's creation","在创建备份时将店铺置于维护模式" -"Rollback","回滚" -"Scheduled Backup Settings","计划备份设置" -"Size, Bytes","大小，字节" -"Start Time","开始时间" -"System","系统" -"System (excluding Media)","系统（不包含媒体）" -"System Backup","系统备份" -"System couldn't put store on the maintenance mode","系统没有将店铺置于维护模式" -"The database and media backup has been created.","数据库与媒体备份已创建。" -"The database backup has been created.","数据库备份已创建。" -"The file was compressed with Zlib, but this extension is not installed on server.","该文件已使用Zlib压缩，但服务器上没有安装该扩展。" -"The selected backup(s) has been deleted.","所选备份已删除。" -"The system (excluding Media) backup has been created.","该系统（不包含媒体）备份已创建。" -"The system backup has been created.","系统备份已创建。" -"Time","时间" -"Type","类型" -"Unable to create backup. Please, try again later.","无法创建备份。请稍候重试。" -"Unable to save the cron expression.","无法保存Cron表达式。" -"Wrong order of creation for new backup.","创建新备份的顺序有误。" -"You do not have sufficient permissions to enable Maintenance Mode during this operation.","在此操作过程中您没有足够的权限来启用“维护模式”。" diff --git a/app/locale/zh_CN/Mage_Bundle.csv b/app/locale/zh_CN/Mage_Bundle.csv deleted file mode 100644 index 3d53ca832..000000000 --- a/app/locale/zh_CN/Mage_Bundle.csv +++ /dev/null @@ -1,71 +0,0 @@ -"%1$s incl tax.","%1$s incl tax." -"* Required Fields","*必要字段" -"-- Select --","-- 选择 --" -"Add New Option","添加新选项" -"Add Selection","添加选择" -"As Low as","低至" -"As low as","低至" -"Bundle Items","捆绑项" -"Bundle Product","捆绑产品" -"Bundle Product View Summary","全部装产品总结" -"Buy %1$s","Buy %1$s" -"Buy %1$s for","Buy %1$s for" -"Buy %1$s for %2$s","Buy %1$s for %2$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","Buy %1$s for %2$s (%3$s incl. tax) each" -"Buy %1$s for %2$s each","Buy %1$s for %2$s each" -"Buy %1$s with %2$s discount each","买 %1$个，每个折扣为 %2$s" -"Catalog Product View (Bundle)","分类产品视图（捆绑）" -"Checkbox","复选框" -"Choose a selection...","选择一个选项..." -"Click for price","Click for price" -"Close","关闭" -"Default","默认" -"Default Qty","默认数量" -"Default Title","默认标题" -"Drop-down","下拉菜单" -"Dynamic","动态" -"Excl. Tax","不含税" -"Excl. Tax:","Excl. Tax:" -"Fixed","固定" -"From","来自" -"From:","来自：" -"Gift Message","礼品消息" -"Incl. Tax","含税" -"Incl. Tax:","Incl. Tax:" -"Input Type","输入类型" -"Is Required","为必须" -"Message:","信息：" -"Multiple Select","多选" -"N/A","N/A" -"No options of this product are available.","该产品没有可用选项。" -"None","无" -"Percent","百分之" -"Percent Discount","折扣百分率" -"Please Select Products to Add","请选择要添加的产品" -"Please enter a number greater 0 in this field.","请在此字段中输入大于 0 的数字。" -"Please enter search conditions to view products.","请输入搜索条件以查看产品。" -"Please select options for product.","请为该产品选择选项。" -"Please specify product option(s).","请指定产品选项。" -"Position","位置" -"Price Range","价格范围" -"Price Type","价格类型" -"Price as configured","预配置价格" -"Qty:","数量：" -"Radio Buttons","单选按钮" -"Required options are not selected.","必要的选项未选择。" -"Selected required options are not available.","所选必要选项不可用。" -"Separately","分别" -"Ship Bundle Items","运送捆绑的项目" -"Shipment","发货" -"Store View Title","店铺视图标题" -"There is no defined renderer for ""%s"" option type.","针对 ""%s"" 选项类型没有预定义的渲染器。" -"This product is also part of bundle(s)","该产品也属于捆绑销售的一部分" -"To","发送至" -"To:","至：" -"Together","一起" -"Total incl. Tax: %1$s","Total incl. Tax: %1$s" -"Use Default Value","使用默认值" -"User Defined Qty","用户定义的数量" -"and","and" -"each","each" -"save","save" diff --git a/app/locale/zh_CN/Mage_Captcha.csv b/app/locale/zh_CN/Mage_Captcha.csv deleted file mode 100644 index dcac23cfd..000000000 --- a/app/locale/zh_CN/Mage_Captcha.csv +++ /dev/null @@ -1,22 +0,0 @@ -"Attention: Captcha is case sensitive.","注意：验证码为大小写敏感的。" -"After number of attempts to login","登录失败的次数" -"Always","总是" -"CAPTCHA","验证码" -"CAPTCHA Timeout (minutes)","验证码超时（分钟）" -"CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen","如果选中，“创建用户”和“忘记密码”表单将总是启用验证码" -"Case Sensitive","大小写敏感" -"Displaying Mode","显示模式" -"Enable CAPTCHA in Admin","在管理界面中启用验证码" -"Enable CAPTCHA on Frontend","在前端启用验证码" -"Font","字体" -"Forms","表单" -"If 0 is specified, CAPTCHA on the Login form will be always available.","如果设置为0，登录表单上的验证码将总是显示。" -"Incorrect CAPTCHA.","验证码有误。" -"Number of Symbols","符号数量" -"Number of Unsuccessful Attempts to Login","不成功的登录企图数量" -"Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","请最多指定8个符号。可用范围指定（例如3-5）" -"Please type the letters below","请输入下列字母" -"Please type the letters from the image:","请输入图像中的字母：" -"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.
    Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","该字段中请只使用字母 (a-z 或 A-Z) 或数字 (0-9)。不能使用空格或其他字符。
    看起来类似的字符 (例如 ""i"", ""l"", ""1"")会降低顾客准确辨识的成功率。" -"Reload captcha","刷新验证码" -"Symbols Used in CAPTCHA","验证码中使用的符号" diff --git a/app/locale/zh_CN/Mage_Catalog.csv b/app/locale/zh_CN/Mage_Catalog.csv deleted file mode 100644 index c8f07e6f5..000000000 --- a/app/locale/zh_CN/Mage_Catalog.csv +++ /dev/null @@ -1,848 +0,0 @@ -"# of Use","# 使用" -"%1$s incl tax.","%1$s 含税。" -"%s - %s","%s - %s" -"%s Item(s)","%s 个项目" -"%s and above","%s 及以上" -"%s-%s of %s","%s-%s / %s" -"(%d)","(%d)" -"(Copy data from: %s)","（复制数据自：%s）" -"* Required Fields","*必要字段" -"-- Please Select --","-- 请选择 --" -"86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.","如果没有设置，则默认值为 86400。要立即刷新，请清空块状 HTML 输出缓存。" -"Warning! Applying MAP by default will hide all product prices on the frontend.","警告！ 默认应用 MAP 将在前端隐藏所有产品的价格。" -"A group with the same name already exists.","以同样名称命名的群组已存在。" -"A name is required","需要设置名称" -"A product type is not defined for the indexer.","索引器中产品类型未定义。" -"ALL GROUPS","所有群组" -"AM","AM" -"Action","操作" -"Actual Price","实际价格" -"Add","添加" -"Add Attribute","添加属性" -"Add Design Change","添加设计变更" -"Add Group","添加群组" -"Add Group Price","添加组价格" -"Add New","添加新内容" -"Add New Attribute","添加新属性" -"Add New Attribute Set","添加新属性集" -"Add New Group","添加新群组" -"Add New Images","添加新图像" -"Add New Option","添加新选项" -"Add New Row","添加新行" -"Add New Search Term","添加新的搜索条件" -"Add New Set","添加新集" -"Add Product","添加产品" -"Add Product To Websites","添加产品到网站" -"Add Root Category","添加根分类" -"Add Subcategory","添加子分类" -"Add Tax","添加税金" -"Add Tier","添加层" -"Add attribute into attribute set","将属性加入属性集" -"Add group into attribute set","将组加入属性集" -"Add new custom option into product","添加新自定义选项到产品" -"Add new values into custom option","添加新值到自定义选项" -"Add option","添加选项" -"Add to Cart","添加到购物车" -"Add to Compare","添加并比较" -"Add to Wishlist","添加到收藏" -"Additional Information","额外信息" -"Alert Urls","警报URL" -"All","全部" -"All Product Types","所有产品类型" -"All Websites","所有网站" -"All products","全部产品" -"All products - recently added products, New products - products marked as new","全部产品 - 最近新增的产品，新产品 - 标记为全新的产品" -"All products of this set will be deleted! Are you sure you want to delete this attribute set?","该集合的所有产品都将被删除！您是否确认要删除该属性集？" -"Allow All Products per Page","每页面允许显示的所有产品" -"Allow Dynamic Media URLs in Products and Categories","在产品和分类中允许使用动态媒体URL" -"Allow HTML Tags on Frontend","允许在前端使用HTML标签" -"Allowed File Extensions","允许的文件扩展" -"Allowed file extensions to upload","允许上传的文件扩展" -"Amount","数量" -"An error occurred while adding products to websites.","添加产品到网站时发生错误。" -"An error occurred while clearing comparison list.","清除对照表时发生错误。" -"An error occurred while deleting this review.","删除该评论时出错。" -"An error occurred while removing products from websites.","从网站移除产品时发生错误。" -"An error occurred while saving the URL rewrite","保存重写的URL时发生错误。" -"An error occurred while saving the attribute set.","保存属性集时发生错误。" -"An error occurred while saving the collection, aborting. Error message: %s","保存集合时出错，正在忽略。错误信息：%s" -"An error occurred while saving the product. ","保存产品时发生错误。" -"An error occurred while saving the search query.","保存搜索查询时发生错误。" -"An error occurred while saving this group.","保存这个分组时发生错误。" -"An error occurred while saving this review.","保存该评论时出错。" -"An error occurred while trying to delete the category.","删除该类别时发生错误。" -"An error occurred while updating the product(s) attributes.","更新产品属性时发生错误。" -"An error occurred while updating the product(s) status.","更新产品状态时发生错误。" -"An invalid group ID is specified, skipping the record.","指定的组ID无效，跳过记录。" -"An invalid option ID is specified for %s (%s), skipping the record.","%s (%s)为无效的选项ID，跳过此记录。" -"An invalid store was specified.","指定了一个无效的存储。" -"Anchor Custom Text","自定义文本锚点" -"Anchor Custom Title","自定义标题锚点" -"Applicable to catalog products and categories only. Any media content will be inserted into editor as a static URL. It is not updated if the system configuration base URL changes.","只适用于产品目录和类别。任何媒体内容将被插入到一个静态的URL编辑器。如果系统配置基础的URL更改了，它也不会随之更新。" -"Apply MAP (Default Value)","MAP应用（预设值）" -"Apply To","应用给" -"Approved","已批准" -"Are you sure you want to delete this category?","你确定要删除此类别？" -"Are you sure you would like to remove all products from your comparison?","你确定要是删除所有对比的产品？" -"Are you sure you would like to remove this item from the compare products?","你确定要从对比产品中删除这个项目？" -"Are you sure?","您是否确认？" -"As low as:","低至：" -"Assign","、分配" -"Assign product link","分配的产品链接" -"Assign product to category","分配产品到分类" -"Assigned Products","分配的产品" -"Associated Products","相关的产品" -"Attrib. Set Name","属性。 设置名称" -"Attribute ""%s"" is invalid.","属性 “%s” 无效。" -"Attribute ""%s"" is required.","属性 ""%s"" 是必须的。" -"Attribute Information","属性信息" -"Attribute Model","属性模型" -"Attribute Name:","属性名：" -"Attribute Set","属性集" -"Attribute Sets","属性集" -"Attribute add","添加的属性" -"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","属性代码无效。在该字段中请只使用字母（a-z）、数字（0-9），或下划线（_），第一个字符必须是字母。" -"Attribute group with the \"/name/\" name already exists","Attribute group with the \"/name/\" name already exists" -"Attribute group with the \/name/\ name already exists","使用该\/name/\ 名称的属性组已经存在。" -"Attribute remove","删除属性" -"Attribute with the same code already exists","使用相同代码的属性已存在" -"Attributes","属性" -"Attrribute names can be specified per store.","属性名可是每店铺专用的。" -"Autogenerate","自动生成" -"Availability:","可用性：" -"Back","返回" -"Backend Model","后端模式" -"Backend Table","后端表格" -"Backend Table Title","后端表格标题" -"Backorders","缺货" -"Based On","基于" -"Before Order Confirmation","在订单确认之前" -"Best Value","最佳值" -"Block after Info Column","信息栏之后阻止" -"Bottom Block Options Wrapper","底部阻止选项包装" -"Bottom/Left","底部/左侧" -"Bottom/Right","底部/右侧" -"Browse By","浏览者：" -"Bundle Items","捆绑项" -"Buy %1$s","购买 %1$s" -"Buy %1$s for","购买 %1$s：" -"Buy %1$s for %2$s","为 %2$s 购买 %1$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","为每 %2$s（%3$s 含税）购买 %1$s" -"Buy %1$s for %2$s each","为每 %2$s 购买 %1$s" -"Cache Lifetime (Seconds)","缓存生存时间（秒）" -"Cache refresh needed.","需要刷新缓存。" -"Can be Divided into Multiple Boxes for Shipping","可拆分为多个箱发货" -"Can be used only with catalog input type Dropdown","仅可用于类别输入类型 下拉" -"Can be used only with catalog input type Dropdown, Multiple Select and Price","仅可用于类别输入类型　下拉、多选和价格" -"Can\'t create image.","无法创建图片。" -"Cancel","取消" -"Cannot create image.","无法创建图片。" -"Cannot create writeable directory '%s'.","无法创建可写的目录 '%s'。" -"Cart Item Attribute","购物车项目属性" -"Catalog","分类" -"Catalog Category (Anchor)","分类类别（固定）" -"Catalog Category (Non-Anchor)","分类类别（不固定）" -"Catalog Category (Without Subcategories)","目录类别（无子类）" -"Catalog Category Link","分类类别链接" -"Catalog New Products List","分类新产品列表" -"Catalog Price Scope","分类价格范围" -"Catalog Product Compare List","分类产品比较列表" -"Catalog Product Email to a Friend","将分类产品用邮件发送给朋友" -"Catalog Product Image Gallery Popup","分类产品图像库弹出窗口" -"Catalog Product Link","分类产品链接" -"Catalog Product View (Any)","分类产品视图（任意）" -"Catalog Product View (Configurable)","分类产品视图（可配置）" -"Catalog Product View (Grouped)","分类产品视图（分组）" -"Catalog Product View (Simple)","分类产品视图（简单）" -"Catalog Product View (Virtual)","分类产品视图（虚拟）" -"Catalog Section","分类选择" -"Catalog Seo Sitemap (Category List)","分类SEO站点结构图（分类列表）" -"Catalog Seo Sitemap (Category Tree)","分类SEO站点结构图（分类树）" -"Catalog Seo Sitemap (Common)","分类SEO站点结构图（常用）" -"Catalog Seo Sitemap (Product List)","分类SEO站点结构图（产品列表）" -"Catalog URL Rewrites","分类URL重写" -"Catalog product custom option values API","编录产品自定义选项值 API" -"Catalog product custom options API","编录产品自定义选项 API" -"Catalog, Search","分类，搜索" -"Categories","分类" -"Categories Sitemap","分类站点结构图" -"Category","分类" -"Category API","分类API" -"Category Data","分类数据" -"Category Flat Data","分类平坦数据" -"Category Link Block Template","分类链接块模板" -"Category Link Inline Template","分类链接内联摸板" -"Category Products","分类产品" -"Category Top Navigation","分类顶部导航" -"Category URL Suffix","分类 URL 后缀" -"Category attributes API","分类属性 API" -"Category move error","分类移动错误" -"Category move error %s","分类移动错误 %s" -"Category move operation is not possible: parent category is equal to child category.","无法进行分类移动操作：母类别与子类别相同。" -"Category move operation is not possible: the current category was not found.","无法进行分类移动操作：无法找到当前类别。" -"Category move operation is not possible: the new parent category was not found.","无法进行分类移动操作：无法找到新的母类别。" -"Category must be an instance of Mage_Catalog_Model_Category.","分类必须为 Mage_Catalog_Model_Category 的一个实例。" -"Center","中心" -"Change","更改" -"Change or Retrieve attribute store view","更改或取回属性商店视图" -"Change status","更改状态" -"Check items to add to the cart or","检查要加入购物车的内容" -"Choose an Option...","选择选项..." -"Clear All","清除全部" -"Clear Price","清除价格" -"Click for price","单击获取价格" -"Close Window","关闭窗口" -"Collapse All","折叠全部" -"Comma-separated.","逗号分隔。" -"Comparable","可比较" -"Comparable on Front-end","前端可比较" -"Comparable on the Frontend","前端可比较" -"Compare","比较" -"Compare Products","比较产品" -"Conditions Combination","条件组合" -"Configurable Product","可配置的产品" -"Configurable Product Settings","可配置的产品设置" -"Configure Product","配置产品" -"Continue","继续" -"Copy From Configurable","从配置中复制" -"Country/State","国家/州" -"Create","创建" -"Create (Upload)","创建（上传）" -"Create Empty","创建空的" -"Create Permanent Redirect for URLs if URL Key Changed","如果 URL 键有变动，为该 URL 创建永久重定向" -"Create Permanent Redirect for old URL","为老URL创建永久重定向" -"Create Product Settings","创建产品设置" -"Create Simple Associated Product","创建简单的关联产品" -"Create attribute set based on another set","根据另一个集创建属性集" -"Create new attribute","创建新属性" -"Create new category","创建新分类" -"Create new product","创建新产品" -"Cross-sells","交叉销售" -"Currently Shopping by:","目前的购物者：" -"Custom Design","自定义设计" -"Custom Options","自定义选项" -"Custom options","自定义选项" -"Customer Group","客户组" -"Customers Reviews","客户评测" -"Customers Tagged Product","客户标记的产品" -"Data Type for Saving in Database","要保存在数据库中的数据类型" -"Date & Time Custom Options","日期和时间自定义选项" -"Date Fields Order","日期字段顺序" -"Date Subscribed","订阅日期" -"Datetime","日期时间" -"Decimal","十进制" -"Declare attribute value saving scope","声明属性值保存范围" -"Default ""What's This"" Text Message","默认“这是什么” 文字信息" -"Default Popup Text Message","默认弹出窗口文字信息" -"Default Price","默认价格" -"Default Price Navigation Step","默认价格导航步骤" -"Default Qty","默认数量" -"Default Values","默认值" -"Defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","定义基准币种范围 (""币种设置"" > ""币种选项"" > ""基准币种"")。" -"Delete","删除" -"Delete Attribute","删除属性" -"Delete Attribute Set","删除属性集" -"Delete Category","删除分类" -"Delete Group Price","删除组价格" -"Delete Option","删除选项" -"Delete Row","删除行" -"Delete Search","删除搜索" -"Delete Selected Group","删除所选组" -"Delete Tier","删除层" -"Delete attribute","删除属性" -"Delete category","删除分类" -"Delete product","删除产品" -"Depends on design theme","取决于设计主题" -"Design","设计" -"Details","详情" -"Disabled","已禁用" -"Disallowed file type.","不允许的文件类型。" -"Display Actual Price","显示实际价格" -"Display Page Control","显示页面控制" -"Display Price Interval as One Price","将价格间隔显示为一个价格" -"Display Product Count","显示产品数量" -"Display Type","显示类型" -"Display in Suggested Terms","显示建议的搜索条件" -"Double click on a group to rename it","双击组即可更名" -"Double click on above image to view full picture","双击上述图片即可查看完整大小" -"Downloadable Information","可下载的信息" -"Duplicate","副本" -"Duplicate amount found.","找到的副本数量" -"Duplicate website group price customer group.","重复网站 团体价 客户群。" -"Duplicate website tier price customer group and quantity.","副本网站层价格客户分组和数量。" -"Duplicate website, country and state tax found.","找到副本网站、国家，以及州税率。" -"E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","例如， {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}。动态指令解析将影响到分类的性能。" -"Edit","编辑" -"Edit Attribute Set '%s'","编辑属性集 '%s'" -"Edit Product Attribute","编辑产品属性" -"Edit Product Attribute ""%s""","编辑产品属性 ""%s""" -"Edit Search","编辑搜索" -"Edit Search '%s'","编辑搜索 '%s'" -"Edit Set Name","编辑集名称" -"Email","电子邮件" -"Email to a Friend","给朋友发邮件" -"Empty","空" -"Enable MAP","启用映射" -"Enable Qty Increments","启用数量增量" -"Enable WYSIWYG","启用所见即所得" -"Enable for reindexing a big number of SKUs.","启用以重新索引大量 SKU。" -"Enabled","已启用" -"Error during retrieval of option value: %s","获取选项值 %s的过程中出错" -"Exclude","排除" -"Expand All","全部展开" -"Failed","已失败" -"Failed to copy file %s. Please, delete media with non-existing images and try again.","文件 %s 复制失败。请删除与不存在图像有关的媒体，然后重试。" -"Failed to move file: %s","移动文件 %s 失败" -"Feature Products","主要产品" -"Field is not complete","字段不完整" -"File options format is not valid.","文件选项格式无效" -"File upload failed","文件上传失败" -"Filter","过滤器" -"Filter model name must be declared.","筛选器模式名称必须声明。" -"Filter must be an object. Please set correct filter.","筛选器必须是对象。请设置正确的筛选器。" -"Filterable (no results)","可筛选（无结果）" -"Filterable (with results)","可筛选（有结果）" -"First Name","名字" -"Fixed","固定" -"For internal use.","限内部使用。" -"For the last time placed.","上次的置入" -"Frontend","前端" -"Frontend Model","前端模式" -"Frontend Properties","前端属性" -"Gallery","画廊" -"General Information","常规信息" -"Get full information about attribute with list of options","通过选项列表, 获取有关属性的完整信息" -"Get full information about custom option in product","获取产品中自定义选项的完整信息" -"Get list of available custom option types","获取可用自定义选项类型列表" -"Get list of non-default attributes by product type and attributes set","按产品类型和属性设置获取非默认属性列表" -"Get list of possible attribute types","获取可能的属性类型列表" -"Get special price","获取特惠价格" -"Global","全球" -"Globally Editable","全球范围内可编辑" -"Go to Home Page","前往主页" -"Grid","网格" -"Group add","组添加" -"Group remove","组删除" -"Grouped Product","分组产品" -"Groups","群组" -"Home","主页" -"ID","ID" -"ID: %s","ID：%s" -"If empty, the Category Name will be used","如果为空，则使用分类名称" -"If empty, the Product Name will be used","如果为空，则使用产品名称" -"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","如果您不为特定商店视图指定一个选项值，则使用默认 (Admin) 值。" -"Image","图案" -"Image content is not valid base64 data.","影像内容不是有效的 base64 数据。" -"Image does not exist.","图片不存在。" -"Image file was not found.","无法找到图片文件。" -"Image type and information need to be specified for each store view.","需要为每个商店视图指定图片类型和信息。" -"In Cart","购物车" -"In Stock","有货" -"In stock","现货" -"Incl. Tax","含税" -"Index product and categories URL rewrites","索引产品和类别 URL 重写" -"Index product attributes for layered navigation building","为分层导航建筑索引产品属性" -"Index product prices","索引产品价格" -"Indexed category/products association","已索引的分类/产品关联" -"Info","信息" -"Info Column Options Wrapper","信息栏选项包装" -"Input Type","输入类型" -"Integer","整数" -"Interval Division Limit","区间划分限制" -"Invalid Tier Prices","无效的层价格" -"Invalid attribute %s","无效的属性 %s" -"Invalid attribute option specified for attribute %s (%s), skipping the record.","为属性 %s (%s) 指定的属性选项无效，正在跳过该记录。" -"Invalid attribute set specified, skipping the record.","指定的属性集无效，正在跳过该记录。" -"Invalid block: %s.","无效的块： %s。" -"Invalid category IDs.","无效分类ID。" -"Invalid category.","无效的分类。" -"Invalid image file type.","无效的图像文件类型。" -"Invalid image type.","无效的图像类型。" -"Invalid option ID specified for %s (%s), skipping the record.","为 %s (%s) 指定的选项ID无效，正在跳过该记录。" -"Invalid product type specified, skipping the record.","指定的产品类型无效，正在跳过该记录。" -"Invalid store specified","指定的店铺无效" -"Invalid store specified, skipping the record.","指定的店铺无效，正在跳过该记录。" -"Invalid tier prices. The product is not associated to the requested website.","无效层价格。该产品与所请求的网站无关联。" -"Inventory","盘点" -"Is Default","为默认值" -"Is Required","为必须" -"Items %s to %s of %s total","项目 %s 到 %s 共 %s个" -"Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.","您不希望显示在分类或搜索结果中的内容应在目标店铺中设置'Disabled'状态。" -"Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.","您不希望在分类或搜索结果中显示的内容应在目标店铺中设置'Disabled'状态。" -"Keep your eyes open for our special Back to School items and save A LOT!","睁大眼睛找到特殊的“返校” 项目，获得大实惠！" -"Label","标签" -"Last Name","姓氏" -"Last Notification","最新通知" -"Layered Navigation","分层导航" -"Learn More","了解更多" -"Line %d, Email: %s","第%行，邮箱：%" -"Line %d, SKU: %s","行 %s， SKU：%s" -"Link (Related, Up sell, Cross sell)","链接（相关，超售，交叉销售）" -"Link product does not exist.","链接的产品不存在。" -"Link to a Specified Category","链接到指定的分类" -"Link to a Specified Product","链接到指定产品" -"List","列表" -"List Mode","列表模式" -"List of Products that are set as New","名单被定为新产品" -"List of types","类型列表" -"Manage Attribute Sets","管理属性集" -"Manage Attributes","管理属性" -"Manage Catalog Categories","管理分类类别" -"Manage Categories","管理分类" -"Manage Label / Options","管理标签/选项" -"Manage Options (values of your attribute)","Manage Options (values of your attribute)" -"Manage Product Attributes","管理产品属性" -"Manage Product Sets","管理产品设置" -"Manage Products","管理产品" -"Manage Stock","库存管理" -"Manage Titles (Size, Color, etc.)","管理名称（尺寸，颜色等）" -"Max Characters","字符数上限" -"Maximal Depth","最大深度" -"Maximum Image Size","最大图像大小" -"Maximum Number of Price Intervals","价格间隔最大数量" -"Maximum Qty Allowed in Shopping Cart","购物车数量上限" -"Maximum allowed image size for '%s' is %sx%s px.","'%s' 允许的最大图像尺寸为%sx%s 像素。" -"Maximum image height","图片最大高度" -"Maximum image width","图片最大宽度" -"Maximum number of characters:","最大字符数：" -"Maximum number of price intervals is 100","价格间隔的最大数量为100" -"Media Image","媒体图片" -"Minimum Advertised Price","最低广告价格" -"Minimum Lines per Page","每页最低行数" -"Minimum Qty Allowed in Shopping Cart","购物车里允许的最少数量" -"Minimum Qty for Item\'s Status to be Out of Stock","商品状态的最小数量为缺货" -"Missing SKU, skipping the record.","丢失SKU，正在跳过该记录。" -"More Views","更多视图" -"Move","移动" -"Move category in tree","在树中移动分类" -"Multi update product","多次更新产品" -"Must be in the allowed values list.","必须位于允许的值列表中。" -"My Account","我的帐户" -"N/A","N/A" -"Name","姓名" -"Name in %s","%s的名称" -"New Product","新产品" -"New Product Attribute","新产品属性" -"New Products","新产品" -"New Products Grid Template","新产品网格模板" -"New Products List Template","新产品列表模板" -"New Root Category","新建根类别" -"New Search","新搜索" -"New Set Name","新集名称" -"New Subcategory","新建子类别" -"New products","新产品" -"Next","下一个" -"No","否" -"No image","无图片" -"No layout updates","无布局更新" -"No options of this product are available.","该产品没有可用选项。" -"No product collections found.","未找到产品集合。" -"None","无" -"Not Visible Individually","无独立可见性" -"Notify Low Stock RSS","存货不足RSS通知" -"Notify for Quantity Below","存量过低通知" -"Number of Products per Page","每页显示的产品数量" -"Number of Products to Display","显示的产品数量" -"Number of Uses","用户数" -"Number of results","结果的数量" -"Number of results (For the last time placed)","结果的数量（上次的置入）" -"OK","确定" -"OR","或" -"Old Price:","原价：" -"On Gesture","手势" -"Option validation failed to add product to cart.","添加产品到购物车时选项验证失败。" -"Option values","选项值" -"Option:","选项：" -"Options","选项" -"Options Control","选项控制" -"Options is required","选项是必须的" -"Our customer service is available 24/7. Call us at (555) 555-0123.","我们提供全天候客户服务。请致电我们 (555) 555-0123。" -"Out of Stock","无货" -"Out of stock","缺货" -"PM","PM" -"Page Title Separator","页面标题分隔器" -"Parent Category","父分类" -"Pending","挂起" -"Pending Reviews RSS","挂起评测RSS" -"Percentage","百分率" -"Please add rows to option.","请添加选项行。" -"Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","请小心，一旦您点击这一行，就会从所选文件中加载包裹数据，所有未保存的数据都将丢失。" -"Please click on the Close Window button if it is not closed automatically.","如果没有自动关闭，请点击关闭窗口按钮。" -"Please enter a new group name","请输入新组的名称" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management" -"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management","请在 系统 -> 索引管理中刷新 ""类别 URL 重写"" 与 ""产品属性""" -"Please refresh ""Product Attributes"" in System -> Index Management","Please refresh ""Product Attributes"" in System -> Index Management" -"Please select a static block ...","请选择一个静态块..." -"Please select items.","请选择项目。" -"Please select one or more attributes.","请选择一个或多个属性。" -"Please select product(s).","请选择产品。" -"Please select products for attributes update","请选择要更新属性的产品" -"Please set up merge date/time","请设置合并日期/时间" -"Please set up merge date/time later then present date","请设置比当前时间晚的合并日期/时间" -"Please specify date required option(s).","请指定日期需要的选项。" -"Please specify the number of products, that will not be divided into subintervals.","请注明不会被划分成子区间的产品的数量。" -"Please specify the product required option(s)","请指定产品需要的选项" -"Please specify the product required option(s).","请指定产品需要的选项。" -"Please specify the product\'s option(s).","请指定产品的选项。" -"Please specify the product\'s required option(s).","请指定产品的必要选项。" -"Please specify the quantity of product(s).","请指定产品数量。" -"Please specify time required option(s).","请指定时间需要的选项。" -"Please wait...","请稍候..." -"Position","位置" -"Position in Layered Navigation","在层次式导航中定位" -"Position of attribute in layered navigation block","分层导航区块的属性位置" -"Prev","上一个" -"Previous","上一个" -"Price","价格" -"Price Navigation Step Calculation","价格导航步骤计算" -"Price Type","价格类型" -"Price is not available","价格不可用" -"Price values for options should be specified in system base currency.","价格数值选项应当在系统基础汇率中指定。" -"Price:","价格：" -"Price: %s","价格：%s" -"Print This Page","打印本页面" -"Product","产品" -"Product API","产品 API" -"Product Alerts","产品警报" -"Product Attribute","产品属性" -"Product Attributes","产品属性" -"Product Categories","产品分类" -"Product Description","产品介绍" -"Product Extra Info","产品的额外信息" -"Product Flat Data","产品平坦数据" -"Product ID","产品 ID" -"Product Image Placeholders","产品图像占位符" -"Product Image Watermarks","产品图像水印" -"Product Images","产品图像" -"Product Images API","产品图片 API" -"Product In Websites","网站中的产品" -"Product Info Column","产品信息栏" -"Product Information","产品信息" -"Product Link Block Template","产品链接区块模板" -"Product Link Inline Template","产品链接内联模板" -"Product Listing Sort by","产品列表排列顺序" -"Product Name","产品名" -"Product Prices","产品价格" -"Product Reviews","产品评测" -"Product Tags","产品标签" -"Product Tier Price API","产品层级价格 API" -"Product Type","产品类型" -"Product URL Suffix","产品URL前缀" -"Product View Extra Hint","产品视图额外提示" -"Product attribute sets API","产品属性集API" -"Product attributes API","产品属性 API" -"Product collection expected.","预期的产品集合。" -"Product is not loaded","产品尚未加载" -"Product links API (related, cross sells, up sells)","产品链接API（相关、交叉销售、超售）" -"Product types API","产品类型API" -"Product with this combination of attributes already associated to configurable.","具有此属性组合的产品已与可配置产品关联。" -"Products","产品" -"Products Comparison List","产品比较列表" -"Products Information","产品信息" -"Products Reviews","产品评论" -"Products Sitemap","产品网站地图" -"Products only","仅产品" -"Products per Page on Grid Allowed Values","网格允许的数值中的每页产品数量" -"Products per Page on Grid Default Value","网格默认值每页产品" -"Products per Page on List Allowed Values","列表允许值每页产品" -"Products per Page on List Default Value","列表默认数值中的每页产品数量" -"Properties","属性" -"Qty","数量" -"Qty Increments","数量增量" -"Qty Uses Decimals","数量使用小数" -"Qty for Item\'s Status to Become Out of Stock","项目的状态变为无货时的数量" -"Qty:","数量：" -"Quantity","数量" -"Quick Create","快速创建" -"Quick Overview","快速概述" -"Quick simple product creation","快速简单产品创建" -"Records for ""%s"" store found.","未找到“%s”商店的记录。" -"Redirect","重定向" -"Redirect URL","重定向URL" -"Regular Price:","常规价格：" -"Related Products","相关产品" -"Remove","删除" -"Remove Product From Websites","从网站删除产品" -"Remove This Item","删除该内容" -"Remove attribute from attribute set","从属性集移除属性" -"Remove attribute set","移除属性集" -"Remove custom option","删除自定义选项" -"Remove group from attribute set","从属性集中删除组" -"Remove option","删除选项" -"Remove product assignment","删除产品的分配" -"Remove product image","删除产品图片" -"Remove product link","删除产品链接" -"Remove value from custom option","从自定义选项中删除值" -"Rename existing group","现有组改名" -"Rename group","组改名" -"Reorganize EAV category structure to flat structure","重新识别EAV分类结构为平坦结构" -"Reorganize EAV product structure to flat structure","重新整理EAV产品结构为平坦结构" -"Reset","重置状态" -"Results","结果" -"Results per page","每页结果数量" -"Retrieve attribute data","获取属性数据" -"Retrieve attribute list","获取属性列表" -"Retrieve attribute options","获取属性选项" -"Retrieve categories tree","获取分类树" -"Retrieve category attributes","获取分类属性" -"Retrieve category data","获取分类数据" -"Retrieve hierarchical tree","获取层次结构树" -"Retrieve linked products","获取链接的产品" -"Retrieve list of assigned products","获取已分配产品列表" -"Retrieve list of option values","获取选项值列表" -"Retrieve list of product custom options","获取产品自定义选项列表" -"Retrieve one level of categories by website/store view/parent category","获取网站/店铺视图/父分类的 一级分类" -"Retrieve option value info","获取选项值信息" -"Retrieve product","获取产品" -"Retrieve product attribute sets","获取产品属性集" -"Retrieve product image","获取产品图片" -"Retrieve product image list","获取产品图片列表" -"Retrieve product image types","获取产品图片类型" -"Retrieve product link type attributes","获取产品链接类型属性" -"Retrieve product link types","获取产品链接类型" -"Retrieve product tier prices","获取产品层价格" -"Retrieve product types","获取产品类型" -"Retrieve products data","获取产品数据" -"Retrieve products list by filters","按照筛选器获取产品列表" -"Reviews","评测" -"Roll Over for preview","翻转预览" -"Root","根" -"SKU","SKU" -"SKU length should be %s characters maximum.","SKU长度最多为 %s 个字符。" -"Save","保存" -"Save Attribute","保存属性" -"Save Attribute Set","保存属性集" -"Save Category","保存分类" -"Save Search","保存搜索" -"Save and Continue Edit","保存并继续编辑" -"Saved %d record(s)","已保存 %s 条记录" -"Scope","范围" -"Scope must not be changed, because the attribute is used in configurable products.","范围不能更改，因为可配置产品中使用了属性。" -"Search","搜索" -"Search Engine Optimizations","搜索引擎优化" -"Search Information","搜索信息" -"Search Query","搜索查询" -"Search Term with such search query already exists.","使用此类查询的搜索条件已存在。" -"Search Weight","搜索高度" -"Searchable","可搜索" -"See price before order confirmation.","确认订单前显示价格。" -"Select Category...","选择分类..." -"Select Configurable Attributes ","选择可配置属性" -"Select Product...","选择产品..." -"Select type of option","选择选项类型" -"Select type options required values rows.","选择需要值的选项类型。" -"Selected Product Types","选择产品类型" -"Send Count","发送数量" -"Set Ascending Direction","设置降序顺序" -"Set Descending Direction","设置升序顺序" -"Set Name","设置名称" -"Set Root Category for Store","为店铺选择根分类" -"Set root category for this store in the configuration","请在 配置中为此店铺设置根目录" -"Set special price","设置特殊价格" -"Set/Get current store view","设置/获取当前店铺视图" -"Settings","设置" -"Share Facebook","分享 Facebook" -"Share on Facebook","分享到 Facebook" -"Share on Twitter","分享到 Twitter" -"Shop By","购物" -"Shopping Options","购物选项" -"Show","显示" -"Show Details","显示详情" -"Show Tags","显示标签" -"Simple Product","简单产品" -"Site Map","站点结构图" -"Sitemap","站点结构图" -"Skip import row, is not valid value ""%s"" for field ""%s""","跳过导入行，该行不是""%s""字段的有效值""%s""" -"Skip import row, required field ""%s"" for the new customer is not defined.","立刻跳过导入，新顾客所需的 ""%s"" 字段未定义。" -"Skip import row, the value ""%s"" is invalid for field ""%s""","跳过导入行，值 ""%s"" 对于 ""%s"" 字段无效" -"Skipping import row, required field ""%s"" for new products is not defined.","正在跳过导入的行，新产品所需的字段 ""%s"" 未定义。" -"Skipping import row, required field ""%s"" is not defined.","跳过导入的行，必须的 ""%s"" 字段未定义。" -"Skipping import row, store ""%s"" field does not exist.","正在跳过导入行，存储 ""%s"" 字段不存在。" -"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","跳过导入的行， ""%s"" 字段的值 ""%s"" 无效。" -"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","某些已经处理的产品无有效SKU值。请在针对这些产品执行操作前首先填写。" -"Some of the selected item options are not currently available.","部分已选择商品的选项当前不可用。" -"Sort By","分类依据" -"Sort Order","排序顺序" -"Source Model","源型号" -"Special Expires On: %s","特殊过期于： %s" -"Special Price:","特殊价格：" -"Special Price: %s","特殊价格： %s" -"Starting at:","开始于：" -"Static","静态" -"Static block and products","静态区块和产品" -"Static block only","仅静态区块" -"Status","状态" -"Stock Availability","库存状况" -"Store","商店" -"Store View","店铺视图" -"Stretch","拉伸" -"Subscribe to RSS Feed","订阅到 RSS 源" -"Super product attributes configuration","超级产品属性配置" -"Synonym For","同义词" -"System Properties","系统属性" -"Tag Name","标签名称" -"Tax","传真" -"Template","模板" -"Text","文字" -"The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","平坦分类模块被限制为 %2\$d 个筛选器和/或可排序属性。目前已经使用了 %1\$d 个。为了使用该模块，请减少所用筛选器/排序属性的数量" -"The From Date value should be less than or equal to the To Date value.","起始日期数值应当小于或等于截止日期数值。" -"The attribute code \'%s\' is reserved by system. Please try another attribute code","属性代码‘%s’已被系统预留。请尝试另一个属性代码" -"The attribute model is not defined","属性型号未定义" -"The attribute set has been saved.","属性集已保存。" -"The base directory to upload file is not specified.","文件上传的基本目录尚未指定。" -"The category has been deleted.","分类已保存。" -"The category has been saved.","类别已保存。" -"The comparison list was cleared.","比较列表被清空。" -"The file '%s' for '%s' has an invalid extension","'%s' 的文件 '%s' 扩展有误" -"The file '%s' you uploaded is larger than %s Megabytes allowed by server","您上传的文件 '％s' 大于服务器允许的 ％s 兆" -"The file you uploaded is larger than %s Megabytes allowed by server","您上传的文件大于服务器所允许的 %s 兆字节" -"The filters must be an array.","过滤器必须为数组。" -"The image contents is not valid base64 data.","图像内容不是有效的 base64 数据。" -"The image is not specified.","图片未指定。" -"The model collection resource name is not defined.","型号集合资源名称未定义。" -"The product %s has been added to comparison list.","产品 %s 已被添加至比较列表。" -"The product %s has been removed from comparison list.","产品 %s 已从比较列表中删除。" -"The product attribute has been deleted.","产品属性已被删除。" -"The product attribute has been saved.","产品属性已保存。" -"The product has been created.","产品已创建。" -"The product has been deleted.","产品已被删除。" -"The product has been duplicated.","产品已复制。" -"The product has been saved.","产品已保存。" -"The product has required options","产品包含必需的选项" -"The review has been deleted","评论已被删除" -"The review has been saved.","评论已保存。" -"The review was removed by another user or does not exist.","评论已被另一用户删除，或评论不存在。" -"The search was deleted.","搜索被删除。" -"The text is too long","文本过长" -"There are no %s available.","没有可用的 %s。" -"There are no customers for this alert","没有客户适用于此提醒" -"There are no customers for this alert.","没有客户适用于此提醒。" -"There are no products matching the selection.","没有产品匹配该选择。" -"There was an error while request processing.","处理请求时遇到了错误。" -"This Attribute no longer exists","该属性已不存在" -"This attribute cannot be deleted.","该属性无法被删除。" -"This attribute cannot be edited.","该属性无法编辑。" -"This attribute cannot be updated.","该属性无法更新。" -"This attribute is used in configurable products.","该属性已用于可配置产品。" -"This attribute is used in configurable products. You cannot remove it from the attribute set.","该属性用于可配置的产品。您无法从属性集中将其删除。" -"This attribute no longer exists","该属性不存在" -"This attribute set no longer exists.","该属性已不存在。" -"This group contains attributes, used in configurable products. Please move these attributes to another group and try again.","该群组包含用于可配置产品的属性。请移动这些属性到另一群组并重试。" -"This group contains system attributes. Please move system attributes to another group and try again.","该群组包含系统属性。请移动系统属性到另一群组并重试。" -"This is a required option","这是必选的选项" -"This product no longer exists.","该产品已不存在。" -"This search no longer exists.","该搜索已不存在。" -"This setting will be applied when all prices in the specific price interval are equal.","如果指定价格间隔的所有价格都相等，将应用该设置。" -"Tier Pricing","层级价格" -"Tile","平铺" -"Time Format","时间格式" -"Title","标题" -"To reindex the enabled product(s), the store or product must be specified","要对已启用的产品重新索引，必须指定商店或产品" -"To see product price, add this item to your cart. You can always remove it later.","要查看产品价格，请添加该项目到您的购物车。您总是可以稍后删除它。" -"Top/Left","顶部/左侧" -"Top/Right","顶部/右侧" -"Total Qty Base Items","总数量 基础项目" -"Total Qty Content Items","内容项总数" -"Total incl. Tax: %1$s","含税总额：%1$s" -"Total of %d record(s) have been deleted.","总共%d记录已被删除。" -"Total of %d record(s) have been updated.","总共%d记录已被更新。" -"Total of %d record(s) were updated","共更新 %d 条记录" -"Type","类型" -"URL Rewrite Management","URL重写管理" -"Unable to complete this request.","无法完成该请求。" -"Unable to find a search term to delete.","无法找到搜索词来删除。" -"Unable to find an attribute to delete.","无法找到要删除的属性。" -"Unable to get the product ID.","无法获得产品 ID。" -"Unassigned Attributes","未分配的属性" -"Unknown EAV indexer type ""%s"".","未知 EAV 索引类型 ""%s"" 。" -"Unknown attribute: %s.","未知属性：%s。" -"Unsupported product type ""%s"".","不支持的产品类型 ""%s""。" -"Up-sells","超售" -"Update","更新" -"Update Attributes","更新属性" -"Update Tier Price","更新层级价格" -"Update assigned product","更新分配的产品" -"Update attribute","更新属性" -"Update attributes","更新属性" -"Update category","更新类别" -"Update custom option of product","更新产品的自定义选项" -"Update product","更新产品" -"Update product image","更新产品图像" -"Update product link","更新产品链接" -"Update product tier prices","更新产品层价格" -"Update value of custom option","更新自定义选项的值" -"Upload new product image ","上传新产品图片" -"Use Canonical Link Meta Tag For Categories","类别使用规范链接 Meta 标签" -"Use Canonical Link Meta Tag For Products","为产品使用标准的链接元数据标签" -"Use Categories Path for Product URLs","产品 URL 使用分类路径" -"Use Config Settings","使用配置设置" -"Use Default Value","使用默认值" -"Use Flat Catalog Category","使用平面目录产品分类" -"Use Flat Catalog Product","使用平面目录产品" -"Use In Layered Navigation","使用分层导航" -"Use In Search Results Layered Navigation","使用搜索结果内层次导航" -"Use JavaScript Calendar","使用 JavaScript 日历" -"Use Static URLs for Media Content in WYSIWYG for Catalog","为分类的所见即所得编辑中的媒体内容使用静态URL" -"Use To Create Configurable Product","用于创建可配置的产品" -"Use Tree Like Category Sitemap","使用树形分类站点地图" -"Use config","用户配置" -"Use default","使用默认" -"Use for Promo Rule Conditions","使用促销规则条件" -"Use four-digit year format.","使用四位年份格式。" -"Use in Advanced Search","使用高级搜索" -"Use in Layered Navigation","用在层次式导航中" -"Use in Layered Navigation
    (Can be used only with catalog input type 'Dropdown')","使用分层导航
    （仅在分类输入类型为“下拉”时使用）" -"Use in Quick Search","使用快速搜索" -"Used for Sorting in Product Listing","在产品列表中使用排序" -"Used in Product Listing","用于产品清单" -"Value for ""%s"" is invalid.","""%s"" 的值无效。" -"Value for ""%s"" is invalid: %s","""%s"" 的值是无效的： %s" -"Varchar","可变长字符串" -"View Details","查看详情" -"View as","查看为" -"Virtual Product","虚拟产品" -"Visibility","可见性" -"Visible","可见" -"Visible on Catalog Pages on Front-end","前端分类页面的可见性" -"Visible on Product View Page on Front-end","在前端产品视图页面可见" -"WYSIWYG Editor","所见即所得编辑器" -"Watermark","水印" -"Watermark Default Size","水印默认大小" -"Watermark Opacity, Percent","水印不透明度，百分比" -"Watermark Position","水印位置" -"We Also Recommend","我们同时推荐" -"Website","网站" -"Website Item Must be checked","网站项目必须检查" -"Website Store Must be checked","网站店铺必须被选中" -"Websites","网站" -"What's this?","这是什么？" -"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","是否在“每页显示 X 个”下拉菜单中显示“全部” 选项。" -"Will make search for the query above return results for this search.","执行上述查询的搜索是否返回该搜索的结果。" -"Wrong BuyRequest instance in options group.","选项组中错误的购买请求实例。" -"Wrong configuration item instance in options group.","选项组中错误的配置项目实例。" -"Wrong configuration item option instance in options group.","选项组中存在错误配置项目选项的实例。" -"Wrong option instance type in options group.","选项组中错误的选项实例类型。" -"Wrong option type to get group instance.","错误的选项类型来获得群组实例。" -"Wrong product instance type in options group.","选项组中错误的产品实例类型。" -"Wrong product type filter specified","错误的已指定产品类型过滤器" -"Wrong product type to extract configurable options.","错误的产品类型来提取可配置选项。" -"Year Range","年份范围" -"Yes","是" -"You cannot remove system attribute from this set.","您无法从此集合中移除系统属性。" -"You have no items to compare.","您没有可比较的项目。" -"You may also be interested in the following product(s)","您还可能对下列产品感兴趣" -"Zoom In","放大" -"Zoom Out","缩小" -"and","和" -"and above","及以上" -"categories","类别" -"each","每个" -"ex. http://domain.com","例如 http://domain.com" -"leave blank if its not an image","如果非图片请留空" -"per page","每页" -"products","产品" -"px.","像素" -"save","保存" -"select all","全选" -"unselect all","撤销全选" -"x","x" diff --git a/app/locale/zh_CN/Mage_CatalogInventory.csv b/app/locale/zh_CN/Mage_CatalogInventory.csv deleted file mode 100644 index 4fe3fac76..000000000 --- a/app/locale/zh_CN/Mage_CatalogInventory.csv +++ /dev/null @@ -1,62 +0,0 @@ -"""%s"" is not available in the requested quantity. %s of the items will be backordered.","所请求数量的""%s""不可用。该项目有 %s 个处于缺货状态。" -"%s is available for purchase in increments of %s only.","%s 仅在增量购买 %s 时可用。" -"%s is not a correct comparsion method.","%s 不是正确的比较方法。" -"Note that these settings are applicable to cart line items, not the whole cart.","请注意这些设置适用于购物车单个项目，而非整个购物车。" -"Add Minimum Qty","添加最小数量" -"Allow Qty Below 0","允许数量小于 0" -"Allow Qty Below 0 and Notify Customer","允许数量小于 0 并通知客户" -"Automatically Return Credit Memo Item to Stock","自动返回信用备忘项目到库存" -"Backorders","缺货" -"By Fixed value","由固定值" -"By Percentage","按百分比" -"Cannot specify product identifier for the order item.","无法为订单项目指定产品标识符。" -"Catalog Inventory","分类清单" -"Decrease Stock When Order is Placed","当下订单时，减少库存" -"Display Out of Stock Products","显示缺货产品" -"Display products availability in stock in the frontend","在前台显示产品库存情况" -"Enable Qty Increments","启用数量增量" -"In Stock","有货" -"Index Product Stock Status","索引产品库存状态" -"Inventory","盘点" -"Inventory API","库存 API" -"Inventory Section","库存区域" -"Manage Stock","库存管理" -"Maximum Qty Allowed in Shopping Cart","购物车数量上限" -"Minimum Qty","最小数量" -"Minimum Qty Allowed in Shopping Cart","购物车里允许的最少数量" -"Multi update product stock data","多次更新产品库存数据" -"No Backorders","无延期交货" -"Not all products are available in the requested quantity","在已请求的数量中并非所有产品均有库存" -"Notify for Quantity Below","存量过低通知" -"Only %s left","仅剩 %s" -"Only X left Threshold","仅 X左侧阈值" -"Out of Stock","无货" -"Product Name","产品名称" -"Product Stock Options","产品库存选项" -"Products will still be shown by direct product URLs.","产品仍将通过直接产品 URL 显示。" -"Qty","数量" -"Qty Increments","数量增量" -"Qty for Item's Status to Become Out of Stock","产品状态变为缺货时的数量" -"Retrieve stock data","获取库存数据" -"Retrieve stock data by product ids","按照产品编号获取库存数据" -"Rule price","规则价格" -"Set Items' Status to be In Stock When Order is Cancelled","如果订单被取消，设置商品的状态为有货" -"Some of the products are currently out of stock.","部分产品当前缺货。" -"Some of the products cannot be ordered in requested quantity.","某些产品的订购数量存货不足。" -"Some of the products cannot be ordered in the requested quantity.","某些产品无法按照所需数量下单。" -"Stock Options","库存选项" -"Stock Status","库存状态" -"The maximum quantity allowed for purchase is %s.","允许购买的最大数量为 %s。" -"The minimum quantity allowed for purchase is %s.","允许购买的最小数量为 %s。" -"The requested quantity for ""%s"" is not available.","""%s"" 所要购买的数量不可用。" -"The stock item for Product in option is not valid.","产品的库存选项无效。" -"The stock item for Product is not valid.","产品的库存项无效。" -"This product is available for purchase in increments of %s only.","该产品只能以 %s 的增量采购。" -"This product is currently out of stock.","该产品目前缺货。" -"This product is not available in the requested quantity. %s of the items will be backordered.","该产品所要购买的数量不足。 %s 个产品处于缺货状态。" -"To Fixed Value","为固定值" -"To Percentage","为百分率" -"Undefined product type.","未定义的产品类型。" -"Update","更新" -"Update product stock data","更新产品库存数据" -"Update the Product","更新产品" diff --git a/app/locale/zh_CN/Mage_CatalogRule.csv b/app/locale/zh_CN/Mage_CatalogRule.csv deleted file mode 100644 index d933f8b9b..000000000 --- a/app/locale/zh_CN/Mage_CatalogRule.csv +++ /dev/null @@ -1,64 +0,0 @@ -"%d Catalog Price Rules based on ""%s"" attribute have been disabled.","基于“%s”属性的 %d 目录价格规则已被禁用。" -"Actions","操作" -"Active","活动" -"Add New Rule","添加新规则" -"An error occurred while deleting the rule. Please review the log and try again.","当删除规则时发生错误。请检查日志并重试。" -"An error occurred while saving the rule data. Please review the log and try again.","当保存规则数据时发生错误。请查看日志并重试。" -"Apply","应用" -"Apply Rules","应用规则" -"Attribute Set","属性集" -"By Fixed Amount","固定额度" -"By Percentage of the Original Price","原始价格的百分率" -"Catalog","分类" -"Catalog Price Rule","目录价格规则" -"Catalog Price Rules","分类价格规则" -"Category","分类" -"Conditions","条件" -"Conditions (leave blank for all products)","条件（用于全部产品时留空）" -"Conditions Combination","条件组合" -"Customer Groups","客户组" -"Date Expire","过期日" -"Date From","日期自" -"Date Start","开始日" -"Date To","日期至" -"Description","描述" -"Discount Amount","折扣帐户" -"Edit Rule","修改规则" -"Edit Rule '%s'","修改规则'%s'" -"Enable Discount to Subproducts","为附属产品启用折扣" -"Expiration Date","过期日期" -"From Date","来自日期" -"General Information","常规信息" -"ID","ID" -"Inactive","未激活" -"New Rule","新规则" -"No","否" -"Options","选项" -"Priority","优先级" -"Product Attribute","产品属性" -"Promotions","促销" -"Rule Information","规则信息" -"Rule Name","规则名称" -"Save and Apply","保存并应用" -"Save and Continue Edit","保存并继续编辑" -"Start Date","开始日期" -"Status","状态" -"Stop Further Rules Processing","停止进一步的规则处理" -"The rule has been deleted.","规则已删除。" -"The rule has been saved.","规则已保存。" -"The rules have been applied.","规则已应用。" -"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","有规则已被更改，但尚未应用。只有能独占访问的用户才能应用规则。" -"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","存在已更改但未应用的规则。请单击“应用规则”以立即查看目录中应用的效果。" -"This rule no longer exists.","该规则已不存在。" -"To Date","截止日期" -"To Fixed Amount","固定额度" -"To Percentage of the Original Price","到原始价格的百分率" -"Type","类型" -"Unable to apply rules.","无法应用规则。" -"Unable to find a rule to delete.","无法查找要删除的规则。" -"Update Prices Using the Following Information","使用下列信息更新价格" -"Update product's %s %s: %s","更新产品的 %s %s：%s" -"Website","网站" -"Websites","网站" -"Wrong rule specified.","所指定规则有误。" -"Yes","是" diff --git a/app/locale/zh_CN/Mage_CatalogSearch.csv b/app/locale/zh_CN/Mage_CatalogSearch.csv deleted file mode 100644 index 297be7c7b..000000000 --- a/app/locale/zh_CN/Mage_CatalogSearch.csv +++ /dev/null @@ -1,49 +0,0 @@ -"%s and greater","%s 并且更多" -"%d item(s) were found using the following search criteria","使用下列搜索条件找到了%d 个商品" -"Advanced Search","高级搜索" -"Advanced Search Form","高级搜索表单" -"Advanced Search Result","高级搜索结果" -"All","全部" -"Applies for ""Like"" search type only.","只应用“喜欢”的搜索类型。" -"Apply Layered Navigation if Search Results are Less Than","如果搜索结果少于该数量，应用层次式导航" -"Attribute setting change related with Search Index. Please run Rebuild Search Index process.","与搜索索引有关的属性设置有改动。请运行重建搜索索引 操作。" -"Autogenerated Site Map","自动生成的站点结构图" -"Catalog Advanced Search","分类高级搜索" -"Catalog Search","分类搜索" -"Catalog Search Index","分类搜索索引" -"Don't see what you're looking for?","没看到您要找的东西？" -"Enter ""0"" to enable layered navigation for any number of results.","输入“0”即可为任何数量的结果启用层次式导航。" -"Go","转到" -"Go to Home Page","前往主页" -"Grid","网格" -"Home","主页" -"List","列表" -"Maximum Query Length","最大查询长度" -"Maximum Query Words Count","最大查询词语数量" -"Maximum Search query length is %s. Your query was cut.","最大搜索查询长度为 %s。您的查询被切断。" -"Maximum words count is %1$s. In your search query was cut next part: %2$s.","最大字数为 %1$s。在您的搜索查询中我们将后续部分去掉了： %2$s。" -"Minimal Query Length","最小查询长度" -"Minimum Search query length is %s","最小搜索查询长度为 %s" -"Modify your search","修改您的搜索" -"No","否" -"No items were found using the following search criteria.","没有找到使用下列搜索条件的项目。" -"Please specify at least one search term.","请至少指定一个搜索词。" -"Popular Search Terms","热门搜索词" -"Quick Search Form","快速搜索表单" -"Rebuild Catalog product fulltext search index","重建目录产品全文搜索索引" -"Relevance","关联" -"Results","结果" -"Search","搜索" -"Search Settings","搜索设置" -"Search Terms","搜索条件" -"Search Type","搜索类型" -"Search entire store here...","在这里搜索整个商店..." -"Search results for '%s'","“%s”的搜索结果" -"Search results for: '%s'","搜索结果：“%s”" -"Search:","搜索：" -"Specified date is invalid.","指定的日期无效。" -"Subscribe to Feed","订阅到源订阅" -"There are no search terms available.","没有可用的搜索词" -"Yes","是" -"Your search returns no results.","您的搜索未找到结果。" -"up to %s","至多 %s" diff --git a/app/locale/zh_CN/Mage_Centinel.csv b/app/locale/zh_CN/Mage_Centinel.csv deleted file mode 100644 index f3374232c..000000000 --- a/app/locale/zh_CN/Mage_Centinel.csv +++ /dev/null @@ -1,33 +0,0 @@ -"3D Secure CAVV","3D 安全 CAVV" -"3D Secure Card Validation","3D 安全信用卡验证" -"3D Secure Cardholder Validation","3D 安全持卡人验证" -"3D Secure Electronic Commerce Indicator","3D 安全电子商务指标" -"3D Secure Verification Result","3D 安全验证结果" -"3D Secure XID","3D 安全 XID" -"Card Issuer Liability","发卡机构法律责任" -"Card Verification","信用卡验证" -"Enrolled","登记" -"Enrolled but Authentication Unavailable","已登记但验证不可用" -"Failed","已失败" -"MasterCard SecureCode","MasterCard 安全代码" -"Merchant Liability","商家责任" -"Not Enrolled","未登记" -"Order cannot be placed.","无法下订单。" -"Payment information error. Please start over.","支付信息错误。请重新开始。" -"Please continue with placing order.","请继续下订单。" -"Please verify the card with the issuer bank before placing the order.","在下订单前，请与发卡行验证信用卡。" -"Please verify the card with the issuer bank:","请与发卡行验证信用卡：" -"Start/Reset Validation...","开始/重设验证..." -"Successful","成功" -"Successful attempt","成功尝试" -"The card has failed verification with the issuer bank.","卡片与发卡行的验证失败。" -"There has been wrong payment information submitted or the time limit has expired. Please, try again.","已提交错误的支付信息，或时间限制已过。请重试。" -"There has been wrong payment information submitted or time limit has expired. Please, try again.","提交的支付信息错误，或时间限制已到。请重试。" -"This card has failed validation and cannot be used.","信用卡验证失败，无法使用。" -"To ensure the security of your transactions","要确保您的交易安全" -"Unable to complete","无法完成" -"Validation failed.","验证失败。" -"Verification Failed","验证失败" -"Verification Successful","验证成功" -"Verification cannot be processed","验证工作无法处理" -"Verified by Visa","Visa 已验证" diff --git a/app/locale/zh_CN/Mage_Checkout.csv b/app/locale/zh_CN/Mage_Checkout.csv deleted file mode 100644 index 5b7d77532..000000000 --- a/app/locale/zh_CN/Mage_Checkout.csv +++ /dev/null @@ -1,360 +0,0 @@ -"%s was added to your shopping cart.","%s 已添加到您的购物车。" -"%s was updated in your shopping cart.","您的购物车中的 %s 已更新。" -"* Required Fields","*必要字段" -"Add New Address","添加新地址" -"Add New Condition","添加新条件" -"Add coupon code for shopping cart","为购物车添加优惠代码" -"Add gift messages to shopping cart","添加礼品消息到购物车" -"Add product to shopping cart","添加产品到购物车" -"Add product(s) to shopping cart","添加产品到购物车" -"Add to Cart","添加到购物车" -"Add to Compare","添加并比较" -"Add to Wishlist","添加到收藏" -"Additional Product Info","额外产品信息" -"Address","地址" -"Address %s of %s","地址 %s，共 %s 个地址" -"After Adding a Product Redirect to Shopping Cart","添加产品后重定向至购物车" -"Allow Guest Checkout","允许来宾结账" -"Already registered?","已注册？" -"An error occurred in the process of payment","支付流程发生错误" -"An error occurred while deleting this condition.","当删除该条件时发生错误。" -"An error occurred while saving this condition.","当保存该条件时发生错误。" -"Apply","应用" -"Apply Coupon","应用优惠券" -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","您确认要离开此页面吗？您需要重新完成一次结账步骤。" -"Are you sure you would like to remove this item from the shopping cart?","您确认要从购物车中删除该项目吗？" -"Back","返回" -"Back to Billing Information","返回到账单信息" -"Back to Select Addresses","返回到选择地址" -"Back to Shipping Information","返回到运送信息" -"Back to Shopping Cart","返回到购物车" -"Based on your selection, you may be interested in the following items:","根据您的选择，您可能对下列内容感兴趣：" -"Billing Address","账单地址" -"Billing Information","账单信息" -"Billing Information - %s","账单信息 - %s" -"Can not remove the item.","无法移除此项目。" -"Can not save item.","无法保存项目。" -"Cancel","取消" -"Cancel Coupon","取消优惠券" -"Cannot add item to the shopping cart.","无法添加项目到购物车。" -"Cannot add the item to shopping cart","无法添加该项目到购物车" -"Cannot add the item to shopping cart.","无法添加该项目到购物车。" -"Cannot apply the coupon code.","无法应用优惠代码。" -"Cannot configure product.","无法配置产品。" -"Cannot open the overview page","无法打开概览页面" -"Cannot process the item.","无法处理该项目。" -"Cannot remove the item.","无法移除项目。" -"Cannot update shopping cart.","无法更新购物车。" -"Cannot update the item.","无法更新该项目。" -"Card Verification Number Visual Reference","信用卡验证号码 视觉参考" -"Cart","购物车" -"Cart Product API","购物车产品 API" -"Cart Subtotal:","购物车小计：" -"Change","更改" -"Change Billing Address","更改账单地址" -"Checkbox Text","复选框文本" -"Checkout","结账" -"Checkout Conditions","支付条件" -"Checkout Forms Extra","结账表单附加" -"Checkout Method","支付方法" -"Checkout Options","支付选项" -"Checkout Progress Wrapper","支付进度封装器" -"Checkout Section","支付区域" -"Checkout Terms and Conditions","结账条款和情况" -"Checkout as Guest","作为来宾结账" -"Checkout as a Guest or Register","以来宾身份结账或注册" -"Checkout with Multiple Addresses","按多个地址支付" -"City","城市" -"Clear Shopping Cart","清空购物车" -"Click here to print a copy of your order confirmation.","单击这里来打印您订单确认信息的拷贝。" -"Click here to continue shopping.","单击这里来继续购物。" -"Close","关闭" -"Company","公司" -"Condition Name","条件名称" -"Configurable Product Image","可配置产品图片" -"Configure Cart Item","配置购物车项目" -"Confirm Password","确认密码" -"Content","内容" -"Content Height","内容高度" -"Content Height (css)","内容高度 (css)" -"Continue","继续" -"Continue Shopping","继续购物" -"Continue to Billing Information","继续以查看账单信息" -"Continue to Review Your Order","继续以查看订单" -"Continue to Shipping Information","继续以查看运送信息" -"Country","国家" -"Coupon code ""%s"" is not valid.","优惠券代码“%s”无效。" -"Coupon code ""%s"" was applied.","优惠代码“%s”已应用。" -"Coupon code was canceled.","优惠代码已被取消。" -"Create Billing Address","创建账单地址" -"Create Shipping Address","创建运送地址" -"Create an order from shopping cart","从购物车创建订单" -"Create shopping cart","创建购物车" -"Customer Address is not valid.","客户地址无效。" -"Customer Information","客户信息" -"Customer's information","客户信息" -"Data saving problem","数据保存问题" -"Default Billing","默认账单" -"Default Shipping","默认运送" -"Delete Condition","删除条件" -"Details","详情" -"Disabled","已禁用" -"Discount Codes","折扣代码" -"Display Cart Summary","显示购物车概要" -"Display Shopping Cart Sidebar","显示购物车侧边栏" -"Display item quantities","显示项目数量" -"Display number of items in cart","显示购物车中项目的数量" -"Display number of items in wishlist","显示愿望列表中项目的数量" -"Easy access to your order history and status","轻松访问您的订单历史记录和状态" -"Edit","编辑" -"Edit Address","编辑地址" -"Edit Billing Address","编辑账单地址" -"Edit Condition","编辑条件" -"Edit Items","编辑项目" -"Edit Shipping Address","编辑运送地址" -"Edit Terms and Conditions","编辑条款和条件" -"Edit Your Cart","编辑您的购物车" -"Edit item","编辑项目" -"Edit item parameters","编辑项目参数" -"Email Address","编辑电子邮件地址" -"Empty Cart","清空购物车" -"Empty Shopping Cart Content Before","清空购物车内容前：" -"Enable Onepage Checkout","启用单页面结账" -"Enable Terms and Conditions","启用条款和条件" -"Enabled","已启用" -"Enter a New Address","输入新地址" -"Enter your coupon code if you have one.","如果您有优惠代码，请输入。" -"Enter your destination to get a shipping estimate.","输入您的目的地来获得预计运送信息。" -"Estimate","预估" -"Estimate Shipping and Tax","预计运费和税费" -"Excl. Tax","不含税" -"Fast and easy check out","方便快捷的结账" -"Fax","传真" -"Forgot an Item?","忘记某个项目？" -"Forgot your password?","忘记您的密码？" -"Get a Quote","获得报价" -"Get list of available payment methods","获得可用支付方法的列表" -"Get list of available shipping methods","获得可用运送方式的列表" -"Get list of products in shopping cart","获得购物车中的产品列表" -"Get terms and conditions","获取条款和条件" -"Get total prices for shopping cart","获得购物车中总价格" -"Gift Message","礼品消息" -"Grand Total:","总计：" -"Grouped Product Image","已分组的产品图片" -"HTML","HTML" -"ID","ID" -"Incl. Tax","含税" -"Invalid checkout type.","无效的结账类型。" -"Invalid data.","无效数据。" -"Invalid email address ""%s""","无效的电子邮件地址 ""%s""" -"Invalid method: %s","无效的方法：%s" -"Invalid shipping method.","运送方法无效。" -"Item not found or already ordered","无法找到项目，或项目已被订购" -"Item was removed successfully.","项目已成功移除。" -"Item was updated successfully.","项目已成功更新。" -"Items","项目" -"Items After","项目晚于" -"Items Before","之前的项目" -"Load customer quote error","载入客户报价错误" -"Loading next step...","正在载入下一步..." -"Login","登录" -"Login/Registration Before","登录/注册早于" -"Manage Terms and Conditions","管理条款与协议" -"Maximum Display Recently Added Item(s)","最大显示近期添加的项目" -"Maximum qty allowed for Shipping to multiple addresses is %s","运送到多个地址所允许的最大数量为 %s" -"Mini-cart promotion block","迷你购物车促销区块" -"Minimum order amount is %s","最小订购数量为 %s" -"Move","移动" -"Move to Wishlist","移动到愿望清单" -"Move to wishlist","移动到愿望清单" -"Multishipping Checkout","多重运送结账" -"Multishipping Checkout Address (Any) Form","多重运送地址（任何）表单" -"Multishipping Checkout Billing Address Creation","多重运送账单地址创建" -"Multishipping Checkout Billing Address Edit Form","多重结账账单地址编辑表单" -"Multishipping Checkout Billing Address Selection","多重运送结账账单地址选择" -"Multishipping Checkout Billing Information Step","多重运送账单信息步骤" -"Multishipping Checkout Customer Address Edit Form","多重运送结账客户地址编辑表单" -"Multishipping Checkout Overview","多重运送结账概览" -"Multishipping Checkout Shipping Address Creation","多重运送结账运送地址创建" -"Multishipping Checkout Shipping Address Edit Form","多重运送结账运送地址编辑表单" -"Multishipping Checkout Shipping Address Selection","多重运送结账运送地址选择" -"Multishipping Checkout Shipping Information Step","多重运送结账运送信息步骤" -"Multishipping Checkout Success","多重运送结账成功" -"My Cart","我的购物车" -"My Cart (%s item)","我的购物车（%s 个项目）" -"My Cart (%s items)","我的购物车（%s 个项目）" -"My Cart Extra Actions","我的购物车额外行为" -"My Cart Link","我的购物车链接" -"New Address","新地址" -"New Condition","新条件" -"New Terms and Conditions","新建条款与协议" -"No Payment Methods","无支付方法" -"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","提交订单前将显示订购的总数" -"One Page Checkout","单页面结账" -"One Page Checkout Failure","单页面结账失败" -"One Page Checkout Overview","单页面结账概览" -"One Page Checkout Success","单页面结账成功" -"One item of products do not have identifier or sku","产品中的一个项目不包含标识或 SKU" -"One item of products is not belong any of quote item","产品中的一个项目不属于任何报价项目" -"Order #","订单 #" -"Order Review","订单总览" -"Order Success","订购成功" -"Order place error.","提交订单错误。" -"Other Items in Your Order","您订单中的其它项目" -"Overview Items After","项目概览" -"Password","密码" -"Payment Failed Email Reciever","支付失败电子邮件接收者" -"Payment Failed Email Sender","支付失败电子邮件发送者" -"Payment Failed Emails","支付失败电子邮件" -"Payment Failed Template","支付失败模板" -"Payment Information","支付信息" -"Payment Method","支付方式" -"Payment Methods After","后续支付方式" -"Payment Methods After Checkout Button","按下结账按钮后的支付方式" -"Payment Methods Before","先前支付方式" -"Payment Methods Before Checkout Button","按下结账按钮前的支付方式" -"Payment method information","支付方式信息" -"Payment method is not defined","支付方式未定义" -"Payment methods in shopping cart","购物车中的支付方式" -"Payment profile # %s: ""%s"".","支付资料 # %s: ""%s""。" -"Place Order","下订单" -"Please agree to all Terms and Conditions before placing the order.","请在下订单前同意所有的条款和条件。" -"Please agree to all Terms and Conditions before placing the orders.","请在下订单前同意所有的条款和条件。" -"Please agree to all the terms and conditions before placing the order.","请在下订单前同意所有的条款和条件。" -"Please check billing address information.","请检查账单地址信息。" -"Please check shipping address information.","请检查运送地址信息。" -"Please check shipping addresses information.","请检查运送地址信息。" -"Please choose to register or to checkout as a guest","请选择地区或以来宾身份结账" -"Please log in below:","请在下面登录：" -"Please select region, state or province","请选择地区、州，或省" -"Please select shipping address for applicable items","请为适用项目选择运送地址" -"Please select shipping methods for all addresses","请为所有地址选择运送方式" -"Please select valid payment method.","请选择有效的支付方法。" -"Please specify payment method.","请指定支付方式。" -"Please specify shipping method.","请指定发货方式。" -"Please specify shipping methods for all addresses.","请为所有地址制定运送方式。" -"Price","价格" -"Proceed to Checkout","进行结账" -"Product","产品" -"Product Name","产品名" -"Products","产品" -"Qty","数量" -"Qty:","数量：" -"Quantity was recalculated from %d to %d","数量已重新计算，从 %d 到 %d" -"Quote Lifetime (days)","报价生命期（天）" -"Quote item does not exist.","报价项目不存在。" -"Quote item is not found.","报价项目未找到。" -"Recently added item(s)","最近添加的项目" -"Register","注册" -"Register and save time!","注册并节约时间！" -"Register to Create an Account","注册以创建帐户" -"Register with us for future convenience:","在这里注册以后可以更方便：" -"Remove Item","删除项目" -"Remove This Item","删除该内容" -"Remove coupon code from shopping cart","从购物车中删除优惠代码" -"Remove item","删除项目" -"Remove product from shopping cart","从购物车中删除产品" -"Remove product(s) from shopping cart","从购物车中删除产品" -"Require Customer To Be Logged In To Checkout","需要顾客登录才能结账" -"Retrieve information about shopping cart","获取关于购物车的信息" -"Review Order","查看订单" -"Review Order - %s","查看订单 - %s" -"SKU","SKU" -"Sales","销售" -"Save Condition","保存条件" -"Save in address book","保存到地址簿" -"See price before order confirmation.","确认订单前显示价格。" -"Select Address","选择地址" -"Select Addresses","选择地址" -"Select Shipping Method","选择运送方式" -"Select State/Province...","选择州/省..." -"Select a billing address from your address book or enter a new address.","从您的地址簿选择账单地址，或输入新地址。" -"Select a shipping address from your address book or enter a new address.","从您的地址簿选择发货地址，或输入新地址。" -"Send Payment Failed Email Copy Method","发送支付失败电子邮件复制方法" -"Send Payment Failed Email Copy To","发送支付失败电子邮件拷贝至" -"Send To","发送至" -"Separate by "","".","以“,”分隔。" -"Set customer for shopping cart","设置客户的购物车" -"Set customer's addresses in shopping cart","设置购物车中客户的地址" -"Set payment method","设置支付方法" -"Set shipping method","设置运送方式" -"Ship to Multiple Addresses","运送到多个地址" -"Ship to different address","送货到不同地址" -"Ship to this address","送货到这个地址" -"Shipping Address","送货地址" -"Shipping Information","运送信息" -"Shipping Method","运送方式" -"Shipping Methods","运送方式" -"Shipping To","运送至" -"Shipping information","运送信息" -"Shipping method has not been selected yet","运送方式尚未被选择" -"Shipping methods in shopping cart","购物车中的运送方式" -"Shipping selection is not applicable.","运送选择不适用。" -"Shopping Cart","购物车" -"Shopping Cart Form Before","购物车形成以前" -"Shopping Cart Items After","后续购物车项目" -"Shopping Cart Items Before","先前购物车项目" -"Shopping Cart Sidebar","购物车侧边栏" -"Shopping Cart Sidebar Extra Actions","购物车侧边栏额外操作" -"Shopping Cart is Empty","购物车为空" -"Shopping cart ability to set coupon code","购物车设置优惠代码" -"Show Content as","显示内容为" -"Some of the requested products are not available in the desired quantity.","部分已请求的产品不符合需求的数量。" -"Some of the requested products are unavailable.","部分已请求的产品暂无供应。" -"Some products quantities were recalculated because of quantity increment mismatch","由于数量增量不匹配，部分产品数量已被重新计算" -"Sorry, guest checkout is not enabled. Please try again or contact store owner.","很抱歉，来宾结账尚未启用。请重试或联系商店店主。" -"Sorry, no quotes are available for this order at this time.","抱歉，当前该订单中没有报价可用。" -"State/Province","州/省" -"Status","状态" -"Store View","店铺视图" -"Street Address","街道地址" -"Street Address %s","街道地址 %s" -"Submitting order information...","正在提交订单信息..." -"Subtotal","小计" -"Subtotal must exceed minimum order amount","总数必须超出允许订购的最小数量" -"Telephone","电话" -"Terms and Conditions","条款和条件" -"Terms and Conditions Information","条款和条件信息" -"Terms and conditions","条款和条件" -"Text","文字" -"Thank you for your purchase!","感谢您的购买！" -"The condition has been deleted","条件已被删除" -"The condition has been saved.","条件已保存。" -"The onepage checkout is disabled.","单页面结账已被禁用。" -"The product could not be found.","无法找到产品。" -"The product does not exist.","产品不存在。" -"There are %s items in your cart.","您的购物车中有 %s 个项目。" -"There is 1 item in your cart.","您的购物车中有 1 个项目。" -"There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.","已存在使用此电子邮件地址注册的客户。请使用此电子邮件登录或输入不同的电子邮件地址来注册您的账户。" -"There was an error processing your order. Please contact us or try again later.","处理您的订单时遇到了错误。请联系我们，或稍后再试。" -"This condition no longer exists.","该条件已不存在。" -"Total","总数" -"Total for this address","该地址的总额" -"Unable to set Payment Method.","无法设置支付方式。" -"Unit Price","单价" -"Update","更新" -"Update Cart","更新购物车" -"Update Qty & Addresses","更新数量与地址" -"Update Shopping Cart","更新购物车" -"Update Total","更新总额" -"Update product quantities in shopping cart","更新购物车中的产品数量" -"Update product(s) quantities in shopping cart","更新购物车中的产品数量" -"Use Billing Address","使用账单地址" -"VAT Number","VAT 编号" -"View Shopping Cart","查看购物车" -"Visible items in minicart","迷你购物车中的可见项目" -"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","我们正在处理您的订单，您将很快收到包含订单详情的电子邮件。当订单运送后，您会收到另一封邮件，并可使用邮件中的链接来追踪运送进度。" -"What's this?","这是什么？" -"What's this?","这是什么？" -"You have no items in your shopping cart.","您的购物车内没有物品。" -"You will receive an order confirmation email with details of your order and a link to track its progress.","您将会收到一份内含订单详细信息和可查询进展情况链接的确认邮件" -"Your Checkout Progress","您的结帐流程" -"Your billing agreement # is: %s.","您的账单编号为： %s" -"Your order # is: %s.","您的订单编号为： %s" -"Your order cannot be completed at this time as there is no payment methods available for it.","由于付款方法不可用，现在无法完成您的订单。" -"Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.","由于送货方法不可用，现在无法完成您的订单。请更改您的收货地址。" -"Your order has been received.","我们已经收到您的订单。" -"Your order number is ","您的订单号是" -"Your recurring payment profiles:","您的付款档案：" -"Zip/Postal Code","邮政编码" -"ok","确定" diff --git a/app/locale/zh_CN/Mage_Cms.csv b/app/locale/zh_CN/Mage_Cms.csv deleted file mode 100644 index dd64c0df8..000000000 --- a/app/locale/zh_CN/Mage_Cms.csv +++ /dev/null @@ -1,123 +0,0 @@ -"A block identifier with the same properties already exists in the selected store.","具有相同属性的区块标识符已在选定的商店存在。" -"A directory with the same name already exists. Please try another folder name.","具有同样名称的目录已存在。请尝试另一个文件夹名称。" -"A page URL key for specified store already exists.","特定商店的页面 URL 密钥已存在。" -"Action","操作" -"Add New Block","添加新区块" -"Add New Page","添加新页面" -"All Countries","全部国家" -"An error occurred while saving the page.","保存页面时发生错误。" -"Anchor Custom Text","自定义文本锚点" -"Anchor Custom Title","自定义标题锚点" -"Are you sure you want to delete current folder?","您确认要删除当前文件夹吗？" -"Are you sure you want to delete the selected file?","您确认要删除已选择的文件吗？" -"Block","区块" -"Block Information","块信息" -"Block Title","区块标题" -"CMS","CMS" -"CMS Content Wrapper","CMS 内容包装器" -"CMS Home Page","CMS首页" -"CMS No Cookies Page","CMS 无 Cookie 页面" -"CMS No Route Page","CMS 无路由页面" -"CMS No-Route Page","CMS非路由页" -"CMS Page","CMS 页面" -"CMS Page Link","CMS 页面链接" -"CMS Page Link Block Template","CMS页面链接块模板" -"CMS Page Link Inline Template","CMS页面链接内联摸板" -"CMS Pages (All)","CMS页面（全部）" -"CMS Static Block","CMS 静态区块" -"CMS Static Block Default Template","CMS 静态区块默认模板" -"Cannot create new directory.","无法创建新目录。" -"Cannot delete directory %s.","无法删除目录 %s。" -"Cannot delete root directory %s.","无法删除根目录 %s。" -"Cannot upload file.","无法上传文件。" -"Collapse All","折叠全部" -"Content","内容" -"Content Heading","内容标题" -"Content Management","内容管理" -"Contents of a Static Block","静态区块的内容" -"Create Folder...","创建文件夹..." -"Custom Design","自定义设计" -"Custom Design From","自定义设计，来自：" -"Custom Design To","自定义设计到" -"Custom Layout","自定义布局" -"Custom Layout Update XML","自定义布局更新 XML" -"Custom Theme","自定义主题" -"Customer Tax Class Information","自定义税费类别信息" -"Date Created","创建日期" -"Delete Block","删除区块" -"Delete File","删除文件" -"Delete Folder","删除文件夹" -"Delete Page","删除页面" -"Description","描述" -"Design","设计" -"Disabled","已禁用" -"Disabled Completely","完全禁用" -"Disabled by Default","默认被禁用" -"Edit Block","编辑区块" -"Edit Block '%s'","编辑区块“%s”" -"Edit Page","编辑页面" -"Edit Page '%s'","编辑页面“%s”" -"Enable WYSIWYG Editor","启用 WYSIWYG 编辑器" -"Enabled","已启用" -"Enabled by Default","默认启用" -"Expand All","全部展开" -"General Information","常规信息" -"Go to Home Page","前往主页" -"Home","主页" -"ID","ID" -"Identifier","标识" -"If empty, the Page Title will be used","如果为空，将使用页面标题" -"Images (%s)","图片 (%s)" -"Insert File","插入文件" -"Invalid folder name. Please, use alphanumeric characters, underscores and dashes.","无效的文件夹名称。请使用字母数字字符、下划线和短划线。" -"Keywords","关键词" -"Last Modified","上次修改" -"Layout","布局" -"Layout Update XML","布局更新 XML" -"Link to a CMS Page","链接到 CMS 页面" -"Manage Pages","管理页面" -"Media Gallery","媒体库" -"Media Storage","媒体存储" -"Meta Data","元数据" -"Meta Description","元描述" -"Meta Keywords","元关键词" -"New Block","新块" -"New Folder Name:","新文件夹名称：" -"New Page","新页面" -"No files found","没有找到文件" -"Page Information","页面信息" -"Page Layout","页面布局" -"Page Status","页面状态" -"Page Title","页面标题" -"Pages","页面" -"Product Tax Class Information","产品税费类别信息" -"Redirect to CMS-page if Cookies are Disabled","如果 Cookie 被禁用，则重定向到 CMS 页面" -"Relative to Website Base URL","关于网站基本 URL" -"Save Block","保存区块" -"Save Page","保存页面" -"Save Process","保存过程" -"Select Block...","选择区块..." -"Select Page...","选择页面..." -"Show Breadcrumbs for CMS Pages","显示 CMS 页面的面包屑" -"Show Notice if JavaScript is Disabled","如果 JavaScript 被禁用，则显示通知" -"Static Blocks","静态块" -"Status","状态" -"Storage Root","存储根目录" -"Store View","店铺视图" -"Template","模板" -"The block has been deleted.","该区块已被删除。" -"The block has been saved.","区块已保存。" -"The directory %s is not writable by server.","目录 %s 对服务器端不可写。" -"The page URL key cannot consist only of numbers.","页面 URL 密钥不能仅由数字组成。" -"The page URL key contains capital letters or disallowed symbols.","页面 URL 密钥包含大写字母或不允许的符号。" -"The page has been deleted.","页面已被删除。" -"The page has been saved.","页面已保存。" -"The static block content cannot contain directive with its self.","静态块内容不能包含到自己的指令。" -"This block no longer exists.","区块已不存在。" -"This page no longer exists.","该页面已不存在。" -"Title","标题" -"URL Key","URL Key" -"Unable to find a block to delete.","无法找到可删除的区块。" -"Unable to find a page to delete.","无法找到要删除的页面。" -"WYSIWYG Options","WYSIWYG 选项" -"px.","像素" diff --git a/app/locale/zh_CN/Mage_Compiler.csv b/app/locale/zh_CN/Mage_Compiler.csv deleted file mode 100644 index b9c49c36f..000000000 --- a/app/locale/zh_CN/Mage_Compiler.csv +++ /dev/null @@ -1,21 +0,0 @@ -"Collected Files Count","已收集文件计数" -"Compilation","编译" -"Compilation State","编译状态" -"Compilation error","编译错误" -"Compiled","已编译" -"Compiled Scopes Count","编译范围计数" -"Compiler Status","编译器状态" -"Compiler include path is disabled.","编译器包含路径已禁用。" -"Compiler include path is enabled.","编译器包含路径已启用。" -"Directory ""%s"" must be writeable","目录“%s”必须为可写" -"Disable","禁用" -"Disabled","已禁用" -"Enable","启用" -"Enabled","已启用" -"File ""%s"" must be writeable","文件“%s”必须为可写" -"Not Compiled","未编译" -"Run Compilation Process","运行编译过程" -"Scopes Compilation Settings","范围编译设置" -"System","系统" -"The compilation has completed.","编译已完成。" -"Tools","工具" diff --git a/app/locale/zh_CN/Mage_Connect.csv b/app/locale/zh_CN/Mage_Connect.csv deleted file mode 100644 index c4fa0fbf6..000000000 --- a/app/locale/zh_CN/Mage_Connect.csv +++ /dev/null @@ -1,58 +0,0 @@ -"1.5.0.0 & later","1.5.0.0 及更新版" -"Action","操作" -"Add Author","添加作者" -"Add Contents Path","添加内容路径" -"Add PHP Extension dependency","添加PHP扩展依存性" -"Add Package dependency","添加数据包依存性" -"Add files","添加文件" -"Authors","作者" -"Channel","渠道" -"Contents","内容" -"Create Extension Package","创建扩展包" -"Dependencies","依存性" -"Description","描述" -"Edit Extension","修改扩展" -"Email","电子邮件" -"Extension","扩展" -"Extensions","扩展" -"Failed to create the package.","创建包失败。" -"Failed to load the package data.","加载包数据失败。" -"Failed to save the package.","保存包失败。" -"Files","文件" -"Folder","文件夹" -"Ignore","忽略" -"Include","包含" -"License","许可" -"License URI","许可URI" -"Load Local Package","加载本地包" -"Load local Package","载入本地包" -"Magento Connect","Magento连接" -"Magento Connect Manager","Magento连接管理器" -"Max","最大" -"Maximum","最大" -"Min","最小" -"Minimum","最小" -"Name","姓名" -"New Extension","新扩展" -"PHP Version","PHP版本" -"Package","包裹" -"Package Extensions","包括扩展" -"Package File Name","包文件名" -"Package Info","包信息" -"Packages","包裹" -"Path","路径" -"Pre-1.5.0.0","Pre-1.5.0.0" -"Release Info","发布信息" -"Remove","删除" -"Save As...","另存为..." -"Save Data and Create Package","保存数据并创建包" -"Save package with custom package file name","使用自定义包文件名保存包" -"Summary","摘要" -"Supported releases","支持的版本" -"System","系统" -"Target","目标" -"The package %s data has been loaded.","包中 %s 数据已载入。" -"The package data has been saved.","包中数据已保存。" -"There was a problem saving package data","保存包数据时遇到问题" -"Type","类型" -"User","用户" diff --git a/app/locale/zh_CN/Mage_Contacts.csv b/app/locale/zh_CN/Mage_Contacts.csv deleted file mode 100644 index 2be015849..000000000 --- a/app/locale/zh_CN/Mage_Contacts.csv +++ /dev/null @@ -1,19 +0,0 @@ -"* Required Fields","*必要字段" -"Comment","评论" -"Contact Form","联系表单" -"Contact Information","联系信息" -"Contact Us","联系我们" -"Contact Us Form","我们的联系方式" -"Contacts","联系人" -"Contacts Section","联系人区域" -"Email","电子邮件" -"Email Options","电子邮件选项" -"Email Sender","电子邮件发送人" -"Email Template","电子邮件模板" -"Enable Contact Us","启用联系功能" -"Name","姓名" -"Send Emails To","发送邮件到" -"Submit","提交" -"Telephone","电话" -"Unable to submit your request. Please, try again later","无法提交您的请求。请稍候重试" -"Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.","您的咨询已提交，我们将尽快回应。感谢您的联系。" diff --git a/app/locale/zh_CN/Mage_Core.csv b/app/locale/zh_CN/Mage_Core.csv deleted file mode 100644 index 79deb8b21..000000000 --- a/app/locale/zh_CN/Mage_Core.csv +++ /dev/null @@ -1,394 +0,0 @@ -"%s","%s" -"%s already exist.","%s 已存在。" -"%s already exists.","%s 已存在。" -"-- Please Select --","-- 请选择 --" -"Warning! When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain","警告！ 在使用CDN时，某些情况下如果CDN不再您的子域内，JavaScript可能无法正常工作" -"Warning! When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).","警告！当在 URL 中使用商店代码时，某些情况下，如果第三方服务指定了不包含商店代码的 URL（例如 PayPal 等），则系统可能无法正常工作。" -"A category object is required for determining the product request path.","为确定产品申请路径，必须提供分类对象。" -"Add Block Names to Hints","添加块名称到提示中" -"Add Secret Key to URLs","添加密钥Key到URL中" -"Add Store Code to Urls","添加店铺代码到URL中" -"Admin","管理员" -"Admin Base URL","管理基本URL" -"Admin User Emails","管理用户邮件" -"Advanced","高级" -"After selecting a new media storage location, press the Synchronize button - to transfer all media to that location. Media will not be available in the new - location until the synchronization process is complete.","在选择新的媒体存储位置后，请按下 同步 按钮以便将所有媒体文件传输到该位置。除非同步工作完成，否则媒体文件将无法通过新位置使用。" -"Allow Countries","允许的国家" -"Allow Magento Backend to run in frame","允许 Magento Backend 运行在框架中" -"Allow Magento Frontend to run in frame","允许 Magento Frontend 运行在框架中" -"Allow Symlinks","允许的符号链接" -"Allowed IPs (comma separated)","允许的IP（逗号分割）" -"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","允许的文件类型：ICO、PNG、GIF、JPG、JPEG、APNG，SVG。并非所有浏览器都支持所有这些格式！" -"Allows customers to stay logged in when switching between different stores.","允许客户在不同店铺间切换时保持登录。" -"Alternative text for next link in pagination menu. If empty, default arrow image will used.","轮换菜单中链接旁的候选文字。如果为空，则使用默认的箭头图片。" -"Alternative text for previous link in pagination menu. If empty, default arrow image will used.","轮换菜单中上一个链接旁的候选文字。如果为空，则使用默认的箭头图片。" -"An error occurred while saving. Please review the error log.","在保存时出现了错误。请查看错误日志。" -"Anchor Text for Next","下一个的锚点文字" -"Anchor Text for Previous","上一个的锚点文字" -"Anchor symbol (#) is not supported in request path","锚点符号（#）不能用于请求路径中" -"Anchor symbol (#) is not supported in url rewrite suffix","URL 重写后缀不支持固定标志 (#)" -"Are you sure?","您是否确认？" -"Auto-redirect to Base URL","自定重定向到基本 URL" -"Back","返回" -"Backup Options","备份选项" -"Base JavaScript URL","基本 JavaScript URL" -"Base Link URL","基本链接 URL" -"Base Media URL","基本媒体 URL" -"Base Secure URL","基本安全 URL" -"Base Skin URL","基本皮肤 URL" -"Base URL","备份URL" -"Base Unsecure URL","基本不安全 URL" -"Before modifying the store view code please make sure that it is not used in index.php.","请在修改商店视图代码前，确认它没有在 index.php 中使用。" -"Before modifying the website code please make sure that it is not used in index.php.","请在修改网站代码前，确认它没有在 index.php 中使用。" -"Block with name ""%s"" already exists","拥有名称“%s”的区块已存在" -"Browser Capabilities Detection","浏览器功能检测" -"CSS Settings","CSS 设置" -"Cache Storage Management","缓存存储管理" -"Cache storage may contain additional data. Are you sure that you want flush it?","缓存存储可能包含额外数据。您确认要清空它吗？" -"Can not create invoice. Order was not found.","无法创建发票。未找到订单。" -"Can't retrieve request object","无法获取请求对象" -"Can\'t retrieve entity config: %s","无法获取实体配置：%s" -"Cancel","取消" -"Cannot complete this operation from non-admin area.","无法从非管理员区域完成该操作。" -"Card type does not match credit card number.","信用卡类型与信用卡号不匹配。" -"Code","代码" -"Controller file was loaded but class does not exist","控制器文件已载入，但类不存在" -"Cookie Domain","Cookie域" -"Cookie Lifetime","Cookie寿命" -"Cookie Path","Cookie路径" -"Cookie Restriction Mode","Cookie 限制模式" -"Copyright","版权所有" -"Core","核心" -"Countries Options","国家选项" -"Country","国家" -"Create Store","创建店铺" -"Create Store View","创建店铺视图" -"Create Website","创建网站" -"Credit card number does not match credit card type.","信用卡编号与信用卡类型不匹配。" -"Current Package Name","当前包名称" -"Custom Admin Path","自定义管理路径" -"Custom Admin URL","自定义管理 URL" -"Custom Design","自定义设计" -"Custom Email 1","自定义邮件1" -"Custom Email 2","自定义邮件2" -"Custom Variables","自定义变量" -"Custom1 Contact Email","自定义 1 联系邮件" -"Custom1 Contact Name","自定义 1 联系姓名" -"Custom2 Contact Email","自定义 2 联系邮件" -"Custom2 Contact Name","自定义 2 联系姓名" -"Customer Support","客户支持" -"Dashboard","仪表板" -"Date From","日期自" -"Date To","日期至" -"Date/time format ""%s"" is not supported.","日期/时间格式 ""%s"" 不被支持。" -"Debug","调试" -"Default","默认" -"Default Country","默认国家" -"Default Description","默认描述" -"Default Keywords","默认关键字" -"Default No-route URL","默认非路由URL" -"Default Pages","默认页面" -"Default Robots","默认机器人" -"Default Store","默认店铺" -"Default Store View","默认店铺视图" -"Default Title","默认标题" -"Default Web URL","默认Web URL" -"Delete","删除" -"Delete Store","删除店铺" -"Delete Store View","删除店铺视图" -"Delete Website","删除网站" -"Deleting a %1$s will not delete the information associated with the %1$s (e.g. categories, products, etc.), but the %1$s will not be able to be restored. It is suggested that you create a database backup before deleting the %1$s.","删除 %1$s 并不能删除关联给 %1$s 的信息（例如分类、产品等），但 %1$s 将无法被还原。建议首先创建数据库备份，然后再删除 %1$s。" -"Design","设计" -"Design Change","设计更改" -"Developer","开发人员" -"Developer Client Restrictions","开发人员客户端闲置" -"Disable Email Communications","禁用电子邮件通讯" -"Disable Modules Output","禁用模块输出" -"Display Demo Store Notice","显示预览店铺通知" -"Duplicate Of Template Name","模板名称副本" -"Edit Design Change","编辑设计变动" -"Edit Store","编辑店铺" -"Edit Store View","编辑店铺视图" -"Edit Website","编辑网站" -"Empty identifier field name","标识符字段名为空" -"Empty main table name","主表名为空" -"Enable Charts","启用图表" -"Enabled","已启用" -"Enabled for Admin","启用管理" -"Enabled for Frontend","为前端启用" -"Environment Update Time","环境更新时间" -"Error in file: ""%s"" - %s","文件中出错：""%s"" - %s" -"European Union Countries","欧盟成员国" -"Exceptions Log File Name","例外日志文件名" -"Favicon Icon","Favicon图标" -"File %s does not exist","文件 %s 不存在" -"File %s is not readable","文件 %s 不可读" -"File not found","文件未找到" -"File system","文件系统" -"File with an extension ""%value%"" is protected and cannot be uploaded","扩展为 ""%value%"" 的文件受到保护，无法上传" -"First Day of Week","每周第一天" -"Flush Cache Storage","清理缓存存储" -"Flush Magento Cache","清理Magento缓存" -"Footer","脚注" -"Forgot Password Email Sender","忘记密码电子邮件发送" -"Forgot Password Email Template","忘记密码邮件模板" -"General","常规" -"General Contact","常规联系人" -"General Contact Email","一般联络电子邮件" -"General Contact Name","常规联系人姓名" -"General Settings","常规设置" -"Get info about current Magento installation","获取有关当前 Magento 安装的信息" -"Global","全球" -"HTML Head","HTML头" -"HTML tags are not allowed","不允许使用 HTML 标签" -"Header","头部" -"Host","主机" -"How many links to display at once.","一次显示多少链接。" -"ID Path for Specified Store","特定商店的 ID 路径" -"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","如果当前框架位置无法涵盖最大的页面，将呈现链接到当前位置并加/减该数值。" -"Incorrect credit card expiration date.","错误的信用卡到期日。" -"Input type ""%value%"" not found in the input types list.","输入类型“%value%”无法在输入类型列表中找到。" -"Invalid URL '%value%'.","无效的 URL '%value%'." -"Invalid base url type","无效的基础 URL 类型" -"Invalid block name to set child %s: %s","无效的区块名称来设置 %s: %s" -"Invalid block type: %s","无效的区块类型：%s" -"Invalid block: %s","无效的区块：%s" -"Invalid connection","无效的连接" -"Invalid date","Invalid date" -"Invalid layout update handle","无效的布局更新句柄" -"Invalid messages storage ""%s"" for layout messages initialization","对布局消息初始化中无效的消息存储“%s”" -"Invalid query","无效的查询" -"Invalid transactional email code: %s","无效的交易电子邮件代码：%s" -"Invalid website\'s configuration path: %s","无效的网站配置路径：%s" -"JavaScript Settings","JavaScript 设置" -"Layout","布局" -"Leave empty for access from any location.","从任何位置访问留空。" -"List of stores","商店列表" -"Locale","区域" -"Locale Options","区域选项" -"Log Settings","日志设置" -"Logging from Mage::log(). File is located in {{base_dir}}/var/log","登录自 Mage::log()。文件位于 {{base_dir}}/var/log" -"Logging from Mage::logException(). File is located in {{base_dir}}/var/log","登录自 Mage::logException()。文件位于 {{base_dir}}/var/log" -"Login is Case Sensitive","登录信息大小写敏感" -"Logo Image","徽标图像" -"Logo Image Alt","备选徽标图像" -"Logo Image Src","徽标图像Src" -"Magento info","Magento 信息" -"Magento info API","Magento 信息 API" -"Mail Sending Settings","邮件发送设置" -"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","确保基本URL以""/""（斜线）结尾，例如http://yourdomain/magento/" -"Manage Stores","管理店铺" -"Match expressions in the same order as displayed in the configuration.","匹配的表达式将以与配置相同的顺序显示出来。" -"Media Storage","媒体存储" -"Merge CSS Files","合并CSS文件" -"Merge JavaScript Files","合并JavaScript文件" -"Miscellaneous HTML","HTML杂项" -"Miscellaneous Scripts","杂项脚本" -"Model collection resource name is not defined.","模块集合资源名未定义。" -"Module ""%1$s"" cannot depend on ""%2$s"".","模块 ""%1$s"" 无法依存于""%2$s""。" -"Module ""%1$s"" requires module ""%2$s"".","模块 ""%1$s"" 需要模块 ""%2$s""。" -"Name","姓名" -"New Design Change","新设计变动" -"New Store","新店铺" -"New Store View","新店铺视图" -"New Website","新网站" -"No","否" -"Offloader header","Offloader头部" -"PHP SOAP extension is required.","要求 PHP SOAP 扩展。" -"Package","包裹" -"Pagination","轮换" -"Pagination Frame","轮换框架" -"Pagination Frame Skip","跳过轮换框架" -"Parent directory does not exist: %s","父目录不存在：%s" -"Path ""%value%"" is not available and cannot be used.","路径 ""%value%"" 不可用，因此无法使用。" -"Path ""%value%"" is protected and cannot be used.","路径 ""%value%"" 受保护，无法使用。" -"Path ""%value%"" may not include parent directory traversal (""../"", ""..\\).""","路径 ""%value%"" 可能不包含父目录遍历 (""../"", ""..\\).""" -"Please define flag code.","请定义旗帜代码。" -"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","请输入六个或更多字符。开头或结尾处的空格会被忽略。" -"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","请输入至少7个字符。密码应包含数字与字母。" -"Please enter a number 0 or greater in this field.","请在该字段中输入数字0或更大值。" -"Please enter a number 1 or greater in this field.","请在该字段输入数字1或更大值。" -"Please enter a number greater than 0 in this field.","请在该字段中输入大于0的数字。" -"Please enter a number lower than 100.","请输入不超过100个数字。" -"Please enter a valid $ amount. For example $100.00.","请输入有效的金额，例如$100.00。" -"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","请输入有效的 URL 密钥。例如， ""example-page""、""example-page.html""，或 ""anotherlevel/example-page""。" -"Please enter a valid URL. For example http://www.example.com or www.example.com","请输入有效的URL，例如http://www.example.com 或 www.example.com" -"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","请输入有效URL。协议名是必须的（http://、https://，或ftp://）" -"Please enter a valid XML-identifier. For example something_1, block5, id-4.","请输入有效的XML标识符。例如，类似something_1、block5、id-4。" -"Please enter a valid credit card number.","请输入有效的信用卡卡号。" -"Please enter a valid credit card verification number.","请输入有效的信用卡验证码。" -"Please enter a valid date between %s and %s","请在 %s 与 %s 之间输入有效日期。" -"Please enter a valid date equal to or greater than %s","请输入等于或大于 %s 的有效日期" -"Please enter a valid date less than or equal to %s","请输入小于或等于 %s 的有效日期" -"Please enter a valid date.","请输入有效日期" -"Please enter a valid day (1-%d).","请输入有效天数（1-%d）。" -"Please enter a valid email address. For example johndoe@domain.com.","请输入有效邮件地址。例如johndoe@domain.com。" -"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","请输入有效传真号码，例如 (123) 456-7890 或 123-456-7890。" -"Please enter a valid full date","请输入有效完整日期" -"Please enter a valid month (1-12).","请输入有效月份（1-12）。" -"Please enter a valid number in this field.","请在此区域输入有效的数字。" -"Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","请输入有效的电话号码。例如 (123) 456-7890 或 123-456-7890。" -"Please enter a valid social security number. For example 123-45-6789.","请输入有效社会安全号码，例如123-45-6789。" -"Please enter a valid year (1900-%d).","请输入有效年份（1900-%d）。" -"Please enter a valid zip code.","请输入有效的邮政编码。" -"Please enter a valid zip code. For example 90602 or 90602-1234.","请输入有效邮编，例如90602或90602-1234。" -"Please enter issue number or start date for switch/solo card type.","请输入Switch/Solo类卡的颁发号或开始日期。" -"Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","请输入有效 CSS长度。例如， 100px 或 77pt 或 20em 或 .5ex 或 50%。" -"Please make sure your passwords match.","请确保密码匹配。" -"Please select State/Province.","请选择州/省。" -"Please select a file","请选择一个文件" -"Please select an option.","请选择一个选项。" -"Please select one of the above options.","请选择上列选项中的一个。" -"Please select one of the options.","请选择下列一个选项。" -"Please set available and/or protected paths list(s) before validation.","请设置有效并/或受保护的路径列表，随后再验证。" -"Please specify either a category or a product, or both.","请指定分类或产品，或两者都指定。" -"Please use letters only (a-z or A-Z) in this field.","在该字段中请只使用字母（a-z或A-Z）" -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","请在该字段中只使用数字。请不要使用空格或其它字符，例如句点或逗号。" -"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","该字段中请只使用字母（a-z 或 A-Z）或数字（0-9），不能使用空格或其它字符。" -"Please use only letters (a-z or A-Z) or numbers (0-9) or spaces and # only in this field.","该字段中只能使用字母（a-z 或 A-Z）或数字（0-9）或空格，或 # 。" -"Please use only letters (a-z or A-Z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","在此字段中，请仅使用字母（a-z或A-Z）、数字（0-9）或下划线（_），首字符必须为字母。" -"Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","该字段中请只使用字母（a-z）、数字（0-9）以及下划线（_），第一个字符应为字母。" -"Please use only visible characters and spaces.","请只使用可见字符和空格。" -"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","请使用这样的日期格式：dd/mm/yyyy。例如17/03/2006代表2006年3月17日。" -"Please wait, loading...","请稍候，正在加载..." -"Polls","投票" -"Port (25)","端口（25）" -"Profiler","配置文件" -"Recovery Link Expiration Period (days)","恢复链接过期周期（天）" -"Request Path for Specified Store","特殊店铺的请求路径" -"Request path length exceeds allowed %s symbols.","请求的路径长度超过允许的 %s 个符号。" -"Requested file may not include parent directory traversal (""../"", ""..\\ notation)""","所请求的文件可能没有包含在父目录遍历中 (""../"", ""..\\ notation)""" -"Requested invalid store ""%s""","请求了无效店铺 ""%s""" -"Resource is not set.","资源未设置。" -"Retrieve info about current Magento installation","检索有关当前 Magneto 安装的信息" -"Retrieve store data","检索商店数据" -"Retrieve store list","检索商店列表" -"Return-Path Email","返回路径邮件" -"Root Category","根分类" -"Sales Representative","销售代表" -"Sales Representative Contact Email","销售代表联络电子邮件" -"Sales Representative Contact Name","销售代表联系人姓名" -"Save","保存" -"Save Store","保存店铺" -"Save Store View","保存店铺视图" -"Save Website","保存网站" -"Search Engines Optimization","搜索引擎优化" -"Secure","安全" -"Security","安全" -"Select Date","选择日期" -"Select Media Database","选择媒体数据库" -"Sender Email","发送人邮件" -"Sender Name","发送人姓名" -"Services","服务" -"Session Cookie Management","会话Cookie管理" -"Session Lifetime (seconds)","会话寿命（秒）" -"Session Validation Settings","会话验证设置" -"Set Return-Path","设置返回路径" -"Set as Default","设置为默认值" -"Skin (Images / CSS)","皮肤（图片/CSS）" -"Small Logo Image Src","小标志图像源" -"Sort Order","排序顺序" -"Specified date/time ""%1$s"" do not match format ""%2$s"".","指定的日期/时间 ""%1$s"" 不符合格式 ""%2$s""。" -"Start date cannot be greater than end date.","开始日期不能大于结束日期。" -"Startup Page","启动页面" -"Status","状态" -"Storage Configuration for Media","媒体的存储配置" -"Store","商店" -"Store API","商店 API" -"Store Contact Address","店铺联系人地址" -"Store Contact Information","店铺联系人信息" -"Store Contact Telephone","店铺联系人电话号码" -"Store Email Addresses","店铺电子邮件地址" -"Store Information","店铺信息" -"Store Name","店铺名称" -"Store View","店铺视图" -"Store View Information","店铺视图信息" -"Store View Name","店铺视图名称" -"Store view doesn't exist","店铺视图不存在" -"Store with the same code","具有相同代码的商店" -"System","系统" -"System Log File Name","系统日志文件名" -"Template Path Hints","模版路径提示" -"Template Settings","模板设置" -"Template Variables","模版变量" -"Templates","模板" -"Text length does not satisfy specified text range.","文本长度不符合指定的文本长度范围。" -"The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","您输入的 %s 无效。请确保使用了类似 ""http://domain.com/"" 的格式。" -"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value." -"The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","商店代码只可包含字母 (a-z)，数字 (0-9) 或下划线 (_)，首字符必须为字母" -"The store does not exist","商店不存在" -"The store has been deleted.","商店已被删除。" -"The store has been saved.","商店已保存。" -"The store view has been deleted.","商店视图已被删除。" -"The store view has been saved","商店视图已保存" -"The template Name must not be empty.","模板名称不能为空。" -"The value is not within the specified range.","数值不在指定范围内。" -"The website does not exist.","网站不存在。" -"The website has been deleted.","网站已被删除。" -"The website has been saved.","网站已保存。" -"Themes","主题" -"This category and all its child elements","该类别和其全部子元素" -"This category and its child categories only","仅支持该分类与其子分类" -"This category and its products only","仅支持该分类与其产品" -"This category only","仅支持该分类" -"This date is a required value.","该日期为必需值。" -"This is a required field.","这是必填区域。" -"This store cannot be deleted.","该商店无法被删除。" -"This store view cannot be deleted.","商店视图无法被删除。" -"This website cannot be deleted.","该网站无法被删除。" -"This will be displayed just before body closing tag.","这将在正文结束标记前显示。" -"This will be included before head closing tag in page HTML.","这将在 HTML 页面头部结束标记前被包含。" -"Timezone","时区" -"Title Prefix","标题前缀" -"Title Suffix","标题后缀" -"Transactional Emails","交易邮件" -"Translate Inline","翻译内嵌" -"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","对于前端和管理员内嵌翻译，翻译区块和其它输出缓存应被禁用。" -"Translations","翻译" -"Two and more slashes together are not permitted in request path","两个或更多斜杠在请求的路径中不被允许" -"Two and more slashes together are not permitted in url rewrite suffix","两个或更多斜杠在 URL 重写后缀中不被允许" -"Unable to create directory: %s","无法创建目录：%s" -"Unable to delete store view. Please, try again later.","无法删除商店视图。请稍后重试。" -"Unable to delete store. Please, try again later.","无法删除商店。请稍后重试。" -"Unable to delete website. Please, try again later.","无法删除网站。请稍后重试。" -"Unable to proceed. Please, try again","无法继续。请重试" -"Unable to proceed. Please, try again.","无法处理。请重试。" -"Unable to save file ""%s"" at ""%s""","无法保存文件 ""%s"" 中的 ""%s""" -"Unable to save file: %s","无法保存文件：%s" -"Unknown old style column type definition: {$definition}.","未知的旧式列类型定义：{$definition}。" -"Unknown scope ""%s"".","未知范围 ""%s""。" -"Unsecure","不安全" -"Url Options","URL 选项" -"Use Custom Admin Path","使用自定义管理员路径" -"Use Custom Admin URL","使用自定义管理 URL" -"Use HTTP Only","仅使用HTTP" -"Use SID on Frontend","在前端使用 SID" -"Use Secure URLs in Admin","在管理界面使用安全URL" -"Use Secure URLs in Frontend","在前端使用安全 URL" -"Use Web Server Rewrites","使用网络服务器重写" -"VAT Number","VAT 编号" -"Validate HTTP_USER_AGENT","验证 HTTP_USER_AGENT" -"Validate HTTP_VIA","验证 HTTP_VIA" -"Validate HTTP_X_FORWARDED_FOR","验证 HTTP_X_FORWARDED_FOR" -"Validate REMOTE_ADDR","验证 REMOTE_ADDR" -"Validation has failed.","验证失败。" -"Values less than 60 are ignored. Note that changes will apply after logout.","忽略小于60的值。请注意更改将在登出后生效。" -"Variable Code must be unique.","变量代码必须是唯一的。" -"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","警告！不建议在生产环境中启用该功能，因为可能带来潜在的安全隐患。" -"Web","Web" -"Website","网站" -"Website Information","网站信息" -"Website Name","网站名称" -"Website code may only contain letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","网站代码只能包含字母（a到z）、数字（0到9）或下划线（_），且第一个字符必须是字母。" -"Website with the same code","使用相同代码的网站" -"Weekend Days","周末" -"Welcome Text","欢迎信息" -"Wrong file info format","错误的文件信息格式" -"Wrong number of arguments for %s","%s 的参数有误" -"Wrong old style column type definition: {$definition}.","定义的老式栏目类型有误： {$definition}。" -"Yes","是" -"You will have to log in after you save your custom admin path.","保存您的自定义管理路径后，您需要重登录。" -"Your design change for the specified store intersects with another one, please specify another date range.","您对指定商店设计的更改和另一个有交叉，请重新指定日期范围。" -"database ""%s""","数据库 ""%s""" diff --git a/app/locale/zh_CN/Mage_Cron.csv b/app/locale/zh_CN/Mage_Cron.csv deleted file mode 100644 index e05299dc3..000000000 --- a/app/locale/zh_CN/Mage_Cron.csv +++ /dev/null @@ -1,24 +0,0 @@ -"10 minutes","10 分钟" -"15 minutes","15 分钟" -"20 minutes","20 分钟" -"30 minutes","30 分钟" -"5 minutes","5 分钟" -"Cron (Scheduled Tasks) - all the times are in minutes","Cron（计划任务） = 所有时间均以分钟为单位" -"Daily","每天" -"Failure History Lifetime","失败历史生命期" -"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","对于 cron 运行时生成的正确的 URL，请确保网络 > 安全和不安全的基本 URL 已明确设置。" -"Generate Schedules Every","生成计划，每" -"History Cleanup Every","清除历史记录，每" -"Hourly","每小时" -"Invalid callback: %s::%s does not exist","无效的回调：%s::%s 不存在" -"Invalid model/method definition, expecting ""model/class::method"".","无效的模型/方法定义，期望值“模型/类::方法”。" -"Minute Intervals","分钟间隔" -"Missed if Not Run Within","丢失，如果未运行在" -"Monthly","每月" -"No callbacks found","没有找到回调" -"Schedule Ahead for","提前计划，为" -"Success History Lifetime","成功历史生命期" -"Too late for the schedule.","对计划而言过晚。" -"Unable to delete the cron task.","无法删除 Corn 任务。" -"Unable to save the cron expression.","无法保存Cron表达式。" -"Weekly","每周" diff --git a/app/locale/zh_CN/Mage_CurrencySymbol.csv b/app/locale/zh_CN/Mage_CurrencySymbol.csv deleted file mode 100644 index 52659586d..000000000 --- a/app/locale/zh_CN/Mage_CurrencySymbol.csv +++ /dev/null @@ -1,10 +0,0 @@ -"Currency","币种" -"Custom currency symbols were applied successfully.","顾客货币符号已成功应用。" -"Manage Currency","管理货币" -"Manage Currency Rates","管理汇率" -"Rates","费率" -"Save Currency Symbols","保存货币符号" -"Symbol","符号" -"Symbols","符号" -"System","系统" -"Use Standard","使用标准" diff --git a/app/locale/zh_CN/Mage_Customer.csv b/app/locale/zh_CN/Mage_Customer.csv deleted file mode 100644 index 37c721194..000000000 --- a/app/locale/zh_CN/Mage_Customer.csv +++ /dev/null @@ -1,469 +0,0 @@ -" or ","或" -"'%value%' appears to be a DNS hostname but cannot extract TLD part","“%value%” 似乎是一个 DNS 主机名，但无法提取 TLD 部分" -"'%value%' appears to be a DNS hostname but cannot match TLD against known list","“%value%” 似乎是一个 DNS 主机名，但无法与已知列表匹配 TLD" -"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","“%value%” 似乎是一个 DNS 主机名，但无法与 TLD “%tld%” 的主机名模式相匹配。" -"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","“%value%” 似乎是一个 DNS 主机名，但在无效位置包含破折号" -"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' 似乎是 DNS 主机名，但无法对指定的 Punycode符号解码" -"'%value%' appears to be a local network name but local network names are not allowed","'%value%' 似乎是本地网络名称，此处不能使用本地网络名称" -"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' 似乎是 IP 地址，此处不能使用 IP 地址" -"'%value%' does not appear to be a valid local network name","'%value%' 似乎不是有效的本地网络名" -"* Required Fields","*必要字段" -"ALL GROUPS","所有群组" -"Account Dashboard","账户显示板" -"Account Information","帐户信息" -"Account Sharing Options","账户分享选项" -"Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please click here.","帐户信息是必须的。请使用您电子邮件中的确认链接。要重新发送确认电子邮件，请 点击这里。" -"Action","操作" -"Add New Address","添加新地址" -"Add New Customer","添加新客户" -"Add New Customer Group","添加新客户群组" -"Added From","已添加，来自" -"Additional Address Entries","额外地址行" -"Address","地址" -"Address Book","地址薄" -"Address Books","地址簿" -"Address Information","地址信息" -"Address Templates","地址模板" -"Addresses","地址" -"Admin","管理员" -"All","全部" -"All Store Views","所有店铺视图" -"All countries","所有国家" -"Always optional.","总是可选。" -"Amount","数量" -"An error occurred while deleting the address.","删除该地址时遇到了错误。" -"An error occurred while retrieving the option value: %s.","获取选项值 %s 时遇到了错误。" -"An error occurred while saving the collection, aborting. Error: %s","保存集合时遇到了错误，正在忽略，错误号：%s" -"An invalid option ID is specified for %s (%s), skipping the record.","%s (%s)为无效的选项ID，跳过此记录。" -"Approved","已批准" -"Are you sure that you want to remove this item?","您是否确认要删除该内容？" -"Are you sure you want to cancel adding of this address?","您是否确认要取消添加该地址？" -"Are you sure you want to delete this address?","您是否确认要删除该地址？" -"Are you sure?","您是否确认？" -"Array of Entity collections is expected.","预期获得实体集合阵列。" -"Assign a Customer Group","分配客户组" -"Average Sale","平均销售" -"Back","返回" -"Back - link to the previously viewed page","返回 - 链接到上一个看过的页面" -"Back to Login","返回到登录界面" -"Bad request.","请求有误。" -"Based on the VAT ID, the customer would belong to the Customer Group %s.","根据 VAT ID 来看，该客户应该属于客户群体 %s。" -"Bill to Name","记账姓名" -"Bought From","购自" -"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","通过在我们的店铺中创建帐户，您将能用更快速度结账，保存多个送货地址，并可在您的帐户中查看并追踪您的订单，还有更多功能。" -"CSV","CSV" -"Cancel","取消" -"Cannot save a new password.","无法保存新密码。" -"Cannot save address.","无法保存地址。" -"Cannot save the customer.","无法保存客户。" -"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","无法全局分享客户帐户，因为某些客户的帐户所用的邮件地址在多个网站是相同的，无法合并。" -"Change Account Password","更改帐户密码" -"Change Billing Address","更改账单地址" -"Change Password","更改密码" -"Change Shipping Address","更改送货地址" -"City","城市" -"Company","公司" -"Config","配置" -"Configure","配置" -"Confirm New Password","确认新密码" -"Confirm Password","确认密码" -"Confirmation Link Email","确认链接邮件" -"Confirmed","已确认" -"Contact Information","联系信息" -"Continue Shopping","继续购物" -"Country","国家" -"Create","创建" -"Create New Account Options","创建新帐户选项" -"Create New Customer Account","创建新客户帐户" -"Create Order","创建订单" -"Create an Account","创建帐户" -"Create customer","创建客户" -"Create customer address","创建客户地址" -"Current Password","当前密码" -"Customer","客户" -"Customer API","自定义 API" -"Customer Account Edit Form","客户帐户编辑表单" -"Customer Account Login Form","客户帐户登录表单" -"Customer Account Logout Success","客户帐户注销成功" -"Customer Account Registration Form","客户账户注册自" -"Customer Addresses","客户地址" -"Customer Configuration","客户配置" -"Customer Forgot Password Form","客户忘记密码表单" -"Customer Group","客户组" -"Customer Groups","客户组" -"Customer Information","客户信息" -"Customer Login","客户登录" -"Customer My Account (All Pages)","客户我的帐户（所有页面）" -"Customer My Account Address Book","客户我的帐户地址簿" -"Customer My Account Address Edit Form","客户我的帐户地址编辑表单" -"Customer My Account Dashboard","客户我的帐户仪表板" -"Customer Since","客户加入日期" -"Customer View","客户视图" -"Customer collection expected.","预期的客户集合。" -"Customer email is required","需要客户邮件" -"Customer website ID must be specified when using the website scope","使用网站范围时必须指定客户网站ID" -"Customer will stay on the current page if ""No"" is selected.","如果选择“否”，客户将停留在当前页面。" -"Customers","客户" -"Customers Only","仅限客户" -"Customers Section","客户区域" -"DD","DD" -"Date","日期" -"Date Added","添加日期" -"Date of Birth","出生日期" -"Day","天" -"Days in Wishlist","位于愿望清单的天数" -"Default Addresses","默认地址" -"Default Billing Address","默认账单地址" -"Default Email Domain","默认邮件域" -"Default Group","默认组" -"Default Shipping Address","默认送货地址" -"Default Value for Disable Automatic Group Changes Based on VAT ID","禁用根据 VAT ID 自动分配顾客组变动的默认值" -"Default Welcome Email","默认欢迎邮件" -"Delete","删除" -"Delete Address","删除地址" -"Delete Customer","删除客户" -"Delete Customer Group","删除客户组" -"Delete customer","删除客户" -"Delete customer address","删除客户地址" -"Deleted Stores","删除店铺" -"Details","详情" -"Disabled","已禁用" -"Edit","编辑" -"Edit Account Info","编辑帐户信息" -"Edit Account Information","修改帐户信息" -"Edit Address","编辑地址" -"Edit Address Entry","编辑地址项" -"Edit Customer Group ""%s""","编辑客户组 ""%s""" -"Edit Customer Groups","编辑客户组" -"Edit Customer's Address","编辑客户的地址" -"Edit Group","编辑组" -"Edit Newsletters","编辑新闻邮件" -"Email","电子邮件" -"Email Address","编辑电子邮件地址" -"Email Sender","电子邮件发送人" -"Email:","电子邮件：" -"Enable Automatic Assignment to Customer Group","启用顾客群体的自动分配" -"Entity collection is expected.","预期为实体集合。" -"Excel XML","Excel XML" -"Failed to confirm customer account.","确认客户帐户失败。" -"Fax","传真" -"First Name","名字" -"Forgot Email Template","忘记邮件模板" -"Forgot Password","忘记密码" -"Forgot Your Password","忘记您的密码" -"Forgot Your Password?","忘记您的密码？" -"Forgot and Remind Email Sender","忘记并提醒邮件发送者" -"Form Fields Before","表单字段，先于" -"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","在您的我的帐户仪表板中，您可以查看最近帐户活动的快照，并更新帐户信息。选择下面的链接以查看或修改信息。" -"Gender","性别" -"Gender is required.","需提供性别信息。" -"General Subscription","常规订阅" -"Generate Human-Friendly Customer ID","生成人性化客户 ID" -"Global","全球" -"Group","分组" -"Group Information","群组信息" -"Group Name","群组名称" -"Group for Invalid VAT ID","无效 VAT ID 组" -"Group for Valid VAT ID - Domestic","无效 VAT ID 组 - 国内" -"Group for Valid VAT ID - Intra-Union","有效 VAT ID 组 - 联邦内" -"Guest","来宾" -"HTML","HTML" -"Hello, %s!","您好， %s！" -"ID","ID" -"IP Address","IP地址" -"If you believe this is an error, please contact us at %s","如果你觉得有错误，请联系我们 %s" -"If you have an account with us, please log in.","如果您拥有账户，请登录。" -"Invalid attribute option specified for attribute %s (%s), skipping the record.","为属性 %s (%s) 指定的属性选项无效，正在跳过该记录。" -"Invalid attribute set specified, skipping the record.","指定的属性集无效，正在跳过该记录。" -"Invalid billing address for (%s)","(%s) 的帐单地址无效" -"Invalid current password","当前密码无效" -"Invalid customer data","客户数据无效" -"Invalid email address ""%s"".","电子邮件地址 ""%s"" 无效。" -"Invalid email address.","邮件地址无效。" -"Invalid login or password.","无效的登录名或密码。" -"Invalid password reset token.","无效的密码重设令牌。" -"Invalid shipping address for (%s)","(%s) 的发货地址无效" -"Invalid store specified, skipping the record.","指定的店铺无效，正在跳过该记录。" -"Invalid website, skipping the record, line: %s","网站无效，跳过该记录，行：%s" -"Last Activity","上次活动" -"Last Date Subscribed","上次订阅的日期" -"Last Date Unsubscribed","上次退订的日期" -"Last Name","姓氏" -"Last URL","最后一个URL" -"Leave empty for default (15 minutes).","留空可使用默认值（15分钟）。" -"Leave empty for default (2). Valid range: 1-4","留空可使用默认值（2）.有效范围：1-4" -"Lifetime Sales","终生销售" -"Log In","登录" -"Log Out","注销" -"Login","登录" -"Login Information","登录信息" -"Login Options","登录选项" -"Login and password are required.","需要登录和密码。" -"Login or Create an Account","登录或创建帐户" -"MM","MM" -"Manage Addresses","管理地址" -"Manage Customers","管理客户" -"Maximum length must be less then %s symbols","最大长度不能超过 %s 个字符" -"Missing email, skipping the record, line: %s","电子邮件丢失，跳过该记录，行：%s" -"Missing email, skipping the record.","邮件缺失，正在跳过该记录。" -"Missing first name, skipping the record, line: %s","名字丢失，跳过该记录，行：%s" -"Missing firstname, skipping the record.","缺少名字，跳过记录。" -"Missing last name, skipping the record, line: %s","姓氏丢失，跳过该记录，行：%s" -"Missing lastname, skipping the record.","缺少姓氏，跳过记录。" -"Missing website, skipping the record, line: %s","网站丢失，跳过该记录，行：%s" -"Month","月" -"My Account","我的帐户" -"My Account Wrapper","我的帐户包装" -"My Dashboard","我的仪表板" -"My Orders","我的订单" -"Name","姓名" -"Name and Address Options","名字和地址选项" -"Never","永不" -"New Address","新地址" -"New Address Entry","新地址项" -"New Customer","新顾客" -"New Customer Address","新建客户地址" -"New Customer Group","新客户组" -"New Customer Groups","新建客户组" -"New Customers","新客户" -"New Group","新组" -"New Password","新密码" -"New account","新帐户" -"New account confirmation key","新建客户确认密钥" -"New account confirmed","新帐户已确认" -"New password field cannot be empty.","新密码字段不能为空。" -"Newsletter","新闻邮件" -"Newsletter Finish","新闻邮件结束" -"Newsletter Information","新闻邮件信息" -"Newsletter Received","新闻邮件已收到" -"Newsletter Start","新闻邮件开始" -"Newsletter Subscription","新闻邮件订阅" -"Newsletters","新闻邮件" -"No Items Found","未找到项目" -"No Newsletter Found","未找到新闻邮件" -"No customer collections found","未找到客户集合" -"No item specified.","未指定项目" -"Not Sent","未发送" -"Not confirmed, can login","未确认，可登录" -"Not confirmed, cannot login","未确认，无法登陆" -"Number of Lines in a Street Address ","街道地址的行数" -"Offline","离线" -"Online","在线" -"Online Customers","在线客户" -"Online Customers Options","在线客户选项" -"Online Minutes Interval","在线分钟数间隔" -"Order #","订单 #" -"Order Total","订单总数" -"Orders","订单" -"PDF","PDF" -"Password","密码" -"Password Management","密码管理" -"Password Options","密码选项" -"Password forgotten","密码忘记" -"Password:","密码：" -"Paused","已暂停" -"Pending","挂起" -"Per Website","每网站" -"Personal Information","个人信息" -"Please enter a number 1 or greater in this field.","请在该字段输入数字1或更大值。" -"Please enter a valid date between %s and %s at %s.","请在%s输入介于%s 与 %s 之间的有效日期。" -"Please enter a valid date equal to or greater than %s at %s.","请在 %s 输入等于或大于 %s 的有效日期。" -"Please enter a valid date less than or equal to %s at %s.","请在 %s 输入小于或等于 %s 的有效日期。" -"Please enter the city.","请输入城市。" -"Please enter the country.","请输入国家。" -"Please enter the first name.","请输入名字。" -"Please enter the last name.","请输入姓氏。" -"Please enter the state/province.","请输入州/省。" -"Please enter the street.","请输入街道。" -"Please enter the telephone number.","请输入电话号码。" -"Please enter the zip/postal code.","请输入邮编。" -"Please enter your email address below. You will receive a link to reset your password.","请在下面输入你的电子邮件地址。你将收到一个重置密码的链接。" -"Please enter your email below and we\'ll send you confirmation link for it.","请在下面输入您的邮件地址，我们将发送确认链接。" -"Please enter your email.","请输入您的电子邮件。" -"Please make sure your passwords match.","请确保密码匹配。" -"Please select a website which contains store view","请选择包含该店铺视图的网站" -"Please select region, state or province","请选择地区、州，或省" -"Please, check your email for confirmation key.","请检查您的电子邮件以获取确认密钥。" -"Prefix Dropdown Options","前缀下拉菜单选项" -"Price","价格" -"Product","产品" -"Product ID","产品 ID" -"Product Name","产品名" -"Product Reviews","产品评测" -"Product Tags","产品标签" -"Purchase On","购买时间：" -"Purchased On","购买于" -"Qty","数量" -"Recent Orders","近期订单" -"Records for %s store found.","%s 店铺的记录已找到。" -"Recovery Link Expiration Period (days)","恢复链接过期周期（天）" -"Redirect Customer to Account Dashboard after Logging in","登录后，重定向客户到账户显示板" -"Refunded","已存储" -"Register","注册" -"Registered Customers","已注册的客户" -"Remind Email Template","提醒邮件模板" -"Remind Password","提醒密码" -"Remove","删除" -"Require Emails Confirmation","需要确认电子邮件" -"Reset a Password","重置密码" -"Retrieve address data","获取地址数据" -"Retrieve address info","获取地址信息" -"Retrieve customer addresses","获取客户地址" -"Retrieve customer data","获取用户数据" -"Retrieve customer groups","获取客户组" -"Retrieve customer info","获取客户信息" -"Retrieve customers","获取客户、" -"Retrieve your confirmation link here","在这里获取您的确认链接" -"Retrieve your password here","在这里获取您的密码" -"SKU","SKU" -"Sales Statistics","销售数据统计" -"Save","保存" -"Save Address","保存地址" -"Save Customer","保存客户" -"Save Customer Group","保存客户群组" -"Save Password","保存密码" -"Save and Continue Edit","保存并继续编辑" -"Saved %d record(s)","已保存 %s 条记录" -"Semicolon (;) separated values.
    Put semicolon in the beginning for empty first option.
    Leave empty for open text field.","用分号（;）分隔值。
    将分号放在第一个选项前面的空白处。
    对于打开文字的字段请留空。" -"Send Auto-Generated Password","发送自动生成的密码" -"Send From","发送自" -"Send Welcome Email","发送欢迎邮件" -"Send Welcome Email after Confirmation","在确认后发送欢迎邮件" -"Send confirmation link","发送确认链接" -"Sending","正在发送" -"Sent","已发送" -"Session Start Time","会话开始时间" -"Set as Default Billing Address","设置为默认账单地址" -"Set as Default Shipping Address","设置为默认运送地址" -"Share Customer Accounts","分享客户账户" -"Shipped to First Name","运送至名字" -"Shipped to Last Name","发送给姓氏" -"Shipped to Name","运送至姓名" -"Shopping Cart","购物车" -"Shopping Cart - %d item(s)","购物车 - %d 个项目" -"Shopping Cart of %1$s - %2$d item(s)","购物车包含 %1$s - %2$d 件商品" -"Show Date of Birth","显示出生日期" -"Show Gender","显示性别" -"Show Middle Name (initial)","显示中间名（初始）" -"Show Prefix","显示前缀" -"Show Suffix","显示后缀" -"Show Tax/VAT Number","显示税/增值税号码" -"Show VAT Number on Frontend","在前端显示 VAT 号码" -"Sign Up for Newsletter","订阅新闻邮件" -"Skipping import row, required field ""%s"" is not defined.","跳过导入的行，必须的 ""%s"" 字段未定义。" -"Skipping import row, website ""%s"" field does not exist.","跳过导入的行，网站 ""%s"" 字段不存在。" -"State/Province","州/省" -"Status","状态" -"Store","商店" -"Store View","店铺视图" -"Street Address","街道地址" -"Street Address %s","街道地址 %s" -"Subject","主题" -"Submit","提交" -"Subscribe to Newsletter","订阅到新闻通讯" -"Subscribed to Newsletter?","是否订阅新闻邮件？" -"Suffix Dropdown Options","后缀下拉菜单选项" -"Tag Name","标签名称" -"Tax Calculation Based On","税金的计算基于" -"Tax Class","税率" -"Tax/VAT number","税/增值税号码" -"Telephone","电话" -"Text","文字" -"Text One Line","一行文字" -"Thank you for registering with %s.","感谢您注册 %s。" -"The Date of Birth is required.","需提供生日。" -"The TAX/VAT number is required.","需提供 TAX/VAT 号码。" -"The VAT ID entered (%s) is not a valid VAT ID.","输入的 VAT ID (%s) 不是有效的 VAT ID。" -"The VAT ID entered (%s) is not a valid VAT ID. The customer would belong to Customer Group %s.","输入的 VAT ID (%s) 不是有效的 VAT ID。该顾客应属于顾客群体 %s。" -"The VAT ID is valid. The current Customer Group will be used.","VAT ID 有效。将使用当前的顾客群体。" -"The account information has been saved.","帐户信息已保存。" -"The address does not belong to this customer.","该地址不输入此用户。" -"The address has been deleted.","地址已删除。" -"The address has been saved.","地址已保存。" -"The customer ID and email did not match, skipping the record, line: %s","顾客 ID 与电子邮件不匹配，跳过该记录，行：%s" -"The customer does not have default billing address.","客户未设置默认账单地址。" -"The customer email (%s) already exists, skipping the record, line: %s","顾客邮件（%s）已经存在，跳过该记录，行：%s" -"The customer group has been deleted.","客户组已删除。" -"The customer group has been saved.","客户群组已保存。" -"The customer is currently assigned to Customer Group %s.","该顾客被分配到顾客群体 %s。" -"The first name cannot be empty.","名字不能为空。" -"The group ""%s"" cannot be deleted","组 ""%s"" 无法删除" -"The last name cannot be empty.","姓氏不能为空。" -"The minimum password length is %s","密码长度最小值为 %s" -"The password cannot be empty.","密码不能为空。" -"The password must have at least 6 characters. Leading or trailing spaces will be ignored.","密码必须包含至少 6 个字符。前导或尾随空格将被忽略。" -"The suffix that goes after name (Jr., Sr., etc.)","名字后面的后缀（Jr.、Sr.等）" -"The title that goes before name (Mr., Mrs., etc.)","姓名前称谓（先生、女士等）" -"There are no items in customer's wishlist at the moment","客户的愿望清单中目前没内容" -"There are no items in customer\'s shopping cart at the moment","客户的购物车中目前没内容" -"There is already an account with this email address. If you are sure that it is your email address, click here to get your password and access your account.","已有帐户使用该电子邮件地址。如果您确认这是您自己的电子邮件地址，请 点击这里 获取您的密码并访问帐户。" -"There was an error validating the VAT ID.","验证 VAT ID 时出错。" -"There was an error validating the VAT ID. The customer would belong to Customer Group %s.","验证 VAT ID 时出错。该顾客可属于顾客群体 %s。" -"This account is not confirmed.","该帐户尚未确认。" -"This customer email already exists","该客户电子邮件地址已存在" -"This customer has no saved addresses.","该客户没有保存的密码。" -"This email does not require confirmation.","该电子邮件不需要确认。" -"This email will be sent instead of default welcome email, after account confirmation.","在确认帐户后，该邮件将代替默认欢迎邮件发送。" -"This is My Default %s Address","这是我的默认 %s 地址" -"To Cart","到购物车" -"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","要在前端显示 VAT 号码，请将“在前端显示 VAT 号码”设置为“是”。" -"Total","总数" -"Type","类型" -"Unable to save the customer.","无法保存到客户。" -"Unknown","未知" -"Unsubscribe from Newsletter","退订新闻邮件" -"Update","更新" -"Update customer address data","更新客户地址数据" -"Update customer data","更新客户数据" -"Use as My Default %s Address","使用并作为我的默认 %s 地址" -"Use as My Default Billing Address","用作我的默认账单地址" -"Use as My Default Shipping Address","用作我的默认运送地址" -"Use as my default billing address","使用并作为我的默认账单地址" -"Use as my default shipping address","使用并作为我的默认运送地址" -"VAT Number","VAT 编号" -"VAT Request Date","VAT 请求日期" -"VAT Request Identifier","VAT 申请标识符" -"Validate VAT Number","验证 VAT 号码" -"Validate on Each Transaction","每次交易都验证" -"Validation Error Group","验证错误组" -"View","查看" -"View Order","查看订单" -"Visitor","访客" -"Visitors Only","仅限访客" -"Website","网站" -"Welcome Email","欢迎邮件" -"Wishlist","愿望清单" -"Wishlist - %d item(s)","愿望清单 - %d 个项目" -"Would you like to change the Customer Group for this order?","你是否想更改该订单的顾客群体？" -"Wrong confirmation key.","错误的确认密钥。" -"Wrong customer account specified.","指定的客户帐户有误。" -"Wrong email.","邮件有误。" -"Wrong transactional account email type","错误的交易账户电子邮件类型" -"YYYY","YYYY" -"Year","年" -"You are currently not subscribed to any newsletter.","您当前没有订阅任何新闻通讯。" -"You are currently not subscribed to our newsletter.","您目前没有订阅我们的时事通讯。" -"You are currently subscribed to 'General Subscription'.","您当前已订阅“常规订阅”。" -"You are currently subscribed to our newsletter.","您当前已订阅我们的新闻通讯。" -"You are now logged out","您已注销" -"You have logged out and will be redirected to our homepage in 5 seconds.","您已退出，5秒钟内会回到首页。" -"You have no additional address entries in your address book.","您的地址薄中没有额外的地址条目。" -"You have no additional entries in your address book.","您的地址簿里有没有额外的条目。" -"You have no default billing address in your address book.","您的地址薄中没有默认账单地址。" -"You have no default entries in your address book.","您的地址薄里没有默认的条目。" -"You have no default shipping address in your address book.","您的地址薄中没有默认运送地址。" -"You have not set a default billing address.","您还没有设置默认的账单地址。" -"You have not set a default shipping address.","您尚未设置默认的运送地址。" -"You have placed no orders yet.","您还没下过订单。" -"You have placed no products yet.","您尚未放置产品。" -"You will be charged tax.","你将被收税。" -"You will not be charged tax.","你不需要交税。" -"Your Tax ID cannot be validated.","你的纳税 ID 无法验证。" -"Your VAT ID was successfully validated.","你的 VAT ID 已成功验证。" -"Your account balance is: %s","您的账户余额为：%s" -"ZIP","邮编" -"ZIP/Post Code","邮政编码" -"Zip/Postal Code","邮政编码" -"n/a","不可用" -"or","或" -"register","注册" diff --git a/app/locale/zh_CN/Mage_Dataflow.csv b/app/locale/zh_CN/Mage_Dataflow.csv deleted file mode 100644 index fb4941833..000000000 --- a/app/locale/zh_CN/Mage_Dataflow.csv +++ /dev/null @@ -1,32 +0,0 @@ -"Link","链接" -"Actions XML is not valid.","操作 XML 无效。" -"An error occurred while opening file: ""%s"".","打开文件“%s” 时发生错误。" -"Could not load file: ""%s"".","无法载入文件：“%s”。" -"Could not save file: %s.","无法保存文件：%s。" -"Declared adapter %s was not found.","声明的适配器 %s 未找到。" -"Destination folder ""%s"" is not a directory.","目标文件夹“%s”不是一个目录。" -"Destination folder ""%s"" is not writable.","目标文件夹“%s”不可写。" -"Done","完成" -"Dry run set, stopping execution.","排练集合，停止执行。" -"ETA: %s","ETA：%s" -"Error in field mapping: field list for mapping is not defined.","字段映射错误错误：字段映射列表未定义。" -"File ""%s"" does not exist.","文件“%s”不存在。" -"Found %d rows.","已找到 %d 行。" -"Less than a minute","小于 1 分钟" -"Loaded successfully: ""%s"".","载入成功：“%s”。" -"Memory Used: %s","已使用内存：%s" -"Method ""%s"" not defined in adapter %s.","方法“%s”没有定义在适配器 %s 中。" -"Method ""%s"" was not defined in adapter %s.","方法“%s”没有定义在适配器 %s 中。" -"Please declare ""adapter"" and ""method"" nodes first.","请先声明“适配器”和“方法”节点。" -"Processed records: %s","已处理记录：%s" -"Profile with the same name already exists.","使用该名称的配置文件已存在。" -"Saved successfully: ""%s"" [%d byte(s)].","保存成功：“%s” [%d 字节]。" -"Sheet 1","表 1" -"Skip undefined row.","跳过未定义行。" -"Starting %s :: %s","正在开始 %s :: %s" -"The destination folder ""%s"" does not exist or there is no access to create it.","目标文件夹“%s”不存在或没有访问权限来创建它。" -"Total records: %s","总记录数：%s" -"hour","小时" -"hours","小时" -"minute","分钟" -"minutes","分钟" diff --git a/app/locale/zh_CN/Mage_Directory.csv b/app/locale/zh_CN/Mage_Directory.csv deleted file mode 100644 index 4a675b893..000000000 --- a/app/locale/zh_CN/Mage_Directory.csv +++ /dev/null @@ -1,49 +0,0 @@ -"-- Please select --","--请选择--" -"Allowed Currencies","允许的货币" -"Base Currency","基准货币" -"Base currency is used for all online payment transactions. Scope is defined by the catalog price scope (""Catalog"" > ""Price"" > ""Catalog Price Scope"").","基准货币将被所有在线支付交易所使用。范围则是由分类价格范围 (""分类"" > ""价格"" > ""分类价格范围"")决定的。" -"Can\'t convert rate from ""%s-%s"".","无法执行 ""%s-%s"" 费率转换。" -"Cannot retrieve rate from %s.","无法从 %s 获取费率。" -"Connection Timeout in Seconds","连接超时的秒数" -"Continue »","继续 »" -"Country","国家" -"Country API","国家API" -"Country and Format Type combination should be unique","国家和格式类型的组合必须是唯一的" -"Currency","币种" -"Currency Options","货币选项" -"Currency Setup","币种设置" -"Currency Update Warnings","货币更新警告" -"Default Display Currency","默认显示的币种" -"Directory","目录" -"Display not required State","显示不需要的州" -"Enabled","已启用" -"Error Email Recipient","邮件接收有误" -"Error Email Sender","邮件发送有误" -"Error Email Template","邮件模板有误" -"FATAL ERROR:","致命错误：" -"Frequency","频率" -"Installed Currencies","已安装的币种" -"Invalid Import Service specified.","指定的导入服务无效。" -"Invalid country code: %s","无效的国家代码：%s" -"Invalid rates received","收到的费率无效" -"Invalid target currency.","目标币种无效。" -"List of countries","国家列表" -"List of regions in specified country","所指定国家中的地区列表" -"Postal Code is Optional for the following countries","下列国家的邮编是可选的" -"Region","地区" -"Region API","地区API" -"Scheduled Import Settings","计划的导入设置" -"Select Your Currency","选择您的币种" -"Service","服务" -"Start Time","开始时间" -"State is required for","需要将州信息用于" -"State/Province","州/省" -"States Options","州选项" -"Strikeiron Email Update Warnings","严重的邮件更新警告" -"Unable to initialize the import model.","无法初始化导入模块。" -"Undefined rate from ""%s-%s"".","未定义的费率 ""%s-%s""。" -"WARNING:","警告：" -"Webservicex","Web服务" -"Your Currency","您的货币" -"Your Currency:","您的货币：" -"Your current currency is: %s","您的当前币种为：%s" diff --git a/app/locale/zh_CN/Mage_Downloadable.csv b/app/locale/zh_CN/Mage_Downloadable.csv deleted file mode 100644 index 5afaa98f6..000000000 --- a/app/locale/zh_CN/Mage_Downloadable.csv +++ /dev/null @@ -1,95 +0,0 @@ -"Add","添加" -"Add New Row","添加新行" -"Add links and samples to downloadable product","为可下载产品添加链接与范例" -"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.","建议对文件名使用字母、横线，以及下划线字符。错误的字符将被使用 \'_\'替换。" -"An error occurred while getting the requested content.","获取所请求的内容时出错。" -"An error occurred while getting the requested content. Please contact the store owner.","获取所请求的内容时出错。请联系店铺所有者。" -"An error occurred while saving the file(s).","保存文件时出错。" -"Availability:","可用性：" -"Back","返回" -"Canceled","已取消" -"Cannot connect to remote host, error: %s.","无法联系远程主机，错误：%s" -"Catalog Product View (Downloadable)","分类产品视图（可下载）" -"Category API","分类API" -"Customer My Account Downloadable Items","客户我的帐户仪表板项目" -"Date","日期" -"Default Link Title","默认链接标题" -"Default Maximum Number of Downloads","下载数量默认最大值" -"Default Sample Title","默认范例标题" -"Delete","删除" -"Disable Guest Checkout if Cart Contains Downloadable Items","如果购物车包含可下载内容，则禁止来宾结账" -"Downloadable Information","可下载的信息" -"Downloadable Product","可下载产品" -"Downloadable Product Options","可下载产品选项" -"Downloadable Product Section","可下载产品区块" -"Edit","编辑" -"Edit item parameters","编辑项目参数" -"Excl. Tax","不含税" -"File","文件" -"From:","来自：" -"Gift Message","礼品消息" -"Go to My Downloadable Products","转到 我的可下载产品" -"Guest checkout will only work with shareable.","来宾结账空能仅限可分享商品。" -"In stock","现货" -"Incl. Tax","含税" -"Invalid download URL host.","无效的下载URL主机。" -"Invalid download URL scheme.","无效的下载URL架构。" -"Invalid download link type.","无效的下载链接类型。" -"Invoiced","已出发票" -"Links can be purchased separately","链接可单独购买" -"List","列表" -"Max. Downloads","最大下载数" -"Message:","信息：" -"Move","移动" -"Move to wishlist","移动到愿望清单" -"My Downloadable Products","我的可下载产品" -"Open Links in New Window","在新窗口打开链接" -"Order #","订单 #" -"Order Item Status to Enable Downloads","订单项目状态为允许下载" -"Order id cannot be null","订单编号不能为空" -"Order item id cannot be null","订购物品 id 不能为空" -"Ordered","已下单" -"Out of stock","缺货" -"Pending","挂起" -"Please log in to download your product or purchase %s.","请登录以下载您的产品或购买 %s。" -"Please log in to download your product.","请登录以下载您的产品" -"Please set resource file and link type.","请设置资源类型与链接类型。" -"Please specify product link(s).","请指定产品链接。" -"Price","价格" -"Product downloadable links","产品下载链接" -"Qty","数量" -"Refunded","已存储" -"Remaining Downloads","剩余下载" -"Remove","删除" -"Remove Item","删除项目" -"Remove links and samples from downloadable product","删除可下载产品的链接和范例" -"Requested link does not exist.","所请求的链接不存在。" -"Retrieve links and samples list from downloadable product","从可下载产品或去链接和范例列表" -"SKU","SKU" -"Sample","范例" -"See price before order confirmation.","确认订单前显示价格。" -"Shareable","可分享" -"Shipped","已发货" -"Sorry, there was an error getting requested content. Please contact the store owner.","抱歉，获取请求内容时发生错误。请联系商店店主。" -"Sort Order","排序顺序" -"Start Download","开始下载" -"Status","状态" -"Subtotal","小计" -"The file does not exist.","该文件不存在。" -"The link has expired.","该链接已过期。" -"The link is not available.","该链接不可用。" -"There are files that were selected but not uploaded yet. Please upload or remove them first","有文件被选中，但尚未上传。请上传或先将其删除" -"Title","标题" -"To:","至：" -"U","U" -"Unlimited","无限" -"Update","更新" -"Use Content-Disposition","用户内容描述" -"Use Default Value","使用默认值" -"View Order","查看订单" -"What's this?","这是什么？" -"You have not purchased any downloadable products yet.","您尚未购买任何可下载的产品。" -"attachment","附件" -"download","下载" -"inline","内联" -"sample","示例" diff --git a/app/locale/zh_CN/Mage_Eav.csv b/app/locale/zh_CN/Mage_Eav.csv deleted file mode 100644 index 7c7b6bb8f..000000000 --- a/app/locale/zh_CN/Mage_Eav.csv +++ /dev/null @@ -1,124 +0,0 @@ -"""%s"" contains not only digit characters.","""%s"" 包含不止数字代码。" -"""%s"" does not fit the entered date format.","""%s""与输入的日期格式不符合。" -"""%s"" exceeds the allowed file size.","""%s""超过了允许的文件尺寸。" -"""%s"" exceeds the allowed length.","""%s""超过了允许的尺寸。" -"""%s"" has not only alphabetic and digit characters.","""%s""包含不止字母和数字代码。" -"""%s"" has not only alphabetic characters.","""%s""有不止字母。" -"""%s"" height exceeds allowed value of %s px.","""%s""高度超过%s px的允许值" -"""%s"" invalid type entered.","""%s""无效输入。" -"""%s"" is a required value.","""%s""是必填值。" -"""%s"" is an empty string.","""%s""是一个空的指令。" -"""%s"" is not a valid URL.","""%s""不是一个有效的URL。" -"""%s"" is not a valid date.","""%s""不是一个有效的日期。" -"""%s"" is not a valid email address.","""%s""不是一个有效的电子邮件地址。" -"""%s"" is not a valid file","""%s""不是一个有效的文件" -"""%s"" is not a valid file extension.","""%s""不是一个有效的文件扩展名。" -"""%s"" is not a valid file.","""%s""不是一个有效的文件。" -"""%s"" is not a valid hostname.","""%s""不是一个有效的主机名。" -"""%s"" is not a valid image format","""%s""不是一个有效的图形格式。" -"""%s"" length must be equal or greater than %s characters.","""%s""长度必须大于等于%s。" -"""%s"" length must be equal or less than %s characters.","""%s""长度必须小于等于%s。" -"""%s"" width exceeds allowed value of %s px.","""%s""长度超过%s px允许值。" -"'%value%' appears to be a DNS hostname but cannot extract TLD part","“%value%” 似乎是一个 DNS 主机名，但无法提取 TLD 部分" -"'%value%' appears to be a DNS hostname but cannot match TLD against known list","“%value%” 似乎是一个 DNS 主机名，但无法与已知列表匹配 TLD" -"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","“%value%” 似乎是一个 DNS 主机名，但无法与 TLD “%tld%” 的主机名模式相匹配。" -"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","“%value%” 似乎是一个 DNS 主机名，但在无效位置包含破折号" -"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' 似乎是 DNS 主机名，但无法对指定的 Punycode符号解码" -"'%value%' appears to be a local network name but local network names are not allowed","'%value%' 似乎是本地网络名称，此处不能使用本地网络名称" -"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' 似乎是 IP 地址，此处不能使用 IP 地址" -"'%value%' does not appear to be a valid URI hostname","'%value%' 似乎不是有效的 URI 主机名" -"'%value%' does not appear to be a valid local network name","'%value%' 似乎不是有效的本地网络名" -"'%value%' does not match the expected structure for a DNS hostname","'%value%' 无法与预期的 DNS 主机名相匹配" -"A joint field with this alias (%s) is already declared","使用该别名 (%s) 的联合字段已声名" -"Add Option","添加选项" -"An error occurred while loading a record, aborting. Error: %s","加载记录时出错，正在忽略。错误：%s" -"An error occurred while loading the collection, aborting. Error: %s","加载集合时出错，正在忽略。错误：%s" -"An error occurred while saving a record, aborting. Error: ","保存记录时出错，正在忽略。错误：" -"Attempt to add an invalid object","尝试添加的对象无效" -"Attribute '%s' used in configurable products","配置产品中使用的属性 '%s'" -"Attribute Code","属性代码" -"Attribute Label","属性标签" -"Attribute Properties","属性的属性" -"Attribute object is undefined","属性对象未定义" -"Attribute set with the ""%s"" name already exists.","使用“%s”为名的属性已存在。" -"Attribute with the same code","使用相同代码的属性" -"Can\'t create table: %s","无法创建表格：%s" -"Catalog Input Type for Store Owner","店铺所有者的分类输出类型" -"Current module EAV entity is undefined","当前模块EAV实体未定义" -"Current module pathname is undefined","当前模块路径名未定义" -"Data integrity: No header row found for attribute","数据完整性：属性的表头行没找到" -"Date","日期" -"Decimal Number","十进制数" -"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","“默认产品列表排序”在“可用产品列表排序”中不存在。" -"Default Value","默认值" -"Default option value is not defined","默认选项值未定义" -"Delete","删除" -"Dropdown","下拉菜单" -"Email","电子邮件" -"Entity collection expected.","预计为实体集合。" -"Entity collections expected.","预计为实体集合。" -"Entity instance is not defined","实体实例未定义" -"Entity is not initialized","实体未初始化" -"Entity object is undefined","实体对象未定义" -"Failed to load node %s from config","从配置中加载节点 %s 出错" -"For internal use. Must be unique with no spaces. Maximum length of attribute code must be less then %s symbols","仅限内部使用。必须具备唯一性且不包含空格。属性代码的长度最大值不能超过 %s 个符号。" -"Form Element with the same attribute","使用相同属性的表单元素" -"Form Fieldset with the same code","使用相同代码的表单字段集" -"Form Type with the same code","使用相同代码的表单类型" -"Form code is not defined","表单代码未定义" -"Frontend label is not defined","前端标签未定义" -"Input Validation for Store Owner","店铺所有者的输入验证" -"Integer Number","整数" -"Invalid EAV attribute.","无效的EAV属性。" -"Invalid alias, already exists in joint attributes","无效的别名、已经存在于联合属性中。" -"Invalid attribute name: %s","无效的属性名：%s" -"Invalid attribute requested: %s","无效的属性请求：%s" -"Invalid attribute type","无效的属性类型" -"Invalid character encountered in increment ID: %s","增量 ID 中遇到无效字符：%s" -"Invalid date","无效的日期" -"Invalid default date","无效的默认日期" -"Invalid default decimal value","无效的默认十进制数值" -"Invalid entity specified","无效的已指定实体" -"Invalid entity supplied.","无效的已提供实体。" -"Invalid entity supplied: %s","无效的已提供实体：%s" -"Invalid entity type","无效的实体类型" -"Invalid entity_id, skipping the record.","无效的 entity_id，跳过该记录。" -"Invalid entity_type specified: %s","无效的已指定 entity_type：%s" -"Invalid foreign key","无效的外键" -"Invalid form type.","无效的表单类型。" -"Invalid joint fields","无效的合并字段" -"Invalid store specified","指定的店铺无效" -"Invalid type given. String expected","指定的类无效。需使用字符串" -"Joined field with this alias is already declared","使用此别名的合并字段已被声明" -"Joint field or attribute expression with this alias is already declared","使用此别名的合并字段或属性表达式已被声明" -"Letters","字母" -"Letters (a-z, A-Z) or Numbers (0-9)","字母 (a-z, A-Z) 或数字 (0-9)" -"Loaded %d records","已载入 %d 条记录" -"Maximum length of attribute code must be less then %s symbols","属性代码的最大长度必须小于 %s 个符号" -"Multiple Select","多选" -"No","否" -"No options found in config node %s","配置节点 %s 中没有找到选项" -"None","无" -"Not shared with other products","未与其它产品共享" -"Problem loading the collection, aborting. Error: %s","载入收藏时遇到问题，正在中止。错误：%s" -"Problem saving the collection, aborting. Error: %s","保存收藏时遇到问题，正在中止。错误：%s" -"Required","必须" -"Saved %d record(s).","已保存 %d 条记录。" -"Source model ""%s"" not found for attribute ""%s""","源模型“%s”在属性“%s”中未找到" -"System","系统" -"Text Area","文本区" -"Text Field","文本字段" -"The value of attribute ""%s"" must be unique","属性“%s”的值必须为唯一" -"The value of attribute ""%s"" must be unique.","属性“%s”的值必须为唯一。" -"This attribute is used in configurable products","该属性已用于可配置产品" -"URL","URL" -"Unique Value","唯一数值" -"Unique Value (not shared with other products)","唯一数值（不与其它产品共享）" -"Unknown parameter","未知参数" -"Values Required","需要数值" -"Wrong attribute group ID","错误的属性群组 ID" -"Wrong attribute set ID","错误的属性设置 ID" -"Wrong entity ID","错误的实体 ID" -"Wrong type definition for %s","错误的类定义：%s" -"Yes","是" -"Yes/No","是/否" diff --git a/app/locale/zh_CN/Mage_GiftMessage.csv b/app/locale/zh_CN/Mage_GiftMessage.csv deleted file mode 100644 index 4d542693b..000000000 --- a/app/locale/zh_CN/Mage_GiftMessage.csv +++ /dev/null @@ -1,38 +0,0 @@ -"Add","添加" -"Add gift message for shopping cart","为购物车添加礼品消息" -"Add gift messages for quote item of shopping cart","为购物车中的报价项目添加礼品消息" -"Add gift messages to products of shopping cart","添加礼品消息到购物车中的产品" -"Add gift options","添加礼品选项" -"Add gift options for Individual Items","为单个项目添加礼品选项" -"Add gift options for the Entire Order","为整个订单添加礼品选项" -"Add gift options.","添加礼品选项。" -"Allow Gift Messages for Order Items","允许为订单项目添加礼品消息" -"Allow Gift Messages on Order Level","允许按订单级别添加礼品消息" -"An error occurred while saving the gift message.","保存礼品消息时发生错误。" -"Are you sure?","您是否确认？" -"Cancel","取消" -"Do you have any gift items in your order?","您的订单中包含任何礼品项目吗？" -"Edit","编辑" -"From","来自" -"Gift Message","礼品消息" -"Gift Message API","礼品消息 API" -"Gift Options","礼品选项" -"Gift Options for","礼品选项，适用于" -"Gift Options for Individual Items","适用于单个项目的礼品选项" -"Gift Options for the Entire Order.","适用于整个订单的礼品选项。" -"Gift Options for this address.","适用于该地址的礼品选项。" -"Item %d of %d","第 %d 个项目，共 %d 个" -"Message","信息" -"No","否" -"OK","确定" -"Save Gift Message","保存礼品信息" -"The gift message has been removed","礼品信息已删除" -"The gift message has been saved","礼品信息已保存" -"The gift message has been saved.","礼品信息已保存。" -"To","发送至" -"Unknown entity type","未知实体类型" -"Use config","用户配置" -"Yes","是" -"You can leave this box blank if you do not wish to add a gift message for the item.","如果您不想为该商品添加礼品信息，则可以在这里留空。" -"You can leave this box blank if you do not wish to add a gift message for this address.","如果您不想为该地址添加礼品信息，则可以在这里留空。" -"You can leave this box blank if you do not wish to add a gift message for whole order.","如果您不想为整个订单添加礼品信息，则可以在这里留空。" diff --git a/app/locale/zh_CN/Mage_GoogleAnalytics.csv b/app/locale/zh_CN/Mage_GoogleAnalytics.csv deleted file mode 100644 index 36079c514..000000000 --- a/app/locale/zh_CN/Mage_GoogleAnalytics.csv +++ /dev/null @@ -1,5 +0,0 @@ -"Account Number","帐户号码" -"Enable","启用" -"Enable IP anonymization","Enable IP anonymization" -"Google API","Google API" -"Google Analytics","Google 分析" diff --git a/app/locale/zh_CN/Mage_GoogleBase.csv b/app/locale/zh_CN/Mage_GoogleBase.csv deleted file mode 100644 index 9c447986d..000000000 --- a/app/locale/zh_CN/Mage_GoogleBase.csv +++ /dev/null @@ -1,78 +0,0 @@ -"Active","活动" -"Add Attribute Mapping","添加属性映射" -"Add New Attribute","添加新属性" -"Add to Google Base","添加到Google Base" -"Are you sure?","您是否确认？" -"Attribute","属性" -"Attribute Set","属性集" -"Attribute Set and Item Type","属性集与项目类型" -"Attributes","属性" -"Attributes Mapping","属性映射" -"Attributes Set","属性集" -"AuthSub","AuthSub" -"Available Products","可用产品" -"Base Currency should be set to %s for %s in system configuration. Otherwise item prices won't be correct in Google Base.","应在系统配置中将基本货币设置为 %s 的 %s，否则商品价格在Google Base中将不准确。" -"Cannot update Google Base Item for Store '%s'","无法为店铺 '%s' 更新 Google Base 项" -"Captcha confirmation error: %s","验证码有误：%s" -"Captcha has been confirmed.","验证码已确认。" -"Catalog","分类" -"Clicks","点击" -"ClientLogin","客户端登录" -"Confirm","确认" -"Current Mapping will be reloaded. Continue?","当前映射会重新加载，是否继续？" -"Custom attribute, no mapping","自定义属性，无映射" -"Delete","删除" -"Delete Mapping","删除映射" -"Edit Item Type","编辑项目类型" -"Edit Item Type ""%s""","编辑项目类型“%s”" -"Error: %s","错误：%s" -"Expires","过期" -"Google","Google" -"Google Base","Google Base" -"Google Base Attribute","Google 基本属性" -"Google Base ID","Google 基本 ID" -"Google Base Item Type","Google 基本项目类型" -"Google Base Item type","Google 基本项目类型" -"Google Base Items","Google Base项目" -"Google base","Google 基本" -"Hide","隐藏" -"Hosted","已托管" -"Hosted or Google","托管或 Google" -"Impr.","Impr." -"Invalid Product Model for Google Base Item","Google Base 项目中无效的产品型号" -"Item Type was deleted","项目类型已删除" -"Item Types","项目类型" -"Item model is not specified to delete Google Base entry.","未指定要删除 Google Base 条目的项目型号。" -"Items","项目" -"Manage Attribute Mapping","管理属性映射" -"Manage Attributes","管理属性" -"Manage Items","管理项目" -"New Item Type","新项目类型" -"New ItemType","新的项目类型" -"No","否" -"No items were deleted from Google Base","没有从Google Base中删除内容" -"No items were published","没有发布内容" -"No items were saved as inactive items","没有将内容保存为不活跃内容" -"No products were added to Google Base","没有将产品加入Google Base" -"Object model is not specified to save Google Base entry.","对象模型未指定保存到Google Base项。" -"Please, select Attribute Set and Google Item Type to load attributes","请选择属性集与Google项目类型以加载属性" -"Product Name","产品名" -"Publish","发布" -"Published","已发布" -"Remove","删除" -"Save Mapping","保存映射" -"Session expired during export. Please revise exported products and repeat the process if necessary.","导出过程中会话过期。请修订导出的产品，并在有必要时重复该操作。" -"Synchronize","同步" -"Target Country","目标国家" -"The item type has been saved.","该项目类型已保存。" -"This action will update items statistics and remove the items which are not available in Google Base. Continue?","该操作将更新项目状态，并删除Google Base中不可用的内容，是否继续？" -"Total of %d items(s) have been deleted; total of %d items(s) have been updated.","总共 %d 个内容被删除，共 %d 个内容被更新。" -"Total of %d items(s) have been published.","共 %d 个内容被发布。" -"Total of %d items(s) have been removed from Google Base.","共 %d 个内容被从Google Base删除。" -"Total of %d items(s) have been saved as inactive items.","共 %d 个内容被保存为不活跃内容。" -"Total of %d product(s) have been added to Google Base.","共 %d 个产品被加入Google Base。" -"Unable to connect to Google Base. Please, check Account settings in configuration.","无法连接到Google Base，请检查配置中的帐户设置。" -"Unable to select a Store View.","无法选择店铺视图。" -"View Available Products","查看可用产品。" -"View Item in Google Base","在Google Base中查看项目" -"Yes","是" diff --git a/app/locale/zh_CN/Mage_GoogleCheckout.csv b/app/locale/zh_CN/Mage_GoogleCheckout.csv deleted file mode 100644 index b4d06b32a..000000000 --- a/app/locale/zh_CN/Mage_GoogleCheckout.csv +++ /dev/null @@ -1,131 +0,0 @@ -"* Select shipping method","* 选择运送方式" -"2Day","2天" -"2nd Day Air","2天航空" -"2nd Day Air AM","第二天航空朝至" -"3 Day Select","3天选择" -"
    Warning: %s
    ","
    警告：%s
    " -"Warning! This option disables the merchant calculated shipping. With this option, Google API ignores any attempt to affect shipping prices.","警告！ 该选项将禁用商家计算的运送费用。使用该选项，Google API 将忽略任何影响运送费用的情况。" -"A virtual item to reflect the discount total","一件虚拟项目反应总折扣" -"A virtual item to reflect the tax total","一件虚拟项目反映总税费" -"AVS Status: %s","AVS 状态：%s" -"Add Shipping Method","添加运送方式" -"Allowed Methods","允许的方式" -"Amount: %s","数量：%s" -"Auto-generated from GoogleCheckout Charge","从 GoogleCheckout 支付自动生成" -"Buyer Account Age: %s days","买家账户年龄：%s 天" -"CC Partial: xxxx-%s","CC 部分：xxxx-%s" -"CID Status: %s","CID 状态：%s" -"Carrier Calculated Methods","承运商计算的方式" -"Cart Discount","购物车折扣" -"Checkout Image Style","结账图片风格" -"Commercial","商业" -"Continue Shopping URL","继续购物 URL" -"Credit memo has been created automatically","信用备忘录已自动创建" -"Debug","调试" -"Default Package Height (in)","默认包裹高度 (in)" -"Default Package Length (in)","默认包裹长度 (in)" -"Default Package Width (in)","默认包裹宽度 (in)" -"Default Price for Methods","默认价格" -"Default price:","默认价格：" -"Delivery Address Category","送货地址分类" -"Delivery Schedule","发货计划" -"Description-based delivery","基于描述的交付" -"Disable Default Tax Tables","禁止默认税率表" -"Discount Tax","折扣率" -"Eligible for Protection: %s","符合资格的保护：%s" -"Email delivery","邮件交付" -"Enable","启用" -"Enable Carrier Calculated","启用承运人计算" -"Enable Digital Delivery","启用数字交付" -"Enable Flat Rate","启用平坦费率" -"Enable Merchant Calculated","启用分行计算" -"Enable this if your checkout request is too big and being cut off.","如果您的结账请求太大被截断，请启用这个。" -"Expiration: %s","到期：%s" -"Express Mail","快速邮件" -"Express Saver","快速经济" -"FedEx","FedEx" -"Financial: %s -> %s","财务： %s -> %s" -"First Overnight","次日达" -"Free Shipping","免运费" -"Fulfillment: %s -> %s","满足： %s -> %s" -"Google API","Google API" -"Google Authorization:","Google身份验证：" -"Google Buyer ID: %s","Google买家ID： %s" -"Google Charge:","Google Charger：" -"Google Chargeback:","Google Chargeback：" -"Google Checkout","Google Checkout" -"Google Checkout Shipping - Carrier Calculated","Google Checkout 送货 - 承运人计算" -"Google Checkout Shipping - Digital Delivery","Google Checkout 送货 - 数字交付" -"Google Checkout Shipping - Flat Rate","Google Checkout 送货 - 平坦费率" -"Google Checkout Shipping - Merchant Calculated","Google Checkout 送货 - 分行计算" -"Google Checkout: %s","Google Checkout：%s" -"Google Order Number: %s","Google 订单号码：%s" -"Google Order Status Change:","Google 订单状态更改：" -"Google Refund:","Google 退款：" -"Google Risk Information:","Google 风险信息：" -"GoogleCheckout is not configured","GoogleCheckout 未配置" -"Ground","地面" -"Hide Cart Contents","隐藏购物车内容" -"Home Delivery","家庭运送" -"IP Address: %s","IP 地址：%s" -"If enabled, cart contents will be hidden after clicking on the Google Checkout button in the shopping cart, and restored if ""Edit Cart"" link was activated.","如果启用，购物车内容会在单击购物车中的 Google Checkout 按钮后被隐藏，并在“编辑购物车”链接激活后恢复显示。" -"Inches","英寸" -"Invoice Auto-Created: %s","发票已自动创建：%s" -"Is Buyer Willing to Receive Marketing Emails: %s","买家是否愿意接收市场营销电子邮件：%s" -"Key/URL delivery","Key/URL 交付" -"Large - %s","大 - %s" -"Latest Charge: %s","最近付款：%s" -"Latest Chargeback: %s","最近退款：%s" -"Latest Refund: %s","最近退款：%s" -"Location","位置" -"Media Mail","媒体邮件" -"Medium - %s","中 - %s" -"Merchant ID","分行ID" -"Merchant Key","分行密钥" -"Method","方式" -"New Order Status","新订单状态" -"Next Day Air","下一日空运" -"Next Day Air Early AM","下一日空运朝至" -"Next Day Air Saver","下一日空运节约型" -"No","否" -"No Comment","无评论" -"No Reason","无原因" -"Optimistic","乐观的" -"Optional, leave empty for home page.","可选，主页留空。" -"Order creation error","订单创建出错" -"Parcel Post","邮政包裹" -"Pessimistic","悲观的" -"Priority Mail","优先邮件" -"Priority Overnight","第二天优先" -"Rate 1 Amount","评级 1 数量" -"Rate 1 Ship To Applicable Countries","评级 1 运送到适用的国家" -"Rate 1 Ship to Specific Countries","评级 1 运送到特定国家" -"Rate 1 Title","比率 1 标题" -"Rate 2 Amount","比率 2 数量" -"Rate 2 Ship To Applicable Countries","比率2 发货到可接受国家" -"Rate 2 Ship to Specific Countries","比率 2 发货到指定国家" -"Rate 2 Title","比率 2 标题" -"Rate 3 Amount","比率 3 数量" -"Rate 3 Ship To Applicable Countries","比率 3 发货到可接受国家" -"Rate 3 Ship to Specific Countries","比率 3 发货到指定国家" -"Rate 3 Title","比率 3 标题" -"Required for live Google Checkout transactions. Make sure that this option corresponds to Use Secure URLs in Frontend (""Web"" > ""Secure"").","实时 Google Checkout 交易所必需。请确保此选项与“在前端使用安全 URL”（“网站”>“安全”）搭配使用。" -"Residential","住宅" -"Sandbox","沙箱" -"Secure Callback URL","安全回拨URL" -"Small - %s","小- %s" -"Standard Overnight","标准次日" -"The tax amount has been applied based on the information received from Google Checkout, because tax amount received from Google Checkout is different from the calculated tax amount","所产生的税金额度取决于从Google Checkout收到的信息，因为从Google Checkout收到的信息与计算而来的税金额度可能有所不同" -"Title","标题" -"Total Chargeback: %s","总退款：%s" -"Total Charged: %s","总收费：%s" -"Total Refunded: %s","总退费：%s" -"Transparent","交易" -"UPS","UPS" -"USPS","USPS" -"United Kingdom","英国" -"United States","美国" -"Unknown Reason","不明原因" -"White Background","白色背景" -"Yes","是" -"You will be redirected to GoogleCheckout in a few seconds.","几秒后您将被重定向到Google Checkout。" diff --git a/app/locale/zh_CN/Mage_ImportExport.csv b/app/locale/zh_CN/Mage_ImportExport.csv deleted file mode 100644 index 72012615e..000000000 --- a/app/locale/zh_CN/Mage_ImportExport.csv +++ /dev/null @@ -1,93 +0,0 @@ -"%s file does not exists or is not readable","%s 文件不存在或不可读取" -"-- Please Select --","-- 请选择 --" -"Adapter must be an instance of Mage_ImportExport_Model_Import_Adapter_Abstract","适配器必须为Mage_ImportExport_Model_Import_Adapter_Abstract的实例" -"Adapter object must be an instance of %s","适配器对象必须是 %s 的实例" -"Adapter type must be a non empty string","适配器类型必须为非空字符串" -"Append Complex Data","附加复杂数据" -"Attribute Code","属性代码" -"Attribute Label","属性标签" -"Attribute does not has options, so filtering is impossible","属性不包含选项，因此无法进行过滤" -"Begin data validation","开始数据验证" -"Begin export of %s","开始 %s 导出" -"Begin import of ""%s"" with ""%s"" behavior","开始导入 ""%s""，按 ""%s"" 行为" -"CSV","CSV" -"Can not determine attribute filter type","无法确定属性筛选类型" -"Can not find required columns: %s","无法找到所需栏：%s" -"Cannot get autoincrement value","无法获取自动增量值" -"Check Data","检查数据" -"Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d","检查的行：%d，检查的项：%d。无效行：%d，错误总数：%d" -"Column names have duplicates","栏名称有重复" -"Column names is empty or is not an array","栏名称为空或非阵列" -"Column names: ""%s"" are invalid","栏名称：%s 无效" -"Customers","客户" -"Data is invalid or file is not uploaded","数据无效，或文件未被上传" -"Delete Entities","删除实体" -"Destination directory is not writable","目标目录不可写" -"Destination file is not writable","目标文件不可写" -"Destination file path must be a string","目标文件路径必须为字符串" -"Done import data validation","完成导入数据验证" -"Duplicate Unique Attribute for '%s'","'%s' 包含重复的唯一属性" -"Entity Type","实体类型" -"Entity adapter obejct must be an instance of Mage_ImportExport_Model_Export_Entity_Abstract","实体适配器对象必须是 Mage_ImportExport_Model_Export_Entity_Abstract 的一个实例" -"Entity adapter object must be an instance of Mage_ImportExport_Model_Import_Entity_Abstract","实体适配器对象必须为Mage_ImportExport_Model_Import_Entity_Abstract的实例" -"Entity is unknown","未知实体" -"Entity type model must be an instance of Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract","实体类型模块必须为Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract的实例" -"Entity type model must be an instance of Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract","实体类型模块必须为Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract的实例" -"Error in data structure: behaviors are mixed","数据结构有误：行为是混合的" -"Error in data structure: entity codes are mixed","数据结构有误：实体代码是混合的" -"Errors limit (%d) reached. Please fix errors and re-upload file","已达到错误限制数量 (%d)。请修复错误并重新上传文件" -"Export","导出" -"Export File Format","导出文件格式" -"Export Settings","导出设置" -"Export has been done.","导出已完成。" -"Exported %s rows.","已导出 %s 行。" -"File does not contain data.","文件不包含数据。" -"File does not contain data. Please upload another one","文件不包含数据。请上传另一个文件" -"File format is unknown","未知的文件格式" -"File is partially valid, but import is not possible","文件部分有效，但无法导入" -"File is totally invalid. Please fix errors and re-upload file","文件无效。请修复错误并重新上传文件" -"File is valid! To start import process press ""Import"" button","文件有效！要开始导入，请单击“导入”按钮" -"File is valid, but import is not possible","文件有效，但无法导入" -"File was not uploaded","文件未上传" -"Filter","过滤器" -"From","来自" -"Header column names already set","标题列名称已设置" -"Import","导入" -"Import Behavior","导入行为" -"Import Settings","导入设置" -"Import has been done successfuly.","导入已成功完成。" -"Import successfully done.","导入成功完成。" -"Import/Export","导入/导出" -"Input entity code is not equal to entity adapter code","输入的实体代码与实体适配器代码不相同" -"Invalid entity","无效的实体" -"Invalid entity model","无效的实体模型。" -"Invalid file format","无效的文件格式" -"Invalid parameters","无效的参数" -"Invalid seek position","无效的位置寻找" -"Invalid value for '%s'","“%s”的数值无效" -"Invalid value for '%s' column","'%s' 列数值无效" -"No filter data provided","没有提供过滤器数据" -"No source specified","没有指定源" -"No valid data sent","没有发送有效的数据" -"No writer specified","没有指定作者" -"Node does not has model token tag","节点不具有模型令牌标签" -"Not implemented yet","尚未实现" -"Please fix errors and re-upload file","请修复错误并重新上传文件" -"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","请修复错误并重新上传文件，或单击“导入”按钮来跳过错误行" -"Products","产品" -"Replace Existing Complex Data","替换现有复杂数据" -"Select File to Import","选择需要导入的文件" -"Skip","跳过" -"Source file moving failed","源文件移动失败" -"Source file path must be a string","源文件路径必须为字符串" -"Source is not set","源未设置" -"Status","状态" -"There are no product types available for export","没有可用的产品类型可供导出" -"There is no data for export","没有可供导入的数据" -"To","发送至" -"Total size of uploadable files must not exceed %s","可上传文件的总大小不可超过 %s" -"Unknown attribute filter type","未知的属性过滤类型" -"Uploaded file has no extension","已上传的文件没有扩展名" -"Validation finished successfully","验证已成功完成" -"in rows","以行" -"in rows:","以行：" diff --git a/app/locale/zh_CN/Mage_Index.csv b/app/locale/zh_CN/Mage_Index.csv deleted file mode 100644 index a9afdb5df..000000000 --- a/app/locale/zh_CN/Mage_Index.csv +++ /dev/null @@ -1,47 +0,0 @@ -"%s Index process is working now. Please try run this process later.","%s 索引进程正在工作。请稍后尝试运行该进程。" -"%s index was rebuilt.","%s 索引已重建。" -"'%s' Index Process Information","“%s”索引进程信息" -"Action","操作" -"Cannot initialize the indexer process.","无法初始化索引器进程。" -"Change Index Mode","更改索引模式" -"Click here to go to Cache Management and refresh cache types.","单击这里前往缓存管理并刷新缓存类型。" -"Click here to go to Index Management and rebuild required indexes.","单击这里前往索引管理并重建需要的索引。" -"Delete","删除" -"Description","描述" -"Disable","禁用" -"Enable","启用" -"General","常规" -"Index","索引" -"Index Description","索引描述" -"Index Management","索引管理" -"Index Mode","索引模式" -"Index Name","索引名称" -"Index mode","索引模式" -"Indexer code is not defined.","索引器代码未定义。" -"Indexer model is not defined.","索引器模型未定义。" -"Indexer model should extend Mage_Index_Model_Indexer_Abstract.","索引器模型必须延伸 Mage_Index_Model_Indexer_Abstract。" -"Manual Update","手动更新" -"Mode","模式" -"Never","永不" -"No","否" -"One or more of the Indexes are not up to date:","一个或多个索引不是最新：" -"Please select Index(es)","请选择索引" -"Please select Indexes","请选择索引" -"Process Information","处理信息" -"Processing","正在处理" -"Ready","就绪" -"Refresh","刷新" -"Reindex Data","重新索引数据" -"Reindex Required","需要重新索引" -"Revoke","撤销" -"Status","状态" -"System","系统" -"The index has been saved.","索引已保存。" -"There was a problem with reindexing process.","重新索引进程遇到问题。" -"There was a problem with saving process.","保存进程遇到问题。" -"Total of %d index(es) have changed index mode.","总计 %d 个索引已变更索引模式。" -"Total of %d index(es) have reindexed data.","总计 %d 个索引包含重新索引数据。" -"Update Required","需要更新" -"Update on Save","保存时更新" -"Updated At","更新于" -"Yes","是" diff --git a/app/locale/zh_CN/Mage_Install.csv b/app/locale/zh_CN/Mage_Install.csv deleted file mode 100644 index 0f40aedac..000000000 --- a/app/locale/zh_CN/Mage_Install.csv +++ /dev/null @@ -1,125 +0,0 @@ -"(Make sure you keep it in a safe place.)","（请务必将其保存在安全的地点。）" -"(Optional. Leave blank for no prefix)","（可选，留空即可不使用前缀。）" -"(ver. %s)","（版本. %s）" -"Additional path added after Base URL to access your Administrative Panel (e.g. admin, backend, control etc.).","在基本URL后添加额外路径即可访问您的管理面板（例如admin, backend, control等）。" -"Admin Path","管理路径" -"After successfull installation please click the button below.","成功安装后请点击下面的按钮。" -"All packages were installed, click 'OK' to continue with installation.","所有包已安装，点击“确定”继续安装。" -"Alternatively you could try the 'Manual Downloads and Upgrades' method.","或者您可以尝试“手工下载并升级”的方法。" -"Base URL","备份URL" -"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","在继续您的店铺前，请记录您的加密密钥（Magento将其用于加密密码、信用卡号码等）。" -"Check out our","结账指南" -"Check this box only if it is not possible to automatically validate Secure URL, for example if HTTP authentication is required.","如果不能自动验证安全URL，例如如果需要HTTP验证，就请选择该选项。" -"Check this box only if it is not possible to automatically validate the Base URL.","如果不能自动验证基本URL，就选中该选项。" -"Choose this if you would like to test frontend and backend functionality.","如果想要测试前端和后端的功能，就选中该选项。" -"Configuration","配置" -"Confirm Password","确认密码" -"Connection","连接" -"Continue","继续" -"Continue After Manual Download","手工下载后连接" -"Continue Full Download / SVN Installation","继续完整下载/SVN安装" -"Create Admin Account","创建管理帐户" -"Currently this is the most stable state available for Magento packages.","目前这是最稳定的可用Magento版本。" -"Database","数据库" -"Database Connection","数据库连接" -"Database Name","数据库名称" -"Database Name cannot be empty.","数据库名称不能为空。" -"Database Type","数据库类型" -"Database connection error.","数据库连接错误。" -"Database host","数据库主机" -"Database server does not support the InnoDB storage engine.","数据库服务器不支持 InnoDB 存储引擎。" -"Database user name","数据库用户名" -"Database user password","数据库用户密码" -"Default Currency","默认货币" -"Download","下载" -"Download Magento Core Modules and Updates","下载Magento核心模块和更新" -"Downloading and installing Magento, please wait...","正在下载和安装Magento，请稍候..." -"Email","电子邮件" -"Email Address","编辑电子邮件地址" -"Enable Charts","启用图表" -"Enable this option if you want the charts to be displayed on Dashboard.","如果希望在仪表板上显示图表，就选中该选项。" -"Enable this option only if you have SSL available.","如果您可以使用SSL，就选中该选项。" -"Encryption Key","加密密钥" -"File System","文件系统" -"First Name","名字" -"Full Download / SVN Installation","完整下载/SVN安装" -"Get ready to experience Open-Source eCommerce Evolved.","准备体验开源电子商务的进化。" -"Go to Backend","转到后端" -"Go to Frontend","转到前端" -"Having trouble installing Magento?","安装Magento时遇到了问题？" -"Help Us to Keep Magento Healthy","帮助我们保证Magento的健康" -"Host","主机" -"I agree to the above terms and conditions.","我同意上述合约和条款。" -"If you are a developer and would like to have the latest public updates, choose this option.","如果您是开发人员，希望获得最新的公开更新，请选择该选项。" -"If you are running PHP as CGI, your PHP processes may run under the same user as the user you used when uploading Magento files.","如果您将PHP作为CGI运行，您PHP的处理使用的身份应与上传Magento文件所用的用户身份相同。" -"If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method.","如果您是在老版本下载并安装好的Magento基础上运行安装向导，请使用这种方法。" -"If you do not wish or are not able to have Magento folders writeable for the web process, you could use PEAR executable located in the root of Magento installation.","如果您不希望，或者不能提供可写的Magento文件夹，则应使用Magento安装文件中的PEAR执行文件。" -"If you have downloaded the full package or installed Magento through SVN, you should skip packages installation and validation by clicking the button below.","如果您下载了完整版，或通过SVN安装Magento，则应点击下列按钮跳过包安装操作和验证过程。" -"If you wish to manage Magento packages through the web admin interface, you will need to have web writeable permissions applied to all Magento folders and files.","如果希望通过Web管理界面管理Magento包，则需要为所有Magento文件夹和文件应用可写权限。" -"If your server is running on MS Windows, most probably you will not need to change anything.","如果您的服务器运行了微软Windows，则不需要修改任何内容。" -"In other cases you will need to make Magento files writeable for the user that the web server process is running under.","其他情况下，您依然需要为服务器上运行Web服务的用户提供Magento文件的写权限。" -"Installation","安装" -"Installation Guide","安装指南" -"Installer does not exist for %s database type","%s 数据库类型的安装程序不存在" -"Last Name","姓氏" -"License Agreement","许可协议" -"Locale","区域" -"Locale settings","区域设置" -"Localization","本地化" -"Login Information","登录信息" -"Magento","Magento" -"Magento Connect Manager Deployment","Magento内容管理器部署" -"Magento Installation Wizard","Magento安装向导" -"Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.","Magento是Magento Inc.的商标， Copyright © %s Magento Inc." -"Magento uses this key to encrypt passwords, credit cards and more. If this field is left empty the system will create an encryption key for you and will display it on the next page.","Magento使用该密钥对密码和信用卡号码等进行加密。如果该字段留空，系统将为您创建加密密钥，并会显示在下一页上。" -"Manual Downloads and Upgrades","手工下载和升级" -"No resource for %s DB model.","%s DB模块没有资源。" -"One of PHP Extensions ""%s"" must be loaded.","必须加载PHP扩展 ""%s""。" -"PHP Extension '%s' loaded","PHP扩展 '%s' 已加载" -"PHP Extensions ""%s"" must be loaded.","必须加载 PHP 扩展""%s""。" -"PHP extension ""%s"" must be loaded.","必须加载PHP扩展 '%s'。" -"Package Management through the Web","通过Web进行包管理" -"Password","密码" -"Password Confirmation","密码确认" -"Path ""%s"" must be writable.","路径 ""%s"" 必须可写。" -"Personal Information","个人信息" -"Please correct the user data and try again.","请改正用户数据并重试。" -"Please make sure that mod_rewrite is enabled in Apache configuration.","请确保在Apache配置中启用了mod_rewrite。" -"Please note that it is much less stable than beta.","请注意，该版本的稳定性不如Beta版。" -"Please note that only UNIX, Linux and Mac OS X shells are currently supported. For Windows use the '%s' option.","请注意，只有UNIX、Linux，以及Mac OS X外壳目前可被支持。对于Windows，请使用 '%s' 选项。" -"Please set all required settings before clicking Continue","请在点击继续之前设置所有必要的选项。" -"Preferred stability: %s","首选稳定性：%s" -"Proceed With Automatic Download (%s)","在不自动下载的情况下处理（%s）" -"Provide a complete base URL for SSL connection. For example: %s","为SSL连接提供完整的基本UEL，例如：%s" -"Report All Bugs","报告所有Bug" -"Required Fields","必须的字段" -"Response from server isn\'t valid.","来自服务器的响应无效。" -"Run admin interface with SSL","使用SSL运行管理界面。" -"Run this in your shell from Magento root folder:","在您的外壳中从Magento根文件夹运行这个：" -"Save Session Data In","保存会话数据至" -"Save Session Files In","保存会话文件至" -"Secure Base URL","安全基本URL" -"Session Storage Options","会话存储选项" -"Setting preferred state to: %s","设置首选州为：%s" -"Skip Base URL Validation Before the Next Step","在开始下一步之前跳过基本URL验证" -"Skip Secure URL validation before next step","在开始下一步之前跳过安全URL验证" -"Tables Prefix","表格前缀" -"The URL ""%s"" is invalid.","URL ""%s"" 无效。" -"The URL ""%s"" is not accessible.","URL “%s” 无法访问。" -"The database server version doesn\'t match system requirements (required: %s, actual: %s).","数据库服务器版本不满足要求（需要：%s，实际：%s）。" -"The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_), the first character should be a letter.","表前缀只能包含字母 (a-z)、数字 (0-9)，或下划线 (_)，第一个字符必须是字母。" -"There was a problem installing Magento packages. Please read the log, correct errors and try again.","安装Magento包时遇到了错误。请阅读日志，解决问题，并重试。" -"Time Zone","时区" -"Use Secure URLs (SSL)","使用安全URL（SSL）" -"Use Web Server (Apache) Rewrites","使用Web服务器（Apache）重写" -"User Name","用户名" -"User Password","用户密码" -"Username","用户名" -"Validation","验证" -"Web access options","Web访问选项" -"Welcome","欢迎" -"Welcome to Magento's Installation Wizard","欢迎使用Magento安装向导" -"You can specify server port, ex.: localhost:3307
    If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","您可以指定服务器端口，例如： localhost:3307
    如果没有使用默认的UNIX socket，则可以在此指定，而不用在主机中指定，例如： /var/run/mysqld/mysqld.sock" -"You could enable this option to use web server rewrites functionality for improved search engines optimization.","您可以启用该选项，以便通过Web服务器的重写功能改善搜索引擎优化效果。" -"You're All Set","您已经设置完毕。" -"You're All Set!","您已经设置完毕！" diff --git a/app/locale/zh_CN/Mage_Log.csv b/app/locale/zh_CN/Mage_Log.csv deleted file mode 100644 index c98cd14c0..000000000 --- a/app/locale/zh_CN/Mage_Log.csv +++ /dev/null @@ -1,9 +0,0 @@ -"Enable Log Cleaning","启用日志清理" -"Error Email Recipient","邮件接收有误" -"Error Email Sender","邮件发送有误" -"Error Email Template","邮件模板有误" -"Frequency","频率" -"Log Cleaning","日志清理" -"Log cleanup Warnings","日志清理警告" -"Save Log, Days","保存日志，天" -"Start Time","开始时间" diff --git a/app/locale/zh_CN/Mage_Media.csv b/app/locale/zh_CN/Mage_Media.csv deleted file mode 100644 index 3a2b36746..000000000 --- a/app/locale/zh_CN/Mage_Media.csv +++ /dev/null @@ -1,3 +0,0 @@ -"An error occurred while creating the image.","创建图像时遇到了错误。" -"The image does not exist or is invalid.","该图像不存在或无效。" -"This content requires last version of Adobe Flash Player. Get Flash","该内容需要最新版Adobe Flash Player。获取Flash" diff --git a/app/locale/zh_CN/Mage_Newsletter.csv b/app/locale/zh_CN/Mage_Newsletter.csv deleted file mode 100644 index 98c17aa53..000000000 --- a/app/locale/zh_CN/Mage_Newsletter.csv +++ /dev/null @@ -1,137 +0,0 @@ -" Copy","复制" -"Action","操作" -"Add New Template","添加新模板" -"Add to Queue","添加到队列" -"Allow Guest Subscription","允许游客订阅" -"An error occurred while saving your subscription.","保存您的订阅时发生错误。" -"Are you sure that you want to delete this template?","您是否确认要删除该模板？" -"Are you sure that you want to strip all tags?","您确认要去除所有标签吗？" -"Back","返回" -"Cancel","取消" -"Cancelled","已取消" -"Cannot mark as received subscriber.","无法标记为已接收的订阅者。" -"Confirmation Email Sender","确认电子邮件发送者" -"Confirmation Email Template","确认电子邮件模版" -"Confirmation request has been sent.","确认请求已发送。" -"Convert to Plain Text","转换为纯文本" -"Create Newsletter Template","创建新闻通讯模板" -"Customer","客户" -"Customer First Name","客户名字" -"Customer Last Name","客户姓氏" -"Customer My Account Newsletter Subscriptions","客户我的账户新闻通讯订阅" -"Date Added","添加日期" -"Date Updated","更新日期" -"Delete","删除" -"Delete Selected Problems","删除已选择的问题" -"Delete Template","删除模板" -"Do you really want to cancel the queue?","您确认要删除队列吗？" -"Duplicate template code.","重复的模版代码。" -"Edit Newsletter","编辑新闻通讯" -"Edit Newsletter Template","编辑新闻通讯模版" -"Edit Queue","编辑队列" -"Edit Template","编辑模板" -"Email","电子邮件" -"Enter your email address","输入您的电子邮件地址" -"Error Code","错误代码" -"Error Text","错误文本" -"Follow this link to unsubscribe {{var subscriber.getUnsubscriptionLink()}}","使用此链接来退订<!-- 该标记用于退订链接 -->{{var subscriber.getUnsubscriptionLink()}}" -"Guest","来宾" -"ID","ID" -"Invalid queue selected.","已选择无效的队列。" -"Invalid subscription ID.","无效的订阅 ID。" -"Invalid subscription confirmation code.","无效的订阅确认代码。" -"Message","信息" -"Need to Confirm","需要确认" -"New Newsletter Template","新新闻通讯模板" -"New Template","新模板" -"Newsletter","新闻邮件" -"Newsletter Message Preview","新闻通讯消息预览" -"Newsletter Problem Reports","新闻通讯问题报告" -"Newsletter Queue","新闻邮件队列" -"Newsletter Section","新闻邮件区域" -"Newsletter Sign-up:","注册新闻通讯：" -"Newsletter Styles","新闻邮件风格" -"Newsletter Subscribers","新闻邮件订阅者" -"Newsletter Subscription","新闻邮件订阅" -"Newsletter Subscription Form Before","新闻邮件订阅表单前" -"Newsletter Subscriptions","新闻邮件订阅" -"Newsletter Templates","新闻邮件模板" -"Newsletter subscription confirmation","新闻邮件订阅确认" -"Newsletter subscription success","新闻邮件订阅成功" -"Newsletter unsubscription success","新闻邮件退订成功" -"No Templates Found","模板未找到" -"No problems found.","未找到问题。" -"No subscribers selected.","未选择订阅者。" -"Not Activated","未激活" -"Not Sent","未发送" -"Pause","暂停" -"Paused","已暂停" -"Please enter a valid email address.","请输入有效的电子邮件地址。" -"Please enter new template name","请输入新的模板名称" -"Please refer to exeption.log","请参考 exeption.log" -"Please select subscriber(s)","请选择订阅者" -"Preview","预览" -"Preview Template","预览模板" -"Processed","已处理" -"Queue Date Start","队列数据开始" -"Queue Finish","队列完成" -"Queue Information","队列信息" -"Queue Newsletter...","队列新闻邮件..." -"Queue Start","队列开始" -"Queue Subject","队列主题" -"Recipients","收件人" -"Reset","重置状态" -"Resume","恢复" -"Return HTML Version","返回HTML版本" -"Save As","另存为" -"Save Newsletter","保存新闻邮件" -"Save Template","保存模板" -"Save and Resume","保存并恢复" -"Selected problem subscribers have been unsubscribed.","选中的有问题订阅者已退订。" -"Selected problems have been deleted.","选中的问题已删除。" -"Sender","发送方" -"Sender Email","发送人邮件" -"Sender Name","发送人姓名" -"Sending","正在发送" -"Sent","已发送" -"Sign Up for Our Newsletter:","订阅我们的新闻邮件：" -"Sign up for our newsletter","订阅我们的新闻邮件" -"Sorry, but administrator denied subscription for guests. Please register.","对不起，但管理员拒绝了来宾的订阅。请 注册。" -"Start","开始" -"Status","状态" -"Store","商店" -"Store View","店铺视图" -"Subject","主题" -"Submit","提交" -"Subscribe","订阅" -"Subscribed","已订阅" -"Subscriber","订阅者" -"Subscribers","订阅者" -"Subscribers From","订阅者来自" -"Subscription Options","订阅选项" -"Success Email Sender","成功电子邮件发送者" -"Success Email Template","成功电子邮件模板" -"Template Content","模板内容" -"Template Information","模板信息" -"Template Name","模板名称" -"Template Styles","模板风格" -"Template Subject","模板主题" -"Template Type","模板类型" -"Thank you for your subscription.","感谢您的订阅。" -"The subscription has been removed.","订阅已删除。" -"The subscription has been saved.","订阅已保存。" -"There was a problem with the subscription.","订阅遇到问题。" -"There was a problem with the subscription: %s","订阅 %s 遇到问题" -"There was a problem with the un-subscription.","取消订阅遇到问题。" -"This email address is already assigned to another user.","该电子邮件地址已分配给另一用户。" -"Type","类型" -"Unconfirmed","未确认" -"Unsubscribe","退订" -"Unsubscribe Selected","退订所选者" -"Unsubscribed","已退订" -"Unsubscription Email Sender","退订邮件发送程序" -"Unsubscription Email Template","退订邮件模板" -"View Newsletter","查看新闻邮件" -"Website","网站" -"You have been unsubscribed.","您已经退订。" -"Your subscription has been confirmed.","您的订阅已确认。" diff --git a/app/locale/zh_CN/Mage_Oauth.csv b/app/locale/zh_CN/Mage_Oauth.csv deleted file mode 100644 index 41f1a426e..000000000 --- a/app/locale/zh_CN/Mage_Oauth.csv +++ /dev/null @@ -1,118 +0,0 @@ -"%name% '%value%' is too long. It must has length %min% symbols.","%name% '%value%' is too long. It must has length %min% symbols." -"%name% '%value%' is too short. It must has length %min% symbols.","%name% '%value%' is too short. It must has length %min% symbols." -"* Required Fields","*必要字段" -"%s requests access to your account","%s requests access to your account" -"Admin","管理员" -"After authorization application will have access to you account.","After authorization application will have access to you account." -"An error occurred on confirm authorize.","An error occurred on confirm authorize." -"An error occurred on delete action.","An error occurred on delete action." -"An error occurred on delete application.","An error occurred on delete application." -"An error occurred on reject authorize.","An error occurred on reject authorize." -"An error occurred on saving consumer data.","An error occurred on saving consumer data." -"An error occurred on update revoke status.","An error occurred on update revoke status." -"An error occurred while deleting the consumer.","An error occurred while deleting the consumer." -"An error occurred.","An error occurred." -"An error occurred. Your authorization request is invalid.","An error occurred. Your authorization request is invalid." -"App Name","App名称" -"Application ""%s"" has been deleted.","Application ""%s"" has been deleted." -"Application ""%s"" has been enabled.","Application ""%s"" has been enabled." -"Application ""%s"" has been revoked.","Application ""%s"" has been revoked." -"Application Name","应用程序名称" -"Application not found.","Application not found." -"Are you sure you want to delete this application?","Are you sure you want to delete this application?" -"Are you sure you want to disable this application?","Are you sure you want to disable this application?" -"Are you sure you want to enable this application?","Are you sure you want to enable this application?" -"Authorization confirmed","Authorization confirmed" -"Authorization confirmed.","Authorization confirmed." -"Authorize","Authorize" -"Authorize application","Authorize application" -"Authorized Tokens","Authorized Tokens" -"Callback URL","Callback URL" -"Cleanup Probability","Cleanup Probability" -"Cleanup Settings","Cleanup Settings" -"Close","关闭" -"Confirm OAuth token authorization","Confirm OAuth token authorization" -"Confirm token authorization Pop Up for admin","Confirm token authorization Pop Up for admin" -"Confirm token authorization for admin","Confirm token authorization for admin" -"Confirmation Of Authorization","Confirmation Of Authorization" -"Consumer Information","Consumer Information" -"Consumer Name","Consumer Name" -"Consumers","Consumers" -"Created At","创建于" -"Customer","客户" -"Customer My Account My OAuth Applications","Customer My Account My OAuth Applications" -"Delete","删除" -"Disable","禁用" -"Disabled","已禁用" -"Edit","编辑" -"Edit Consumer","Edit Consumer" -"Email","电子邮件" -"Email Address","编辑电子邮件地址" -"Enable","启用" -"Enabled","已启用" -"Entry with ID #%s not found.","Entry with ID #%s not found." -"Expiration Period","Expiration Period" -"Give the verifier code to application administrator","Give the verifier code to application administrator" -"ID","ID" -"Invalid Callback URL","Invalid Callback URL" -"Invalid ID parameter.","Invalid ID parameter." -"Invalid Rejected Callback URL","Invalid Rejected Callback URL" -"Invalid entry ID.","Invalid entry ID." -"Invalid revoke status.","Invalid revoke status." -"Key","密钥" -"Log In","登录" -"Log in as a customer","Log in as a customer" -"Log in as admin","Log in as admin" -"Log in as customer","Log in as customer" -"Log in to use %s","Log in to use %s" -"Login","登录" -"My Applications","My Applications" -"Name","姓名" -"New Consumer","New Consumer" -"OAuth","OAuth" -"OAuth Admin My Apps","OAuth Admin My Apps" -"OAuth Authorized Tokens","OAuth Authorized Tokens" -"OAuth Consumers","OAuth Consumers" -"OAuth authorization Pop Up for customer","OAuth authorization Pop Up for customer" -"OAuth authorization for admin","OAuth authorization for admin" -"OAuth authorization for customer","OAuth authorization for customer" -"OAuth authorization simple for admin","OAuth authorization simple for admin" -"Password","密码" -"Permissions","权限" -"Please login to proceed authorization.","Please login to proceed authorization." -"Please select needed row(s).","Please select needed row(s)." -"Please select revoke status.","Please select revoke status." -"REST - My Apps","REST - My Apps" -"REST - OAuth Authorized Tokens","REST - OAuth Authorized Tokens" -"REST - OAuth Consumers","REST - OAuth Consumers" -"Reject","拒绝" -"Reject OAuth token authorization","Reject OAuth token authorization" -"Reject authorization","Reject authorization" -"Reject token authorization Pop Up for admin","Reject token authorization Pop Up for admin" -"Reject token authorization for admin","Reject token authorization for admin" -"Rejected Callback URL","Rejected Callback URL" -"Rejection Of Authorization","Rejection Of Authorization" -"Revoked","Revoked" -"Role Name","角色名称" -"Save","保存" -"Save and Continue Edit","保存并继续编辑" -"Secret","Secret" -"Selected entries enabled.","Selected entries enabled." -"Selected entries has been deleted.","Selected entries has been deleted." -"Selected entries revoked.","Selected entries revoked." -"Status","状态" -"System","系统" -"The application access request is rejected.","The application access request is rejected." -"The consumer has been deleted.","The consumer has been deleted." -"The consumer has been saved.","The consumer has been saved." -"Token Status Change","Token Status Change" -"Token Status Change Email Template","Token Status Change Email Template" -"Unable to find a consumer.","Unable to find a consumer." -"User ID","用户ID" -"User Name","用户名" -"User Type","User Type" -"Verifier code: %s","Verifier code: %s" -"You have no applications.","You have no applications." -"deleted","deleted" -"enabled","enabled" -"revoked","revoked" diff --git a/app/locale/zh_CN/Mage_Page.csv b/app/locale/zh_CN/Mage_Page.csv deleted file mode 100644 index 604afe834..000000000 --- a/app/locale/zh_CN/Mage_Page.csv +++ /dev/null @@ -1,81 +0,0 @@ -"%s Item(s)","%s 个项目" -"%s-%s of %s","%s-%s / %s" -"© 2012 Magento Demo Store. All Rights Reserved.","© 2012 Magento 演示商店。保留所有权利。" -"© 2013 Magento Demo Store. All Rights Reserved.","© 2013 Magento Demo Store. All Rights Reserved." -"(Shift-)Click or drag to change value","（Shift-）点击或拖拽即可更改值" -"(ver. %s)","（版本. %s）" -"- Click on any of the time parts to increase it","- 点击时间的任何部分即可更改" -"- Hold mouse button on any of the above buttons for faster selection.","- 在任何按钮上按下鼠标按键即可选中。" -"- Use the %s buttons to select month","- 使用%s 按钮选择月份" -"- Use the %s, %s buttons to select year","- 使用%s，%s按钮选择年份" -"- or Shift-click to decrease it","- 或Shift-点击以减小" -"- or click and drag for faster selection.","- 或点击并拖拽以快速选中。" -"-- Please Select --","-- 请选择 --" -"1 column","1栏" -"2 columns with left bar","2栏带左边栏" -"2 columns with right bar","2栏带右边栏" -"3 columns","3栏" -"About the calendar","关于日历" -"Account","帐户" -"All Empty Layout Pages","所有空的布局页面" -"All One-Column Layout Pages","所有一栏布局页面" -"All Pages","所有页面" -"All Pages (Print Version)","所有页面（打印版）" -"All Three-Column Layout Pages","所有三栏布局页面" -"All Two-Column Layout Pages (Left Column)","所有两栏布局页面（左栏）" -"All Two-Column Layout Pages (Right Column)","所有两栏布局页面（右栏）" -"Allow","允许" -"Breadcrumbs","面包屑" -"Click here if nothing has happened","如果什么都没有发生，请点击 这里" -"Close","关闭" -"Close Window","关闭窗口" -"DHTML Date/Time Selector","DHTML 日期/时间选择器" -"Date selection:","选择日期：" -"Default Description","默认描述" -"Default welcome msg!","默认欢迎信息！" -"Display %s first","显示前 %s个" -"Distributed under GNU LGPL. See %s for details.","在GNU LGPL下分发。详情请参考 %s。" -"Drag to move","拖拽以移动" -"Empty","空" -"For latest version visit: %s","最新版访问：%s" -"Free Shipping on orders over 50$","超过 50$ 的订单可享免费运送" -"Go Today","转到今天" -"Help Us to Keep Magento Healthy","帮助我们保证Magento的健康" -"Interface Language","界面语言" -"Items %s to %s of %s total","项目 %s 到 %s 共 %s个" -"JavaScript seems to be disabled in your browser.","你的浏览器似乎禁用了 JavaScript。" -"Left Column","左栏" -"Left Column First (shows above main column on smaller screens)","左侧列优先（在更小的屏幕上显示上方主列）" -"Main Content Area","主内容区域" -"Menu","菜单" -"Navigation Bar","导航栏" -"Next","下一个" -"Next month (hold for menu)","下个月（按下可打开菜单）" -"Next year (hold for menu)","明年（按下可打开菜单）" -"Page Bottom","页面底部" -"Page Footer","页面脚注" -"Page Header","页面头部" -"Page Top","页面顶部" -"Page:","页面：" -"Prev. month (hold for menu)","上个月（按下菜单）" -"Prev. year (hold for menu)","去年（按下可打开菜单）" -"Previous","上一个" -"Redirecting...","正在重定向..." -"Report All Bugs","报告所有Bug" -"Results per page","每页结果数量" -"Right Column","右栏" -"Search","搜索" -"Select Store","选择店铺" -"Select Store:","选择店铺：" -"Select date","选择日期" -"Show","显示" -"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","这是一个演示商店。任何在此商店下的订单将无法被兑现或履行。" -"This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our Privacy Policy page. To accept cookies from this site, please click the Allow button below.","该网站需要 Cookie 以提供其全部功能。要了解有关 Cookie 包含何种数据的更多信息，请查看我们的 隐私权政策页面。要接收来自此网站的 Cookie，请单击下方的“允许”按钮。" -"Time selection:","时间选择：" -"Time:","时间：" -"View All ","查看全部" -"Welcome, %s!","欢迎，%s！" -"You must have JavaScript enabled in your browser to utilize the functionality of this website.","您必须在浏览器中启用JavaScript才能使用本网站的功能。" -"Your Language","您的语言" -"Your Language:","您的语言：" -"per page","每页" diff --git a/app/locale/zh_CN/Mage_PageCache.csv b/app/locale/zh_CN/Mage_PageCache.csv deleted file mode 100644 index 44401be6a..000000000 --- a/app/locale/zh_CN/Mage_PageCache.csv +++ /dev/null @@ -1,12 +0,0 @@ -"An error occurred while clearing the external full page cache.","清理外部全页面缓存时出错。" -"Cookie Lifetime (seconds)","Cookie 寿命（秒）" -"Enable External Cache","启用外部缓存" -"External Cache Control","外部缓存控制" -"External Full Page Cache Settings","外部全页面缓存设置" -"External Page Cache","外部页面缓存" -"External full page cache.","外部全页面缓存。" -"Failed to load external cache control","加载外部缓存控制出错" -"Flush External Page Cache","清除外部页面缓存" -"If empty, default value will be used.","如果为空，将使用默认值。" -"The external full page cache has been cleaned.","外部全页面缓存已被清理。" -"Zend Full Page Cache","Zend 全页面缓存" diff --git a/app/locale/zh_CN/Mage_Paygate.csv b/app/locale/zh_CN/Mage_Paygate.csv deleted file mode 100644 index f73ece5cb..000000000 --- a/app/locale/zh_CN/Mage_Paygate.csv +++ /dev/null @@ -1,67 +0,0 @@ -"3D Secure","3D 安全" -"3D Secure Card Validation","3D 安全信用卡验证" -"API Login ID","API 登录 ID" -"Accepted Currency","接受的汇率" -"Allow Partial Authorization","允许部分身份验证" -"Are you sure you want to cancel your payment? Click OK to cancel your payment and release the amount on hold. Click Cancel to enter another credit card and continue with your payment.","您是否确定要取消支付？单击确定可取消您的支付，并释放占用的额度。单击取消可输入其他信用卡，并继续进行支付。" -"Authorize Only","仅供授权" -"Authorize and Capture","授权和捕获" -"Authorize.Net Transaction ID %s","Authorize.Net 交易 ID %s" -"Authorize.net","Authorize.net" -"Cancel","取消" -"Centinel API URL","Centinel API URL" -"Credit Card Types","信用卡类型" -"Credit Card Verification","信用卡验证" -"Credit Card: xxxx-%s","信用卡：xxxx-%s" -"Debug","调试" -"Email Customer","发送电子邮件给客户" -"Enabled","已启用" -"Error in payment gateway.","支付网关出错。" -"Gateway actions are locked because the gateway cannot complete one or more of the transactions. Please log in to your Authorize.Net account to manually resolve the issue(s).","网关操作被锁定，因为网关无法完成一个或多个交易。请登录到您的 Authorize.Net 帐户并手工解决该问题。" -"Gateway error: %s","网关错误：%s" -"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","如果为空，则会使用默认值。自定义URL可通过 CardinalCommerce 协议提供。" -"Invalid amount for authorization.","授权的额度无效。" -"Invalid amount for capture.","获取的额度无效。" -"Invalid amount for partial authorization.","部分身份验证无效。" -"Invalid amount for refund.","退款额度无效。" -"Invalid split tenderId ID.","拆分的 tenderId ID 无效。" -"Invalid transaction ID.","无效交易的身份" -"Maximum Order Total","最大订单总数" -"Merchant's Email","商家电子邮件" -"Minimum Order Total","最小订单总数" -"New Order Status","新订单状态" -"Parent Authorize.Net transaction (ID %s) expired","Authorize.Net 父交易 (ID %s) 已过期" -"Payment Action","支付操作" -"Payment authorization error.","支付授权错误。" -"Payment canceling error.","取消支付过程出错。" -"Payment capturing error.","支付捕获出错。" -"Payment from Applicable Countries","从可接受的国家支付" -"Payment from Specific Countries","从指定的国家支付" -"Payment partial authorization error.","支付的部分身份验证出错。" -"Payment refunding error.","支付的退款出错。" -"Payment updating error.","支付更新错误。" -"Payment voiding error.","支付的作废出错。" -"Processed Amount","处理的额度" -"Remaining Balance","剩下的余额" -"Severe 3D Secure Card Validation","提供 3D 安全信用卡验证" -"Severe Validation Removes Chargeback Liability on Merchant","正式验证将撤销银行的退款责任" -"Shopping cart contents and/or address has been changed.","购物车内容和/或地址已被更改。" -"Sort Order","排序顺序" -"Test Mode","测试模式" -"The amount on your credit card is insufficient to complete your purchase. The available amount has been put on hold. To complete your purchase click OK and specify additional credit card number. To cancel the purchase and release the amount on hold, click Cancel.","您信用卡的余额不足以完成本次购买。可用余额已经被暂挂。为完成您的购买，请点击确定并提供另一个信用卡号码。要取消购买并退回暂挂的余额，请点击取消。" -"There was an error canceling transactions. Please contact us or try again later.","取消交易时遇到了错误。请联系我们或稍候重试。" -"Title","标题" -"Transaction Key","交易密钥" -"You have reached the maximum number of credit card allowed to be used for the payment.","您已经达到了可用于交易的信用卡数量最大值。" -"You have reached the maximum number of credit cards that can be used for one payment. The available amounts on all used cards were insufficient to complete payment. The payment has been cancelled and amounts on hold have been released.","您已经达到了一次支付可使用信用卡数量的最大值。所有用过卡片的可用额度都不足以完成支付。付款已被取消，暂挂的额度已经被返还。" -"Your credit card has been declined. Click OK to specify another credit card to complete your purchase. Click Cancel to release the amount on hold and select another payment method.","您的信用卡被拒绝。点击确定以指定另一张可完成此次交易的信用卡。点击取消以返还被暂挂的额度，并选择其他支付方式。" -"Your order has not been placed, because contents of the shopping cart and/or address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process for your recent cart contents.","您的订单创建不成功，因为购物车的内容和/或地址已经有变动。您的上次支付中通过预授权被暂挂的额度已经返还。请为购物车中的新内容重新执行付款流程。" -"Your payment has been cancelled. All authorized amounts have been released.","您的付款已被取消。所有授权的额度已经被返还。" -"amount %s","额度 %s" -"authorize","授权" -"authorize and capture","授权和获取" -"capture","获取" -"failed","失败" -"refund","退款" -"successful","成功" -"void","避免" diff --git a/app/locale/zh_CN/Mage_Payment.csv b/app/locale/zh_CN/Mage_Payment.csv deleted file mode 100644 index 94eca7ff4..000000000 --- a/app/locale/zh_CN/Mage_Payment.csv +++ /dev/null @@ -1,142 +0,0 @@ -"%s %s cycle.","%s %s 周期。" -"* Required Fields","* 必填字段" -"--Please Select--","-- 请选择 --" -"3D Secure Card Validation","3D 安全信用卡验证" -"3D Secure Credit Card Validation","3D安全信用卡验证" -" %s"," %s" -"A value is required for live mode. Refer to your CardinalCommerce agreement.","动态模式需要提供值。请参考您的CardinalCommerce 协议。" -"Allow Initial Fee Failure","允许初始费用失败" -"An internal reference ID is required to save the payment profile.","保存支付配置文件时需要提供内部参考ID。" -"Authorize action is not available.","授权操作不可用。" -"Auto Bill on Next Cycle","下个周期自动记账" -"Automatically Invoice All Items","对所有商品自动创建发票" -"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","下个记账周期对余款额度自动记账（如果有失败的支付的话）。" -"Bank Transfer Payment","银行转账支付" -"Billing Agreement status is not set.","记账协议状态未设置。" -"Billing Amount","记账额度" -"Billing Frequency","记账频率" -"Billing Period","记账周期" -"Billing Period Unit","记账周期单位" -"Billing period unit is not defined or wrong.","记账周期单位未定义或有误。" -"Cannot retrieve the payment info model object.","无法获取支付信息模块对象。" -"Cannot retrieve the payment information object instance.","无法获取支付信息对象实例。" -"Cannot retrieve the payment method code.","无法获取支付方法代码。" -"Cannot retrieve the payment method model object.","无法获取支付方法模块对象。" -"Capture action is not available.","捕获操作不可用。" -"Card Verification Number","卡片验证号码" -"Cash On Delivery Payment","货到付款" -"Centinel API URL","Centinel API URL" -"Check / Money Order","支票/费用订单" -"Credit Card Number","信用卡号码" -"Credit Card Number: xxxx-%s","信用卡号码：xxxx-%s" -"Credit Card Type","信用卡类型" -"Credit Card Type: %s","信用卡类型：%s" -"Credit Card Types","信用卡类型" -"Credit card number mismatch with credit card type.","信用卡号与信用卡类型不匹配。" -"Credit card type is not allowed for this payment method.","信用卡类型无法用于此支付方法。" -"Currency","币种" -"Currency code is undefined.","货币代码未定义。" -"Customer ID is not set.","客户ID未设置。" -"Day","天" -"Debug Mode","调试模式" -"Enabled","已启用" -"Expiration Date","过期日期" -"Expiration Date: %s/%s","过期日期：%s/%s" -"Full name of the person receiving the product or service paid for by the recurring payment.","获取通过周期性支付所提供的产品或服务的人的全名。" -"Incorrect credit card expiration date.","错误的信用卡到期日。" -"Initial Fee","初始费用" -"Initial non-recurring payment amount due immediately upon profile creation.","创建配置文件时立刻进行非周期性初始支付。" -"Instructions","说明" -"Internal Reference ID","内部参考ID" -"Invalid Credit Card Number","信用卡号无效" -"Issue Number","问题编号" -"Make Check Payable to","通过支票付款给" -"Make Check payable to:","通过支票付款给：" -"Make Check payable to: %s","通过支票付款给：%s" -"Maximum Billing Cycles","最长记账周期" -"Maximum Order Total","最大订单总数" -"Maximum Payment Failures","最多付款失败次数" -"Maximum Trial Billing Cycles","最长试用记账周期" -"Merchant ID","分行ID" -"Minimum Order Total","最小订单总数" -"Month","月" -"N/A","N/A" -"Name on Card","卡片上的名字" -"Name on the Card","持卡人名字" -"Name on the Card: %s","卡片上的名字：%s" -"New Order Status","新订单状态" -"Number of billing periods that make up one billing cycle.","组成一个账单循环的账单周期数量。" -"Order action is not available.","订购操作不可用。" -"Overrides API URL that may be specified by a payment method.","覆盖可能由支付方式指定的 API URL。" -"Password","密码" -"Payment ID: %s","支付 ID：%s" -"Payment Method","支付方式" -"Payment Methods","支付方式" -"Payment Methods Section","支付方式区域" -"Payment Reference ID","支付参考 ID" -"Payment Services","支付服务" -"Payment from Applicable Countries","从可接受的国家支付" -"Payment from Specific Countries","从指定的国家支付" -"Payment method code is not set.","支付方式代码未设置。" -"Payment method code is undefined.","支付方式代码未定义。" -"Payment profile is invalid:\n%s","支付资料无效：\n%s" -"Period frequency is wrong.","周期频率错误。" -"Please enter a valid credit card verification number.","请输入有效的信用卡验证码。" -"Processor ID","处理器 ID" -"Purchase Order","采购订单" -"Purchase Order Number","采购订单号" -"Purchase Order Number:","采购订单号" -"Purchase Order Number: %s","付款的订单号：%s" -"Recurring Profile Start Date","周期性配置文件开始日期" -"Recurring profile start date has invalid format.","周期性配置文件开始日期格式无效。" -"Reference ID is not set.","参考ID未设置。" -"Refund action is not available.","退款操作不可用。" -"Repeats %s time(s).","重复 %s 次。" -"Repeats until suspended or canceled.","一直重复，直到被挂起或取消。" -"Request Card Security Code","请求卡安全码。" -"Saved CC","保存的CC" -"Schedule Description","计划描述" -"Schedule description must be not empty.","计划描述不能为空" -"Selected payment type is not allowed for billing country.","发卡行所在国不允许使用所选支付类类型。" -"Send Check to","发送支票给" -"Send Check to:","发送支票给：" -"Severe 3D Secure Card Validation","提供 3D 安全信用卡验证" -"Severe validation removes chargeback liability on merchant.","严格的验证可避免分行的退款责任。" -"Shipping Amount","运送量" -"Short description of the recurring payment. By default equals to the product name.","周期性付款的简短描述。默认等于产品名。" -"Sort Order","排序顺序" -"Start Date","开始日期" -"Start date has invalid format.","开始日期格式无效。" -"Start date is undefined.","开始日期未定义。" -"Subscriber Name","订阅者姓名" -"Switch/Solo/Maestro Issue Number","Switch/Solo/Maestro卡号" -"Switch/Solo/Maestro Only","仅限 Switch/Solo/Maestro" -"Switch/Solo/Maestro Start Date","Switch/Solo/Maestro开始日期" -"Tax Amount","税额" -"Test Mode","测试模式" -"The date when billing for the profile begins.","该配置文件记账的开始日期。" -"The number of billing cycles for payment period.","支付周期内记账循环的数量。" -"The number of scheduled payments that can fail before the profile is automatically suspended.","配置文件被自动挂起之前，支付计划的失败数量。" -"The payment review action is unavailable.","支付审查操作不可用。" -"The requested Payment Method is not available.","请求的支付方式不可用。" -"Title","标题" -"Trial Billing Amount","尝试记账帐户。" -"Trial Billing Frequency","尝试记账频率" -"Trial Billing Period Unit","尝试记账周期单位" -"Trial Period","尝试周期" -"Trial billing amount is wrong.","尝试记账额度有误。" -"Trial billing period unit is wrong.","尝试记账周期单位有误。" -"Trial period frequency is wrong.","尝试周期频率有误。" -"Trial period max cycles is wrong.","尝试周期最大周期有误。" -"Two Weeks","两周" -"Unable to save Billing Agreement:","无法保存记账协议：" -"Unit for billing during the subscription period.","订阅期限内的记账单位。" -"Unsupported currency code: %s.","不支持的货币代码：%s" -"Void action is not available.","空操作不可用。" -"Week","周" -"What is this?","这是什么？" -"Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.","如果初始费用失败，或添加到余款余额中，是否挂起支付配置文件。" -"Wrong %s specified.","指定的 %s 有误。" -"Wrong or empty billing amount specified.","指定的记账额度有误或为空。" -"Year","年" -"Zero Subtotal Checkout","无小计结账" diff --git a/app/locale/zh_CN/Mage_Paypal.csv b/app/locale/zh_CN/Mage_Paypal.csv deleted file mode 100644 index 185d61779..000000000 --- a/app/locale/zh_CN/Mage_Paypal.csv +++ /dev/null @@ -1,623 +0,0 @@ -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -" - Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details. - ","Why Advertise Financing?
    - Give your sales a boost when you advertise financing.
    PayPal helps turn browsers into buyers with financing - from Bill Me Later®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise Bill Me Later® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details." -"-OR-","-或-" -"120 x 240","120 x 240" -"120 x 600","120 x 600" -"120 x 90","120 x 90" -"190 x 100","190 x 100" -"2-pixel perimeter around the header space.","头部空间周围2像素的边界" -"234 x 400","234 x 400" -"234 x 60","234 x 60" -"250 x 250","250 x 250" -"300 x 50","300 x 50" -"3D Secure","3D 安全" -"3D Secure Card Validation","3D 安全信用卡验证" -"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at http://www.paypal.com/amexupdate.","Maestro卡需要 3D 安全验证。对美国运通卡的支持需要额外的协议。详情请访问 http://www.paypal.com/amexupdate。" -"468 x 60","468 x 60" -"728 x 90","728 x 90" -"800 x 66","800 x 66" -"Start accepting payments via PayPal!","开始通过PayPal接受付款！" -"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement." -"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof." -"A reversal has occurred on this transaction because you have given the customer a refund.","A reversal has occurred on this transaction because you have given the customer a refund." -"A reversal has occurred on this transaction due to a chargeback by your customer.","A reversal has occurred on this transaction due to a chargeback by your customer." -"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","A reversal has occurred on this transaction due to a complaint about the transaction from your customer." -"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","A reversal has occurred on this transaction due to your customer triggering a money-back guarantee." -"A value is required for live mode. Refer to your CardinalCommerce agreement.","动态模式需要提供值。请参考您的CardinalCommerce 协议。" -"ACH Deposit (Hold for Dispute or Other Investigation)","ACH保证金（用作保证或其他调查用途）" -"ACH Deposit (Reversal)","ACH保证金（撤销）" -"ACH Funding for Funds Recovery from Account Balance","来自帐户余额的返款恢复ACH返款" -"ACH Withdrawal","ACH撤销" -"API Authentication Methods","API身份验证方法" -"API Certificate","API证书" -"API Password","API密码" -"API Signature","API签名" -"API Username","API用户名" -"API Uses Proxy","API使用代理" -"Ability for buyer to purchase without PayPal account.","买家在不使用PayPal帐户下购买的能力。" -"Accept credit card and PayPal payments securely.","Accept credit card and PayPal payments securely." -"Accept credit cards, debit cards and PayPal payments securely.","Accept credit cards, debit cards and PayPal payments securely." -"Accept payments in your shopping cart. PayPal will process your card payments through the Payflow Gateway.","Accept payments in your shopping cart. PayPal will process your card payments through the Payflow Gateway." -"Accept payments with a PCI compliant checkout that keeps customers on your site.","Accept payments with a PCI compliant checkout that keeps customers on your site." -"Accept payments with a PCI-compliant checkout that keeps customers on your site.","Accept payments with a PCI-compliant checkout that keeps customers on your site." -"Accept payments with a completely customizable checkout page.","Accept payments with a completely customizable checkout page." -"Accept payments with a completely customizable checkout.","Accept payments with a completely customizable checkout." -"Acceptance Mark","接受标志" -"Acceptance Mark Image","接受标志图片" -"Account-to-Account Payment, initiated by PayPal","帐户到帐户支付，由PayPal开创" -"Add PayPal as an additional payment method to your checkout page to increase your sales.","Add PayPal as an additional payment method to your checkout page to increase your sales." -"Add PayPal as an additional payment method to your checkout page.","Add PayPal as an additional payment method to your checkout page." -"Add another payment method to your existing solution or as a stand-alone option.","Add another payment method to your existing solution or as a stand-alone option." -"Additional Options","其他选项" -"Address","地址" -"Address Verification System Response","地址验证系统响应" -"Advanced Settings","高级设置" -"Advertise Bill Me Later","广告宣传 Bill Me Later" -"All the address information matched","所有地址信息都匹配" -"Allow in Billing Agreement Wizard","允许使用记账协议向导" -"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","可用的值： ""paypal""、""primary"" （默认值）、your_custom_value（您的帐户配置文件中包含的一种自定义支付页面样式）。" -"Allowed Credit Card Types","允许的信用卡类型" -"Also affects mini-shopping cart.","同时会影响迷你购物车。" -"Are you sure you want to leave this page? You will need to go through the checkout steps again.","您确认要离开此页面吗？您需要重新完成一次结账步骤。" -"Ask Customer","询问顾客" -"Attempted Authentication, Bad Result","尝试身份验证，结果有误" -"Attempted Authentication, Good Result","尝试身份验证，结果正常" -"Auction Payment other than through eBay","eBay之外的其他拍卖支付" -"Authenticated, Bad Result","已身份验证，结果有误" -"Authenticated, Good Result","已身份验证，结果正常" -"Authorization","授权" -"Authorization Honor Period (days)","授权有效期限（天）" -"Authorization expired.","授权已过期。" -"Authorization transaction is required to void.","授权的交易必须无效。" -"Authorization was voided by merchant.","授权被银行撤销。" -"Authorized amount of %s.","授权额度 %s" -"Authorizing amount of %s is pending approval on gateway.","授权额度 %s 正等待网关的审批。" -"Auto","自动" -"AutoSweep","自动清理" -"Available Balance","可用余额" -"Balance Manager Account Bonus","余额管理器帐户点数" -"Basic Settings - PayPal Express Checkout","Basic Settings - PayPal Express Checkout" -"Basic Settings - PayPal Integral Evolution","Basic Settings - PayPal Integral Evolution" -"Basic Settings - PayPal Pasarela integral","Basic Settings - PayPal Pasarela integral" -"Basic Settings - PayPal Payflow Link","Basic Settings - PayPal Payflow Link" -"Basic Settings - PayPal Payflow Pro","Basic Settings - PayPal Payflow Pro" -"Basic Settings - PayPal Payments Advanced","Basic Settings - PayPal Payments Advanced" -"Basic Settings - PayPal Payments Pro","Basic Settings - PayPal Payments Pro" -"Basic Settings - PayPal Payments Pro Hosted Solution","Basic Settings - PayPal Payments Pro Hosted Solution" -"Basic Settings - PayPal Payments Standard","基本设置 - PayPal Payments Standard" -"Basic Settings - PayPal Pro","基本设置 - PayPal Pro" -"Basic Settings - PayPal Website Payments Plus","基本设置 - PayPal Website Payments Plus" -"Basic Settings - PayPal Website Payments Pro","基本设置 - PayPal Website Payments Pro" -"Basic Settings - PayPal Website Payments Pro Hosted Solution","基本设置 - PayPal Website Payments Pro Hosted Solution" -"Basic Settings - PayPal Website Payments Pro Payflow Edition","基本设置 - PayPal Website Payments Pro Payflow Edition" -"Basic Settings - PayPal Website Payments Standard","基础设置 - PayPal Website Payments Standard" -"Billing Address","账单地址" -"Billing Agreement Signup","签署记账协议" -"Billing Information","账单信息" -"Bonus for first ACH Use","首次使用ACH奖励" -"Both section above must be complete. ","Both section above must be complete." -"Buyer Credit Payment","买家信用支付" -"Buyer claims that a possible duplicate payment was made to the merchant.","Buyer claims that a possible duplicate payment was made to the merchant." -"Buyer claims that he did not receive goods or service.","Buyer claims that he did not receive goods or service." -"Buyer claims that he/she did not authorize transaction.","Buyer claims that he/she did not authorize transaction." -"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Buyer claims that the goods or service received differ from merchant’s description of the goods or service." -"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged." -"Buyer\'s Tax ID","买家的纳税人 ID" -"Buyer\'s Tax ID Type","买家的纳税人 ID 类型" -"By default it is ""reports.paypal.com"".","默认为“reports.paypal.com”。" -"CNPJ","CNPJ" -"CPF","CPF" -"CVV Entry is Editable","CVV Entry is Editable" -"CVV2 Check Result by PayPal","PayPal的CVV2检查结果" -"Can not send new order email.","无法发送新的订单邮件。" -"Cannot create target file for reading reports.","无法为阅读的报告创建目标文件。" -"Catalog Category Page","目录分类页面" -"Catalog Product Page","目录产品页面" -"Centinel API URL","Centinel API URL" -"Centinel Custom API URL","Centinel 自定义 API URL" -"Charge-off","收取" -"Chargeback","退款" -"Checkout Cart Page","结账购物车页面" -"Checkout with PayPal","使用PayPal结账" -"Checkout with PayPal Bill Me Later","使用 PayPal Bill Me Later 结账" -"Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business." -"City","城市" -"Click here if you are not redirected within 10 seconds...","如果你在10秒内没有重定向，请点击这里..." -"Close","关闭" -"Company","公司" -"Complaint","Complaint" -"Completion Date","完成日期" -"Configure","配置" -"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site." -"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site." -"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","正在连接到PayPal SFTP服务器获取新报告。您是否确定要处理？" -"Continue","继续" -"Countries Payment Applicable From","各国支付可用情况表单" -"Country","国家" -"Coupon Redemption","代金券兑换" -"Credit","信用" -"Credit Card Settings","信用卡设置" -"Currency Conversion required to cover negative balance","货币转换需要考虑余额负值" -"Custom","自定义" -"Custom Endpoint Hostname or IP-Address","自定义端点主机名或IP地址" -"Custom Path","自定义路径" -"Customer Information","客户信息" -"Customer did not include a confirmed address.","客户并未提供确认的地址。" -"Customer failed to pay.","客户付款失败。" -"Customer used non-confirmed address.","客户使用了未经确认的地址/" -"Daily","每天" -"Debit","借记" -"Debit Card Cash Back","借记卡返现" -"Debit Card Transaction","借记卡交易" -"Debit or Credit","借记卡或信用卡" -"Debug Mode","调试模式" -"Direct Payment API","直接支付API" -"Discount","折扣" -"Display","显示" -"Display Express Checkout in the Payment Information step","在支付信息页面显示快速结账" -"Displays on catalog pages and homepage.","显示在分类页和首页" -"Dispute","Dispute" -"Don't have a PayPal account? Simply enter your email address.","还没有PayPal帐户？直接输入您的电子邮件地址。" -"Dynamic","动态" -"EFT Funding (German banking)","EFT返款（德国银行）" -"Edit","编辑" -"Edit Payment Information","编辑支付信息" -"Edit Shopping Cart","编辑购物车" -"Email Address","编辑电子邮件地址" -"Email Associated with PayPal Merchant Account","关联给PayPal银行帐户的电子邮件地址" -"Email Associated with PayPal Merchant Account (Optional)","Email Associated with PayPal Merchant Account (Optional)" -"Enable Automatic Fetching","启用自动获取" -"Enable Bill Me Later","启用 Bill Me Later" -"Enable Express Checkout","Enable Express Checkout" -"Enable PayPal Guest Checkout","启用PayPal来宾结账" -"Enable Payflow Link","Enable Payflow Link" -"Enable SSL verification","Enable SSL verification" -"Enable this Solution","Enable this Solution" -"Enabled","已启用" -"Event","事件" -"Event Code","事件代码" -"Every 10 days","每10天" -"Every 14 days","每14天" -"Every 3 days","每3天" -"Every 30 days","每30天" -"Every 40 days","每40天" -"Every 7 days","每7天" -"Exact Match. Address and Postal Code. International","完全匹配。地址和邮编。国际" -"Exact Match. Address and Postal Code. UK-specific","完全匹配。地址和邮编。仅限英国" -"Exact Match. Address and nine-digit ZIP code","完全匹配，地址和九位邮编" -"Explanation: %s.","说明：%s" -"Express Checkout","快速结账" -"Express Checkout APIs","快速结账API" -"Express Checkout and Order have been canceled.","快速结账且订单已取消。" -"Express Checkout has been canceled.","快速结账已被取消。" -"Failed to fetch reports from '%s@%s'.","从 '%s@%s'获取报告失败。" -"Fax","传真" -"Fee Amount","费率" -"Fee Debit or Credit","借记卡或信用卡费用" -"Fee Reversal","撤销手续费" -"Fee: Foreign ACH Withdrawal","费用：外国ACH撤销" -"Fee: Mass Pay Request","费用：批量付款请求" -"Fee: Web Site Payments Pro Account Monthly","费用：专业帐户月度网站支付" -"Fee: WorldLink Check Withdrawal","费用：WorldLink支票撤销" -"Fetch","获取" -"Fetch Updates","获取更新" -"Fetched %s report rows from '%s@%s'.","从'%s@%s'获取 %s 报告。" -"For Virtual Quotes Only","仅用于虚拟产品" -"Frontend Experience Settings","前端体验设置" -"Funding","退款" -"General (Authorization)","常规（身份验证）" -"General (Dividend)","常规（利息）" -"General (Funds Transfer from PayPal Account to Another)","常规（从一个PayPal帐户向另一个转移资金）" -"General (Purchase with a credit card)","常规（使用信用卡购买）" -"General Adjustment without businessrelated event","与业务无关的常规调整" -"General Currency Conversion","常规货币转换" -"General Funding of PayPal Account ","PayPal帐户的常规退款" -"General Redemption","常规兑换" -"General Withdrawal from PayPal Account","来自PayPal帐户的常规撤销" -"General. Product no longer supported","常规。产品不在被支持" -"General: Use of PayPal account for purchasing as well as receiving payments","常规：使用PayPal帐户进行付款以及收款" -"General: Withdrawal from PayPal Account","常规：通过PayPal帐户撤销" -"General: Withdrawal to Non-Bank Entity","常规：通过非银行实体撤销" -"General: adjustment of a type not belonging to the other T12xx categories","常规：调整为一种不再属于其他T12xx分类的类型" -"General: bonus of a type not belonging to the other T08xx categories","常规：通过一种不再属于其他T08xx类型的奖励" -"General: event not yet categorized","常规：事件尚未分类" -"General: non-payment fee of a type not belonging to the other T01xx categories","常规：一种不属于其他T01xx分类的非支付费用" -"General: received payment of a type not belonging to the other T00xx categories","常规：一种不属于其他T00xx分类的支付收款" -"General: reversal of a type not belonging to the other T11xx categories","常规：不属于其他T11xx分类的保留类型" -"General: temporary hold of a type not belonging to the other T15xx categories","常规：不属于其他T15xx分类的暂时保留类型" -"Get Credentials from PayPal","从PayPal获得凭证" -"Get Publisher ID from PayPal","获取来自 PayPal 的发布者 ID" -"Gift Certificate Payment: purchase of Gift Certificate","礼品券支付：购买礼品券" -"Gift Certificate Redemption","礼品券兑换" -"Gross Amount","总额" -"Header (center)","标题（居中）" -"Header Background Color","头部背景色" -"Header Border Color","头部边框颜色" -"Header Image URL","头部图像URL" -"Help","帮助" -"Hidden Virtual PayPal Debit Card Transaction","隐藏虚拟PayPal借记卡交易" -"Hold for Dispute Investigation","保留做争议调查" -"Home Page","主页" -"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","抱歉 - 我们无法完成您的交易。请联系我们，我们将为您提供协助。" -"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","抱歉 - 我们无法处理您的付款。请尝试另一种支付方式或联系我们，我们会为您提供协助。" -"IPN ""%s"".","IPN ""%s""。" -"IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""","IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""" -"IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s.","IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s." -"IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s","IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s" -"IPN verification ""%s"".","IPN 验证 ""%s""。" -"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","如果为空，则会使用默认值。自定义URL可通过 CardinalCommerce 协议提供。" -"If not specified, Default Country from General Config will be used","如果不指定，则使用常规配置中的默认国家" -"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","如果启用该选项，客户即可在PayPal网站更改自己的发货地址和发货方法。动态模式下只能使用HTTPS协议。" -"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here." -"Impossible to issue a refund transaction because the capture transaction does not exist.","无法发布退款交易，因为获得的交易不存在。" -"Incentive","奖励" -"Initiation Date","发起日期" -"Integral Evolution","整体演化" -"Invoice ID","发票ID" -"Issuer Liability","发卡人责任" -"It is recommended to set this value to ""Debit or Credit Card"" per store views.","建议对店铺的每个视图，将该值设置为“储蓄卡或信用卡”。" -"It is recommended to set this value to ""PayPal"" per store views.","建议对店铺的每个视图，将该值设置为“PayPal”。" -"Items in Your Shopping Cart","您购物车中的商品" -"Last Correlation ID","最新关联ID" -"Last Transaction ID","最新交易ID" -"Learn More","了解更多" -"Login","登录" -"Mass Pay Payment","大量付款支付。" -"Matched (CVV2)","匹配（CVV2）" -"Matched (CVV2CSC)","匹配（CVV2CSC）" -"Matched Address only (no ZIP)","只匹配地址（无邮编）" -"Matched Address only (no ZIP). International","只匹配地址（无邮编）。国际" -"Matched Postal Code only (no Address)","只匹配邮编（无地址）" -"Matched five-digit ZIP only (no Address)","只匹配五位邮编（无地址）" -"Matched whole nine-didgit ZIP (no Address)","只匹配九位邮编（无地址）" -"Merchant Account","银行帐户" -"Merchant Country","银行所在国" -"Merchant Liability","商家责任" -"Merchant Location","商家位置" -"Merchant Protection Eligibility","银行保护的资格" -"Merchant Referral Bonus","银行推荐奖励" -"Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","银行帐户没有撤销机制。银行必须从您的帐户概述中手工接受或拒绝本支付。" -"Merchant account is not verified.","银行帐户未验证。" -"Merchant denied this pending payment.","银行拒绝了这一挂起的支付。" -"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","银行提供了非美国帐户，并且没有撤销机制。" -"Merchant must upgrade account to Business or Premier status.","银行必须将帐户升级为商业或白金状态。" -"Merchant reference ID format is not supported.","不支持的银行推荐ID格式。" -"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","银行需要通过PayPal启用记账协议功能。在PayPal确认您的银行帐户已经启用记账协议之前，不要启用该功能。" -"Mobile Payment (made via a mobile phone)","移动支付（通过手机进行）" -"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","多币种问题。银行必须通过PayPal帐户概述手工接受或拒绝该支付。" -"N/A","N/A" -"N/A. Address not checked, or acquirer had no response. Service not available","N/A。地址未检查，或对方行未响应。服务不可用" -"N/A. Global Unavailable","N/A.全球不可用" -"N/A. International Unavailable","N/A. 国际不可用" -"N/A. Merchant has indicated that CVV2 is not present on card","N/A. 商家指出信用卡缺少CVV2码" -"N/A. No response","N/A. 没有响应" -"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. 不允许MOTO（网络，手机厂商）交易" -"N/A. Not processed","N/A. 未处理" -"N/A. Retry","N/A. 重试" -"N/A. Service not Supported","N/A. 不支持的服务" -"N/A. Service not available","N/A. 服务不可用" -"N/A. Service not supported","N/A。服务不支持" -"N/A. The merchant did not provide AVS information","N/A. 商家未提供AVS信息。" -"N/A. The merchant has not implemented CVV2 code handling","N/A. 商家未完成CVV2码的处理" -"N/A. Unavailable","N/A. 不可用" -"Near Bill Me Later checkout button","靠近 Bill Me Later 结账按钮" -"Negative Balance","逆差" -"Never","永不" -"No","否" -"No Details matched","无匹配资料" -"No Details matched. International","无匹配资料。国际化" -"No Liability Shift","无责任转移" -"No Logo","没有标示" -"No match","无匹配结果" -"None of the address information matched","无匹配地址信息" -"Not sure what PayPal payment method to use? Click here to learn more.","不确定要使用何种 PayPal 支付方法？单击这里了解更多信息。" -"Note: %s","注意：%s" -"Nothing to fetch because of an empty configuration.","由于配置为空，未获取任何信息" -"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","请注意，PayPal 最多可处理10个运送选项。因此如果可用数超过10个，Magento将只传输运费最便宜的前十个。" -"Notified customer about creditmemo #%s.","通知客户有关信用提醒 #%s。" -"Notified customer about invoice #%s.","通知客户有关发票 #%s。" -"Now accepting PayPal (150 X 40)","现在接受PayPal（150X40）" -"Now accepting PayPal (150 X 60)","现在接受PayPal（150X60）" -"Number of Child Authorizations","授权子帐户的数量" -"Open Authorization","开放授权" -"Order","订单" -"Order ID","订单 ID" -"Order Valid Period (days)","订单有效期（天）" -"Ordered amount of %s.","%s 的已下单数量。" -"Ordering amount of %s is pending approval on gateway.","%s的订单数量正在网站上挂起供审批。" -"Page Background Color","页面背景色" -"Page Style","页面样式" -"Part of the address information matched","地址信息中部分匹配" -"Partner","合作伙伴" -"Pasarela integral","Pasarela integral" -"Password","密码" -"PayPal All-in-One Payment Solutions  Accept and process credit cards and PayPal payments.","PayPal 多合一支付解决方案  接受并处理信用卡和 PayPal 付款。" -"PayPal Balance Manager function of PayPal account","PayPal帐户的PayPal余额管理器功能" -"PayPal Billing Agreement Settings","PayPal 结算协议设置" -"PayPal Buyer Warranty Bonus","PayPal买家担保津贴" -"PayPal Debit Card Cash Advance","PayPal借记卡预付现金" -"PayPal Debit Card Withdrawal from ATM","从ATM进行PayPal借记卡撤销" -"PayPal Express Checkout","PayPal 快速结账" -"PayPal Express Checkout Shortcut Wrapper","PayPal Express Checkout 快捷方式保护" -"PayPal Express Checkout Token does not exist.","PayPal快速结账令牌不存在。" -"PayPal Express Checkout is not enabled.","PayPal Express Checkout 未启用。" -"PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you. - You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®. - Learn More - ","PayPal Express Checkout lets you give customers access to financing through Bill Me Later® - at no additional cost to you. - You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Bill Me Later®. - Learn More" -"PayPal Express Order Review Form","PayPal快速订单审查表单" -"PayPal Fee Information","PayPal费用信息" -"PayPal Merchant Pages Style","PayPal商业页面样式" -"PayPal Payment Gateways","PayPal 支付网关" -"PayPal Payment Solutions","PayPal 支付解决方案" -"PayPal Pro","PayPal Pro" -"PayPal Product Logo","PayPal产品徽标" -"PayPal Protection Bonus","PayPal保护津贴" -"PayPal Reference ID","PayPal推荐ID" -"PayPal Reference ID Type","PayPal推荐ID类型" -"PayPal Settlement Reports","PayPal处理报告" -"PayPal certificate does not exist.","PayPal 证书不存在。" -"PayPal certificate file is empty.","PayPal 证书文件为空。" -"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal不支持处理零金额的订单。为完成您的订购，请使用标准结账流程。" -"PayPal gateway has rejected request. %s","PayPal网关拒绝了该请求。%s" -"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal 推荐您前往 manager.paypal.com 在您的账户下建立另一用户" -"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal 建议您前往 manager.paypal.com 在您的账户下建立另一用户，而非在这里输入您的管理员用户名和密码。这样可增强您的安全性并防止您在日后更改密码时造成服务中断。如果您不希望建立另一用户，你可以在此重新输入您的商家登录信息。" -"PayPal response hasn't required fields.","PayPal的响应缺少必须字段。" -"PayPal retains reports for 45 days.","PayPal会将报告保存45天。" -"PayPal/Centinel Electronic Commerce Indicator","PayPal/Centinel Electronic Commerce指示器" -"PayPal/Centinel Visa Payer Authentication Service Result","PayPal/Centinel Visa付款者验证服务结果" -"Payer Address ID","付款者地址ID" -"Payer Address Status","付款者地址状态" -"Payer Email","付款者邮件地址" -"Payer ID","付款者ID" -"Payer Status","付款者状态" -"Payer is not identified.","付款者未经检定。" -"Payflow Link","Payflow Link" -"Payflow Link (Includes Express Checkout)","Payflow 链接（含 Express Checkout）" -"Payflow Pro","Payflow Pro" -"Payflow Pro (Includes Express Checkout)","Payflow Pro（含 Express Checkout）" -"Payflow Pro and Express Checkout","Payflow Pro 和 Express Checkout" -"Payment Action","支付操作" -"Payment Applicable From","支付适用性表单" -"Payment Method","支付方式" -"Payment Refund initiated by merchant","由商户发起的支付退款" -"Payment has been declined. Please try again.","支付被拒绝。请重试。" -"Payment is being reviewed by PayPal for risk.","支付正在被PayPal做风险评估。" -"Payment transactions disallow storing objects.","支付交易不允许的店铺对象。" -"Payment was made to an email address that is not yet registered or confirmed.","支付时通过尚未注册或确认的电子邮件进行的。" -"Payments Advanced","Payments Advanced" -"Payments Advanced (Includes Express Checkout)","Payments Advanced（含 Express Checkout）" -"Payments Pro (Includes Express Checkout)","Payments Pro（含 Express Checkout）" -"Payments Pro Hosted Solution","Payments Pro Hosted Solution" -"Payments Pro and Express Checkout","Payments Pro 和 Express Checkout" -"Payments Standard","Payments Standard" -"Payments by PayPal (150 X 40)","用PayPal付款（150X40）" -"Payments by PayPal (150 X 60)","用PayPal付款（150X60）" -"Pending PayPal","挂起的PayPal" -"Place Order","下订单" -"Please agree to all the terms and conditions before placing the order.","请在下订单前同意所有的条款和条件。" -"Please contact PayPal Customer Service.","请联系PayPal客服。" -"Please do not refresh the page until you complete payment.","请不要刷新该页面，直到付款完成。" -"Please re-enable the previously enabled payment solutions.","请重新启用先前已启用的支付解决方案。" -"Please select a shipping method...","请选择送货方法..." -"Please select region, state or province","请选择地区、州，或省" -"Please update order data to get shipping methods and rates","请更新订单数据，获取配送方式和价格" -"Points Incentive Redemption","兑换奖励点" -"Position","位置" -"Postage Payment to either USPS or UPS","USPS或UPS的运费" -"Preapproved Payment (BillUser API), either sent or received","预审核接收或发送的支付（BillUser API）" -"Preapproved Payment ID","预审核的支付ID" -"Price","价格" -"Pro","Pro" -"Process payments using your own internet merchant account.","使用自己的互联网商家帐户处理付款。" -"Product","产品" -"Product Name","产品名" -"Proxy Host","代理主机" -"Proxy Port","代理端口" -"Publisher ID","发布者 ID" -"Qty","数量" -"Reauthorization","撤销授权" -"Reference Information","参考信息" -"Reimbursement for a chargeback.","偿还退款。" -"Reimbursement of Chargeback","退款的偿还" -"Report Date","报告日期" -"Reports","报告" -"Requested %s and configured %s merchant emails do not match.","所请求的 %s 与配置的 %s 商家邮件不匹配。" -"Require CVV Entry","需要CVV项" -"Require Customer's Billing Address","要求客户帐单地址" -"Required PayPal Settings","必需的 PayPal 设置" -"Required Settings","必需的设置" -"Required to display a banner","显示横幅所必需" -"Reversal","撤销" -"Reversal of General Account Hold","常规帐户保持的撤销" -"Reversal of Points Usage","点数使用情况撤销" -"Reversal of an adjustment.","调整撤销" -"Reversal of hold for Dispute Investigation","撤销保留的争议调查" -"Review Order","查看订单" -"Reward Voucher Redemption","奖励兑换" -"SFTP Credentials","SFTP凭据" -"Sale","销售" -"Sales","销售" -"Same as shipping","与配送地址相同" -"Sandbox Credentials","沙箱凭据" -"Sandbox Mode","沙箱模式" -"Schedule","计划" -"Schedule description is too long.","计划描述太长。" -"Scheduled Fetching","计划的获取" -"Select a Payment Solution","选择一种支付解决方案" -"Send Email Confirmation","发送确认电子邮件" -"Server Error. Please try again.","服务器错误。请再试一次。" -"Settlement Consolidation","合并处理" -"Settlement Report Settings","处理报告设置" -"Settlement of a chargeback.","处理返款。" -"Severe 3D Secure Card Validation","提供 3D 安全信用卡验证" -"Severe Validation Removes Chargeback Liability on Merchant","正式验证将撤销银行的退款责任" -"Severe validation removes chargeback liability on merchant.","严格的验证可避免分行的退款责任。" -"Shipping","运送" -"Shipping Address","送货地址" -"Shipping Information","运送信息" -"Shipping Method","运送方式" -"Shop now using (150 X 40)","立刻购物并使用（150X40）" -"Shop now using (150 X 60)","立刻购物并使用（150X60）" -"Shortcut","快捷方式" -"Shortcut Buttons Flavor","快捷方式按钮风格" -"Shortcut on Product View","产品视图上的快捷方式" -"Shortcut on Shopping Cart","购物车上的快捷方式" -"Sidebar (right)","侧边栏（右侧）" -"Sign a billing agreement to streamline further purchases with PayPal.","与PayPal签署记账协议简化后续购买。" -"Size","尺寸" -"Skip Order Review Step","跳过订单复查步骤" -"Solo","Solo" -"Some PayPal solutions conflict.","部分 PayPal 解决方案出现冲突。" -"Sorry, no quotes are available for this order at this time.","抱歉，当前该订单中没有报价可用。" -"Sort Order","排序顺序" -"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","指定商家PayPal帐户的授权周期时长，这里的设置必须与PayPal中的设置一致。" -"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","指定商家PayPal帐户的订单验证周期。这里的设置必须与PayPal中的设置一致。" -"State/Province","州/省" -"Static","静态" -"Street Address","街道地址" -"Street Address %s","街道地址 %s" -"Submitting order information...","正在提交订单信息..." -"Subscriber name is too long.","订阅者姓名太长。" -"Subscription ID","订阅ID" -"Subscription Payment, either payment sent or payment received","订阅支付，可通过发出或收到的付款进行" -"Subtotal","小计" -"Summary Text for Aggregated Cart","聚合购物车的摘要文字" -"Supporting of American Express cards require additional agreement. Learn more at http://www.paypal.com/amexupdate.","对美国运通卡的支持要求额外的协议。欲知详情请访问 http://www.paypal.com/amexupdate。" -"Switch/Maestro","Switch/Maestro" -"Telephone","电话" -"Test Mode","测试模式" -"The background color for the checkout page around the header and payment form.","付款页面上头部和支付表单周围的背景色。" -"The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.","付款页面上头部的背景色。请用ASCII码方式输入大小写敏感的六位代表HTML十六进制颜色代码的字符。" -"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","您PayPal帐户中授权子帐户的默认数量为1。如果要获得更多授权，请联系PayPal增加数量。" -"The following error(s) occured:","发生如下错误：" -"The image at the top left of the checkout page. Max size is 750x90-pixel. https is highly encouraged.","付款页面左上角的图像，最大尺寸为750x90像素。 强烈建议使用https地址。" -"The maximum number of child authorizations is reached.","授权子帐户的最大数量已达到。" -"The merchant account is not yet verified.","银行帐户尚未验证。" -"The payment curency does not match any of the merchant\'s balances currency.","支付的币种与银行支持的币种不一致。" -"The payment eCheck is not yet cleared.","支付的电子支票尚未兑现。" -"The payment is authorized but not settled.","支付已获授权但尚未确定。" -"The payment is pending because it was made to an email address that is not yet registered or confirmed.","支付被挂起，因为支付使用了一个未经确认的电子邮件地址。" -"The payment is pending while it is being reviewed by PayPal for risk.","支付被挂起，因为正在由PayPal进行风险评估。" -"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","支付是通过信用卡进行的。为了收到资金，银行必须将帐户升级为商业或白金状态。" -"There is already another PayPal solution enabled. Enable this solution instead?","已启用另一个 PayPal 解决方案。要启用此方案取代现有方案吗？" -"There was an error processing your order. Please contact us or try again later.","处理您的订单时遇到了错误。请联系我们，或稍后再试。" -"This feature needs be enabled first for the merchant account through PayPal technical support.","要使用商家账户，必须先通过 PayPal 技术支持启用该功能。" -"This operation requires an existing transaction object.","该操作需要一个现有的交易目标。" -"Time of Day","每天的时间段" -"Title","标题" -"To proceed to Checkout, please log in using your email address.","要继续结账，请使用您的电子邮件地址登录。" -"Transaction ID","交易ID" -"Transaction ID must not be empty.","交易ID不能为空。" -"Transaction Information","交易信息" -"Transaction reversal by PayPal administrators.","交易被 PayPal 管理员转回。" -"Transaction reversal due to fraud detected by PayPal administrators.","PayPal 管理员检测到欺诈，交易被转回。" -"Transfer Cart Line Items","传输购物车内容" -"Transfer Shipping Options","传输送货选项" -"Triggered Fraud Filters","触发的欺诈筛选器" -"URL method for Cancel URL and Return URL","用于取消 URL 和退货 URL 的 URL 方法" -"Unable to cancel Express Checkout.","无法取消快速结账。" -"Unable to change status. Current status is not correspond to real status.","无法更改状态。当前状态与实际状态不一致。" -"Unable to communicate with the PayPal gateway.","无法与PayPal网关通讯。" -"Unable to initialize Express Checkout review.","无法初始化快速结账评估。" -"Unable to initialize Express Checkout.","无法发起快速结账。" -"Unable to place the order.","无法下订单。" -"Unable to process Express Checkout approval.","无法处理快速结账审批。" -"Unable to start Express Checkout.","无法进行快速结账。" -"Unable to update Order data.","无法更新订单数据。" -"Unable to update shipping method.","无法更新送货方法。" -"Unknown Error. Please try again later.","未知错误。请稍后重试。" -"Unknown reason. Please contact PayPal customer service.","未知原因。请联系PayPal客户服务。" -"Update Order Data","更新订单数据" -"Update Shipping Method","更新运送方式" -"Use Proxy","使用代理" -"Use colon to specify port. For example: ""test.example.com:5224"".","使用冒号指定端口。例如：""test.example.com:5224""。" -"User","用户" -"User-initiated Currency Conversion","用户发起的货币转换" -"Uses store frontend name by default.","默认使用店铺前端名称。" -"VAT Number","VAT 编号" -"Vendor","供应商" -"View","查看" -"View Demo","查看演示" -"View Transaction","查看交易" -"View Transaction Details","查看交易详情" -"Virtual PayPal Debit Card Transaction","虚拟PayPal借记卡交易" -"Virtual Terminal Payment","虚拟终端支付" -"Void","无效" -"Waiting until Customer\'s eCheck will be cleared.","等待直到客户的电子支票兑现。" -"We prefer PayPal (150 X 40)","我们喜欢PayPal（150X40）" -"We prefer PayPal (150 X 60)","我们喜欢PayPal（150X60）" -"Website Payments Plus","网站支付高级版" -"Website Payments Pro (Includes Express Checkout)","Website Payments Pro（含 Express Checkout）" -"Website Payments Pro Hosted Solution","网站支付专业版托管解决方案" -"Website Payments Pro Hosted Solution (Includes Express Checkout)","Website Payments Pro Hosted Solution（含 Express Checkout）" -"Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution 和 Express Checkout" -"Website Payments Pro Payflow Edition (Includes Express Checkout)","Website Payments Pro Payflow Edition（含 Express Checkout）" -"Website Payments Pro Payflow Edition and Express Checkout","Website Payments Pro Payflow Edition 和 Express Checkout" -"Website Payments Pro and Express Checkout","Website Payments Pro 和 Express Checkout" -"Website Payments Standard","网站支付标准版" -"Website Payments Standard Payment","网站支付标准版付款" -"What is PayPal?","什么是PayPal？" -"Whether to create a billing agreement, if there are no active billing agreements available.","无论是否创建记账协议，如果没有活跃的记账协议可用。" -"Will appear as a payment option only for customers who have at least one active billing agreement.","只有在客户至少有一个活跃记账协议时才能出现付款选项。" -"WorldLink Withdrawal","WorldLink撤销" -"Would you like to sign a billing agreement to streamline further purchases with PayPal?","您是否想要通过PayPal签署记账协议并简化后续的付款？" -"Wrong Order ID (%s) specified.","所指定的订单ID（%s）有误。" -"Wrong PayPal Express Checkout Token specified.","所指定的PayPal快速结账令牌有误。" -"Yes","是" -"Yes. Matched Address and five-didgit ZIP","是的，匹配地址与五位邮编" -"You cannot void a verification transaction","您无法将验证交易作废" -"You will be redirected to the PayPal website in a few seconds.","几秒钟后，您将被重定向到PayPal网站。" -"You will be redirected to the PayPal website when you place an order.","在您下单时，您会被重定向到PayPal网站。" -"You will be redirected to the PayPal website.","您将被重定向到PayPal网站。" -"You will be required to enter your payment details after you place an order.","下单后，您需要输入付款详情。" -"Zip/Postal Code","邮政编码" -"chargeback reimbursed","退款偿还" -"chargeback settled","解决退款" -"customer complaint","客户投诉" -"customer triggered a chargeback","客户触发的退款" -"customer triggered money-back guarantee","客户触发的返款保障" -"eBay Auction Payment","eBay拍卖付款" -"merchant refunded payment","商家退款支付" -"no reason","无原因" -"reversal of an adjustment","撤销调整" -"unknown reason","未知原因" diff --git a/app/locale/zh_CN/Mage_PaypalUk.csv b/app/locale/zh_CN/Mage_PaypalUk.csv deleted file mode 100644 index e89936813..000000000 --- a/app/locale/zh_CN/Mage_PaypalUk.csv +++ /dev/null @@ -1,2 +0,0 @@ -"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","PayPal快速结账（Payflow版）快捷方式包装" -"PayPal Express Order Review Form","PayPal快速订单审查表单" diff --git a/app/locale/zh_CN/Mage_Persistent.csv b/app/locale/zh_CN/Mage_Persistent.csv deleted file mode 100644 index 3ff0fedc2..000000000 --- a/app/locale/zh_CN/Mage_Persistent.csv +++ /dev/null @@ -1,74 +0,0 @@ -"""Remember Me"" Default Value","“记住我”的默认值" -"(Not %s?)","（不是 %s ？）" -"* Required Fields","*必要字段" -"Address","地址" -"Address Information","地址信息" -"Already registered?","已注册？" -"Back","返回" -"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","通过在我们的店铺中创建帐户，您将能用更快速度结账，保存多个送货地址，并可在您的帐户中查看并追踪您的订单，还有更多功能。" -"Cannot load configuration from file %s.","无法从文件 %s 加载配置" -"Checkout as Guest","作为来宾结账" -"Checkout as a Guest","作为来宾结账" -"Checkout as a Guest or Register","以来宾身份结账或注册" -"City","城市" -"Clear Persistence on Log Out","注销时清空选项" -"Close","关闭" -"Company","公司" -"Confirm Password","确认密码" -"Continue","继续" -"Country","国家" -"Create an Account","创建帐户" -"Easy access to your order history and status","轻松访问您的订单历史记录和状态" -"Email Address","编辑电子邮件地址" -"Enable ""Remember Me""","启用“记住我”" -"Enable Persistence","启用保留" -"Fast and easy check out","方便快捷的结账" -"Faster checkout","更快速结账" -"Fax","传真" -"Forgot Your Password?","忘记您的密码？" -"Forgot your password?","忘记您的密码？" -"General Options","常规选项" -"If you have an account with us, please log in.","如果您拥有账户，请登录。" -"Loading next step...","正在载入下一步..." -"Login","登录" -"Login Information","登录信息" -"Login or Create an Account","登录或创建帐户" -"New Customers","新客户" -"New Here?","新手上路？" -"Password","密码" -"Persist Shopping Cart","保留购物车" -"Persistence Lifetime (seconds)","保留寿命（秒）" -"Persistent Shopping Cart","保留购物车" -"Personal Information","个人信息" -"Please enter the following information to create your account.","请输入下列信息来创建您的帐户。" -"Please log in below:","请在下面登录：" -"Please select region, state or province","请选择地区、州，或省" -"Register","注册" -"Register and Checkout","注册并结账" -"Register and save time!","注册并节约时间！" -"Register to Create an Account","注册以创建帐户" -"Register with us for future convenience:","在这里注册以后可以更方便：" -"Registered Customers","已注册的客户" -"Registration is free and easy!","注册免费快捷！" -"Remember Me","记住我" -"Returning Customers","回头客户" -"Save in address book","保存到地址簿" -"Save multiple shipping addresses","保存多个运送地址" -"Select State/Province...","选择州/省..." -"Select a billing address from your address book or enter a new address.","从您的地址簿选择账单地址，或输入新地址。" -"Ship to different address","送货到不同地址" -"Ship to this address","送货到这个地址" -"Shopping cart has been updated with appropriate prices","购物车已使用正确的价格更新" -"Sign Up for Newsletter","订阅新闻邮件" -"Sign in to speed up your checkout process","登录来加速您的结账过程" -"State/Province","州/省" -"Street Address","街道地址" -"Street Address %s","街道地址 %s" -"Submit","提交" -"Telephone","电话" -"To proceed to Checkout, please log in using your email address.","要继续结账，请使用你的电子邮件地址登录。" -"VAT Number","VAT 编号" -"View and track orders and more","查看并追踪订单和更多" -"Welcome, %s!","欢迎，%s！" -"What\'s this?","这是什么？" -"Zip/Postal Code","邮政编码" diff --git a/app/locale/zh_CN/Mage_Poll.csv b/app/locale/zh_CN/Mage_Poll.csv deleted file mode 100644 index e07ef7e5a..000000000 --- a/app/locale/zh_CN/Mage_Poll.csv +++ /dev/null @@ -1,42 +0,0 @@ -"Actions","操作" -"Add Answer","添加答案" -"Add New Answer","添加新答案" -"Add New Poll","添加新投票" -"Answer Title","答案标题" -"Answer Title:","答案标题：" -"Answer with the same title in this poll","在投票中使用相同标题回答" -"Are you sure you want to delete it?","您是否确认要将其删除？" -"Assigned Answers","分配的答案" -"Closed","已关闭" -"Community Poll","社区投票" -"Date Closed","关闭日期" -"Date Posted","发布日期" -"Delete","删除" -"Delete Answer","删除答案" -"Delete Poll","删除投票" -"Disallow Voting in a Poll Multiple Times from Same IP-address","不允许相同IP地址多次参与同一个投票" -"Edit Answer '%s'","编辑答案 '%s'" -"Edit Poll '%s'","编辑投票 '%s'" -"Edit Poll Answer","编辑投票答案" -"ID","ID" -"Invalid Answer.","无效答案。" -"New Poll","新投票" -"Number of Responses","响应次数" -"Open","打开" -"Poll Answers","投票答案" -"Poll Information","投票信息" -"Poll Manager","投票管理器" -"Poll Question","投票问题" -"Poll information","投票信息" -"Poll with the same question","使用相同问题投票" -"Polls","投票" -"Save Answer","保存答案" -"Save Poll","保存投票" -"Status","状态" -"The answer has been saved.","答案已被保存。" -"The poll does not exist.","该投票不存在。" -"Unable to find an answer to delete.","无法找到要删除的答案。" -"Visible In","可见性" -"Vote","投票" -"Votes Count","投票统计" -"Votes Count:","投票统计：" diff --git a/app/locale/zh_CN/Mage_ProductAlert.csv b/app/locale/zh_CN/Mage_ProductAlert.csv deleted file mode 100644 index aa267b805..000000000 --- a/app/locale/zh_CN/Mage_ProductAlert.csv +++ /dev/null @@ -1,35 +0,0 @@ -"Alert Email Sender","提醒电子邮件发送者" -"Alert subscription has been saved.","提醒订阅已保存。" -"Allow Alert When Product Comes Back in Stock","当产品重新有库存时允许提醒" -"Allow Alert When Product Price Changes","当产品价格变更时允许提醒" -"Click here not to receive alerts for this product","单击这里不再接收此产品的提醒" -"Error Email Recipient","邮件接收有误" -"Error Email Sender","邮件发送有误" -"Error Email Template","邮件模板有误" -"Frequency","频率" -"Not enough parameters.","没有足够的参数。" -"Price Alert Email Template","价格提醒电子邮件模板" -"Price:","价格：" -"Product Alerts","产品警报" -"Product Alerts Run Settings","产品提醒运行设置" -"Product alerts Cron error","产品提醒 Cron 错误" -"Product price alert","产品价格提醒" -"Product stock alert","产品库存提醒" -"Regular Price:","常规价格：" -"Sign up for price alert","注册价格提醒" -"Sign up to get notified when this product is back in stock","注册以在此产品重新有库存时获得通知" -"Special price:","特惠价格：" -"Start Time","开始时间" -"Stock Alert Email Template","库存提醒电子邮件模版" -"The alert subscription has been deleted.","提醒订阅已被删除。" -"The alert subscription has been saved.","提醒订阅已保存。" -"The product is not found.","产品未找到。" -"The product was not found.","产品未找到。" -"Unable to update the alert subscription.","无法更新提醒订阅。" -"Unsubscribe from all price alerts","退订所有价格提醒" -"Unsubscribe from all stock alerts","退订所有库存提醒" -"You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:","您收到该通知的原因是您订阅了当下列产品有库存时接收提醒：" -"You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:","您收到该通知的原因是您订阅了当下列产品价格更改时接受提醒：" -"You will no longer receive price alerts for this product.","您不再接收此产品的价格提醒。" -"You will no longer receive stock alerts for this product.","您不再接收此产品的库存提醒。" -"You will no longer receive stock alerts.","您不再接收库存提醒。" diff --git a/app/locale/zh_CN/Mage_Rating.csv b/app/locale/zh_CN/Mage_Rating.csv deleted file mode 100644 index 4370d80b0..000000000 --- a/app/locale/zh_CN/Mage_Rating.csv +++ /dev/null @@ -1,29 +0,0 @@ -"1 star","1 星" -"2 stars","2 星" -"3 stars","3 星" -"4 stars","4 星" -"5 stars","5 星" -"Add New Rating","添加新评级" -"Assigned Options","分配的选项" -"Be the first to review this product","作为评论该产品的第一人" -"Default Value","默认值" -"Delete Rating","删除评级" -"Edit Rating","编辑评级" -"ID","ID" -"If you do not specify a rating title for a store, the default value will be used.","如果您不为商店指定评级标题，则将使用默认值。" -"Manage Ratings","管理评级" -"New Rating","新评级" -"Option Label","选项标签" -"Option Title","选项标题" -"Option Title:","选项标题：" -"Please select one of each ratings above","请选择上述评级" -"Rating Information","评级信息" -"Rating Name","评级名称" -"Rating Options","评级选项" -"Rating Title","评级标题" -"Rating Visibility","评级能见度" -"Rating isn't Available","评级不可用" -"Rating with the same title","对同一名称打分" -"Save Rating","保存评分" -"Sort Order","排序顺序" -"Visible In","可见性" diff --git a/app/locale/zh_CN/Mage_Reports.csv b/app/locale/zh_CN/Mage_Reports.csv deleted file mode 100644 index dbf3fda62..000000000 --- a/app/locale/zh_CN/Mage_Reports.csv +++ /dev/null @@ -1,174 +0,0 @@ -"Abandoned Carts","放弃购物车" -"Abandoned carts","废弃的购物车" -"Action","操作" -"Add to Cart","添加到购物车" -"Add to Compare","添加并比较" -"Add to Wishlist","添加到收藏" -"Any","任意" -"Applied Coupon","已应用的优惠券" -"Applies to Any of the Specified Order Statuses","适用于任何指定的顺序状态" -"Are you sure you want to refresh lifetime statistics? There can be performance impact during this operation.","您确认要刷新生命期数据吗？此操作过程可能会影响性能。" -"Are you sure?","您是否确认？" -"Avg. Approved Rating","平均已审核的评级" -"Avg. Rating","平均评级" -"Bestsellers","最佳销量" -"Bought from wishlists","购买自愿望清单" -"CSV","CSV" -"Carts","购物车" -"Catalog Category (Without Subcategories)","目录类别（无子类）" -"Compared Products Grid Template","比对的产品网格模板" -"Compared Products List Template","比对的产品列表模板" -"Coupons","折价券" -"Coupons Usage Report","优惠券使用报告" -"Created At","创建于" -"Current Month Starts","当前月起始" -"Customer","客户" -"Customer Name","顾客姓名" -"Customer Tags","顾客标签" -"Customers","客户" -"Customers Report","顾客报告" -"Customers Reviews","客户评测" -"Customers Tags","顾客标签" -"Customers by Number of Orders","按订单编号排列顾客" -"Customers by Orders Total","按订单数量排列顾客" -"Customers by number of orders","按订单数排列顾客" -"Customers by orders total","按订单总数排列顾客" -"Customers that have wishlist: %s%","有愿望清单的顾客：%s%" -"Dashboard","仪表板" -"Day","天" -"Default Recently Compared Products Count","默认最近比较的产品数量" -"Default Recently Viewed Products Count","默认最近查看的产品数量" -"Description","描述" -"Detail","详情" -"Downloads","下载" -"Email","电子邮件" -"Empty Rows","空行" -"Excel XML","Excel XML" -"Filter","过滤器" -"First Name","名字" -"From","来自" -"Guest","来宾" -"Hits","提示" -"ID","ID" -"IP Address","IP地址" -"Index model name must be defined","索引模型名称必须被定义" -"Invalid date specified.","已指定的日期无效。" -"Invoiced","已出发票" -"Items in Cart","购物车中的项目" -"Last Name","姓氏" -"Last Review","上次评论" -"Link","链接" -"List of Products Recently Compared and Removed from the Compare List by Visitor","最近由访客从比较列表中比较和删除的产品列表" -"List of Products Recently Viewed by Visitor","最近由访客浏览过的产品列表" -"Low Stock","库存量低" -"Low stock","低库存" -"Match Period To","匹配期间至" -"Month","月" -"Most Viewed","最受欢迎" -"Name","姓名" -"New Accounts","新帐户" -"No","否" -"Number Added","数字已添加" -"Number Fulfilled","已履行的数字" -"Number Of Reviews","评论数目" -"Number Purchased","已购买数目" -"Number Viewed","浏览数目" -"Number of Items","项目的数量" -"Number of New Accounts","新账户数量" -"Number of Products to display","显示产品的数量" -"Number of Reviews","评价数量" -"Number of Times Deleted","已删除时间数量" -"Number of Total Tags","总标签数量" -"Number of Unique Tags","唯一标签数量" -"Number of Views","浏览数量" -"Number of items bought from a wishlist: %s","从愿望清单中购买项目的数量：%s" -"Number of times wishlists have been shared (emailed): %s","愿望清单被分享（通过发送电子邮件）的次数：%s" -"Number of wishlist conversions: %s","愿望清单转换的数量：%s" -"Number of wishlist referrals: %s","愿望清单推荐次数：%s" -"Number of wishlists: %s","愿望清单数量：%s" -"Order Status","订单状态" -"Order Taxes Report Grouped by Tax Rate","按税率分组的订购税费报告" -"Orders","订单" -"Out of stock","缺货" -"Period","周期" -"Poducts Report","产品报告" -"Popular Tags","热门标签" -"Popularity","人气" -"Price","价格" -"Product Name","产品名" -"Product Reviews","产品评测" -"Product SKU","产品SKU" -"Product Tags","产品标签" -"Products","产品" -"Products Ordered","产品已下单" -"Products Report","产品报告" -"Products Reviews","产品评论" -"Products Tags","产品标签" -"Products in carts","购物车中的产品" -"Purchases","购买" -"Quantity Ordered","下单的数量" -"Quantity of Items","商品的数量" -"Recently Compared","最近比较过的" -"Recently Compared Products","最近比较过的产品" -"Recently Viewed","最近查看过的" -"Recently Viewed Products","最近查看过的产品" -"Recently Viewed/Compared Products","最近查看/比较过的产品" -"Refresh Lifetime Statistics","刷新寿命状态" -"Refresh Statistics","刷新状态" -"Refresh Statistics for the Last Day","刷新昨天的状态" -"Refunds","退款" -"Report","报告" -"Reports","报告" -"Results","结果" -"Revenue","收入" -"Review","评测" -"Reviews","评测" -"Reviews for %s","%s的评测" -"Sales","销售" -"Sales Report","销售报告" -"Search Query","搜索查询" -"Search Terms","搜索条件" -"Select day of the month.","选择每月的天数。" -"Shipping","运送" -"Shopping Cart","购物车" -"Shopping Cart Price Rule","共享购物车规则" -"Show Actual Values","显示实际值" -"Show Report","显示报告" -"Show for Current","显示最新值" -"Specified","已指定" -"Statistics","状态" -"Stock Qty","库存数量" -"Submitted In","提交于" -"Submitted On","提交到" -"Subtotal","小计" -"Tag","标签" -"Tag ""%s"" details","标签 ""%s"" 详情" -"Tag Detail","标签详情" -"Tag Name","标签名称" -"Tag Use","标签的使用" -"Tags Submitted by %s","由%s 提交的标签" -"Tags submitted to %s","由%s 提交的标签" -"Tax","传真" -"Title","标题" -"To","发送至" -"Total","总数" -"Total Invoiced vs. Paid Report","发票总数 vs. 付款报告" -"Total Ordered Report","订单总数报告" -"Total Refunded Report","退款总数报告" -"Total Shipped Report","发货总数报告" -"Total Tags","标签总数" -"Total invoiced","发票总数" -"Total refunded","退款总数" -"Updated At","更新于" -"Viewed Products Grid Template","查看过的产品网格模板" -"Viewed Products List Template","查看的产品列表模板" -"Visible In","可见性" -"Wishlist Report","愿望清单报告" -"Wishlist vs. Regular Order","愿望清单 vs. 正常订单" -"Wishlists","愿望清单" -"Year","年" -"Year-To-Date Starts","开始的年月日" -"Yes","是" -"Your Recently Compared","您最近的比较" -"Your Recently Viewed","您最近看过的" -"undefined","未定义" diff --git a/app/locale/zh_CN/Mage_Review.csv b/app/locale/zh_CN/Mage_Review.csv deleted file mode 100644 index c47ffbdfc..000000000 --- a/app/locale/zh_CN/Mage_Review.csv +++ /dev/null @@ -1,104 +0,0 @@ -"%d Review(s)","%d 个评测" -"%s Review(s)","%s个评测" -"(Posted on %s)","（发布于%s）" -"1 star","1 星" -"2 star","2 星" -"2 stars","2 星" -"3 star","3 星" -"3 stars","3 星" -"4 star","4 星" -"4 stars","4 星" -"5 star","5 星" -"5 stars","5 星" -"%2$s %3$s (%4$s)","%2$s %3$s (%4$s)" -"Add New Review","添加新评测" -"Add Your Review","添加您的评测" -"Administrator","管理员" -"All Reviews","所有评测" -"All Reviews of Customer `%s`","客户 '%s' 的所有评测" -"All Reviews of Product `%s`","产品 `%s` 的所有评论" -"Allow Guests to Write Reviews","允许来宾撰写评测" -"Approved","已批准" -"Are you sure you want to do this?","您是否确认要这样做？" -"Are you sure?","您是否确认？" -"Average Customer Rating","客户平均分" -"Average Customer Rating:","客户平均分：" -"Back","返回" -"Back to Main Product Info","返回产品信息主页" -"Back to My Reviews","返回我的评测" -"Back to Product Reviews","返回产品评测" -"Be the first to review this product","作为评论该产品的第一人" -"Catalog Product Review View","分类产品评测视图" -"Catalog Product Reviews List","分类产品评测列表" -"Created On","创建于" -"Customer","客户" -"Customer My Account Product Reviews","客户我的账户产品评价" -"Customer My Account Review Details","客户我的账户评价详情" -"Customer Reviews","顾客评测" -"Customers Reviews","客户评测" -"Delete","删除" -"Delete Review","删除评价" -"Detailed Rating","详细评级" -"Edit Review '%s'","编辑评价“%s”" -"Guest","来宾" -"How do you rate this product?","您如何评价该产品？" -"ID","ID" -"Let us know your thoughts","让我们知道您的想法" -"Manage Ratings","管理评级" -"My Product Reviews","我的产品评价" -"My Recent Reviews","我的最近评价" -"Name","姓名" -"Name in Store","商店名称" -"New Review","新评测" -"Nickname","昵称" -"Nickname can\'t be empty","昵称不能为空" -"Not Approved","未批准" -"Only registered users can write reviews. Please, log in or register","仅注册用户可撰写评论。请登录或注册" -"Pending","挂起" -"Pending Reviews","挂起的评测" -"Pending Reviews of Customer `%s`","来自客户“%s”未决的评论" -"Please select a product","请选择产品" -"Please select one of each of the ratings above","请在上方选择每个评级" -"Posted By","发布者" -"Price","价格" -"Product","产品" -"Product Name","产品名" -"Product Rating","产品评分" -"Product Rating:","产品评分：" -"Product Review (submitted on %s):","产品评测（提交于 %s）" -"Product Reviews","产品评测" -"Product SKU","产品SKU" -"Products Reviews","产品评论" -"Qty","数量" -"Rating:","评分：" -"Review","评测" -"Review (submitted on %s):","评测（提交于 %s）：" -"Review Details","评测详情" -"Review Form Fields Before","评测表单字段之前" -"Review by %s","审核者 %s" -"Review by %s","评测者 %s" -"Review can\'t be empty","评论不能为空" -"Review summary can\'t be empty","评论摘要不能为空" -"Reviews and Ratings","评测与评级" -"SKU","SKU" -"Save Review","保存评测" -"Status","状态" -"Submit Review","提交评测" -"Summary Rating","评分汇总" -"Summary of Review","评测汇总" -"Summary of Your Review","您的评测汇总" -"Title","标题" -"Type","类型" -"Unable to post the review.","无法发布该评测。" -"Update Status","更新状态" -"View All Reviews","查看所有评测" -"View Details","查看详情" -"Visible In","可见性" -"Websites","网站" -"What's your nickname?","您的昵称是什么？" -"Write Your Own Review","撰写您自己的评测" -"You have submitted no reviews.","您尚未提交评测。" -"You're reviewing:","您正在评测：" -"Your Rating:","您的评分：" -"Your Review (submitted on %s):","您的评测（提交于 %s）：" -"Your review has been accepted for moderation.","您的评测已被管理员批准。" diff --git a/app/locale/zh_CN/Mage_Rss.csv b/app/locale/zh_CN/Mage_Rss.csv deleted file mode 100644 index 2576bee2b..000000000 --- a/app/locale/zh_CN/Mage_Rss.csv +++ /dev/null @@ -1,56 +0,0 @@ -"%s - Discounts and Coupons","%s - 折扣与代金券" -"%s - Special Products","%s - 特价产品" -"%s RSS Feed","%s RSS源" -"%s has reached a quantity of %s.","%s 已经达到了一些 %s" -"%s\'s Wishlist","%s 的愿望清单" -"Cannot retrieve the wishlist","无法获取愿望清单" -"Catalog","分类" -"Category Feeds","分类源" -"Click for price","单击获取价格" -"Comment: %s
    ","评论：%s
    " -"Coupons/Discounts","代金券/折扣" -"Current Status: %s
    ","当前状态：%s
    " -"Customer Name: %s","客户姓名：%s" -"Customer Order Status Notification","客户订单状态通知" -"Details for %s #%s","%s #%s的详情" -"Discount","折扣" -"Discount (%s)","折扣（%s）" -"Enable RSS","启用RSS" -"Error in processing xml. %s","处理xml时出错。%s" -"From:","来自：" -"Get Feed","获取源" -"Gift Message","礼品消息" -"Grand Total","总计" -"Low Stock Products","产品库存低" -"Message:","信息：" -"Miscellaneous Feeds","杂项源订阅" -"New Orders","新订单" -"New Products","新产品" -"New Products from %s","新产品来自 %s" -"Notified Date: %s
    ","通知日期：%s
    " -"Order # %s Notification(s)","订单 # %s 通知" -"Order #%s created at %s","订单 # %s 已于 %s 创建" -"Pending product review(s)","未决的产品评论" -"Product: ""%s"" review By: %s","产品：“%s” 由 %s 评论" -"Product: %s
    ","产品：%s
    " -"Products tagged with %s","已标记 %s 的产品" -"Purchased From: %s","购买自：%s" -"RSS","RSS" -"RSS Feeds","RSS 订阅源" -"RSS Feeds List","RSS 订阅源列表" -"RSS Feeds Section","RSS 源选区" -"Review: %s
    ","评价：%s
    " -"Rss Config","RSS 配置" -"Shipping & Handling","运送与手续费" -"Special Products","特殊商品" -"Store: %s
    ","商店：%s
    " -"Subtotal","小计" -"Summary of review: %s
    ","评论摘要：%s
    " -"Tags Products","标记产品" -"Tax","传真" -"There are no Rss Feeds","没有RSS源" -"To:","至：" -"Top Level Category","顶级分类" -"Total: %s
    ","总数：%s
    " -"Wishlist","愿望清单" -"click here to view the review","点击 这里 查看评测" diff --git a/app/locale/zh_CN/Mage_Rule.csv b/app/locale/zh_CN/Mage_Rule.csv deleted file mode 100644 index 25e714af1..000000000 --- a/app/locale/zh_CN/Mage_Rule.csv +++ /dev/null @@ -1,40 +0,0 @@ -"ALL","全部" -"ANY","任意" -"Add","添加" -"Apply","应用" -"Conditions Combination","条件组合" -"Customer Groups must be specified.","必须指定顾客群体。" -"End Date must be greater than Start Date.","结束日期必须大于开始日期。" -"FALSE","否" -"If %s of these conditions are %s:","如果 %s 个这些条件为%s：" -"Invalid discount amount.","无效的折扣额。" -"Open Chooser","打开选择器" -"Perform following actions","执行下列操作" -"Please choose a condition to add...","请选择要添加的条件..." -"Please choose an action to add...","请选择一个要添加的操作..." -"Remove","删除" -"TRUE","真" -"There is no information about associated entity type ""%s"".","没有关于已关联实体类型“%s”的信息。" -"Websites must be specified.","必须指定网站。" -"by","由" -"contains","包含" -"does not contain","不包含" -"does not contains","不包含" -"equals or greater than","等于或大于" -"equals or less than","等于或小于" -"for","为" -"for greater than","大于" -"for or greater than","或大于" -"found","找到" -"from","来自" -"greater than","大于" -"is","是" -"is not","非" -"is not one of","不属于" -"is one of","属于" -"less than","小于" -"not found","未找到" -"not from","非来自" -"to","至" -"was","曾是" -"was not","曾不是" diff --git a/app/locale/zh_CN/Mage_Sales.csv b/app/locale/zh_CN/Mage_Sales.csv deleted file mode 100644 index 3e75255cb..000000000 --- a/app/locale/zh_CN/Mage_Sales.csv +++ /dev/null @@ -1,882 +0,0 @@ -"""%s"" coupon code is not valid.","“%s”优惠券代码无效。" -"%s","%s" -"%s / %s rate:","%s / %s 比率：" -"%s for %s","%s 对 %s" -"%s order(s) cannot be canceled","%s 个订单无法被取消" -"%s order(s) have been canceled.","%s个订单已取消。" -"%s order(s) have been put on hold.","%s个订单已挂起。" -"%s order(s) have been released from holding status.","%s个订单已从挂起状态恢复。" -"%s order(s) were not put on hold.","%s 个订单没有被保持。" -"%s order(s) were not released from holding status.","%s 个订单没有从保持状态恢复。" -"* - Enter custom price excluding tax","* - 输入不含税的自定义价格" -"* - Enter custom price including tax","* - 输入含税的自定义价格" -"* Required Fields","*必要字段" -"-- Please Select --","-- 请选择 --" -"-- Please Select Billing Agreement--","-- 请选择记账协议 --" -"About This Order:","关于此订单：" -"About This Profile:","关于此资料：" -"About Your Invoice","关于您的发票" -"About Your Order","关于您的订单" -"About Your Refund","关于您的退款" -"About Your Shipment","关于您的运送" -"Accept Payment","接受付款" -"Accept or Deny Payment","接受或拒绝付款" -"Account Information","帐户信息" -"Action","操作" -"Actions","操作" -"Activate","激活" -"Active","活动" -"Add","添加" -"Add New Address","添加新地址" -"Add Order Comments","添加订单评论" -"Add Package","添加包" -"Add Products","添加产品" -"Add Selected Product(s) to Option","添加所选产品到选项" -"Add Selected Product(s) to Order","添加所选产品到订单" -"Add Selected Product(s) to Package","添加所选产品到包" -"Add To Order","添加到订单" -"Add Tracking Number","添加追踪编号" -"Add comment to order","添加评论到订单" -"Add new comment to credit memo","为信用记录添加评论" -"Add new comment to shipment","添加新评论到送货" -"Add new tracking number","添加新的追踪编号" -"Add to Cart","添加到购物车" -"Additional Product Info","额外产品信息" -"Address","地址" -"Address model is not defined.","地址模块未定义" -"Adjustment Fee","调整费" -"Adjustment Refund","调整退款" -"Agreement Information","协议信息" -"Allow Reorder","允许记录" -"Amount","数量" -"Amount: %s.","数量：%s。" -"An error occurred while assigning order status. Status has not been assigned.","分配订单状态时发生错误。状态未被分配。" -"An error occurred while creating shipping label.","创建运送标签时发生错误。" -"An error occurred while saving order status. The status has not been added.","保存订单状态时发生错误。状态未被添加。" -"An error occurred while unassigning order status.","取消分配订单状态时发生错误。" -"An error occurred while updating the order address. The address has not been changed.","更新订单地址时发生错误。地址未更改。" -"An item option with code %s already exists.","代码为 %s 的项已经存在。" -"Anchor Custom Title","自定义标题锚点" -"Append Comments","附加评论" -"Apply","应用" -"Apply Coupon Code","应用折价券" -"Approved the payment online.","已在线审核支付。" -"Are you sure you want to accept this payment?","您确认要接受该支付吗？" -"Are you sure you want to cancel this order?","您确认要取消该订单吗？" -"Are you sure you want to delete all items from shopping cart?","你是否确定要删除购物车中的所有内容？" -"Are you sure you want to deny this payment?","您确认要拒绝该支付吗？" -"Are you sure you want to do this?","您是否确认要这样做？" -"Are you sure you want to send Creditmemo email to customer?","您确认要发送信用备忘录电子邮件给客户吗？" -"Are you sure you want to send Invoice email to customer?","您确认要发送发票电子邮件给客户吗？" -"Are you sure you want to send Shipment email to customer?","您确认要发送运送电子邮件给客户吗？" -"Are you sure you want to send order email to customer?","您确认要发送订单电子邮件给客户吗？" -"Are you sure you want to void the payment?","您确认要使支付无效吗？" -"Are you sure?","您是否确认？" -"Are you sure? This order will be canceled and a new one will be created instead","您确认吗？该订单会被取消，并创建一个全新订单" -"Assign Order Status to State","按国家分配订单状态" -"Assign Status to State","按国家分配状态" -"Assignment Information","分配信息" -"At least a payment ID must be set.","必须至少设置一个付款ID。" -"Authorization","授权" -"Authorized amount of %s.","授权额度 %s" -"Authorizing amount of %s is pending approval on gateway.","授权额度 %s 正等待网关的审批。" -"Back","返回" -"Back to Billing Agreements","返回记账协议" -"Back to My Orders","返回我的订单" -"Back to Recurring Profiles","返回循环配置文件" -"Backordered","延期" -"Bestsellers","最佳销量" -"Bill to Name","记账姓名" -"Billing","账单" -"Billing Address","账单地址" -"Billing Agreement","记账协议" -"Billing Agreement # %s","记账协议 # %s" -"Billing Agreement #%s","记账协议#%s" -"Billing Agreement View","记账协议视图" -"Billing Agreements","记账协议" -"Billing Last Name","按姓氏记账" -"Billing ZIP Code","按邮编记账" -"Buy %s for price %s","以 %s 价格购买 %s" -"CSV","CSV" -"Cancel","取消" -"Cancel credit memo","取消信用记录" -"Cancel invoice","取消发票" -"Cancel order","取消订单" -"Canceled","已取消" -"Canceled order offline.","取消的订单已离线。" -"Canceled order online.","取消的订单在线。" -"Cannot add order history.","无法添加订单历史。" -"Cannot create an empty shipment.","无法创建空运单。" -"Cannot determine the field name.","无法确定字段名称。" -"Cannot do invoice for order.","无法为订单创建发票。" -"Cannot do shipment for order.","无法为该订单发货。" -"Cannot get order instance","无法获得订单实例" -"Cannot get the order instance.","无法获得订单实例。" -"Cannot register an existing credit memo.","无法注册现有信用记录。" -"Cannot register existing invoice","无法注册现有发票" -"Cannot register existing shipment","无法注册现有运单" -"Capture","获取" -"Capture Amount","获取额度" -"Capture Offline","离线获取" -"Capture Online","在线获取" -"Capture invoice","获取发票" -"Captured amount of %s online.","在线获取 %s 的数量。" -"Capturing amount of %s is pending approval on gateway.","获取的 %s 数量被挂起等待网关审批。" -"Carrier","运营商" -"Carrier/Method","运营商/方法" -"Change status, add comments","更改状态，添加评论" -"Changing address information will not recalculate shipping, tax or other order amount.","更改地址信息不会导致重新计算发货、税金，或其他金额。" -"Checkout Totals Sort Order","按结账总数对订单排序" -"City","城市" -"Clear Shopping Cart","清空购物车" -"Click to change shipping method","点击更改送货方法" -"Close","关闭" -"Closed","已关闭" -"Comma-separated.","逗号分隔。" -"Comment","评论" -"Comment Text","评论文字" -"Comments","评论" -"Comments History","评论历史" -"Company","公司" -"Complete","完成" -"Configure","配置" -"Configure and Add to Order","配置并添加到订单" -"Contents","内容" -"Continue","继续" -"Controls whether customer IP is shown in orders, invoices, shipments, credit memos.","控制是否在订单、收据、发货单，以及信用记录上显示顾客 IP地址。" -"Country","国家" -"Coupons","折价券" -"Create","创建" -"Create New Customer","创建新客户" -"Create New Order","创建新订单" -"Create New Order Status","创建新订单状态" -"Create New Order for %s","为 %s 创建新订单" -"Create New Order for %s in %s","为 %s 在 %s 中创建新订单" -"Create New Order for New Customer","为新客户创建新订单" -"Create New Order for New Customer in %s","为新客户在 %s 中创建新订单" -"Create New Status","创建新状态" -"Create Order","创建订单" -"Create Packages","创建包" -"Create Shipment","创建运单" -"Create Shipping Label","创建运送标签" -"Create Shipping Label...","创建运送标签..." -"Create new credit memo for order","为订单新建信用记录" -"Create new invoice for order","为订单创建新发票" -"Create new shipment for order","为订单创建新运单" -"Create...","创建..." -"Created At","创建于" -"Created billing agreement #%s.","创建记账协议 #%s。" -"Created:","创建：" -"Credit Memo","信用记录" -"Credit Memo #","信用记录 #" -"Credit Memo # ","Credit Memo # " -"Credit Memo #%1$s | %3$s | %2$s (%4$s)","信用记录 #%1$s | %3$s | %2$s (%4$s)" -"Credit Memo Comment Email Sender","信用记录评论电子邮件发送程序" -"Credit Memo Comment Email Template","信用记录评论电子邮件模板" -"Credit Memo Comment Email Template for Guest","针对来宾的信用记录评论电子邮件模板" -"Credit Memo Comments","信用记录评论" -"Credit Memo Email Sender","信用记录电子邮件发送程序" -"Credit Memo Email Template","信用记录电子邮件模板" -"Credit Memo Email Template for Guest","针对来宾的信用记录电子邮件模板" -"Credit Memo Update","信用记录更新" -"Credit Memo Update for Guest","针对来宾的信用记录更新" -"Credit Memos","信用记录" -"Credit memo canceling problem.","信用记录取消出错。" -"Credit memo cannot be canceled.","信用记录无法取消。" -"Credit memo has been created automatically","信用备忘录已自动创建" -"Custom Price","自定义价格" -"Custom Value","自定义值" -"Customer","客户" -"Customer Can Define Start Date","客户可以定义开始日期" -"Customer Email","客户邮件" -"Customer Group","客户组" -"Customer Last Name","客户姓氏" -"Customer My Account Order Creditmemo View","客户我的帐户订单信用记录视图" -"Customer My Account Order History","客户我的帐户订单历史" -"Customer My Account Order Invoice View","客户我的帐户订单发票视图" -"Customer My Account Order Shipment View","客户我的帐户订单发货视图" -"Customer My Account Order View","客户我的帐户订单视图" -"Customer Name","顾客姓名" -"Customer\'s Current Activities","客户的当前活动" -"Customs Value","自定义值" -"Date","日期" -"Date Shipped","发货日期" -"Default Status","默认状态" -"Default Template","默认模板" -"Default logo, will be used in PDF and HTML documents.
    (jpeg, tiff, png) If you see image distortion in PDF, try to use larger image","默认 logo 将用于 PDF 和 HTML 文档。
    (jpeg, tiff, png) 如果您在 PDF 文件中发现图片失真，请使用较大的图片" -"Delete","删除" -"Delete Package","删除包" -"Denied the payment online.","拒绝的在线支付。" -"Deny Payment","拒绝支付" -"Description Message","描述信息" -"Discount","折扣" -"Discount (%s)","折扣（%s）" -"Discount Amount","折扣帐户" -"Display Order ID in Header","在头部显示订单ID" -"Edit","编辑" -"Edit Order #%s","编辑订单 #%s" -"Edit Order %s %s Address","编辑订单 %s %s地址" -"Edit Order Status","编辑订单状态" -"Email","电子邮件" -"Email Address","编辑电子邮件地址" -"Email Copy of Credit Memo","信用记录副本用邮件发送" -"Email Copy of Invoice","发票副本用邮件发送" -"Email Copy of Shipment","运单副本用邮件发送" -"Email Order Confirmation","订单确认用邮件发送" -"Enable","启用" -"Enabled","已启用" -"Enter the billing last name and email/ZIP as in the order billing address","在订单记账地址中允许对姓氏和邮件/邮编记账" -"Entered data is incorrect. Please try again.","输入的数据有误。请重试。" -"Error to Show in Shopping Cart","在购物车中显示时出错" -"Excel XML","Excel XML" -"Excl. Tax","不含税" -"Expired","已过期" -"Explanation","解释" -"Failed to cancel the billing agreement.","取消记账协议时出错。" -"Failed to create billing agreement for this order.","为该订单创建记账协议时出错。" -"Failed to finish billing agreement wizard.","完成地记账协议向导时出错。" -"Failed to send the order email.","发送订单邮件出错。" -"Failed to start billing agreement wizard.","开始记账协议向导时出错。" -"Failed to update the payment.","更新支付时出错。" -"Failed to update the profile.","更新配置文件时出错。" -"Failed to void the payment.","取消支付时出错。" -"Fetch","获取" -"File extension not known or unsupported type in the following shipment: %s","下列订单 %s 中存在未知文件扩展，或不支持的类型" -"Find Order By:","订单查找条件：" -"First Name","名字" -"From","来自" -"From Name","通过名称" -"From:","来自：" -"G.T. (Base)","G.T.（基本）" -"G.T. (Purchased)","G.T.（已购买）" -"General","常规" -"General Information","常规信息" -"Get Payment Update","获得支付更新" -"Get Update","获得更新" -"Get shipping methods and rates","获得发货方法和费率" -"Gift Message","礼品消息" -"Gift Message for This Order","该订单的礼品信息" -"Gift Message for the Entire Order","整个订单的礼品信息" -"Gift Message for this Order","该订单的礼品信息" -"Gift Options","礼品选项" -"Gift Wrapping for the Entire Order","整个订单的礼品包装" -"Girth","周长" -"Go to Home Page","Go to Home Page" -"Grand Total","总计" -"Grand Total to be Charged","需要收取的总费用" -"Guest","来宾" -"Height","高度" -"Hide Customer IP","隐藏顾客 IP 地址" -"Hold","暂挂" -"Hold action is not available.","暂挂操作不可用。" -"Hold order","暂挂订单" -"Home","Home" -"ID","ID" -"ID #","ID#" -"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"". Credit Memo has not been created. Please create offline Credit Memo.","IPN“已退款”。退款由商家发起。有关退款金额 %s 的通知已注册。交易 ID：“%s”。尚未创建贷项凭证。请创建离线贷项凭证。" -"If empty, the default description above will be used.","如果为空，将使用上述默认描述。" -"If empty, the default error above will be used.","如果为空，将使用上述默认错误。" -"If the invoice was created offline, try creating an offline creditmemo.","如果离线创建发票，请尝试离线创建信用记录。" -"Incl. Tax","含税" -"Information","信息" -"Initial Fee","初始费用" -"Initial Fees","起步费用" -"Initial period payment","初始付款周期" -"Insufficient information to create shipping label(s). Please verify your Store Information and Shipping Settings.","创建发货标签所需的信息不足。请确认你的店铺信息与发货设置。" -"Invalid block: %s.","无效的块： %s。" -"Invalid carrier specified.","指定的运营商无效。" -"Invalid draw line data. Please define ""lines"" array.","行数据无效。请定义“行”阵列。" -"Invalid entity model","无效的实体模型。" -"Invalid item option format.","项目选项格式无效。" -"Invalid qty to invoice item ""%s""","商品 ""%s""的发票数量无效" -"Invalid qty to refund item ""%s""","商品""%s""的退款数量无效" -"Invalid qty to ship for item ""%s""","商品""%s""的发货数量无效" -"Invalid renderer model","无效的渲染模型" -"Invalid request for adding product to quote.","添加产品供引用的请求无效。" -"Invalid value(s) for Qty to Ship","Invalid value(s) for Qty to Ship" -"Invoice","发票" -"Invoice #","发票 #" -"Invoice # ","Invoice # " -"Invoice #%1$s | %2$s | %4$s (%3$s)","发票 #%1$s | %2$s | %4$s (%3$s)" -"Invoice #%s","发票 #%s" -"Invoice Comment Email Sender","发票评论电子邮件发送程序" -"Invoice Comment Email Template","发票评论电子邮件模板" -"Invoice Comment Email Template for Guest","针对来宾的发票评论电子邮件模板" -"Invoice Comments","发票评论" -"Invoice Date","发票日期" -"Invoice Email Sender","发票邮件发送程序" -"Invoice Email Template","发票邮件模板" -"Invoice Email Template for Guest","针对来宾的发票邮件模板" -"Invoice Update","发票更新" -"Invoice Update for Guest","针对来宾的发票更新" -"Invoice and Packing Slip Design","发票与包装标签设计" -"Invoice and Ship","发票与发货" -"Invoice canceling problem.","发票取消问题。" -"Invoice cannot be canceled.","发票无法被取消。" -"Invoice cannot be captured.","发票无法被获取。" -"Invoice cannot be voided.","发票无法被撤销。" -"Invoice capturing problem.","发票获取问题。" -"Invoice void problem","发票撤销问题" -"Invoice will be created without communication with payment gateway.","发票会在不与支付网关沟通的情况下创建。" -"Invoiced","已出发票" -"Invoices","发票" -"Is Closed","已关闭" -"Item","商品" -"Item Status","商品状态" -"Item object is not specified.","商品对象未指定。" -"Item options declaration error.","商品选项声明有误。" -"Item ordered qty","下单商品的数量" -"Item qty declaration error.","商品数量声明有误" -"Items","项目" -"Items Invoiced","商品移开发票" -"Items Ordered","商品已下单" -"Items Refunded","商品已退款" -"Items Shipped","商品已发货" -"Items in the Package","包裹中的商品" -"Items maximum quantity or price do not allow checkout.","商品最大数量或价格不允许结账。" -"Items options declaration error.","商品选项声明有误。" -"Items to Refund","要退货的商品" -"Items to Ship","要发货的商品" -"Key","密钥" -"Last Name","姓氏" -"Last Ordered Items","上次订购的商品" -"Last status can\'t be unassigned from state.","上次状态无法被取消分配。" -"Length","长度" -"Link to the New Order","链接到新订单" -"Link to the Previous Order","连接到前一订单" -"Logo for HTML Print View","HTML 打印视图标志" -"Logo for HTML documents only. If empty, default will be used.
    (jpeg, gif, png)","仅供 HTML 文档使用的标志。如果为空，则使用默认标志。
    (jpeg, gif, png)" -"Logo for PDF Print-outs (200x50)","适用于 PDF 打印的标志 (200x50)" -"Make Check payable to:","通过支票付款给：" -"Manage","管理" -"Maximum amount available to refund is %s","可退款的最高金额为 ％s" -"Maximum shipping amount allowed to refund is: %s","允许退款的最大运送数量为：%s" -"Message","信息" -"Message:","信息：" -"Minimum Amount","最小数量" -"Minimum Order Amount","最小订单数量" -"Mixed","混合" -"Most Viewed","最受欢迎" -"Most Viewed Products Report","最受欢迎的产品报告" -"Move to Shopping Cart","移动到购物车" -"Move to Wishlist","移动到愿望清单" -"Multi-address Description Message","多个地址描述消息" -"Multi-address Error to Show in Shopping Cart","购物车中多个地址显示错误" -"My Orders","我的订单" -"My Orders - Details","我的订单 - 详情" -"N/A","N/A" -"Name","姓名" -"New","新建" -"New Billing Agreement","新建记账协议" -"New Credit Memo","新建信用记录" -"New Credit Memo for Guest","为来宾新建信用记录" -"New Credit Memo for Invoice #%s","为收据 #%s 新建信用记录" -"New Credit Memo for Order #%s","新订单 #%s 的贷项凭单" -"New Invoice","新发票" -"New Invoice and Shipment for Order #%s","订单 #%s 的新发票和运单" -"New Invoice for Guest","针对来宾的新发票" -"New Invoice for Order #%s","订单 #%s 的新发票" -"New Order","新订单" -"New Order Confirmation Email Sender","新订单确认邮件发送程序" -"New Order Confirmation Template","新订单确认模板" -"New Order Confirmation Template for Guest","针对来宾的新订单确认模板" -"New Order RSS","新订单RSS" -"New Order Status","新订单状态" -"New Order for Guest","针对来宾的新订单" -"New Shipment","新运单" -"New Shipment for Guest","针对来宾的新运单" -"New Shipment for Order #%s","订单 #%s 的新运单" -"Newsletter Subscription","新闻邮件订阅" -"No","否" -"No Items","无项目" -"No Items To Refund","无可退款项目" -"No Payment Methods","无支付方法" -"No detail for number ""%s""","编号 ""%s"" 无详情" -"No information available.","无可用信息。" -"No items","无项目" -"No order(s) were put on hold.","没有被暂挂的订单。" -"No order(s) were released from holding status.","没有脱离暂挂状态的订单。" -"No ordered items","无订单项" -"No shipping information available","无可用发货信息" -"Nominal Items","名义上的产品" -"Nominal item can be purchased standalone only. To proceed please remove other items from the quote.","名义上的产品只能单独购买。要继续处理，请从订单中删除其他产品。" -"Nominal order registered.","定义上的订单已注册。" -"Not Capture","无获取" -"Not Initialized","未初始化" -"Not Notified","未通知" -"Not enough valid data to save the parent transaction ID.","没有保存父交易ID所需的足够数据。" -"Notification Not Applicable","通知不可用" -"Notified","已通知。" -"Notify Customer by Email","通过电子邮件通知客户" -"Number","数字" -"Number of Invoiced Orders","已开发票订单的数量" -"Number of Orders","订单数量" -"Number of Refunded Orders","已退款订单的数量" -"OK","确定" -"Offline Refunded","离线退款" -"On Hold","暂挂" -"Online Refunded","在线退款" -"Order","订单" -"Order #","订单 #" -"Order # ","Order # " -"Order # %s","订单 #%s" -"Order # %s %s | %s","订单 # %s %s | %s" -"Order #%s","订单# %s" -"Order #%s - %s","订单 #%s - %s" -"Order API","订单API" -"Order Address Information","订单地址信息" -"Order Comment","订单评论" -"Order Comment Email Sender","订单评论邮件发送程序" -"Order Comment Email Template","订单评论邮件模板" -"Order Comment Email Template for Guest","针对来宾的订单评论邮件模板" -"Order Comments","订单评论" -"Order Credit Memos","订单信用记录" -"Order Currency:","订单币种：" -"Order Date","订单日期" -"Order Date (%s)","订单日期（%s）" -"Order Date: ","订单日期：" -"Order Date: %s","订单日期：%s" -"Order Details","订单详情" -"Order Grand Total","订单总数" -"Order History","订单历史" -"Order History Info","订单历史信息" -"Order ID","订单 ID" -"Order Information","订单信息" -"Order Invoices","订单发票" -"Order Shipments","订单发货" -"Order State","订单状态" -"Order Status","订单状态" -"Order Status Information","订单状态信息" -"Order Statuses","订单状态" -"Order Subtotal","订单小计" -"Order Taxes Report Grouped by Tax Rates","按税率分组的订单税费报告" -"Order Total","订单总数" -"Order Totals","订单总数" -"Order Update","订单更新" -"Order Update for Guest","来宾的订单更新" -"Order View","订单查看" -"Order credit memo","订单信用记录" -"Order does not allow to be canceled.","订单不允许取消。" -"Order invoice","订单发票" -"Order is suspended as its authorizing amount %s is suspected to be fraudulent.","订单已中止，因为其授权金额 %s 被怀疑为欺诈。" -"Order is suspended as its capture amount %s is suspected to be fraudulent.","订单被暂停，因为它的接受金额 %s 被怀疑为欺诈。" -"Order object is not specified.","订单对象未指定。" -"Order saving error: %s","订单保存错误：%s" -"Order shipments","订单运送" -"Order status does not exist.","订单状态不存在。" -"Order status with the same status code already exist.","具有相同订单代码的订单状态已存在。" -"Order was placed using %s","使用 %s 下订单" -"Ordered","已下单" -"Ordered amount of %s.","%s 的已下单数量。" -"Ordering amount of %s is pending approval on gateway.","%s的订单数量正在网站上挂起供审批。" -"Orders","订单" -"Orders and Returns","订单与退货" -"Orders and Returns Search Form","订单与退货搜索表单" -"Original Price","原始价格" -"Original order item that recurring payment profile correspondss to.","循环支付配置文件所对应的原始订单项。" -"PDF Credit Memos","PDF版信用记录" -"PDF Invoices","PDF版发票" -"PDF Packingslips","PDF版包裹清单" -"PDF Print-outs","PDF版打印输出" -"PDF object is not specified.","PDF对象未指定。" -"PDF page object is not specified.","PDF页面对象未指定。" -"PDF total model should extend Mage_Sales_Model_Order_Pdf_Total_Default","PDF总模块必须扩展Mage_Sales_Model_Order_Pdf_Total_Default" -"Package","包裹" -"Package types are disregarded for USPS domestic shipments.","USPS国内发货将忽略包装类型。" -"Packages","包裹" -"Packingslip # ","包裹清单 #" -"Paid","已付费" -"Paid Amount","付费金额" -"Parent Transaction ID","父交易ID" -"Parent transaction ID must have a transaction ID.","父交易ID必须有一个交易ID" -"Partial","部分" -"Payment Failed","支付失败" -"Payment Information","支付信息" -"Payment Method","支付方式" -"Payment Method Name","支付方法的名称" -"Payment Method:","支付方法：" -"Payment Review","支付预览" -"Payment disallow storing objects.","不允许支付的店铺对象。" -"Payment transactions disallow storing objects.","支付交易不允许的店铺对象。" -"Payment type","支付类型" -"Payment update has been made.","支付更新已完成。" -"Pending","挂起" -"Pending Payment","挂起的支付" -"Period","周期" -"Place Order Using Billing Agreements","使用记账协议下单" -"Placed from IP","下单用的IP" -"Please Select Products to Add","请选择要添加的产品" -"Please Select a Customer","请选择一个客户" -"Please Select a Store","请选择商店" -"Please check billing address information. %s","请检查帐单地址信息。 ％s" -"Please check shipping address information. %s","请检查配送地址信息。％s" -"Please define PDF object before using.","请在使用前定义 PDF 对象。" -"Please enter positive number in this field.","请在该字段输入正数。" -"Please select a valid payment method.","请选择有效的支付方式。" -"Please specify a shipping method.","请指定一个配送方法。" -"Please specify a valid grid column alias name that exists in grid table.","请从现有网格表中指定有效的网格栏别名名称。" -"Price","价格" -"Print","打印" -"Print All","打印全部" -"Print All Invoices","打印所有发票" -"Print All Refunds","打印所有退款" -"Print All Shipments","打印所有运单" -"Print Credit Memos","打印信用记录" -"Print Invoice","打印发票" -"Print Invoices","打印发票" -"Print Order","打印订单" -"Print Order # %s","打印订单 # %s" -"Print Packingslips","打印包裹清单" -"Print Refund","打印退款" -"Print Shipment","打印运单" -"Print Shipping Label","打印发货标签" -"Print Shipping Labels","打印运单标签" -"Processing","正在处理" -"Product","产品" -"Product Name","产品名" -"Products","产品" -"Products Bestsellers Report","产品最佳销量报告" -"Products in Comparison List","比较列表中的产品" -"Products should be added to package(s)","产品应添加到包中" -"Profile #%s","配置文件 #%s" -"Profile Information","配置文件信息" -"Profile State","配置文件状态" -"Profit","利润" -"Promotion Coupons Usage Report","促销代金券使用情况报告" -"Proper payment object must be set.","必须设置恰当的支付对象。" -"Purchase Order Number:","采购订单号" -"Purchased From","购买自" -"Purchased From (Store)","购买自（店铺）" -"Purchased Item","已购买内容" -"Purchased On","购买于" -"Qty","数量" -"Qty Invoiced","已开发票数量" -"Qty Ordered","下单的数量" -"Qty Shipped","已发货数量" -"Qty To Add","添加的数量" -"Qty to Add","要添加的数量" -"Qty to Invoice","发票数量" -"Qty to Refund","要退款的数量" -"Qty to Ship","发货数量" -"Quantity Ordered","下单的数量" -"Quote item id is not received.","报价项编号无法接受。" -"Quote item is not loaded.","报价项未被加载。" -"Rate","费率" -"Recent Orders","近期订单" -"Recently Compared Products","最近比较过的产品" -"Recently Viewed","最近查看过的" -"Recently Viewed Products","最近查看过的产品" -"Recurring Profile # %s","循环配置文件 # %s" -"Recurring Profile Initial Fee","循环配置文件初始化费用" -"Recurring Profiles","递归配置文件" -"Recurring Profiles (beta)","循环配置文件（测试）" -"Reference ID","参考ID" -"Reference ID:","参考ID：" -"Refresh","刷新" -"Refund","退款" -"Refund #","退款 #" -"Refund #%s","退款 #%s" -"Refund Amount","退款额度" -"Refund Offline","离线退款" -"Refund Shipping","发货退款" -"Refund Shipping (Excl. Tax)","发货退款（不含税）" -"Refund Shipping (Incl. Tax)","发货退款（含税）" -"Refund Totals","退款总数" -"Refunded","已存储" -"Refunded amount of %s offline.","%s 离线退款的额度" -"Refunded amount of %s online.","%s 在线退款额度" -"Refunds","退款" -"Registered a Void notification.","注册的撤销通知。" -"Registered notification about approved payment.","注册的有关已审批支付的通知。" -"Registered notification about captured amount of %s.","注册的有关%s获取额度的通知。" -"Registered notification about denied payment.","注册的有关拒绝支付的通知。" -"Registered notification about refunded amount of %s.","注册的有关%s 退款额度的通知。" -"Registered update about approved payment.","注册的有关已审批支付的更新。" -"Registered update about denied payment.","注册的有关拒绝支付的更新。" -"Regular Payment","正常支付" -"Related Orders","相关订单" -"Remove","删除" -"Remove Coupon Code","删除折价券" -"Remove tracking number","删除追踪号码" -"Reorder","记录" -"Retrieve credit memo info","检索贷项凭单信息" -"Retrieve credit memo information","获取信用记录信息" -"Retrieve credit memo list","检索贷项凭单清单" -"Retrieve invoice info","就获取发票信息" -"Retrieve invoice information","获取发票信息" -"Retrieve list of credit memos by filters","使用过滤器检索贷项凭单清单" -"Retrieve list of invoices by filters","使用筛选器获取发票列表" -"Retrieve list of orders by filters","使用筛选器获取订单列表" -"Retrieve list of shipments by filters","使用筛选器获取运单列表" -"Retrieve order information","获取订单信息" -"Retrieve orders info","获取订单信息" -"Retrieve shipment info","获取运单信息" -"Retrieve shipment information","获取运单信息" -"Return to Stock","返回库存" -"Returned","已退款" -"Returns","返回" -"Revenue","收入" -"Row Subtotal","行小计" -"Row Total","总行数" -"SKU","SKU" -"Sales","销售" -"Sales Discount","销售折扣" -"Sales Emails","销售邮件" -"Sales Emails Section","销售邮件区域" -"Sales Invoice Print View","销售发票打印视图" -"Sales Items","销售产品" -"Sales Order Print View","销售订单打印视图" -"Sales Section","销售部分" -"Sales Shipment Print View","销售发货打印视图" -"Sales Shipping","销售发货" -"Sales Tax","销售税" -"Sales Total","销售总量" -"Same As Billing Address","与账单地址相同" -"Save Order Address","保存订单地址" -"Save Status","销售状态" -"Save Status Assignment","保存状态协议" -"Save in address book","保存到地址簿" -"Schedule","计划" -"Select","选择" -"Select All","全选" -"Select from existing customer addresses:","从现有客户地址选择：" -"Selected option(s) or their combination is not currently available.","已选择的选项或选项组合当前不可用。" -"Send Credit Memo Comment Email Copy To","发送信用记录评论邮件副本到" -"Send Credit Memo Comments Email Copy Method","发送信用记录评论邮件副本的方法" -"Send Credit Memo Email Copy Method","发送信用记录邮件副本的方法" -"Send Credit Memo Email Copy To","发送信用记录邮件副本至" -"Send Email","发送邮件" -"Send Invoice Comment Email Copy To","发送发票评论邮件副本至" -"Send Invoice Comments Email Copy Method","发送发票评论邮件副本的方法" -"Send Invoice Email Copy Method","发送发票邮件副本的方法" -"Send Invoice Email Copy To","发送发票邮件副本到" -"Send Order Comment Email Copy To","发送订单评论邮件副本至" -"Send Order Comments Email Copy Method","发送订单评论邮件副本的方法" -"Send Order Email","发送订单邮件" -"Send Order Email Copy Method","发送订单邮件副本的方法" -"Send Order Email Copy To","发送订单邮件副本至" -"Send Sales Emails","发送销售邮件" -"Send Shipment Comment Email Copy To","发送送货评价邮件副本至" -"Send Shipment Comments Email Copy Method","发送运单评论邮件副本的方法" -"Send Shipment Email Copy Method","发送运单邮件副本的方法" -"Send Shipment Email Copy To","发送送货邮件副本至" -"Send Tracking Information","发送追踪信息" -"Send shipment info","发送运送信息" -"Set order for existing transactions not allowed","不允许对已存在的交易设置订单" -"Ship","送货" -"Ship To","送货至" -"Ship to Name","收货人" -"Ship to:","货到：" -"Shipment","发货" -"Shipment #","送货单号" -"Shipment #%1$s | %3$s (%2$s)","送货单号#%1$s | %3$s (%2$s)" -"Shipment #%s","送货单号#%s" -"Shipment Comment Email Sender","送货评价邮件发送者" -"Shipment Comment Email Template","送货评价邮件模板" -"Shipment Comment Email Template for Guest","针对来宾的运单评论邮件模板" -"Shipment Comments","运单评论" -"Shipment Email Sender","运单邮件发送程序" -"Shipment Email Template","送货邮件模板" -"Shipment Email Template for Guest","访客送货邮件模板" -"Shipment Update","送货信息更新" -"Shipment Update for Guest","针对来宾的运单更新" -"Shipments","发货" -"Shipped","已发货" -"Shipped By","送货方" -"Shipping","运送" -"Shipping & Handling","运费和手续费" -"Shipping & Handling","运送与手续费" -"Shipping & Handling Information","运单 & 处理信息" -"Shipping Address","送货地址" -"Shipping Amount","运送量" -"Shipping Information","运送信息" -"Shipping Method","运送方式" -"Shipping Method:","送货方法：" -"Shipping Refund","运单退款" -"Shipping and Tracking Information","运送和追踪信息" -"Shopping Cart","购物车" -"Show Packages","显示包裹" -"Signature Confirmation","签名确认" -"Signed Up From","签署自" -"Size","尺寸" -"Sku","Sku" -"Sold to:","被销售到：" -"Some item options or their combination are not currently available.","部分商品选项或选项组合当前不可用。" -"Some of the products below do not have all the required options.","下方部分产品未包含所有必需的选项。" -"Some of the selected options are not currently available.","部分已选择的选项当前不可用。" -"Sorry, no quotes are available for this order at this time.","抱歉，当前该订单中没有报价可用。" -"Source object is not specified.","源对象未指定。" -"Specified profile does not exist.","指定的配置文件不存在。" -"State Code [State Title]","州代码[州名称]" -"State/Province","州/省" -"Status","状态" -"Status Code","状态代码" -"Status Label","状态标签" -"Status:","状态：" -"Store Credit","店铺信用" -"Store View Specific Labels","店铺视图指定的标签" -"Street Address","街道地址" -"Submit Comment","提交评论" -"Submit Credit Memo","提交信用记录" -"Submit Invoice","提交发票" -"Submit Invoice and Shipment","提交发票与运单" -"Submit Order","提交订单" -"Submit Shipment","提交运单" -"Subscribe to Newsletter","订阅到新闻通讯" -"Subscribe to Order Status","订阅订单状态" -"Subtotal","小计" -"Subtotal after discount.","折扣后总额。" -"Subtotal:","小计：" -"Suspected Fraud","欺诈嫌疑" -"Suspend","挂起" -"Suspended","暂挂" -"Tax","传真" -"Tax Amount","税额" -"Tax Percent","税率" -"Telephone","电话" -"The Order State ""%s"" must not be set manually.","订单状态 ""%s"" 必须手工设置。" -"The address total model should be extended from Mage_Sales_Model_Quote_Address_Total_Abstract.","地址总模块应扩展自Mage_Sales_Model_Quote_Address_Total_Abstract。" -"The billing agreement ""%s"" has been canceled.","该记账协议 ""%s"" 已被取消。" -"The billing agreement ""%s"" has been created.","该记账协议 ""%s"" 已被创建。" -"The coupon code has been accepted.","该代金券代码已被使用。" -"The message has been sent.","该信息已发送。" -"The message was sent.","消息已发送。" -"The order address has been updated.","订单地址已更新。" -"The order email has been sent.","订单电子邮件已发送。" -"The order has been cancelled.","订单已被取消。" -"The order has been created.","订单已创建。" -"The order has been put on hold.","订单已被暂挂。" -"The order has been released from holding status.","订单已脱离暂挂状态。" -"The order has not been cancelled.","订单尚未被取消。" -"The order status has been assigned.","订单状态已被分配。" -"The order status has been saved.","订单状态已被保存。" -"The order status has been unassigned.","订单状态已被撤销分配。" -"The order was not put on hold.","订单没有被保持。" -"The order was not unheld.","订单没有被保持。" -"The order was placed using %s","订单被使用 %s 下达。" -"The order(s) cannot be canceled","订单无法被取消" -"The payment has been accepted.","支付已被接受。" -"The payment has been denied.","支付已被拒绝。" -"The payment has been voided.","支付已被撤销。" -"The profile has been updated.","个人资料已更新。" -"The profile has no changes.","个人资料无变化。" -"The profile state has been updated.","配置文件状态已更新。" -"The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)","你想要添加的数量超出了某些所选商品的总可发货数量" -"The requested Payment Method is not available.","请求的支付方式不可用。" -"The shipping label has been created.","运送标签已创建。" -"The transaction ""%s"" (%s) is already closed.","交易 ""%s"" (%s) 已被关闭。" -"The transaction ""%s"" cannot be captured yet.","交易 ""%s"" 尚无法获取。" -"The value that you entered is not valid.","你输入的数值无效。" -"There are no billing agreements yet.","尚无记账协议。" -"There are no printable documents related to selected orders.","没有与所选订单有关的可打印文档。" -"There are no shipping labels related to selected orders.","已选择的订单没有运送标签。" -"There are no shipping labels related to selected shipments.","已选择的商品运送没有运送标签。" -"There is no need to approve this payment.","无需审核该支付。" -"There is no need to deny this payment.","无需拒绝该支付。" -"There is no update for the payment.","该支付无更新。" -"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","如果折扣后的总价格低于最小值，该信息会显示在购物车里。" -"This operation requires an existing transaction object.","该操作需要一个现有的交易目标。" -"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","该订单包含 (%s) 个项目，因此当前无法通过管理员界面编辑，如果您希望继续编辑，(%s) 个项目将被删除，该订单将被取消并生成新订单。" -"This order no longer exists.","该订单已不存在。" -"This product does not have any configurable options","该产品不包含任何可配置选项" -"This profile state cannot be changed to ""%s"".","该资料状态无法更改为“%s”。" -"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","这将会创建离线退款。要创建在线退款，打开一张发票并为其创建信用备忘录。您希望继续吗？" -"Tier Pricing","层级价格" -"Title","标题" -"To","发送至" -"To Name","到名称" -"To:","至：" -"Total","总数" -"Total %d product(s)","总共%d个产品" -"Total (ex)","总计 (ex)" -"Total (inc)","总数（含）" -"Total Due","总额" -"Total Invoiced","发票总量" -"Total Invoiced Paid","发票总金额" -"Total Invoiced VS Paid Report","发票总数 VS 付款报告" -"Total Invoiced not Paid","未付款发票总额" -"Total Ordered Report","订单总数报告" -"Total Paid","同付款额" -"Total Qty","总数量" -"Total Refund","总退款额" -"Total Refunded","退款总量" -"Total Refunded Report","退款总数报告" -"Total Sales Shipping","总销售运送" -"Total Shipped Report","发货总数报告" -"Total Shipping","总运送额" -"Total Shipping Charges","总运费" -"Total Tax","总税款" -"Total Weight","总高度" -"Total model should be extended from Mage_Sales_Model_Order_Total_Abstract.","总模型应延长自 Mage_Sales_Model_Order_Total_Abstract。" -"Track Order","追踪订单" -"Track all shipment(s)","追踪所有运送" -"Track all shipments","追踪所有运单" -"Track this shipment","追踪该运单" -"Track your order","追踪您的订单" -"Tracking","追踪" -"Tracking Number","追踪编号" -"Tracking Number(s):","追踪编号：" -"Transaction ""%s"" was already processed.","交易 ""%s"" 已被处理。" -"Transaction # %s | %s","交易 # %s | %s" -"Transaction ID","交易ID" -"Transaction ID must not be empty.","交易ID不能为空。" -"Transaction ID: ""%s"".","交易ID： ""%s""。" -"Transaction Type","交易类型" -"Transactions","交易" -"Trial ","试用" -"Trial Payment","试用支付" -"Trial Period","尝试周期" -"Trial period payment","试用期支付" -"Type","类型" -"Unassign","撤销分配" -"Unhold","适当" -"Unhold action is not available.","恢复操作不可用。" -"Unhold order","释放的订单" -"Unknown State","未知州" -"Unknown Status","位置状态" -"Unsupported transaction type ""%s"".","不支持的交易类型""%s""。" -"Update Changes","更新更改" -"Update Items and Qty\'s","更新项目与数量" -"Update Qty\'s","更新数量" -"Updated At","更新于" -"Updated:","更新时间：" -"Use Aggregated Data (beta)","使用聚合数据（测试版）" -"Use Order Status As Default","默认使用订单状态" -"Validate Each Address Separately in Multi-address Checkout","分别验证多地址复选框内的每一个地址" -"Value","值" -"View","查看" -"View All","查看全部" -"View Another Order","查看另一订单" -"View Order","查看订单" -"Visible on Frontend","前端可见" -"Void","无效" -"Void invoice","查看发票" -"Voided authorization.","无效的认证。" -"Website","网站" -"Weight","高度" -"Whether buyer can define the date when billing for the profile begins.","卖家是否可以在简介开始时定义日期。" -"Width","宽" -"Wishlist","愿望清单" -"Wrong billing agreement ID specified.","指定的记账协议ID有误。" -"Wrong quote item id to update configuration.","更新配置的报价项目ID错误。" -"Wrong state: ""%s"".","州错误：""%s""" -"Yes","是" -"You can leave a box blank if you don\'t wish to add a gift message for whole order","如果不希望为整个订单添加礼品信息，即可在这里留空" -"You don\'t have permissions to manage this order because of one or more products are not permitted for your website.","You don\'t have permissions to manage this order because of one or more products are not permitted for your website." -"You have placed no orders.","您没有下订单。" -"You will be redirected to the payment system website.","您将被重定向到支付系统网站。" -"Your credit card will be charged for","您的信用卡将被收取" -"ZIP/Post Code","邮政编码" -"Zip/Postal Code","邮政编码" -"cm","厘米" -"in","英寸" -"kg","kg" -"lb","lb" -"the credit memo email is not sent","信用备忘录邮件未发送" -"the credit memo email was sent","信用备忘录邮件已发送" -"the invoice email is not sent","发票电子邮件未发送" -"the invoice email was sent","发票电子邮件已发送" -"the order confirmation email is not sent","订单确认电子邮件未发送" -"the order confirmation email was sent","订单确认电子邮件已发送" -"the shipment email is not sent","运送电子邮件未发送" -"the shipment email was sent","运送电子邮件已发送" diff --git a/app/locale/zh_CN/Mage_SalesRule.csv b/app/locale/zh_CN/Mage_SalesRule.csv deleted file mode 100644 index d0e857ed7..000000000 --- a/app/locale/zh_CN/Mage_SalesRule.csv +++ /dev/null @@ -1,132 +0,0 @@ -"%d Shopping Cart Price Rules based on ""%s"" attribute have been disabled.","%d 购物车价格规则基于 ""%s"" 属性，已被禁用。" -"%s Coupon(s) have been generated","已生成 %s 个组" -"Actions","操作" -"Active","活动" -"Add New Rule","添加新规则" -"Alphabetical","字母表" -"Alphanumeric","字母表" -"An error occurred while generating coupons. Please review the log and try again.","生成折扣券时出错。请查阅日志并重试。" -"Apply","应用" -"Apply To","应用给" -"Apply the rule only if the following conditions are met (leave blank for all products)","只有下列条件满足时才应用规则（留空即可针对所有产品）" -"Apply the rule only to cart items matching the following conditions (leave blank for all items)","只对购物车中满足下列条件的产品应用规则（留空即可针对所有产品）" -"Apply the rule to cart items matching the following conditions","对购物车中符合下列条件的商品应用规则" -"Apply to Shipping Amount","应用给运单额度" -"Are you sure you want to delete the selected coupon(s)?","你是否确定要删除所选折扣券？" -"Auto","自动" -"Auto Generated Specific Coupon Codes","自动生成指定的折扣券代码" -"Buy X get Y free (discount amount is Y)","购买 X 即可免费获得 Y（折扣额是Y）" -"By Fixed value","由固定值" -"By Percentage","按百分比" -"Can\'t acquire coupon.","无法获取代金券。" -"Cart Attribute","购物车属性" -"Catalog","分类" -"Code Format","代码格式" -"Code Length","代码长度" -"Code Prefix","代码前缀" -"Code Suffix","代码后缀" -"Conditions","条件" -"Conditions combination","条件组合" -"Coupon","折扣券" -"Coupon Code","折扣券代码" -"Coupon Qty","折扣券数量" -"Coupon with the same code","使用相同代码的折扣券" -"Coupons Information","折扣券信息" -"Created On","创建于" -"Customer Groups","客户组" -"Dash Every X Characters","每x个字符加横线" -"Date Expire","过期日" -"Date Start","开始日" -"Default Label","默认标签" -"Default Rule Label for All Store Views","针对所有店铺视图的默认规则标签" -"Description","描述" -"Discount Amount","折扣帐户" -"Discount Qty Step (Buy X)","折扣数量步骤（购买 X）" -"Edit Rule","修改规则" -"Edit Rule '%s'","修改规则'%s'" -"Excluding prefix, suffix and separators.","包含前缀、后缀，以及分隔符。" -"FOUND","找到" -"Fixed amount discount","定额折扣" -"Fixed amount discount for whole cart","整个购物车的定额折扣" -"For matching items only","仅限匹配的商品" -"For shipment with matching items","针对运单中匹配的商品" -"Free Shipping","免运费" -"From Date","来自日期" -"General Information","常规信息" -"Generate","生成" -"ID","ID" -"If %s %s %s for a subselection of items in cart matching %s of these conditions:","如果购物车中的 %s %s %s 附属项目符合下列 %s 个条件：" -"If an item is %s in the cart with %s of these conditions true:","如果购物车中的项目 %s 满足下列 %s 个条件：" -"If empty no separation.","如果为空则不分隔。" -"If you select and save the rule you will be able to generate multiple coupon codes.","如果选择并保存该规则，你就可以生成多个折扣券代码。" -"Inactive","未激活" -"Item totals are not set for rule.","商品总数并不由规则设置" -"Labels","标签" -"Manage Coupon Codes","管理折扣券代码" -"Maximum Qty Discount is Applied To","最大数量折扣被应用给" -"NOT FOUND","未找到" -"NOT LOGGED IN","未登录" -"New Rule","新规则" -"No","否" -"No Coupon","无代金券" -"Not valid data provided","提供的数据无效" -"Number of Uses","用户数" -"Numeric","数字" -"Payment Method","支付方式" -"Percent of product price discount","产品价格折扣比例" -"Period","周期" -"Price in cart","购物车价格" -"Priority","优先级" -"Product attribute combination","产品属性组合" -"Products subselection","产品复选" -"Promotions","促销" -"Public In RSS Feed","发布到RSS源中" -"Quantity in cart","购物车中数量" -"Row total in cart","购物车中行数" -"Rule Information","规则信息" -"Rule Name","规则名称" -"Rule is not defined","规则未定义" -"Sales Discount Amount","销售折扣额" -"Sales Subtotal Amount","销售小计额度" -"Sales Total Amount","销售总额" -"Save and Continue Edit","保存并继续编辑" -"Shipping Country","运送国家" -"Shipping Method","运送方式" -"Shipping Postcode","运送邮编" -"Shipping Region","运送地区" -"Shipping State/Province","运行州/省" -"Shopping Cart Price Rule","共享购物车规则" -"Shopping Cart Price Rules","购物车价格规则" -"Special Price","特殊价格" -"Specific Coupon","指定代金券" -"Status","状态" -"Stop Further Rules Processing","停止进一步的规则处理" -"Store View Specific Labels","店铺视图指定的标签" -"Subtotal","小计" -"Subtotal Amount","小计额度" -"The rule has been deleted.","规则已删除。" -"The rule has been saved.","规则已保存。" -"This rule no longer exists.","该规则已不存在。" -"Times Used","使用时间" -"To Date","截止日期" -"To Fixed Value","为固定值" -"To Percentage","为百分率" -"Total","总数" -"Total Amount","总数量" -"Total Items Quantity","总商品数量" -"Total Weight","总重量" -"Unable to create requested Coupon Qty. Please check settings and try again.","无法创建所需数量的折扣券。请检查设置并重试。" -"Unable to find a rule to delete.","无法查找要删除的规则。" -"Update prices using the following information","使用下列信息更新价格" -"Update product's %s %s: %s","更新产品的 %s %s：%s" -"Update the Product","更新产品" -"Use Auto Generation","使用自动生成" -"Used","已使用" -"Uses per Coupon","每代金券使用" -"Uses per Customer","每客户使用" -"Website","网站" -"Websites","网站" -"Wrong rule specified.","所指定规则有误。" -"Yes","是" -"total amount","总数" -"total quantity","总量" diff --git a/app/locale/zh_CN/Mage_Sendfriend.csv b/app/locale/zh_CN/Mage_Sendfriend.csv deleted file mode 100644 index 1e0be61d1..000000000 --- a/app/locale/zh_CN/Mage_Sendfriend.csv +++ /dev/null @@ -1,38 +0,0 @@ -"Add Recipient","添加收件人" -"Allow for Guests","对来宾允许" -"An invalid email address for recipient was entered.","输入的收件人电子邮件地址无效。" -"At least one recipient must be specified.","必须至少指定一个收件人。" -"Back","返回" -"Catalog Product Email to a Friend","将分类产品用邮件发送给朋友" -"Email Address","编辑电子邮件地址" -"Email Address:","电子邮件地址：" -"Email Templates","邮件模板" -"Email to a Friend","给朋友发邮件" -"Email:","电子邮件：" -"Enabled","已启用" -"Invalid Sender Information","无效的发送者信息" -"Invalid sender email.","无效的发送者电子邮件。" -"Limit Sending By","限制发送，通过" -"Max Products Sent in 1 Hour","1 小时内最多产品发送" -"Max Recipients","最大收件人数量" -"Maximum %d email addresses allowed.","最多允许发送 %d封邮件。" -"Message:","信息：" -"Name","姓名" -"Name:","姓名：" -"No more than %d emails can be sent at a time.","一次能发送不超过 %d 封电子邮件。" -"Please define a correct Cookie instance.","请定义正确的 Cookie 实例。" -"Please define a correct Product instance.","请定义正确的产品实例。" -"Please define the correct Sender information.","请定义正确的发送者信息。" -"Recipient:","收件人：" -"Remove Email","删除邮件" -"Select Email Template","选择邮件模板" -"Send Email","发送邮件" -"Send product to a friend","发送产品给朋友" -"Sender:","发送人：" -"Some emails were not sent.","某些邮件未发送" -"The link to a friend was sent.","链接已发送给朋友。" -"The message cannot be empty.","消息不能为空。" -"The messages cannot be sent more than %d times in an hour","一小时内消息不能发送超过%d次。" -"The sender name cannot be empty.","发送人姓名不能为空。" -"There were some problems with the data.","数据有些问题。" -"You have exceeded limit of %d sends in an hour","您已超过一小时内的%d次发送限制。" diff --git a/app/locale/zh_CN/Mage_Shipping.csv b/app/locale/zh_CN/Mage_Shipping.csv deleted file mode 100644 index 01edd9de9..000000000 --- a/app/locale/zh_CN/Mage_Shipping.csv +++ /dev/null @@ -1,93 +0,0 @@ -" for more information or ","欲知详情或" -"# of Items (and above)","# 商品（上述）" -"# of Items vs. Destination","# 商品 vs. 目标" -"Allow Shipping to Multiple Addresses","允许发送到多个地址" -"An error occurred while import table rates.","导入表格费率时遇到了错误。" -"Calculate Handling Fee","计算的手续费" -"Carrier:","运营商：" -"City","城市" -"Close Window","关闭窗口" -"Condition","条件" -"Country","国家" -"Custom Value","自定义值" -"Date","日期" -"Delivered on:","发布于：" -"Delivered to:","发布至：" -"Description","描述" -"Displayed Error Message","显示的错误信息" -"Divide to equal weight (one request)","拆分为相等重量（申请一次）" -"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","重复行 #%s (国家 ""%s"", 地区/州 ""%s"", 邮编 ""%s"" ，以及值 ""%s"")。" -"Enabled","已启用" -"Error:","错误：" -"Export","导出" -"File has not been imported. See the following list of errors: %s","文件并未导入。请查看下列错误列表：%s" -"Fixed","固定" -"Flat Rate","平坦费率" -"Free Shipping","免运费" -"Google Sitemap Section","Google站点结构图区域" -"Handling Fee","处理费" -"Import","导入" -"Include Virtual Products in Price Calculation","计算的价格中包含虚拟产品" -"Info:","信息：" -"Invalid %s ""%s"" in the Row #%s.","行 #%s 存在无效的 %s ""%s""" -"Invalid Country ""%s"" in the Row #%s.","行 #%s 存在无效的国家""%s""。" -"Invalid Region/State ""%s"" in the Row #%s.","行 #%s 存在无效的地区/州 ""%s""。" -"Invalid Shipping Price ""%s"" in the Row #%s.","行 #%s 存在无效的运费 ""%s"" 。" -"Invalid Table Rate code for type %s: %s","类型 %s: %s 的表格费率代码无效" -"Invalid Table Rate code type: %s","类型 %s 的表格费率代码无效" -"Invalid Table Rates File Format","无效的表格费率文件格式" -"Invalid Table Rates format in the Row #%s","行 #%s 存在无效的表费率格式" -"Local Time","本地时间" -"Location","位置" -"Maximum Qty Allowed for Shipping to Multiple Addresses","允许发送到多个地址的最多数量" -"Method Name","方法的名称" -"Minimum Order Amount","最小订单数量" -"N/A","N/A" -"None","无" -"Options","选项" -"Order Subtotal (and above)","订单小计（以上）" -"Origin","原始" -"Per Order","每订单" -"Per Package","每个包裹" -"Percent","百分之" -"Price","价格" -"Price vs. Destination","价格 vs. 目标" -"Region/State","地区/州" -"Service Type:","服务类型：" -"Ship to Applicable Countries","发送到适用的国家" -"Ship to Specific Countries","发送到指定国家" -"Shipment #","送货单号" -"Shipment Tracking Popup","运单追踪弹出窗口" -"Shipped or billed on:","发送或扣款于：" -"Shipping Methods","运送方式" -"Shipping Methods Section","发送方法选择" -"Shipping Settings","发送设置" -"Shipping Settings Section","发送设置区域" -"Show Method if Not Applicable","如果不可用，显示其他方法" -"Signed by:","签名者：" -"Sort Order","排序顺序" -"Status:","状态：" -"Store Pickup","店铺取货" -"Street Address","街道地址" -"Street Address Line 2","街道地址第二行" -"Table Rates","表费率" -"The shipping module is not available for selected delivery country.","针对所选目标国家，发货模块不可用。" -"The shipping module is not available.","运送模块不可用。" -"There is no tracking available for this shipment.","此运送项目无可用的状态追踪。" -"There is no tracking available.","没有可用的追踪。" -"This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","该运送方式当前不可用。如果您要使用该运送方式进行运送，请联系我们。" -"This shipping method is not available, please specify ZIP-code","该运送方式不可用，请指定邮政编码" -"Title","标题" -"Track:","追踪：" -"Tracking Information","追踪信息" -"Tracking Number:","追踪号码：" -"Tracking information is currently not available. Please ","追踪信息当前不可用。请" -"Tracking information is currently unavailable.","追踪信息当前不可用。" -"Type","类型" -"Use origin weight (few requests)","使用原始重量（较少请求）" -"Weight (and above)","重量（和以上）" -"Weight vs. Destination","重量 vs. 目的地" -"Weight:","重量：" -"ZIP/Postal Code","邮政编码" -"contact us","联系我们" -"email us at ","发送电子邮件给我们：" diff --git a/app/locale/zh_CN/Mage_Sitemap.csv b/app/locale/zh_CN/Mage_Sitemap.csv deleted file mode 100644 index df8f71edb..000000000 --- a/app/locale/zh_CN/Mage_Sitemap.csv +++ /dev/null @@ -1,46 +0,0 @@ -"Action","操作" -"Add Sitemap","添加站点结构图" -"Always","总是" -"CMS Pages Options","CMS包选项" -"Categories Options","分类选项" -"Daily","每天" -"Edit Sitemap","编辑站点结构图" -"Enabled","已启用" -"Error Email Recipient","邮件接收有误" -"Error Email Sender","邮件发送有误" -"Error Email Template","邮件模板有误" -"File ""%s"" cannot be saved. Please, make sure the directory ""%s"" is writeable by web server.","文件 ""%s"" 无法保存。请确保目录 ""%s"" 可被Web服务器写入。" -"Filename","文件名" -"Frequency","频率" -"Generate","生成" -"Generation Settings","常规设置" -"Google Sitemap","Google Sitemap" -"Hourly","每小时" -"ID","ID" -"Last Time Generated","上一次生成时间" -"Link for Google","Google的链接" -"Monthly","每月" -"Never","永不" -"New Sitemap","新站点结构图" -"Path","路径" -"Please create the specified folder ""%s"" before saving the sitemap.","保存站点结构图之前，请创建指定的文件夹 ""%s""。" -"Please define correct path","请定义正确的路径" -"Please make sure that ""%s"" is writable by web-server.","请确保Web服务器可写入 ""%s""。" -"Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.","在文件名中请只使用字母（a-z或A-Z）、数字（0-9），或下划线（_）。不允许使用空格或其他字符。" -"Priority","优先级" -"Products Options","产品选项" -"Sitemap","站点结构图" -"Sitemap generate Warnings","站点结构图生成警报" -"Start Time","开始时间" -"Store View","店铺视图" -"The priority must be between 0 and 1.","优先级必须介于0和1之间。" -"The sitemap ""%s"" has been generated.","站点结构图 “%s”已生成。" -"The sitemap has been deleted.","站点结构图已被删除。" -"The sitemap has been saved.","站点结构图已保存。" -"This sitemap no longer exists.","站点结构图不存在。" -"Unable to find a sitemap to delete.","无法找到要删除的站点结构图。" -"Unable to find a sitemap to generate.","无法找到生成的站点结构图。" -"Unable to generate the sitemap.","无法生成站点结构图。" -"Valid values range: from 0.0 to 1.0.","有效的值范围：从0.0到1.0。" -"Weekly","每周" -"Yearly","每年" diff --git a/app/locale/zh_CN/Mage_Tag.csv b/app/locale/zh_CN/Mage_Tag.csv deleted file mode 100644 index 31cad179f..000000000 --- a/app/locale/zh_CN/Mage_Tag.csv +++ /dev/null @@ -1,101 +0,0 @@ -"# of Uses","用户数" -"%s tag(s) have been accepted for moderation.","%s 个标签已经被管理员采纳。" -"Tag Name: %s","标签名称： %s" -"Action","操作" -"Add","添加" -"Add New Tag","添加新标签" -"Add Tags","添加标签" -"Add Your Tags:","添加您的标签：" -"Add tag(s) to product","为产品添加标签" -"Add to Cart","添加到购物车" -"Add to Wishlist","添加到收藏" -"All Tags","所有标签" -"Approved","已批准" -"Are you sure you want to delete this tag?","您是否确认要删除该标签？" -"Are you sure you want to do this?","您是否确认要这样做？" -"Are you sure?","您是否确认？" -"Back","返回" -"Back to Tags List","返回标签列表" -"Base Popularity","基本流行度" -"Block Information","块信息" -"CSV","CSV" -"Catalog Product View","分类产品视图" -"Change status","更改状态" -"Click on a tag to view your corresponding products.","点击标签查看您对应的产品。" -"Country","国家" -"Customer My Account My Tags List","客户我的帐户我的标签列表" -"Customer My Account Tag View","客户我的帐户标签视图" -"Customer Since","客户加入日期" -"Customers","客户" -"Customers Submitted this Tag","客户提交的该标签" -"Customers Tagged '%s'","客户标记为 '%s'" -"Delete","删除" -"Delete Tag","删除标签" -"Disabled","已禁用" -"Edit Tag '%s'","编辑标签 '%s'" -"Email","电子邮件" -"First Name","名字" -"General Information","常规信息" -"Grid","网格" -"ID","ID" -"Info","信息" -"Last Name","姓氏" -"List","列表" -"Manage Tags","管理标签" -"My Recent Tags","我最近的标签" -"My Tags","我的标签" -"Name","姓名" -"New Tag","新标签" -"No matches found.","未找到匹配内容。" -"Other people marked this product with these tags:","其他人对该产品使用了下列标签：" -"Pending","挂起" -"Pending Tags","挂起的标记" -"Popular","流行" -"Popular Tags","热门标签" -"Price","价格" -"Product Name","产品名" -"Product SKU","产品SKU" -"Product Tag API","产品标签 API" -"Product Tags","产品标签" -"Products","产品" -"Products Tagged by Administrators","管理员为产品添加的标签" -"Products Tagged by Customers","客户为产品添加的标签" -"Products Tagged with '%s'","使用 '%s' 作为标签的产品" -"Products tagged with '%s'","使用 '%s' 作为标签的产品" -"Rebuild Tag aggregation data","重建标签聚合数据" -"Remove","删除" -"Remove product tag","删除产品标签" -"Retrieve list of tags by product","按产品获取标签列表" -"Retrieve product tag info","获取产品标签信息" -"SKU","SKU" -"Save Tag","保存标签" -"Save and Continue Edit","保存并继续编辑" -"Status","状态" -"Store View","店铺视图" -"Tag","标签" -"Tag ""%s"" has already been added to the product.","标签 ""%s"" 已被添加给该产品。" -"Tag ""%s"" has been added to the product.","标签 ""%s"" 已被添加给该产品。" -"Tag ""%s"" has been rejected by administrator.","标签 ""%s"" 已被管理员拒绝。" -"Tag Aggregation Data","标签聚合数据" -"Tag Name","标签名称" -"Tagged Products List","带标签的产品列表" -"Tags","标签" -"Tags List (All Available)","标签列表（所有可用内容）" -"Tags List Before","标签列表之前" -"Tags:","标签：" -"Telephone","电话" -"The tag has been deleted.","标签已被删除。" -"There are no tags available.","没有可用标签。" -"Unable to find any products tagged with '%s' in the current store","当前店铺内无法找到任何带有 '%s' 标签的产品" -"Unable to remove tag. Please, try again later.","无法删除标签。请稍候重试。" -"Unable to save tag(s).","无法保存标签。" -"Update","更新" -"Update product tag","更新产品标签" -"Use spaces to separate tags. Use single quotes (') for phrases.","使用空格分隔标签。使用单引号（'）标注词组。" -"View All Tags","查看所有标签" -"View Customers","查看客户" -"View Products","查看产品" -"XML","XML" -"You have not tagged any products yet.","您尚未为任何产品添加标签。" -"ZIP/Post Code","邮政编码" -"[STORE VIEW]","[店铺视图]" diff --git a/app/locale/zh_CN/Mage_Tax.csv b/app/locale/zh_CN/Mage_Tax.csv deleted file mode 100644 index 160ab9254..000000000 --- a/app/locale/zh_CN/Mage_Tax.csv +++ /dev/null @@ -1,163 +0,0 @@ -"'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.","'*' - 匹配任意； 'xyz*' - 匹配以 'xyz' 开头且不长于 %d。" -"-- Please Select --","-- 请选择 --" -"Add New Class","添加新类" -"Add New Tax Rate","添加新税率" -"Add New Tax Rule","添加新税率规则" -"After Discount","折扣后" -"An error occurred while deleting this rate.","删除该税率时出现了错误。" -"An error occurred while deleting this rate. Incorrect rate ID.","删除该费率时出现了错误。错误的费率ID。" -"An error occurred while deleting this tax class.","删除该税务类型时出现了错误。" -"An error occurred while deleting this tax rule.","删除该税务规则时出现了错误。" -"An error occurred while saving this tax class.","保存该税务类别时出现了错误。" -"An error occurred while saving this tax class. A class with the same name","保存该税金类别时出错。已有类别使用该名称" -"Apply Customer Tax","应用客户税" -"Apply Discount On Prices","在价格上应用折扣" -"Apply Tax On","将税应用于" -"Apply discount on price including tax is calculated based on store tax, if ""Apply Tax after Discount"" is selected.","如果选中”折后应用税率“，则在含税价格上应用折扣会根据店铺税率计算。" -"Are you sure you want to do this?","您是否确认要这样做？" -"Back","返回" -"Before Discount","折前" -"CSV","CSV" -"Calculate off subtotal only","仅计算小计" -"Calculation Settings","计算设置" -"Catalog Prices","分类价格" -"Class Name","类型名称" -"Click here to go to Tax configuration and change your settings.","单击这里前往税费配置并更改您的设置。" -"Code","代码" -"Country","国家" -"Custom price if available","可用时的自定义价格" -"Customer Tax Class","客户税务类型" -"Customer Tax Class Information","自定义税费类别信息" -"Customer Tax Classes","客户税率" -"Default Country","默认国家" -"Default Post Code","默认发布代码" -"Default State","默认州" -"Default Tax Destination Calculation","默认税额计算" -"Delete Class","删除类" -"Delete Rate","删除费率" -"Delete Rule","删除规则" -"Display Full Tax Summary","显示完整文字摘要" -"Display Prices","显示价格" -"Display Product Prices In Catalog","在分类中显示产品价格" -"Display Shipping Amount","显示运送量" -"Display Shipping Prices","显示运费" -"Display Subtotal","显示小计" -"Display Zero Tax Subtotal","显示零税额小计" -"Edit Class","编辑类" -"Edit Class '%s'","编辑类 '%s'" -"Edit Rule","修改规则" -"Edit Tax Rate","编辑税率" -"Enable Cross Border Trade","启用跨境交易" -"Excel XML","Excel XML" -"Excl. Tax","不含税" -"Excl. Tax:","不含税：" -"Excluding Tax","不含税" -"Export Tax Rates","导出税率" -"Grand Total (Excl. Tax)","合计（不含税）" -"Grand Total (Excl.Tax)","合计（不含税）" -"Grand Total (Incl. Tax)","合计（含税）" -"Grand Total (Incl.Tax)","合计（含税）" -"Grand Total Excl. Tax","合计不含税" -"Grand Total Incl. Tax","合计含税" -"Ignore this notification","忽略此通知" -"Import / Export Tax Rates","导入/导出税率" -"Import Tax Rates","导入税率" -"Inc. Tax","含税" -"Incl. Tax","含税" -"Incl. Tax:","含税：" -"Include Tax In Grand Total","在合计中含税" -"Including Tax","含税" -"Including and Excluding Tax","包含和不包含税" -"Invalid file format upload attempt","文件格式无效的上传企图" -"Invalid file upload attempt","文件无效的上传企图" -"Manage Customer Tax Classes","管理客户税类" -"Manage Product Tax Classes","管理产品税类" -"Manage Tax Rates","管理税率" -"Manage Tax Rules","管理税务规则" -"Manage Tax Zones & Rates","管理税务地区和税率" -"Maximum zip code length is 9.","邮编最大长度为 9。" -"Name","姓名" -"New Class","新类" -"New Rule","新规则" -"New Tax Rate","新税率" -"No","否" -"None","无" -"One of the country has invalid code.","其中一个国家代码无效。" -"Orders, Invoices, Credit Memos Display Settings","订单、收据、信用记录显示设置" -"Original price only","仅原价" -"Please fill all required fields with valid information.","请使用有效信息填写所有必需字段。" -"Please see source for more details.","请查看源了解更多详情。" -"Price Display Settings","价格显示设置" -"Priority","优先级" -"Product Tax Class","产品税务类型" -"Product Tax Class Information","产品税费类别信息" -"Product Tax Classes","产品税率" -"Range From","范围从" -"Range To","范围到" -"Range To should be equal or greater than Range From.","“范围至”数值应当等于或大于“范围自”数值。" -"Rate","费率" -"Rate Percent","税率百分率" -"Rate Percent should be a positive number.","百分比应该为正数。" -"Reset","重置状态" -"Row Total","总行数" -"Sales","销售" -"Save Class","保存类" -"Save Rate","保存税率" -"Save Rule","保存规则" -"Save and Continue Edit","保存并继续编辑" -"Shipping & Handling (Excl.Tax)","运费和手续费（不含税）" -"Shipping & Handling (Incl.Tax)","运费和手续费（含税）" -"Shipping & Handling Tax","处理、运送及税金费用" -"Shipping (Excl. Tax)","运费（不含税）" -"Shipping (Incl. Tax)","运费（含税）" -"Shipping Excl. Tax (%s)","运费不含税（%s）" -"Shipping Incl. Tax (%s)","运费含税（%s）" -"Shipping Prices","运费" -"Shopping Cart Display Settings","购物车显示设置" -"Sort Order","排序顺序" -"State","州" -"State/Region","州/地区" -"Subtotal (Excl. Tax)","小计（不含税）" -"Subtotal (Excl.Tax)","小计（不含税）" -"Subtotal (Incl. Tax)","小计（含税）" -"Subtotal (Incl.Tax)","小计（含税）" -"Subtotal only","仅小计" -"Tax","传真" -"Tax Calculation Based On","税金的计算基于" -"Tax Calculation Method Based On","税金的计算方法基于" -"Tax Class for Shipping","运费的税类" -"Tax Classes","税类" -"Tax Identifier","税务识别符" -"Tax Rate","税率" -"Tax Rate Information","税率信息" -"Tax Rule Information","税务规则信息" -"Tax Rules","税务规则" -"Tax Section","纳税项" -"Tax Titles","税务标题" -"Tax rate cannot be removed. It exists in tax rule","税率不能被删除。它存在于税务规则中。" -"Tax rates at the same priority are added, others are compounded.","同一优先级的税率已被添加，其它的是集合的。" -"The tax class has been deleted.","该税务类型已被删除。" -"The tax class has been saved.","该税务类型已保存。" -"The tax rate has been deleted.","该税率已被删除。" -"The tax rate has been imported.","该税率已被导入。" -"The tax rate has been saved.","该税率已保存。" -"The tax rule has been deleted.","该税务规则已被删除。" -"This class no longer exists","此类型不再存在。" -"This rule no longer exists","该规则不存在。" -"This rule no longer exists.","该规则已不存在。" -"Total","总数" -"Unit Price","单价" -"Warning tax configuration can result in rounding errors","警告：税费配置可能会导致舍入误差的问题" -"Warning tax configuration can result in unexpected FPT prices on applicable devices","Warning tax configuration can result in unexpected FPT prices on applicable devices" -"Warning tax discount configuration might result in different discounts than a customer might expect","警告：税费优惠配置，可能会导致与客户所期望的折扣不相同的问题" -"When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","当目录价格含税时，启用此设置将固定此价格，不论客户的税率是多少。" -"Whether catalog prices entered by admin include tax.","任何目录价格包括税，都由管理员输入。" -"Whether shipping amounts entered by admin or obtained from gateways include tax.","任何销售金额包含税，都由管理员输入或从网关获取。" -"Yes","是" -"You cannot delete this tax class as it is used for %d customer groups.","无法删除此税务类型，它使用于％d个客户组中。" -"You cannot delete this tax class as it is used for %d products.","无法删除此税务类型，它使用于%d个产品中。" -"You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","无法删除此税务类型，它在税务规则中被使用。若要删除请先删除对应的规则。" -"Zip code should not contain characters other than digits.","邮政编码不可包含除数字外的其他字符。" -"Zip/Post Code","邮政编码" -"Zip/Post is Range","邮编范围" -"for store(s)","用于商店" diff --git a/app/locale/zh_CN/Mage_Usa.csv b/app/locale/zh_CN/Mage_Usa.csv deleted file mode 100644 index 0e2d64c4d..000000000 --- a/app/locale/zh_CN/Mage_Usa.csv +++ /dev/null @@ -1,381 +0,0 @@ -" was not delivered nor scanned","尚未发布或扫描" -"""Per Order"" allows single handling fee for entire order. ""Per Package"" allows individual handling fee for each package.","“预定”可以让整个订单只收取一笔处理费用。“每包裹”需要为每个包裹收取处理费用。" -"1 Day Freight","1天送达" -"2 Day","2天" -"2 Day AM","二日早间" -"2 Day Freight","2天送达" -"2Day","2天" -"2nd Day Air","2天航空" -"2nd Day Air AM","第二天航空朝至" -"2nd Day Air AM Letter","第二天航空朝至信件" -"2nd Day Air Letter","第二天航空信件" -"3 Day Freight","3天送达" -"3 Day Select","3天选择" -"Access ID","访问ID" -"Access License Number","访问许可编号" -"Account ID","帐户ID" -"Account Number","帐户号码" -"Additional Protection Configuration Value","额外的保护已启用" -"Additional Protection Enabled","额外的保护已启用" -"Additional Protection Min Subtotal","额外的保护减去小计" -"Additional Protection Value","额外保护的价值" -"Additional Protection Value Rounding Method","额外保护价值凑整方法" -"Adult","成人" -"Adult Signature Required","需要核对签名" -"Allowed Methods","允许的方式" -"Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges.","为确保准确估算运费，可将重量超过 %s %s 的包裹拆分为多个小件。" -"Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","为确保准确估算运费，总重量超过 70kg 的包裹将拆分为多个小件。" -"Bound Printed Matter","有封面的印刷品" -"Break bulk economy","经济式拆分" -"Break bulk express","快速式拆分" -"Business Service Center","商业服务中心" -"Calculate Handling Fee","计算的手续费" -"Canada Standard","加拿大标准" -"Cannot identify measure unit for %s","无法确认 %s 的度量单位" -"Cannot identify weight unit for %s","无法确认 %s 的重量单位" -"Cannot retrieve shipping rates","无法获取运费" -"Centimeters","厘米" -"Commercial","商业" -"Configuration","配置" -"Container","容器" -"Content Type","内容类型" -"Customer Packaging","客户自取" -"Customer Supplied Package","客户提供包裹" -"Customer services","客户服务" -"DHL","DHL" -"DHL (Deprecated)","DHL（不赞成）" -"DHL service is not available at %s date","DHL service is not available at %s date" -"Debug","调试" -"Default Package Height","默认包裹高度" -"Default Package Length","默认包裹长度" -"Default Package Width","默认包裹宽度" -"Delivered","已交付" -"Delivery Confirmation","交付确认" -"Depth","深度" -"Destination Type","目的地类型" -"Destination facility code is empty","目的地代码为空" -"Development","开发" -"Direct","直接" -"Displayed Error Message","显示的错误信息" -"Divide Order Weight","拆分订单重量" -"Documents","文档" -"Domestic Shipment Days","国内运送天数" -"Domestic economy select","选择经济型" -"Domestic express","选择快速型" -"Drop Box","取件箱" -"Dropoff","自取" -"Easy shop","轻松购物" -"Economy select","选择经济的" -"Empty response","无需应答" -"Enable Negotiated Rates","启用协商费率" -"Enabled for Checkout","为付款启用" -"Enables/Disables SSL verification of Magento server by UPS.","启用/禁用UPS对Magento服务器的SSL验证。" -"Error #%s : %s","错误 #%s : %s" -"Error #%s : %s (%s)","错误 #%s : %s (%s)" -"Error #%s: %s","错误 #%s: %s" -"Europack","欧洲" -"Europe First Priority","欧洲优先" -"Exchange rate %s (Base Currency) -> %s not found. DHL method %s skipped","费率 %s (基本货币) -> %s 未找到。DHL 方法 %s 被跳过" -"Express","快速" -"Express 10:30","快速 10:30" -"Express 10:30 AM","快速早10:30" -"Express 12:00","快速 12:00" -"Express 9:00","快速 9:00" -"Express Mail","快速邮件" -"Express Saturday","快速周六" -"Express Saver","快速经济" -"Express easy","快速简单" -"Express envelope","快速信封" -"Express worldwide","快速全球" -"Failed to parse xml document: %s","解析xml文档 %s 出错" -"FedEx","FedEx" -"FedEx 10kg Box","FedEx 10公斤箱子" -"FedEx 25kg Box","DefEx 25公斤箱子" -"FedEx Box","FedEx 箱子" -"FedEx Envelope","FedEx信封" -"FedEx Pak","FedEx 聚酯包装" -"FedEx Tube","FedEx 包装管" -"First Overnight","次日达" -"First-Class","一类" -"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope" -"First-Class Mail International Letter","First-Class Mail International Letter" -"First-Class Mail International Postcard","First-Class Mail International Postcard" -"First-Class Mail Large Envelope","First-Class Mail Large Envelope" -"First-Class Mail Large Postcards","First-Class Mail Large Postcards" -"First-Class Mail Letter","First-Class Mail Letter" -"First-Class Mail Parcel","First-Class Mail Parcel" -"First-Class Mail Postcards","First-Class Mail Postcards" -"First-Class Package International Service","First-Class Package International Service" -"First-Class Package Service","First-Class Package Service" -"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup" -"Flat","平坦" -"Flat-Rate Box","平纸箱" -"Flat-Rate Envelope","平信封" -"Free Method","免费方法" -"Free Shipping with Minimum Order Amount","有最小订单数量要求的免费送货" -"Freight","送达" -"Freight worldwide","直飞全球" -"Gateway URL","网关 URL" -"Gateway XML URL","网关 XML URL" -"Gift","礼品" -"Girth","周长" -"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)" -"Global Express Guaranteed Document","Global Express Guaranteed Document" -"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular" -"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular" -"Globalmail business","全球邮寄业务" -"Ground","地面" -"Ground Commercial","地面运送" -"Ground Residential","地面住宅" -"Handling Applied","需要的处理" -"Handling Fee","处理费" -"Height","高度" -"Height, width and length should be equal or greater than %s","高度、宽度，及长度必须等于或大于 %s" -"Home Delivery","家庭运送" -"Hub ID","中枢 ID" -"Inches","英寸" -"Indirect","非直接" -"International Economy","国际经济型" -"International Express","国际快速型" -"International First","国际优先" -"International Ground","国际陆云" -"International Priority","国际优先" -"International Shipment Days","国际送货日" -"Intl Economy Freight","国际经济达" -"Intl Priority Freight","国际优先达" -"Jetline","Jetline" -"Jumbo box","Jumbo 箱" -"Key","密钥" -"Kilograms","千克" -"Large","大型" -"Large Express Box","大型快递箱" -"Length","长度" -"Letter","信件" -"Library","图书馆" -"Library Mail","Library Mail" -"Live","动态" -"Machinable","可加工" -"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","最大包裹重量（可支持的最大包裹重量请咨询您的物流公司）" -"Media Mail","媒体邮件" -"Medical express","医疗快速" -"Medium Express Box","中等快递箱" -"Merchandise","商品" -"Meter Number","仪表编号" -"Minimum Order Amount for Free Shipping","免费货运的最小订单量" -"Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)","最小包裹重量（可支持的最小包裹重量请咨询您的物流公司）" -"Mode","模式" -"National Freight","全国达" -"Next Afternoon","第二天下午" -"Next Day Air","下一日空运" -"Next Day Air Early AM","下一日空运朝至" -"Next Day Air Early AM Letter","下一日空运朝至信件" -"Next Day Air Intra (Puerto Rico)","下一日空运（波多黎各）" -"Next Day Air Letter","下一日空运信件" -"Next Day Air Saver","下一日空运节约型" -"Next Day Air Saver Letter","下一日空运节约型信件" -"No","否" -"No packages for request","无所请求的包裹" -"Non Documents","无文档" -"Non documents","无文档" -"Non-rectangular","非矩形" -"None","无" -"Not Required","非必须" -"Order","订单" -"Order #%s","订单# %s" -"Origin of the Shipment","始发运送" -"Origin serviceAreaCode is missing","来源服务区域代码丢失" -"Other","其它" -"Others","其他" -"PAK","PAK" -"Package","包裹" -"Package Description","包裹描述" -"Package content is missing","包装内容丢失" -"Packages Request Type","包裹请求类型" -"Packaging","打包" -"Pallet","托盘" -"Parcel","小包" -"Parcel Post","邮政包裹" -"Password","密码" -"Pickup Method","取货方法" -"Piece Id barcode is missing","价格 ID 条码丢失" -"Piece number information is missing","价格数字信息丢失" -"Please make sure to use only digits here. No dashes are allowed.","请在这里只使用数字，不能使用横线。" -"Please, specify origin country","请指定原产国" -"Pounds","磅" -"Priority Mail","优先邮件" -"Priority Mail Express","Priority Mail Express" -"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes" -"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup" -"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope" -"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup" -"Priority Mail Express International","Priority Mail Express International" -"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes" -"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope" -"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope" -"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope" -"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope" -"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope" -"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup" -"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery" -"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes" -"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope" -"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope" -"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope" -"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope" -"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup" -"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope" -"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup" -"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup" -"Priority Mail International","Priority Mail International" -"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box" -"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope" -"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope" -"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box" -"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box" -"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope" -"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box" -"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope" -"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box" -"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope" -"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope" -"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box" -"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup" -"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope" -"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup" -"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box" -"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup" -"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope" -"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup" -"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A" -"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup" -"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B" -"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup" -"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C" -"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup" -"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box" -"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup" -"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope" -"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup" -"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope" -"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup" -"Priority Overnight","第二天优先" -"Product content code is invalid","产品内容代码无效" -"Product name is missing","产品名称丢失" -"Receiver","收件人" -"Rectangular","矩形" -"Reference code is missing","参考代码丢失" -"Regular","常规" -"Regular Pickup","常规取件" -"Request Courier","需要快递员" -"Required","必须" -"Required for negotiated rates; 6-character UPS.","费率需协商，6字符 UPS。" -"Residential","住宅" -"Residential Delivery","住宅送货" -"Response is in the wrong format","响应的格式有误" -"Return","退货" -"Round","周围" -"Routing barcode is missing","流转条码丢失" -"Same day","当天" -"Sample","范例" -"Sandbox Mode","沙箱模式" -"Second Day Service","第二日服务" -"Secure Gateway URL","安全网关URL" -"Secureline","安全线" -"Sender","发送方" -"Sender city info is missing","发送方城市信息丢失" -"Sender contact name is missing","发送方联系人姓名丢失" -"Sender country info is missing","发送方国家信息丢失" -"Service type does not match","服务类型不匹配" -"Ship to Applicable Countries","发送到适用的国家" -"Ship to Specific Countries","发送到指定国家" -"Shipment Contains Hazardous Materials","运单包含危险物品" -"Shipment Dutiable","运单应纳税" -"Shipment Duty Payment Type","运单税务支付类型" -"Shipment Type","运送类型" -"Shipment is not available.","运送不可用。" -"Shipment picked up","运单取件" -"Shipper Number","运单号" -"Shipping Accept XML URL","运送接受 XML URL" -"Shipping Confirm XML URL","运送确认 XML URL" -"Shipping Key","运单密钥" -"Shipping Key (International)","运单密钥（国际）" -"Show Method if Not Applicable","如果不可用，显示其他方法" -"Signature Required","需要签名" -"Size","尺寸" -"Small Express Box","快递小箱" -"Smart Post","智能发布" -"Sort Order","排序顺序" -"Specific","指定" -"Sprintline","Sprintline" -"Standard Overnight","标准次日" -"Standard Post","标准发布" -"Station","站台" -"Subtotal","小计" -"Subtotal With Discount","不含折扣小计" -"The field is applicable if the Smart Post method is selected.","如果“智能发布”方法已选择，则此字段可用。" -"The response is in wrong format.","响应格式有误。" -"There is no available method for selected shipping address.","所选运送地址没有可用运送方法。" -"There is no items in this order","该订单不包含商品" -"Third Party","第三方" -"Title","标题" -"To Lower","要降低" -"To Upper","要升高" -"Tracking XML URL","追踪XML URL" -"UPS","UPS" -"UPS Expedited","UPS加快" -"UPS Express","UPS快速" -"UPS Express Box","UPS快件箱" -"UPS Express Early A.M.","UPS快速朝至" -"UPS Express Plus","UPS快速加急" -"UPS Ground","UPS陆运" -"UPS Letter Envelope","UPS信封" -"UPS Next Day Air","UPS次日空运" -"UPS Next Day Air Early A.M.","UPS次日空运朝至" -"UPS Next Day Air Saver","UPS次日空运节约型" -"UPS Saver","UPS节约型" -"UPS Second Day Air","UPS次日空运" -"UPS Second Day Air A.M.","UPS次日空运朝至" -"UPS Standard","UPS标准型" -"UPS Three-Day Select","UPS第三天选择" -"UPS Today Dedicated Courrier","UPS当天专运" -"UPS Today Express","UPS当天快速" -"UPS Today Express Saver","UPS当天快速节约型" -"UPS Today Intercity","UPS当天城际" -"UPS Today Standard","UPS当天标准型" -"UPS Tube","UPS包装管" -"UPS Type","UPS类型" -"UPS Worldwide 10 kilo","UPS全球10公斤" -"UPS Worldwide 25 kilo","UPS全球25公斤" -"UPS Worldwide Expedited","UPS全球专运" -"UPS Worldwide Express","UPS全球快速" -"UPS Worldwide Express Plus","UPS全球快速加急" -"UPS Worldwide Express PlusSM","UPS全球快速加急SM" -"UPS Worldwide Saver","UPS Worldwide Saver" -"USPS","USPS" -"USPS GXG Envelopes","USPS GXG Envelopes" -"Unable to retrieve tracking","无法获取追踪" -"United Parcel Service","美国联合包裹服务" -"United Parcel Service XML","美国联合包裹服务XML" -"Unknown error","未知错误" -"Used only when ""Additional Protection Value"" is set to ""Configuration"". Can contain only numeric amount.","只有在“额外保护价值”被设置为“配置”时使用。只能包含数额。" -"User ID","用户ID" -"Variable","变量" -"Waybill barcode information is missing","Waybill 条码信息丢失" -"Weight Unit","重量单位" -"Weight unit is invalid","重量单位无效" -"Width","宽" -"Worldwide Expedited","全球专递" -"Worldwide Express","全球快速" -"Worldwide Express Letter","全球快速信件" -"Worldwide Express Plus","全球快速加急" -"Worldwide Express Plus Letter","全球快速加急信件" -"Worldwide Express Saver","全球快速节约型" -"Wrong Content Type.","内容类型有误。" -"Wrong Region.","地区有误。" -"Yes","是" -"Your Packaging","您的包裹" -"Zero shipping charge for '%s'","'%s' 免运费" -"cm","厘米" -"inch","英寸" diff --git a/app/locale/zh_CN/Mage_Weee.csv b/app/locale/zh_CN/Mage_Weee.csv deleted file mode 100644 index 97835fa4e..000000000 --- a/app/locale/zh_CN/Mage_Weee.csv +++ /dev/null @@ -1,25 +0,0 @@ -"All Websites","所有网站" -"Apply Discounts To FPT","应用折扣到 FPT" -"Apply Tax To FPT","应用税费到 FPT" -"Display Prices In Emails","在电子邮件专用显示价格" -"Display Prices In Product Lists","在产品列表中显示价格" -"Display Prices In Sales Modules","在销售模块中显示价格" -"Display Prices On Product View Page","在产品查看页面中显示价格" -"Enable FPT","启用 FPT" -"Excluding FPT","不包含 FPT" -"Excluding FPT, FPT description, final price","不包含 FPT，FPT 描述，最终价格" -"FPT Tax Configuration","FPT Tax Configuration" -"Fixed Product Tax","固定产品税费" -"Fixed Product Taxes","固定产品税费" -"Include FPT In Subtotal","在小计中包含 FPT" -"Including FPT and FPT description","包含 FPT 和 FPT 描述" -"Including FPT and FPT description [incl. FPT VAT]","包含 FPT 和 FPT 描述 [包含 FPT VAT]" -"Including FPT only","仅包含 FPT" -"Loaded and Displayed with Tax","Loaded and Displayed with Tax" -"Not Taxed","Not Taxed" -"Taxed","Taxed" -"Total","总数" -"Total Incl. Tax","含税总计" -"Total excl. tax","税后总额" -"Total incl. tax","总价含税" -"Total:","总数：" diff --git a/app/locale/zh_CN/Mage_Widget.csv b/app/locale/zh_CN/Mage_Widget.csv deleted file mode 100644 index 56fb2b7ba..000000000 --- a/app/locale/zh_CN/Mage_Widget.csv +++ /dev/null @@ -1,75 +0,0 @@ -"%s","%s" -"-- Please Select --","-- 请选择 --" -"Actions","操作" -"Add Layout Update","添加布局更新" -"Add New Widget Instance","添加新小工具实例" -"All","全部" -"All Pages","所有页面" -"All Product Types","所有产品类型" -"An error occurred during saving a widget: %s","保存小工具 %s 时出错。" -"Anchor Categories","锚点分类" -"Apply","应用" -"Assign to Store Views","分配到店铺视图" -"Big Image","大图片" -"Block Reference","块引用" -"CMS","CMS" -"Categories","分类" -"Choose...","选择..." -"Close","关闭" -"Continue","继续" -"Default Template","默认模板" -"Delete","删除" -"Design Package/Theme","设计 包裹/主题" -"Export to:","导出到：" -"Frontend Properties","前端属性" -"Generic Pages","通用页面" -"Images","图像" -"Insert Widget","插入小工具" -"Insert Widget...","插入小工具..." -"Layout Updates","布局更新" -"Manage Widget Instances","管理小工具实例" -"New Instance","新实例" -"New Widget Instance","新小工具实例" -"Next page","下一页" -"Non-Anchor Categories","非锚点分类" -"Not Selected","非所选" -"Open Chooser","打开选择器" -"Page","页面" -"Please Select Block Reference First","请首先选择块引用" -"Previous page","上一页" -"Products","产品" -"Remove Layout Update","删除布局更新" -"Save and Continue Edit","保存并继续编辑" -"Select All","全选" -"Select Visible","选择可见性" -"Settings","设置" -"Sort Order","排序顺序" -"Sort Order of widget instances in the same block reference","用相同的块应用对订单的小工具实例进行排序" -"Specific %s","指定的 %s" -"Specified Page","指定的页面" -"Template","模板" -"The information in this tab has been changed.","该选项卡中的信息已变更。" -"The widget instance has been deleted.","该小工具实例已被删除。" -"The widget instance has been saved.","该小工具实例已被保存。" -"This tab contains invalid data. Please solve the problem before saving.","该选项卡包含无效数据。请在保存前解决问题。" -"Thumbnail","缩略图" -"Total %d records found","共找到 %s条记录" -"Type","类型" -"Unselect All","全部反选" -"Unselect Visible","反选可见性" -"View","查看" -"Widget","小工具" -"Widget ""%s""","小工具 ""%s""" -"Widget ID","小工具ID" -"Widget Insertion","小工具插入" -"Widget Instance","小工具实例" -"Widget Instance Title","小工具实例标题" -"Widget Options","小工具选项" -"Widget Type","小工具类型" -"Widget Type is not specified","小工具类型未指定" -"Widget instance is not full complete to create.","小工具实例并未完全创建。" -"Widgets","小工具" -"Wrong widget instance specified.","指定的小工具实例有误。" -"items selected","以选项" -"of %s pages","共 %s 页" -"per page","每页" diff --git a/app/locale/zh_CN/Mage_Wishlist.csv b/app/locale/zh_CN/Mage_Wishlist.csv deleted file mode 100644 index d9bc658ab..000000000 --- a/app/locale/zh_CN/Mage_Wishlist.csv +++ /dev/null @@ -1,100 +0,0 @@ -"%1$s has been updated in your wishlist.","%1$s 已在您的愿望清单中更新。" -"%d product(s) have been added to shopping cart: %s.","%d 个产品已添加到购物车：%s。" -"%s for ""%s"".","%s 对 “%s”。" -"%s has been moved to wishlist %s","%s 已被移动到愿望清单 %s" -"%s's Wishlist","%s 的愿望清单" -"* Required Fields","*必要字段" -"Add All to Cart","全部添加到购物车" -"Add to Cart","添加到购物车" -"Add to Compare","添加并比较" -"Add to Wishlist","添加到收藏" -"Added From","已添加，来自" -"An error occurred while adding item to wishlist.","当添加项目到愿望清单时发生错误。" -"An error occurred while adding item to wishlist: %s","当添加项目到愿望清单 %s 时发生错误" -"An error occurred while deleting the item from wishlist.","当从愿望清单删除项目时发生错误。" -"An error occurred while deleting the item from wishlist: %s","当从愿望清单 %s 删除项目时发生错误" -"An error occurred while updating wishlist.","更新愿望清单时发生错误。" -"Are you sure you want to remove this product from your wishlist?","您是否确认要从愿望清单中删除该产品？" -"Are you sure you would like to remove this item from the wishlist?","您确认要从愿望清单中删除该项目？" -"Back","返回" -"Can\'t delete item from wishlist","无法从愿望清单中删除项目" -"Can\'t save description %s","无法保存描述 %s" -"Can\'t update wishlist","无法更新愿望清单" -"Cannot add item to shopping cart","无法添加内容到购物车" -"Cannot add the following product(s) to shopping cart: %s.","无法将下列产品添加到购物车：%s。" -"Cannot add the item to shopping cart.","无法添加该项目到购物车。" -"Cannot configure product","无法配置产品" -"Cannot load wishlist item","无法加载愿望清单内容" -"Cannot move item to wishlist","无法将内容添加到愿望清单" -"Cannot specify product.","无法指定产品。" -"Cannot specify wishlist item.","无法指定愿望清单内容" -"Cannot specify wishlist.","无法指定愿望清单。" -"Cannot update wishlist","无法更新愿望清单" -"Check this checkbox if you want to add a link to an rss feed to your wishlist.","如果希望将到RSS源的链接添加到您的愿望清单，就选中该选项。" -"Click for price","单击获取价格" -"Comment","评论" -"Comment:","评论：" -"Configure Wishlist Item","配置愿望清单内容" -"Configured Price:","配置价格：" -"Could not find such wishlist","找不到该愿望清单" -"Could not find wishlist","找不到愿望清单" -"Customer My Account My Wishlist","客户我的帐户我的愿望清单" -"Customer My Account Wishlist Sharing Form","客户我的帐户愿望清单共享表单" -"Customer Shared Wishlist View","客户共享愿望清单视图" -"Date Added","添加日期" -"Days in Wishlist","位于愿望清单的天数" -"Display Wishlist Summary","显示愿望清单摘要" -"Edit","编辑" -"Email Sender","电子邮件发送人" -"Email Template","电子邮件模板" -"Email address can\'t be empty.","邮件地址不能为空。" -"Email addresses, separated by commas","邮件地址，使用逗号分隔" -"Enabled","已启用" -"General Options","常规选项" -"Go to Wishlist","转到愿望清单" -"Helper for wishlist options rendering doesn't implement required interface.","愿望清单选项渲染助手没有实施必要的界面。" -"In stock","现货" -"Last Added Items","最后添加的内容" -"Message","信息" -"My Wishlist","我的收藏" -"My Wishlist (%d item)","我的愿望清单（%d 件商品）" -"My Wishlist (%d items)","我的愿望清单 （%d 件商品）" -"My Wishlist (%d)","我的愿望清单(%d)" -"My Wishlist Link","我的愿望清单链接" -"Options Details","选项详情" -"Out of stock","缺货" -"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","请输入有效电子邮件地址，并使用逗号分隔。例如johndoe@domain.com, johnsmith@domain.com" -"Please input a valid email address.","请输入有效电子邮件地址。" -"Please, enter your comments...","请输入您的评论..." -"Price","价格" -"Product","产品" -"Product Details and Comment","产品详情与评论" -"Product(s) %s have required options. Each of them can be added to cart separately only.","产品 %s 有必要选项。每个选项都只能单独添加到购物车。" -"Product(s) %s have required options. Each product can only be added individually.","产品 %s 有必填选项。每个产品必须分别添加。" -"Quantity","数量" -"RSS Feed","RSS源" -"RSS link to %s's wishlist","到 %s 的与啊unwangqingdande链接" -"Remove Item","删除项目" -"Remove This Item","删除该内容" -"Remove item","删除项目" -"Requested cart item doesn't exist","请求的购物车项目不存在" -"Requested wishlist doesn't exist","请求的愿望清单不存在" -"Share Options","共享选项" -"Share Wishlist","分享愿望清单" -"Share Your Wishlist","共享您的愿望清单" -"Sharing Information","分享信息" -"This Wishlist has no Items","此心愿清单中没有商品" -"This product(s) is currently out of stock","该产品目前缺货" -"Unable to add the following product(s) to shopping cart: %s.","无法添加下列产品到购物车：%s。" -"Update Wishlist","更新愿望清单" -"User Description","用户描述" -"View Details","查看详情" -"View Product","查看产品" -"What's this?","这是什么？" -"Wishlist","愿望清单" -"Wishlist Section","愿望清单区域" -"Wishlist Sharing","愿望清单分享" -"Wishlist could not be created.","无法创建愿望清单。" -"Wishlist is empty now.","愿望清单目前为空。" -"You have no items in your wishlist.","您的愿望清单是空的。" -"Your Wishlist has been shared.","您的愿望清单已分享。" diff --git a/app/locale/zh_CN/Mage_XmlConnect.csv b/app/locale/zh_CN/Mage_XmlConnect.csv deleted file mode 100644 index 9acc595f2..000000000 --- a/app/locale/zh_CN/Mage_XmlConnect.csv +++ /dev/null @@ -1,1200 +0,0 @@ -" But cart has some errors.","但购物车中有一些错误。" -" Note: Image size affects the performance of your app."," Note: Image size affects the performance of your app." -"""Description"" is more than %d characters long","“描述”多于 %d 个字符长度" -"""Title"" is more than %d characters long","“标题”多于 %d 个字符长度" -"""id"" attribute is required for a ""%s"" field.","""%s"" 字段需要 ""id"" 属性。" -"""line_count"" attribute is required for ""multiline"" element.","“多行”元素需要 ""line_count"" 属性。" -"""message"" attribute is required for ""%s"" validator rule.","""%s"" 验证器规则需要 ""message"" 属性。" -"%1$s has been added to your wishlist.","%1$s 已添加到您的愿望清单。" -"%1$s incl tax.","%1$s 含税。" -"%@ is not correct","%@ is not correct" -"%s API Key required.","%s 需要 API 密钥。" -"%s Application ID required.","%s 需要应用程序 ID。" -"%s Secret Key required.","需要 %s 密钥。" -"%s attribute is required.","需要 %s 属性。" -"%s fields is required","%s fields is required" -"%s has been added to your cart.","%s 已添加到您的购物车。" -"%s id:","%s id:" -"%s was updated in your shopping cart.","%s was updated in your shopping cart." -"(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)","（包含列表中不包括的国家。作为应用的所有者，您需要负责遵守在特定国家，包括您自己的祖国分发或销售您的应用程序时，该国的相关法律。）" -"* - field is required","* - field is required" -"*Subject to change","*可能会有变更" -"1. Please select type of the action:","1. Please select type of the action:" -"10:40 AM","10:40 AM" -"2. Please select a page","2. Please select a page" -"2. Type Category Name","2. Type Category Name" -"2. Type Product Name","2. Type Product Name" -"80px x 80px","80px x 80px" -"80x80 px","80x80 px" -"Login to Urabn Airship.","登录到 Urban Airship。" -"Login to Urban Airship.","Login to Urban Airship." -"A Catalog Only App will not support functions such as add to cart, add to wishlist, or login.","仅在目录中的应用程序将不支持部分功能，例如添加到购物车、添加到愿望清单，或登录。" -"A new password has been sent.","新密码已发送。" -"About","About" -"Access forbidden","Access forbidden" -"Account","帐户" -"Account Information","Account Information" -"Account Settings","Account Settings" -"Account confirmation is required. Please check your email for the confirmation link.","需要进行账户确认。请检查您的电子邮件并找到确认链接。" -"Account information has been saved.","账户信息已保存。" -"Action","操作" -"Action type does\'t recognized","Action type does\'t recognized" -"Action type does\'t recognized.","Action type does\'t recognized." -"Action type doesn\'t recognized.","Action type doesn\'t recognized." -"Activate","激活" -"Activate PayPal Checkout","激活 PayPal 结账" -"Activate PayPal MECL","激活 PayPal MECL" -"Activation Key","激活密钥" -"Add","Add" -"Add Action","Add Action" -"Add Address from Contacts","Add Address from Contacts" -"Add App","添加应用程序" -"Add Custom","Add Custom" -"Add New Address","Add New Address" -"Add New Template","添加新模板" -"Add Page","添加页面" -"Add To Wishlist","Add To Wishlist" -"Add a billing address","Add a billing address" -"Add a shipping address","Add a shipping address" -"Add to Cart","添加到购物车" -"Add to Wishlist","添加到收藏" -"Adding Product to Cart...","Adding Product to Cart..." -"Adding Product to WishList...","Adding Product to WishList..." -"Additional Address","其他地址" -"Additional Info","Additional Info" -"Address","地址" -"Address 2","地址2" -"Address Book","Address Book" -"Address Book Updated","Address Book Updated" -"Address Info","Address Info" -"Address book is empty","Address book is empty" -"Address data not specified.","地址数据未指定。" -"Address does not belong to this customer.","地址不属于该客户。" -"Address has been deleted.","地址已被删除。" -"Address has been saved.","地址已被保存。" -"Admin Application Settings","Admin Application Settings" -"Admin Mobile Application","Admin Mobile Application" -"Admin application has not been enabled","Admin application has not been enabled" -"Administrative contact for this app and for app submission issues.","管理有关该应用的联系以及该应用提交的问题。" -"Advanced Settings","高级设置" -"After submitting the App to Magento, please contact %1$s to receive the Application Key, Application Secret and Application Master Secret.","在提交应用程序到 Magento 后，请联系 %1$s 以接收应用程序密钥，应用程序密码和应用程序主密码。" -"AirMail Message Queue","航空邮件消息队列" -"AirMail Messages Queue","航空邮件消息队列" -"AirMail Template Preview","航空邮件模板预览" -"AirMail message","航空邮件消息" -"AirMail templates","航空邮件模板" -"All Allowed Countries","所有允许的国家" -"All Images","All Images" -"All locations","所有位置" -"Amount","Amount" -"Amount in %@","Amount in %@" -"Amounts","Amounts" -"An account with this email address already exists.","使用该邮件地址的帐户已存在。" -"An error occurred while adding item to wishlist.","当添加项目到愿望清单时发生错误。" -"An error occurred while deleting the address.","删除该地址时遇到了错误。" -"An error occurred while loading categories.","载入分类时发生错误。" -"An error occurred while loading category filters.","加载分类筛选器时出错。" -"An error occurred while loading configuration.","An error occurred while loading configuration." -"An error occurred while loading localization.","An error occurred while loading localization." -"An error occurred while loading login form.","An error occurred while loading login form." -"An error occurred while loading wishlist.","载入愿望清单时发生错误。" -"An error occurred while processing your order. Please contact us or try again later.","处理您的订单时出错。请联系我们或稍后再试。" -"An error occurred while processing your request.","处理您的请求时出错。" -"An error occurred while removing item from wishlist.","从您的愿望清单中删除该商品时出错。" -"An error occurred while removing items from wishlist.","从愿望清单删除内容时出现了错误。" -"Analytics","分析" -"Android","Android" -"Android doesn\'t support AirMail message type.","Android 不支持 AirMail 消息类型。" -"App Background","App背景" -"App Background (landscape mode)","App Background (landscape mode)" -"App Background (landscape mode).","App背景（横向模式）。" -"App Background (portrait mode)","App Background (portrait mode)" -"App Background (portrait mode).","App背景（纵向模式）。" -"App Background
    (landscape mode)","App背景
    （横向模式）" -"App Background
    (portrait mode)","App背景
    （纵向模式）" -"App Background image missing.","App背景图像丢失" -"App Code","App代码" -"App Information","App信息" -"App Name","App名称" -"App Stores","App店铺" -"App Submission History","App提交历史" -"App Title","App标题" -"App code","App code" -"App code required.","需要App代码。" -"App does not exist.","App不存在。" -"App has been deleted.","App已被删除。" -"App has been saved.","App已被保存。" -"App has been submitted.","App已被提交。" -"App model not loaded.","App模块未加载。" -"App with specified code does not exist.","使用特定代码的App已存在。" -"Appears in the info section of your app (example: Copyright 2010 – Your Company, Inc.)","显示在您应用的信息界面中（例如：Copyright 2010 – Your Company, Inc.）" -"Application","应用程序" -"Application Key","应用程序密钥" -"Application Master Secret","应用程序主密钥" -"Application Name","应用程序名称" -"Application Secret","应用程序密码" -"Application doesn\'t exist.","Application doesn\'t exist." -"Apply","Apply" -"Applying Coupon Code","Applying Coupon Code" -"Applying Gift Card %@","Applying Gift Card %@" -"Are you sure you want to cancel a message?","Are you sure you want to cancel a message?" -"Are you sure you want to cancel selected records?","Are you sure you want to cancel selected records?" -"Are you sure you want to delete a message?","Are you sure you want to delete a message?" -"Are you sure you want to delete selected records?","Are you sure you want to delete selected records?" -"Are you sure you want to delete this theme? This change will affect all applications.","你确认要删除此主题吗？此变更将影响所有应用程序。" -"Are you sure you want to do this?","您是否确认要这样做？" -"Are you sure you want to remove this item?","Are you sure you want to remove this item?" -"Are you sure you whant to cancel a message?","您是否确定要取消该信息？" -"Are you sure you whant to delete a message?","您是否确定要删除该信息？" -"Are you sure you what to cancel selected records?","您是否确定要取消所选记录？" -"Are you sure you what to delete selected records?","您是否确定要删除所选记录？" -"As Low As","As Low As" -"As Low Excl. Tax","As Low Excl. Tax" -"As Low Incl. Tax","As Low Incl. Tax" -"As a Magento customer, Urban Airship is offering you unlimited Push Notifications and Rich Push for $100/year* along with a 60 day free trial.","作为 Magento 的客户，Urban Airship 为您提供仅需 $100/年无限制的推送通知和富推送，包含 60 天免费试用。" -"As low as","As low as" -"As low as excl. tax","As low as excl. tax" -"As low as incl. tax","As low as incl. tax" -"At last one application has to be created.","至少需要创建一个应用程序。" -"At least one option should be selected","At least one option should be selected" -"Authentication complete.","身份验证完成。" -"Authentication to %@ did failed...","Authentication to %@ did failed..." -"Average Order Amount","Average Order Amount" -"Average Orders","Average Orders" -"Average Rating","Average Rating" -"Back","返回" -"Back to App Edit","返回应用编辑" -"Background Color","背景色" -"Balance","余额" -"Balance Change","余额变动" -"Balance History","余额历史" -"Banner on Home Screen","主界面的旗帜" -"Banner on Home Screen (landscape mode)","Banner on Home Screen (landscape mode)" -"Banner on Home Screen (landscape mode) image missing.","主屏幕（横向模式）的横幅图片丢失。" -"Banner on Home Screen (portrait mode)","Banner on Home Screen (portrait mode)" -"Banner on Home Screen (portrait mode) image missing.","主屏幕（纵向模式）的横幅图片丢失。" -"Banner on Home Screen
    (landscape mode)","主屏幕的横幅图片
    （横向模式）" -"Banner on Home Screen
    (portrait mode)","主屏幕的横幅图片
    （纵向模式）" -"Banner on Home Screen image missing.","主界面旗帜的图片丢失。" -"Banners on Home Screen","Banners on Home Screen" -"Best Sellers","Best Sellers" -"Billing","Billing" -"Billing Address","账单地址" -"Billing address","Billing address" -"Billing address has been set.","账单地址已设置/" -"Bundle Products","Bundle Products" -"Buy %1$s for %2$s","为 %2$s 购买 %1$s" -"Buy %1$s for %2$s (%3$s incl. tax) each","为每 %2$s（%3$s 含税）购买 %1$s" -"Buy %1$s for %2$s each","为每 %2$s 购买 %1$s" -"Buy %1$s with %2$s discount each","买 %1$个，每个折扣为 %2$s" -"Buy More & Save","Buy More & Save" -"Buyer country is not allowed by store.","店铺不允许买家的国家。" -"CMS Page","CMS Page" -"CMS Pages haven\'t been found.","CMS Pages haven\'t been found." -"Cache Lifetime (seconds)","缓存寿命（秒）" -"Cache Management","缓存管理" -"Can\'t add item to shopping cart.","无法添加项目到购物车。" -"Can\'t apply the coupon code.","无法应用代金券代码。" -"Can\'t copy file ""%s"" to ""%s"".","无法复制文件""%s"" 到 ""%s""。" -"Can\'t create wishlist.","无法创建愿望清单。" -"Can\'t delete ""%s"" theme.","无法删除 ""%s"" 主题。" -"Can\'t load XML.","无法加载XML。" -"Can\'t load admin application settings.","Can\'t load admin application settings." -"Can\'t load application with id ""%s""","无法载入 id 为 ""%s"" 的应用程序" -"Can\'t load cart info.","无法载入购物车信息。" -"Can\'t load cart.","无法载入购物车。" -"Can\'t load customer form.","无法载入客户表单。" -"Can\'t load default themes.","无法载入默认主题。" -"Can\'t load selected theme. Please check your media folder permissions.","无法载入已选择的主题。请检查您的媒体文件夹权限。" -"Can\'t load template with id ""%s""","Can\'t load template with id ""%s""" -"Can\'t open submission form.","无法打开提交表单。" -"Can\'t read file ""%s"".","无法读取文件""%s""。" -"Can\'t remove the item.","无法删除该项目。" -"Can\'t reset theme.","无法重设主题。" -"Can\'t save address.","无法保存地址。" -"Can\'t save the customer.","无法保存客户。" -"Can\'t save theme.","无法保存主题。" -"Can\'t show configuration.","无法显示配置。" -"Can\'t specify product.","无法指定产品。" -"Can\'t submit application.","无法提交应用程序。" -"Can\'t update cart.","无法更新购物车。" -"Can\'t write to file ""%s"".","无法写入到文件 ""%s""。" -"Cancel","取消" -"Canceled","已取消" -"Canceling PayPal ...","Canceling PayPal ..." -"Cancelled","已取消" -"Cannot apply gift card.","无法应用礼品卡。" -"Cannot configure product.","Cannot configure product." -"Cannot load theme ""%s"".","无法加载主题 ""%s""。" -"Cannot redeem Gift Card.","无法兑换礼品卡。" -"Cannot remove gift card.","无法删除礼品卡。" -"Cannot save theme ""%s"". Incorrect data received","无法保存主题 ""%s""。收到的数据有误" -"Cannot update the item.","Cannot update the item." -"Card Verification Number","卡片验证号码" -"Card verification number is wrong","卡验证号码有误" -"Carrier","运营商" -"Cart","购物车" -"Cart Updated","Cart Updated" -"Cart has been updated.","购物车无法更新。" -"Cart has some errors.","购物车存在一些错误。" -"Cart is empty.","购物车为空。" -"Catalog Only App?","只对App分类？" -"Category","Category" -"Category Button Color","分类按钮也暗色" -"Category Item Background Color","分类项目背景色" -"Cc:","Cc:" -"Chairs","链" -"Change Orientation","更改方向" -"Change Password","更改密码" -"Changes have been saved to theme.","变动已保存到主题中。" -"Check","Check" -"Check Gift Card","Check Gift Card" -"Check Gift Card Promo Redeemed","Check Gift Card Promo Redeemed" -"Checking Gift Card %@","Checking Gift Card %@" -"Checkout","Checkout" -"Checkout Page Registration","Checkout Page Registration" -"Checkout as Guest","Checkout as Guest" -"Checkout as Guest or Register","Checkout as Guest or Register" -"Checkout has been initialized.","结账已被初始化。" -"Checkout initialization...","Checkout initialization..." -"Checkout initialized!","Checkout initialized!" -"Choose Store View","Choose Store View" -"Choose amount","Choose amount" -"Choose file","Choose file" -"City","城市" -"Clear","Clear" -"Close","Close" -"Color Themes","色彩主题" -"Colors","色彩" -"Commiting updates...","Commiting updates..." -"Company","公司" -"Completed","已完成" -"Configuration data have been saved","Configuration data have been saved" -"Configure Cart Item","Configure Cart Item" -"Confirm New Password","确认新密码" -"Confirm Password","确认密码" -"Connecting","Connecting" -"Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate.","Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate." -"Contact Email","联系邮件" -"Contact Information","联系信息" -"ContactsAreEmpty","ContactsAreEmpty" -"Container is not defined.","未定义容器。" -"Content","内容" -"Continue","Continue" -"Copyright","版权所有" -"Copyright Page Logo","版权页面徽标" -"Copyright Page Logo (iPhone 4 retina)","Copyright Page Logo (iPhone 4 retina)" -"Copyright Page Logo
    (iPhone 4 retina)","版权页面徽标
    （iPhone 4 retina屏幕）" -"Copyright: Magento (c) 2010","Copyright: Magento (c) 2010" -"Countries","Countries" -"Countries Payment Applicable From","各国支付可用情况表单" -"Country","国家" -"Country options don\'t recognized for ""%s"".","国家选项不能识别 ""%s""。" -"Coupon code %s is not valid.","代金券代码 ""%s"" 无效。" -"Coupon code %s was applied.","代金券代码 %s 已被使用。" -"Coupon code is empty.","代金券代码为空。" -"Coupon code was canceled.","优惠代码已被取消。" -"Create Account","Create Account" -"Create an Account","Create an Account" -"Creating a Template is allowed only for applications which have device type iPhone.","只有设备类型为iPhone的应用程序才能创建模板。" -"Credit Card","信用卡" -"Credit Card %s","信用卡 %s" -"Credit Card Number","信用卡号码" -"Credit Card Type","信用卡类型" -"Credit card number does not match credit card type.","信用卡编号与信用卡类型不匹配。" -"Cross Sells","Cross Sells" -"Current Balance: %s","当前余额：%s" -"Current Password","当前密码" -"Currently, PayPal MEP is not available for the Android application","当前，PayPal MEP不能用于Android应用。" -"Currently, the system does not support the viewing of the order detail.","Currently, the system does not support the viewing of the order detail." -"Custom App Icon","自定义App图标" -"Custom App Icon (iPhone 4 retina)","Custom App Icon (iPhone 4 retina)" -"Custom App Icon
    (iPhone 4 retina)","自定义App图标
    （iPhone 4 retina屏幕）" -"Custom Colors","自定义颜色" -"Custom amount","Custom amount" -"Customer","Customer" -"Customer Name","Customer Name" -"Customer authentication problem.","客户身份验证问题。" -"Customer balance available in enterprise version of Magento only.","客户余额仅在 Magento 的企业版本中提供。" -"Customer balance is disabled for current store","客户余额在当前商店已禁用" -"Customer email not specified.","客户邮件未指定。" -"Customer logout problem.","客户注销问题。" -"Customer not logged in.","客户未登录。" -"Customers","Customers" -"DD","DD" -"Date","日期" -"Date Created","创建日期" -"Date Submitted","日期已提交" -"Date Updated","更新日期" -"Date:","Date:" -"Day","天" -"Deeper Messaging and Engagement with Rich Push.","通过丰富的推送，获取更多的消息和参与。" -"Default Billing Address","默认账单地址" -"Default Shipping Address","默认送货地址" -"Default Theme","默认主题" -"Default themes are missed.","Default themes are missed." -"Delete","删除" -"Delete Action","Delete Action" -"Delete theme","删除主题" -"Deleted","已删除" -"Description","描述" -"Description that appears in Android Market. %s chars maximum. ","显示在Android市场中的描述。最多 %s 个字符。" -"Description that appears in the iTunes App Store. %s chars maximum. ","显示在iTunes App Store中的描述。最多 %s 个字符。" -"Deselect All","全部反选" -"Design","设计" -"Device","设备" -"Device Information","设备信息" -"Device Type","设备类型" -"Device doesn\'t recognized","Device doesn\'t recognized" -"Device doesn\'t recognized. Unable to load a template.","设备未被识别。无法加载模板。" -"Device doesn\'t recognized: ""%s"". Unable to load a helper.","设备未被识别：""%s""。无法加载帮助程序。" -"Device doesn\'t recognized: ""%s"". Unable to load preview model.","设备未被识别：""%s""。无法加载预览模型。" -"Device type doesn\'t recognized.","Device type doesn\'t recognized." -"Discount code is empty","Discount code is empty" -"Discount:","Discount:" -"Done","Done" -"Downloadable Products Updated","Downloadable Products Updated" -"Downloads limit:","Downloads limit:" -"E-mail","E-mail" -"Edit","编辑" -"Edit Action","Edit Action" -"Edit Address","Edit Address" -"Edit AirMail Message","编辑航空邮件信息" -"Edit AirMail Message Queue #%s","编辑航空邮件队列 #%s" -"Edit App ""%s""","编辑 App ""%s""" -"Edit Filter","编辑筛选器" -"Edit Image","Edit Image" -"Edit Mail List","Edit Mail List" -"Edit Template ""%s""","编辑模板 ""%s""" -"Edit filter","Edit filter" -"Edit note","Edit note" -"Either remote URL or application code was not set. Please make sure you filled all the values and try again.","Either remote URL or application code was not set. Please make sure you filled all the values and try again." -"Element with id %s already exists","ID ％s 元素已存在" -"Email","电子邮件" -"Email Address","编辑电子邮件地址" -"Email address you provided is not valid. Please provide a valid one.","Email address you provided is not valid. Please provide a valid one." -"Email is not correct","Email is not correct" -"Email is not specified","Email is not specified" -"Enable Admin Application","Enable Admin Application" -"Enable AirMail Message Push notification","启用航空邮件信息推送通知" -"Enable Facebook","启用反馈" -"Enable Flurry Analytics","启用Flurry分析" -"Enable Flurry Analytics for the merchant.","对商家启用Flurry分析。" -"Enable LinkedIn","启用LinkedIn" -"Enable Standard Checkout","启用标准结账" -"Enable Twitter","启用Twitter" -"Enter Name","Enter Name" -"Enter discount code first.","Enter discount code first." -"Enter discount code if any","Enter discount code if any" -"Enter e-mail","Enter e-mail" -"Enter giftcard promo code here","Enter giftcard promo code here" -"Enter text","Enter text" -"Enter the gift card code","Enter the gift card code" -"Error","Error" -"Error Loading Configuration Format","Error Loading Configuration Format" -"Error during shortening url","Error during shortening url" -"Error message text is missed.","Error message text is missed." -"Error while processing file ""%s"".","处理文件 ""%s"" 时遇到了错误。" -"Error while reading data from Payment Bridge. Please, try again.","从支付桥读取数据时出错。请重试。" -"Error while reading remote data","Error while reading remote data" -"Error while uploading file ""%s"".","上传文件 ""%s"" 时出错。" -"Error while uploading file ""%s"". Disallowed file type. Only ""jpg"", ""jpeg"", ""gif"", ""png"" are allowed.","上传文件 ""%s""时出错。不允许的文件类型。只有 ""jpg"", ""jpeg"", ""gif"", ""png"" 是允许的。" -"Error.","错误。" -"Excl. Tax","Excl. Tax" -"Expiration Date - Month","截止日期 - 月" -"Expiration Date - Year","截止日期 - 年" -"Expires: %s","过期于：%s" -"Extend the life of your app with Urban Airship Push Notifications.","借助 Urban Airship 推送通知，让您的应用程序流行更久。" -"Extensions","扩展" -"FILTERS APPLIED","过滤器已应用" -"Facebook","Facebook" -"Facebook API","Facebook API" -"Facebook Application ID","反馈应用程序ID" -"Facebook post failed...","Facebook post failed..." -"Fax","传真" -"File can\'t be uploaded.","文件无法上传。" -"File doesn\'t exist ""%s"".","文件不存在 ""%s""。" -"Filter","Filter" -"Filters","Filters" -"First Name","名字" -"Fixed amounts","Fixed amounts" -"Flurry API Code","Flurry API代码" -"Flurry Analytics","Flurry分析" -"Flurry Analytics Site","Flurry分析网站" -"Fonts","字体" -"Forgot Password","Forgot Password" -"Forgot Password?","Forgot Password?" -"Forgot your password?","Forgot your password?" -"Form","Form" -"Free","免费" -"From","From" -"From Excl. Tax","From Excl. Tax" -"From Incl. Tax","From Incl. Tax" -"From excl. tax","From excl. tax" -"From incl. tax","From incl. tax" -"Full Description","Full Description" -"Funk Leaf","Funk Leaf" -"Gallery","Gallery" -"General","常规" -"Generate Offline Catalog","Generate Offline Catalog" -"Get Content from CMS Page","从CMS页面获得内容" -"Gift Card ""%s"" was added.","礼品卡 ""%s"" 已添加" -"Gift Card ""%s"" was redeemed.","礼品卡 ""%s"" 已兑换。" -"Gift Card ""%s"" was removed.","礼品卡 ""%s"" 已被删除。" -"Gift Card (%s)","礼品卡 （%s）" -"Gift Card amount applied to order: %s","应用给订单的礼品卡数量：%s" -"Gift Card code is empty.","礼品卡代码为空。" -"Gift Card: %s","礼品卡：%s" -"Gift card account available in enterprise version of Magento only.","礼品卡帐户仅在 Magento 的企业版本中提供。" -"Giftcard promo code","Giftcard promo code" -"Grand Total","Grand Total" -"Grand Total (Excl. Tax)","合计（不含税）" -"Grand Total (Incl. Tax)","合计（含税）" -"Guest","来宾" -"Header Background Color","头部背景色" -"Header Font Color","头字体颜色" -"High Resolution Application Icon","高分辨率应用程序图标" -"Home","主页" -"Hot Red","大红" -"How do you rate this product?","您如何评价该产品？" -"How to incorporate Urban Airship within your application:","如何将 Urban Airship 整合入您的应用程序：" -"I Agree","I Agree" -"I agree to the Terms and Conditions","I agree to the Terms and Conditions" -"ID","ID" -"Icon that will appear on the user\'s device after they download your app.","Icon that will appear on the user\'s device after they download your app." -"Icon that will appear on the user\'s device after they download your app. Recommended size: 48px x 48px.","下载应用后，该图标将出现在用户设备上。建议的大小是：48px x 48px。" -"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 72px x 72px.","下载应用后，该图标将会出现在用户的设备上。您不需要自己应用渐变或圆滑的边缘（这是由Apple自动进行的）。建议的大小是：72px x 72px。" -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 114px x 114px.","下载应用后，该图标将会出现在用户的设备上。您不需要自己应用渐变或圆滑的边缘（这是Apple自动进行的）。建议的大小是：114px x 114px。" -"Icon that will appear on the user’s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 57px x 57px at 72 dpi.","下载应用后，该图标会出现在用户的设备上。您不需要自己应用渐变或圆滑的边缘（这是Apple自动进行的）。建议的大小是：72dpi下57px x 57px。" -"Icons","图标" -"If leave this field empty, the message will be sent immediately","如果该字段留空，信息将立刻发送。" -"If you want to disable the cache on the application side, leave the field empty. Warning! When disabling cache, the application will take time to load each page.","如果希望在应用程序端禁用缓存，请将该字段留空。警告！禁用缓存后，应用程序加载每个页面所需的时间将更长。" -"Image %s is required.","Image %s is required." -"Image action has been saved.","Image action has been saved." -"Image does not exist. Please reload this page.","Image does not exist. Please reload this page." -"Image file was not found.","无法找到图片文件。" -"Image has been deleted.","Image has been deleted." -"Image id is required.","Image id is required." -"Image limits don\'t recognized for ""%s"" image type","Image limits don\'t recognized for ""%s"" image type" -"Image that appears on first screen while your app is loading.","Image that appears on first screen while your app is loading." -"Image that appears on first screen while your app is loading. Required size: 1024px x 768px.","当您加载应用时，出现在第一个界面上的图像。要求的大小为：1024px x 768px。" -"Image that appears on first screen while your app is loading. Required size: 320px x 455px.","当您加载应用时，出现在第一个界面上的图像。要求的大小为：320px x 455px。" -"Image that appears on first screen while your app is loading. Required size: 320px x 460px.","当您加载应用时，出现在第一个界面上的图像。要求的大小为：320px x 460px。" -"Image that appears on first screen while your app is loading. Required size: 640px x 920px.","当您加载应用时，出现在第一个界面上的图像。要求的大小为：640px x 920px。" -"Image that appears on first screen while your app is loading. Required size: 768px x 1024px.","当您加载应用时，出现在第一个界面上的图像。要求的大小为：768px x 1024px。" -"Image type doesn\'t recognized: ""%s"".","Image type doesn\'t recognized: ""%s""." -"Image type is required.","Image type is required." -"Images","图像" -"Images order has been updated.","Images order has been updated." -"In Queue","位于队列中" -"In Stock","有货" -"In addition, click here to review Urban Airship\'s Terms of Service: click here.","此外，点击此处查看城市飞艇的服务条款: 点击此处。" -"In order to resubmit your app, you need to first purchase a %s from MagentoCommerce","为了提交您的App，您需要首先从MagentoCommerce购买 %s。" -"In order to submit your app, you need to first purchase a %s from MagentoCommerce","为了提交您的App，您需要首先从MagentoCommerce购买 %s。" -"Inactive Tabs","非活跃选项卡" -"Incl. Tax","Incl. Tax" -"Incl. tax","Incl. tax" -"Initialization PayPal ...","Initialization PayPal ..." -"Initialization of the PayPal checkout failed!","Initialization of the PayPal checkout failed!" -"Invalid XML.","无效XML。" -"Invalid current password.","当前密码无效。" -"Invalid customer data.","客户数据无效。" -"Invalid data.","无效数据。" -"Invalid email address.","邮件地址无效。" -"Invalid item or wishlist.","无效商品或愿望清单。" -"Invalid login or password.","无效的登录名或密码。" -"Invalid shipping method.","运送方法无效。" -"Issue Number","问题编号" -"It\'s not allowed to delete submitted application.","不允许删除已提交的应用程序。" -"Item","Item" -"Item Options","Item Options" -"Item has been added to cart.","商品已被添加到购物车。" -"Item has been deleted from cart.","商品已从购物车中删除。" -"Item has been removed from wishlist.","商品已从愿望清单中删除。" -"Items","Items" -"Items were updated. But can\'t update wishlist.","商品已更新。但无法更新愿望清单。" -"Keep your image size below %s KB for optimal performance.","Keep your image size below %s KB for optimal performance." -"Key","密钥" -"Keywords","关键词" -"Label","标签" -"Landscape app Background","Landscape app Background" -"Landscape banners on Home Screen","Landscape banners on Home Screen" -"Large iTunes Icon","大iTunes图标" -"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple)." -"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.","出现在iTunes App Store的大图标。您不需要应用渐变或圆滑的边缘（这是由Apple自动实现的）。必须的大小：512px x 512px。" -"Last 5 Orders","Last 5 Orders" -"Last 5 Search Terms","Last 5 Search Terms" -"Last Name","姓氏" -"Last update: %@","Last update: %@" -"Lifetime Sales","Lifetime Sales" -"LindedIn","LindedIn" -"Link:","Link:" -"LinkedIn","LinkedIn" -"LinkedIn API","LinkedIn API" -"LinkedIn API Key","LinkedIn API密钥" -"LinkedIn Authorization","LinkedIn Authorization" -"LinkedIn Autorization","LinkedIn Autorization" -"LinkedIn Secret Key","LinkedIn密钥" -"Linkedin post failed...","Linkedin post failed..." -"List of downloadable products is empty","List of downloadable products is empty" -"Load more items","Load more items" -"Loader Splash Screen","加载启动界面" -"Loader Splash Screen (iPhone 4 retina)","Loader Splash Screen (iPhone 4 retina)" -"Loader Splash Screen (landscape mode)","Loader Splash Screen (landscape mode)" -"Loader Splash Screen (portrait mode)","Loader Splash Screen (portrait mode)" -"Loader Splash Screen
    (iPhone 4 retina)","加载启动界面
    （iPhone 4 retina屏幕）" -"Loader Splash Screen
    (landscape mode)","加载启动界面
    （横向模式）" -"Loader Splash Screen
    (portrait mode)","加载启动界面
    （纵向模式）" -"Loading %@...","Loading %@..." -"Loading Account Form...","Loading Account Form..." -"Loading Address Book...","Loading Address Book..." -"Loading Address Form...","Loading Address Form..." -"Loading CMS page ...","Loading CMS page ..." -"Loading Cart...","Loading Cart..." -"Loading Gallery...","Loading Gallery..." -"Loading Login Form...","Loading Login Form..." -"Loading My Downloadable Products...","Loading My Downloadable Products..." -"Loading Order Details","Loading Order Details" -"Loading Orders List...","Loading Orders List..." -"Loading Preview...","正在加载预览..." -"Loading Product Options...","Loading Product Options..." -"Loading Products...","Loading Products..." -"Loading Registration Form...","Loading Registration Form..." -"Loading Restore Password Form...","Loading Restore Password Form..." -"Loading Store Credit...","Loading Store Credit..." -"Loading WishList...","Loading WishList..." -"Loading Write Review Form...","Loading Write Review Form..." -"Loading category ...","Loading category ..." -"Loading more items...","Loading more items..." -"Loading product ...","Loading product ..." -"Loading shipping methods ...","Loading shipping methods ..." -"Loading...","Loading..." -"Locations","位置" -"Log In","登录" -"Log Out","Log Out" -"Log in to Admin Panel","Log in to Admin Panel" -"Log into Account","Log into Account" -"Log into your account","Log into your account" -"Log out Account","Log out Account" -"LogInMessageTitle","LogInMessageTitle" -"Login and password are required.","需要登录和密码。" -"Logo in Header","头部徽标" -"Logo in Header image missing.","头部徽标图像丢失。" -"Logout complete.","注销完毕。" -"M.I.","M.I." -"MEP is PayPal\'s native checkout experience for the iPhone. You can choose to use MEP alongside standard checkout, or use it as your only checkout method for Magento mobile. PayPal MEP requires a PayPal business account","MEP 是贝宝为 iPhone 设计的本地结账程序。你可以选择在标准结帐的同时也使用 MEP ​​，或将其作为Magento 移动唯一的结帐手段。贝宝 MEP 需要一个贝宝商业帐户" -"MM","MM" -"Mailbox title","邮箱标题" -"Main Tabs","主选项卡" -"Make Inactive","使其不活跃" -"Make this app available in the following territories","让该应用可在下列区域使用" -"Manage Apps","管理应用" -"Manage Mobile App","管理移动应用" -"Maximum length is 140","最大长度为140" -"Maximum length is 255","最大长度为255" -"Maximum size: %s KB.","Maximum size: %s KB." -"Maximum: %.2f","Maximum: %.2f" -"Merchant Label","商家标签" -"Merge","Merge" -"Message","Message" -"Message Queue","消息队列" -"Message Settings","消息设置" -"Message Templates","消息模板" -"Message Title","消息标题" -"Message Type","消息类型" -"Message can be edited when status of the message is ""In Queue"" only.","消息只可在状态为“处于队列中”时进行编辑。" -"Message content","信息内容" -"Message text is missed.","Message text is missed." -"Message title","信息标题" -"Message too long, please use 140 symbols","Message too long, please use 140 symbols" -"Message type doesn\'t recognized","Message type doesn\'t recognized" -"Minimize","Minimize" -"Minimum %@, maximum %@","Minimum %@, maximum %@" -"Minimum: %.2f","Minimum: %.2f" -"Mobile","移动" -"Mobile Express Checkout has been canceled.","手机快速结账已被取消。" -"Mobile Express Checkout processed successfully.","手机快速结账已成功处理。" -"Month","月" -"More","更多" -"More Info","更多信息" -"More Tabs","更多选项卡" -"Most Viewed Products","Most Viewed Products" -"My Account","My Account" -"My Downloadable Products","My Downloadable Products" -"My Orders","My Orders" -"My Wishlist","My Wishlist" -"Name","Name" -"Name on Card","卡片上的名字" -"Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize. %s chars max.","当用户安装应用程序到他们的设备时，名称会显示在您的应用程序下方。我们推荐您选取 10-12 字符长度的名称，这样您的客户能完整识别。最多 %s 个字符。" -"New AirMail Message","新 AirMail 消息" -"New AirMail Message Queue","新 AirMail 消息队列" -"New App","新应用程序" -"New Customers","New Customers" -"New Password","新密码" -"New Template","新模板" -"New to Our Store?","New to Our Store?" -"Nickname","昵称" -"No","No" -"No Payment Information Required","不需要支付信息" -"No Ratings","No Ratings" -"No internet connection. Retry later ...","No internet connection. Retry later ..." -"No items were specifed to update.","没有指定项目来更新。" -"No items were updated.","没有项目被更新。" -"No product selected.","没有选择产品。" -"No products found. Please retry with other term","No products found. Please retry with other term" -"No shipping method required.","无需任何运输方式。" -"No such file ""%s"".","没有此文件“%s”。" -"Not Submitted","未提交" -"Note: Image size affects the performance of your app.","Note: Image size affects the performance of your app." -"Notice","注意" -"Number of Orders","Number of Orders" -"Number of Uses","Number of Uses" -"OK","OK" -"OR, Pay with Standard Checkout","OR, Pay with Standard Checkout" -"Offline Catalog","Offline Catalog" -"Offline cart stored on server","Offline cart stored on server" -"Offline catalog export complete.","Offline catalog export complete." -"Offline catalog export failed.","Offline catalog export failed." -"One or more keywords that describe your app. Keywords are matched to users\' searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum.","描述您应用程序的一个或两个关键词。关键词将用于匹配用户在 App Store 中的搜索，并帮助返回准确的搜索结果。使用逗号分隔多个关键词。最多 100 个字符。" -"Onepage checkout is disabled.","单页结账已被禁用。" -"Only custom theme can be deleted","仅有自定义主题可被删除" -"Only default theme can be reset","您只能重置默认主题" -"Only free apps are allowed in this version.","该版本仅允许免费应用程序。" -"Only registered users can write reviews. Please, log in or register.","仅已注册用户可撰写评论。请登录或注册。" -"Open","Open" -"Options","Options" -"Options menu items","选项菜单项" -"Order","Order" -"Order #","Order #" -"Order #%s - %s","订单 #%s - %s" -"Order Date: %s","订单日期：%s" -"Order Details Updated","Order Details Updated" -"Order ID","Order ID" -"Order ID:","Order ID:" -"Order Info","Order Info" -"Order List Updated","Order List Updated" -"Order Number","Order Number" -"Order Review","Order Review" -"Order canceled","Order canceled" -"Order failed","Order failed" -"Order id is not specified.","订购 id 未指定。" -"Order is not available.","订单不可用。" -"Ordered","已下单" -"Ordered Items","Ordered Items" -"Orders","Orders" -"Other amount","Other amount" -"Out of Stock","Out of Stock" -"Output format is not specified. Please, specify ""format"" key in constructor, or set it using setFormat().","未指定输出格式。请在构造函数中指定 “格式” 键，或使用 setFormat（）进行设置。" -"Overall Activity","Overall Activity" -"POST data is not valid.","POST 数据无效。" -"Pages","页面" -"Password","密码" -"Password fields cannot be empty.","密码字段不能为空。" -"Password is not specified","Password is not specified" -"Password:","Password:" -"PayPal","PayPal" -"PayPal Checkout","PayPal Checkout" -"PayPal MECL is the mobile version of PayPal\'s Express Checkout service. You can choose to use MECL alongside standard checkout, or use it as your only checkout method for Magento Mobile.","MECL 是贝宝快速结帐服务的移动版本。您可以选择在标准结账的同时也使用MECL，或者将其作为您Magento 移动唯一的结帐手段。" -"PayPal MEP","PayPal MEP" -"PayPal Mobile Embedded Payment (MEP)","PayPal 移动嵌入支付 (MEP)" -"PayPal Mobile Express Checkout","PayPal 手机快速结账" -"PayPal Mobile Express Checkout Library (MECL)","PayPal 手机快速结账库 (MECL)" -"PayPal Mobile Express Checkout Token does not exist.","PayPal 手机快速结账令牌不存在。" -"Payer Email: %s","付款者邮件地址：%s" -"Payment Applicable From","支付适用性表单" -"Payment Bridge module unavailable.","付款桥模块不可用。" -"Payment Information","Payment Information" -"Payment Method","支付方式" -"Payment Method has been set.","支付方法已设置。" -"Payment Methods","支付方式" -"Payment method","Payment method" -"Payment method was successfully set.","支付方法已成功设置。" -"Paypal MEP doesn\'t support checkout with any discount.","PayPal MEP 不支持使用任何折扣结账。" -"Place Order","Place Order" -"Placing order ...","Placing order ..." -"Please click here to see how to setup and retrieve API credentials.","请单击这里查看如何设置和取回 API 凭证。" -"Please Select Application","请选择应用程序" -"Please Select Device Type","请选择设备类型" -"Please agree to all the terms and conditions before placing the order.","请在下订单前同意所有的条款和条件。" -"Please create and save an application first.","请先创建并保存一个应用程序。" -"Please enter ""App Title"".","请输入“应用名称”。" -"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","请输入有效URL。协议名是必须的（http://、https://，或ftp://）" -"Please enter a valid date.","请输入有效日期" -"Please enter a valid email address. For example johndoe@domain.com.","请输入有效邮件地址。例如johndoe@domain.com。" -"Please enter at least one email recipient","Please enter at least one email recipient" -"Please enter issue number or start date for switch/solo card type.","请输入Switch/Solo类卡的颁发号或开始日期。" -"Please enter the Activation Key.","请输入激活密钥。" -"Please enter the Copyright.","请输入版权。" -"Please enter the Description.","请输入描述。" -"Please enter the Price.","请输入价格。" -"Please enter the Resubmission Key.","请输入重提交密钥。" -"Please enter the Title.","请输入名称。" -"Please make sure your passwords match.","请确保密码匹配。" -"Please save application first.","Please save application first." -"Please select an option.","请选择一个选项。" -"Please select at least one country.","请选择至少一个国家。" -"Please select payment method to cover a quote","Please select payment method to cover a quote" -"Please set email","Please set email" -"Please specify payment method","Please specify payment method" -"Please specify shipping method","Please specify shipping method" -"Please upload an image for ""App Background (landscape mode)"" field from Design Tab.","请从设计选项卡为“App背景（横向模式）”字段上传一个图片。" -"Please upload an image for ""App Background (portrait mode)"" field from Design Tab.","请从设计选项卡为“App背景（纵向模式）”字段上传一个图片。" -"Please upload an image for ""App Background"" field from Design Tab.","请从设计选项卡为“App背景”字段上传一个图片。" -"Please upload an image for ""Banner on Home Screen (landscape mode)"" field from Design Tab.","请在“设计”选项卡中为“主屏幕（横向）横幅图片”上传图片。" -"Please upload an image for ""Banner on Home Screen (portrait mode)"" field from Design Tab.","请在“设计”选项卡中为“主屏幕（纵向）横幅图片”上传图片。" -"Please upload an image for ""Banner on Home Screen"" field from Design Tab.","请从设计选项卡为“主界面旗帜”字段上传一个图片。" -"Please upload an image for ""Logo in Header"" field from Design Tab.","请从设计选项卡为“头部徽标”字段上传一个图片。" -"Please use letters only (a-z or A-Z) in this field.","在该字段中请只使用字母（a-z或A-Z）" -"Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","请在该字段中只使用数字。请不要使用空格或其它字符，例如句点或逗号。" -"Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","该字段中请只使用字母（a-z 或 A-Z）或数字（0-9），不能使用空格或其它字符。" -"Please wait...","Please wait..." -"Please, specify gift card amount!","Please, specify gift card amount!" -"Portrait app Background","Portrait app Background" -"Portrait banners on Home Screen","Portrait banners on Home Screen" -"Post data is empty.","Post data is empty." -"Post this product to your wall","Post this product to your wall" -"Posting to e-mails","Posting to e-mails" -"Preferred size: %spx x %spx.","Preferred size: %spx x %spx." -"Prefix","前缀" -"Preset Theme","预设主题" -"Preview","预览" -"Price","价格" -"Price Font Color","价格字体颜色" -"Price excluding tax","Price excluding tax" -"Price including tax","Price including tax" -"Primary Color","主要颜色" -"Primary Font Color","主要字体颜色" -"Problem changing or sending password.","更改或发送密码时遇到问题。" -"Proceed to Checkout","Proceed to Checkout" -"Product","Product" -"Product Added to Cart","Product Added to Cart" -"Product Added to Wishlist","Product Added to Wishlist" -"Product Gallery Updated","Product Gallery Updated" -"Product Name3 ","产品名 3" -"Product Name3 1","产品名 3 1" -"Product Name3 2","产品名 3 2" -"Product Options Updated","Product Options Updated" -"Product Removed From Wishlist","Product Removed From Wishlist" -"Product Reviews Updated","Product Reviews Updated" -"Product SKU","Product SKU" -"Product Updated","Product Updated" -"Product added","Product added" -"Product is out of stock","Product is out of stock" -"Product is unavailable.","产品不可用。" -"Product only available on the website.","Product only available on the website." -"Product succesfully added to cart","Product succesfully added to cart" -"Product was not specified.","产品未指定。" -"Product(s) currently out of stock.","产品目前缺货。" -"Products","Products" -"Pull Down To Update..","Pull Down To Update.." -"Purchase Order Number","采购订单号" -"Push Notification","发布通知" -"Push Notifications allow you to send messages directly to the people who have installed your app on their device. Send messages to your full audience even when your app is closed. Push Notifications are one of the best ways to keep your app active by delivering valuable content directly to your customers. Learn more about Push Notifications - %1$s","推送通知允许您直接发送消息给安装您应用程序的用户。即使您的应用程序处于关闭状态仍可发送消息给所有接收者。推送通知是通过直接递送有价值内容给您的客户而保持应用程序持久活力的最佳方式。要了解关于推送通知的更多信息，请访问 - %1$s" -"Push Title","推送标题" -"Push message","推送信息" -"Push title","推送标题" -"Qty","Qty" -"Qty:","Qty:" -"Quantity","Quantity" -"Quantity:","Quantity:" -"Queue Date","队列日期" -"Queue Message","队列消息" -"Queue does not exist.","队列不存在。" -"Queue is allowed only for applications with enabled Push Notification.","队列仅可在启用推送通知的应用程序中使用。" -"Quote instance is required.","队列实例是必须的。" -"Quote item is not found.","Quote item is not found." -"Range param doesn\'t recognized","Range param doesn\'t recognized" -"Ratings and Reviews","Ratings and Reviews" -"Read the Terms and Conditions","Read the Terms and Conditions" -"Recent Activity","Recent Activity" -"Recipient Information","收件人信息" -"Recommended size %spx x %spx.","Recommended size %spx x %spx." -"Recommended size 1024px x 344px. Note: Image size affects the performance of your app.","推荐尺寸 1024px x 344px。注意：图片尺寸将影响您的应用程序的性能。" -"Recommended size 1024px x 704px. Note: Image size affects the performance of your app.","建议的大小：1024px x 704px。注意：图像大小会影响您应用的性能。" -"Recommended size 320px x 230px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","建议的大小：320px x 320px。注意：图像大小会影响您应用的性能。为获得最佳性能，建议图像大小不超过50 KB。" -"Recommended size 320px x 258px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","建议的大小：320px x 258px。注意：图像大小会影响您应用的性能。为获得最佳性能，建议图像大小不超过50 KB。" -"Recommended size 320px x 367px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.","建议的大小：320px x 367px。注意：图像大小会影响您应用的性能。为获得最佳性能，建议图像大小不超过50 KB。" -"Recommended size 35px x 35px.","建议的大小为 35px x 35px。" -"Recommended size 768px x 294px. Note: Image size affects the performance of your app.","建议的大小为768px x 294px。注意：图像大小会影响您应用的性能。" -"Recommended size 768px x 960px. Note: Image size affects the performance of your app.","建议的大小为768px x 960px。注意：图像大小会影响您应用的性能。" -"Recommended size: %spx x %spx at %s dpi.","Recommended size: %spx x %spx at %s dpi." -"Recommended size: %spx x %spx.","Recommended size: %spx x %spx." -"Recover","Recover" -"Redeem","Redeem" -"Redeeming Gift Card %@","Redeeming Gift Card %@" -"Redemption functionality is disabled.","兑换功能被禁用。" -"Refunded","已存储" -"Regions","Regions" -"Register","Register" -"Registering cart ...","Registering cart ..." -"Registering user ...","Registering user ..." -"Regular","Regular" -"Regular and confirmation passwords must be equal","常规和确认密码必须一致。" -"Related Product Background Color","相关产品的背景色" -"Release To Update...","Release To Update..." -"Relevance","Relevance" -"Remaining downloads","Remaining downloads" -"Remove","Remove" -"Remove Address...","Remove Address..." -"Removing %@...","Removing %@..." -"Removing Coupon...","Removing Coupon..." -"Removing Gift Card...","Removing Gift Card..." -"Removing Product from WishList...","Removing Product from WishList..." -"Removing Store Credit...","Removing Store Credit..." -"Request internal error.","请求内部错误。" -"Request param %s is missed","Request param %s is missed" -"Required size: %spx x %spx.","Required size: %spx x %spx." -"Reset theme to default","将主题重设为默认" -"Resubmission Key","重新提交密钥" -"Resubmit App","重新提交App" -"Resubmit App failure. %s","Resubmit App failure. %s" -"Results","Results" -"Revenue","Revenue" -"Revert","Revert" -"Revert Discount","Revert Discount" -"Review","评测" -"Rich Push allows you to create and send engaging experiences by adding HTML and other rich media components to your push notifications. Moving beyond alerts and badge updates, Rich Push takes users into the app while displaying content in a customizable WebKit view. Create branded messages that engage your users with new content and information, all without having to update your app. Learn more about Rich Push - %1$s","富推送 (Rich Push) 允许您添加 HTML 和其他富媒体组件到您的推送通知中，从而达到创建和传送引人入胜的推送体验。超越常规提醒和应用程序图标标记更新，富推送将用户带入到应用程序的同时，在可定制的 WebKit 视图中显示内容。使用全新内容和信息来创建您的品牌消息吸引您的用户，无需更新您的应用程序。要了解关于富推送的贡多信息，请访问 - %1$s" -"SORT BY:","排序方式：" -"Sample","Sample" -"Samples","Samples" -"Save","保存" -"Save As","另存为" -"Save Theme","保存主题" -"Save and Continue Edit","保存并继续编辑" -"Save and Submit App","保存并提交App" -"Save in address book","保存到地址簿" -"Saving Address...","Saving Address..." -"Saving changes ...","Saving changes ..." -"Saving shipping address ...","Saving shipping address ..." -"Saving shipping methods ...","Saving shipping methods ..." -"Screen resolution is not supported","Screen resolution is not supported" -"Screens:","屏幕：" -"Scroll Background Color","卷动背景色" -"Search","搜索" -"Search Term","Search Term" -"Search Updated","Search Updated" -"Searching for %@...","Searching for %@..." -"Secondary Color","辅助颜色" -"Secondary Font Color","辅助字体颜色" -"See all","See all" -"Select %@","Select %@" -"Select All","全选" -"Select Chart","Select Chart" -"Select Links","Select Links" -"Select Options","Select Options" -"Select Payment Method","Select Payment Method" -"Select Range","Select Range" -"Select a","Select a" -"Select a Billing Address","Select a Billing Address" -"Select a Shipping Address","Select a Shipping Address" -"Select from Address Book","Select from Address Book" -"Select shipping method","Select shipping method" -"Selected product is unavailable.","所选产品不可用。" -"Send","Send" -"Sender Information","发送者信息" -"Sending e-mail failed...","Sending e-mail failed..." -"Set","Set" -"Settings","设置" -"Shake device to reset the filter","Shake device to reset the filter" -"Share","Share" -"Share on LinkedIn","Share on LinkedIn" -"Share on Twitter","Share on Twitter" -"Ship method","Ship method" -"Shipped","已发货" -"Shipping","Shipping" -"Shipping Address","送货地址" -"Shipping Method","运送方式" -"Shipping address","Shipping address" -"Shipping address has been set.","运行地址已设置。" -"Shipping method","Shipping method" -"Shipping method has been set.","运送方法已设置。" -"Shipping method is required","需要填写运送方式" -"Shipping method successfully updated","配送方式已成功更新" -"Shipping to this address is not possible.","无法运送到此地址。" -"Shop","商店" -"Shop All","Shop All" -"Shop Updated","Shop Updated" -"Shopping Cart","Shopping Cart" -"Shopping cart is empty.","购物车为空。" -"Show Password","Show Password" -"Sign In","Sign In" -"Signing In...","Signing In..." -"Signing Out ...","Signing Out ..." -"Sky Blue","天蓝" -"Social Networking","社交网络" -"Some emails were not sent.","某些邮件未发送" -"Sorry, no payment options are available for this order at this time.","对不起，该订单目前没有可用支付选项。" -"Sorry, no quotes are available for this order at this time.","抱歉，当前该订单中没有报价可用。" -"Sorry, there are no items in this category.","Sorry, there are no items in this category." -"Special","Special" -"Special Excl. Tax","Special Excl. Tax" -"Special Incl. Tax","Special Incl. Tax" -"Specific Countries","指定国家" -"Specified address does not exist.","指定的地址不存在。" -"Specified invalid app code.","指定了无效的App代码。" -"Specified invalid data.","指定了无效数据。" -"Specified item does not exist in wishlist.","指定的产品不在愿望清单中。" -"Standard Checkout","标准结账" -"Standard Checkout uses the checkout methods provided by Magento. Only inline payment methods are supported. (e.g PayPal Direct, Authorize.Net, etc.)","标准支付将使用Magento提供的支付方法。只能支持内联支付方法（例如e.g PayPal Direct, Authorize.Net,等）" -"Start Date","开始日期" -"Start Date - Month","开始日期 - 月" -"Start Date - Year","开始日期 - 年" -"Starting At","Starting At" -"Starting At Excl. Tax","Starting At Excl. Tax" -"Starting At Incl. Tax","Starting At Incl. Tax" -"Starting at excl. tax","Starting at excl. tax" -"Starting at incl. tax","Starting at incl. tax" -"State/Province","州/省" -"Status","状态" -"Storage of offline cart on server failed. Please retry later","Storage of offline cart on server failed. Please retry later" -"Store Credit Info Updated","Store Credit Info Updated" -"Store Credit payment is not being used in your shopping cart.","您的购物车尚未使用店铺信用支付。" -"Store View","店铺视图" -"Store credit","Store credit" -"Store logo that is displayed on copyright page of app.","Store logo that is displayed on copyright page of app." -"Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.","店铺徽标会显示在应用的版权页上。首选大小为：100px x 100px。" -"Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px.","店铺徽标会显示在应用的版权页上。首选大小为：200px x 200px。" -"Store switcher hasn\'t been defined","Store switcher hasn\'t been defined" -"Street Address","街道地址" -"Street Address 2","街道地址2" -"Subject:","Subject:" -"Submission","提交" -"Submission Fields","提交字段" -"Submission History","提交历史" -"Submit App","提交应用" -"Submit App ""%s""","提交应用 ""%s""" -"Submit App failure. %s","提交应用失败。""%s""" -"Submit App failure. Invalid activation key provided","提交应用失败。所提供的激活密钥无效" -"Submit Review","Submit Review" -"Submitted","已提交" -"Submitting Review...","Submitting Review..." -"Subtotal","Subtotal" -"Subtotal (Excl. Tax)","小计（不含税）" -"Subtotal (Incl. Tax)","小计（含税）" -"Subtotal Excl. Tax","Subtotal Excl. Tax" -"Subtotal Incl. Tax","Subtotal Incl. Tax" -"Subtotal excluding tax","Subtotal excluding tax" -"Subtotal incl. tax:","Subtotal incl. tax:" -"Subtotal including tax","Subtotal including tax" -"Subtotal:","Subtotal:" -"Success","Success" -"Successfully posted to Facebook","Successfully posted to Facebook" -"Successfully posted to Linkedin","Successfully posted to Linkedin" -"Suffix","后缀" -"Summary of Your Review","您的评测汇总" -"Swipe a product to reveal more options","Swipe a product to reveal more options" -"T-Shirts","T恤" -"Tabs","选项卡" -"Tax","传真" -"Telephone","电话" -"Tell a Friend","告诉朋友" -"Tell a Friend is disabled.","告诉朋友功能被禁用。" -"Tell a Friend link has been sent.","告诉朋友链接已发送。" -"Template","模板" -"Template Content","模板内容" -"Template Name","模板名称" -"Template does not exist.","模板不存在。" -"Template for new AirMail Message does not exist.","用于新的航空邮件信息的模板不存在。" -"Template has been deleted.","模板已删除。" -"Terms And Conditions","Terms And Conditions" -"Text length does not satisfy specified max text range.","文本长度不符合指定的最大文本范围。" -"Text length does not satisfy specified min text range.","文本长度不符合指定的最小文本范围。" -"Thank you for registering!","感谢您的注册！" -"Thank you for your purchase! ","感谢您的购买！" -"The %s field should be filled.","The %s field should be filled." -"The Mailbox title will be shown in the More Info tab. To understand more about the title, please click here","邮箱标题会显示在更多信息选项卡下。要详细了解该标题的信息，请 点击这里" -"The application is currently inactive.\nPlease try again later.","The application is currently inactive.\nPlease try again later." -"The cart is empty","The cart is empty" -"The custom amount value should be higher than 0.","The custom amount value should be higher than 0." -"The custom amount value should not be higher than %s.","The custom amount value should not be higher than %s." -"The custom amount value should not be lower than %s.","The custom amount value should not be lower than %s." -"The following email(s) are either mistyped or have incorrect format. Check them and try again:\n","The following email(s) are either mistyped or have incorrect format. Check them and try again:\n" -"The icon that appears in the Android Market.","The icon that appears in the Android Market." -"The icon that appears in the Android Market. Recommended size: 512px x 512px. Maximum size: 1024 KB.","该图标会显示在Android市场中。建议的大小：512px x 512px。最大尺寸：1024 KB。" -"The length of the text in the %s field is too big. Please shorten the text.","The length of the text in the %s field is too big. Please shorten the text." -"The max length of the field ""%@"" is %d!","The max length of the field ""%@"" is %d!" -"The minimum password length is 6","The minimum password length is 6" -"The server responded with invalid data.","The server responded with invalid data." -"The shortening service returned status code %d indicating a client side error.","The shortening service returned status code %d indicating a client side error." -"The shortening service returned status code %d indicating a server side error.","The shortening service returned status code %d indicating a server side error." -"The store credit payment has been removed from shopping cart.","该店铺信用支付已从购物车中删除。" -"The value is too big!","The value is too big!" -"The value should not be greater than %.2f!","The value should not be greater than %.2f!" -"The value should not be less than %.2f!","The value should not be less than %.2f!" -"Theme configurations are successfully reset.","这些配置已成功重设。" -"Theme has been created.","主题已创建。" -"Theme has been delete.","主题已被删除。" -"Theme label can\'t be empty","主题标签不能为空" -"Theme label:","主题标签：" -"Theme name is not set.","主题名称尚未设置。" -"There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?","There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?" -"There are no items here","There are no items here" -"There are no items in your cart","There are no items in your cart" -"There is an error in loading an app\'s configuration","There is an error in loading an app\'s configuration" -"There is an error in retrieving the data. Please try again later","There is an error in retrieving the data. Please try again later" -"There is no addresses for this contact","There is no addresses for this contact" -"There is no store credit history!","There is no store credit history!" -"There were some problems with the data.","数据有些问题。" -"This email address was not found in our records.","该电子邮件地址无法在我们的记录中找到。" -"This functionality disabled in offline mode","This functionality disabled in offline mode" -"This is a required field.","这是必填区域。" -"This product has no images.","This product has no images." -"Title","标题" -"Title bar","标题栏" -"To","To" -"To Excl. Tax","To Excl. Tax" -"To Incl. Tax","To Incl. Tax" -"To activate PayPal MEP payment method activate Express checkout first. ","要激活PayPal MEP支付方法，首先需要激活快速结账功能。" -"To excl. tax","To excl. tax" -"To incl. tax","To incl. tax" -"To preview the newly uploaded images, please save your application first.","To preview the newly uploaded images, please save your application first." -"To:","To:" -"Token has not been set.","令牌尚未设置。" -"Too many recipients have been set. Max amount of recipients is:","Too many recipients have been set. Max amount of recipients is:" -"Top Search Terms","Top Search Terms" -"Total","Total" -"Total Order Amount","Total Order Amount" -"Total incl. Tax: %1$s","含税总额：%1$s" -"Total incl. tax","Total incl. tax" -"Totals","Totals" -"Touch and hold a product to delete from shopping cart","Touch and hold a product to delete from shopping cart" -"Touch and hold a product to reveal more options","Touch and hold a product to reveal more options" -"Try Again","Try Again" -"Twitter","Twitter" -"Twitter API","Twitter API" -"Twitter API Key","Twitter API密钥" -"Twitter Authorization","Twitter Authorization" -"Twitter Autorization","Twitter Autorization" -"Twitter Secret Key","Twitter密码" -"Twitter post failed...","Twitter post failed..." -"Type","Type" -"Type and data is required","Type and data is required" -"URL","URL" -"Unable to cancel Mobile Express Checkout.","无法取消手机快速结帐。" -"Unable to cancel queue.","无法取消队列。" -"Unable to collect cart totals.","无法收集购物车总数。" -"Unable to delete queue.","无法删除队列。" -"Unable to find an app to delete.","无法找到要删除的应用。" -"Unable to find template to delete.","无法找到要删除的模板。" -"Unable to get shipping methods list.","无法获得运送方法列表。" -"Unable to initialize MEP Checkout.","无法初始化MEP支付。" -"Unable to initialize PayPal Mobile Express Checkout.","无法初始化贝宝手机快速结帐。" -"Unable to initialize express checkout review.","无法初始化快速结账审核。" -"Unable to initialize express checkout shipping method list.","无法初始化快速结账运送方式列表。" -"Unable to initialize return action.","无法初始化返回动作。" -"Unable to load addresses.","无法加载地址。" -"Unable to load application form.","无法加载应用程序表单。" -"Unable to load banners.","Unable to load banners." -"Unable to load billing address form.","无法加载帐单地址表单。" -"Unable to load billing address.","无法加载帐单地址。" -"Unable to load categories.","无法加载类别。" -"Unable to load checkout.","无法加载结账。" -"Unable to load localization.","Unable to load localization." -"Unable to load order list.","无法载入订购列表。" -"Unable to load order review.","无法载入订单审核。" -"Unable to load product gallery.","无法加载产品图库。" -"Unable to load product info.","无法加载产品信息。" -"Unable to load product options.","无法载入产品选项。" -"Unable to load product review.","无法加载商品评论。" -"Unable to load product reviews.","无法加载商品评论。" -"Unable to load review form.","无法载入审核表单。" -"Unable to load search.","无法加载搜索。" -"Unable to load shipping address form.","无法载入运送地址表单。" -"Unable to place the order.","无法下订单。" -"Unable to post the review.","无法发布该评测。" -"Unable to process preview.","无法处理预览。" -"Unable to render a gift card account.","无法提供礼品卡帐户。" -"Unable to render an order.","无法提供订单。" -"Unable to render downloadable products.","Unable to render downloadable products." -"Unable to render the store credits.","无法提供商店信贷。" -"Unable to save app.","无法保存应用。" -"Unable to save message.","无法保存信息。" -"Unable to save shipping address.","无法保存运送地址。" -"Unable to save shipping method.","无法保存运送方法。" -"Unable to save template.","无法保存模板。" -"Unable to start MEP Checkout.","无法开始MEP结账。" -"Unable to start Mobile Express Checkout.","无法启动手机快速结帐。" -"Unable to update shipping method.","无法更新送货方法。" -"Undefined","未定义" -"Unit Price","Unit Price" -"Unit Price:","Unit Price:" -"Unknown Error","未知错误" -"Unknown Error.","未知错误。" -"Unknown Payment Bridge Error","Unknown Payment Bridge Error" -"Unknown error ocured. Please retry later","Unknown error ocured. Please retry later" -"Unsupported character in path: ""%s""","路径 ""%s"" 包含不支持的字符" -"Unsupported value type received","接收到不支持的值类型" -"Update Comment Error","Update Comment Error" -"Update Preview","更新预览" -"Updating ...","Updating ..." -"Updating Cart...","Updating Cart..." -"Upon receiving these credentials, please fill in the corresponding fields.","接收到这些凭据后，请填写相应的字段。" -"Urban Airship Push Notification","Urban Airship推送通知" -"Use Billing Address","Use Billing Address" -"Use Store Credit (%s available)","使用商店信用点数（%s 可用）" -"Use as my default billing address","使用并作为我的默认账单地址" -"Use as my default shipping address","使用并作为我的默认运送地址" -"Use billing address for shipping","Use billing address for shipping" -"User Name:","User Name:" -"User session is expired","User session is expired" -"Version","Version" -"View Cart","View Cart" -"View Details","查看详情" -"View Gallery","查看画廊" -"View Wishlist","View Wishlist" -"Warning: All related AirMail messages will be deleted!","警告：所有相关的 AirMail 消息将被删除！" -"Website is offline","Website is offline" -"Website is offline.","网站已离线。" -"WishList Updated","WishList Updated" -"Wishlist has been cleared.","愿望列表已被清空。" -"Wishlist has been updated.","愿望清单已更新。" -"Wishlist has been updated. But there are accrued some errors while updating some items.","愿望清单已更新。但在更新某些商品时遇到了一些错误。" -"Wishlist is empty.","Wishlist is empty." -"Write a Review","Write a Review" -"Write a review","Write a review" -"Wrong Ipad background image orientation has been specified: ""%s"".","指定的iPad背景图像 ""%s"" 方向有误。" -"Wrong PayPal Mobile Express Checkout Token specified.","指定了错误的贝宝手机快速结帐令牌" -"Wrong device type.","设备类型有误。" -"Wrong email format","邮件格式有误。" -"Wrong or expired Gift Card Code.","礼品卡代码有误或已过期。" -"Wrong theme format.","主题格式有误。" -"YYYY","YYYY" -"Year","年" -"Yes","Yes" -"You are already logged in.","您已经登录了。" -"You are not logged in","You are not logged in" -"You can watch statistics here.","您可以在这里看到统计信息。" -"You canceled your order. Touch ""Pay with PayPal"" to try again.","You canceled your order. Touch ""Pay with PayPal"" to try again." -"You have entered an incorrect decimal value in the custom amount field. Provide a valid value.","You have entered an incorrect decimal value in the custom amount field. Provide a valid value." -"You have placed no orders.","You have placed no orders." -"You have uncommitted actions. Commit?","You have uncommitted actions. Commit?" -"You may also like","You may also like" -"You must login first","You must login first" -"You must read and agree to the Terms and Conditions before placing your order.","You must read and agree to the Terms and Conditions before placing your order." -"You need to enable PayPal Express Checkout first from the Payment configuration before enabling PayPal MECL.","您在启用贝宝 MECL 前，需要首先在贝宝的设置中启用贝宝快速结帐。" -"You will receive an order confirmation email with details of your order and a link to track its progress.","您将会收到一份内含订单详细信息和可查询进展情况链接的确认邮件" -"Your current balance is:","您的当前余额为：" -"Your order # is: %s. ","您的订单编号是：%s。" -"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it." -"Your order failed. Touch ""Pay with PayPal"" to try again.","Your order failed. Touch ""Pay with PayPal"" to try again." -"Your review has been accepted for moderation.","您的评测已被管理员批准。" -"Your tweet has been sent. Thanks for sharing this product on Twitter","Your tweet has been sent. Thanks for sharing this product on Twitter" -"Zip/Postal Code","邮政编码" -"\'%s\' exceeds the allowed file size: %d (bytes)","\'%s\' 超出了允许的文件大小: %d (字节)" -"\'%s\' height exceeds allowed value of %d px","\'%s\' 高度超过允许值 %d px" -"\'%s\' is not a valid file extension. Allowed extensions: %s","\'%s\' 不是有效的文件扩展名。允许的扩展名：%s" -"\'%s\' width exceeds allowed value of %d px","\'%s\' 的宽度值超过了允许的 %d 像素" -"and","和" -"as Guest","as Guest" -"each","每个" -"field is required","field is required" -"iPad","iPad" -"iPhone","iPhone" -"image_id is required","image_id is required" -"not set","not set" -"required","required" -"save","保存" -"ver. %s","版本 %s" diff --git a/app/locale/zh_CN/Phoenix_Moneybookers.csv b/app/locale/zh_CN/Phoenix_Moneybookers.csv deleted file mode 100644 index cf14e5b39..000000000 --- a/app/locale/zh_CN/Phoenix_Moneybookers.csv +++ /dev/null @@ -1,42 +0,0 @@ -"All Credit Cards / Visa, Mastercard, AMEX, JCB, Diners (powered by Moneybookers) - International","全部信用卡 / Visa，Mastercard，AMEX，JCB，Diners（由 Moneybookers 支持） - 国际" -"CartaSi (powered by Moneybookers) - Italy","CartaSi（由 Moneybookers 支持） - 意大利" -"Carte Bleue (powered by Moneybookers) - France","Carte Bleue（由 Moneybookers 支持） - 法国" -"Customer ID","客户ID" -"Dankort (powered by Moneybookers) - Denmark","Dankort（由 Moneybookers 支持） - 丹麦" -"EPS Online-Überweisung (powered by Moneybookers) - Austria","EPS Online-Überweisung（由 Moneybookers 支持） - 奥地利" -"Enabled","已启用" -"Find out more about Online Bank Transfer","了解更多关于在线银行转账的信息" -"Giropay (powered by Moneybookers) - Germany","Giropay（由 Moneybookers 支持） - 德国" -"Laser (powered by Moneybookers) - Ireland","Laser（由 Moneybookers 支持） - 爱尔兰" -"Lastschrift (ELV) (powered by Moneybookers) - Germany","Lastschrift (ELV)（由 Moneybookers 支持） - 德国" -"Loading secure payment page (SSL)","正在载入安全支付页面 (SSL)" -"Maestro (powered by Moneybookers) - United Kingdom, Austria, Spain","Maestro（由 Moneybookers 支持） - 英国，奥地利，西班牙" -"Moneybookers","Moneybookers" -"Moneybookers Settings","Moneybookers 设置" -"Moneybookers Transaction ID: %s","Moneybookers 交易 ID：%s" -"Moneybookers eWallet","Moneybookers 电子钱包" -"More information about Moneybookers","关于 Moneybookers 的更多信息" -"Nordea Solo (powered by Moneybookers) - Finland","Nordea Solo（由 Moneybookers 支持） - 芬兰" -"Nordea Solo (powered by Moneybookers) - Sweden","Nordea Solo（由 Moneybookers 支持） - 瑞典" -"Online Bank Transfer (powered by Moneybookers)","在线银行转账（由 Moneybookers 支持）" -"Order ID","订单 ID" -"POLi (powered by Moneybookers) - Australia","POLi（由 Moneybookers 支持） - 澳大利亚" -"Payment failed.","支付失败。" -"Payment from Applicable Countries","从可接受的国家支付" -"Payment from Specific Countries","从指定的国家支付" -"Payment has not been processed yet.","支付尚未处理。" -"Payment was canceled.","支付已被取消。" -"Pending bank transfer created.","创建了暂挂的银行转帐。" -"Please pay your order now","请立刻为您的订单付款" -"Postepay (powered by Moneybookers) - Italy","Postepay（由Moneybookers驱动） - 意大利" -"Powered by Moneybookers","由Moneybookers驱动" -"Przelewy24 (powered by Moneybookers) - Poland","Przelewy24（由Moneybookers驱动） - 波兰" -"Sofortüberweisung (powered by Moneybookers) - Germany","Sofortüberweisung（由Moneybookers驱动） - 德国" -"Sort Order","排序顺序" -"The amount has been authorized and captured by Moneybookers.","由Moneybookers授权并获取的额度。" -"The customer was redirected to Moneybookers.","客户已重定向到Moneybookers。" -"The order has been canceled.","订单已被取消。" -"Title","标题" -"You will be redirected to our secure payment page when you place an order.","在下订单时，您会被重定向到我们的安全支付页面。" -"eNETS (powered by Moneybookers) - Singapore","eNETS（由Moneybookers驱动） - 新加坡" -"iDeal (powered by Moneybookers) - Netherlands","iDeal（由Moneybookers驱动） - 荷兰" diff --git a/app/locale/zh_CN/template/email/account_new.html b/app/locale/zh_CN/template/email/account_new.html deleted file mode 100644 index 7f83c5446..000000000 --- a/app/locale/zh_CN/template/email/account_new.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}}
    -

    亲爱的{{htmlescape var=$customer.name}},

    -

    欢迎来到{{var store.getFrontendName()}}。访问本站时，如需登录请点击 登录 或 我的帐户 每一页的上方，然后输入您的电子邮件地址和密码.

    -

    - 如遇提示需登录时，请使用下列值:
    - 电子邮件: {{var customer.email}}
    - 密码: {{htmlescape var=$customer.password}}

    -

    登录您的账户后，即可进行下列操作:

    -
      -
    • – 购物时可更快速地结算
      • -
    • – 查看订单状态
      • -
    • – 查看过去的订单
      • -
    • – 修改账户信息
      • -
    • – 修改密码
      • -
    • – 存储备选地址（可将货物发送给不同的家庭成员和朋友！）
      • -
    -

    如果您有任何关于账户或其他方面的问题，请随时与我们联系 {{config path='trans_email/ident_support/email'}} 或致电 {{config path='general/store_information/phone'}}.

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/account_new_confirmation.html b/app/locale/zh_CN/template/email/account_new_confirmation.html deleted file mode 100644 index 04b4dbe1d..000000000 --- a/app/locale/zh_CN/template/email/account_new_confirmation.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    亲爱的{{htmlescape var=$customer.name}},

    -

    使用电子邮件 {{var customer.email}} 登录到我们的店铺时必须先进行邮件验证.

    -

    要验证电子邮件并立刻登录，请使用 本验证链接. 本链接仅一次有效.

    -

    - 如遇提示需登录时，请使用下列值:
    - 电子邮件: {{var customer.email}}
    - 密码: {{htmlescape var=$customer.password}}

    -

    如果您有任何关于账户或其他方面的问题，请随时与我们联系 {{config path='trans_email/ident_support/email'}} 或致电 {{config path='general/store_information/phone'}}.

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/account_new_confirmed.html b/app/locale/zh_CN/template/email/account_new_confirmed.html deleted file mode 100644 index 07f7481ba..000000000 --- a/app/locale/zh_CN/template/email/account_new_confirmed.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    亲爱的{{htmlescape var=$customer.name}},

    -

    欢迎来到{{var store.getFrontendName()}}。访问本站时，如需登录请点击 登录 或 我的帐户 每一页的上方，然后输入您的电子邮件地址和密码.

    -

    登录您的账户后，即可进行下列操作:

    -
      -
    • – 购物时可更快速地结算
      • -
    • – 查看订单状态
      • -
    • – 查看过去的订单
      • -
    • – 修改账户信息
      • -
    • – 修改密码
      • -
    • – 存储备选地址（可将货物发送给不同的家庭成员和朋友！）
      • -
    -

    如果您有任何关于账户或其他方面的问题，请随时与我们联系 {{config path='trans_email/ident_support/email'}} 或致电 {{config path='general/store_information/phone'}}.

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/account_password_reset_confirmation.html b/app/locale/zh_CN/template/email/account_password_reset_confirmation.html deleted file mode 100644 index f5fb5acf8..000000000 --- a/app/locale/zh_CN/template/email/account_password_reset_confirmation.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    亲爱的{{htmlescape var=$customer.name}},

    -

    您的账户近期有修改密码的请求.

    -

    如果您提出了申请，请点击如下链接重新设置密码: {{store url="customer/account/resetpassword/" _query_id=$customer.id _query_token=$customer.rp_token}}

    -

    如果点击无法进行链接，请将该 URL 复制并粘贴到浏览器中.

    -
    -

    如果您未提出申请，请忽略本信息并且您的密码将保持不变.

    -

    谢谢, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/zh_CN/template/email/admin_password_new.html b/app/locale/zh_CN/template/email/admin_password_new.html deleted file mode 100644 index d0c396ef9..000000000 --- a/app/locale/zh_CN/template/email/admin_password_new.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    亲爱的 {{htmlescape var=$user.name}},

    -

    您的新密码是: {{htmlescape var=$password}}

    -

    您可以通过登录您的账户随时修改密码 please note that this sentence and the above should be translated into one sentence in Chinese. So there would be no translation here.

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/admin_password_reset_confirmation.html b/app/locale/zh_CN/template/email/admin_password_reset_confirmation.html deleted file mode 100644 index edba24709..000000000 --- a/app/locale/zh_CN/template/email/admin_password_reset_confirmation.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - -
    - - - - -
    - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    亲爱的 {{htmlescape var=$user.name}},

    -

    您的账户近期有修改密码的请求.

    -

    如果您提出了申请，请点击如下链接重新设置密码: {{store url="adminhtml/index/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}

    -

    如果点击无法进行链接，请将该 URL 复制并粘贴到浏览器中.

    -
    -

    如果您未提出申请，请忽略本信息并且您的密码将保持不变.

    -

    谢谢, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/zh_CN/template/email/amazonpayments_asp_notification_error.html b/app/locale/zh_CN/template/email/amazonpayments_asp_notification_error.html deleted file mode 100644 index 9b19ada4a..000000000 --- a/app/locale/zh_CN/template/email/amazonpayments_asp_notification_error.html +++ /dev/null @@ -1,12 +0,0 @@ - - -
    -
    __('Amazon Simple Pay notification message')__
    -
    __('Request')__:
    -
    {{var request}}
    -
    __('Error')__:
    -
    {{var error}}
    -
    \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/contact_form.html b/app/locale/zh_CN/template/email/contact_form.html deleted file mode 100644 index 3250e3dfb..000000000 --- a/app/locale/zh_CN/template/email/contact_form.html +++ /dev/null @@ -1,12 +0,0 @@ - - -姓名：{{var data.name}} -电子邮件： {{var data.email}} -电话： {{var data.telephone}} - -备注： {{var data.comment}} \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/currency_update_warning.html b/app/locale/zh_CN/template/email/currency_update_warning.html deleted file mode 100644 index 3c4b30ef7..000000000 --- a/app/locale/zh_CN/template/email/currency_update_warning.html +++ /dev/null @@ -1,8 +0,0 @@ - - -货币更新警告: - - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/log_clean_warning.html b/app/locale/zh_CN/template/email/log_clean_warning.html deleted file mode 100644 index 050f90d71..000000000 --- a/app/locale/zh_CN/template/email/log_clean_warning.html +++ /dev/null @@ -1,7 +0,0 @@ - - -日志清除警告: - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/moneybookers_activateemail.html b/app/locale/zh_CN/template/email/moneybookers_activateemail.html deleted file mode 100644 index ac9f6c5c6..000000000 --- a/app/locale/zh_CN/template/email/moneybookers_activateemail.html +++ /dev/null @@ -1,6 +0,0 @@ - -{{var store.getFrontendName()}}
    -Moneybookers 电子邮件地址： {{var email_addr}}
    -Moneybookers 客户 ID：{{var customer_id}}
    -URL：{{var url}}
    -语言：{{var language}}
    diff --git a/app/locale/zh_CN/template/email/newsletter_subscr_confirm.html b/app/locale/zh_CN/template/email/newsletter_subscr_confirm.html deleted file mode 100644 index 64b72a196..000000000 --- a/app/locale/zh_CN/template/email/newsletter_subscr_confirm.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    谢谢您订阅我们的新闻通讯.

    -

    要开始接收新闻通讯，您必须首先点击以下链接确认订阅:
    - {{var subscriber.getConfirmationLink()}}

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/newsletter_subscr_success.html b/app/locale/zh_CN/template/email/newsletter_subscr_success.html deleted file mode 100644 index bb05fff1d..000000000 --- a/app/locale/zh_CN/template/email/newsletter_subscr_success.html +++ /dev/null @@ -1,2 +0,0 @@ - -新闻邮件订阅成功 \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/newsletter_unsub_success.html b/app/locale/zh_CN/template/email/newsletter_unsub_success.html deleted file mode 100644 index e3175f128..000000000 --- a/app/locale/zh_CN/template/email/newsletter_unsub_success.html +++ /dev/null @@ -1,2 +0,0 @@ - -新闻邮件退订成功 \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/password_new.html b/app/locale/zh_CN/template/email/password_new.html deleted file mode 100644 index e60ca697d..000000000 --- a/app/locale/zh_CN/template/email/password_new.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    亲爱的{{htmlescape var=$customer.name}},

    -

    您的新密码是: {{htmlescape var=$customer.password}}

    -

    您可以通过登录您的账户随时修改密码 please note that this sentence and the above should be translated into one sentence in Chinese. So there would be no translation here.

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - diff --git a/app/locale/zh_CN/template/email/payment_failed.html b/app/locale/zh_CN/template/email/payment_failed.html deleted file mode 100644 index e02fce2f9..000000000 --- a/app/locale/zh_CN/template/email/payment_failed.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - -
    交易失败.
    -

    - 原因
    - {{var reason}} -

    -

    - 收费类型
    - {{var checkoutType}} -

    -

    - 客户:
    - {{var customer}} <{{var customerEmail}}> -

    -

    - 收费项
    - {{var items}} -

    -

    - 总额:
    - {{var total}} -

    -

    - 账单地址:
    - {{var billingAddress.format('html')}} -

    -

    - 运输地址:
    - {{var shippingAddress.format('html')}} -

    -

    - 运输方式:
    - {{var shippingMethod}} -

    -

    - 交易方式:
    - {{var paymentMethod}} -

    -

    - 日期时间:
    - {{var dateAndTime}} -

    -
    \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/product_alert_cron_error.html b/app/locale/zh_CN/template/email/product_alert_cron_error.html deleted file mode 100644 index d35336fec..000000000 --- a/app/locale/zh_CN/template/email/product_alert_cron_error.html +++ /dev/null @@ -1,7 +0,0 @@ - - -产品警告cron警告: - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/product_price_alert.html b/app/locale/zh_CN/template/email/product_price_alert.html deleted file mode 100644 index cfda1f74a..000000000 --- a/app/locale/zh_CN/template/email/product_price_alert.html +++ /dev/null @@ -1,8 +0,0 @@ - - -您好， {{var customerName}}, - -{{var alertGrid}} \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/product_share.html b/app/locale/zh_CN/template/email/product_share.html deleted file mode 100644 index 8914f6d9f..000000000 --- a/app/locale/zh_CN/template/email/product_share.html +++ /dev/null @@ -1,13 +0,0 @@ - - - -欢迎您，{{htmlescape var=$name}}

    请看 {{var product_name}}

    这里是信息:
    {{var message}}

    \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/product_stock_alert.html b/app/locale/zh_CN/template/email/product_stock_alert.html deleted file mode 100644 index 5cd32c5f3..000000000 --- a/app/locale/zh_CN/template/email/product_stock_alert.html +++ /dev/null @@ -1,8 +0,0 @@ - - -您好， {{var customerName}}, - -{{var alertGrid}} \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/creditmemo_new.html b/app/locale/zh_CN/template/email/sales/creditmemo_new.html deleted file mode 100644 index b8ee9b3de..000000000 --- a/app/locale/zh_CN/template/email/sales/creditmemo_new.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    您好，{{htmlescape var=$order.getCustomerName()}}

    -

    - 感谢您来自{{var store.getFrontendName()}}的订单. - 您可以查看您的订单状态 登录您的账户. - 如果您有关于订单的任何问题，请联系我们 {{config path='trans_email/ident_support/email'}} 或者给我们打电话 {{config path='general/store_information/phone'}} 周一 - 周五，8:00-17:00 PST. -

    -
    -

    您的信用备忘录 #{{var creditmemo.increment_id}} for Order #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    账单信息:支付方式:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    运送信息:运送方式:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} -

    {{var comment}}

    -

    谢谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/creditmemo_new_guest.html b/app/locale/zh_CN/template/email/sales/creditmemo_new_guest.html deleted file mode 100644 index 464041979..000000000 --- a/app/locale/zh_CN/template/email/sales/creditmemo_new_guest.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    {{htmlescape var=$billing.getName()}}，你好

    -

    - 感谢您来自{{var store.getFrontendName()}}的订单. - 如果您有关于订单的任何问题，请联系我们 {{config path='trans_email/ident_support/email'}} 或者给我们打电话 {{config path='general/store_information/phone'}} 周一 - 周五，8:00-17:00 PST. -

    -
    -

    您的信用备忘录 #{{var creditmemo.increment_id}} for Order #{{var order.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    账单信息:支付方式:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    运送信息:运送方式:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} -

    {{var comment}}

    -

    谢谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/creditmemo_update.html b/app/locale/zh_CN/template/email/sales/creditmemo_update.html deleted file mode 100644 index 13a2f7a05..000000000 --- a/app/locale/zh_CN/template/email/sales/creditmemo_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    亲爱的{{htmlescape var=$order.getCustomerName()}},

    -

    - 您的订单 # {{var order.increment_id}} 已经
    - {{var order.getStatusLabel()}}. -

    -

    您可以查看您的订单状态 登录您的账户.

    -

    {{var comment}}

    -

    - 如果您有任何问题，请随时与我们联系 - {{config path='trans_email/ident_support/email'}} - 或致电 {{config path='general/store_information/phone'}}. -

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/creditmemo_update_guest.html b/app/locale/zh_CN/template/email/sales/creditmemo_update_guest.html deleted file mode 100644 index d7cad4c48..000000000 --- a/app/locale/zh_CN/template/email/sales/creditmemo_update_guest.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    亲爱的{{htmlescape var=$billing.getName()}},

    -

    - 您的订单 # {{var order.increment_id}} 已经
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - 如果您有任何问题，请随时与我们联系 - {{config path='trans_email/ident_support/email'}} - 或致电 {{config path='general/store_information/phone'}}. -

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/invoice_new.html b/app/locale/zh_CN/template/email/sales/invoice_new.html deleted file mode 100644 index 1cc5d9b02..000000000 --- a/app/locale/zh_CN/template/email/sales/invoice_new.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    您好，{{htmlescape var=$order.getCustomerName()}}

    -

    - 感谢您来自{{var store.getFrontendName()}}的订单. - 您可以查看您的订单状态 登录您的账户. - 如果您有关于订单的任何问题，请联系我们 {{config path='trans_email/ident_support/email'}} 或者给我们打电话 {{config path='general/store_information/phone'}} 周一 - 周五，8:00-17:00 PST. -

    -
    -

    您的订单 #{{var order.increment_id}}的发票 #{{var invoice.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    账单信息:支付方式:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    运送信息:运送方式:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}}  -
    -
    - {{/depend}} - {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} -

    {{var comment}}

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/invoice_new_guest.html b/app/locale/zh_CN/template/email/sales/invoice_new_guest.html deleted file mode 100644 index ab765b6f6..000000000 --- a/app/locale/zh_CN/template/email/sales/invoice_new_guest.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    {{htmlescape var=$billing.getName()}}，你好

    -

    - 感谢您来自{{var store.getFrontendName()}}的订单. - 如果您有关于订单的任何问题，请联系我们 {{config path='trans_email/ident_support/email'}} 或者给我们打电话 {{config path='general/store_information/phone'}} 周一 - 周五，8:00-17:00 PST. -

    -
    -

    您的订单 #{{var order.increment_id}}的发票 #{{var invoice.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    账单信息:支付方式:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    运送信息:运送方式:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} -

    {{var comment}}

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/invoice_update.html b/app/locale/zh_CN/template/email/sales/invoice_update.html deleted file mode 100644 index d0daff9b7..000000000 --- a/app/locale/zh_CN/template/email/sales/invoice_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    亲爱的{{htmlescape var=$order.getCustomerName()}},

    -

    - 您的订单 # {{var order.increment_id}} 已经
    - {{var order.getStatusLabel()}}. -

    -

    您可以查看您的订单状态 登录您的账户.

    -

    {{var comment}}

    -

    - 如果您有任何问题，请随时与我们联系 - {{config path='trans_email/ident_support/email'}} - 或致电 {{config path='general/store_information/phone'}}. -

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/invoice_update_guest.html b/app/locale/zh_CN/template/email/sales/invoice_update_guest.html deleted file mode 100644 index 52f7bbe32..000000000 --- a/app/locale/zh_CN/template/email/sales/invoice_update_guest.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    亲爱的{{htmlescape var=$billing.getName()}},

    -

    - __('Your order # {{var order.increment_id}} has been')__
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - 如果您有任何问题，请随时与我们联系 - {{config path='trans_email/ident_support/email'}} - 或致电 {{config path='general/store_information/phone'}}. -

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/order_new.html b/app/locale/zh_CN/template/email/sales/order_new.html deleted file mode 100644 index 3a5ce4def..000000000 --- a/app/locale/zh_CN/template/email/sales/order_new.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    您好，{{htmlescape var=$order.getCustomerName()}}

    -

    - 感谢您来自{{var store.getFrontendName()}}的订单. - 如果您打包送货，我们将邮件发送链接跟踪您的订单. - 您可以查看您的订单状态 登录您的账户. - 如果您有关于订单的任何问题，请联系我们 {{config path='trans_email/ident_support/email'}} 或者给我们打电话 {{config path='general/store_information/phone'}} 周一 - 周五，8:00-17:00 PST. -

    -

    下面是您的订单确认。再次感谢您购物.

    -
    -

    您的订单 #{{var order.increment_id}} （放在 {{var order.getCreatedAtFormated('long')}}）

    -
    - - - - - - - - - - - - - - - -
    账单信息:支付方式:
    - {{var order.getBillingAddress().format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    运送信息:运送方式:
    - {{var order.getShippingAddress().format('html')}} -   -   - {{var order.getShippingDescription()}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_items" order=$order}} -

    {{var order.getEmailCustomerNote()}}

    -

    谢谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/order_new_guest.html b/app/locale/zh_CN/template/email/sales/order_new_guest.html deleted file mode 100644 index 768cb417b..000000000 --- a/app/locale/zh_CN/template/email/sales/order_new_guest.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    您好，{{htmlescape var=$order.getBillingAddress().getName()}}

    -

    - 感谢您来自{{var store.getFrontendName()}}的订单. - 如果您打包送货，我们将邮件发送链接跟踪您的订单. - 如果您有关于订单的任何问题，请联系我们 {{config path='trans_email/ident_support/email'}} 或者给我们打电话 {{config path='general/store_information/phone'}} 周一 - 周五，8:00-17:00 PST. -

    -

    下面是您的订单确认。再次感谢您购物.

    -
    -

    您的订单 #{{var order.increment_id}} （放在 {{var order.getCreatedAtFormated('long')}}）

    -
    - - - - - - - - - - - - - - - -
    账单信息:支付方式:
    - {{var order.getBillingAddress().format('html')}} -   - {{var payment_html}} -
    -
    - {{depend order.getIsNotVirtual()}} - - - - - - - - - - - - - - - -
    运送信息:运送方式:
    - {{var order.getShippingAddress().format('html')}} -   -   - {{var order.getShippingDescription()}} -   -
    -
    - {{/depend}} - {{layout handle="sales_email_order_items" order=$order}} -

    {{var order.getEmailCustomerNote()}}

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/order_update.html b/app/locale/zh_CN/template/email/sales/order_update.html deleted file mode 100644 index b6ee24a7a..000000000 --- a/app/locale/zh_CN/template/email/sales/order_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    亲爱的{{htmlescape var=$order.getCustomerName()}},

    -

    - 您的订单 # {{var order.increment_id}} 已经
    - {{var order.getStatusLabel()}}. -

    -

    您可以查看您的订单状态 登录您的账户.

    -

    {{var comment}}

    -

    - 如果您有任何问题，请随时与我们联系 - {{config path='trans_email/ident_support/email'}} - 或致电 {{config path='general/store_information/phone'}}. -

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/order_update_guest.html b/app/locale/zh_CN/template/email/sales/order_update_guest.html deleted file mode 100644 index 2a8b56448..000000000 --- a/app/locale/zh_CN/template/email/sales/order_update_guest.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    亲爱的{{htmlescape var=$billing.getName()}},

    -

    - 您的订单 # {{var order.increment_id}} 已经
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - 如果您有任何问题，请随时与我们联系 - {{config path='trans_email/ident_support/email'}} - 或致电 {{config path='general/store_information/phone'}}. -

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/shipment_new.html b/app/locale/zh_CN/template/email/sales/shipment_new.html deleted file mode 100644 index 89958e75d..000000000 --- a/app/locale/zh_CN/template/email/sales/shipment_new.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    您好，{{htmlescape var=$order.getCustomerName()}}

    -

    - 感谢您来自{{var store.getFrontendName()}}的订单. - 您可以查看您的订单状态 登录您的账户. - 如果您有关于订单的任何问题，请联系我们 {{config path='trans_email/ident_support/email'}} 或者给我们打电话 {{config path='general/store_information/phone'}} 周一 - 周五，8:00-17:00 PST. -

    -

    - 您的发货信息如下。再次感谢您的光临. -

    -
    -

    您订单 #{{var order.increment_id}} 的运单 #{{var shipment.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    账单信息:支付方式:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - - - - - - - - - - - - - - - -
    运送信息:运送方式:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -

    {{var comment}}

    -

    谢谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/shipment_new_guest.html b/app/locale/zh_CN/template/email/sales/shipment_new_guest.html deleted file mode 100644 index 5c9a4ed46..000000000 --- a/app/locale/zh_CN/template/email/sales/shipment_new_guest.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    {{htmlescape var=$billing.getName()}}，你好

    -

    - 感谢您来自{{var store.getFrontendName()}}的订单. - 如果您有关于订单的任何问题，请联系我们 {{config path='trans_email/ident_support/email'}} 或者给我们打电话 {{config path='general/store_information/phone'}} 周一 - 周五，8:00-17:00 PST. -

    -

    - 您的发货信息如下。再次感谢您的光临. -

    -
    -

    您订单 #{{var order.increment_id}} 的运单 #{{var shipment.increment_id}}

    -
    - - - - - - - - - - - - - - - -
    账单信息:支付方式:
    - {{var order.billing_address.format('html')}} -   - {{var payment_html}} -
    -
    - - - - - - - - - - - - - - - -
    运送信息:运送方式:
    - {{var order.shipping_address.format('html')}} -   -   - {{var order.shipping_description}} -   -
    -
    - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -

    {{var comment}}

    -

    谢谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/shipment_update.html b/app/locale/zh_CN/template/email/sales/shipment_update.html deleted file mode 100644 index d11c0e3a8..000000000 --- a/app/locale/zh_CN/template/email/sales/shipment_update.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    亲爱的{{htmlescape var=$order.getCustomerName()}},

    -

    - 您的订单 # {{var order.increment_id}} 已经
    - {{var order.getStatusLabel()}}. -

    -

    您可以查看您的订单状态 登录您的账户.

    -

    {{var comment}}

    -

    - 如果您有任何问题，请随时与我们联系 - {{config path='trans_email/ident_support/email'}} - 或致电 {{config path='general/store_information/phone'}}. -

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sales/shipment_update_guest.html b/app/locale/zh_CN/template/email/sales/shipment_update_guest.html deleted file mode 100644 index b69ba840b..000000000 --- a/app/locale/zh_CN/template/email/sales/shipment_update_guest.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    {{var logo_alt}}
    -

    亲爱的{{htmlescape var=$billing.getName()}},

    -

    - 您的订单 # {{var order.increment_id}} 已经
    - {{var order.getStatusLabel()}}. -

    -

    {{var comment}}

    -

    - 如果您有任何问题，请随时与我们联系 - {{config path='trans_email/ident_support/email'}} - 或致电 {{config path='general/store_information/phone'}}. -

    -

    再次向您表示感谢, {{var store.getFrontendName()}}

    -
    -
    - \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/sitemap_generate_warning.html b/app/locale/zh_CN/template/email/sitemap_generate_warning.html deleted file mode 100644 index 8413045e6..000000000 --- a/app/locale/zh_CN/template/email/sitemap_generate_warning.html +++ /dev/null @@ -1,8 +0,0 @@ - - -站点地图生成警告: - - -{{var warnings}} \ No newline at end of file diff --git a/app/locale/zh_CN/template/email/token.html b/app/locale/zh_CN/template/email/token.html deleted file mode 100644 index 150948ecf..000000000 --- a/app/locale/zh_CN/template/email/token.html +++ /dev/null @@ -1,9 +0,0 @@ - - - -{{htmlescape var=$userName}}，您好

    -您的授权 {{htmlescape var=$applicationName}} 已被更改为 {{htmlescape var=$status}} 操作者是管理团队.

    diff --git a/app/locale/zh_CN/template/email/wishlist_share.html b/app/locale/zh_CN/template/email/wishlist_share.html deleted file mode 100644 index 38a79e92a..000000000 --- a/app/locale/zh_CN/template/email/wishlist_share.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    - {{var logo_alt}} -
    -

    嘿,
    看看我在 {{var store.getFrontendName()}} 的愿望清单吧.

    -

    {{var message}}

    - {{var items}} -
    - {{depend salable}}

    将所有内容加入购物车 |{{/depend}} 查看所有愿望清单项目

    -

    谢谢, {{htmlescape var=$customer.name}}

    -
    -
    - \ No newline at end of file diff --git a/composer.json b/composer.json deleted file mode 100644 index 3aa84716a..000000000 --- a/composer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "magento/core", - "license": "OSL-3.0", - "type": "magento-core", - "description": "Magento Core", - "homepage": "http://www.magentocommerce.com/", - "require": { - "magento-hackathon/magento-composer-installer": "*" - }, - "require-dev": { - }, - "extra": { - "magento-root-dir": "root/" - } -} \ No newline at end of file diff --git a/downloader/Maged/Connect.php b/downloader/Maged/Connect.php index e7610c4c1..5be577a96 100644 --- a/downloader/Maged/Connect.php +++ b/downloader/Maged/Connect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/Maged/Connect/Frontend.php b/downloader/Maged/Connect/Frontend.php index c35105c68..6cd8e771b 100644 --- a/downloader/Maged/Connect/Frontend.php +++ b/downloader/Maged/Connect/Frontend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -136,12 +136,11 @@ public function confirm($string) } /** - * Retrieve output cache - * - * @param bool $clearPrevious - * @return array|mixed - */ - public function getOutput($clearPrevious = false) + * Retrieve output cache + * + * @return array + */ + public function getOutput() { return $this->_out; } diff --git a/downloader/Maged/Controller.php b/downloader/Maged/Controller.php index fd6c0ffc0..bd20039dd 100644 --- a/downloader/Maged/Controller.php +++ b/downloader/Maged/Controller.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -770,23 +770,6 @@ public function url(http://github.com/$action%20=%20'',%20$params%20=%20array()) return sprintf('%s?%s=%s%s', $_SERVER['SCRIPT_NAME'], self::ACTION_KEY, rawurlencode($action), $args); } - /** - * Add domain policy header according to admin area settings - */ - protected function _addDomainPolicyHeader() - { - if (class_exists('Mage') && Mage::isInstalled()) { - /** @var Mage_Core_Model_Domainpolicy $domainPolicy */ - $domainPolicy = Mage::getModel('core/domainpolicy'); - if ($domainPolicy) { - $policy = $domainPolicy->getBackendPolicy(); - if ($policy) { - header('X-Frame-Options: ' . $policy); - } - } - } - } - /** * Dispatch process */ @@ -794,8 +777,6 @@ public function dispatch() { header('Content-type: text/html; charset=UTF-8'); - $this->_addDomainPolicyHeader(); - $this->setAction(); if (!$this->isInstalled()) { @@ -1015,9 +996,9 @@ public static function getVersionInfo() { return array( 'major' => '1', - 'minor' => '9', - 'revision' => '0', - 'patch' => '1', + 'minor' => '8', + 'revision' => '1', + 'patch' => '0', 'stability' => '', 'number' => '', ); diff --git a/downloader/Maged/Exception.php b/downloader/Maged/Exception.php index bcf9ce52d..172df9559 100644 --- a/downloader/Maged/Exception.php +++ b/downloader/Maged/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/Maged/Model.php b/downloader/Maged/Model.php index c8d46fc5b..87f9f0ed6 100644 --- a/downloader/Maged/Model.php +++ b/downloader/Maged/Model.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/Maged/Model/Config.php b/downloader/Maged/Model/Config.php index cded897a5..f0f2cc2fe 100644 --- a/downloader/Maged/Model/Config.php +++ b/downloader/Maged/Model/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/Maged/Model/Config/Abstract.php b/downloader/Maged/Model/Config/Abstract.php index 25e6182c1..a9b9af7ce 100644 --- a/downloader/Maged/Model/Config/Abstract.php +++ b/downloader/Maged/Model/Config/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/Maged/Model/Config/Community.php b/downloader/Maged/Model/Config/Community.php index 2c4c7001a..1ac7376b9 100644 --- a/downloader/Maged/Model/Config/Community.php +++ b/downloader/Maged/Model/Config/Community.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/Maged/Model/Config/Interface.php b/downloader/Maged/Model/Config/Interface.php index b41df810a..2fcad40a9 100644 --- a/downloader/Maged/Model/Config/Interface.php +++ b/downloader/Maged/Model/Config/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/Maged/Model/Connect.php b/downloader/Maged/Model/Connect.php index 4039910cd..ec11e3037 100644 --- a/downloader/Maged/Model/Connect.php +++ b/downloader/Maged/Model/Connect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/Maged/Model/Connect/Request.php b/downloader/Maged/Model/Connect/Request.php index 008640229..e1c77fb3a 100644 --- a/downloader/Maged/Model/Connect/Request.php +++ b/downloader/Maged/Model/Connect/Request.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/Maged/Model/Dowloader.php b/downloader/Maged/Model/Dowloader.php index 50c68a516..ec2a3e756 100644 --- a/downloader/Maged/Model/Dowloader.php +++ b/downloader/Maged/Model/Dowloader.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/Maged/Model/Session.php b/downloader/Maged/Model/Session.php index 05d623618..8dff44dfe 100644 --- a/downloader/Maged/Model/Session.php +++ b/downloader/Maged/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/Maged/View.php b/downloader/Maged/View.php index b8fcd815d..b7ec9b293 100644 --- a/downloader/Maged/View.php +++ b/downloader/Maged/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/index.php b/downloader/index.php index bb8fd427e..0acb5bb59 100644 --- a/downloader/index.php +++ b/downloader/index.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Archive.php b/downloader/lib/Mage/Archive.php index 30838a4c3..b94dd7619 100644 --- a/downloader/lib/Mage/Archive.php +++ b/downloader/lib/Mage/Archive.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Archive - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Archive/Abstract.php b/downloader/lib/Mage/Archive/Abstract.php index 9eef87325..549bc084d 100644 --- a/downloader/lib/Mage/Archive/Abstract.php +++ b/downloader/lib/Mage/Archive/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Archive - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Archive/Bz.php b/downloader/lib/Mage/Archive/Bz.php index 9d5f0e680..b2dc11538 100644 --- a/downloader/lib/Mage/Archive/Bz.php +++ b/downloader/lib/Mage/Archive/Bz.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Archive - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Archive/Gz.php b/downloader/lib/Mage/Archive/Gz.php index a759d8ee5..ce9ad38c3 100644 --- a/downloader/lib/Mage/Archive/Gz.php +++ b/downloader/lib/Mage/Archive/Gz.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Archive - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Archive/Helper/File.php b/downloader/lib/Mage/Archive/Helper/File.php index a026acbe5..916548045 100644 --- a/downloader/lib/Mage/Archive/Helper/File.php +++ b/downloader/lib/Mage/Archive/Helper/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Archive - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Archive/Helper/File/Bz.php b/downloader/lib/Mage/Archive/Helper/File/Bz.php index d78e57b4f..b31662e31 100644 --- a/downloader/lib/Mage/Archive/Helper/File/Bz.php +++ b/downloader/lib/Mage/Archive/Helper/File/Bz.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Archive - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Archive/Helper/File/Gz.php b/downloader/lib/Mage/Archive/Helper/File/Gz.php index d84e3cf14..0dc74520e 100644 --- a/downloader/lib/Mage/Archive/Helper/File/Gz.php +++ b/downloader/lib/Mage/Archive/Helper/File/Gz.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Archive - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Archive/Interface.php b/downloader/lib/Mage/Archive/Interface.php index 2461308f0..c52cb9a30 100644 --- a/downloader/lib/Mage/Archive/Interface.php +++ b/downloader/lib/Mage/Archive/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Archive - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Archive/Tar.php b/downloader/lib/Mage/Archive/Tar.php index df20d89b6..fb7847c20 100644 --- a/downloader/lib/Mage/Archive/Tar.php +++ b/downloader/lib/Mage/Archive/Tar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Archive - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Autoload/Simple.php b/downloader/lib/Mage/Autoload/Simple.php index a42118202..e07b57158 100644 --- a/downloader/lib/Mage/Autoload/Simple.php +++ b/downloader/lib/Mage/Autoload/Simple.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Autoload - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +46,7 @@ public function autoload($class) { $classFile = str_replace(' ', DIRECTORY_SEPARATOR, ucwords(str_replace('_', ' ', $class))); $classFile.= '.php'; - include_once($classFile); + @include $classFile; } } diff --git a/downloader/lib/Mage/Backup.php b/downloader/lib/Mage/Backup.php index e2f215c84..b4632b1c0 100644 --- a/downloader/lib/Mage/Backup.php +++ b/downloader/lib/Mage/Backup.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Abstract.php b/downloader/lib/Mage/Backup/Abstract.php index 448d548a0..bc5f81d74 100644 --- a/downloader/lib/Mage/Backup/Abstract.php +++ b/downloader/lib/Mage/Backup/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Archive/Tar.php b/downloader/lib/Mage/Backup/Archive/Tar.php index 5204adfd4..7d63e047b 100644 --- a/downloader/lib/Mage/Backup/Archive/Tar.php +++ b/downloader/lib/Mage/Backup/Archive/Tar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Db.php b/downloader/lib/Mage/Backup/Db.php index 3fa1047df..fab6e21e7 100644 --- a/downloader/lib/Mage/Backup/Db.php +++ b/downloader/lib/Mage/Backup/Db.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Exception.php b/downloader/lib/Mage/Backup/Exception.php index 0b6b0f1f3..766913cb8 100644 --- a/downloader/lib/Mage/Backup/Exception.php +++ b/downloader/lib/Mage/Backup/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Exception/CantLoadSnapshot.php b/downloader/lib/Mage/Backup/Exception/CantLoadSnapshot.php index 8ff86dbfd..cf2b92ec3 100644 --- a/downloader/lib/Mage/Backup/Exception/CantLoadSnapshot.php +++ b/downloader/lib/Mage/Backup/Exception/CantLoadSnapshot.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Exception/FtpConnectionFailed.php b/downloader/lib/Mage/Backup/Exception/FtpConnectionFailed.php index 1a3c64a05..5b2ec25a1 100644 --- a/downloader/lib/Mage/Backup/Exception/FtpConnectionFailed.php +++ b/downloader/lib/Mage/Backup/Exception/FtpConnectionFailed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Exception/FtpValidationFailed.php b/downloader/lib/Mage/Backup/Exception/FtpValidationFailed.php index fe7a20d0c..d57e82faf 100644 --- a/downloader/lib/Mage/Backup/Exception/FtpValidationFailed.php +++ b/downloader/lib/Mage/Backup/Exception/FtpValidationFailed.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Exception/NotEnoughFreeSpace.php b/downloader/lib/Mage/Backup/Exception/NotEnoughFreeSpace.php index 02e6324f3..f1834204a 100644 --- a/downloader/lib/Mage/Backup/Exception/NotEnoughFreeSpace.php +++ b/downloader/lib/Mage/Backup/Exception/NotEnoughFreeSpace.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Exception/NotEnoughPermissions.php b/downloader/lib/Mage/Backup/Exception/NotEnoughPermissions.php index ccbd4d940..729dab6b8 100644 --- a/downloader/lib/Mage/Backup/Exception/NotEnoughPermissions.php +++ b/downloader/lib/Mage/Backup/Exception/NotEnoughPermissions.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Filesystem.php b/downloader/lib/Mage/Backup/Filesystem.php index c108064b5..de806a6da 100644 --- a/downloader/lib/Mage/Backup/Filesystem.php +++ b/downloader/lib/Mage/Backup/Filesystem.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Filesystem/Helper.php b/downloader/lib/Mage/Backup/Filesystem/Helper.php index 395ad7477..59f248526 100644 --- a/downloader/lib/Mage/Backup/Filesystem/Helper.php +++ b/downloader/lib/Mage/Backup/Filesystem/Helper.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Filesystem/Iterator/File.php b/downloader/lib/Mage/Backup/Filesystem/Iterator/File.php index bffca6784..a52caa522 100644 --- a/downloader/lib/Mage/Backup/Filesystem/Iterator/File.php +++ b/downloader/lib/Mage/Backup/Filesystem/Iterator/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Filesystem/Iterator/Filter.php b/downloader/lib/Mage/Backup/Filesystem/Iterator/Filter.php index 0cb5b122b..b25a4ebc5 100644 --- a/downloader/lib/Mage/Backup/Filesystem/Iterator/Filter.php +++ b/downloader/lib/Mage/Backup/Filesystem/Iterator/Filter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Filesystem/Rollback/Abstract.php b/downloader/lib/Mage/Backup/Filesystem/Rollback/Abstract.php index 199b64e95..e978ecb2b 100644 --- a/downloader/lib/Mage/Backup/Filesystem/Rollback/Abstract.php +++ b/downloader/lib/Mage/Backup/Filesystem/Rollback/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Filesystem/Rollback/Fs.php b/downloader/lib/Mage/Backup/Filesystem/Rollback/Fs.php index e93290109..2722dd8b4 100644 --- a/downloader/lib/Mage/Backup/Filesystem/Rollback/Fs.php +++ b/downloader/lib/Mage/Backup/Filesystem/Rollback/Fs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Filesystem/Rollback/Ftp.php b/downloader/lib/Mage/Backup/Filesystem/Rollback/Ftp.php index 733590545..d80a57dc8 100644 --- a/downloader/lib/Mage/Backup/Filesystem/Rollback/Ftp.php +++ b/downloader/lib/Mage/Backup/Filesystem/Rollback/Ftp.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Interface.php b/downloader/lib/Mage/Backup/Interface.php index 96a544451..6e69cc311 100644 --- a/downloader/lib/Mage/Backup/Interface.php +++ b/downloader/lib/Mage/Backup/Interface.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Media.php b/downloader/lib/Mage/Backup/Media.php index 19158514c..3c3f25063 100644 --- a/downloader/lib/Mage/Backup/Media.php +++ b/downloader/lib/Mage/Backup/Media.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Nomedia.php b/downloader/lib/Mage/Backup/Nomedia.php index e96f2b888..aba4c8b38 100644 --- a/downloader/lib/Mage/Backup/Nomedia.php +++ b/downloader/lib/Mage/Backup/Nomedia.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Backup/Snapshot.php b/downloader/lib/Mage/Backup/Snapshot.php index 70fa888d9..852956e19 100644 --- a/downloader/lib/Mage/Backup/Snapshot.php +++ b/downloader/lib/Mage/Backup/Snapshot.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Channel/Generator.php b/downloader/lib/Mage/Connect/Channel/Generator.php index 5d8f0f822..4973e1ce6 100644 --- a/downloader/lib/Mage/Connect/Channel/Generator.php +++ b/downloader/lib/Mage/Connect/Channel/Generator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Channel/Parser.php b/downloader/lib/Mage/Connect/Channel/Parser.php index 2bcd48530..4b7acfcbd 100644 --- a/downloader/lib/Mage/Connect/Channel/Parser.php +++ b/downloader/lib/Mage/Connect/Channel/Parser.php @@ -20,6 +20,6 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Channel/VO.php b/downloader/lib/Mage/Connect/Channel/VO.php index 697e72f9d..282c772f6 100644 --- a/downloader/lib/Mage/Connect/Channel/VO.php +++ b/downloader/lib/Mage/Connect/Channel/VO.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Command.php b/downloader/lib/Mage/Connect/Command.php index 588f48e1d..71268c9a8 100644 --- a/downloader/lib/Mage/Connect/Command.php +++ b/downloader/lib/Mage/Connect/Command.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Command/Channels.php b/downloader/lib/Mage/Connect/Command/Channels.php index 6d9eac292..d810b6ec7 100644 --- a/downloader/lib/Mage/Connect/Command/Channels.php +++ b/downloader/lib/Mage/Connect/Command/Channels.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Command/Channels_Header.php b/downloader/lib/Mage/Connect/Command/Channels_Header.php index 299ceacb9..21940428f 100644 --- a/downloader/lib/Mage/Connect/Command/Channels_Header.php +++ b/downloader/lib/Mage/Connect/Command/Channels_Header.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Command/Config.php b/downloader/lib/Mage/Connect/Command/Config.php index d6236df86..60a2c649a 100644 --- a/downloader/lib/Mage/Connect/Command/Config.php +++ b/downloader/lib/Mage/Connect/Command/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Command/Config_Header.php b/downloader/lib/Mage/Connect/Command/Config_Header.php index 334bd1c2a..370d78f07 100644 --- a/downloader/lib/Mage/Connect/Command/Config_Header.php +++ b/downloader/lib/Mage/Connect/Command/Config_Header.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Command/Install.php b/downloader/lib/Mage/Connect/Command/Install.php index 8cd8e3f62..e13699044 100644 --- a/downloader/lib/Mage/Connect/Command/Install.php +++ b/downloader/lib/Mage/Connect/Command/Install.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ final class Mage_Connect_Command_Install extends Mage_Connect_Command diff --git a/downloader/lib/Mage/Connect/Command/Install_Header.php b/downloader/lib/Mage/Connect/Command/Install_Header.php index c1a6ac76d..fcba82b8f 100644 --- a/downloader/lib/Mage/Connect/Command/Install_Header.php +++ b/downloader/lib/Mage/Connect/Command/Install_Header.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Command/Package.php b/downloader/lib/Mage/Connect/Command/Package.php index 5cf6c1c25..4fd440ff1 100644 --- a/downloader/lib/Mage/Connect/Command/Package.php +++ b/downloader/lib/Mage/Connect/Command/Package.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Command/Package_Header.php b/downloader/lib/Mage/Connect/Command/Package_Header.php index e49750c50..6b1152395 100644 --- a/downloader/lib/Mage/Connect/Command/Package_Header.php +++ b/downloader/lib/Mage/Connect/Command/Package_Header.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Command/Registry.php b/downloader/lib/Mage/Connect/Command/Registry.php index 59ff46764..5a1030aa1 100644 --- a/downloader/lib/Mage/Connect/Command/Registry.php +++ b/downloader/lib/Mage/Connect/Command/Registry.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Command/Registry_Header.php b/downloader/lib/Mage/Connect/Command/Registry_Header.php index bbf154afb..0d4f8cd7e 100644 --- a/downloader/lib/Mage/Connect/Command/Registry_Header.php +++ b/downloader/lib/Mage/Connect/Command/Registry_Header.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Command/Remote.php b/downloader/lib/Mage/Connect/Command/Remote.php index d36c4bcc8..768775abd 100644 --- a/downloader/lib/Mage/Connect/Command/Remote.php +++ b/downloader/lib/Mage/Connect/Command/Remote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Command/Remote_Header.php b/downloader/lib/Mage/Connect/Command/Remote_Header.php index ed7af5eae..799739bea 100644 --- a/downloader/lib/Mage/Connect/Command/Remote_Header.php +++ b/downloader/lib/Mage/Connect/Command/Remote_Header.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Config.php b/downloader/lib/Mage/Connect/Config.php index 0369cd8cf..b2947d406 100644 --- a/downloader/lib/Mage/Connect/Config.php +++ b/downloader/lib/Mage/Connect/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Converter.php b/downloader/lib/Mage/Connect/Converter.php index f02277cfa..17004bf16 100644 --- a/downloader/lib/Mage/Connect/Converter.php +++ b/downloader/lib/Mage/Connect/Converter.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Frontend.php b/downloader/lib/Mage/Connect/Frontend.php index 251395ad4..275f99505 100644 --- a/downloader/lib/Mage/Connect/Frontend.php +++ b/downloader/lib/Mage/Connect/Frontend.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Connect_Frontend diff --git a/downloader/lib/Mage/Connect/Frontend/CLI.php b/downloader/lib/Mage/Connect/Frontend/CLI.php index a64de4d4d..39867ba90 100644 --- a/downloader/lib/Mage/Connect/Frontend/CLI.php +++ b/downloader/lib/Mage/Connect/Frontend/CLI.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Ftp.php b/downloader/lib/Mage/Connect/Ftp.php index 14604e400..549d6581f 100644 --- a/downloader/lib/Mage/Connect/Ftp.php +++ b/downloader/lib/Mage/Connect/Ftp.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Loader.php b/downloader/lib/Mage/Connect/Loader.php index 2306a369f..de2503621 100644 --- a/downloader/lib/Mage/Connect/Loader.php +++ b/downloader/lib/Mage/Connect/Loader.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Loader/Ftp.php b/downloader/lib/Mage/Connect/Loader/Ftp.php index 0d0b856fa..d8510ebd7 100644 --- a/downloader/lib/Mage/Connect/Loader/Ftp.php +++ b/downloader/lib/Mage/Connect/Loader/Ftp.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Package.php b/downloader/lib/Mage/Connect/Package.php index f68d9d66d..a290773f5 100644 --- a/downloader/lib/Mage/Connect/Package.php +++ b/downloader/lib/Mage/Connect/Package.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Package/Hotfix.php b/downloader/lib/Mage/Connect/Package/Hotfix.php index db7685dd4..b6c3aad0f 100644 --- a/downloader/lib/Mage/Connect/Package/Hotfix.php +++ b/downloader/lib/Mage/Connect/Package/Hotfix.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Package/Reader.php b/downloader/lib/Mage/Connect/Package/Reader.php index 74747df2d..15e965a7c 100644 --- a/downloader/lib/Mage/Connect/Package/Reader.php +++ b/downloader/lib/Mage/Connect/Package/Reader.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Package/Target.php b/downloader/lib/Mage/Connect/Package/Target.php index a5df1beb9..2b50cb364 100644 --- a/downloader/lib/Mage/Connect/Package/Target.php +++ b/downloader/lib/Mage/Connect/Package/Target.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Package/VO.php b/downloader/lib/Mage/Connect/Package/VO.php index a89d729e0..f0e6dfb5d 100644 --- a/downloader/lib/Mage/Connect/Package/VO.php +++ b/downloader/lib/Mage/Connect/Package/VO.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Package/Writer.php b/downloader/lib/Mage/Connect/Package/Writer.php index 903f75d44..0e031613d 100644 --- a/downloader/lib/Mage/Connect/Package/Writer.php +++ b/downloader/lib/Mage/Connect/Package/Writer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Packager.php b/downloader/lib/Mage/Connect/Packager.php index 3336a8aa6..3fa3002a0 100644 --- a/downloader/lib/Mage/Connect/Packager.php +++ b/downloader/lib/Mage/Connect/Packager.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Rest.php b/downloader/lib/Mage/Connect/Rest.php index 7c58ecbbf..01c74cc5d 100644 --- a/downloader/lib/Mage/Connect/Rest.php +++ b/downloader/lib/Mage/Connect/Rest.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Singleconfig.php b/downloader/lib/Mage/Connect/Singleconfig.php index ef1131eba..567ba8b2b 100644 --- a/downloader/lib/Mage/Connect/Singleconfig.php +++ b/downloader/lib/Mage/Connect/Singleconfig.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Structures/Graph.php b/downloader/lib/Mage/Connect/Structures/Graph.php index 46fef6b6e..f3d29b6da 100644 --- a/downloader/lib/Mage/Connect/Structures/Graph.php +++ b/downloader/lib/Mage/Connect/Structures/Graph.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Structures/Node.php b/downloader/lib/Mage/Connect/Structures/Node.php index a26699035..74ab00d5f 100644 --- a/downloader/lib/Mage/Connect/Structures/Node.php +++ b/downloader/lib/Mage/Connect/Structures/Node.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Connect/Validator.php b/downloader/lib/Mage/Connect/Validator.php index d28cb08d6..f54f55b42 100644 --- a/downloader/lib/Mage/Connect/Validator.php +++ b/downloader/lib/Mage/Connect/Validator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/DB/Exception.php b/downloader/lib/Mage/DB/Exception.php index 3bbeaedc2..08e7be583 100644 --- a/downloader/lib/Mage/DB/Exception.php +++ b/downloader/lib/Mage/DB/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_DB - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/DB/Mysqli.php b/downloader/lib/Mage/DB/Mysqli.php index 71d2e92b8..8bc79f502 100644 --- a/downloader/lib/Mage/DB/Mysqli.php +++ b/downloader/lib/Mage/DB/Mysqli.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_DB - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Exception.php b/downloader/lib/Mage/Exception.php index 48507d21b..11371d5b0 100644 --- a/downloader/lib/Mage/Exception.php +++ b/downloader/lib/Mage/Exception.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Exception - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/HTTP/Client.php b/downloader/lib/Mage/HTTP/Client.php index 8df682bad..93a4ade37 100644 --- a/downloader/lib/Mage/HTTP/Client.php +++ b/downloader/lib/Mage/HTTP/Client.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_HTTP - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/HTTP/Client/Curl.php b/downloader/lib/Mage/HTTP/Client/Curl.php index c55f88da9..6d0607e73 100644 --- a/downloader/lib/Mage/HTTP/Client/Curl.php +++ b/downloader/lib/Mage/HTTP/Client/Curl.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_HTTP - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/HTTP/Client/Socket.php b/downloader/lib/Mage/HTTP/Client/Socket.php index 5b9de9946..099b3fcba 100644 --- a/downloader/lib/Mage/HTTP/Client/Socket.php +++ b/downloader/lib/Mage/HTTP/Client/Socket.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_HTTP - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/HTTP/IClient.php b/downloader/lib/Mage/HTTP/IClient.php index f424419e4..a92fe8865 100644 --- a/downloader/lib/Mage/HTTP/IClient.php +++ b/downloader/lib/Mage/HTTP/IClient.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_HTTP - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/System/Args.php b/downloader/lib/Mage/System/Args.php index 5ef1f4f32..2aca350e8 100644 --- a/downloader/lib/Mage/System/Args.php +++ b/downloader/lib/Mage/System/Args.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_System - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/System/Dirs.php b/downloader/lib/Mage/System/Dirs.php index 005482cd2..a5c42f1c5 100644 --- a/downloader/lib/Mage/System/Dirs.php +++ b/downloader/lib/Mage/System/Dirs.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_System - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_System_Dirs diff --git a/downloader/lib/Mage/System/Ftp.php b/downloader/lib/Mage/System/Ftp.php index 21b3dfdb6..62b52d04b 100644 --- a/downloader/lib/Mage/System/Ftp.php +++ b/downloader/lib/Mage/System/Ftp.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_System - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/lib/Mage/Xml/Generator.php b/downloader/lib/Mage/Xml/Generator.php index 9b2cab44b..4615a59de 100644 --- a/downloader/lib/Mage/Xml/Generator.php +++ b/downloader/lib/Mage/Xml/Generator.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Xml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Xml_Generator diff --git a/downloader/lib/Mage/Xml/Parser.php b/downloader/lib/Mage/Xml/Parser.php index d71394071..16e5541eb 100644 --- a/downloader/lib/Mage/Xml/Parser.php +++ b/downloader/lib/Mage/Xml/Parser.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Xml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Xml_Parser diff --git a/downloader/mage.php b/downloader/mage.php index 5b7f8b436..52d052a18 100644 --- a/downloader/mage.php +++ b/downloader/mage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Connect - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/downloader/skin/boxes.css b/downloader/skin/boxes.css index b8b5ee660..fbfb98927 100644 --- a/downloader/skin/boxes.css +++ b/downloader/skin/boxes.css @@ -19,7 +19,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* diff --git a/downloader/skin/ie7boxes.css b/downloader/skin/ie7boxes.css index 4e6f91f48..f43e78703 100644 --- a/downloader/skin/ie7boxes.css +++ b/downloader/skin/ie7boxes.css @@ -19,7 +19,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ .main { height:auto !important; } diff --git a/downloader/skin/ieboxes.css b/downloader/skin/ieboxes.css index 8eec06efa..5c3b0293c 100644 --- a/downloader/skin/ieboxes.css +++ b/downloader/skin/ieboxes.css @@ -19,7 +19,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ button, .form-button { filter:chroma(color=#000000); overflow:visible; width:auto; } diff --git a/downloader/skin/install/boxes.css b/downloader/skin/install/boxes.css index bf701cce1..6eb32f00f 100644 --- a/downloader/skin/install/boxes.css +++ b/downloader/skin/install/boxes.css @@ -19,7 +19,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/downloader/skin/install/clears.css b/downloader/skin/install/clears.css index 86f88235b..d5803a354 100644 --- a/downloader/skin/install/clears.css +++ b/downloader/skin/install/clears.css @@ -19,7 +19,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/downloader/skin/install/ie7minus.css b/downloader/skin/install/ie7minus.css index 6a1a18433..ff77b66d0 100644 --- a/downloader/skin/install/ie7minus.css +++ b/downloader/skin/install/ie7minus.css @@ -19,7 +19,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/downloader/skin/install/iestyles.css b/downloader/skin/install/iestyles.css index d4d73f6dd..e16140d81 100644 --- a/downloader/skin/install/iestyles.css +++ b/downloader/skin/install/iestyles.css @@ -19,7 +19,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ .col2-set, diff --git a/downloader/skin/install/reset.css b/downloader/skin/install/reset.css index c0163aa8e..46c9f5738 100644 --- a/downloader/skin/install/reset.css +++ b/downloader/skin/install/reset.css @@ -19,7 +19,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /******************************************/ diff --git a/downloader/template/connect/iframe.phtml b/downloader/template/connect/iframe.phtml index 4cd15af7f..228de5be3 100644 --- a/downloader/template/connect/iframe.phtml +++ b/downloader/template/connect/iframe.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/downloader/template/connect/packages.phtml b/downloader/template/connect/packages.phtml index 241d99ab1..a46bd97a1 100644 --- a/downloader/template/connect/packages.phtml +++ b/downloader/template/connect/packages.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/downloader/template/connect/packages_prepare.phtml b/downloader/template/connect/packages_prepare.phtml index 7fd095369..fd329c3d1 100644 --- a/downloader/template/connect/packages_prepare.phtml +++ b/downloader/template/connect/packages_prepare.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/downloader/template/exception.phtml b/downloader/template/exception.phtml index b81da9686..486186bbf 100644 --- a/downloader/template/exception.phtml +++ b/downloader/template/exception.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/downloader/template/footer.phtml b/downloader/template/footer.phtml index 85ca058ae..994ea2e1c 100644 --- a/downloader/template/footer.phtml +++ b/downloader/template/footer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -33,7 +33,7 @@ - Magento is a trademark of Magento, Inc. Copyright © 2014 Magento Inc. + Magento is a trademark of Magento, Inc. Copyright © 2013 Magento Inc.

    diff --git a/downloader/template/header.phtml b/downloader/template/header.phtml index edd0bd30b..02c2827f3 100644 --- a/downloader/template/header.phtml +++ b/downloader/template/header.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/downloader/template/index.phtml b/downloader/template/index.phtml index 823111998..a48fc0e93 100644 --- a/downloader/template/index.phtml +++ b/downloader/template/index.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/downloader/template/install/download.phtml b/downloader/template/install/download.phtml index 9cdf177ea..9c7117e3b 100644 --- a/downloader/template/install/download.phtml +++ b/downloader/template/install/download.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/downloader/template/install/footer.phtml b/downloader/template/install/footer.phtml index 8684a5d4a..7288eeb66 100644 --- a/downloader/template/install/footer.phtml +++ b/downloader/template/install/footer.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -41,7 +41,7 @@ - Magento is a trademark of Magento, Inc. Copyright © 2014 Magento Inc.

    + Magento is a trademark of Magento, Inc. Copyright © 2013 Magento Inc.

    diff --git a/downloader/template/install/header.phtml b/downloader/template/install/header.phtml index e206c1dd3..c94436ba3 100644 --- a/downloader/template/install/header.phtml +++ b/downloader/template/install/header.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -85,7 +85,7 @@

    - Having trouble installing Magento? Check out our Installation Guide + Having trouble installing Magento? Check out our Installation Guide diff --git a/downloader/template/install/writable.phtml b/downloader/template/install/writable.phtml index c17acf414..6213c1008 100644 --- a/downloader/template/install/writable.phtml +++ b/downloader/template/install/writable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/downloader/template/login.phtml b/downloader/template/login.phtml index 7a821790a..0750cd7cc 100644 --- a/downloader/template/login.phtml +++ b/downloader/template/login.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/downloader/template/messages.phtml b/downloader/template/messages.phtml index 05889aab3..646db460a 100644 --- a/downloader/template/messages.phtml +++ b/downloader/template/messages.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/downloader/template/noroute.phtml b/downloader/template/noroute.phtml index 448429b90..357c25a53 100644 --- a/downloader/template/noroute.phtml +++ b/downloader/template/noroute.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/downloader/template/settings.phtml b/downloader/template/settings.phtml index b91b41e18..766f6e785 100644 --- a/downloader/template/settings.phtml +++ b/downloader/template/settings.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/downloader/template/writable.phtml b/downloader/template/writable.phtml index b5cb64f0b..d14a7bfa2 100644 --- a/downloader/template/writable.phtml +++ b/downloader/template/writable.phtml @@ -20,7 +20,7 @@ * * @category design * @package default - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/errors/404.php b/errors/404.php index 1edf66056..f3c1ddd94 100644 --- a/errors/404.php +++ b/errors/404.php @@ -20,7 +20,7 @@ * * @category Mage * @package Errors - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/errors/503.php b/errors/503.php index 6394090d3..13795cca2 100644 --- a/errors/503.php +++ b/errors/503.php @@ -20,7 +20,7 @@ * * @category Mage * @package Errors - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/errors/default/404.phtml b/errors/default/404.phtml index b0c122aad..4dcbabbf6 100644 --- a/errors/default/404.phtml +++ b/errors/default/404.phtml @@ -20,7 +20,7 @@ * * @category Mage * @package Errors - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/errors/default/503.phtml b/errors/default/503.phtml index 6e9688d02..c97276a16 100644 --- a/errors/default/503.phtml +++ b/errors/default/503.phtml @@ -20,7 +20,7 @@ * * @category Mage * @package Errors - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/errors/default/css/styles.css b/errors/default/css/styles.css index 1f3b4e226..7956ec780 100644 --- a/errors/default/css/styles.css +++ b/errors/default/css/styles.css @@ -19,7 +19,7 @@ * * @category Mage * @package Errors - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* Reset ================================================================================= */ diff --git a/errors/default/page.phtml b/errors/default/page.phtml index eb8d0d1ee..8bc274764 100644 --- a/errors/default/page.phtml +++ b/errors/default/page.phtml @@ -20,7 +20,7 @@ * * @category Mage * @package Errors - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -52,7 +52,7 @@

    -
    Magento is a trademark of Magento Inc. Copyright © 2014 Magento Inc.
    +
    Magento is a trademark of Magento Inc. Copyright © 2013 Magento Inc.
    diff --git a/errors/default/report.phtml b/errors/default/report.phtml index 289a0f872..69b391ce4 100644 --- a/errors/default/report.phtml +++ b/errors/default/report.phtml @@ -20,7 +20,7 @@ * * @category Mage * @package Errors - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/errors/local.xml.sample b/errors/local.xml.sample index 3855524a6..c67e6a4a4 100644 --- a/errors/local.xml.sample +++ b/errors/local.xml.sample @@ -21,7 +21,7 @@ * * @category Mage * @package Errors - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/errors/processor.php b/errors/processor.php index 95fe18eed..686c6f0f3 100644 --- a/errors/processor.php +++ b/errors/processor.php @@ -20,7 +20,7 @@ * * @category Mage * @package Errors - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/errors/report.php b/errors/report.php index be04130e1..74b729d6b 100644 --- a/errors/report.php +++ b/errors/report.php @@ -20,7 +20,7 @@ * * @category Mage * @package Errors - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/js/lib/dropdown.js b/js/lib/dropdown.js index a38c369f1..40d52afb3 100644 --- a/js/lib/dropdown.js +++ b/js/lib/dropdown.js @@ -19,7 +19,7 @@ * * @category Mage * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ dropdown = function() { diff --git a/js/lib/flex.js b/js/lib/flex.js index fc08d0034..7070a98de 100644 --- a/js/lib/flex.js +++ b/js/lib/flex.js @@ -19,7 +19,7 @@ * * @category Mage * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/accordion.js b/js/mage/adminhtml/accordion.js index 611368c4d..a8173feae 100644 --- a/js/mage/adminhtml/accordion.js +++ b/js/mage/adminhtml/accordion.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var varienAccordion = new Class.create(); diff --git a/js/mage/adminhtml/backup.js b/js/mage/adminhtml/backup.js index 8750fbd33..c47716d70 100644 --- a/js/mage/adminhtml/backup.js +++ b/js/mage/adminhtml/backup.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var AdminBackup = new Class.create(); diff --git a/js/mage/adminhtml/browser.js b/js/mage/adminhtml/browser.js index ec1a3d289..5464d6899 100644 --- a/js/mage/adminhtml/browser.js +++ b/js/mage/adminhtml/browser.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ MediabrowserUtility = { diff --git a/js/mage/adminhtml/events.js b/js/mage/adminhtml/events.js index c3c7d089b..2c2f97b07 100644 --- a/js/mage/adminhtml/events.js +++ b/js/mage/adminhtml/events.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ // from http://www.someelement.com/2007/03/eventpublisher-custom-events-la-pubsub.html diff --git a/js/mage/adminhtml/flexuploader.js b/js/mage/adminhtml/flexuploader.js index 16f4c263a..ecfa96570 100644 --- a/js/mage/adminhtml/flexuploader.js +++ b/js/mage/adminhtml/flexuploader.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/form.js b/js/mage/adminhtml/form.js index 201e6afec..32fec80a0 100644 --- a/js/mage/adminhtml/form.js +++ b/js/mage/adminhtml/form.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var varienForm = new Class.create(); @@ -500,10 +500,6 @@ FormElementDependenceController.prototype = { */ trackChange : function(e, idTo, valuesFrom) { - if (!$(idTo)) { - return; - } - // define whether the target should show up var shouldShowUp = true; for (var idFrom in valuesFrom) { diff --git a/js/mage/adminhtml/giftmessage.js b/js/mage/adminhtml/giftmessage.js index df3f81211..f1aec11f5 100644 --- a/js/mage/adminhtml/giftmessage.js +++ b/js/mage/adminhtml/giftmessage.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/giftoptions/tooltip.js b/js/mage/adminhtml/giftoptions/tooltip.js index 4b2c8a4f4..444430ba9 100644 --- a/js/mage/adminhtml/giftoptions/tooltip.js +++ b/js/mage/adminhtml/giftoptions/tooltip.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/grid.js b/js/mage/adminhtml/grid.js index 8a5347f00..eefcc37dc 100644 --- a/js/mage/adminhtml/grid.js +++ b/js/mage/adminhtml/grid.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var varienGrid = new Class.create(); diff --git a/js/mage/adminhtml/hash.js b/js/mage/adminhtml/hash.js index fdc3fd554..39617420b 100644 --- a/js/mage/adminhtml/hash.js +++ b/js/mage/adminhtml/hash.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* diff --git a/js/mage/adminhtml/image.js b/js/mage/adminhtml/image.js index ad4c0a8e6..c43ae8735 100644 --- a/js/mage/adminhtml/image.js +++ b/js/mage/adminhtml/image.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/loader.js b/js/mage/adminhtml/loader.js index e98d4dd37..905db8bf4 100644 --- a/js/mage/adminhtml/loader.js +++ b/js/mage/adminhtml/loader.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/magento-all.js b/js/mage/adminhtml/magento-all.js index 90c77d8c8..d12141f03 100644 --- a/js/mage/adminhtml/magento-all.js +++ b/js/mage/adminhtml/magento-all.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/moneybookers.js b/js/mage/adminhtml/moneybookers.js index 3c80abec0..0195deef1 100644 --- a/js/mage/adminhtml/moneybookers.js +++ b/js/mage/adminhtml/moneybookers.js @@ -13,7 +13,7 @@ * * @category Phoenix * @package Phoenix_Moneybookers - * @copyright Copyright (c) 2014 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) + * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/js/mage/adminhtml/product.js b/js/mage/adminhtml/product.js index e38a2c301..975e87ee4 100644 --- a/js/mage/adminhtml/product.js +++ b/js/mage/adminhtml/product.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/product/composite/configure.js b/js/mage/adminhtml/product/composite/configure.js index 00e97087a..3d1fabaff 100644 --- a/js/mage/adminhtml/product/composite/configure.js +++ b/js/mage/adminhtml/product/composite/configure.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/rules.js b/js/mage/adminhtml/rules.js index e847e2661..170ac26c8 100644 --- a/js/mage/adminhtml/rules.js +++ b/js/mage/adminhtml/rules.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/sales.js b/js/mage/adminhtml/sales.js index b53861769..9929910e3 100644 --- a/js/mage/adminhtml/sales.js +++ b/js/mage/adminhtml/sales.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var AdminOrder = new Class.create(); diff --git a/js/mage/adminhtml/sales/centinel.js b/js/mage/adminhtml/sales/centinel.js index 16237f1d1..5b77f9d1a 100644 --- a/js/mage/adminhtml/sales/centinel.js +++ b/js/mage/adminhtml/sales/centinel.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var centinelValidator = new Class.create(); diff --git a/js/mage/adminhtml/sales/packaging.js b/js/mage/adminhtml/sales/packaging.js index 7f9deda16..54b8d9591 100644 --- a/js/mage/adminhtml/sales/packaging.js +++ b/js/mage/adminhtml/sales/packaging.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var Packaging = Class.create(); diff --git a/js/mage/adminhtml/scrollbar.js b/js/mage/adminhtml/scrollbar.js index 24c4995d7..2bdb8805b 100644 --- a/js/mage/adminhtml/scrollbar.js +++ b/js/mage/adminhtml/scrollbar.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /************************************************** diff --git a/js/mage/adminhtml/tabs.js b/js/mage/adminhtml/tabs.js index 7b86e7916..391bb3734 100644 --- a/js/mage/adminhtml/tabs.js +++ b/js/mage/adminhtml/tabs.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var varienTabs = new Class.create(); diff --git a/js/mage/adminhtml/tools.js b/js/mage/adminhtml/tools.js index 29f321ff1..3b266e262 100644 --- a/js/mage/adminhtml/tools.js +++ b/js/mage/adminhtml/tools.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ function setLocation(url){ diff --git a/js/mage/adminhtml/uploader.js b/js/mage/adminhtml/uploader.js index 0c0771d21..d768f4eef 100644 --- a/js/mage/adminhtml/uploader.js +++ b/js/mage/adminhtml/uploader.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/js/mage/adminhtml/variables.js b/js/mage/adminhtml/variables.js index 0e25192d0..3f61eaa0f 100644 --- a/js/mage/adminhtml/variables.js +++ b/js/mage/adminhtml/variables.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js b/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js index 47f2d6208..a4f6ed547 100644 --- a/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js +++ b/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js index cde54cc68..c00832ea6 100644 --- a/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js +++ b/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ tinyMCE.addI18n({en:{ diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js index a1c2a43aa..a7ffda315 100644 --- a/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js +++ b/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css b/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css index 3bd9f502b..48ee1ce1a 100644 --- a/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css +++ b/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css b/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css index 828511fa2..d71cacf61 100644 --- a/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css +++ b/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/wysiwyg/widget.js b/js/mage/adminhtml/wysiwyg/widget.js index 9c15c5b39..09410951a 100644 --- a/js/mage/adminhtml/wysiwyg/widget.js +++ b/js/mage/adminhtml/wysiwyg/widget.js @@ -19,7 +19,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/captcha.js b/js/mage/captcha.js index e1c835450..14b220b45 100644 --- a/js/mage/captcha.js +++ b/js/mage/captcha.js @@ -19,7 +19,7 @@ * * @category Mage * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var Captcha = Class.create(); diff --git a/js/mage/centinel.js b/js/mage/centinel.js index 94cd1e24d..46251b4c2 100644 --- a/js/mage/centinel.js +++ b/js/mage/centinel.js @@ -19,7 +19,7 @@ * * @category Mage * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var CentinelAuthenticate = Class.create(); diff --git a/js/mage/cookies.js b/js/mage/cookies.js index dbf856ec8..98cc591f0 100644 --- a/js/mage/cookies.js +++ b/js/mage/cookies.js @@ -19,7 +19,7 @@ * * @category Mage * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ // old school cookie functions grabbed off the web diff --git a/js/mage/directpost.js b/js/mage/directpost.js index 0d80648ad..dd784206e 100644 --- a/js/mage/directpost.js +++ b/js/mage/directpost.js @@ -19,7 +19,7 @@ * * @category Mage * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var directPost = Class.create(); diff --git a/js/mage/translate.js b/js/mage/translate.js index eb407c887..c52e283f4 100644 --- a/js/mage/translate.js +++ b/js/mage/translate.js @@ -19,7 +19,7 @@ * * @category Mage * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/translate_inline.css b/js/mage/translate_inline.css index 8a792022c..e3bf8ee01 100644 --- a/js/mage/translate_inline.css +++ b/js/mage/translate_inline.css @@ -19,7 +19,7 @@ * * @category Mage * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/translate_inline.js b/js/mage/translate_inline.js index 9eb5bf6d1..5361cc3a3 100644 --- a/js/mage/translate_inline.js +++ b/js/mage/translate_inline.js @@ -19,7 +19,7 @@ * * @category Mage * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/prototype/validation.js b/js/prototype/validation.js index ee93d85c4..c9c179880 100644 --- a/js/prototype/validation.js +++ b/js/prototype/validation.js @@ -697,17 +697,17 @@ Validation.addAllThese([ return true; } - var validationFailure = false; + // Matched credit card type + var ccMatchedType = ''; + Validation.creditCartTypes.each(function (pair) { - if (pair.key == ccType) { - if (pair.value[0] && !v.match(pair.value[0])) { - validationFailure = true; - } + if (pair.value[0] && v.match(pair.value[0])) { + ccMatchedType = pair.key; throw $break; } }); - if (validationFailure) { + if(ccMatchedType != ccType) { return false; } @@ -879,12 +879,11 @@ function parseNumber(v) Validation.creditCartTypes = $H({ // 'SS': [new RegExp('^((6759[0-9]{12})|(5018|5020|5038|6304|6759|6761|6763[0-9]{12,19})|(49[013][1356][0-9]{12})|(6333[0-9]{12})|(6334[0-4]\d{11})|(633110[0-9]{10})|(564182[0-9]{10}))([0-9]{2,3})?$'), new RegExp('^([0-9]{3}|[0-9]{4})?$'), true], 'SO': [new RegExp('^(6334[5-9]([0-9]{11}|[0-9]{13,14}))|(6767([0-9]{12}|[0-9]{14,15}))$'), new RegExp('^([0-9]{3}|[0-9]{4})?$'), true], + 'SM': [new RegExp('(^(5[0678])[0-9]{11,18}$)|(^(6[^05])[0-9]{11,18}$)|(^(601)[^1][0-9]{9,16}$)|(^(6011)[0-9]{9,11}$)|(^(6011)[0-9]{13,16}$)|(^(65)[0-9]{11,13}$)|(^(65)[0-9]{15,18}$)|(^(49030)[2-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49033)[5-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49110)[1-2]([0-9]{10}$|[0-9]{12,13}$))|(^(49117)[4-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49118)[0-2]([0-9]{10}$|[0-9]{12,13}$))|(^(4936)([0-9]{12}$|[0-9]{14,15}$))'), new RegExp('^([0-9]{3}|[0-9]{4})?$'), true], 'VI': [new RegExp('^4[0-9]{12}([0-9]{3})?$'), new RegExp('^[0-9]{3}$'), true], 'MC': [new RegExp('^5[1-5][0-9]{14}$'), new RegExp('^[0-9]{3}$'), true], 'AE': [new RegExp('^3[47][0-9]{13}$'), new RegExp('^[0-9]{4}$'), true], - 'DI': [new RegExp('^(30[0-5][0-9]{13}|3095[0-9]{12}|35(2[8-9][0-9]{12}|[3-8][0-9]{13})|36[0-9]{12}|3[8-9][0-9]{14}|6011(0[0-9]{11}|[2-4][0-9]{11}|74[0-9]{10}|7[7-9][0-9]{10}|8[6-9][0-9]{10}|9[0-9]{11})|62(2(12[6-9][0-9]{10}|1[3-9][0-9]{11}|[2-8][0-9]{12}|9[0-1][0-9]{11}|92[0-5][0-9]{10})|[4-6][0-9]{13}|8[2-8][0-9]{12})|6(4[4-9][0-9]{13}|5[0-9]{14}))$'), new RegExp('^[0-9]{3}$'), true], - 'JCB': [new RegExp('^(30[0-5][0-9]{13}|3095[0-9]{12}|35(2[8-9][0-9]{12}|[3-8][0-9]{13})|36[0-9]{12}|3[8-9][0-9]{14}|6011(0[0-9]{11}|[2-4][0-9]{11}|74[0-9]{10}|7[7-9][0-9]{10}|8[6-9][0-9]{10}|9[0-9]{11})|62(2(12[6-9][0-9]{10}|1[3-9][0-9]{11}|[2-8][0-9]{12}|9[0-1][0-9]{11}|92[0-5][0-9]{10})|[4-6][0-9]{13}|8[2-8][0-9]{12})|6(4[4-9][0-9]{13}|5[0-9]{14}))$'), new RegExp('^[0-9]{3,4}$'), true], - 'DICL': [new RegExp('^(30[0-5][0-9]{13}|3095[0-9]{12}|35(2[8-9][0-9]{12}|[3-8][0-9]{13})|36[0-9]{12}|3[8-9][0-9]{14}|6011(0[0-9]{11}|[2-4][0-9]{11}|74[0-9]{10}|7[7-9][0-9]{10}|8[6-9][0-9]{10}|9[0-9]{11})|62(2(12[6-9][0-9]{10}|1[3-9][0-9]{11}|[2-8][0-9]{12}|9[0-1][0-9]{11}|92[0-5][0-9]{10})|[4-6][0-9]{13}|8[2-8][0-9]{12})|6(4[4-9][0-9]{13}|5[0-9]{14}))$'), new RegExp('^[0-9]{3}$'), true], - 'SM': [new RegExp('(^(5[0678])[0-9]{11,18}$)|(^(6[^05])[0-9]{11,18}$)|(^(601)[^1][0-9]{9,16}$)|(^(6011)[0-9]{9,11}$)|(^(6011)[0-9]{13,16}$)|(^(65)[0-9]{11,13}$)|(^(65)[0-9]{15,18}$)|(^(49030)[2-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49033)[5-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49110)[1-2]([0-9]{10}$|[0-9]{12,13}$))|(^(49117)[4-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49118)[0-2]([0-9]{10}$|[0-9]{12,13}$))|(^(4936)([0-9]{12}$|[0-9]{14,15}$))'), new RegExp('^([0-9]{3}|[0-9]{4})?$'), true], + 'DI': [new RegExp('^6011[0-9]{12}$'), new RegExp('^[0-9]{3}$'), true], + 'JCB': [new RegExp('^(3[0-9]{15}|(2131|1800)[0-9]{11})$'), new RegExp('^[0-9]{3,4}$'), true], 'OT': [false, new RegExp('^([0-9]{3}|[0-9]{4})?$'), false] }); diff --git a/js/tiny_mce/plugins/media/img/flv_player.swf b/js/tiny_mce/plugins/media/img/flv_player.swf new file mode 100644 index 0000000000000000000000000000000000000000..042c2ab969e98a6fdbe08848c4a73bd2c41de906 GIT binary patch literal 11668 zcmV;FEo;(4S5pYUVE_PloV|PrTvNvr@V+F3a36As0Rb-#MGjBSfQpD35b>z>Admpj zkkAkitwp@*Rqv`rs-o69lDZ&@y{HKo3{JcK8Rt^ z72Hab0Fi(9n@~bYkV2y_)Fy`HtF#7{J|rojb4e1a7ekY%Jpqu!GtXQ6#>m0qvY zqk05XkPr<=DTomvJ9PBuQB+V+fX0s>j}|Rjgg*T6Llosb@Z|f-K0(8m{He?6zo^!s zgW%o|yBiCa{N=g3_eV+xKc?-B?2)mXBGanczVGz$;(Jq8W!}yB$#d7jwz;Cki@c`f zWnSDHobzK#aT@9u=8^8x_Ib_e#Xl4Y`Zer+8u>-bA6`uVXi-Ep^6uWh%d8KaJS&g= z)KA}qY1=qz((;kczfDdZmcI1pls2gC!tgBV;pBqfKiK7u7MDbR)&C>$gyc05A7uO} zTU6zl(L392O7^D-J^u?tL2G}Nl|dGb6UZS!lq5p+9>gp}0$|zy zkSG#qbPAfg3zp?lIyJ5j#n!UMW{%nE-W&j!ZI})Q-KC5ph&MP(<)Js zTB%fN`{MEmC|{-4pi+ZEZQoGP^zA& zLSxF+rRqEl+hmTqSfx>GRVc3zjiF2!xFY<5N}=@HB8fb_IYAXlu?mZ7o| zrNW>xk}{1xtqwkmRR+Z{LK(lMQ+^9H0Gff% zJX2#B5lWP0dWAs^!o=T2Duogl*TKM!LUG8TsxY9=AQJ=bIZ~7vbc1o5C@Ly0DylPi zB6X=;AxGtErAn8jC@Te$;}vQ{nof_KL}N>PDKwfqMgBNcpw_5zCX}d9MX?4f1q5BH zQjIf;K8tpwpGg@hdc9%-(x|kBAc=g9I)9w8e;9k(1AMm0;^LIo2w|sWvCp)nqQ>Q7OIBoG-c3dwN`BaqJ6M4 zOw%ihS>0nCrK&(trZKR9V0>jIgTY<~VtawF!NoeAp$Mx6j|!@8ZhRE#47wDpaxk_w zZ9bB#483$(tty`=BA>qE(!oTHNMSH2@{4Fs^2!PdRC?S%DtRNC0b9$_Vc`%-0KWsl z4tpyM3N%(xt|-mdt4j=V07SGG+5vUw2tQ$nS`eWC^bEjRP@go6ZIn-bkt%;2?kwgU zO4Mu->COPIH>?q}HbxaOMi1RbgUQ$i;+&MUN@8Pb=p;x%p_xEbqg59ZRT$-mKTO69 z!yNNKBTkW_Sd)Vd6GVm$l)xKwg@qbbTA4-zomHu{D2EgTnM#5}(?In_K|MQ0b&T%O zv0GG-P9IbR152e3=^iR;{1rz?#t z)>Wug`QQd3^L53YQGQveL060kl%kTdQtS=buB4W!HHLm#TBTH%Vl9C#4A_6@i(xPp z0H1>?=P*pb)mTQ;z)w9I8i3J zGPPErptgE+fycR@b$bnIc#*`@ZkZw?a&b6jjeW{^Wky@if#fot%>Nv=VB$=K+nQI}A85~NO@ z;yQJrXo!Rj&atr$y{rUU0DqzfQ5x9-^=WZ&iLR8b!m3t6j%Nl|TsjW-XP^RpW0y9R zhP+-d-V8_q17$oKlV7ICVlALkB!tps zE=VF0Ble%j&I#b{0T@Z_2zhaKCjMnF^;{`HJ&_4XA`*&3d`O3Er%bk5gd~pmH+)It znbiW+kwX*{M7GXJ?zGGS*{0%58U#Gx`7~4m%Z`L)7pW(%aUnJJTn)6*ft2iR7Iw3Z znpPZN@N|_gb3zg~qbxEpv+g2+$k8dl1mz*ez4H_aGEHSIXqm)a$}99Dg(4FOJVoT` zF71o?!4380A$b2cghV3(70zUH=6T58JY;@}r<@RyTD0u*Pmm=98RR|u-!^aAaUUze z8>@VclI3idkLdT(+Lr%Ko{SN}U&;q{HG$&s0FdcqSlJvH{+vyVLnPq?r*F@f zI(GNCT^@`l*P=*lge0iA*jh0`|H2;4^c3_8_W1AAc8TG87F^PSQ{+oVDu`nU;@iG8 z;vq}KLoA|{0}~NhXPUk|O<%OPAYVbc=K!GXi+oKrPI6A?=_HQVB5DyGY*<7n&muwz zb_bqCbdZ{0Y*|FGr9}i=TSTyJiwL%~i2wf{3jYe@=PgD%vZ``2+975(sa(J|3?zK`XS zCPH@M=z<8-?L@qnB$6O^CS9QKQF0gO01Oe$hwvg0F;ZM7;PSCftU5c9FPeN}92aNX zJ)&6AELQYC!iqIZVxz4R>u6(Q%}049n>O|k;1Y;#&B3~48`DlBDA67UcD5!;=cNR~ z5z5oqnHR9%RmAkAw8&i4s#egK;)3&KB;EQFr{9-OUIo1A6c~MXkx0^m^tGpyrtWc4 z5*?grbm+;BQz-F5X2{S`cS$@!iI!UM?vTwXBb|=$7L*zfFd>oFNN7!>)a)~f&L*o# zBu$o*Dpy)1BQ2!#BLIGAnzzNWWgo3FGz<}5Q=3N&Ld)DuR!&)>O6ir2rwgqaGZer$ zPe}GAC4I;C4(UcYG&kSQC*iq$#*dZPR6H|7GI$(EUZqD<)EmqGE z5{9GCc>STP37J;w3t2plEqN#;ZX$qVfse+8N}5XAA?!kung=sUpcxnFfSnvE9|X#A zru!@qgVd-snJs3wr&1dnN0c69OC2_K6w$omI*~OLPg_;d%~Ulrf^z5x8e;N&&^yATxs&TCd(CJ-oKnKR{%vS@4$o+Gkt zxBzVWE=cmaskM=^fMpWID(ZCtJSv+o5Q#sz&X1M_un~|ep=t6M+DfjeoEor#mgiZP z=V$XGsdByxKDJ;t7KwCuW6@0p$F@L-ZHznszqW=~0ey{u*BCkBAx8SrP)!$wW27|5 zHXo#g|1AuYm1L`0VPA?1JoNwH z!O&Q!<|o|V)H|xB{FO2q7z+qVHPmGUurNdj#8o=5l`+x)YkblXKxu} zY1pIn!8U9Xe8ph7G54UWcVpXwuyBQ>l{AyLir$j2H2_niPKMa%IEhA@Ip2e~ql%Cq z3>gTiwx+y>&JL`{1@#X+v2#PHt*JY7mQkGTYr7jPw_4z%rH#E%@WWx~3eH4``?H(? z>9TFkid>wHRwdx)Sg$mT(h^a1FwUH?#3Z4{*;2qOio%A82Acs;1;+W-c$n|4BQynB zW>)?-axt3wM7%6Zvz4a2Bogx+S4|7cGXV%KC2S>9mm7|-Hx!`eydmpUtH}s_so&(B zE2T|s)dAU=h3FEJagx|=hb$_H-SCbWfR779LVWVThoM4#LvFN2y^QAgPT1ez5^!~; zl!+lCA#cKE9)FFQ25~^m1z`(hgN+S}EK?!}zRw1Rz{V`uf&e!;C)O>n;hM$S#sWTS z87K1jZpJeJWW2|7;S(sAvnYeNHM9RLe4ZRvd)NEI@U5|8|ugIm>8*) z%Xx#>#dM|vvCDS@yAV4XKnIFN?mQ9t7p-u2uTI5g!rSAg=0sTaM4%LmVC+_ECIlO^vs4JDBLZ&EVS!{J z#9?oX!&jhCh`|D!%Px{EmMoFHOFEUx69E0k3%VG9WIO3(m4I$`E``xZ`m&5&SP_Z@ z@=P1`%gOZNJ@Xi40aI;j2bT{6FDuwJObgVE`FKMaJ1Z~Novbho|C&T!TR86#cN9cOdLp7vK^BoISnGxtn8HG0&H;#R4W6qxVVEbs z{H+x}c$g1 zpG_0Fp2+tVpg*KBj6CTEJK)phF7v2Ea!<3fS#%hwmFNUApVN~*M#px}TbN-#q9@OR)B3i*0Q?^Cwv)$r*hsAeC%Bl|``w0>2 zQXo(LOr7Nbv;hWhpW1=MeR(JR7~~L+BwBn9`y831_Ay0{0Bc7Nv0osPNOsDpoQS($ zMI0MjC=#%zNQkfdjKF;^H!kgQMQL*5J}6i8g`5UcUePW&jiS7w-SU~-p)!!K2WAHc zPZ5MsAxU6TEu3ioCT^e`kM0=LS8Fq{L3M8t!#5uhW7~Sz@>ejP z3IDH*!`tGFCrshO&}pF=7Ce_)iO1YlxRqRPL=j7o3a|kQAvy}l>Ob~)mQ>;SB|Eor z#91Xi@+81QB$E=l<4t7)PM+7M$)E(1J#-&NBsPa;2Q_O{LYN2Ar4C2p4EGvsO~7sB zh(u(uLLm9Vj0jN^TeI7&M#QUGArfX%YBo)Yk0xNbvLjsC3F(@X4+%qdbjm7_d__c1 zoJ}XP=E2FAJ(o~#)e-bfJCErSUp9k#7yx8jeHd!3lYq2=Mv17SJz*Uk%lnkG1 zvRq(>+w8J{RRtM*afr_=%Cu~Yzjk1Ch``(8uZ}>4;b?`(B+Y}SR{7#Rlt8h6EChRp$6lOftRMFA0$ZuGMvhL!{1Vd4Tsq%M#rM4oAw z9iKIpnk}!>m3x~eZYD)?2uzqsw;en&QKMxDB@J{XKdgB=4P;k@hsT$`6F!RKK!+a3 zr8A#t_WTVyH>G9Y(IYTsW&3TEnRl3&TsPkM+-Hp4=01_{%|?*5)NC7AjFsO!Vw5^J z*E3u6wIEAFM1zzbo(rV=o+2aXPR3A2asW%-_rH|){mt;c-v;mdU!8X&Su^_vJgdKI z5c5E2Cf3Z~H?YV2hw+TK`BUC2ZHyUqo8D*`_V{ShTtv??#=jETnJ*X_MI$|1bXVa5AVDKCif@+*5fHKbb^HrG6?P;jBm9rosSX{-zLOxtv=$mH}G z6p@{UQ{4<9cW?!q!XkIYV zbYN4jadEs{(<1A%-dJmvr;8?@E}HRV#O86vFI#1!m4Cx!KYsddA@y`t>U>C3_U_6* zV06h6lqBwa#8tKtFDF{&>^4`>`2PQuSa3CC!S&y;VBrRhg|Etjj~NR-|BMBCp3b&j z`m@bM@L~K+L)v1=By*W3lE_S3=Qv(qZz|vx{cwSkacP3qTp=OxYIXwt#owX#MXWRC z2I4ic$rOZMx>B<}(HAv2;J%CTl_K!FUhE3bZXyiCuooUAyWx{D_V81SDhLd|?4rFG zijE;@0+GuR>dBh~6`@vD2xS3weSJN0ciGl}>_16wwb}LCM(qXmq6`P_q6`VWD5KtP z9y}eqwYSFCDg{O)>u5$QQ<`O({-1kWbW=~p;X14q7^+7)lR35F$=-NUu zvPRh$+wM{~G~fbyuR10#SEy`oDW84jwe{as4Q$Vh8#nX!vp!!s{l4|b6A)paKYtztc{PL;U2Hrgo-;L}^M>h-(x}{F(}Fl2JvbY2XKe)G zzv1*mBbH=O3;Gl)F$s6?v02LTIevi;rUCD$H9)igjw5AA@{mFI?%e~3xeHOC*PCnS z_s~YpI0VFf0LTmQ-@(LNpkqX8|S(sH6w)^49?S?t6rsux-nX{OQ7xcTjO4 zib5%<6m3C=kQYII>$u&1hb&+- zy1(7NxC#mm*bQeMWeGoN2<(Q+LxtZqxE??i7nlpRZmm$f7jv`LUR9NlgTd!i1uVlP zZcber^Vab9D?*uj@om0tK)DIt2If*N;7$Al!;P&<=!hO{2fV~WO!BjaKp2 zS>ORQX&ovbE<9HP_3;{L$MrHM+5l|a&jOa9&C9uzha0&-E50NBF25k$Cv!cE2_BHS z9zo?BfoIweXpr=AeHHKwv~EMM-}GW`<=W4v;(AKRy4j)l9NaZ;1Y`-z6&sn0xj?pJ zIBw<$Zia~GVHOqz{w7_n0g5?HCtQOv*%goIoeF=mCQI`sf00#FQ{Yapg`Km&7TiZr9a#b62OAn z&e=44;$C9CRG>}9k9ZA2olqp|3@~-k8Y9% z&ST3*L|@&W8^77v86`V(0e}Ex=K(IK;!=LD-;2g%*Bwo5?>1#lxiY!q&yq*8qlKfc z%c@hhj@jt(;rH_|uW>|f2cu8WY$Fi-=VtJqOs@cRQHE$%)}mo^$vUZbq033u@3rRq zULfat0}#$zvVeI^XLJxcV$@knZbuj=$%9)syjFe@Ch(GcSt2FE^S+qcp@yt>)=}+ zp7Rd1*f!OzHYLRWk%PPAzKkx)xrM&N)@G;oJ~=0&(pWs=gcaHA; z^6=hWPd2UUC+}7lTOZrh)HBxq*b~>f!^*r~5Q?`AU0+$>`HzW-Yeq)aO_4SH{pisn z?|V-w67uRUPJdADbpD?A=#PEp9l0&oayDb@`FoY0Uw)oEG|*XGQh%MXuT;JE_L-kV zpI@H$qD{}+L$}->ziZ^=aUb3Zzkj0y^;?`PQH2+l5Hxu`cp5Yt5)bWqGaf=jwKh$-(Q&1N?>7CyW-dc2S zYEg^qP49l)|EhNRIfwI$4nB^lcHVk^od2mJ=Zd6(J8%5`s3QG9-k{s@D_w8D5pW{s z_nV`$$It4$w&9J0Q3rdT3i5We8!~xQ&f1-6ZioIpUGw&By~ErCQy+SKmp|~0>lFz; zes2%Dcjxib+-^1do<0BY>7a-ckE2$fP?t#USFe`-@#mzZDObYI-6+}kJl20+-nOCZ zUMvj^jb14~n-mgXJ>VNhcbEU(>e7SH-b-)$x6j<$N1m)ZfA6&oXTqlMSIquB zE99D;zJB=P%UjQmt$(^}Y^C7NUbi{ab+qG#f3LQD*HK%tQR-vwQUzA?jKOD9j8+pr z_vbA4gU>@8yM^S9ThqEB&2EQB@{~C~i^pj{9dueUHCGipYvZ=zug(2tSep?a);)Ya z-`~5>fx5!C2j(t+^Ycqnf`dydW1FgDPZd?3?^sY*?KX3N>aLN?ChlGJ{e$uuc{>i- zPfMA5Sozm%mx{fkcZ~jc$%FF#ADxewuy^#`6eYH-(&wm0m!KPE&X`1ahru5lNNy4-v#Y4z7m>$4r6*{y5{>$+}`&)$ogkp6{L zb+u1tC}TD~%-(QjU(bLAeU)pj71XWKcqRJGU9vA%<}=ss#|a66*-5L1JuUxoUP95Z z;XUj-9y}n~|M$KNlahvYN#8Y6es)Z#SIN1P(@uAI|5lG*oZ@SaJ-h;@GJM&PJ9nNu zi~h5+e$nfZ%Qr4n_$hOLb?Z?@1DMc%n(qEF@fz6fqV(Pw8_r~hFZH}z`KZh1eYTu^@!PMP zpCT7u{}^f}9gJqu-lmx}IRulqCouYb;$GX~NHaq$WPkwmK^MT9!i?55c;J?lL0*6K z4QMryujzI{$jKq5F--kksSxZ$3G` zt;2~!o6hdKT6g}^xL@lQ$e&znH+;%`;xUom#wDfh&{6Lp10kLLEiw4a}; zIDuAP)Vv)ChJEZIV}o1o=@sDa)R-{;C&PD%3r9w7c-q;^@xr)`%QQgIBU$tI$DsPM~TZtCLia_!cmJ!8M!6F&aStJ$fNQ6HaQG3CS6elc5S##RpqA0r{AvF=pozs2fVM3+IQo9{D96nf>VEXn9-D_xI)gr)#o&!{AM4$5x!LikG@>R3)vx<(x9wr`O?v zx;z`iKeD|p0{m(CIbk`T0D)PFb{oHGI@ASBp z?bn88XucBp)SS8ZN9)RucIyr_x^|#O(#dEf9baN3k(`lq;?@whfRS`2>oa(3w>^U( z8G;NAfP}~s=W@QdScEgR_r8=Nr|fA##%od8G)@eO)q(D5L8z0=5%Cf$d}}2OA|W8X zF^F#iFD=7YsMd=y|B;Sddgd~;u@mCK&?{E!#eo>gnS*i~IQ1m2Esd%G!-QZMSDbiq z%<>2sFFR#h^gzAC82hU|g?s{WV}mbgTK#ceruOOfj6{MDrJ) zV!6^5v~;pVdw6z%X6R-7R7di^MB2Q%&x%H9~#H-8QIUz(Ln45_OAge~rzKY(Z zN$kU;1MVY}0BlLWpOS+YO}Wd789{x0eG|TgoBS|sCOf3TYY$LYg8hB>#s`+_y5EFy z)CP?zNLLVKC{hI#Xv*>By!Zl9Y?VO+bb3{Bkh&x?G7?nZ1~7U8t+<1>X7Cr9P*hA@ zOftB+zizKzKBewZKps5XY6i;Ke4&Bn>%d3@Tm6gZ+=B0g9S(D!OZdT|wxoI+8 z=+X?B&#f8#aj$Jdr=_iXbU1Iv$@eCYi}L&8uYq0s*DpNME6Ba7pw8jFmRg36;}QujUXdwq|5!y7UViX(-j1q2 zCO&6&PS`Pg&$~x%?|G3J=mtUyJTxi2e)?M*&Rl%_>yu~Glc(L^R99CwFDLx=ql49_ zeSLkMV=51<-k$vM;5GI4x;NhV!}+hp7n4G6B~HHC?~~U5@tu31aCUEf*~E$8&FUR; z?a9oyI&W`U-FtGb{9H+o=@2;oY<>5#r{j!=ZqHro>i7MXyK}^XNA^D~_mPOMM+t}3 ze|_=3Wb&TU`%SO6(2ZQZqf&|yfMthy(G*fa6>Yl^Hx8=GtqqH9}^n3 z?n|l4A|t<=x|*Yb?<6<<7TA&>f9U>1dpj5?ep3Zerh8l2F(?MB_nTf-LE=C)bwEc0 zd=pU2pqcEdMpN>MhiCy_w@5%qF4s?{o$NOgP4-e7%Us?WKuxEPeDVi{|B8v^R zB>cGn?UUW+E~#=aaYWFkwhoKc;CAT!w6v!!;h98w>O^~*NS!XbLWOrSlF@Laq(1%H zwQI=TMN<`1aa?+*WrOkuCFk2^oD7pW8IFQy3V04~Lb8bZ?L&=BI^DTJ=v^#E8S4m$fXGF-bTg^FJ?Eia`h^T literal 0 HcmV?d00001 diff --git a/js/varien/accordion.js b/js/varien/accordion.js index 508f892eb..40367da4e 100644 --- a/js/varien/accordion.js +++ b/js/varien/accordion.js @@ -19,7 +19,7 @@ * * @category Varien * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ Accordion = Class.create(); diff --git a/js/varien/configurable.js b/js/varien/configurable.js index 79642029c..d3ed9745e 100644 --- a/js/varien/configurable.js +++ b/js/varien/configurable.js @@ -19,7 +19,7 @@ * * @category Varien * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ if (typeof Product == 'undefined') { diff --git a/js/varien/form.js b/js/varien/form.js index c14a40f77..30075f7ca 100644 --- a/js/varien/form.js +++ b/js/varien/form.js @@ -19,7 +19,7 @@ * * @category Varien * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ VarienForm = Class.create(); diff --git a/js/varien/iehover-fix.js b/js/varien/iehover-fix.js index 51e28f9e9..44f0da486 100644 --- a/js/varien/iehover-fix.js +++ b/js/varien/iehover-fix.js @@ -19,7 +19,7 @@ * * @category Varien * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ function toggleMenu(el, over) diff --git a/js/varien/js.js b/js/varien/js.js index e30594f29..2342b77f8 100644 --- a/js/varien/js.js +++ b/js/varien/js.js @@ -19,7 +19,7 @@ * * @category Varien * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ function popWin(url,win,para) { diff --git a/js/varien/menu.js b/js/varien/menu.js index 54ea6a584..5852df85d 100644 --- a/js/varien/menu.js +++ b/js/varien/menu.js @@ -19,7 +19,7 @@ * * @category Varien * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/varien/payment.js b/js/varien/payment.js index 46951583e..5052c468c 100644 --- a/js/varien/payment.js +++ b/js/varien/payment.js @@ -19,7 +19,7 @@ * * @category Varien * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var paymentForm = Class.create(); diff --git a/js/varien/product.js b/js/varien/product.js index f08731424..1d9199548 100644 --- a/js/varien/product.js +++ b/js/varien/product.js @@ -19,7 +19,7 @@ * * @category Varien * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ if(typeof Product=='undefined') { @@ -749,58 +749,28 @@ Product.OptionsPrice.prototype = { }; }.bind(this)); - if (typeof(skipTierPricePercentUpdate) === "undefined" && typeof(this.tierPrices) !== "undefined") { - for (var i = 0; i < this.tierPrices.length; i++) { - $$('.benefit').each(function(el) { - var parsePrice = function(html) { - var format = this.priceFormat; - var decimalSymbol = format.decimalSymbol === undefined ? "," : format.decimalSymbol; - var regexStr = '[^0-9-' + decimalSymbol + ']'; - //remove all characters except number and decimal symbol - html = html.replace(new RegExp(regexStr, 'g'), ''); - html = html.replace(decimalSymbol, '.'); - return parseFloat(html); - }.bind(this); - - var updateTierPriceInfo = function(priceEl, tierPriceDiff, tierPriceEl, benefitEl) { - if (typeof(tierPriceEl) === "undefined") { - //tierPrice is not shown, e.g., MAP, no need to update the tier price info - return; - } - var price = parsePrice(priceEl.innerHTML); - var tierPrice = price + tierPriceDiff; - - tierPriceEl.innerHTML = this.formatPrice(tierPrice); - - var $percent = Selector.findChildElements(benefitEl, ['.percent.tier-' + i]); - $percent.each(function(el) { - el.innerHTML = Math.ceil(100 - ((100 / price) * tierPrice)); - }); - }.bind(this); - - var tierPriceElArray = $$('.tier-price.tier-' + i + ' .price'); - if (this.showBothPrices) { - var containerExclTax = $(this.containers[3]); - var tierPriceExclTaxDiff = this.tierPrices[i]; - var tierPriceExclTaxEl = tierPriceElArray[0]; - updateTierPriceInfo(containerExclTax, tierPriceExclTaxDiff, tierPriceExclTaxEl, el); - var containerInclTax = $(this.containers[2]); - var tierPriceInclTaxDiff = this.tierPricesInclTax[i]; - var tierPriceInclTaxEl = tierPriceElArray[1]; - updateTierPriceInfo(containerInclTax, tierPriceInclTaxDiff, tierPriceInclTaxEl, el); - } else if (this.showIncludeTax) { - var container = $(this.containers[0]); - var tierPriceInclTaxDiff = this.tierPricesInclTax[i]; - var tierPriceInclTaxEl = tierPriceElArray[0]; - updateTierPriceInfo(container, tierPriceInclTaxDiff, tierPriceInclTaxEl, el); - } else { - var container = $(this.containers[0]); - var tierPriceExclTaxDiff = this.tierPrices[i]; - var tierPriceExclTaxEl = tierPriceElArray[0]; - updateTierPriceInfo(container, tierPriceExclTaxDiff, tierPriceExclTaxEl, el); - } - }, this); - } + for (var i = 0; i < this.tierPrices.length; i++) { + $$('.price.tier-' + i).each(function (el) { + var price = this.tierPrices[i] + parseFloat(optionPrices); + el.innerHTML = this.formatPrice(price); + }, this); + $$('.price.tier-' + i + '-incl-tax').each(function (el) { + var price = this.tierPricesInclTax[i] + parseFloat(optionPrices); + el.innerHTML = this.formatPrice(price); + }, this); + $$('.benefit').each(function (el) { + var parsePrice = function (html) { + return parseFloat(/\d+\.?\d*/.exec(html)); + }; + var container = $(this.containers[3]) ? this.containers[3] : this.containers[0]; + var price = parsePrice($(container).innerHTML); + var tierPrice = $$('.tier-price.tier-' + i+' .price'); + tierPrice = tierPrice.length ? parsePrice(tierPrice[0].innerHTML, 10) : 0; + var $percent = Selector.findChildElements(el, ['.percent.tier-' + i]); + $percent.each(function (el) { + el.innerHTML = Math.ceil(100 - ((100 / price) * tierPrice)); + }); + }, this); } }, diff --git a/js/varien/telephone.js b/js/varien/telephone.js index 2c9612289..2dcb071b6 100644 --- a/js/varien/telephone.js +++ b/js/varien/telephone.js @@ -19,7 +19,7 @@ * * @category Varien * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var telephoneElem = Class.create(); diff --git a/js/varien/weee.js b/js/varien/weee.js index 91f457c60..7dca52339 100644 --- a/js/varien/weee.js +++ b/js/varien/weee.js @@ -19,7 +19,7 @@ * * @category Varien * @package js - * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com) + * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/lib/Magento/Autoload/ClassMap.php b/lib/Magento/Autoload/ClassMap.php deleted file mode 100644 index 00b5e59da..000000000 --- a/lib/Magento/Autoload/ClassMap.php +++ /dev/null @@ -1,100 +0,0 @@ - 'relative/path/to/Class/Name.php', - * ) - * - * @var array - */ - protected $_map = array(); - - /** - * Set base directory absolute path - * - * @param string $baseDir - * @throws \InvalidArgumentException - */ - public function __construct($baseDir) - { - $this->_baseDir = realpath($baseDir); - if (!$this->_baseDir || !is_dir($this->_baseDir)) { - throw new \InvalidArgumentException("Specified path is not a valid directory: '{$baseDir}'"); - } - } - - /** - * Find an absolute path to a file to be included - * - * @param string $class - * @return string|bool - */ - public function getFile($class) - { - if (isset($this->_map[$class])) { - return $this->_baseDir . DIRECTORY_SEPARATOR . $this->_map[$class]; - } - return false; - } - - /** - * Add classes files declaration to the map. New map will override existing values if such was defined before. - * - * @param array $map - * @return \Magento\Autoload\ClassMap - */ - public function addMap(array $map) - { - $this->_map = array_merge($this->_map, $map); - return $this; - } - - /** - * Resolve a class file and include it - * - * @param string $class - */ - public function load($class) - { - $file = $this->getFile($class); - if (file_exists($file)) { - include $file; - } - } -} diff --git a/lib/Magento/Autoload/IncludePath.php b/lib/Magento/Autoload/IncludePath.php deleted file mode 100644 index 854b4123a..000000000 --- a/lib/Magento/Autoload/IncludePath.php +++ /dev/null @@ -1,93 +0,0 @@ - CURLOPT_TIMEOUT, - 'maxredirects' => CURLOPT_MAXREDIRS, - 'proxy' => CURLOPT_PROXY, - 'ssl_cert' => CURLOPT_SSLCERT, - 'userpwd' => CURLOPT_USERPWD + 'timeout' => CURLOPT_TIMEOUT, + 'maxredirects' => CURLOPT_MAXREDIRS, + 'proxy' => CURLOPT_PROXY, + 'ssl_cert' => CURLOPT_SSLCERT, + 'userpwd' => CURLOPT_USERPWD ); /** @@ -74,12 +74,15 @@ class Varien_Http_Adapter_Curl implements Zend_Http_Client_Adapter_Interface */ protected function _applyConfig() { - curl_setopt_array($this->_getResource(), $this->_options); - if (empty($this->_config)) { return $this; } + // apply additional options to cURL + foreach ($this->_options as $option => $value) { + curl_setopt($this->_getResource(), $option, $value); + } + $verifyPeer = isset($this->_config['verifypeer']) ? $this->_config['verifypeer'] : 0; curl_setopt($this->_getResource(), CURLOPT_SSL_VERIFYPEER, $verifyPeer); @@ -119,19 +122,6 @@ public function addOption($option, $value) return $this; } - /** - * Add additional options list to curl - * - * @param array $options - * - * @return Varien_Http_Adapter_Curl - */ - public function addOptions(array $options) - { - $this->_options = $options + $this->_options; - return $this; - } - /** * Set the configuration array for the adapter * @@ -162,7 +152,7 @@ public function connect($host, $port = 80, $secure = false) * Send request to the remote server * * @param string $method - * @param string|Zend_Uri_Http $url + * @param Zend_Uri_Http $url * @param string $http_ver * @param array $headers * @param string $body @@ -175,23 +165,26 @@ public function write($method, $url, $http_ver = '1.1', $headers = array(), $bod } $this->_applyConfig(); - $header = isset($this->_config['header']) ? $this->_config['header'] : true; - $options = array( - CURLOPT_URL => $url, - CURLOPT_RETURNTRANSFER => true, - CURLOPT_HEADER => $header - ); + // set url to post to + curl_setopt($this->_getResource(), CURLOPT_URL, $url); + curl_setopt($this->_getResource(), CURLOPT_RETURNTRANSFER, true); if ($method == Zend_Http_Client::POST) { - $options[CURLOPT_POST] = true; - $options[CURLOPT_POSTFIELDS] = $body; - } elseif ($method == Zend_Http_Client::GET) { - $options[CURLOPT_HTTPGET] = true; + curl_setopt($this->_getResource(), CURLOPT_POST, true); + curl_setopt($this->_getResource(), CURLOPT_POSTFIELDS, $body); + } + elseif ($method == Zend_Http_Client::GET) { + curl_setopt($this->_getResource(), CURLOPT_HTTPGET, true); } + if (is_array($headers)) { - $options[CURLOPT_HTTPHEADER] = $headers; + curl_setopt($this->_getResource(), CURLOPT_HTTPHEADER, $headers); } - curl_setopt_array($this->_getResource(), $options); + /** + * @internal Curl options setter have to be re-factored + */ + $header = isset($this->_config['header']) ? $this->_config['header'] : true; + curl_setopt($this->_getResource(), CURLOPT_HEADER, $header); return $body; } @@ -271,10 +264,6 @@ public function getError() */ public function getInfo($opt = 0) { - if (!$opt) { - return curl_getinfo($this->_getResource()); - } - return curl_getinfo($this->_getResource(), $opt); } @@ -294,8 +283,8 @@ public function multiRequest($urls, $options = array()) foreach ($urls as $key => $url) { $handles[$key] = curl_init(); - curl_setopt($handles[$key], CURLOPT_URL, $url); - curl_setopt($handles[$key], CURLOPT_HEADER, 0); + curl_setopt($handles[$key], CURLOPT_URL, $url); + curl_setopt($handles[$key], CURLOPT_HEADER, 0); curl_setopt($handles[$key], CURLOPT_RETURNTRANSFER, 1); if (!empty($options)) { curl_setopt_array($handles[$key], $options); diff --git a/lib/Zend/Acl.php b/lib/Zend/Acl.php index c2c73b179..dd293f336 100644 --- a/lib/Zend/Acl.php +++ b/lib/Zend/Acl.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Acl.php 24771 2012-05-07 01:13:06Z adamlundrigan $ + * @version $Id: Acl.php 23358 2010-11-18 16:19:31Z ralph $ */ @@ -53,7 +53,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Acl @@ -140,7 +140,7 @@ class Zend_Acl * will have the least priority, and the last parent added will have the * highest priority. * - * @param Zend_Acl_Role_Interface|string $role + * @param Zend_Acl_Role_Interface $role * @param Zend_Acl_Role_Interface|string|array $parents * @uses Zend_Acl_Role_Registry::add() * @return Zend_Acl Provides a fluent interface @@ -655,7 +655,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr } unset($rTarget); } - + // normalize privileges to array if (null === $privileges) { $privileges = array(); @@ -726,7 +726,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr } continue; } - + if (isset($rules['allPrivileges']['type']) && $type === $rules['allPrivileges']['type']) { @@ -750,7 +750,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr * since null (all resources) was passed to this setRule() call, we need * clean up all the rules for the global allResources, as well as the indivually * set resources (per privilege as well) - */ + */ foreach (array_merge(array(null), $allResources) as $resource) { $rules =& $this->_getRules($resource, $role, true); if (null === $rules) { @@ -769,7 +769,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr } continue; } - + if (isset($rules['allPrivileges']['type']) && $type === $rules['allPrivileges']['type']) { unset($rules['allPrivileges']); } @@ -1218,11 +1218,6 @@ public function getRegisteredRoles() } /** - * Returns an array of registered roles. - * - * Note that this method does not return instances of registered roles, - * but only the role identifiers. - * * @return array of registered roles */ public function getRoles() @@ -1237,6 +1232,6 @@ public function getResources() { return array_keys($this->_resources); } - + } - + diff --git a/lib/Zend/Acl/Assert/Interface.php b/lib/Zend/Acl/Assert/Interface.php index d954db739..730ed2b7a 100644 --- a/lib/Zend/Acl/Assert/Interface.php +++ b/lib/Zend/Acl/Assert/Interface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -41,7 +41,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Acl_Assert_Interface diff --git a/lib/Zend/Acl/Exception.php b/lib/Zend/Acl/Exception.php index d3c5c4f64..97d85b38a 100644 --- a/lib/Zend/Acl/Exception.php +++ b/lib/Zend/Acl/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Acl_Exception extends Zend_Exception diff --git a/lib/Zend/Acl/Resource.php b/lib/Zend/Acl/Resource.php index 78e9824ed..cf8d746b6 100644 --- a/lib/Zend/Acl/Resource.php +++ b/lib/Zend/Acl/Resource.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Resource.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Acl_Resource implements Zend_Acl_Resource_Interface diff --git a/lib/Zend/Acl/Resource/Interface.php b/lib/Zend/Acl/Resource/Interface.php index 4ab228461..9720594d6 100644 --- a/lib/Zend/Acl/Resource/Interface.php +++ b/lib/Zend/Acl/Resource/Interface.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Acl_Resource_Interface diff --git a/lib/Zend/Acl/Role.php b/lib/Zend/Acl/Role.php index 9c44db4c0..4de78eb30 100644 --- a/lib/Zend/Acl/Role.php +++ b/lib/Zend/Acl/Role.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Role.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Role.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Acl_Role implements Zend_Acl_Role_Interface @@ -44,7 +44,7 @@ class Zend_Acl_Role implements Zend_Acl_Role_Interface /** * Sets the Role identifier * - * @param string $roleId + * @param string $id * @return void */ public function __construct($roleId) diff --git a/lib/Zend/Acl/Role/Interface.php b/lib/Zend/Acl/Role/Interface.php index ddb7b3313..65d6d84ff 100644 --- a/lib/Zend/Acl/Role/Interface.php +++ b/lib/Zend/Acl/Role/Interface.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Acl_Role_Interface diff --git a/lib/Zend/Acl/Role/Registry.php b/lib/Zend/Acl/Role/Registry.php index 05bcf21b1..863dca282 100644 --- a/lib/Zend/Acl/Role/Registry.php +++ b/lib/Zend/Acl/Role/Registry.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Registry.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Registry.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Acl_Role_Registry diff --git a/lib/Zend/Acl/Role/Registry/Exception.php b/lib/Zend/Acl/Role/Registry/Exception.php index c3e474ac6..cb618cdf1 100644 --- a/lib/Zend/Acl/Role/Registry/Exception.php +++ b/lib/Zend/Acl/Role/Registry/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Acl_Role_Registry_Exception extends Zend_Acl_Exception diff --git a/lib/Zend/Amf/Adobe/Auth.php b/lib/Zend/Amf/Adobe/Auth.php index 7b244bbc3..f0063d721 100644 --- a/lib/Zend/Amf/Adobe/Auth.php +++ b/lib/Zend/Amf/Adobe/Auth.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Auth.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Auth.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @see Zend_Amf_Auth_Abstract */ @@ -33,7 +33,7 @@ * * @package Zend_Amf * @subpackage Adobe - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract diff --git a/lib/Zend/Amf/Adobe/DbInspector.php b/lib/Zend/Amf/Adobe/DbInspector.php index 9562a6067..82c3c8d65 100644 --- a/lib/Zend/Amf/Adobe/DbInspector.php +++ b/lib/Zend/Amf/Adobe/DbInspector.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbInspector.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: DbInspector.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -24,7 +24,7 @@ * * @package Zend_Amf * @subpackage Adobe - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Adobe_DbInspector diff --git a/lib/Zend/Amf/Adobe/Introspector.php b/lib/Zend/Amf/Adobe/Introspector.php index 453554bcb..961f67b39 100644 --- a/lib/Zend/Amf/Adobe/Introspector.php +++ b/lib/Zend/Amf/Adobe/Introspector.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Introspector.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id: Introspector.php 23316 2010-11-10 16:37:40Z matthew $ */ /** @see Zend_Amf_Parse_TypeLoader */ @@ -33,7 +33,7 @@ * * @package Zend_Amf * @subpackage Adobe - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Adobe_Introspector diff --git a/lib/Zend/Amf/Auth/Abstract.php b/lib/Zend/Amf/Auth/Abstract.php index dfde920bc..47fea489e 100644 --- a/lib/Zend/Amf/Auth/Abstract.php +++ b/lib/Zend/Amf/Auth/Abstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @see Zend_Auth_Adapter_Interface */ @@ -27,7 +27,7 @@ * * @package Zend_Amf * @subpackage Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Amf_Auth_Abstract implements Zend_Auth_Adapter_Interface diff --git a/lib/Zend/Amf/Constants.php b/lib/Zend/Amf/Constants.php index d5342f5ec..f3bc4ee9c 100644 --- a/lib/Zend/Amf/Constants.php +++ b/lib/Zend/Amf/Constants.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Constants.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Constants.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -24,7 +24,7 @@ * deserialization to detect the AMF marker and encoding types. * * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_Amf_Constants diff --git a/lib/Zend/Amf/Exception.php b/lib/Zend/Amf/Exception.php index 110f4ea26..184fffe3c 100644 --- a/lib/Zend/Amf/Exception.php +++ b/lib/Zend/Amf/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -26,7 +26,7 @@ /** * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Exception extends Zend_Exception diff --git a/lib/Zend/Amf/Parse/Amf0/Deserializer.php b/lib/Zend/Amf/Parse/Amf0/Deserializer.php index 00c33dc0d..a259d32ac 100644 --- a/lib/Zend/Amf/Parse/Amf0/Deserializer.php +++ b/lib/Zend/Amf/Parse/Amf0/Deserializer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Deserializer.php 21209 2010-02-27 10:37:15Z yoshida@zend.co.jp $ */ /** Zend_Amf_Constants */ @@ -33,7 +33,7 @@ * @todo Class could be implemented as Factory Class with each data type it's own class * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer diff --git a/lib/Zend/Amf/Parse/Amf0/Serializer.php b/lib/Zend/Amf/Parse/Amf0/Serializer.php index 7072ee29b..bf3deb39c 100644 --- a/lib/Zend/Amf/Parse/Amf0/Serializer.php +++ b/lib/Zend/Amf/Parse/Amf0/Serializer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $ + * @version $Id: Serializer.php 21968 2010-04-22 03:53:34Z matthew $ */ /** Zend_Amf_Constants */ @@ -32,7 +32,7 @@ * @uses Zend_Amf_Parse_Serializer * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer @@ -63,8 +63,8 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer */ public function writeTypeMarker(&$data, $markerType = null, $dataByVal = false) { - // Workaround for PHP5 with E_STRICT enabled complaining about "Only - // variables should be passed by reference" + // Workaround for PHP5 with E_STRICT enabled complaining about "Only + // variables should be passed by reference" if ((null === $data) && ($dataByVal !== false)) { $data = &$dataByVal; } @@ -127,7 +127,7 @@ public function writeTypeMarker(&$data, $markerType = null, $dataByVal = false) case (is_bool($data)): $markerType = Zend_Amf_Constants::AMF0_BOOLEAN; break; - case (is_string($data) && (($this->_mbStringFunctionsOverloaded ? mb_strlen($data, '8bit') : strlen($data)) > 65536)): + case (is_string($data) && (strlen($data) > 65536)): $markerType = Zend_Amf_Constants::AMF0_LONGSTRING; break; case (is_string($data)): @@ -187,23 +187,23 @@ public function writeTypeMarker(&$data, $markerType = null, $dataByVal = false) * Check if the given object is in the reference table, write the reference if it exists, * otherwise add the object to the reference table * - * @param mixed $object object reference to check for reference - * @param string $markerType AMF type of the object to write - * @param mixed $objectByVal object to check for reference + * @param mixed $object object reference to check for reference + * @param $markerType AMF type of the object to write + * @param mixed $objectByVal object to check for reference * @return Boolean true, if the reference was written, false otherwise */ - protected function writeObjectReference(&$object, $markerType, $objectByVal = false) + protected function writeObjectReference(&$object, $markerType, $objectByVal = false) { - // Workaround for PHP5 with E_STRICT enabled complaining about "Only + // Workaround for PHP5 with E_STRICT enabled complaining about "Only // variables should be passed by reference" if ((null === $object) && ($objectByVal !== false)) { $object = &$objectByVal; } - if ($markerType == Zend_Amf_Constants::AMF0_OBJECT - || $markerType == Zend_Amf_Constants::AMF0_MIXEDARRAY - || $markerType == Zend_Amf_Constants::AMF0_ARRAY - || $markerType == Zend_Amf_Constants::AMF0_TYPEDOBJECT + if ($markerType == Zend_Amf_Constants::AMF0_OBJECT + || $markerType == Zend_Amf_Constants::AMF0_MIXEDARRAY + || $markerType == Zend_Amf_Constants::AMF0_ARRAY + || $markerType == Zend_Amf_Constants::AMF0_TYPEDOBJECT ) { $ref = array_search($object, $this->_referenceObjects, true); //handle object reference diff --git a/lib/Zend/Amf/Parse/Amf3/Deserializer.php b/lib/Zend/Amf/Parse/Amf3/Deserializer.php index e21e60229..deac37177 100644 --- a/lib/Zend/Amf/Parse/Amf3/Deserializer.php +++ b/lib/Zend/Amf/Parse/Amf3/Deserializer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Deserializer.php 21968 2010-04-22 03:53:34Z matthew $ */ /** Zend_Amf_Parse_Deserializer */ @@ -34,7 +34,7 @@ * @todo Class could be implemented as Factory Class with each data type it's own class. * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer @@ -225,7 +225,7 @@ public function readDate() $timestamp = floor($this->_stream->readDouble() / 1000); #require_once 'Zend/Date.php'; - $dateTime = new Zend_Date($timestamp); + $dateTime = new Zend_Date((int) $timestamp); $this->_referenceObjects[] = $dateTime; return $dateTime; } @@ -385,7 +385,6 @@ public function readObject() } // Add properties back to the return object. - if (!is_array($properties)) $properties = array(); foreach($properties as $key=>$value) { if($key) { $returnObject->$key = $value; diff --git a/lib/Zend/Amf/Parse/Amf3/Serializer.php b/lib/Zend/Amf/Parse/Amf3/Serializer.php index f640ba0a3..eb5468045 100644 --- a/lib/Zend/Amf/Parse/Amf3/Serializer.php +++ b/lib/Zend/Amf/Parse/Amf3/Serializer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $ + * @version $Id: Serializer.php 22101 2010-05-04 20:07:13Z matthew $ */ /** Zend_Amf_Constants */ @@ -35,7 +35,7 @@ * * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer @@ -45,7 +45,7 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer * @var string */ protected $_strEmpty = ''; - + /** * An array of reference objects per amf body * @var array @@ -78,7 +78,7 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer */ public function writeTypeMarker(&$data, $markerType = null, $dataByVal = false) { - // Workaround for PHP5 with E_STRICT enabled complaining about "Only + // Workaround for PHP5 with E_STRICT enabled complaining about "Only // variables should be passed by reference" if ((null === $data) && ($dataByVal !== false)) { $data = &$dataByVal; @@ -215,7 +215,7 @@ public function writeInteger($int) * @return Zend_Amf_Parse_Amf3_Serializer */ protected function writeBinaryString(&$string){ - $ref = ($this->_mbStringFunctionsOverloaded ? mb_strlen($string, '8bit') : strlen($string)) << 1 | 0x01; + $ref = strlen($string) << 1 | 0x01; $this->writeInteger($ref); $this->_stream->writeBytes($string); @@ -230,17 +230,15 @@ protected function writeBinaryString(&$string){ */ public function writeString(&$string) { - $len = $this->_mbStringFunctionsOverloaded ? mb_strlen($string, '8bit') : strlen($string); + $len = strlen($string); if(!$len){ $this->writeInteger(0x01); return $this; } - $ref = array_key_exists($string, $this->_referenceStrings) - ? $this->_referenceStrings[$string] - : false; - if ($ref === false){ - $this->_referenceStrings[$string] = count($this->_referenceStrings); + $ref = array_search($string, $this->_referenceStrings, true); + if($ref === false){ + $this->_referenceStrings[] = $string; $this->writeBinaryString($string); } else { $ref <<= 1; @@ -382,16 +380,13 @@ public function writeArray(&$array) */ protected function writeObjectReference(&$object, $objectByVal = false) { - // Workaround for PHP5 with E_STRICT enabled complaining about "Only + // Workaround for PHP5 with E_STRICT enabled complaining about "Only // variables should be passed by reference" if ((null === $object) && ($objectByVal !== false)) { $object = &$objectByVal; } - $hash = spl_object_hash($object); - $ref = array_key_exists($hash, $this->_referenceObjects) - ? $this->_referenceObjects[$hash] - : false; + $ref = array_search($object, $this->_referenceObjects,true); // quickly handle object references if ($ref !== false){ @@ -399,7 +394,7 @@ protected function writeObjectReference(&$object, $objectByVal = false) $this->writeInteger($ref); return true; } - $this->_referenceObjects[$hash] = count($this->_referenceObjects); + $this->_referenceObjects[] = $object; return false; } diff --git a/lib/Zend/Amf/Parse/Deserializer.php b/lib/Zend/Amf/Parse/Deserializer.php index 6c5636782..4f697bb1f 100644 --- a/lib/Zend/Amf/Parse/Deserializer.php +++ b/lib/Zend/Amf/Parse/Deserializer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Deserializer.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -30,7 +30,7 @@ * @see http://opensource.adobe.com/svn/opensource/blazeds/trunk/modules/core/src/java/flex/messaging/io/amf/ * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Amf_Parse_Deserializer diff --git a/lib/Zend/Amf/Parse/InputStream.php b/lib/Zend/Amf/Parse/InputStream.php index fd0b2bad3..5a9d152ee 100644 --- a/lib/Zend/Amf/Parse/InputStream.php +++ b/lib/Zend/Amf/Parse/InputStream.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InputStream.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: InputStream.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** Zend_Amf_Util_BinaryStream */ @@ -31,7 +31,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_InputStream extends Zend_Amf_Util_BinaryStream diff --git a/lib/Zend/Amf/Parse/OutputStream.php b/lib/Zend/Amf/Parse/OutputStream.php index fd11d566f..a77c5a312 100644 --- a/lib/Zend/Amf/Parse/OutputStream.php +++ b/lib/Zend/Amf/Parse/OutputStream.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OutputStream.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: OutputStream.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** Zend_Amf_Util_BinaryStream */ @@ -32,7 +32,7 @@ * @uses Zend_Amf_Util_BinaryStream * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_OutputStream extends Zend_Amf_Util_BinaryStream diff --git a/lib/Zend/Amf/Parse/Resource/MysqlResult.php b/lib/Zend/Amf/Parse/Resource/MysqlResult.php index 85f0c563e..199b7d7bb 100644 --- a/lib/Zend/Amf/Parse/Resource/MysqlResult.php +++ b/lib/Zend/Amf/Parse/Resource/MysqlResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MysqlResult.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: MysqlResult.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -26,7 +26,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Resource_MysqlResult diff --git a/lib/Zend/Amf/Parse/Resource/MysqliResult.php b/lib/Zend/Amf/Parse/Resource/MysqliResult.php index c549fadd5..dc99849fd 100644 --- a/lib/Zend/Amf/Parse/Resource/MysqliResult.php +++ b/lib/Zend/Amf/Parse/Resource/MysqliResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MysqliResult.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: MysqliResult.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -26,7 +26,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Resource_MysqliResult diff --git a/lib/Zend/Amf/Parse/Resource/Stream.php b/lib/Zend/Amf/Parse/Resource/Stream.php index 2f6ee88f6..2e116c410 100644 --- a/lib/Zend/Amf/Parse/Resource/Stream.php +++ b/lib/Zend/Amf/Parse/Resource/Stream.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Resource_Stream diff --git a/lib/Zend/Amf/Parse/Serializer.php b/lib/Zend/Amf/Parse/Serializer.php index c36e4c689..a7c71dc78 100644 --- a/lib/Zend/Amf/Parse/Serializer.php +++ b/lib/Zend/Amf/Parse/Serializer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $ + * @version $Id: Serializer.php 21968 2010-04-22 03:53:34Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Amf_Parse_Serializer @@ -37,13 +37,6 @@ abstract class Zend_Amf_Parse_Serializer */ protected $_stream; - /** - * str* functions overloaded using mbstring.func_overload - * - * @var bool - */ - protected $mbStringFunctionsOverloaded; - /** * Constructor * @@ -53,7 +46,6 @@ abstract class Zend_Amf_Parse_Serializer public function __construct(Zend_Amf_Parse_OutputStream $stream) { $this->_stream = $stream; - $this->_mbStringFunctionsOverloaded = function_exists('mb_strlen') && (ini_get('mbstring.func_overload') !== '') && ((int)ini_get('mbstring.func_overload') & 2); } /** diff --git a/lib/Zend/Amf/Parse/TypeLoader.php b/lib/Zend/Amf/Parse/TypeLoader.php index 20a84ef83..d5fd507f5 100644 --- a/lib/Zend/Amf/Parse/TypeLoader.php +++ b/lib/Zend/Amf/Parse/TypeLoader.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TypeLoader.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: TypeLoader.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -47,7 +47,7 @@ * @todo PHP 5.3 can drastically change this class w/ namespace and the new call_user_func w/ namespace * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_Amf_Parse_TypeLoader diff --git a/lib/Zend/Amf/Request.php b/lib/Zend/Amf/Request.php index 8c4c91725..450d34dc6 100644 --- a/lib/Zend/Amf/Request.php +++ b/lib/Zend/Amf/Request.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Request.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Request.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @see Zend_Amf_Parse_InputStream */ @@ -40,7 +40,7 @@ * * @todo Currently not checking if the object needs to be Type Mapped to a server object. * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Request diff --git a/lib/Zend/Amf/Request/Http.php b/lib/Zend/Amf/Request/Http.php index b786cb6b1..c2a49acaa 100644 --- a/lib/Zend/Amf/Request/Http.php +++ b/lib/Zend/Amf/Request/Http.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @see Zend_Amf_Request */ @@ -32,7 +32,7 @@ * * @package Zend_Amf * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Request_Http extends Zend_Amf_Request diff --git a/lib/Zend/Amf/Response.php b/lib/Zend/Amf/Response.php index 2802379ff..708ee5516 100644 --- a/lib/Zend/Amf/Response.php +++ b/lib/Zend/Amf/Response.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Response.php 21968 2010-04-22 03:53:34Z matthew $ */ /** @see Zend_Amf_Constants */ @@ -32,7 +32,7 @@ * Handles converting the PHP object ready for response back into AMF * * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Response @@ -95,7 +95,7 @@ public function writeMessage(Zend_Amf_Parse_OutputStream $stream) $stream->writeByte($header->mustRead); $stream->writeLong(Zend_Amf_Constants::UNKNOWN_CONTENT_LENGTH); if (is_object($header->data)) { - // Workaround for PHP5 with E_STRICT enabled complaining about + // Workaround for PHP5 with E_STRICT enabled complaining about // "Only variables should be passed by reference" $placeholder = null; $serializer->writeTypeMarker($placeholder, null, $header->data); @@ -115,7 +115,7 @@ public function writeMessage(Zend_Amf_Parse_OutputStream $stream) $bodyData = $body->getData(); $markerType = ($this->_objectEncoding == Zend_Amf_Constants::AMF0_OBJECT_ENCODING) ? null : Zend_Amf_Constants::AMF0_AMF3; if (is_object($bodyData)) { - // Workaround for PHP5 with E_STRICT enabled complaining about + // Workaround for PHP5 with E_STRICT enabled complaining about // "Only variables should be passed by reference" $placeholder = null; $serializer->writeTypeMarker($placeholder, $markerType, $bodyData); diff --git a/lib/Zend/Amf/Response/Http.php b/lib/Zend/Amf/Response/Http.php index 2535bf565..5bf06a775 100644 --- a/lib/Zend/Amf/Response/Http.php +++ b/lib/Zend/Amf/Response/Http.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Response - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Http.php 22096 2010-05-04 15:37:23Z wadearnold $ */ /** Zend_Amf_Response */ @@ -28,7 +28,7 @@ * * @package Zend_Amf * @subpackage Response - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Response_Http extends Zend_Amf_Response @@ -41,33 +41,11 @@ class Zend_Amf_Response_Http extends Zend_Amf_Response public function getResponse() { if (!headers_sent()) { - if ($this->isIeOverSsl()) { - header('Cache-Control: cache, must-revalidate'); - header('Pragma: public'); - } else { - header('Cache-Control: no-cache, must-revalidate'); - header('Pragma: no-cache'); - } + header('Cache-Control: no-cache, must-revalidate'); header('Expires: Thu, 19 Nov 1981 08:52:00 GMT'); + header('Pragma: no-cache'); header('Content-Type: application/x-amf'); } return parent::getResponse(); } - - protected function isIeOverSsl() - { - $ssl = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : false; - if (!$ssl || ($ssl == 'off')) { - // IIS reports "off", whereas other browsers simply don't populate - return false; - } - - $ua = $_SERVER['HTTP_USER_AGENT']; - if (!preg_match('/; MSIE \d+\.\d+;/', $ua)) { - // Not MicroSoft Internet Explorer - return false; - } - - return true; - } } diff --git a/lib/Zend/Amf/Server.php b/lib/Zend/Amf/Server.php index d9692c52e..c7e752bdd 100644 --- a/lib/Zend/Amf/Server.php +++ b/lib/Zend/Amf/Server.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Server.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Server.php 23256 2010-10-26 12:51:54Z alexander $ */ /** @see Zend_Server_Interface */ @@ -52,7 +52,7 @@ * @todo Make the reflection methods cache and autoload. * @package Zend_Amf * @subpackage Server - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Server implements Zend_Server_Interface @@ -142,18 +142,12 @@ public function __construct() /** * Set authentication adapter * - * If the authentication adapter implements a "getAcl()" method, populate - * the ACL of this instance with it (if none exists already). - * * @param Zend_Amf_Auth_Abstract $auth * @return Zend_Amf_Server */ public function setAuth(Zend_Amf_Auth_Abstract $auth) { $this->_auth = $auth; - if ((null === $this->getAcl()) && method_exists($auth, 'getAcl')) { - $this->setAcl($auth->getAcl()); - } return $this; } /** @@ -323,7 +317,6 @@ protected function _dispatch($method, $params = null, $source = null) throw new Zend_Amf_Server_Exception('Class "' . $className . '" does not exist: '.$e->getMessage(), 0, $e); } // Add the new loaded class to the server. - #require_once 'Zend/Amf/Server/Exception.php'; $this->setClass($className, $source); } @@ -341,8 +334,6 @@ protected function _dispatch($method, $params = null, $source = null) $params = array_merge($params, $argv); } - $params = $this->_castParameters($info, $params); - if ($info instanceof Zend_Server_Reflection_Function) { $func = $info->getName(); $this->_checkAcl(null, $func); @@ -503,60 +494,66 @@ protected function _handle(Zend_Amf_Request $request) // set response encoding $response->setObjectEncoding($objectEncoding); - // Authenticate, if we have credential headers - $error = false; - $headers = $request->getAmfHeaders(); - if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]) - && isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid) - && isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password) - ) { - try { - if ($this->_handleAuth( - $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid, - $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password - )) { - // use RequestPersistentHeader to clear credentials - $response->addAmfHeader( - new Zend_Amf_Value_MessageHeader( - Zend_Amf_Constants::PERSISTENT_HEADER, - false, - new Zend_Amf_Value_MessageHeader( - Zend_Amf_Constants::CREDENTIALS_HEADER, - false, null - ) - ) - ); - } - } catch (Exception $e) { - // Error during authentication; report it - $error = $this->_errorMessage( - $objectEncoding, - '', - $e->getMessage(), - $e->getTraceAsString(), - $e->getCode(), - $e->getLine() - ); - $responseType = Zend_AMF_Constants::STATUS_METHOD; + $responseBody = $request->getAmfBodies(); + + $handleAuth = false; + if ($this->_auth) { + $headers = $request->getAmfHeaders(); + if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]) && + isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid)) { + $handleAuth = true; } } // Iterate through each of the service calls in the AMF request - foreach($request->getAmfBodies() as $body) + foreach($responseBody as $body) { - if ($error) { - // Error during authentication; just report it and be done - $responseURI = $body->getResponseURI() . $responseType; - $newBody = new Zend_Amf_Value_MessageBody($responseURI, null, $error); - $response->addAmfBody($newBody); - continue; - } try { - switch ($objectEncoding) { - case Zend_Amf_Constants::AMF0_OBJECT_ENCODING: - // AMF0 Object Encoding + if ($handleAuth) { + if ($this->_handleAuth( + $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid, + $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password)) { + // use RequestPersistentHeader to clear credentials + $response->addAmfHeader( + new Zend_Amf_Value_MessageHeader( + Zend_Amf_Constants::PERSISTENT_HEADER, + false, + new Zend_Amf_Value_MessageHeader( + Zend_Amf_Constants::CREDENTIALS_HEADER, + false, null))); + $handleAuth = false; + } + } + + if ($objectEncoding == Zend_Amf_Constants::AMF0_OBJECT_ENCODING) { + // AMF0 Object Encoding + $targetURI = $body->getTargetURI(); + $message = ''; + + // Split the target string into its values. + $source = substr($targetURI, 0, strrpos($targetURI, '.')); + + if ($source) { + // Break off method name from namespace into source + $method = substr(strrchr($targetURI, '.'), 1); + $return = $this->_dispatch($method, $body->getData(), $source); + } else { + // Just have a method name. + $return = $this->_dispatch($targetURI, $body->getData()); + } + } else { + // AMF3 read message type + $message = $body->getData(); + if ($message instanceof Zend_Amf_Value_Messaging_CommandMessage) { + // async call with command message + $return = $this->_loadCommandMessage($message); + } elseif ($message instanceof Zend_Amf_Value_Messaging_RemotingMessage) { + #require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; + $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message); + $return->body = $this->_dispatch($message->operation, $message->body, $message->source); + } else { + // Amf3 message sent with netConnection $targetURI = $body->getTargetURI(); - $message = ''; // Split the target string into its values. $source = substr($targetURI, 0, strrpos($targetURI, '.')); @@ -569,35 +566,7 @@ protected function _handle(Zend_Amf_Request $request) // Just have a method name. $return = $this->_dispatch($targetURI, $body->getData()); } - break; - case Zend_Amf_Constants::AMF3_OBJECT_ENCODING: - default: - // AMF3 read message type - $message = $body->getData(); - if ($message instanceof Zend_Amf_Value_Messaging_CommandMessage) { - // async call with command message - $return = $this->_loadCommandMessage($message); - } elseif ($message instanceof Zend_Amf_Value_Messaging_RemotingMessage) { - #require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; - $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message); - $return->body = $this->_dispatch($message->operation, $message->body, $message->source); - } else { - // Amf3 message sent with netConnection - $targetURI = $body->getTargetURI(); - - // Split the target string into its values. - $source = substr($targetURI, 0, strrpos($targetURI, '.')); - - if ($source) { - // Break off method name from namespace into source - $method = substr(strrchr($targetURI, '.'), 1); - $return = $this->_dispatch($method, $body->getData(), $source); - } else { - // Just have a method name. - $return = $this->_dispatch($targetURI, $body->getData()); - } - } - break; + } } $responseType = Zend_AMF_Constants::RESULT_METHOD; } catch (Exception $e) { @@ -964,85 +933,4 @@ public function listMethods() { return array_keys($this->_table); } - - /** - * Cast parameters - * - * Takes the provided parameters from the request, and attempts to cast them - * to objects, if the prototype defines any as explicit object types - * - * @param Reflection $reflectionMethod - * @param array $params - * @return array - */ - protected function _castParameters($reflectionMethod, array $params) - { - $prototypes = $reflectionMethod->getPrototypes(); - $nonObjectTypes = array( - 'null', - 'mixed', - 'void', - 'unknown', - 'bool', - 'boolean', - 'number', - 'int', - 'integer', - 'double', - 'float', - 'string', - 'array', - 'object', - 'stdclass', - ); - $types = array(); - foreach ($prototypes as $prototype) { - foreach ($prototype->getParameters() as $parameter) { - $type = $parameter->getType(); - if (in_array(strtolower($type), $nonObjectTypes)) { - continue; - } - $position = $parameter->getPosition(); - $types[$position] = $type; - } - } - - if (empty($types)) { - return $params; - } - - foreach ($params as $position => $value) { - if (!isset($types[$position])) { - // No specific type to cast to? done - continue; - } - - $type = $types[$position]; - - if (!class_exists($type)) { - // Not a class, apparently. done - continue; - } - - if ($value instanceof $type) { - // Already of the right type? done - continue; - } - - if (!is_array($value) && !is_object($value)) { - // Can't cast scalars to objects easily; done - continue; - } - - // Create instance, and loop through value to set - $object = new $type; - foreach ($value as $property => $defined) { - $object->{$property} = $defined; - } - - $params[$position] = $object; - } - - return $params; - } } diff --git a/lib/Zend/Amf/Server/Exception.php b/lib/Zend/Amf/Server/Exception.php index 597381f5a..1cf318bb1 100644 --- a/lib/Zend/Amf/Server/Exception.php +++ b/lib/Zend/Amf/Server/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Server - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** Zend_Amf_Exception */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Amf * @subpackage Server - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Server_Exception extends Zend_Amf_Exception diff --git a/lib/Zend/Amf/Util/BinaryStream.php b/lib/Zend/Amf/Util/BinaryStream.php index 0d62cc34d..7e4d30555 100644 --- a/lib/Zend/Amf/Util/BinaryStream.php +++ b/lib/Zend/Amf/Util/BinaryStream.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Util - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BinaryStream.php 25241 2013-01-22 11:07:36Z frosch $ + * @version $Id: BinaryStream.php 22101 2010-05-04 20:07:13Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Util - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Util_BinaryStream @@ -50,11 +50,6 @@ class Zend_Amf_Util_BinaryStream */ protected $_needle; - /** - * @var bool str* functions overloaded using mbstring.func_overload? - */ - protected $_mbStringFunctionsOverloaded; - /** * Constructor * @@ -74,8 +69,7 @@ public function __construct($stream) $this->_stream = $stream; $this->_needle = 0; - $this->_mbStringFunctionsOverloaded = function_exists('mb_strlen') && (ini_get('mbstring.func_overload') !== '') && ((int)ini_get('mbstring.func_overload') & 2); - $this->_streamLength = $this->_mbStringFunctionsOverloaded ? mb_strlen($stream, '8bit') : strlen($stream); + $this->_streamLength = strlen($stream); $this->_bigEndian = (pack('l', 1) === "\x00\x00\x00\x01"); } @@ -103,7 +97,7 @@ public function readBytes($length) #require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length); } - $bytes = $this->_mbStringFunctionsOverloaded ? mb_substr($this->_stream, $this->_needle, $length, '8bit') : substr($this->_stream, $this->_needle, $length); + $bytes = substr($this->_stream, $this->_needle, $length); $this->_needle+= $length; return $bytes; } @@ -126,18 +120,12 @@ public function writeBytes($bytes) * Reads a signed byte * * @return int Value is in the range of -128 to 127. - * @throws Zend_Amf_Exception */ public function readByte() { if (($this->_needle + 1) > $this->_streamLength) { #require_once 'Zend/Amf/Exception.php'; - throw new Zend_Amf_Exception( - 'Buffer underrun at needle position: ' - . $this->_needle - . ' while requesting length: ' - . $this->_streamLength - ); + throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length); } return ord($this->_stream{$this->_needle++}); @@ -196,7 +184,7 @@ public function readUtf() */ public function writeUtf($stream) { - $this->writeInt($this->_mbStringFunctionsOverloaded ? mb_strlen($stream, '8bit') : strlen($stream)); + $this->writeInt(strlen($stream)); $this->_stream.= $stream; return $this; } @@ -221,7 +209,7 @@ public function readLongUtf() */ public function writeLongUtf($stream) { - $this->writeLong($this->_mbStringFunctionsOverloaded ? mb_strlen($stream, '8bit') : strlen($stream)); + $this->writeLong(strlen($stream)); $this->_stream.= $stream; } @@ -267,7 +255,7 @@ public function readUnsignedShort() */ public function readDouble() { - $bytes = $this->_mbStringFunctionsOverloaded ? mb_substr($this->_stream, $this->_needle, 8, '8bit') : substr($this->_stream, $this->_needle, 8); + $bytes = substr($this->_stream, $this->_needle, 8); $this->_needle+= 8; if (!$this->_bigEndian) { diff --git a/lib/Zend/Amf/Value/ByteArray.php b/lib/Zend/Amf/Value/ByteArray.php index b62c182fb..f6e9de74b 100644 --- a/lib/Zend/Amf/Value/ByteArray.php +++ b/lib/Zend/Amf/Value/ByteArray.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ByteArray.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ByteArray.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_ByteArray diff --git a/lib/Zend/Amf/Value/MessageBody.php b/lib/Zend/Amf/Value/MessageBody.php index fe58eea21..e366291d4 100644 --- a/lib/Zend/Amf/Value/MessageBody.php +++ b/lib/Zend/Amf/Value/MessageBody.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MessageBody.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: MessageBody.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -33,7 +33,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_MessageBody diff --git a/lib/Zend/Amf/Value/MessageHeader.php b/lib/Zend/Amf/Value/MessageHeader.php index b106c501a..124b2b3bd 100644 --- a/lib/Zend/Amf/Value/MessageHeader.php +++ b/lib/Zend/Amf/Value/MessageHeader.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MessageHeader.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: MessageHeader.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_MessageHeader diff --git a/lib/Zend/Amf/Value/Messaging/AbstractMessage.php b/lib/Zend/Amf/Value/Messaging/AbstractMessage.php index f342b3f63..1974405a5 100644 --- a/lib/Zend/Amf/Value/Messaging/AbstractMessage.php +++ b/lib/Zend/Amf/Value/Messaging/AbstractMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AbstractMessage.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: AbstractMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -26,7 +26,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_AbstractMessage diff --git a/lib/Zend/Amf/Value/Messaging/AcknowledgeMessage.php b/lib/Zend/Amf/Value/Messaging/AcknowledgeMessage.php index 463d0a2cc..feb6deae7 100644 --- a/lib/Zend/Amf/Value/Messaging/AcknowledgeMessage.php +++ b/lib/Zend/Amf/Value/Messaging/AcknowledgeMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AcknowledgeMessage.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: AcknowledgeMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** Zend_Amf_Value_Messaging_AsyncMessage */ @@ -32,7 +32,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_AcknowledgeMessage extends Zend_Amf_Value_Messaging_AsyncMessage diff --git a/lib/Zend/Amf/Value/Messaging/ArrayCollection.php b/lib/Zend/Amf/Value/Messaging/ArrayCollection.php index bdcfeec8f..a862c67c0 100644 --- a/lib/Zend/Amf/Value/Messaging/ArrayCollection.php +++ b/lib/Zend/Amf/Value/Messaging/ArrayCollection.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ArrayCollection.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ArrayCollection.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -27,9 +27,9 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Amf_Value_Messaging_ArrayCollection extends ArrayObject +class Zend_Amf_Value_Messaging_ArrayCollection { } diff --git a/lib/Zend/Amf/Value/Messaging/AsyncMessage.php b/lib/Zend/Amf/Value/Messaging/AsyncMessage.php index 8796f6962..f39e06fcb 100644 --- a/lib/Zend/Amf/Value/Messaging/AsyncMessage.php +++ b/lib/Zend/Amf/Value/Messaging/AsyncMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AsyncMessage.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: AsyncMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -30,7 +30,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_AsyncMessage extends Zend_Amf_Value_Messaging_AbstractMessage diff --git a/lib/Zend/Amf/Value/Messaging/CommandMessage.php b/lib/Zend/Amf/Value/Messaging/CommandMessage.php index 97699a73b..6852b1586 100644 --- a/lib/Zend/Amf/Value/Messaging/CommandMessage.php +++ b/lib/Zend/Amf/Value/Messaging/CommandMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommandMessage.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: CommandMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -36,7 +36,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_CommandMessage extends Zend_Amf_Value_Messaging_AsyncMessage diff --git a/lib/Zend/Amf/Value/Messaging/ErrorMessage.php b/lib/Zend/Amf/Value/Messaging/ErrorMessage.php index 28421e775..6cd3cb5f7 100644 --- a/lib/Zend/Amf/Value/Messaging/ErrorMessage.php +++ b/lib/Zend/Amf/Value/Messaging/ErrorMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ErrorMessage.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ErrorMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @see Zend_Amf_Value_Messaging_AcknowledgeMessage */ @@ -30,7 +30,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_ErrorMessage extends Zend_Amf_Value_Messaging_AcknowledgeMessage diff --git a/lib/Zend/Amf/Value/Messaging/RemotingMessage.php b/lib/Zend/Amf/Value/Messaging/RemotingMessage.php index f1fa6ec88..146c91cf9 100644 --- a/lib/Zend/Amf/Value/Messaging/RemotingMessage.php +++ b/lib/Zend/Amf/Value/Messaging/RemotingMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemotingMessage.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: RemotingMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** Zend_Amf_Value_Messaging_AbstractMessage */ @@ -31,7 +31,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_RemotingMessage extends Zend_Amf_Value_Messaging_AbstractMessage diff --git a/lib/Zend/Amf/Value/TraitsInfo.php b/lib/Zend/Amf/Value/TraitsInfo.php index f8863cdc2..ecd6efab5 100644 --- a/lib/Zend/Amf/Value/TraitsInfo.php +++ b/lib/Zend/Amf/Value/TraitsInfo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TraitsInfo.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: TraitsInfo.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_TraitsInfo diff --git a/lib/Zend/Application.php b/lib/Zend/Application.php index d26772275..59e95d375 100644 --- a/lib/Zend/Application.php +++ b/lib/Zend/Application.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Application.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id: Application.php 23163 2010-10-19 16:30:26Z matthew $ */ /** * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application @@ -376,12 +376,9 @@ public function run() protected function _loadConfig($file) { $environment = $this->getEnvironment(); - $suffix = pathinfo($file, PATHINFO_EXTENSION); - $suffix = ($suffix === 'dist') - ? pathinfo(basename($file, ".$suffix"), PATHINFO_EXTENSION) - : $suffix; + $suffix = strtolower(pathinfo($file, PATHINFO_EXTENSION)); - switch (strtolower($suffix)) { + switch ($suffix) { case 'ini': $config = new Zend_Config_Ini($file, $environment); break; @@ -395,7 +392,6 @@ protected function _loadConfig($file) break; case 'yaml': - case 'yml': $config = new Zend_Config_Yaml($file, $environment); break; diff --git a/lib/Zend/Application/Bootstrap/Bootstrap.php b/lib/Zend/Application/Bootstrap/Bootstrap.php index d81cc2570..f8189f5fa 100644 --- a/lib/Zend/Application/Bootstrap/Bootstrap.php +++ b/lib/Zend/Application/Bootstrap/Bootstrap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Bootstrap.php 25073 2012-11-06 19:31:53Z rob $ + * @version $Id: Bootstrap.php 20885 2010-02-03 19:33:59Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Bootstrap_Bootstrap @@ -120,7 +120,7 @@ public function setResourceLoader(Zend_Loader_Autoloader_Resource $loader) public function getResourceLoader() { if ((null === $this->_resourceLoader) - && (false != ($namespace = $this->getAppNamespace())) + && (false !== ($namespace = $this->getAppNamespace())) ) { $r = new ReflectionClass($this); $path = $r->getFileName(); diff --git a/lib/Zend/Application/Bootstrap/BootstrapAbstract.php b/lib/Zend/Application/Bootstrap/BootstrapAbstract.php index 7a0f94fcb..d12fcce33 100644 --- a/lib/Zend/Application/Bootstrap/BootstrapAbstract.php +++ b/lib/Zend/Application/Bootstrap/BootstrapAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BootstrapAbstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: BootstrapAbstract.php 23278 2010-10-30 12:50:21Z ramon $ */ /** @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Application_Bootstrap_BootstrapAbstract @@ -352,9 +352,7 @@ public function getPluginResource($resource) continue; } - if (class_exists($plugin) - && is_subclass_of($plugin, 'Zend_Application_Resource_Resource') - ) { //@SEE ZF-7550 + if (class_exists($plugin)) { //@SEE ZF-7550 $spec = (array) $spec; $spec['bootstrap'] = $this; $instance = new $plugin($spec); @@ -416,8 +414,7 @@ public function getPluginLoader() { if ($this->_pluginLoader === null) { $options = array( - 'Zend_Application_Resource' => 'Zend/Application/Resource', - 'ZendX_Application_Resource' => 'ZendX/Application/Resource' + 'Zend_Application_Resource' => 'Zend/Application/Resource' ); $this->_pluginLoader = new Zend_Loader_PluginLoader($options); diff --git a/lib/Zend/Application/Bootstrap/Bootstrapper.php b/lib/Zend/Application/Bootstrap/Bootstrapper.php index 956da1427..09e077e4f 100644 --- a/lib/Zend/Application/Bootstrap/Bootstrapper.php +++ b/lib/Zend/Application/Bootstrap/Bootstrapper.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Bootstrapper.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Bootstrapper.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Application_Bootstrap_Bootstrapper diff --git a/lib/Zend/Application/Bootstrap/Exception.php b/lib/Zend/Application/Bootstrap/Exception.php index c7e27b6d8..2cbe1477f 100644 --- a/lib/Zend/Application/Bootstrap/Exception.php +++ b/lib/Zend/Application/Bootstrap/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Application * @uses Zend_Application_Exception - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Bootstrap_Exception extends Zend_Application_Exception diff --git a/lib/Zend/Application/Bootstrap/ResourceBootstrapper.php b/lib/Zend/Application/Bootstrap/ResourceBootstrapper.php index 79b83782c..80d233302 100644 --- a/lib/Zend/Application/Bootstrap/ResourceBootstrapper.php +++ b/lib/Zend/Application/Bootstrap/ResourceBootstrapper.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResourceBootstrapper.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ResourceBootstrapper.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Application_Bootstrap_ResourceBootstrapper diff --git a/lib/Zend/Application/Exception.php b/lib/Zend/Application/Exception.php index dd53ef36a..8c2e847bb 100644 --- a/lib/Zend/Application/Exception.php +++ b/lib/Zend/Application/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -30,7 +30,7 @@ * @uses Zend_Exception * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Exception extends Zend_Exception diff --git a/lib/Zend/Application/Module/Autoloader.php b/lib/Zend/Application/Module/Autoloader.php index 7c8813d35..3577804b6 100644 --- a/lib/Zend/Application/Module/Autoloader.php +++ b/lib/Zend/Application/Module/Autoloader.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Application * @subpackage Module - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Autoloader.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Autoloader.php 20250 2010-01-12 22:15:20Z dasprid $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Application * @subpackage Module - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Module_Autoloader extends Zend_Loader_Autoloader_Resource diff --git a/lib/Zend/Application/Module/Bootstrap.php b/lib/Zend/Application/Module/Bootstrap.php index a99ebc0e2..3ca2f55b0 100644 --- a/lib/Zend/Application/Module/Bootstrap.php +++ b/lib/Zend/Application/Module/Bootstrap.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Application * @subpackage Module - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Bootstrap.php 25024 2012-07-30 15:08:15Z rob $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Bootstrap.php 20096 2010-01-06 02:05:09Z bkarwin $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Module - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Application_Module_Bootstrap @@ -97,9 +97,9 @@ public function initResourceLoader() /** * Get default application namespace * - * Proxies to {@link getModuleName()}, and returns the current module + * Proxies to {@link getModuleName()}, and returns the current module * name - * + * * @return string */ public function getAppNamespace() diff --git a/lib/Zend/Application/Resource/Cachemanager.php b/lib/Zend/Application/Resource/Cachemanager.php index 226d3bb6c..f521f5adb 100644 --- a/lib/Zend/Application/Resource/Cachemanager.php +++ b/lib/Zend/Application/Resource/Cachemanager.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cachemanager.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Cachemanager.php 20785 2010-01-31 09:43:03Z mikaelkael $ */ #require_once 'Zend/Application/Resource/ResourceAbstract.php'; @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Cachemanager extends Zend_Application_Resource_ResourceAbstract @@ -57,7 +57,7 @@ public function getCacheManager() { if (null === $this->_manager) { $this->_manager = new Zend_Cache_Manager; - + $options = $this->getOptions(); foreach ($options as $key => $value) { if ($this->_manager->hasCacheTemplate($key)) { @@ -67,7 +67,7 @@ public function getCacheManager() } } } - + return $this->_manager; } } diff --git a/lib/Zend/Application/Resource/Db.php b/lib/Zend/Application/Resource/Db.php index cca1cb8e1..d03ed61ff 100644 --- a/lib/Zend/Application/Resource/Db.php +++ b/lib/Zend/Application/Resource/Db.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db.php 25123 2012-11-14 18:27:44Z matthew $ + * @version $Id: Db.php 22544 2010-07-10 15:01:37Z freak $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbstract @@ -45,7 +45,7 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs protected $_adapter = null; /** - * @var Zend_Db_Adapter_Abstract + * @var Zend_Db_Adapter_Interface */ protected $_db; @@ -66,7 +66,7 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs /** * Set the adapter * - * @param string $adapter + * @param $adapter string * @return Zend_Application_Resource_Db */ public function setAdapter($adapter) @@ -88,7 +88,7 @@ public function getAdapter() /** * Set the adapter params * - * @param string $adapter + * @param $adapter string * @return Zend_Application_Resource_Db */ public function setParams(array $params) @@ -132,7 +132,7 @@ public function isDefaultTableAdapter() /** * Retrieve initialized DB connection * - * @return null|Zend_Db_Adapter_Abstract + * @return null|Zend_Db_Adapter_Interface */ public function getDbAdapter() { @@ -140,12 +140,6 @@ public function getDbAdapter() && (null !== ($adapter = $this->getAdapter())) ) { $this->_db = Zend_Db::factory($adapter, $this->getParams()); - - if ($this->_db instanceof Zend_Db_Adapter_Abstract - && $this->isDefaultTableAdapter() - ) { - Zend_Db_Table::setDefaultAdapter($this->_db); - } } return $this->_db; } @@ -158,13 +152,16 @@ public function getDbAdapter() public function init() { if (null !== ($db = $this->getDbAdapter())) { + if ($this->isDefaultTableAdapter()) { + Zend_Db_Table::setDefaultAdapter($db); + } return $db; } } /** * Set the default metadata cache - * + * * @param string|Zend_Cache_Core $cache * @return Zend_Application_Resource_Db */ diff --git a/lib/Zend/Application/Resource/Dojo.php b/lib/Zend/Application/Resource/Dojo.php index 0add368a8..13ce071f8 100644 --- a/lib/Zend/Application/Resource/Dojo.php +++ b/lib/Zend/Application/Resource/Dojo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dojo.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Dojo.php 21318 2010-03-04 13:20:01Z freak $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Dojo diff --git a/lib/Zend/Application/Resource/Exception.php b/lib/Zend/Application/Resource/Exception.php index 870bebefe..610f27666 100644 --- a/lib/Zend/Application/Resource/Exception.php +++ b/lib/Zend/Application/Resource/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 22609 2010-07-17 08:47:59Z torio $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Exception extends Zend_Application_Exception diff --git a/lib/Zend/Application/Resource/Frontcontroller.php b/lib/Zend/Application/Resource/Frontcontroller.php index cb6223313..7b1151536 100644 --- a/lib/Zend/Application/Resource/Frontcontroller.php +++ b/lib/Zend/Application/Resource/Frontcontroller.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Frontcontroller.php 24798 2012-05-12 19:17:41Z adamlundrigan $ + * @version $Id: Frontcontroller.php 23378 2010-11-18 21:48:27Z bittarman $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resource_ResourceAbstract @@ -101,9 +101,9 @@ public function init() case 'plugins': foreach ((array) $value as $pluginClass) { - $stackIndex = null; - if(is_array($pluginClass)) { - $pluginClass = array_change_key_case($pluginClass, CASE_LOWER); + $stackIndex = null; + if(is_array($pluginClass)) { + $pluginClass = array_change_key_case($pluginClass, CASE_LOWER); if(isset($pluginClass['class'])) { if(isset($pluginClass['stackindex'])) { @@ -135,22 +135,6 @@ public function init() } break; - case 'dispatcher': - if(!isset($value['class'])) { - #require_once 'Zend/Application/Exception.php'; - throw new Zend_Application_Exception('You must specify both '); - } - if (!isset($value['params'])) { - $value['params'] = array(); - } - - $dispatchClass = $value['class']; - if(!class_exists($dispatchClass)) { - #require_once 'Zend/Application/Exception.php'; - throw new Zend_Application_Exception('Dispatcher class not found!'); - } - $front->setDispatcher(new $dispatchClass((array)$value['params'])); - break; default: $front->setParam($key, $value); break; diff --git a/lib/Zend/Application/Resource/Layout.php b/lib/Zend/Application/Resource/Layout.php index b452cc09a..09f395a8d 100644 --- a/lib/Zend/Application/Resource/Layout.php +++ b/lib/Zend/Application/Resource/Layout.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Layout.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Layout.php 20814 2010-02-01 20:13:08Z freak $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Layout diff --git a/lib/Zend/Application/Resource/Locale.php b/lib/Zend/Application/Resource/Locale.php index af4c4403c..a9c860ef3 100644 --- a/lib/Zend/Application/Resource/Locale.php +++ b/lib/Zend/Application/Resource/Locale.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Locale.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Locale.php 20814 2010-02-01 20:13:08Z freak $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Locale @@ -56,6 +56,7 @@ public function init() return $this->getLocale(); } + /** * Retrieve locale object * @@ -65,8 +66,7 @@ public function getLocale() { if (null === $this->_locale) { $options = $this->getOptions(); - - if (!isset($options['default'])) { + if(!isset($options['default'])) { $this->_locale = new Zend_Locale(); } elseif(!isset($options['force']) || (bool) $options['force'] == false) @@ -86,32 +86,4 @@ public function getLocale() return $this->_locale; } - - /** - * Set the cache - * - * @param string|Zend_Cache_Core $cache - * @return Zend_Application_Resource_Locale - */ - public function setCache($cache) - { - if (is_string($cache)) { - $bootstrap = $this->getBootstrap(); - if ($bootstrap instanceof Zend_Application_Bootstrap_ResourceBootstrapper - && $bootstrap->hasPluginResource('CacheManager') - ) { - $cacheManager = $bootstrap->bootstrap('CacheManager') - ->getResource('CacheManager'); - if (null !== $cacheManager && $cacheManager->hasCache($cache)) { - $cache = $cacheManager->getCache($cache); - } - } - } - - if ($cache instanceof Zend_Cache_Core) { - Zend_Locale::setCache($cache); - } - - return $this; - } } diff --git a/lib/Zend/Application/Resource/Log.php b/lib/Zend/Application/Resource/Log.php index 0e9998797..f635f2846 100644 --- a/lib/Zend/Application/Resource/Log.php +++ b/lib/Zend/Application/Resource/Log.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Log.php 24607 2012-01-16 16:45:49Z xerkus $ + * @version $Id: Log.php 20814 2010-02-01 20:13:08Z freak $ */ /** @@ -27,13 +27,13 @@ /** - * Resource for initializing logger + * Resource for initializing the locale * * @uses Zend_Application_Resource_ResourceAbstract * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Log @@ -56,8 +56,8 @@ public function init() /** * Attach logger - * - * @param Zend_Log $log + * + * @param Zend_Log $log * @return Zend_Application_Resource_Log */ public function setLog(Zend_Log $log) @@ -66,11 +66,6 @@ public function setLog(Zend_Log $log) return $this; } - /** - * Retrieve logger object - * - * @return Zend_Log - */ public function getLog() { if (null === $this->_log) { diff --git a/lib/Zend/Application/Resource/Mail.php b/lib/Zend/Application/Resource/Mail.php index 1178def9b..084c83499 100644 --- a/lib/Zend/Application/Resource/Mail.php +++ b/lib/Zend/Application/Resource/Mail.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mail.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Mail.php 21015 2010-02-11 01:56:02Z freak $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceAbstract @@ -46,7 +46,7 @@ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceA public function init() { return $this->getMail(); } - + /** * * @return Zend_Mail_Transport_Abstract|null @@ -56,7 +56,7 @@ public function getMail() if (null === $this->_transport) { $options = $this->getOptions(); foreach($options as $key => $option) { - $options[strtolower($key)] = $option; + $options[strtolower($key)] = $option; } $this->setOptions($options); @@ -73,14 +73,14 @@ public function getMail() Zend_Mail::setDefaultTransport($this->_transport); } } - + $this->_setDefaults('from'); $this->_setDefaults('replyTo'); } return $this->_transport; } - + protected function _setDefaults($type) { $key = strtolower('default' . $type); $options = $this->getOptions(); @@ -99,13 +99,13 @@ protected function _setDefaults($type) { } } } - + protected function _setupTransport($options) { - if(!isset($options['type'])) { - $options['type'] = 'sendmail'; - } - + if(!isset($options['type'])) { + $options['type'] = 'sendmail'; + } + $transportName = $options['type']; if(!Zend_Loader_Autoloader::autoload($transportName)) { @@ -122,10 +122,9 @@ protected function _setupTransport($options) } } } - + unset($options['type']); - unset($options['register']); //@see ZF-11022 - + switch($transportName) { case 'Zend_Mail_Transport_Smtp': if(!isset($options['host'])) { @@ -133,7 +132,7 @@ protected function _setupTransport($options) 'A host is necessary for smtp transport,' .' but none was given'); } - + $transport = new $transportName($options['host'], $options); break; case 'Zend_Mail_Transport_Sendmail': diff --git a/lib/Zend/Application/Resource/Modules.php b/lib/Zend/Application/Resource/Modules.php index 299abeb84..c4307caed 100644 --- a/lib/Zend/Application/Resource/Modules.php +++ b/lib/Zend/Application/Resource/Modules.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Modules.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Modules.php 20814 2010-02-01 20:13:08Z freak $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Modules extends Zend_Application_Resource_ResourceAbstract @@ -62,7 +62,6 @@ public function __construct($options = null) */ public function init() { - $bootstraps = array(); $bootstrap = $this->getBootstrap(); $bootstrap->bootstrap('FrontController'); $front = $bootstrap->getResource('FrontController'); @@ -104,28 +103,12 @@ public function init() continue; } - $bootstraps[$module] = $bootstrapClass; - } - - return $this->_bootstraps = $this->bootstrapBootstraps($bootstraps); - } - - /* - * Bootstraps the bootstraps found. Allows for easy extension. - * @param array $bootstraps Array containing the bootstraps to instantiate - */ - protected function bootstrapBootstraps($bootstraps) - { - $bootstrap = $this->getBootstrap(); - $out = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS); - - foreach($bootstraps as $module => $bootstrapClass) { $moduleBootstrap = new $bootstrapClass($bootstrap); $moduleBootstrap->bootstrap(); - $out[$module] = $moduleBootstrap; + $this->_bootstraps[$module] = $moduleBootstrap; } - return $out; + return $this->_bootstraps; } /** diff --git a/lib/Zend/Application/Resource/Multidb.php b/lib/Zend/Application/Resource/Multidb.php index 3bbbd8b66..616d335a6 100644 --- a/lib/Zend/Application/Resource/Multidb.php +++ b/lib/Zend/Application/Resource/Multidb.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Multidb.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Multidb.php 22546 2010-07-10 15:18:12Z freak $ */ #require_once 'Zend/Application/Resource/ResourceAbstract.php'; @@ -51,7 +51,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Multidb extends Zend_Application_Resource_ResourceAbstract @@ -85,7 +85,7 @@ public function init() } foreach ($options as $id => $params) { - $adapter = $params['adapter']; + $adapter = $params['adapter']; $default = (int) ( isset($params['isDefaultTableAdapter']) && $params['isDefaultTableAdapter'] || isset($params['default']) && $params['default'] @@ -178,7 +178,7 @@ protected function _setDefault(Zend_Db_Adapter_Abstract $adapter) /** * Set the default metadata cache - * + * * @param string|Zend_Cache_Core $cache * @return Zend_Application_Resource_Multidb */ diff --git a/lib/Zend/Application/Resource/Navigation.php b/lib/Zend/Application/Resource/Navigation.php index db2670078..33e01f857 100644 --- a/lib/Zend/Application/Resource/Navigation.php +++ b/lib/Zend/Application/Resource/Navigation.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Navigation.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Navigation.php 22882 2010-08-22 14:00:16Z freak $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @author Dolf Schimmel * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -56,13 +56,12 @@ public function init() { if (!$this->_container) { $options = $this->getOptions(); - + $pages = isset($options['pages']) ? $options['pages'] : array(); + $this->_container = new Zend_Navigation($pages); + if(isset($options['defaultPageType'])) { Zend_Navigation_Page::setDefaultPageType($options['defaultPageType']); } - - $pages = isset($options['pages']) ? $options['pages'] : array(); - $this->_container = new Zend_Navigation($pages); } $this->store(); diff --git a/lib/Zend/Application/Resource/Resource.php b/lib/Zend/Application/Resource/Resource.php index 40ba45fa0..d3246acc3 100644 --- a/lib/Zend/Application/Resource/Resource.php +++ b/lib/Zend/Application/Resource/Resource.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Resource.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Application_Resource_Resource diff --git a/lib/Zend/Application/Resource/ResourceAbstract.php b/lib/Zend/Application/Resource/ResourceAbstract.php index 46397dc7b..652bbcab1 100644 --- a/lib/Zend/Application/Resource/ResourceAbstract.php +++ b/lib/Zend/Application/Resource/ResourceAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResourceAbstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ResourceAbstract.php 23384 2010-11-19 00:00:29Z ramon $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Application_Resource_Resource diff --git a/lib/Zend/Application/Resource/Router.php b/lib/Zend/Application/Resource/Router.php index 806051954..1333beab3 100644 --- a/lib/Zend/Application/Resource/Router.php +++ b/lib/Zend/Application/Resource/Router.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Router.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Router.php 20814 2010-02-01 20:13:08Z freak $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Router diff --git a/lib/Zend/Application/Resource/Session.php b/lib/Zend/Application/Resource/Session.php index d09a6f0f7..bb5fbabc9 100644 --- a/lib/Zend/Application/Resource/Session.php +++ b/lib/Zend/Application/Resource/Session.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Session.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Session.php 20814 2010-02-01 20:13:08Z freak $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Session extends Zend_Application_Resource_ResourceAbstract @@ -50,7 +50,7 @@ class Zend_Application_Resource_Session extends Zend_Application_Resource_Resour * * @param array|string|Zend_Session_SaveHandler_Interface $saveHandler * @return Zend_Application_Resource_Session - * @throws Zend_Application_Resource_Exception When $saveHandler is not a valid save handler + * @throws Zend_Application_Resource_Exception When $saveHandler is no valid save handler */ public function setSaveHandler($saveHandler) { diff --git a/lib/Zend/Application/Resource/Translate.php b/lib/Zend/Application/Resource/Translate.php index 55e6a2dea..052fbe6c9 100644 --- a/lib/Zend/Application/Resource/Translate.php +++ b/lib/Zend/Application/Resource/Translate.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Translate.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Translate.php 22968 2010-09-18 19:50:02Z intiilapa $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Translate extends Zend_Application_Resource_ResourceAbstract diff --git a/lib/Zend/Application/Resource/Useragent.php b/lib/Zend/Application/Resource/Useragent.php index 3b166cd8e..ccfb72b93 100644 --- a/lib/Zend/Application/Resource/Useragent.php +++ b/lib/Zend/Application/Resource/Useragent.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,24 +23,24 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Application_Resource_UserAgent extends Zend_Application_Resource_ResourceAbstract +class Zend_Application_Resource_UserAgent extends Zend_Application_Resource_ResourceAbstract { /** * @var Zend_Http_UserAgent */ - protected $_userAgent; - + protected $_userAgent; + /** * Intialize resource - * + * * @return Zend_Http_UserAgent */ - public function init() + public function init() { - $userAgent = $this->getUserAgent(); + $userAgent = $this->getUserAgent(); // Optionally seed the UserAgent view helper $bootstrap = $this->getBootstrap(); @@ -53,20 +53,20 @@ public function init() } return $userAgent; - } - + } + /** * Get UserAgent instance - * + * * @return Zend_Http_UserAgent */ - public function getUserAgent() + public function getUserAgent() { - if (null === $this->_userAgent) { - $options = $this->getOptions(); - $this->_userAgent = new Zend_Http_UserAgent($options); - } - - return $this->_userAgent; - } + if (null === $this->_userAgent) { + $options = $this->getOptions(); + $this->_userAgent = new Zend_Http_UserAgent($options); + } + + return $this->_userAgent; + } } diff --git a/lib/Zend/Application/Resource/View.php b/lib/Zend/Application/Resource/View.php index 64f3aaf7b..44e1a4e2d 100644 --- a/lib/Zend/Application/Resource/View.php +++ b/lib/Zend/Application/Resource/View.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: View.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: View.php 22965 2010-09-18 17:45:51Z intiilapa $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_View extends Zend_Application_Resource_ResourceAbstract @@ -52,8 +52,9 @@ public function init() { $view = $this->getView(); - $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); + $viewRenderer = new Zend_Controller_Action_Helper_ViewRenderer(); $viewRenderer->setView($view); + Zend_Controller_Action_HelperBroker::addHelper($viewRenderer); return $view; } @@ -77,9 +78,6 @@ public function getView() if (isset($options['contentType'])) { $this->_view->headMeta()->appendHttpEquiv('Content-Type', $options['contentType']); } - if (isset($options['assign']) && is_array($options['assign'])) { - $this->_view->assign($options['assign']); - } } return $this->_view; } diff --git a/lib/Zend/Auth.php b/lib/Zend/Auth.php index 23af36b5f..50e5b5530 100644 --- a/lib/Zend/Auth.php +++ b/lib/Zend/Auth.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Auth.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Auth.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth diff --git a/lib/Zend/Auth/Adapter/DbTable.php b/lib/Zend/Auth/Adapter/DbTable.php index 8c9810259..b8673246b 100644 --- a/lib/Zend/Auth/Adapter/DbTable.php +++ b/lib/Zend/Auth/Adapter/DbTable.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTable.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: DbTable.php 22613 2010-07-17 13:43:22Z dragonbe $ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface @@ -114,12 +114,12 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface * @var array */ protected $_resultRow = null; - + /** - * $_ambiguityIdentity - Flag to indicate same Identity can be used with + * $_ambiguityIdentity - Flag to indicate same Identity can be used with * different credentials. Default is FALSE and need to be set to true to * allow ambiguity usage. - * + * * @var boolean */ protected $_ambiguityIdentity = false; @@ -159,7 +159,7 @@ public function __construct(Zend_Db_Adapter_Abstract $zendDb = null, $tableName /** * _setDbAdapter() - set the database adapter to be used for quering * - * @param Zend_Db_Adapter_Abstract + * @param Zend_Db_Adapter_Abstract * @throws Zend_Auth_Adapter_Exception * @return Zend_Auth_Adapter_DbTable */ @@ -178,7 +178,7 @@ protected function _setDbAdapter(Zend_Db_Adapter_Abstract $zendDb = null) throw new Zend_Auth_Adapter_Exception('No database adapter present'); } } - + return $this; } @@ -265,12 +265,12 @@ public function setCredential($credential) $this->_credential = $credential; return $this; } - + /** * setAmbiguityIdentity() - sets a flag for usage of identical identities * with unique credentials. It accepts integers (0, 1) or boolean (true, * false) parameters. Default is false. - * + * * @param int|bool $flag * @return Zend_Auth_Adapter_DbTable */ @@ -284,9 +284,9 @@ public function setAmbiguityIdentity($flag) return $this; } /** - * getAmbiguityIdentity() - returns TRUE for usage of multiple identical + * getAmbiguityIdentity() - returns TRUE for usage of multiple identical * identies with different credentials, FALSE if not used. - * + * * @return bool */ public function getAmbiguityIdentity() @@ -367,7 +367,7 @@ public function authenticate() $this->_authenticateSetup(); $dbSelect = $this->_authenticateCreateSelect(); $resultIdentities = $this->_authenticateQuerySelect($dbSelect); - + if ( ($authResult = $this->_authenticateValidateResultSet($resultIdentities)) instanceof Zend_Auth_Result) { return $authResult; } @@ -382,7 +382,7 @@ public function authenticate() } $resultIdentities = $validIdentities; } - + $authResult = $this->_authenticateValidateResult(array_shift($resultIdentities)); return $authResult; } @@ -477,7 +477,7 @@ protected function _authenticateQuerySelect(Zend_Db_Select $dbSelect) $origDbFetchMode = $this->_zendDb->getFetchMode(); $this->_zendDb->setFetchMode(Zend_DB::FETCH_ASSOC); } - $resultIdentities = $this->_zendDb->fetchAll($dbSelect); + $resultIdentities = $this->_zendDb->fetchAll($dbSelect->__toString()); if (isset($origDbFetchMode)) { $this->_zendDb->setFetchMode($origDbFetchMode); unset($origDbFetchMode); diff --git a/lib/Zend/Auth/Adapter/Digest.php b/lib/Zend/Auth/Adapter/Digest.php index 73d767685..3ef372530 100644 --- a/lib/Zend/Auth/Adapter/Digest.php +++ b/lib/Zend/Auth/Adapter/Digest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Digest.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Digest.php 23088 2010-10-11 19:53:24Z padraic $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface @@ -227,7 +227,7 @@ public function authenticate() $result['messages'][] = "Username '$this->_username' and realm '$this->_realm' combination not found"; return new Zend_Auth_Result($result['code'], $result['identity'], $result['messages']); } - + /** * Securely compare two strings for equality while avoided C level memcmp() * optimisations capable of leaking timing information useful to an attacker diff --git a/lib/Zend/Auth/Adapter/Exception.php b/lib/Zend/Auth/Adapter/Exception.php index 20e28e6d9..fc9a1f7a5 100644 --- a/lib/Zend/Auth/Adapter/Exception.php +++ b/lib/Zend/Auth/Adapter/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_Exception extends Zend_Auth_Exception diff --git a/lib/Zend/Auth/Adapter/Http.php b/lib/Zend/Auth/Adapter/Http.php index 6f492f5e4..7e68fce1c 100644 --- a/lib/Zend/Auth/Adapter/Http.php +++ b/lib/Zend/Auth/Adapter/Http.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Http.php 23088 2010-10-11 19:53:24Z padraic $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @todo Support auth-int * @todo Track nonces, nonce-count, opaque for replay protection and stale support @@ -844,7 +844,7 @@ protected function _parseDigestAuth($header) return $data; } - + /** * Securely compare two strings for equality while avoided C level memcmp() * optimisations capable of leaking timing information useful to an attacker diff --git a/lib/Zend/Auth/Adapter/Http/Resolver/Exception.php b/lib/Zend/Auth/Adapter/Http/Resolver/Exception.php index 2f68b75e0..0a8f8bd94 100644 --- a/lib/Zend/Auth/Adapter/Http/Resolver/Exception.php +++ b/lib/Zend/Auth/Adapter/Http/Resolver/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_Http_Resolver_Exception extends Zend_Auth_Exception diff --git a/lib/Zend/Auth/Adapter/Http/Resolver/File.php b/lib/Zend/Auth/Adapter/Http/Resolver/File.php index b7a74756c..5964f94d3 100644 --- a/lib/Zend/Auth/Adapter/Http/Resolver/File.php +++ b/lib/Zend/Auth/Adapter/Http/Resolver/File.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Resolver_Interface diff --git a/lib/Zend/Auth/Adapter/Http/Resolver/Interface.php b/lib/Zend/Auth/Adapter/Http/Resolver/Interface.php index 521035531..78c034314 100644 --- a/lib/Zend/Auth/Adapter/Http/Resolver/Interface.php +++ b/lib/Zend/Auth/Adapter/Http/Resolver/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Auth_Adapter_Http_Resolver_Interface diff --git a/lib/Zend/Auth/Adapter/InfoCard.php b/lib/Zend/Auth/Adapter/InfoCard.php index eaaee067a..230c79797 100644 --- a/lib/Zend/Auth/Adapter/InfoCard.php +++ b/lib/Zend/Auth/Adapter/InfoCard.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InfoCard.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: InfoCard.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_InfoCard implements Zend_Auth_Adapter_Interface diff --git a/lib/Zend/Auth/Adapter/Interface.php b/lib/Zend/Auth/Adapter/Interface.php index 12dd9e720..0b4d43634 100644 --- a/lib/Zend/Auth/Adapter/Interface.php +++ b/lib/Zend/Auth/Adapter/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Auth_Adapter_Interface diff --git a/lib/Zend/Auth/Adapter/Ldap.php b/lib/Zend/Auth/Adapter/Ldap.php index f5d7bd503..8cd44f369 100644 --- a/lib/Zend/Auth/Adapter/Ldap.php +++ b/lib/Zend/Auth/Adapter/Ldap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ldap.php 24618 2012-02-03 08:32:06Z sgehrig $ + * @version $Id: Ldap.php 21319 2010-03-04 16:02:16Z sgehrig $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_Ldap implements Zend_Auth_Adapter_Interface @@ -335,8 +335,8 @@ public function authenticate() $messages[1] = ''; $messages[] = "$canonicalName authentication successful"; if ($requireRebind === true) { - // rebinding with authenticated user - $ldap->bind($dn, $password); + // rebinding with authenticated user + $ldap->bind($dn, $password); } return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $canonicalName, $messages); } else { @@ -371,11 +371,7 @@ public function authenticate() } else { $line = $zle->getLine(); $messages[] = $zle->getFile() . "($line): " . $zle->getMessage(); - $messages[] = preg_replace( - '/\b'.preg_quote(substr($password, 0, 15), '/').'\b/', - '*****', - $zle->getTraceAsString() - ); + $messages[] = str_replace($password, '*****', $zle->getTraceAsString()); $messages[0] = 'An unexpected failure occurred'; } $messages[1] = $zle->getMessage(); @@ -492,9 +488,7 @@ public function getAccountObject(array $returnAttribs = array(), array $omitAttr $returnObject = new stdClass(); - $returnAttribs = array_map('strtolower', $returnAttribs); - $omitAttribs = array_map('strtolower', $omitAttribs); - $returnAttribs = array_diff($returnAttribs, $omitAttribs); + $omitAttribs = array_map('strtolower', $omitAttribs); $entry = $this->getLdap()->getEntry($this->_authenticatedDn, $returnAttribs, true); foreach ($entry as $attr => $value) { diff --git a/lib/Zend/Auth/Adapter/OpenId.php b/lib/Zend/Auth/Adapter/OpenId.php index d516b1dcd..f9463d091 100644 --- a/lib/Zend/Auth/Adapter/OpenId.php +++ b/lib/Zend/Auth/Adapter/OpenId.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenId.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: OpenId.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_OpenId implements Zend_Auth_Adapter_Interface diff --git a/lib/Zend/Auth/Exception.php b/lib/Zend/Auth/Exception.php index a082c4b44..52e909eb2 100644 --- a/lib/Zend/Auth/Exception.php +++ b/lib/Zend/Auth/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Exception extends Zend_Exception diff --git a/lib/Zend/Auth/Result.php b/lib/Zend/Auth/Result.php index e13e64d5f..964d44d80 100644 --- a/lib/Zend/Auth/Result.php +++ b/lib/Zend/Auth/Result.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Result.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Result diff --git a/lib/Zend/Auth/Storage/Exception.php b/lib/Zend/Auth/Storage/Exception.php index f03ed980e..c8215e401 100644 --- a/lib/Zend/Auth/Storage/Exception.php +++ b/lib/Zend/Auth/Storage/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Storage_Exception extends Zend_Auth_Exception diff --git a/lib/Zend/Auth/Storage/Interface.php b/lib/Zend/Auth/Storage/Interface.php index b64f6d242..9fedf0132 100644 --- a/lib/Zend/Auth/Storage/Interface.php +++ b/lib/Zend/Auth/Storage/Interface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Auth_Storage_Interface diff --git a/lib/Zend/Auth/Storage/NonPersistent.php b/lib/Zend/Auth/Storage/NonPersistent.php index f64efcc6d..3fbf5c742 100644 --- a/lib/Zend/Auth/Storage/NonPersistent.php +++ b/lib/Zend/Auth/Storage/NonPersistent.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NonPersistent.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: NonPersistent.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Storage_NonPersistent implements Zend_Auth_Storage_Interface diff --git a/lib/Zend/Auth/Storage/Session.php b/lib/Zend/Auth/Storage/Session.php index 5b9fcd55b..c2a37b1f6 100644 --- a/lib/Zend/Auth/Storage/Session.php +++ b/lib/Zend/Auth/Storage/Session.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Session.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Session.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Storage_Session implements Zend_Auth_Storage_Interface diff --git a/lib/Zend/Barcode.php b/lib/Zend/Barcode.php index e088d9df3..683b723ea 100644 --- a/lib/Zend/Barcode.php +++ b/lib/Zend/Barcode.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Barcode.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Barcode.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode @@ -55,10 +55,10 @@ class Zend_Barcode * @throws Zend_Barcode_Exception */ public static function factory( - $barcode, - $renderer = 'image', - $barcodeConfig = array(), - $rendererConfig = array(), + $barcode, + $renderer = 'image', + $barcodeConfig = array(), + $rendererConfig = array(), $automaticRenderError = true ) { /* @@ -313,9 +313,9 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array * @param array | Zend_Config $rendererConfig */ public static function render( - $barcode, - $renderer, - $barcodeConfig = array(), + $barcode, + $renderer, + $barcodeConfig = array(), $rendererConfig = array() ) { self::factory($barcode, $renderer, $barcodeConfig, $rendererConfig)->render(); @@ -331,9 +331,9 @@ public static function render( * @return mixed */ public static function draw( - $barcode, - $renderer, - $barcodeConfig = array(), + $barcode, + $renderer, + $barcodeConfig = array(), $rendererConfig = array() ) { return self::factory($barcode, $renderer, $barcodeConfig, $rendererConfig)->draw(); diff --git a/lib/Zend/Barcode/Exception.php b/lib/Zend/Barcode/Exception.php index a0401e274..0c034a514 100644 --- a/lib/Zend/Barcode/Exception.php +++ b/lib/Zend/Barcode/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 22999 2010-09-23 19:43:14Z mikaelkael $ */ /** * Zend_Exception @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Exception extends Zend_Exception diff --git a/lib/Zend/Barcode/Object/Code128.php b/lib/Zend/Barcode/Object/Code128.php index 3c329b20a..9dbdd14eb 100644 --- a/lib/Zend/Barcode/Object/Code128.php +++ b/lib/Zend/Barcode/Object/Code128.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Code25.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Code128 extends Zend_Barcode_Object_ObjectAbstract @@ -48,9 +48,9 @@ class Zend_Barcode_Object_Code128 extends Zend_Barcode_Object_ObjectAbstract protected $_withChecksum = true; /** - * @var array - */ - protected $_convertedText = array(); + * @var array + */ + protected $_convertedText = array(); protected $_codingMap = array( 0 => "11011001100", 1 => "11001101100", 2 => "11001100110", @@ -192,7 +192,7 @@ protected function _calculateBarcodeWidth() $characterLength = 11 * $this->_barThinWidth * $this->_factor; $convertedChars = count($this->_convertToBarcodeChars($this->getText())); if ($this->_withChecksum) { - $convertedChars++; + $convertedChars++; } $encodedData = $convertedChars * $characterLength; // ...except the STOP character (13) @@ -220,7 +220,7 @@ protected function _prepareBarcode() $convertedChars = $this->_convertToBarcodeChars($this->getText()); if ($this->_withChecksum) { - $convertedChars[] = $this->getChecksum($this->getText()); + $convertedChars[] = $this->getChecksum($this->getText()); } // STOP CHARACTER @@ -229,7 +229,7 @@ protected function _prepareBarcode() foreach ($convertedChars as $barcodeChar) { $barcodePattern = $this->_codingMap[$barcodeChar]; foreach (str_split($barcodePattern) as $c) { - $barcodeTable[] = array($c, $this->_barThinWidth, 0, 1); + $barcodeTable[] = array($c, 1, 0, 1); } } return $barcodeTable; @@ -238,24 +238,24 @@ protected function _prepareBarcode() /** * Checks if the next $length chars of $string starting at $pos are numeric. * Returns false if the end of the string is reached. - * @param string $string String to search - * @param int $pos Starting position - * @param int $length Length to search + * @param $string String to search + * @param $pos Starting position + * @param $length Length to search * @return bool */ protected static function _isDigit($string, $pos, $length = 2) { - if ($pos + $length > strlen($string)) { - return false; - } + if ($pos + $length > strlen($string)) { + return false; + } - for ($i = $pos; $i < $pos + $length; $i++) { - if (!is_numeric($string[$i])) { - return false; - } - } - return true; - } + for ($i = $pos; $i < $pos + $length; $i++) { + if (!is_numeric($string[$i])) { + return false; + } + } + return true; + } /** * Convert string to barcode string @@ -263,14 +263,14 @@ protected static function _isDigit($string, $pos, $length = 2) */ protected function _convertToBarcodeChars($string) { - $string = (string) $string; - if (!strlen($string)) { - return array(); - } + $string = (string) $string; + if (!strlen($string)) { + return array(); + } - if (isset($this->_convertedText[md5($string)])) { - return $this->_convertedText[md5($string)]; - } + if (isset($this->_convertedText[md5($string)])) { + return $this->_convertedText[md5($string)]; + } $currentCharset = null; $sum = 0; @@ -363,17 +363,17 @@ public function getText() */ public function getChecksum($text) { - $tableOfChars = $this->_convertToBarcodeChars($text); + $tableOfChars = $this->_convertToBarcodeChars($text); - $sum = $tableOfChars[0]; - unset($tableOfChars[0]); + $sum = $tableOfChars[0]; + unset($tableOfChars[0]); - $k = 1; - foreach ($tableOfChars as $char) { - $sum += ($k++) * $char; - } + $k = 1; + foreach ($tableOfChars as $char) { + $sum += ($k++) * $char; + } - $checksum = $sum % 103; + $checksum = $sum % 103; return $checksum; } @@ -385,7 +385,7 @@ public function getChecksum($text) */ protected function _validateText($value, $options = array()) { - // @TODO: add code128 validator - return true; + // @TODO: add code128 validator + return true; } -} +} \ No newline at end of file diff --git a/lib/Zend/Barcode/Object/Code25.php b/lib/Zend/Barcode/Object/Code25.php index 8281e015b..587e01015 100644 --- a/lib/Zend/Barcode/Object/Code25.php +++ b/lib/Zend/Barcode/Object/Code25.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code25.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Code25.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Code25 extends Zend_Barcode_Object_ObjectAbstract @@ -97,7 +97,7 @@ protected function _prepareBarcode() $barcodeTable[] = array(1 , $this->_barThickWidth , 0 , 1); $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1); $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , 1); - $barcodeTable[] = array(0 , $this->_barThinWidth); + $barcodeTable[] = array(0 , 1); $text = str_split($this->getText()); foreach ($text as $char) { @@ -106,7 +106,7 @@ protected function _prepareBarcode() /* visible, width, top, length */ $width = $c ? $this->_barThickWidth : $this->_barThinWidth; $barcodeTable[] = array(1 , $width , 0 , 1); - $barcodeTable[] = array(0 , $this->_barThinWidth); + $barcodeTable[] = array(0 , 1); } } diff --git a/lib/Zend/Barcode/Object/Code25interleaved.php b/lib/Zend/Barcode/Object/Code25interleaved.php index ed2b9d5d6..2a090d9e9 100644 --- a/lib/Zend/Barcode/Object/Code25interleaved.php +++ b/lib/Zend/Barcode/Object/Code25interleaved.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code25interleaved.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Code25interleaved.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @see Zend_Barcode_Object_Code25 */ @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Code25interleaved extends Zend_Barcode_Object_Code25 diff --git a/lib/Zend/Barcode/Object/Code39.php b/lib/Zend/Barcode/Object/Code39.php index c7c3fd4be..e7d277667 100644 --- a/lib/Zend/Barcode/Object/Code39.php +++ b/lib/Zend/Barcode/Object/Code39.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code39.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Code39.php 23398 2010-11-19 17:17:05Z mikaelkael $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Code39 extends Zend_Barcode_Object_ObjectAbstract @@ -163,7 +163,7 @@ protected function _prepareBarcode() $barcodeTable[] = array((int) $visible, $width, 0, 1); $visible = ! $visible; } - $barcodeTable[] = array(0 , $this->_barThinWidth); + $barcodeTable[] = array(0 , 1); } return $barcodeTable; } diff --git a/lib/Zend/Barcode/Object/Ean13.php b/lib/Zend/Barcode/Object/Ean13.php index 4098e02ea..a7f18048a 100644 --- a/lib/Zend/Barcode/Object/Ean13.php +++ b/lib/Zend/Barcode/Object/Ean13.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean13.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Ean13.php 22999 2010-09-23 19:43:14Z mikaelkael $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Ean13 extends Zend_Barcode_Object_ObjectAbstract diff --git a/lib/Zend/Barcode/Object/Ean2.php b/lib/Zend/Barcode/Object/Ean2.php index cbee24a26..8cd04961b 100644 --- a/lib/Zend/Barcode/Object/Ean2.php +++ b/lib/Zend/Barcode/Object/Ean2.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean2.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Ean2.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Ean2 extends Zend_Barcode_Object_Ean5 diff --git a/lib/Zend/Barcode/Object/Ean5.php b/lib/Zend/Barcode/Object/Ean5.php index 326c9f973..a81cb4d5e 100644 --- a/lib/Zend/Barcode/Object/Ean5.php +++ b/lib/Zend/Barcode/Object/Ean5.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean5.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Ean5.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Ean5 extends Zend_Barcode_Object_Ean13 diff --git a/lib/Zend/Barcode/Object/Ean8.php b/lib/Zend/Barcode/Object/Ean8.php index fe010399c..5096101eb 100644 --- a/lib/Zend/Barcode/Object/Ean8.php +++ b/lib/Zend/Barcode/Object/Ean8.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean8.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Ean8.php 21667 2010-03-28 17:45:14Z mikaelkael $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Ean8 extends Zend_Barcode_Object_Ean13 diff --git a/lib/Zend/Barcode/Object/Error.php b/lib/Zend/Barcode/Object/Error.php index b0319c229..6e22913ee 100644 --- a/lib/Zend/Barcode/Object/Error.php +++ b/lib/Zend/Barcode/Object/Error.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Error.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Error.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @see Zend_Barcode_Object_ObjectAbstract */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Error extends Zend_Barcode_Object_ObjectAbstract diff --git a/lib/Zend/Barcode/Object/Exception.php b/lib/Zend/Barcode/Object/Exception.php index b0c09ac7a..6105e08b7 100644 --- a/lib/Zend/Barcode/Object/Exception.php +++ b/lib/Zend/Barcode/Object/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @see Zend_Barcode_Exception */ @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Exception extends Zend_Barcode_Exception diff --git a/lib/Zend/Barcode/Object/Identcode.php b/lib/Zend/Barcode/Object/Identcode.php index f0be2ff37..c40922c84 100644 --- a/lib/Zend/Barcode/Object/Identcode.php +++ b/lib/Zend/Barcode/Object/Identcode.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Identcode.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Identcode.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Identcode extends Zend_Barcode_Object_Code25interleaved diff --git a/lib/Zend/Barcode/Object/Itf14.php b/lib/Zend/Barcode/Object/Itf14.php index 920c56fc3..2a15e9bf1 100644 --- a/lib/Zend/Barcode/Object/Itf14.php +++ b/lib/Zend/Barcode/Object/Itf14.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Itf14.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Itf14.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @see Zend_Barcode_Object_Code25interleaved */ @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Itf14 extends Zend_Barcode_Object_Code25interleaved diff --git a/lib/Zend/Barcode/Object/Leitcode.php b/lib/Zend/Barcode/Object/Leitcode.php index d2ae517f4..26655d154 100644 --- a/lib/Zend/Barcode/Object/Leitcode.php +++ b/lib/Zend/Barcode/Object/Leitcode.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Leitcode.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Leitcode.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Leitcode extends Zend_Barcode_Object_Identcode diff --git a/lib/Zend/Barcode/Object/ObjectAbstract.php b/lib/Zend/Barcode/Object/ObjectAbstract.php index 51362f30e..ef4b52d0c 100644 --- a/lib/Zend/Barcode/Object/ObjectAbstract.php +++ b/lib/Zend/Barcode/Object/ObjectAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ObjectAbstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ObjectAbstract.php 23400 2010-11-19 17:18:31Z mikaelkael $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Barcode_Object_ObjectAbstract diff --git a/lib/Zend/Barcode/Object/Planet.php b/lib/Zend/Barcode/Object/Planet.php index 33dcf942c..ade56d306 100644 --- a/lib/Zend/Barcode/Object/Planet.php +++ b/lib/Zend/Barcode/Object/Planet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Planet.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Planet.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Planet extends Zend_Barcode_Object_Postnet diff --git a/lib/Zend/Barcode/Object/Postnet.php b/lib/Zend/Barcode/Object/Postnet.php index f5c9361e8..e1ee58e6a 100644 --- a/lib/Zend/Barcode/Object/Postnet.php +++ b/lib/Zend/Barcode/Object/Postnet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Postnet.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Postnet.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Postnet extends Zend_Barcode_Object_ObjectAbstract diff --git a/lib/Zend/Barcode/Object/Royalmail.php b/lib/Zend/Barcode/Object/Royalmail.php index 28b728234..5a84c63a4 100644 --- a/lib/Zend/Barcode/Object/Royalmail.php +++ b/lib/Zend/Barcode/Object/Royalmail.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Royalmail.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Royalmail.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Royalmail extends Zend_Barcode_Object_ObjectAbstract diff --git a/lib/Zend/Barcode/Object/Upca.php b/lib/Zend/Barcode/Object/Upca.php index 0234310ae..9239ea059 100644 --- a/lib/Zend/Barcode/Object/Upca.php +++ b/lib/Zend/Barcode/Object/Upca.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Upca.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Upca.php 21667 2010-03-28 17:45:14Z mikaelkael $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Upca extends Zend_Barcode_Object_Ean13 diff --git a/lib/Zend/Barcode/Object/Upce.php b/lib/Zend/Barcode/Object/Upce.php index 5190da630..7875aceef 100644 --- a/lib/Zend/Barcode/Object/Upce.php +++ b/lib/Zend/Barcode/Object/Upce.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Upce.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Upce.php 21667 2010-03-28 17:45:14Z mikaelkael $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Upce extends Zend_Barcode_Object_Ean13 diff --git a/lib/Zend/Barcode/Renderer/Exception.php b/lib/Zend/Barcode/Renderer/Exception.php index 106f50dbb..4bc7f3c09 100644 --- a/lib/Zend/Barcode/Renderer/Exception.php +++ b/lib/Zend/Barcode/Renderer/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @see Zend_Barcode_Exception */ @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Renderer_Exception extends Zend_Barcode_Exception diff --git a/lib/Zend/Barcode/Renderer/Image.php b/lib/Zend/Barcode/Renderer/Image.php index 8afe0ca36..b6338b773 100644 --- a/lib/Zend/Barcode/Renderer/Image.php +++ b/lib/Zend/Barcode/Renderer/Image.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Renderer - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Image.php 22999 2010-09-23 19:43:14Z mikaelkael $ */ /** @see Zend_Barcode_Renderer_RendererAbstract*/ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract diff --git a/lib/Zend/Barcode/Renderer/Pdf.php b/lib/Zend/Barcode/Renderer/Pdf.php index b0616cf50..16c628137 100644 --- a/lib/Zend/Barcode/Renderer/Pdf.php +++ b/lib/Zend/Barcode/Renderer/Pdf.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Renderer - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pdf.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Pdf.php 22418 2010-06-11 16:27:22Z mikaelkael $ */ /** @see Zend_Barcode_Renderer_RendererAbstract */ @@ -37,7 +37,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Renderer_Pdf extends Zend_Barcode_Renderer_RendererAbstract diff --git a/lib/Zend/Barcode/Renderer/RendererAbstract.php b/lib/Zend/Barcode/Renderer/RendererAbstract.php index afa94390e..14db9721f 100644 --- a/lib/Zend/Barcode/Renderer/RendererAbstract.php +++ b/lib/Zend/Barcode/Renderer/RendererAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Renderer - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RendererAbstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: RendererAbstract.php 22999 2010-09-23 19:43:14Z mikaelkael $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Barcode_Renderer_RendererAbstract diff --git a/lib/Zend/Barcode/Renderer/Svg.php b/lib/Zend/Barcode/Renderer/Svg.php index c22c071dc..218bc4db8 100644 --- a/lib/Zend/Barcode/Renderer/Svg.php +++ b/lib/Zend/Barcode/Renderer/Svg.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Barcode * @subpackage Renderer - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Image.php 20366 2010-01-18 03:56:52Z ralph $ */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract diff --git a/lib/Zend/Cache.php b/lib/Zend/Cache.php index 42d21fda1..70bcb4d7e 100644 --- a/lib/Zend/Cache.php +++ b/lib/Zend/Cache.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 24656 2012-02-26 06:02:53Z adamlundrigan $ + * @version $Id: Cache.php 23154 2010-10-18 17:41:06Z mabe $ */ /** * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Cache @@ -41,14 +41,14 @@ abstract class Zend_Cache * @var array */ public static $standardBackends = array('File', 'Sqlite', 'Memcached', 'Libmemcached', 'Apc', 'ZendPlatform', - 'Xcache', 'TwoLevels', 'WinCache', 'ZendServer_Disk', 'ZendServer_ShMem'); + 'Xcache', 'TwoLevels', 'ZendServer_Disk', 'ZendServer_ShMem'); /** * Standard backends which implement the ExtendedInterface * * @var array */ - public static $standardExtendedBackends = array('File', 'Apc', 'TwoLevels', 'Memcached', 'Libmemcached', 'Sqlite', 'WinCache'); + public static $standardExtendedBackends = array('File', 'Apc', 'TwoLevels', 'Memcached', 'Libmemcached', 'Sqlite'); /** * Only for backward compatibility (may be removed in next major release) @@ -64,7 +64,7 @@ abstract class Zend_Cache * @var array * @deprecated */ - public static $availableBackends = array('File', 'Sqlite', 'Memcached', 'Libmemcached', 'Apc', 'ZendPlatform', 'Xcache', 'WinCache', 'TwoLevels'); + public static $availableBackends = array('File', 'Sqlite', 'Memcached', 'Libmemcached', 'Apc', 'ZendPlatform', 'Xcache', 'TwoLevels'); /** * Consts for clean() method @@ -133,7 +133,7 @@ public static function _makeBackend($backend, $backendOptions, $customBackendNam #require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php'; } else { // we use a custom backend - if (!preg_match('~^[\w\\\\]+$~D', $backend)) { + if (!preg_match('~^[\w]+$~D', $backend)) { Zend_Cache::throwException("Invalid backend name [$backend]"); } if (!$customBackendNaming) { @@ -175,7 +175,7 @@ public static function _makeFrontend($frontend, $frontendOptions = array(), $cus #require_once str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php'; } else { // we use a custom frontend - if (!preg_match('~^[\w\\\\]+$~D', $frontend)) { + if (!preg_match('~^[\w]+$~D', $frontend)) { Zend_Cache::throwException("Invalid frontend name [$frontend]"); } if (!$customFrontendNaming) { diff --git a/lib/Zend/Cache/Backend.php b/lib/Zend/Cache/Backend.php index df24332cc..2cec83558 100644 --- a/lib/Zend/Cache/Backend.php +++ b/lib/Zend/Cache/Backend.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Backend.php 24989 2012-06-21 07:24:13Z mabe $ + * @version $Id: Backend.php 20880 2010-02-03 18:18:32Z matthew $ */ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend @@ -111,28 +111,6 @@ public function setOption($name, $value) } } - /** - * Returns an option - * - * @param string $name Optional, the options name to return - * @throws Zend_Cache_Exceptions - * @return mixed - */ - public function getOption($name) - { - $name = strtolower($name); - - if (array_key_exists($name, $this->_options)) { - return $this->_options[$name]; - } - - if (array_key_exists($name, $this->_directives)) { - return $this->_directives[$name]; - } - - Zend_Cache::throwException("Incorrect option name : {$name}"); - } - /** * Get the life time * @@ -176,7 +154,7 @@ public function getTmpDir() $tmpdir = array(); foreach (array($_ENV, $_SERVER) as $tab) { foreach (array('TMPDIR', 'TEMP', 'TMP', 'windir', 'SystemRoot') as $key) { - if (isset($tab[$key]) && is_string($tab[$key])) { + if (isset($tab[$key])) { if (($key == 'windir') or ($key == 'SystemRoot')) { $dir = realpath($tab[$key] . '\\temp'); } else { @@ -222,7 +200,7 @@ public function getTmpDir() /** * Verify if the given temporary directory is readable and writable * - * @param string $dir temporary directory + * @param $dir temporary directory * @return boolean true if the directory is ok */ protected function _isGoodTmpDir($dir) @@ -259,9 +237,7 @@ protected function _loggerSanity() // Create a default logger to the standard output stream #require_once 'Zend/Log.php'; #require_once 'Zend/Log/Writer/Stream.php'; - #require_once 'Zend/Log/Filter/Priority.php'; $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output')); - $logger->addFilter(new Zend_Log_Filter_Priority(Zend_Log::WARN, '<=')); $this->_directives['logger'] = $logger; } diff --git a/lib/Zend/Cache/Backend/Apc.php b/lib/Zend/Cache/Backend/Apc.php index 5fc5bd678..e74e0e7b6 100644 --- a/lib/Zend/Cache/Backend/Apc.php +++ b/lib/Zend/Cache/Backend/Apc.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Apc.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Apc.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -35,7 +35,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface diff --git a/lib/Zend/Cache/Backend/BlackHole.php b/lib/Zend/Cache/Backend/BlackHole.php index a8daf5d5c..6551b1bdf 100644 --- a/lib/Zend/Cache/Backend/BlackHole.php +++ b/lib/Zend/Cache/Backend/BlackHole.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BlackHole.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: BlackHole.php 20785 2010-01-31 09:43:03Z mikaelkael $ */ /** @@ -33,11 +33,11 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cache_Backend_BlackHole - extends Zend_Cache_Backend +class Zend_Cache_Backend_BlackHole + extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface { /** diff --git a/lib/Zend/Cache/Backend/ExtendedInterface.php b/lib/Zend/Cache/Backend/ExtendedInterface.php index 8b285082a..32b032ffe 100644 --- a/lib/Zend/Cache/Backend/ExtendedInterface.php +++ b/lib/Zend/Cache/Backend/ExtendedInterface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ExtendedInterface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ExtendedInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Cache_Backend_ExtendedInterface extends Zend_Cache_Backend_Interface diff --git a/lib/Zend/Cache/Backend/File.php b/lib/Zend/Cache/Backend/File.php index b24cf08d7..100495e01 100644 --- a/lib/Zend/Cache/Backend/File.php +++ b/lib/Zend/Cache/Backend/File.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 24844 2012-05-31 19:01:36Z rob $ + * @version $Id: File.php 21636 2010-03-24 17:10:23Z mabe $ */ /** @@ -34,7 +34,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface @@ -71,11 +71,7 @@ class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_B * for you. Maybe, 1 or 2 is a good start. * * =====> (int) hashed_directory_umask : - * - deprecated - * - Permissions for hashed directory structure - * - * =====> (int) hashed_directory_perm : - * - Permissions for hashed directory structure + * - Umask for hashed directory structure * * =====> (string) file_name_prefix : * - prefix for cache files @@ -83,11 +79,7 @@ class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_B * (like /tmp) can cause disasters when cleaning the cache * * =====> (int) cache_file_umask : - * - deprecated - * - Permissions for cache files - * - * =====> (int) cache_file_perm : - * - Permissions for cache files + * - Umask for cache files * * =====> (int) metatadatas_array_max_size : * - max size for the metadatas array (don't change this value unless you @@ -101,9 +93,9 @@ class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_B 'read_control' => true, 'read_control_type' => 'crc32', 'hashed_directory_level' => 0, - 'hashed_directory_perm' => 0700, + 'hashed_directory_umask' => 0700, 'file_name_prefix' => 'zend_cache', - 'cache_file_perm' => 0600, + 'cache_file_umask' => 0600, 'metadatas_array_max_size' => 100 ); @@ -138,29 +130,13 @@ public function __construct(array $options = array()) if ($this->_options['metadatas_array_max_size'] < 10) { Zend_Cache::throwException('Invalid metadatas_array_max_size, must be > 10'); } - - if (isset($options['hashed_directory_umask'])) { - // See #ZF-12047 - trigger_error("'hashed_directory_umask' is deprecated -> please use 'hashed_directory_perm' instead", E_USER_NOTICE); - if (!isset($options['hashed_directory_perm'])) { - $options['hashed_directory_perm'] = $options['hashed_directory_umask']; - } - } - if (isset($options['hashed_directory_perm']) && is_string($options['hashed_directory_perm'])) { + if (isset($options['hashed_directory_umask']) && is_string($options['hashed_directory_umask'])) { // See #ZF-4422 - $this->_options['hashed_directory_perm'] = octdec($this->_options['hashed_directory_perm']); + $this->_options['hashed_directory_umask'] = octdec($this->_options['hashed_directory_umask']); } - - if (isset($options['cache_file_umask'])) { - // See #ZF-12047 - trigger_error("'cache_file_umask' is deprecated -> please use 'cache_file_perm' instead", E_USER_NOTICE); - if (!isset($options['cache_file_perm'])) { - $options['cache_file_perm'] = $options['cache_file_umask']; - } - } - if (isset($options['cache_file_perm']) && is_string($options['cache_file_perm'])) { + if (isset($options['cache_file_umask']) && is_string($options['cache_file_umask'])) { // See #ZF-4422 - $this->_options['cache_file_perm'] = octdec($this->_options['cache_file_perm']); + $this->_options['cache_file_umask'] = octdec($this->_options['cache_file_umask']); } } @@ -175,10 +151,10 @@ public function __construct(array $options = array()) public function setCacheDir($value, $trailingSeparator = true) { if (!is_dir($value)) { - Zend_Cache::throwException(sprintf('cache_dir "%s" must be a directory', $value)); + Zend_Cache::throwException('cache_dir must be a directory'); } if (!is_writable($value)) { - Zend_Cache::throwException(sprintf('cache_dir "%s" is not writable', $value)); + Zend_Cache::throwException('cache_dir is not writable'); } if ($trailingSeparator) { // add a trailing DIRECTORY_SEPARATOR if necessary @@ -292,15 +268,14 @@ public function remove($id) * Clean some cache records * * Available modes are : - * - * Zend_Cache::CLEANING_MODE_ALL (default) => remove all cache entries ($tags is not used) - * Zend_Cache::CLEANING_MODE_OLD => remove too old cache entries ($tags is not used) - * Zend_Cache::CLEANING_MODE_MATCHING_TAG => remove cache entries matching all given tags - * ($tags can be an array of strings or a single string) - * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags} - * ($tags can be an array of strings or a single string) - * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags - * ($tags can be an array of strings or a single string) + * 'all' (default) => remove all cache entries ($tags is not used) + * 'old' => remove too old cache entries ($tags is not used) + * 'matchingTag' => remove cache entries matching all given tags + * ($tags can be an array of strings or a single string) + * 'notMatchingTag' => remove cache entries not matching one of the given tags + * ($tags can be an array of strings or a single string) + * 'matchingAnyTag' => remove cache entries matching any given tags + * ($tags can be an array of strings or a single string) * * @param string $mode clean mode * @param tags array $tags array of tags @@ -747,8 +722,8 @@ protected function _clean($dir, $mode = Zend_Cache::CLEANING_MODE_ALL, $tags = a if ((is_dir($file)) and ($this->_options['hashed_directory_level']>0)) { // Recursive call $result = $this->_clean($file . DIRECTORY_SEPARATOR, $mode, $tags) && $result; - if ($mode == Zend_Cache::CLEANING_MODE_ALL) { - // we try to drop the structure too + if ($mode=='all') { + // if mode=='all', we try to drop the structure too @rmdir($file); } } @@ -943,8 +918,8 @@ protected function _recursiveMkdirAndChmod($id) $partsArray = $this->_path($id, true); foreach ($partsArray as $part) { if (!is_dir($part)) { - @mkdir($part, $this->_options['hashed_directory_perm']); - @chmod($part, $this->_options['hashed_directory_perm']); // see #ZF-320 (this line is required in some configurations) + @mkdir($part, $this->_options['hashed_directory_umask']); + @chmod($part, $this->_options['hashed_directory_umask']); // see #ZF-320 (this line is required in some configurations) } } return true; @@ -1012,7 +987,7 @@ protected function _filePutContents($file, $string) } @fclose($f); } - @chmod($file, $this->_options['cache_file_perm']); + @chmod($file, $this->_options['cache_file_umask']); return $result; } diff --git a/lib/Zend/Cache/Backend/Interface.php b/lib/Zend/Cache/Backend/Interface.php index 3f44e2e19..3e8c7d121 100644 --- a/lib/Zend/Cache/Backend/Interface.php +++ b/lib/Zend/Cache/Backend/Interface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Cache_Backend_Interface diff --git a/lib/Zend/Cache/Backend/Libmemcached.php b/lib/Zend/Cache/Backend/Libmemcached.php index 68253da5c..aed5c69a6 100644 --- a/lib/Zend/Cache/Backend/Libmemcached.php +++ b/lib/Zend/Cache/Backend/Libmemcached.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Libmemcached.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Libmemcached.php 23220 2010-10-22 10:24:14Z mabe $ */ @@ -35,7 +35,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Libmemcached extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface diff --git a/lib/Zend/Cache/Backend/Memcached.php b/lib/Zend/Cache/Backend/Memcached.php index ba95d1ca9..824efbae8 100644 --- a/lib/Zend/Cache/Backend/Memcached.php +++ b/lib/Zend/Cache/Backend/Memcached.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Memcached.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Memcached.php 22207 2010-05-20 16:47:16Z mabe $ */ @@ -35,7 +35,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Memcached extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface diff --git a/lib/Zend/Cache/Backend/Sqlite.php b/lib/Zend/Cache/Backend/Sqlite.php index 4135326f4..13aaf5c45 100644 --- a/lib/Zend/Cache/Backend/Sqlite.php +++ b/lib/Zend/Cache/Backend/Sqlite.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlite.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Sqlite.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -34,7 +34,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Sqlite extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface @@ -530,6 +530,7 @@ private function _automaticVacuum() $rand = rand(1, $this->_options['automatic_vacuum_factor']); if ($rand == 1) { $this->_query('VACUUM'); + @sqlite_close($this->_getConnection()); } } } diff --git a/lib/Zend/Cache/Backend/Static.php b/lib/Zend/Cache/Backend/Static.php index 3926955e4..b55f8beb7 100644 --- a/lib/Zend/Cache/Backend/Static.php +++ b/lib/Zend/Cache/Backend/Static.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Static.php 24989 2012-06-21 07:24:13Z mabe $ + * @version $Id: Static.php 22950 2010-09-16 19:33:00Z mabe $ */ /** @@ -33,7 +33,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Static @@ -99,13 +99,17 @@ public function setOption($name, $value) */ public function getOption($name) { - $name = strtolower($name); - if ($name == 'tag_cache') { return $this->getInnerCache(); + } else { + if (in_array($name, $this->_options)) { + return $this->_options[$name]; + } + if ($name == 'lifetime') { + return parent::getLifetime(); + } + return null; } - - return parent::getOption($name); } /** @@ -119,7 +123,7 @@ public function getOption($name) */ public function load($id, $doNotTestCacheValidity = false) { - if (($id = (string)$id) === '') { + if (empty($id)) { $id = $this->_detectId(); } else { $id = $this->_decodeId($id); @@ -132,7 +136,7 @@ public function load($id, $doNotTestCacheValidity = false) } $fileName = basename($id); - if ($fileName === '') { + if (empty($fileName)) { $fileName = $this->_options['index_filename']; } $pathName = $this->_options['public_dir'] . dirname($id); @@ -159,7 +163,7 @@ public function test($id) } $fileName = basename($id); - if ($fileName === '') { + if (empty($fileName)) { $fileName = $this->_options['index_filename']; } if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) { @@ -207,14 +211,14 @@ public function save($data, $id, $tags = array(), $specificLifetime = false) } clearstatcache(); - if (($id = (string)$id) === '') { + if ($id === null || strlen($id) == 0) { $id = $this->_detectId(); } else { $id = $this->_decodeId($id); } $fileName = basename($id); - if ($fileName === '') { + if (empty($fileName)) { $fileName = $this->_options['index_filename']; } @@ -304,7 +308,7 @@ public function remove($id) } else { $extension = $this->_options['file_extension']; } - if ($fileName === '') { + if (empty($fileName)) { $fileName = $this->_options['index_filename']; } $pathName = $this->_options['public_dir'] . dirname($id); @@ -329,7 +333,7 @@ public function removeRecursively($id) Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path'); } $fileName = basename($id); - if ($fileName === '') { + if (empty($fileName)) { $fileName = $this->_options['index_filename']; } $pathName = $this->_options['public_dir'] . dirname($id); @@ -339,16 +343,14 @@ public function removeRecursively($id) if (!is_writable($directory)) { return false; } - if (is_dir($directory)) { - foreach (new DirectoryIterator($directory) as $file) { - if (true === $file->isFile()) { - if (false === unlink($file->getPathName())) { - return false; - } + foreach (new DirectoryIterator($directory) as $file) { + if (true === $file->isFile()) { + if (false === unlink($file->getPathName())) { + return false; } } } - rmdir($directory); + rmdir(dirname($path)); } if (file_exists($file)) { if (!is_writable($file)) { @@ -536,7 +538,7 @@ protected static function _validateIdOrTag($string) * Detect an octal string and return its octal value for file permission ops * otherwise return the non-string (assumed octal or decimal int already) * - * @param string $val The potential octal in need of conversion + * @param $val The potential octal in need of conversion * @return int */ protected function _octdec($val) @@ -549,12 +551,9 @@ protected function _octdec($val) /** * Decode a request URI from the provided ID - * - * @param string $id - * @return string */ protected function _decodeId($id) { - return pack('H*', $id); + return pack('H*', $id);; } } diff --git a/lib/Zend/Cache/Backend/Test.php b/lib/Zend/Cache/Backend/Test.php index cebb32357..b006d22ac 100644 --- a/lib/Zend/Cache/Backend/Test.php +++ b/lib/Zend/Cache/Backend/Test.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Test.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Test.php 23051 2010-10-07 17:01:21Z mabe $ */ @@ -34,7 +34,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Test extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface @@ -164,7 +164,7 @@ public function test($id) public function save($data, $id, $tags = array(), $specificLifetime = false) { $this->_addLog('save', array($data, $id, $tags)); - if (substr($id,-5)=='false') { + if ($id=='false') { return false; } return true; @@ -182,7 +182,7 @@ public function save($data, $id, $tags = array(), $specificLifetime = false) public function remove($id) { $this->_addLog('remove', array($id)); - if (substr($id,-5)=='false') { + if ($id=='false') { return false; } return true; diff --git a/lib/Zend/Cache/Backend/TwoLevels.php b/lib/Zend/Cache/Backend/TwoLevels.php index fae5828e3..cecb0ada7 100644 --- a/lib/Zend/Cache/Backend/TwoLevels.php +++ b/lib/Zend/Cache/Backend/TwoLevels.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TwoLevels.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: TwoLevels.php 22736 2010-07-30 16:25:54Z andyfowler $ */ @@ -35,7 +35,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -383,6 +383,7 @@ public function getIdsMatchingAnyTags($tags = array()) return $this->_slowBackend->getIdsMatchingAnyTags($tags); } + /** * Return the filling percentage of the backend storage * @@ -480,19 +481,18 @@ private function _prepareData($data, $lifetime, $priority) */ private function _getFastLifetime($lifetime, $priority, $maxLifetime = null) { - if ($lifetime <= 0) { - // if no lifetime, we have an infinite lifetime + if ($lifetime === null) { + // if lifetime is null, we have an infinite lifetime // we need to use arbitrary lifetimes $fastLifetime = (int) (2592000 / (11 - $priority)); } else { - // prevent computed infinite lifetime (0) by ceil - $fastLifetime = (int) ceil($lifetime / (11 - $priority)); + $fastLifetime = (int) ($lifetime / (11 - $priority)); } - - if ($maxLifetime >= 0 && $fastLifetime > $maxLifetime) { - return $maxLifetime; + if (($maxLifetime !== null) && ($maxLifetime >= 0)) { + if ($fastLifetime > $maxLifetime) { + return $maxLifetime; + } } - return $fastLifetime; } diff --git a/lib/Zend/Cache/Backend/WinCache.php b/lib/Zend/Cache/Backend/WinCache.php deleted file mode 100644 index 0a3035370..000000000 --- a/lib/Zend/Cache/Backend/WinCache.php +++ /dev/null @@ -1,349 +0,0 @@ - infinite lifetime) - * @return boolean true if no problem - */ - public function save($data, $id, $tags = array(), $specificLifetime = false) - { - $lifetime = $this->getLifetime($specificLifetime); - $result = wincache_ucache_set($id, array($data, time(), $lifetime), $lifetime); - if (count($tags) > 0) { - $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND); - } - return $result; - } - - /** - * Remove a cache record - * - * @param string $id cache id - * @return boolean true if no problem - */ - public function remove($id) - { - return wincache_ucache_delete($id); - } - - /** - * Clean some cache records - * - * Available modes are : - * 'all' (default) => remove all cache entries ($tags is not used) - * 'old' => unsupported - * 'matchingTag' => unsupported - * 'notMatchingTag' => unsupported - * 'matchingAnyTag' => unsupported - * - * @param string $mode clean mode - * @param array $tags array of tags - * @throws Zend_Cache_Exception - * @return boolean true if no problem - */ - public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array()) - { - switch ($mode) { - case Zend_Cache::CLEANING_MODE_ALL: - return wincache_ucache_clear(); - break; - case Zend_Cache::CLEANING_MODE_OLD: - $this->_log("Zend_Cache_Backend_WinCache::clean() : CLEANING_MODE_OLD is unsupported by the WinCache backend"); - break; - case Zend_Cache::CLEANING_MODE_MATCHING_TAG: - case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG: - case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG: - $this->_log(self::TAGS_UNSUPPORTED_BY_CLEAN_OF_WINCACHE_BACKEND); - break; - default: - Zend_Cache::throwException('Invalid mode for clean() method'); - break; - } - } - - /** - * Return true if the automatic cleaning is available for the backend - * - * DEPRECATED : use getCapabilities() instead - * - * @deprecated - * @return boolean - */ - public function isAutomaticCleaningAvailable() - { - return false; - } - - /** - * Return the filling percentage of the backend storage - * - * @throws Zend_Cache_Exception - * @return int integer between 0 and 100 - */ - public function getFillingPercentage() - { - $mem = wincache_ucache_meminfo(); - $memSize = $mem['memory_total']; - $memUsed = $memSize - $mem['memory_free']; - if ($memSize == 0) { - Zend_Cache::throwException('can\'t get WinCache memory size'); - } - if ($memUsed > $memSize) { - return 100; - } - return ((int) (100. * ($memUsed / $memSize))); - } - - /** - * Return an array of stored tags - * - * @return array array of stored tags (string) - */ - public function getTags() - { - $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND); - return array(); - } - - /** - * Return an array of stored cache ids which match given tags - * - * In case of multiple tags, a logical AND is made between tags - * - * @param array $tags array of tags - * @return array array of matching cache ids (string) - */ - public function getIdsMatchingTags($tags = array()) - { - $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND); - return array(); - } - - /** - * Return an array of stored cache ids which don't match given tags - * - * In case of multiple tags, a logical OR is made between tags - * - * @param array $tags array of tags - * @return array array of not matching cache ids (string) - */ - public function getIdsNotMatchingTags($tags = array()) - { - $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND); - return array(); - } - - /** - * Return an array of stored cache ids which match any given tags - * - * In case of multiple tags, a logical AND is made between tags - * - * @param array $tags array of tags - * @return array array of any matching cache ids (string) - */ - public function getIdsMatchingAnyTags($tags = array()) - { - $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND); - return array(); - } - - /** - * Return an array of stored cache ids - * - * @return array array of stored cache ids (string) - */ - public function getIds() - { - $res = array(); - $array = wincache_ucache_info(); - $records = $array['ucache_entries']; - foreach ($records as $record) { - $res[] = $record['key_name']; - } - return $res; - } - - /** - * Return an array of metadatas for the given cache id - * - * The array must include these keys : - * - expire : the expire timestamp - * - tags : a string array of tags - * - mtime : timestamp of last modification time - * - * @param string $id cache id - * @return array array of metadatas (false if the cache id is not found) - */ - public function getMetadatas($id) - { - $tmp = wincache_ucache_get($id); - if (is_array($tmp)) { - $data = $tmp[0]; - $mtime = $tmp[1]; - if (!isset($tmp[2])) { - return false; - } - $lifetime = $tmp[2]; - return array( - 'expire' => $mtime + $lifetime, - 'tags' => array(), - 'mtime' => $mtime - ); - } - return false; - } - - /** - * Give (if possible) an extra lifetime to the given cache id - * - * @param string $id cache id - * @param int $extraLifetime - * @return boolean true if ok - */ - public function touch($id, $extraLifetime) - { - $tmp = wincache_ucache_get($id); - if (is_array($tmp)) { - $data = $tmp[0]; - $mtime = $tmp[1]; - if (!isset($tmp[2])) { - return false; - } - $lifetime = $tmp[2]; - $newLifetime = $lifetime - (time() - $mtime) + $extraLifetime; - if ($newLifetime <=0) { - return false; - } - return wincache_ucache_set($id, array($data, time(), $newLifetime), $newLifetime); - } - return false; - } - - /** - * Return an associative array of capabilities (booleans) of the backend - * - * The array must include these keys : - * - automatic_cleaning (is automating cleaning necessary) - * - tags (are tags supported) - * - expired_read (is it possible to read expired cache records - * (for doNotTestCacheValidity option for example)) - * - priority does the backend deal with priority when saving - * - infinite_lifetime (is infinite lifetime can work with this backend) - * - get_list (is it possible to get the list of cache ids and the complete list of tags) - * - * @return array associative of with capabilities - */ - public function getCapabilities() - { - return array( - 'automatic_cleaning' => false, - 'tags' => false, - 'expired_read' => false, - 'priority' => false, - 'infinite_lifetime' => false, - 'get_list' => true - ); - } - -} diff --git a/lib/Zend/Cache/Backend/Xcache.php b/lib/Zend/Cache/Backend/Xcache.php index 7e7495b45..fcfd1abc0 100644 --- a/lib/Zend/Cache/Backend/Xcache.php +++ b/lib/Zend/Cache/Backend/Xcache.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xcache.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Xcache.php 23345 2010-11-15 16:31:14Z mabe $ */ @@ -35,7 +35,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Xcache extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface diff --git a/lib/Zend/Cache/Backend/ZendPlatform.php b/lib/Zend/Cache/Backend/ZendPlatform.php index 22b15f7c8..ffb306298 100644 --- a/lib/Zend/Cache/Backend/ZendPlatform.php +++ b/lib/Zend/Cache/Backend/ZendPlatform.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZendPlatform.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ZendPlatform.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -36,7 +36,7 @@ * * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_ZendPlatform extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface diff --git a/lib/Zend/Cache/Backend/ZendServer.php b/lib/Zend/Cache/Backend/ZendServer.php index e528e8cbf..19f785243 100644 --- a/lib/Zend/Cache/Backend/ZendServer.php +++ b/lib/Zend/Cache/Backend/ZendServer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZendServer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ZendServer.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -31,7 +31,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Cache_Backend_ZendServer extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface diff --git a/lib/Zend/Cache/Backend/ZendServer/Disk.php b/lib/Zend/Cache/Backend/ZendServer/Disk.php index e83fac5f7..e02c538a4 100644 --- a/lib/Zend/Cache/Backend/ZendServer/Disk.php +++ b/lib/Zend/Cache/Backend/ZendServer/Disk.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Disk.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Disk.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -31,7 +31,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_ZendServer_Disk extends Zend_Cache_Backend_ZendServer implements Zend_Cache_Backend_Interface diff --git a/lib/Zend/Cache/Backend/ZendServer/ShMem.php b/lib/Zend/Cache/Backend/ZendServer/ShMem.php index e814dc8ec..ddbfad858 100644 --- a/lib/Zend/Cache/Backend/ZendServer/ShMem.php +++ b/lib/Zend/Cache/Backend/ZendServer/ShMem.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ShMem.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ShMem.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -31,7 +31,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_ZendServer_ShMem extends Zend_Cache_Backend_ZendServer implements Zend_Cache_Backend_Interface diff --git a/lib/Zend/Cache/Core.php b/lib/Zend/Cache/Core.php index b5965abdd..47cb2c39e 100644 --- a/lib/Zend/Cache/Core.php +++ b/lib/Zend/Cache/Core.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Core.php 24989 2012-06-21 07:24:13Z mabe $ + * @version $Id: Core.php 22651 2010-07-21 04:19:44Z ramon $ */ /** * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Core @@ -211,7 +211,7 @@ public function getBackend() public function setOption($name, $value) { if (!is_string($name)) { - Zend_Cache::throwException("Incorrect option name!"); + Zend_Cache::throwException("Incorrect option name : $name"); } $name = strtolower($name); if (array_key_exists($name, $this->_options)) { @@ -235,18 +235,17 @@ public function setOption($name, $value) */ public function getOption($name) { - $name = strtolower($name); - - if (array_key_exists($name, $this->_options)) { - // This is a Core option - return $this->_options[$name]; - } - - if (array_key_exists($name, $this->_specificOptions)) { - // This a specic option of this frontend - return $this->_specificOptions[$name]; + if (is_string($name)) { + $name = strtolower($name); + if (array_key_exists($name, $this->_options)) { + // This is a Core option + return $this->_options[$name]; + } + if (array_key_exists($name, $this->_specificOptions)) { + // This a specic option of this frontend + return $this->_specificOptions[$name]; + } } - Zend_Cache::throwException("Incorrect option name : $name"); } @@ -301,8 +300,6 @@ public function load($id, $doNotTestCacheValidity = false, $doNotUnserialize = f $id = $this->_id($id); // cache id may need prefix $this->_lastId = $id; self::_validateIdOrTag($id); - - $this->_log("Zend_Cache_Core: load item '{$id}'", 7); $data = $this->_backend->load($id, $doNotTestCacheValidity); if ($data===false) { // no cache available @@ -329,8 +326,6 @@ public function test($id) $id = $this->_id($id); // cache id may need prefix self::_validateIdOrTag($id); $this->_lastId = $id; - - $this->_log("Zend_Cache_Core: test item '{$id}'", 7); return $this->_backend->test($id); } @@ -365,22 +360,27 @@ public function save($data, $id = null, $tags = array(), $specificLifetime = fal Zend_Cache::throwException("Datas must be string or set automatic_serialization = true"); } } - // automatic cleaning if ($this->_options['automatic_cleaning_factor'] > 0) { $rand = rand(1, $this->_options['automatic_cleaning_factor']); if ($rand==1) { - // new way || deprecated way - if ($this->_extendedBackend || method_exists($this->_backend, 'isAutomaticCleaningAvailable')) { - $this->_log("Zend_Cache_Core::save(): automatic cleaning running", 7); - $this->clean(Zend_Cache::CLEANING_MODE_OLD); + if ($this->_extendedBackend) { + // New way + if ($this->_backendCapabilities['automatic_cleaning']) { + $this->clean(Zend_Cache::CLEANING_MODE_OLD); + } else { + $this->_log('Zend_Cache_Core::save() / automatic cleaning is not available/necessary with this backend'); + } } else { - $this->_log("Zend_Cache_Core::save(): automatic cleaning is not available/necessary with current backend", 4); + // Deprecated way (will be removed in next major version) + if (method_exists($this->_backend, 'isAutomaticCleaningAvailable') && ($this->_backend->isAutomaticCleaningAvailable())) { + $this->clean(Zend_Cache::CLEANING_MODE_OLD); + } else { + $this->_log('Zend_Cache_Core::save() / automatic cleaning is not available/necessary with this backend'); + } } } } - - $this->_log("Zend_Cache_Core: save item '{$id}'", 7); if ($this->_options['ignore_user_abort']) { $abort = ignore_user_abort(true); } @@ -392,23 +392,22 @@ public function save($data, $id = null, $tags = array(), $specificLifetime = fal if ($this->_options['ignore_user_abort']) { ignore_user_abort($abort); } - if (!$result) { // maybe the cache is corrupted, so we remove it ! - $this->_log("Zend_Cache_Core::save(): failed to save item '{$id}' -> removing it", 4); - $this->_backend->remove($id); + if ($this->_options['logging']) { + $this->_log("Zend_Cache_Core::save() : impossible to save cache (id=$id)"); + } + $this->remove($id); return false; } - if ($this->_options['write_control']) { $data2 = $this->_backend->load($id, true); if ($data!=$data2) { - $this->_log("Zend_Cache_Core::save(): write control of item '{$id}' failed -> removing it", 4); + $this->_log('Zend_Cache_Core::save() / write_control : written and read data do not match'); $this->_backend->remove($id); return false; } } - return true; } @@ -425,8 +424,6 @@ public function remove($id) } $id = $this->_id($id); // cache id may need prefix self::_validateIdOrTag($id); - - $this->_log("Zend_Cache_Core: remove item '{$id}'", 7); return $this->_backend->remove($id); } @@ -461,7 +458,6 @@ public function clean($mode = 'all', $tags = array()) Zend_Cache::throwException('Invalid cleaning mode'); } self::_validateTagsArray($tags); - return $this->_backend->clean($mode, $tags); } @@ -653,8 +649,6 @@ public function touch($id, $extraLifetime) Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF); } $id = $this->_id($id); // cache id may need prefix - - $this->_log("Zend_Cache_Core: touch item '{$id}'", 7); return $this->_backend->touch($id, $extraLifetime); } @@ -719,11 +713,9 @@ protected function _loggerSanity() } // Create a default logger to the standard output stream - #require_once 'Zend/Log.php'; #require_once 'Zend/Log/Writer/Stream.php'; - #require_once 'Zend/Log/Filter/Priority.php'; + #require_once 'Zend/Log.php'; $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output')); - $logger->addFilter(new Zend_Log_Filter_Priority(Zend_Log::WARN, '<=')); $this->_options['logger'] = $logger; } diff --git a/lib/Zend/Cache/Exception.php b/lib/Zend/Cache/Exception.php index 239838e72..b9f54a453 100644 --- a/lib/Zend/Cache/Exception.php +++ b/lib/Zend/Cache/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -26,7 +26,7 @@ /** * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Exception extends Zend_Exception {} diff --git a/lib/Zend/Cache/Frontend/Capture.php b/lib/Zend/Cache/Frontend/Capture.php index 0ec20b7d1..48ab835ad 100644 --- a/lib/Zend/Cache/Frontend/Capture.php +++ b/lib/Zend/Cache/Frontend/Capture.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Capture.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Capture.php 22662 2010-07-24 17:37:36Z mabe $ */ @@ -30,7 +30,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_Capture extends Zend_Cache_Core @@ -46,7 +46,7 @@ class Zend_Cache_Frontend_Capture extends Zend_Cache_Core * @var array */ protected $_tags = array(); - + protected $_extension = null; /** diff --git a/lib/Zend/Cache/Frontend/Class.php b/lib/Zend/Cache/Frontend/Class.php index 4c6fedb05..08b63d92a 100644 --- a/lib/Zend/Cache/Frontend/Class.php +++ b/lib/Zend/Cache/Frontend/Class.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Class.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Class.php 23051 2010-10-07 17:01:21Z mabe $ */ /** @@ -29,7 +29,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_Class extends Zend_Cache_Core @@ -200,19 +200,13 @@ public function setTagsArray($tags = array()) */ public function __call($name, $parameters) { - $callback = array($this->_cachedEntity, $name); - - if (!is_callable($callback, false)) { - Zend_Cache::throwException('Invalid callback'); - } - $cacheBool1 = $this->_specificOptions['cache_by_default']; $cacheBool2 = in_array($name, $this->_specificOptions['cached_methods']); $cacheBool3 = in_array($name, $this->_specificOptions['non_cached_methods']); $cache = (($cacheBool1 || $cacheBool2) && (!$cacheBool3)); if (!$cache) { // We do not have not cache - return call_user_func_array($callback, $parameters); + return call_user_func_array(array($this->_cachedEntity, $name), $parameters); } $id = $this->_makeId($name, $parameters); @@ -226,7 +220,7 @@ public function __call($name, $parameters) ob_implicit_flush(false); try { - $return = call_user_func_array($callback, $parameters); + $return = call_user_func_array(array($this->_cachedEntity, $name), $parameters); $output = ob_get_clean(); $data = array($output, $return); $this->save($data, $id, $this->_tags, $this->_specificLifetime, $this->_priority); diff --git a/lib/Zend/Cache/Frontend/File.php b/lib/Zend/Cache/Frontend/File.php index dbe417609..bb6223dff 100644 --- a/lib/Zend/Cache/Frontend/File.php +++ b/lib/Zend/Cache/Frontend/File.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: File.php 23330 2010-11-14 20:08:09Z mabe $ */ @@ -30,7 +30,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_File extends Zend_Cache_Core @@ -110,11 +110,7 @@ public function setMasterFiles(array $masterFiles) clearstatcache(); $i = 0; foreach ($masterFiles as $masterFile) { - if (file_exists($masterFile)) { - $mtime = filemtime($masterFile); - } else { - $mtime = false; - } + $mtime = @filemtime($masterFile); if (!$this->_specificOptions['ignore_missing_master_files'] && !$mtime) { Zend_Cache::throwException('Unable to read master_file : ' . $masterFile); @@ -123,7 +119,7 @@ public function setMasterFiles(array $masterFiles) $this->_masterFile_mtimes[$i] = $mtime; $this->_specificOptions['master_files'][$i] = $masterFile; if ($i === 0) { // to keep a compatibility - $this->_specificOptions['master_file'] = $masterFile; + $this->_specificOptions['master_files'] = $masterFile; } $i++; diff --git a/lib/Zend/Cache/Frontend/Function.php b/lib/Zend/Cache/Frontend/Function.php index 6f3f3627a..abf4701fc 100644 --- a/lib/Zend/Cache/Frontend/Function.php +++ b/lib/Zend/Cache/Frontend/Function.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Function.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Function.php 22648 2010-07-20 14:43:27Z mabe $ */ @@ -30,7 +30,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_Function extends Zend_Cache_Core @@ -104,7 +104,8 @@ public function call($callback, array $parameters = array(), $tags = array(), $s ob_start(); ob_implicit_flush(false); $return = call_user_func_array($callback, $parameters); - $output = ob_get_clean(); + $output = ob_get_contents(); + ob_end_clean(); $data = array($output, $return); $this->save($data, $id, $tags, $specificLifetime, $priority); } diff --git a/lib/Zend/Cache/Frontend/Output.php b/lib/Zend/Cache/Frontend/Output.php index 9048b99bc..c103ccd14 100644 --- a/lib/Zend/Cache/Frontend/Output.php +++ b/lib/Zend/Cache/Frontend/Output.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Output.php 24800 2012-05-13 11:59:32Z mabe $ + * @version $Id: Output.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -30,7 +30,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_Output extends Zend_Cache_Core @@ -55,7 +55,7 @@ public function __construct(array $options = array()) * * @param string $id Cache id * @param boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested - * @param boolean $echoData If set to true, datas are sent to the browser if the cache is hit (simply returned else) + * @param boolean $echoData If set to true, datas are sent to the browser if the cache is hit (simpy returned else) * @return mixed True if the cache is hit (false else) with $echoData=true (default) ; string else (datas) */ public function start($id, $doNotTestCacheValidity = false, $echoData = true) @@ -88,7 +88,8 @@ public function start($id, $doNotTestCacheValidity = false, $echoData = true) public function end($tags = array(), $specificLifetime = false, $forcedDatas = null, $echoData = true, $priority = 8) { if ($forcedDatas === null) { - $data = ob_get_clean(); + $data = ob_get_contents(); + ob_end_clean(); } else { $data =& $forcedDatas; } diff --git a/lib/Zend/Cache/Frontend/Page.php b/lib/Zend/Cache/Frontend/Page.php index 01a196f4f..d3c3bb98d 100644 --- a/lib/Zend/Cache/Frontend/Page.php +++ b/lib/Zend/Cache/Frontend/Page.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Page.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Page.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -30,7 +30,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_Page extends Zend_Cache_Core @@ -243,11 +243,9 @@ public function start($id = false, $doNotDie = false) { $this->_cancel = false; $lastMatchingRegexp = null; - if (isset($_SERVER['REQUEST_URI'])) { - foreach ($this->_specificOptions['regexps'] as $regexp => $conf) { - if (preg_match("`$regexp`", $_SERVER['REQUEST_URI'])) { - $lastMatchingRegexp = $regexp; - } + foreach ($this->_specificOptions['regexps'] as $regexp => $conf) { + if (preg_match("`$regexp`", $_SERVER['REQUEST_URI'])) { + $lastMatchingRegexp = $regexp; } } $this->_activeOptions = $this->_specificOptions['default_options']; diff --git a/lib/Zend/Cache/Manager.php b/lib/Zend/Cache/Manager.php index d4766bc91..a7ffada2a 100644 --- a/lib/Zend/Cache/Manager.php +++ b/lib/Zend/Cache/Manager.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manager.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Manager.php 22727 2010-07-30 12:36:00Z mabe $ */ /** @see Zend_Cache_Exception */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Manager diff --git a/lib/Zend/Captcha/Adapter.php b/lib/Zend/Captcha/Adapter.php index e42e890a2..c879c3231 100644 --- a/lib/Zend/Captcha/Adapter.php +++ b/lib/Zend/Captcha/Adapter.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Adapter.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Adapter.php 20096 2010-01-06 02:05:09Z bkarwin $ */ interface Zend_Captcha_Adapter extends Zend_Validate_Interface { diff --git a/lib/Zend/Captcha/Base.php b/lib/Zend/Captcha/Base.php index 21b9af4e8..c19fe01a8 100644 --- a/lib/Zend/Captcha/Base.php +++ b/lib/Zend/Captcha/Base.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,9 +33,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $ */ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_Captcha_Adapter { diff --git a/lib/Zend/Captcha/Dumb.php b/lib/Zend/Captcha/Dumb.php index 3018b22d0..33250ebf1 100644 --- a/lib/Zend/Captcha/Dumb.php +++ b/lib/Zend/Captcha/Dumb.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,35 +30,12 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dumb.php 24747 2012-05-05 00:21:56Z adamlundrigan $ + * @version $Id: Dumb.php 20096 2010-01-06 02:05:09Z bkarwin $ */ class Zend_Captcha_Dumb extends Zend_Captcha_Word { - /** - * CAPTCHA label - * @type string - */ - protected $_label = 'Please type this word backwards'; - - /** - * Set the label for the CAPTCHA - * @param string $label - */ - public function setLabel($label) - { - $this->_label = $label; - } - - /** - * Retrieve the label for the CAPTCHA - * @return string - */ - public function getLabel() - { - return $this->_label; - } /** * Render the captcha * @@ -68,7 +45,7 @@ public function getLabel() */ public function render(Zend_View_Interface $view = null, $element = null) { - return $this->getLabel() . ': ' + return 'Please type this word backwards: ' . strrev($this->getWord()) . ''; } diff --git a/lib/Zend/Captcha/Exception.php b/lib/Zend/Captcha/Exception.php index 52b914d98..57833bba4 100644 --- a/lib/Zend/Captcha/Exception.php +++ b/lib/Zend/Captcha/Exception.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Captcha - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Captcha - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Captcha_Exception extends Zend_Exception diff --git a/lib/Zend/Captcha/Figlet.php b/lib/Zend/Captcha/Figlet.php index 497473d19..b7d289cdf 100644 --- a/lib/Zend/Captcha/Figlet.php +++ b/lib/Zend/Captcha/Figlet.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,9 +33,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Figlet.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Figlet.php 20096 2010-01-06 02:05:09Z bkarwin $ */ class Zend_Captcha_Figlet extends Zend_Captcha_Word { diff --git a/lib/Zend/Captcha/Image.php b/lib/Zend/Captcha/Image.php index a4faf7450..d2bd3f690 100644 --- a/lib/Zend/Captcha/Image.php +++ b/lib/Zend/Captcha/Image.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 24821 2012-05-29 14:54:50Z adamlundrigan $ + * @version $Id: Image.php 22589 2010-07-16 20:51:51Z mikaelkael $ */ /** @see Zend_Captcha_Word */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Captcha_Image extends Zend_Captcha_Word @@ -580,7 +580,7 @@ protected function _gc() $suffixLength = strlen($this->_suffix); foreach (new DirectoryIterator($imgdir) as $file) { if (!$file->isDot() && !$file->isDir()) { - if (file_exists($file->getPathname()) && $file->getMTime() < $expire) { + if ($file->getMTime() < $expire) { // only deletes files ending with $this->_suffix if (substr($file->getFilename(), -($suffixLength)) == $this->_suffix) { unlink($file->getPathname()); @@ -599,11 +599,7 @@ protected function _gc() */ public function render(Zend_View_Interface $view = null, $element = null) { - $endTag = ' />'; - if (($view instanceof Zend_View_Abstract) && !$view->doctype()->isXhtml()) { - $endTag = '>'; - } return '' . $this->getImgAlt() - . ''; } } diff --git a/lib/Zend/Captcha/ReCaptcha.php b/lib/Zend/Captcha/ReCaptcha.php index 636bb85c6..c879ab020 100644 --- a/lib/Zend/Captcha/ReCaptcha.php +++ b/lib/Zend/Captcha/ReCaptcha.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ReCaptcha.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ReCaptcha.php 20096 2010-01-06 02:05:09Z bkarwin $ */ class Zend_Captcha_ReCaptcha extends Zend_Captcha_Base { @@ -261,20 +261,6 @@ public function isValid($value, $context = null) */ public function render(Zend_View_Interface $view = null, $element = null) { - $name = null; - if ($element instanceof Zend_Form_Element) { - $name = $element->getBelongsTo(); - } - return $this->getService()->getHTML($name); - } - - /** - * Get captcha decorator - * - * @return string - */ - public function getDecorator() - { - return "Captcha_ReCaptcha"; + return $this->getService()->getHTML(); } } diff --git a/lib/Zend/Captcha/Word.php b/lib/Zend/Captcha/Word.php index feae9d777..6170b06da 100644 --- a/lib/Zend/Captcha/Word.php +++ b/lib/Zend/Captcha/Word.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Word.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Word.php 21793 2010-04-08 00:51:31Z stas $ */ abstract class Zend_Captcha_Word extends Zend_Captcha_Base { @@ -131,7 +131,7 @@ abstract class Zend_Captcha_Word extends Zend_Captcha_Base * * @return string */ - public function getSessionClass() + public function getSessionClass() { return $this->_sessionClass; } @@ -217,17 +217,17 @@ public function getTimeout() return $this->_timeout; } - /** - * Sets if session should be preserved on generate() - * - * @param bool $keepSession Should session be kept on generate()? - * @return Zend_Captcha_Word - */ - public function setKeepSession($keepSession) - { - $this->_keepSession = $keepSession; - return $this; - } + /** + * Sets if session should be preserved on generate() + * + * @param $keepSession Should session be kept on generate()? + * @return Zend_Captcha_Word + */ + public function setKeepSession($keepSession) + { + $this->_keepSession = $keepSession; + return $this; + } /** * Numbers should be included in the pattern? @@ -239,10 +239,10 @@ public function getUseNumbers() return $this->_useNumbers; } - /** - * Set if numbers should be included in the pattern - * - * @param bool $_useNumbers numbers should be included in the pattern? + /** + * Set if numbers should be included in the pattern + * + * @param $_useNumbers numbers should be included in the pattern? * @return Zend_Captcha_Word */ public function setUseNumbers($_useNumbers) @@ -250,8 +250,8 @@ public function setUseNumbers($_useNumbers) $this->_useNumbers = $_useNumbers; return $this; } - - /** + + /** * Get session object * * @return Zend_Session_Namespace diff --git a/lib/Zend/Cloud/AbstractFactory.php b/lib/Zend/Cloud/AbstractFactory.php index 6e4f2a50b..500839ed3 100644 --- a/lib/Zend/Cloud/AbstractFactory.php +++ b/lib/Zend/Cloud/AbstractFactory.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,29 +23,29 @@ * * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_AbstractFactory { /** * Constructor - * + * * @return void */ private function __construct() { // private ctor - should not be used } - + /** * Get an individual adapter instance - * - * @param string $adapterOption - * @param array|Zend_Config $options + * + * @param string $adapterOption + * @param array|Zend_Config $options * @return null|Zend_Cloud_DocumentService_Adapter|Zend_Cloud_QueueService_Adapter|Zend_Cloud_StorageService_Adapter */ - protected static function _getAdapter($adapterOption, $options) + protected static function _getAdapter($adapterOption, $options) { if ($options instanceof Zend_Config) { $options = $options->toArray(); diff --git a/lib/Zend/Cloud/DocumentService/Adapter.php b/lib/Zend/Cloud/DocumentService/Adapter.php index 9479fea3b..3cbc6d933 100644 --- a/lib/Zend/Cloud/DocumentService/Adapter.php +++ b/lib/Zend/Cloud/DocumentService/Adapter.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Cloud_DocumentService_Adapter @@ -67,9 +67,9 @@ public function listCollections($options = null); /** * List all documents in a collection - * - * @param string $collectionName - * @param null|array $options + * + * @param string $collectionName + * @param null|array $options * @return Zend_Cloud_DocumentService_DocumentSet */ public function listDocuments($collectionName, array $options = null); @@ -87,7 +87,7 @@ public function insertDocument($collectionName, $document, $options = null); /** * Replace document * The new document replaces the existing document with the same ID. - * + * * @param string $collectionName Collection name * @param Zend_Cloud_DocumentService_Document $document * @param array $options @@ -96,8 +96,8 @@ public function replaceDocument($collectionName, $document, $options = null); /** * Update document - * The fields of the existing documents will be updated. - * Fields not specified in the set will be left as-is. + * The fields of the existing documents will be updated. + * Fields not specified in the set will be left as-is. * * @param string $collectionName * @param mixed|Zend_Cloud_DocumentService_Document $documentID Document ID, adapter-dependent, or document containing updates @@ -106,7 +106,7 @@ public function replaceDocument($collectionName, $document, $options = null); * @return boolean */ public function updateDocument($collectionName, $documentID, $fieldset = null, $options = null); - + /** * Delete document * @@ -119,16 +119,16 @@ public function deleteDocument($collectionName, $documentID, $options = null); /** * Fetch single document by ID - * + * * Will return false if the document does not exist - * + * * @param string $collectionName Collection name * @param mixed $documentID Document ID, adapter-dependent * @param array $options * @return Zend_Cloud_DocumentService_Document */ public function fetchDocument($collectionName, $documentID, $options = null); - + /** * Query for documents stored in the document service. If a string is passed in * $query, the query string will be passed directly to the service. @@ -139,15 +139,15 @@ public function fetchDocument($collectionName, $documentID, $options = null); * @return array Array of field sets */ public function query($collectionName, $query, $options = null); - + /** * Create query statement - * + * * @param string $fields * @return Zend_Cloud_DocumentService_Query */ public function select($fields = null); - + /** * Get the concrete service client */ diff --git a/lib/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php b/lib/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php index a5d7dfde0..6ba83b730 100644 --- a/lib/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php +++ b/lib/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,10 +33,10 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -abstract class Zend_Cloud_DocumentService_Adapter_AbstractAdapter +abstract class Zend_Cloud_DocumentService_Adapter_AbstractAdapter implements Zend_Cloud_DocumentService_Adapter { const DOCUMENT_CLASS = 'document_class'; @@ -57,15 +57,15 @@ abstract class Zend_Cloud_DocumentService_Adapter_AbstractAdapter /** * Class to utilize for new query objects - * + * * @var string */ protected $_queryClass = 'Zend_Cloud_DocumentService_Query'; /** * Set the class for document objects - * - * @param string $class + * + * @param string $class * @return Zend_Cloud_DocumentService_Adapter_AbstractAdapter */ public function setDocumentClass($class) @@ -76,7 +76,7 @@ public function setDocumentClass($class) /** * Get the class for document objects - * + * * @return string */ public function getDocumentClass() @@ -86,8 +86,8 @@ public function getDocumentClass() /** * Set the class for document set objects - * - * @param string $class + * + * @param string $class * @return Zend_Cloud_DocumentService_Adapter_AbstractAdapter */ public function setDocumentSetClass($class) @@ -98,7 +98,7 @@ public function setDocumentSetClass($class) /** * Get the class for document set objects - * + * * @return string */ public function getDocumentSetClass() @@ -108,8 +108,8 @@ public function getDocumentSetClass() /** * Set the query class for query objects - * - * @param string $class + * + * @param string $class * @return Zend_Cloud_DocumentService_Adapter_AbstractAdapter */ public function setQueryClass($class) @@ -120,7 +120,7 @@ public function setQueryClass($class) /** * Get the class for query objects - * + * * @return string */ public function getQueryClass() diff --git a/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb.php b/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb.php index 011174c19..0298d997e 100644 --- a/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb.php +++ b/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,10 +29,10 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cloud_DocumentService_Adapter_SimpleDb +class Zend_Cloud_DocumentService_Adapter_SimpleDb extends Zend_Cloud_DocumentService_Adapter_AbstractAdapter { /* @@ -40,9 +40,9 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDb */ const AWS_ACCESS_KEY = 'aws_accesskey'; const AWS_SECRET_KEY = 'aws_secretkey'; - + const ITEM_NAME = 'ItemName'; - + const MERGE_OPTION = "merge"; const RETURN_DOCUMENTS = "return_documents"; @@ -54,20 +54,20 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDb * @var Zend_Service_Amazon_SimpleDb */ protected $_simpleDb; - + /** * Class to utilize for new query objects * @var string */ protected $_queryClass = 'Zend_Cloud_DocumentService_Adapter_SimpleDb_Query'; - + /** * Constructor - * - * @param array|Zend_Config $options + * + * @param array|Zend_Config $options * @return void */ - public function __construct($options = array()) + public function __construct($options = array()) { if ($options instanceof Zend_Config) { $options = $options->toArray(); @@ -82,8 +82,8 @@ public function __construct($options = array()) ); if (isset($options[self::HTTP_ADAPTER])) { - $this->_simpleDb->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); - } + $this->_sqs->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); + } if (isset($options[self::DOCUMENT_CLASS])) { $this->setDocumentClass($options[self::DOCUMENT_CLASS]); @@ -105,7 +105,7 @@ public function __construct($options = array()) * @param array $options * @return void */ - public function createCollection($name, $options = null) + public function createCollection($name, $options = null) { try { $this->_simpleDb->createDomain($name); @@ -121,7 +121,7 @@ public function createCollection($name, $options = null) * @param array $options * @return void */ - public function deleteCollection($name, $options = null) + public function deleteCollection($name, $options = null) { try { $this->_simpleDb->deleteDomain($name); @@ -136,7 +136,7 @@ public function deleteCollection($name, $options = null) * @param array $options * @return array */ - public function listCollections($options = null) + public function listCollections($options = null) { try { // TODO package this in Pages @@ -157,7 +157,7 @@ public function listCollections($options = null) * @param array|null $options * @return Zend_Cloud_DocumentService_DocumentSet */ - public function listDocuments($collectionName, array $options = null) + public function listDocuments($collectionName, array $options = null) { $query = $this->select('*')->from($collectionName); $items = $this->query($collectionName, $query, $options); @@ -176,12 +176,12 @@ public function insertDocument($collectionName, $document, $options = null) { if (is_array($document)) { $document = $this->_getDocumentFromArray($document); - } - + } + if (!$document instanceof Zend_Cloud_DocumentService_Document) { throw new Zend_Cloud_DocumentService_Exception('Invalid document supplied'); } - + try { $this->_simpleDb->putAttributes( $collectionName, @@ -195,22 +195,22 @@ public function insertDocument($collectionName, $document, $options = null) /** * Replace an existing document with a new version - * - * @param string $collectionName + * + * @param string $collectionName * @param array|Zend_Cloud_DocumentService_Document $document - * @param array $options + * @param array $options * @return void */ public function replaceDocument($collectionName, $document, $options = null) { if (is_array($document)) { $document = $this->_getDocumentFromArray($document); - } - + } + if (!$document instanceof Zend_Cloud_DocumentService_Document) { throw new Zend_Cloud_DocumentService_Exception('Invalid document supplied'); } - + // Delete document first, then insert. PutAttributes always keeps any // fields not referenced in the payload, but present in the document $documentId = $document->getId(); @@ -221,14 +221,14 @@ public function replaceDocument($collectionName, $document, $options = null) $document = new $docClass($fields, $documentId); $this->insertDocument($collectionName, $document); } - + /** * Update document. The new document replaces the existing document. * * Option 'merge' specifies to add all attributes (if true) or * specific attributes ("attr" => true) instead of replacing them. - * By default, attributes are replaced. - * + * By default, attributes are replaced. + * * @param string $collectionName * @param mixed|Zend_Cloud_DocumentService_Document $documentId Document ID, adapter-dependent * @param array|Zend_Cloud_DocumentService_Document $fieldset Set of fields to update @@ -248,7 +248,7 @@ public function updateDocument($collectionName, $documentId, $fieldset = null, $ } $fieldset = $fieldset->getFields(); } - + $replace = array(); if (empty($options[self::MERGE_OPTION])) { // no merge option - we replace all @@ -263,7 +263,7 @@ public function updateDocument($collectionName, $documentId, $fieldset = null, $ } } } // otherwise $replace is empty - all is merged - + try { $this->_simpleDb->putAttributes( $collectionName, @@ -300,7 +300,7 @@ public function deleteDocument($collectionName, $document, $options = null) /** * Fetch single document by ID - * + * * @param string $collectionName Collection name * @param mixed $documentId Document ID, adapter-dependent * @param array $options @@ -318,7 +318,7 @@ public function fetchDocument($collectionName, $documentId, $options = null) throw new Zend_Cloud_DocumentService_Exception('Error on fetching document: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Query for documents stored in the document service. If a string is passed in * $query, the query string will be passed directly to the service. @@ -348,7 +348,7 @@ public function query($collectionName, $query, $options = null) /** * Create query statement - * + * * @param string $fields * @return Zend_Cloud_DocumentService_Adapter_SimpleDb_Query */ @@ -367,9 +367,9 @@ public function select($fields = null) } $query->select($fields); - return $query; + return $query; } - + /** * Get the concrete service client * @@ -379,10 +379,10 @@ public function getClient() { return $this->_simpleDb; } - + /** * Convert array of key-value pairs to array of Amazon attributes - * + * * @param string $name * @param array $attributes * @return array @@ -395,10 +395,10 @@ protected function _makeAttributes($name, $attributes) } return $result; } - + /** - * Convert array of Amazon attributes to array of key-value pairs - * + * Convert array of Amazon attributes to array of key-value pairs + * * @param array $attributes * @return array */ @@ -423,10 +423,10 @@ protected function _resolveAttributes($attributes, $returnDocument = false) return $result; } - + /** * Create suitable document from array of fields - * + * * @param array $document * @return Zend_Cloud_DocumentService_Document */ @@ -450,9 +450,9 @@ protected function _getDocumentFromArray($document) /** * Create a DocumentSet from a SimpleDb resultset - * - * @param Zend_Service_Amazon_SimpleDb_Page $resultSet - * @param bool $returnDocs + * + * @param Zend_Service_Amazon_SimpleDb_Page $resultSet + * @param bool $returnDocs * @return Zend_Cloud_DocumentService_DocumentSet */ protected function _getDocumentSetFromResultSet(Zend_Service_Amazon_SimpleDb_Page $resultSet, $returnDocs = true) diff --git a/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php b/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php index 490332c63..5efdc2d29 100644 --- a/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php +++ b/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,13 +23,13 @@ #require_once 'Zend/Cloud/DocumentService/Query.php'; /** - * Class implementing Query adapter for working with SimpleDb queries in a + * Class implementing Query adapter for working with SimpleDb queries in a * structured way * * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_DocumentService_Adapter_SimpleDb_Query @@ -42,8 +42,8 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDb_Query /** * Constructor - * - * @param Zend_Cloud_DocumentService_Adapter_SimpleDb $adapter + * + * @param Zend_Cloud_DocumentService_Adapter_SimpleDb $adapter * @param null|string $collectionName * @return void */ @@ -57,7 +57,7 @@ public function __construct(Zend_Cloud_DocumentService_Adapter_SimpleDb $adapter /** * Get adapter - * + * * @return Zend_Cloud_DocumentService_Adapter_SimpleDb */ public function getAdapter() @@ -67,7 +67,7 @@ public function getAdapter() /** * Assemble the query into a format the adapter can utilize - * + * * @var string $collectionName Name of collection from which to select * @return string */ @@ -150,10 +150,10 @@ public function assemble($collectionName = null) /** * Parse a where statement into service-specific language - * + * * @todo Ensure this fulfills the entire SimpleDB query specification for WHERE - * @param string $where - * @param array $args + * @param string $where + * @param array $args * @return string */ protected function _parseWhere($where, $args) diff --git a/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php b/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php index 91c55875f..ad5480e28 100644 --- a/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php +++ b/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,10 +29,10 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cloud_DocumentService_Adapter_WindowsAzure +class Zend_Cloud_DocumentService_Adapter_WindowsAzure extends Zend_Cloud_DocumentService_Adapter_AbstractAdapter { /* @@ -50,20 +50,20 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzure const ROW_KEY = 'RowKey'; const VERIFY_ETAG = "verify_etag"; const TIMESTAMP_KEY = "Timestamp"; - + const DEFAULT_HOST = Zend_Service_WindowsAzure_Storage::URL_CLOUD_TABLE; const DEFAULT_QUERY_CLASS = 'Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query'; /** * Azure service instance. - * + * * @var Zend_Service_WindowsAzure_Storage_Table */ protected $_storageClient; /** * Class to utilize for new query objects - * + * * @var string */ protected $_queryClass = 'Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query'; @@ -76,11 +76,11 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzure /** * Constructor - * - * @param array $options + * + * @param array $options * @return void */ - public function __construct($options = array()) + public function __construct($options = array()) { if ($options instanceof Zend_Config) { $options = $options->toArray(); @@ -142,8 +142,8 @@ public function __construct($options = array()) /** * Set the default partition key - * - * @param string $key + * + * @param string $key * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure */ public function setDefaultPartitionKey($key) @@ -155,7 +155,7 @@ public function setDefaultPartitionKey($key) /** * Retrieve default partition key - * + * * @return null|string */ public function getDefaultPartitionKey() @@ -170,7 +170,7 @@ public function getDefaultPartitionKey() * @param array $options * @return boolean */ - public function createCollection($name, $options = null) + public function createCollection($name, $options = null) { if (!preg_match('/^[A-Za-z][A-Za-z0-9]{2,}$/', $name)) { throw new Zend_Cloud_DocumentService_Exception('Invalid collection name; Windows Azure collection names must consist of alphanumeric characters only, and be at least 3 characters long'); @@ -192,7 +192,7 @@ public function createCollection($name, $options = null) * @param array $options * @return boolean */ - public function deleteCollection($name, $options = null) + public function deleteCollection($name, $options = null) { try { $this->_storageClient->deleteTable($name); @@ -210,7 +210,7 @@ public function deleteCollection($name, $options = null) * @param array $options * @return array */ - public function listCollections($options = null) + public function listCollections($options = null) { try { $tables = $this->_storageClient->listTables(); @@ -228,7 +228,7 @@ public function listCollections($options = null) /** * Create suitable document from array of fields - * + * * @param array $document * @param null|string $collectionName Collection to which this document belongs * @return Zend_Cloud_DocumentService_Document @@ -257,12 +257,12 @@ protected function _getDocumentFromArray($document, $collectionName = null) $documentClass = $this->getDocumentClass(); return new $documentClass($document, $key); } - + /** * List all documents in a collection - * - * @param string $collectionName - * @param null|array $options + * + * @param string $collectionName + * @param null|array $options * @return Zend_Cloud_DocumentService_DocumentSet */ public function listDocuments($collectionName, array $options = null) @@ -282,19 +282,19 @@ public function insertDocument($collectionName, $document, $options = null) { if (is_array($document)) { $document = $this->_getDocumentFromArray($document, $collectionName); - } - + } + if (!$document instanceof Zend_Cloud_DocumentService_Document) { throw new Zend_Cloud_DocumentService_Exception('Invalid document supplied'); } - + $key = $this->_validateDocumentId($document->getId(), $collectionName); $document->setId($key); - + $this->_validateCompositeKey($key); $this->_validateFields($document); try { - + $entity = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity($key[0], $key[1]); $entity->setAzureValues($document->getFields(), true); $this->_storageClient->insertEntity($collectionName, $entity); @@ -304,8 +304,8 @@ public function insertDocument($collectionName, $document, $options = null) } /** - * Replace document. - * + * Replace document. + * * The new document replaces the existing document. * * @param Zend_Cloud_DocumentService_Document $document @@ -316,12 +316,12 @@ public function replaceDocument($collectionName, $document, $options = null) { if (is_array($document)) { $document = $this->_getDocumentFromArray($document, $collectionName); - } - + } + if (!$document instanceof Zend_Cloud_DocumentService_Document) { throw new Zend_Cloud_DocumentService_Exception('Invalid document supplied'); } - + $key = $this->_validateDocumentId($document->getId(), $collectionName); $this->_validateFields($document); try { @@ -330,7 +330,7 @@ public function replaceDocument($collectionName, $document, $options = null) if (isset($options[self::VERIFY_ETAG])) { $entity->setEtag($options[self::VERIFY_ETAG]); } - + $this->_storageClient->updateEntity($collectionName, $entity, isset($options[self::VERIFY_ETAG])); } catch(Zend_Service_WindowsAzure_Exception $e) { throw new Zend_Cloud_DocumentService_Exception('Error on document replace: '.$e->getMessage(), $e->getCode(), $e); @@ -338,8 +338,8 @@ public function replaceDocument($collectionName, $document, $options = null) } /** - * Update document. - * + * Update document. + * * The new document is merged the existing document. * * @param string $collectionName @@ -375,13 +375,13 @@ public function updateDocument($collectionName, $documentId, $fieldset = null, $ if (isset($options[self::VERIFY_ETAG])) { $entity->setEtag($options[self::VERIFY_ETAG]); } - + $this->_storageClient->mergeEntity($collectionName, $entity, isset($options[self::VERIFY_ETAG])); } catch(Zend_Service_WindowsAzure_Exception $e) { throw new Zend_Cloud_DocumentService_Exception('Error on document update: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Delete document. * @@ -412,7 +412,7 @@ public function deleteDocument($collectionName, $documentId, $options = null) /** * Fetch single document by ID - * + * * @param string $collectionName Collection name * @param mixed $documentId Document ID, adapter-dependent * @param array $options @@ -432,7 +432,7 @@ public function fetchDocument($collectionName, $documentId, $options = null) throw new Zend_Cloud_DocumentService_Exception('Error on document fetch: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Query for documents stored in the document service. If a string is passed in * $query, the query string will be passed directly to the service. @@ -466,7 +466,7 @@ public function query($collectionName, $query, $options = null) $setClass = $this->getDocumentSetClass(); return new $setClass($resultSet); } - + /** * Create query statement * @@ -487,9 +487,9 @@ public function select($fields = null) } $query->select($fields); - return $query; + return $query; } - + /** * Get the concrete service client * @@ -499,11 +499,11 @@ public function getClient() { return $this->_storageClient; } - + /** * Resolve table values to attributes - * - * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity + * + * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity * @return array */ protected function _resolveAttributes(Zend_Service_WindowsAzure_Storage_TableEntity $entity) @@ -514,12 +514,12 @@ protected function _resolveAttributes(Zend_Service_WindowsAzure_Storage_TableEnt } return $result; } - + /** * Validate a partition or row key - * - * @param string $key + * + * @param string $key * @return void * @throws Zend_Cloud_DocumentService_Exception */ @@ -532,8 +532,8 @@ protected function _validateKey($key) /** * Validate a composite key - * - * @param array $key + * + * @param array $key * @return throws Zend_Cloud_DocumentService_Exception */ protected function _validateCompositeKey(array $key) @@ -549,15 +549,15 @@ protected function _validateCompositeKey(array $key) /** * Validate a document identifier * - * If the identifier is an array containing a valid partition and row key, + * If the identifier is an array containing a valid partition and row key, * returns it. If the identifier is a string: - * - if a default partition key is present, it creates an identifier using + * - if a default partition key is present, it creates an identifier using * that and the provided document ID * - if a collection name is provided, it will use that for the partition key * - otherwise, it's invalid - * - * @param array|string $documentId - * @param null|string $collectionName + * + * @param array|string $documentId + * @param null|string $collectionName * @return array * @throws Zend_Cloud_DocumentService_Exception */ @@ -585,7 +585,7 @@ protected function _validateDocumentId($documentId, $collectionName = false) /** * Validate a document's fields for well-formedness * - * Since Azure uses Atom, and fieldnames are included as part of XML + * Since Azure uses Atom, and fieldnames are included as part of XML * element tag names, the field names must be valid XML names. * * @param Zend_Cloud_DocumentService_Document|array $document @@ -608,10 +608,10 @@ public function _validateFields($document) /** * Validate an individual field name for well-formedness * - * Since Azure uses Atom, and fieldnames are included as part of XML + * Since Azure uses Atom, and fieldnames are included as part of XML * element tag names, the field names must be valid XML names. * - * While we could potentially normalize names, this could also lead to + * While we could potentially normalize names, this could also lead to * conflict with other field names -- which we should avoid. As such, * invalid field names will raise an exception. * diff --git a/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php b/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php index 648fed85c..ec5110bd4 100644 --- a/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php +++ b/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,14 +23,14 @@ #require_once 'Zend/Cloud/DocumentService/QueryAdapter.php'; /** - * Class implementing Query adapter for working with Azure queries in a + * Class implementing Query adapter for working with Azure queries in a * structured way - * + * * @todo Look into preventing a query injection attack. * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query @@ -38,18 +38,18 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query { /** * Azure concrete query - * + * * @var Zend_Service_WindowsAzure_Storage_TableEntityQuery */ protected $_azureSelect; - + /** * Constructor - * + * * @param null|Zend_Service_WindowsAzure_Storage_TableEntityQuery $select Table select object * @return void */ - public function __construct($select = null) + public function __construct($select = null) { if (!$select instanceof Zend_Service_WindowsAzure_Storage_TableEntityQuery) { #require_once 'Zend/Service/WindowsAzure/Storage/TableEntityQuery.php'; @@ -60,9 +60,9 @@ public function __construct($select = null) /** * SELECT clause (fields to be selected) - * + * * Does nothing for Azure. - * + * * @param string $select * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query */ @@ -70,10 +70,10 @@ public function select($select) { return $this; } - + /** * FROM clause (table name) - * + * * @param string $from * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query */ @@ -82,10 +82,10 @@ public function from($from) $this->_azureSelect->from($from); return $this; } - + /** * WHERE clause (conditions to be used) - * + * * @param string $where * @param mixed $value Value or array of values to be inserted instead of ? * @param string $op Operation to use to join where clauses (AND/OR) @@ -100,13 +100,13 @@ public function where($where, $value = null, $op = 'and') $this->_azureSelect->where($where, $value, $op); return $this; } - + /** * WHERE clause for item ID - * + * * This one should be used when fetching specific rows since some adapters * have special syntax for primary keys - * + * * @param array $value Row ID for the document (PartitionKey, RowKey) * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query */ @@ -119,10 +119,10 @@ public function whereId($value) $this->_azureSelect->wherePartitionKey($value[0])->whereRowKey($value[1]); return $this; } - + /** * LIMIT clause (how many rows to return) - * + * * @param int $limit * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query */ @@ -134,7 +134,7 @@ public function limit($limit) /** * ORDER BY clause (sorting) - * + * * @todo Azure service doesn't seem to support this yet; emulate? * @param string $sort Column to sort by * @param string $direction Direction - asc/desc @@ -146,10 +146,10 @@ public function order($sort, $direction = 'asc') #require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('No support for sorting for Azure yet'); } - + /** * Get Azure select query - * + * * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery */ public function getAzureSelect() @@ -161,7 +161,7 @@ public function getAzureSelect() * Assemble query * * Simply return the WindowsAzure table entity query object - * + * * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery */ public function assemble() diff --git a/lib/Zend/Cloud/DocumentService/Document.php b/lib/Zend/Cloud/DocumentService/Document.php index b23f2cef6..97e938e14 100644 --- a/lib/Zend/Cloud/DocumentService/Document.php +++ b/lib/Zend/Cloud/DocumentService/Document.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,10 +26,10 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cloud_DocumentService_Document +class Zend_Cloud_DocumentService_Document implements ArrayAccess, IteratorAggregate, Countable { /** key in document denoting identifier */ @@ -75,8 +75,8 @@ public function __construct($fields, $id = null) /** * Set document identifier - * - * @param mixed $id + * + * @param mixed $id * @return Zend_Cloud_DocumentService_Document */ public function setId($id) @@ -90,7 +90,7 @@ public function setId($id) * * @return string */ - public function getId() + public function getId() { return $this->_id; } @@ -100,7 +100,7 @@ public function getId() * * @return array */ - public function getFields() + public function getFields() { return $this->_fields; } @@ -118,7 +118,7 @@ public function getField($name) } return null; } - + /** * Set field by name. * @@ -126,16 +126,16 @@ public function getField($name) * @param mixed $value * @return Zend_Cloud_DocumentService_Document */ - public function setField($name, $value) + public function setField($name, $value) { $this->_fields[$name] = $value; return $this; } - + /** * Overloading: get value - * - * @param string $name + * + * @param string $name * @return mixed */ public function __get($name) @@ -145,54 +145,54 @@ public function __get($name) /** * Overloading: set field - * - * @param string $name - * @param mixed $value + * + * @param string $name + * @param mixed $value * @return void */ public function __set($name, $value) { $this->setField($name, $value); } - + /** * ArrayAccess: does field exist? - * - * @param string $name + * + * @param string $name * @return bool */ public function offsetExists($name) { return isset($this->_fields[$name]); } - + /** * ArrayAccess: get field by name - * - * @param string $name + * + * @param string $name * @return mixed */ public function offsetGet($name) { return $this->getField($name); } - + /** * ArrayAccess: set field to value - * - * @param string $name - * @param mixed $value + * + * @param string $name + * @param mixed $value * @return void */ public function offsetSet($name, $value) { $this->setField($name, $value); } - + /** * ArrayAccess: remove field from document - * - * @param string $name + * + * @param string $name * @return void */ public function offsetUnset($name) @@ -201,12 +201,12 @@ public function offsetUnset($name) unset($this->_fields[$name]); } } - + /** * Overloading: retrieve and set fields by name - * - * @param string $name - * @param mixed $args + * + * @param string $name + * @param mixed $args * @return mixed */ public function __call($name, $args) @@ -228,7 +228,7 @@ public function __call($name, $args) /** * Countable: return count of fields in document - * + * * @return int */ public function count() @@ -238,7 +238,7 @@ public function count() /** * IteratorAggregate: return iterator for iterating over fields - * + * * @return Iterator */ public function getIterator() diff --git a/lib/Zend/Cloud/DocumentService/DocumentSet.php b/lib/Zend/Cloud/DocumentService/DocumentSet.php index 156b2dd3b..f259403ae 100644 --- a/lib/Zend/Cloud/DocumentService/DocumentSet.php +++ b/lib/Zend/Cloud/DocumentService/DocumentSet.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_DocumentService_DocumentSet implements Countable, IteratorAggregate @@ -48,7 +48,7 @@ public function __construct(array $documents) /** * Countable: number of documents in set - * + * * @return int */ public function count() @@ -58,7 +58,7 @@ public function count() /** * IteratorAggregate: retrieve iterator - * + * * @return Traversable */ public function getIterator() diff --git a/lib/Zend/Cloud/DocumentService/Exception.php b/lib/Zend/Cloud/DocumentService/Exception.php index 37a873b54..a83a79878 100644 --- a/lib/Zend/Cloud/DocumentService/Exception.php +++ b/lib/Zend/Cloud/DocumentService/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_DocumentService_Exception extends Zend_Cloud_Exception diff --git a/lib/Zend/Cloud/DocumentService/Factory.php b/lib/Zend/Cloud/DocumentService/Factory.php index f5887cdd8..eda5c8bd1 100644 --- a/lib/Zend/Cloud/DocumentService/Factory.php +++ b/lib/Zend/Cloud/DocumentService/Factory.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,13 +23,13 @@ /** * Class implementing working with Azure queries in a structured way - * + * * TODO Look into preventing a query injection attack. * * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_DocumentService_Factory extends Zend_Cloud_AbstractFactory @@ -43,21 +43,21 @@ class Zend_Cloud_DocumentService_Factory extends Zend_Cloud_AbstractFactory /** * Constructor - * + * * @return void */ private function __construct() { // private ctor - should not be used } - + /** * Retrieve an adapter instance - * - * @param array $options + * + * @param array $options * @return void */ - public static function getAdapter($options = array()) + public static function getAdapter($options = array()) { $adapter = parent::_getAdapter(self::DOCUMENT_ADAPTER_KEY, $options); if (!$adapter) { diff --git a/lib/Zend/Cloud/DocumentService/Query.php b/lib/Zend/Cloud/DocumentService/Query.php index 8f2724bb3..feaa66397 100644 --- a/lib/Zend/Cloud/DocumentService/Query.php +++ b/lib/Zend/Cloud/DocumentService/Query.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -22,13 +22,13 @@ /** * Generic query object * - * Aggregates operations in an array of clauses, where the first element + * Aggregates operations in an array of clauses, where the first element * describes the clause type, and the next element describes the criteria. * * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_DocumentService_Query @@ -46,24 +46,24 @@ class Zend_Cloud_DocumentService_Query /** * Clause list - * + * * @var array */ protected $_clauses = array(); /** * Generic clause - * + * * You can use any clause by doing $query->foo('bar') * but concrete adapters should be able to recognise it - * - * The call will be iterpreted as clause 'foo' with argument 'bar' - * + * + * The call will be iterpreted as clause 'foo' with argument 'bar' + * * @param string $name Clause/method name * @param mixed $args * @return Zend_Cloud_DocumentService_Query */ - public function __call($name, $args) + public function __call($name, $args) { $this->_clauses[] = array(strtolower($name), $args); return $this; @@ -71,8 +71,8 @@ public function __call($name, $args) /** * SELECT clause (fields to be selected) - * - * @param null|string|array $select + * + * @param null|string|array $select * @return Zend_Cloud_DocumentService_Query */ public function select($select) @@ -81,32 +81,32 @@ public function select($select) return $this; } if (!is_string($select) && !is_array($select)) { - #require_once 'Zend/Cloud/DocumentService/Exception.php'; + #require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception("SELECT argument must be a string or an array of strings"); } $this->_clauses[] = array(self::QUERY_SELECT, $select); return $this; } - + /** * FROM clause - * - * @param string $name Field names + * + * @param string $name Field names * @return Zend_Cloud_DocumentService_Query */ public function from($name) { if(!is_string($name)) { - #require_once 'Zend/Cloud/DocumentService/Exception.php'; + #require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception("FROM argument must be a string"); } $this->_clauses[] = array(self::QUERY_FROM, $name); return $this; } - + /** * WHERE query - * + * * @param string $cond Condition * @param array $args Arguments to substitute instead of ?'s in condition * @param string $op relation to other clauses - and/or @@ -115,7 +115,7 @@ public function from($name) public function where($cond, $value = null, $op = 'and') { if (!is_string($cond)) { - #require_once 'Zend/Cloud/DocumentService/Exception.php'; + #require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception("WHERE argument must be a string"); } $this->_clauses[] = array(self::QUERY_WHERE, array($cond, $value, $op)); @@ -124,14 +124,14 @@ public function where($cond, $value = null, $op = 'and') /** * Select record or fields by ID - * + * * @param string|int $value Identifier to select by * @return Zend_Cloud_DocumentService_Query */ public function whereId($value) { if (!is_scalar($value)) { - #require_once 'Zend/Cloud/DocumentService/Exception.php'; + #require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception("WHEREID argument must be a scalar"); } $this->_clauses[] = array(self::QUERY_WHEREID, $value); @@ -140,14 +140,14 @@ public function whereId($value) /** * LIMIT clause (how many items to return) - * - * @param int $limit + * + * @param int $limit * @return Zend_Cloud_DocumentService_Query */ public function limit($limit) { if ($limit != (int) $limit) { - #require_once 'Zend/Cloud/DocumentService/Exception.php'; + #require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception("LIMIT argument must be an integer"); } $this->_clauses[] = array(self::QUERY_LIMIT, $limit); @@ -156,9 +156,9 @@ public function limit($limit) /** * ORDER clause; field or fields to sort by, and direction to sort - * - * @param string|int|array $sort - * @param string $direction + * + * @param string|int|array $sort + * @param string $direction * @return Zend_Cloud_DocumentService_Query */ public function order($sort, $direction = 'asc') @@ -171,21 +171,21 @@ public function order($sort, $direction = 'asc') * "Assemble" the query * * Simply returns the clauses present. - * + * * @return array */ public function assemble() { return $this->getClauses(); } - + /** * Return query clauses as an array - * + * * @return array Clauses in the query */ public function getClauses() { - return $this->_clauses; + return $this->_clauses; } } diff --git a/lib/Zend/Cloud/DocumentService/QueryAdapter.php b/lib/Zend/Cloud/DocumentService/QueryAdapter.php index cfb1c4fb0..7baab9072 100644 --- a/lib/Zend/Cloud/DocumentService/QueryAdapter.php +++ b/lib/Zend/Cloud/DocumentService/QueryAdapter.php @@ -13,13 +13,13 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ /** * This interface describes the API that concrete query adapter should implement - * + * * Common interface for document storage services in the cloud. This interface * supports most document services and provides some flexibility for * vendor-specific features and requirements via an optional $options array in @@ -34,14 +34,14 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Cloud_DocumentService_QueryAdapter { /** * SELECT clause (fields to be selected) - * + * * @param string $select * @return Zend_Cloud_DocumentService_QueryAdapter */ @@ -49,7 +49,7 @@ public function select($select); /** * FROM clause (table name) - * + * * @param string $from * @return Zend_Cloud_DocumentService_QueryAdapter */ @@ -57,7 +57,7 @@ public function from($from); /** * WHERE clause (conditions to be used) - * + * * @param string $where * @param mixed $value Value or array of values to be inserted instead of ? * @param string $op Operation to use to join where clauses (AND/OR) @@ -67,10 +67,10 @@ public function where($where, $value = null, $op = 'and'); /** * WHERE clause for item ID - * + * * This one should be used when fetching specific rows since some adapters * have special syntax for primary keys - * + * * @param mixed $value Row ID for the document * @return Zend_Cloud_DocumentService_QueryAdapter */ @@ -78,7 +78,7 @@ public function whereId($value); /** * LIMIT clause (how many rows ot return) - * + * * @param int $limit * @return Zend_Cloud_DocumentService_QueryAdapter */ @@ -86,7 +86,7 @@ public function limit($limit); /** * ORDER BY clause (sorting) - * + * * @param string $sort Column to sort by * @param string $direction Direction - asc/desc * @return Zend_Cloud_DocumentService_QueryAdapter @@ -95,7 +95,7 @@ public function order($sort, $direction = 'asc'); /** * Assemble the query into a format the adapter can utilize - * + * * @return mixed */ public function assemble(); diff --git a/lib/Zend/Cloud/Exception.php b/lib/Zend/Cloud/Exception.php index 9146ea16f..4855a916e 100644 --- a/lib/Zend/Cloud/Exception.php +++ b/lib/Zend/Cloud/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,19 +28,19 @@ /** * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_Exception extends Zend_Exception -{ +{ /** * Exception for the underlying adapter - * + * * @var Exception */ protected $_clientException; - - public function __construct($message, $code = 0, $clientException = null) + + public function __construct($message, $code = 0, $clientException = null) { $this->_clientException = $clientException; parent::__construct($message, $code, $clientException); diff --git a/lib/Zend/Cloud/Infrastructure/Adapter.php b/lib/Zend/Cloud/Infrastructure/Adapter.php deleted file mode 100644 index b23c7184f..000000000 --- a/lib/Zend/Cloud/Infrastructure/Adapter.php +++ /dev/null @@ -1,167 +0,0 @@ -adapterResult; - } - - /** - * Wait for status $status with a timeout of $timeout seconds - * - * @param string $id - * @param string $status - * @param integer $timeout - * @return boolean - */ - public function waitStatusInstance($id, $status, $timeout = self::TIMEOUT_STATUS_CHANGE) - { - if (empty($id) || empty($status)) { - return false; - } - - $num = 0; - while (($num<$timeout) && ($this->statusInstance($id) != $status)) { - sleep(self::TIME_STEP_STATUS_CHANGE); - $num += self::TIME_STEP_STATUS_CHANGE; - } - return ($num < $timeout); - } - - /** - * Run arbitrary shell script on an instance - * - * @param string $id - * @param array $param - * @param string|array $cmd - * @return string|array - */ - public function deployInstance($id, $params, $cmd) - { - if (!function_exists("ssh2_connect")) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('Deployment requires the PHP "SSH" extension (ext/ssh2)'); - } - - if (empty($id)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('You must specify the instance where to deploy'); - } - - if (empty($cmd)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('You must specify the shell commands to run on the instance'); - } - - if (empty($params) - || empty($params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME]) - || (empty($params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD]) - && empty($params[Zend_Cloud_Infrastructure_Instance::SSH_KEY])) - ) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('You must specify the params for the SSH connection'); - } - - $host = $this->publicDnsInstance($id); - if (empty($host)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception(sprintf( - 'The instance identified by "%s" does not exist', - $id - )); - } - - $conn = ssh2_connect($host); - if (!ssh2_auth_password($conn, $params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME], - $params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD])) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('SSH authentication failed'); - } - - if (is_array($cmd)) { - $result = array(); - foreach ($cmd as $command) { - $stream = ssh2_exec($conn, $command); - $errorStream = ssh2_fetch_stream($stream, SSH2_STREAM_STDERR); - - stream_set_blocking($errorStream, true); - stream_set_blocking($stream, true); - - $output = stream_get_contents($stream); - $error = stream_get_contents($errorStream); - - if (empty($error)) { - $result[$command] = $output; - } else { - $result[$command] = $error; - } - } - } else { - $stream = ssh2_exec($conn, $cmd); - $result = stream_set_blocking($stream, true); - $errorStream = ssh2_fetch_stream($stream, SSH2_STREAM_STDERR); - - stream_set_blocking($errorStream, true); - stream_set_blocking($stream, true); - - $output = stream_get_contents($stream); - $error = stream_get_contents($errorStream); - - if (empty($error)) { - $result = $output; - } else { - $result = $error; - } - } - return $result; - } -} diff --git a/lib/Zend/Cloud/Infrastructure/Adapter/Ec2.php b/lib/Zend/Cloud/Infrastructure/Adapter/Ec2.php deleted file mode 100644 index 085e7ce4e..000000000 --- a/lib/Zend/Cloud/Infrastructure/Adapter/Ec2.php +++ /dev/null @@ -1,496 +0,0 @@ - Zend_Cloud_Infrastructure_Instance::STATUS_RUNNING, - 'terminated' => Zend_Cloud_Infrastructure_Instance::STATUS_TERMINATED, - 'pending' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, - 'shutting-down' => Zend_Cloud_Infrastructure_Instance::STATUS_SHUTTING_DOWN, - 'stopping' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, - 'stopped' => Zend_Cloud_Infrastructure_Instance::STATUS_STOPPED, - 'rebooting' => Zend_Cloud_Infrastructure_Instance::STATUS_REBOOTING, - ); - - /** - * Map monitor metrics between Infrastructure and EC2 - * - * @var array - */ - protected $mapMetrics= array ( - Zend_Cloud_Infrastructure_Instance::MONITOR_CPU => 'CPUUtilization', - Zend_Cloud_Infrastructure_Instance::MONITOR_DISK_READ => 'DiskReadBytes', - Zend_Cloud_Infrastructure_Instance::MONITOR_DISK_WRITE => 'DiskWriteBytes', - Zend_Cloud_Infrastructure_Instance::MONITOR_NETWORK_IN => 'NetworkIn', - Zend_Cloud_Infrastructure_Instance::MONITOR_NETWORK_OUT => 'NetworkOut', - ); - - /** - * Constructor - * - * @param array|Zend_Config $options - * @return void - */ - public function __construct($options = array()) - { - if (is_object($options)) { - if (method_exists($options, 'toArray')) { - $options= $options->toArray(); - } elseif ($options instanceof Traversable) { - $options = iterator_to_array($options); - } - } - - if (empty($options) || !is_array($options)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('Invalid options provided'); - } - - if (!isset($options[self::AWS_ACCESS_KEY]) - || !isset($options[self::AWS_SECRET_KEY]) - ) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('AWS keys not specified!'); - } - - $this->accessKey = $options[self::AWS_ACCESS_KEY]; - $this->accessSecret = $options[self::AWS_SECRET_KEY]; - $this->region = ''; - - if (isset($options[self::AWS_REGION])) { - $this->region= $options[self::AWS_REGION]; - } - - try { - $this->ec2 = new Zend_Service_Amazon_Ec2_Instance($options[self::AWS_ACCESS_KEY], $options[self::AWS_SECRET_KEY], $this->region); - } catch (Exception $e) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('Error on create: ' . $e->getMessage(), $e->getCode(), $e); - } - - if (isset($options[self::HTTP_ADAPTER])) { - $this->ec2->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); - } - } - - /** - * Convert the attributes of EC2 into attributes of Infrastructure - * - * @param array $attr - * @return array|boolean - */ - private function convertAttributes($attr) - { - $result = array(); - if (!empty($attr) && is_array($attr)) { - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_ID] = $attr['instanceId']; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STATUS] = $this->mapStatus[$attr['instanceState']['name']]; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_IMAGEID] = $attr['imageId']; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_ZONE] = $attr['availabilityZone']; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_LAUNCHTIME] = $attr['launchTime']; - - switch ($attr['instanceType']) { - case Zend_Service_Amazon_Ec2_Instance::MICRO: - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_CPU] = '1 virtual core'; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = '613MB'; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = '0GB'; - break; - case Zend_Service_Amazon_Ec2_Instance::SMALL: - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_CPU] = '1 virtual core'; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = '1.7GB'; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = '160GB'; - break; - case Zend_Service_Amazon_Ec2_Instance::LARGE: - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_CPU] = '2 virtual core'; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = '7.5GB'; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = '850GB'; - break; - case Zend_Service_Amazon_Ec2_Instance::XLARGE: - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_CPU] = '4 virtual core'; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = '15GB'; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = '1690GB'; - break; - case Zend_Service_Amazon_Ec2_Instance::HCPU_MEDIUM: - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_CPU] = '2 virtual core'; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = '1.7GB'; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = '350GB'; - break; - case Zend_Service_Amazon_Ec2_Instance::HCPU_XLARGE: - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_CPU] = '8 virtual core'; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = '7GB'; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = '1690GB'; - break; - } - } - return $result; - } - - /** - * Return a list of the available instancies - * - * @return Zend_Cloud_Infrastructure_InstanceList - */ - public function listInstances() - { - $this->adapterResult = $this->ec2->describe(); - - $result = array(); - foreach ($this->adapterResult['instances'] as $instance) { - $result[]= $this->convertAttributes($instance); - } - return new Zend_Cloud_Infrastructure_InstanceList($this, $result); - } - - /** - * Return the status of an instance - * - * @param string - * @return string|boolean - */ - public function statusInstance($id) - { - $this->adapterResult = $this->ec2->describe($id); - if (empty($this->adapterResult['instances'])) { - return false; - } - $result = $this->adapterResult['instances'][0]; - return $this->mapStatus[$result['instanceState']['name']]; - } - - /** - * Return the public DNS name of the instance - * - * @param string $id - * @return string|boolean - */ - public function publicDnsInstance($id) - { - $this->adapterResult = $this->ec2->describe($id); - if (empty($this->adapterResult['instances'])) { - return false; - } - $result = $this->adapterResult['instances'][0]; - return $result['dnsName']; - } - - /** - * Reboot an instance - * - * @param string $id - * @return boolean - */ - public function rebootInstance($id) - { - $this->adapterResult= $this->ec2->reboot($id); - return $this->adapterResult; - } - - /** - * Create a new instance - * - * @param string $name - * @param array $options - * @return Instance|boolean - */ - public function createInstance($name, $options) - { - // @todo instance's name management? - $this->adapterResult = $this->ec2->run($options); - if (empty($this->adapterResult['instances'])) { - return false; - } - $this->error= false; - return new Zend_Cloud_Infrastructure_Instance($this, $this->convertAttributes($this->adapterResult['instances'][0])); - } - - /** - * Stop an instance - * - * @param string $id - * @return boolean - */ - public function stopInstance($id) - { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('The stopInstance method is not implemented in the adapter'); - } - - /** - * Start an instance - * - * @param string $id - * @return boolean - */ - public function startInstance($id) - { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('The startInstance method is not implemented in the adapter'); - } - - /** - * Destroy an instance - * - * @param string $id - * @return boolean - */ - public function destroyInstance($id) - { - $this->adapterResult = $this->ec2->terminate($id); - return (!empty($this->adapterResult)); - } - - /** - * Return a list of all the available instance images - * - * @return ImageList - */ - public function imagesInstance() - { - if (!isset($this->ec2Image)) { - $this->ec2Image = new Zend_Service_Amazon_Ec2_Image($this->accessKey, $this->accessSecret, $this->region); - } - - $this->adapterResult = $this->ec2Image->describe(); - - $images = array(); - - foreach ($this->adapterResult as $result) { - switch (strtolower($result['platform'])) { - case 'windows' : - $platform = Zend_Cloud_Infrastructure_Image::IMAGE_WINDOWS; - break; - default: - $platform = Zend_Cloud_Infrastructure_Image::IMAGE_LINUX; - break; - } - - $images[]= array ( - Zend_Cloud_Infrastructure_Image::IMAGE_ID => $result['imageId'], - Zend_Cloud_Infrastructure_Image::IMAGE_NAME => '', - Zend_Cloud_Infrastructure_Image::IMAGE_DESCRIPTION => $result['imageLocation'], - Zend_Cloud_Infrastructure_Image::IMAGE_OWNERID => $result['imageOwnerId'], - Zend_Cloud_Infrastructure_Image::IMAGE_ARCHITECTURE => $result['architecture'], - Zend_Cloud_Infrastructure_Image::IMAGE_PLATFORM => $platform, - ); - } - return new Zend_Cloud_Infrastructure_ImageList($images,$this->ec2Image); - } - - /** - * Return all the available zones - * - * @return array - */ - public function zonesInstance() - { - if (!isset($this->ec2Zone)) { - $this->ec2Zone = new Zend_Service_Amazon_Ec2_AvailabilityZones($this->accessKey,$this->accessSecret,$this->region); - } - $this->adapterResult = $this->ec2Zone->describe(); - - $zones = array(); - foreach ($this->adapterResult as $zone) { - if (strtolower($zone['zoneState']) === 'available') { - $zones[] = array ( - Zend_Cloud_Infrastructure_Instance::INSTANCE_ZONE => $zone['zoneName'], - ); - } - } - return $zones; - } - - /** - * Return the system information about the $metric of an instance - * - * @param string $id - * @param string $metric - * @param null|array $options - * @return array - */ - public function monitorInstance($id, $metric, $options = null) - { - if (empty($id) || empty($metric)) { - return false; - } - - if (!in_array($metric,$this->validMetrics)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception(sprintf( - 'The metric "%s" is not valid', - $metric - )); - } - - if (!empty($options) && !is_array($options)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('The options must be an array'); - } - - if (!empty($options) - && (empty($options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME]) - || empty($options[Zend_Cloud_Infrastructure_Instance::MONITOR_END_TIME])) - ) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception(sprintf( - 'The options array must contain: "%s" and "%s"', - $options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME], - $options[Zend_Cloud_Infrastructure_Instance::MONITOR_END_TIME] - )); - } - - if (!isset($this->ec2Monitor)) { - $this->ec2Monitor = new Zend_Service_Amazon_Ec2_CloudWatch($this->accessKey, $this->accessSecret, $this->region); - } - - $param = array( - 'MeasureName' => $this->mapMetrics[$metric], - 'Statistics' => array('Average'), - 'Dimensions' => array('InstanceId' => $id), - ); - - if (!empty($options)) { - $param['StartTime'] = $options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME]; - $param['EndTime'] = $options[Zend_Cloud_Infrastructure_Instance::MONITOR_END_TIME]; - } - - $this->adapterResult = $this->ec2Monitor->getMetricStatistics($param); - - $monitor = array(); - $num = 0; - $average = 0; - - if (!empty($this->adapterResult['datapoints'])) { - foreach ($this->adapterResult['datapoints'] as $result) { - $monitor['series'][] = array ( - 'timestamp' => $result['Timestamp'], - 'value' => $result['Average'], - ); - $average += $result['Average']; - $num++; - } - } - - if ($num > 0) { - $monitor['average'] = $average / $num; - } - - return $monitor; - } - - /** - * Get the adapter - * - * @return Zend_Service_Amazon_Ec2_Instance - */ - public function getAdapter() - { - return $this->ec2; - } - - /** - * Get last HTTP request - * - * @return string - */ - public function getLastHttpRequest() - { - return $this->ec2->getHttpClient()->getLastRequest(); - } - - /** - * Get the last HTTP response - * - * @return Zend_Http_Response - */ - public function getLastHttpResponse() - { - return $this->ec2->getHttpClient()->getLastResponse(); - } -} diff --git a/lib/Zend/Cloud/Infrastructure/Adapter/Rackspace.php b/lib/Zend/Cloud/Infrastructure/Adapter/Rackspace.php deleted file mode 100644 index 0e11f0f4b..000000000 --- a/lib/Zend/Cloud/Infrastructure/Adapter/Rackspace.php +++ /dev/null @@ -1,483 +0,0 @@ - Zend_Cloud_Infrastructure_Instance::STATUS_RUNNING, - 'SUSPENDED' => Zend_Cloud_Infrastructure_Instance::STATUS_STOPPED, - 'BUILD' => Zend_Cloud_Infrastructure_Instance::STATUS_REBUILD, - 'REBUILD' => Zend_Cloud_Infrastructure_Instance::STATUS_REBUILD, - 'QUEUE_RESIZE' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, - 'PREP_RESIZE' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, - 'RESIZE' => Zend_Cloud_Infrastructure_Instance::STATUS_REBUILD, - 'VERIFY_RESIZE' => Zend_Cloud_Infrastructure_Instance::STATUS_REBUILD, - 'PASSWORD' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, - 'RESCUE' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, - 'REBOOT' => Zend_Cloud_Infrastructure_Instance::STATUS_REBOOTING, - 'HARD_REBOOT' => Zend_Cloud_Infrastructure_Instance::STATUS_REBOOTING, - 'SHARE_IP' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, - 'SHARE_IP_NO_CONFIG' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, - 'DELETE_IP' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, - 'UNKNOWN' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING - ); - /** - * Constructor - * - * @param array|Zend_Config $options - * @return void - */ - public function __construct($options = array()) - { - if (is_object($options)) { - if (method_exists($options, 'toArray')) { - $options= $options->toArray(); - } elseif ($options instanceof Traversable) { - $options = iterator_to_array($options); - } - } - - if (empty($options) || !is_array($options)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('Invalid options provided'); - } - - if (!isset($options[self::RACKSPACE_USER])) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('Rackspace access user not specified!'); - } - - if (!isset($options[self::RACKSPACE_KEY])) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('Rackspace access key not specified!'); - } - - $this->accessUser = $options[self::RACKSPACE_USER]; - $this->accessKey = $options[self::RACKSPACE_KEY]; - - if (isset($options[self::RACKSPACE_REGION])) { - switch ($options[self::RACKSPACE_REGION]) { - case self::RACKSPACE_ZONE_UK: - $this->region= Zend_Service_Rackspace_Servers::UK_AUTH_URL; - break; - case self::RACKSPACE_ZONE_USA: - $this->region = Zend_Service_Rackspace_Servers::US_AUTH_URL; - break; - default: - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('The region is not valid'); - } - } else { - $this->region = Zend_Service_Rackspace_Servers::US_AUTH_URL; - } - - try { - $this->rackspace = new Zend_Service_Rackspace_Servers($this->accessUser,$this->accessKey, $this->region); - } catch (Exception $e) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('Error on create: ' . $e->getMessage(), $e->getCode(), $e); - } - - if (isset($options[self::HTTP_ADAPTER])) { - $this->rackspace->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); - } - - } - /** - * Convert the attributes of Rackspace server into attributes of Infrastructure - * - * @param array $attr - * @return array|boolean - */ - protected function convertAttributes($attr) - { - $result = array(); - if (!empty($attr) && is_array($attr)) { - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_ID] = $attr['id']; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_NAME] = $attr['name']; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STATUS] = $this->mapStatus[$attr['status']]; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_IMAGEID] = $attr['imageId']; - if ($this->region==Zend_Service_Rackspace_Servers::US_AUTH_URL) { - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_ZONE] = self::RACKSPACE_ZONE_USA; - } else { - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_ZONE] = self::RACKSPACE_ZONE_UK; - } - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = $this->flavors[$attr['flavorId']]['ram']; - $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = $this->flavors[$attr['flavorId']]['disk']; - } - return $result; - } - /** - * Return a list of the available instancies - * - * @return InstanceList|boolean - */ - public function listInstances() - { - $this->adapterResult = $this->rackspace->listServers(true); - if ($this->adapterResult===false) { - return false; - } - $array= $this->adapterResult->toArray(); - $result = array(); - foreach ($array as $instance) { - $result[]= $this->convertAttributes($instance); - } - return new Zend_Cloud_Infrastructure_InstanceList($this, $result); - } - /** - * Return the status of an instance - * - * @param string - * @return string|boolean - */ - public function statusInstance($id) - { - $this->adapterResult = $this->rackspace->getServer($id); - if ($this->adapterResult===false) { - return false; - } - $array= $this->adapterResult->toArray(); - return $this->mapStatus[$array['status']]; - } - /** - * Return the public DNS name/Ip address of the instance - * - * @param string $id - * @return string|boolean - */ - public function publicDnsInstance($id) - { - $this->adapterResult = $this->rackspace->getServerPublicIp($id); - if (empty($this->adapterResult)) { - return false; - } - return $this->adapterResult[0]; - } - /** - * Reboot an instance - * - * @param string $id - * @return boolean - */ - public function rebootInstance($id) - { - return $this->rackspace->rebootServer($id,true); - } - /** - * Create a new instance - * - * @param string $name - * @param array $options - * @return Instance|boolean - */ - public function createInstance($name, $options) - { - if (empty($name)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('You must specify the name of the instance'); - } - if (empty($options) || !is_array($options)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('The options must be an array'); - } - // @todo create an generic abstract definition for an instance? - $metadata= array(); - if (isset($options['metadata'])) { - $metadata= $options['metadata']; - unset($options['metadata']); - } - $files= array(); - if (isset($options['files'])) { - $files= $options['files']; - unset($options['files']); - } - $options['name']= $name; - $this->adapterResult = $this->rackspace->createServer($options,$metadata,$files); - if ($this->adapterResult===false) { - return false; - } - return new Zend_Cloud_Infrastructure_Instance($this, $this->convertAttributes($this->adapterResult->toArray())); - } - /** - * Stop an instance - * - * @param string $id - * @return boolean - */ - public function stopInstance($id) - { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('The stopInstance method is not implemented in the adapter'); - } - - /** - * Start an instance - * - * @param string $id - * @return boolean - */ - public function startInstance($id) - { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('The startInstance method is not implemented in the adapter'); - } - - /** - * Destroy an instance - * - * @param string $id - * @return boolean - */ - public function destroyInstance($id) - { - $this->adapterResult= $this->rackspace->deleteServer($id); - return $this->adapterResult; - } - /** - * Return a list of all the available instance images - * - * @return ImageList|boolean - */ - public function imagesInstance() - { - $this->adapterResult = $this->rackspace->listImages(true); - if ($this->adapterResult===false) { - return false; - } - - $images= $this->adapterResult->toArray(); - $result= array(); - - foreach ($images as $image) { - if (strtolower($image['status'])==='active') { - if (strpos($image['name'],'Windows')!==false) { - $platform = Zend_Cloud_Infrastructure_Image::IMAGE_WINDOWS; - } else { - $platform = Zend_Cloud_Infrastructure_Image::IMAGE_LINUX; - } - if (strpos($image['name'],'x64')!==false) { - $arch = Zend_Cloud_Infrastructure_Image::ARCH_64BIT; - } else { - $arch = Zend_Cloud_Infrastructure_Image::ARCH_32BIT; - } - $result[]= array ( - Zend_Cloud_Infrastructure_Image::IMAGE_ID => $image['id'], - Zend_Cloud_Infrastructure_Image::IMAGE_NAME => $image['name'], - Zend_Cloud_Infrastructure_Image::IMAGE_DESCRIPTION => $image['name'], - Zend_Cloud_Infrastructure_Image::IMAGE_ARCHITECTURE => $arch, - Zend_Cloud_Infrastructure_Image::IMAGE_PLATFORM => $platform, - ); - } - } - return new Zend_Cloud_Infrastructure_ImageList($result,$this->adapterResult); - } - /** - * Return all the available zones - * - * @return array - */ - public function zonesInstance() - { - return array(self::RACKSPACE_ZONE_USA,self::RACKSPACE_ZONE_UK); - } - /** - * Return the system information about the $metric of an instance - * NOTE: it works only for Linux servers - * - * @param string $id - * @param string $metric - * @param null|array $options - * @return array|boolean - */ - public function monitorInstance($id, $metric, $options = null) - { - if (!function_exists("ssh2_connect")) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('Monitor requires the PHP "SSH" extension (ext/ssh2)'); - } - if (empty($id)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('You must specify the id of the instance to monitor'); - } - if (empty($metric)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('You must specify the metric to monitor'); - } - if (!in_array($metric,$this->validMetrics)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception(sprintf('The metric "%s" is not valid', $metric)); - } - if (!empty($options) && !is_array($options)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('The options must be an array'); - } - - switch ($metric) { - case Zend_Cloud_Infrastructure_Instance::MONITOR_CPU: - $cmd= 'top -b -n '.self::MONITOR_CPU_SAMPLES.' | grep \'Cpu\''; - break; - case Zend_Cloud_Infrastructure_Instance::MONITOR_RAM: - $cmd= 'top -b -n 1 | grep \'Mem\''; - break; - case Zend_Cloud_Infrastructure_Instance::MONITOR_DISK: - $cmd= 'df --total | grep total'; - break; - } - if (empty($cmd)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('The metric specified is not supported by the adapter'); - } - - $params= array( - Zend_Cloud_Infrastructure_Instance::SSH_USERNAME => $options['username'], - Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD => $options['password'] - ); - $exec_time= time(); - $result= $this->deployInstance($id,$params,$cmd); - - if (empty($result)) { - return false; - } - - $monitor = array(); - $num = 0; - $average = 0; - - $outputs= explode("\n",$result); - foreach ($outputs as $output) { - if (!empty($output)) { - switch ($metric) { - case Zend_Cloud_Infrastructure_Instance::MONITOR_CPU: - if (preg_match('/(\d+\.\d)%us/', $output,$match)) { - $usage = (float) $match[1]; - } - break; - case Zend_Cloud_Infrastructure_Instance::MONITOR_RAM: - if (preg_match('/(\d+)k total/', $output,$match)) { - $total = (integer) $match[1]; - } - if (preg_match('/(\d+)k used/', $output,$match)) { - $used = (integer) $match[1]; - } - if ($total>0) { - $usage= (float) $used/$total; - } - break; - case Zend_Cloud_Infrastructure_Instance::MONITOR_DISK: - if (preg_match('/(\d+)%/', $output,$match)) { - $usage = (float) $match[1]; - } - break; - } - - $monitor['series'][] = array ( - 'timestamp' => $exec_time, - 'value' => number_format($usage,2).'%' - ); - - $average += $usage; - $exec_time+= 60; // seconds - $num++; - } - } - - if ($num>0) { - $monitor['average'] = number_format($average/$num,2).'%'; - } - return $monitor; - } - /** - * Get the adapter - * - * @return Zend_Service_Rackspace_Servers - */ - public function getAdapter() - { - return $this->rackspace; - } - /** - * Get last HTTP request - * - * @return string - */ - public function getLastHttpRequest() - { - return $this->rackspace->getHttpClient()->getLastRequest(); - } - /** - * Get the last HTTP response - * - * @return Zend_Http_Response - */ - public function getLastHttpResponse() - { - return $this->rackspace->getHttpClient()->getLastResponse(); - } -} diff --git a/lib/Zend/Cloud/Infrastructure/Exception.php b/lib/Zend/Cloud/Infrastructure/Exception.php deleted file mode 100644 index b36723000..000000000 --- a/lib/Zend/Cloud/Infrastructure/Exception.php +++ /dev/null @@ -1,25 +0,0 @@ -toArray(); - } elseif ($data instanceof Traversable) { - $data = iterator_to_array($data); - } - } - - if (empty($data) || !is_array($data)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('You must pass an array of parameters'); - } - - foreach ($this->attributeRequired as $key) { - if (empty($data[$key])) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception(sprintf( - 'The param "%s" is a required parameter for class %s', - $key, - __CLASS__ - )); - } - } - - $this->attributes = $data; - $this->adapter = $adapter; - } - - /** - * Get Attribute with a specific key - * - * @param array $data - * @return misc|boolean - */ - public function getAttribute($key) - { - if (!empty($this->attributes[$key])) { - return $this->attributes[$key]; - } - return false; - } - - /** - * Get all the attributes - * - * @return array - */ - public function getAttributes() - { - return $this->attributes; - } - - /** - * Get the image ID - * - * @return string - */ - public function getId() - { - return $this->attributes[self::IMAGE_ID]; - } - - /** - * Get the Owner ID - * - * @return string - */ - public function getOwnerId() - { - return $this->attributes[self::IMAGE_OWNERID]; - } - - /** - * Get the name - * - * @return string - */ - public function getName() - { - return $this->attributes[self::IMAGE_NAME]; - } - - /** - * Get the description - * - * @return string - */ - public function getDescription() - { - return $this->attributes[self::IMAGE_DESCRIPTION]; - } - - /** - * Get the platform - * - * @return string - */ - public function getPlatform() - { - return $this->attributes[self::IMAGE_PLATFORM]; - } - - /** - * Get the architecture - * - * @return string - */ - public function getArchitecture() - { - return $this->attributes[self::IMAGE_ARCHITECTURE]; - } -} diff --git a/lib/Zend/Cloud/Infrastructure/ImageList.php b/lib/Zend/Cloud/Infrastructure/ImageList.php deleted file mode 100644 index e329a382c..000000000 --- a/lib/Zend/Cloud/Infrastructure/ImageList.php +++ /dev/null @@ -1,218 +0,0 @@ -adapter = $adapter; - $this->constructFromArray($images); - } - - /** - * Transforms the Array to array of Instances - * - * @param array $list - * @return void - */ - protected function constructFromArray(array $list) - { - foreach ($list as $image) { - $this->addImage(new Zend_Cloud_Infrastructure_Image($image, $this->adapter)); - } - } - - /** - * Add an image - * - * @param Image - * @return ImageList - */ - protected function addImage(Zend_Cloud_Infrastructure_Image $image) - { - $this->images[] = $image; - return $this; - } - - /** - * Return number of images - * - * Implement Countable::count() - * - * @return int - */ - public function count() - { - return count($this->images); - } - - /** - * Return the current element - * - * Implement Iterator::current() - * - * @return Image - */ - public function current() - { - return $this->images[$this->iteratorKey]; - } - - /** - * Return the key of the current element - * - * Implement Iterator::key() - * - * @return int - */ - public function key() - { - return $this->iteratorKey; - } - - /** - * Move forward to next element - * - * Implement Iterator::next() - * - * @return void - */ - public function next() - { - $this->iteratorKey++; - } - - /** - * Rewind the Iterator to the first element - * - * Implement Iterator::rewind() - * - * @return void - */ - public function rewind() - { - $this->iteratorKey = 0; - } - - /** - * Check if there is a current element after calls to rewind() or next() - * - * Implement Iterator::valid() - * - * @return bool - */ - public function valid() - { - $numItems = $this->count(); - if ($numItems > 0 && $this->iteratorKey < $numItems) { - return true; - } - return false; - } - - /** - * Whether the offset exists - * - * Implement ArrayAccess::offsetExists() - * - * @param int $offset - * @return bool - */ - public function offsetExists($offset) - { - return ($offset < $this->count()); - } - - /** - * Return value at given offset - * - * Implement ArrayAccess::offsetGet() - * - * @param int $offset - * @throws Zend_Cloud_Infrastructure_Exception - * @return Image - */ - public function offsetGet($offset) - { - if (!$this->offsetExists($offset)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('Illegal index'); - } - return $this->images[$offset]; - } - - /** - * Throws exception because all values are read-only - * - * Implement ArrayAccess::offsetSet() - * - * @param int $offset - * @param string $value - * @throws Zend_Cloud_Infrastructure_Exception - */ - public function offsetSet($offset, $value) - { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('You are trying to set read-only property'); - } - - /** - * Throws exception because all values are read-only - * - * Implement ArrayAccess::offsetUnset() - * - * @param int $offset - * @throws Zend_Cloud_Infrastructure_Exception - */ - public function offsetUnset($offset) - { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('You are trying to unset read-only property'); - } -} diff --git a/lib/Zend/Cloud/Infrastructure/Instance.php b/lib/Zend/Cloud/Infrastructure/Instance.php deleted file mode 100644 index 3ebce7edb..000000000 --- a/lib/Zend/Cloud/Infrastructure/Instance.php +++ /dev/null @@ -1,320 +0,0 @@ -toArray(); - } elseif ($data instanceof Traversable) { - $data = iterator_to_array($data); - } - } - - if (empty($data) || !is_array($data)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception("You must pass an array of parameters"); - } - - foreach ($this->attributeRequired as $key) { - if (empty($data[$key])) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception(sprintf( - 'The param "%s" is a required param for %s', - $key, - __CLASS__ - )); - } - } - - $this->adapter = $adapter; - $this->attributes = $data; - } - - /** - * Get Attribute with a specific key - * - * @param array $data - * @return misc|false - */ - public function getAttribute($key) - { - if (!empty($this->attributes[$key])) { - return $this->attributes[$key]; - } - return false; - } - - /** - * Get all the attributes - * - * @return array - */ - public function getAttributes() - { - return $this->attributes; - } - - /** - * Get the instance's id - * - * @return string - */ - public function getId() - { - return $this->attributes[self::INSTANCE_ID]; - } - - /** - * Get the instance's image id - * - * @return string - */ - public function getImageId() - { - return $this->attributes[self::INSTANCE_IMAGEID]; - } - - /** - * Get the instance's name - * - * @return string - */ - public function getName() - { - return $this->attributes[self::INSTANCE_NAME]; - } - - /** - * Get the status of the instance - * - * @return string|boolean - */ - public function getStatus() - { - return $this->adapter->statusInstance($this->attributes[self::INSTANCE_ID]); - } - - /** - * Wait for status $status with a timeout of $timeout seconds - * - * @param string $status - * @param integer $timeout - * @return boolean - */ - public function waitStatus($status, $timeout = Adapter::TIMEOUT_STATUS_CHANGE) - { - return $this->adapter->waitStatusInstance($this->attributes[self::INSTANCE_ID], $status, $timeout); - } - - /** - * Get the public DNS of the instance - * - * @return string - */ - public function getPublicDns() - { - if (!isset($this->attributes[self::INSTANCE_PUBLICDNS])) { - $this->attributes[self::INSTANCE_PUBLICDNS] = $this->adapter->publicDnsInstance($this->attributes[self::INSTANCE_ID]); - } - return $this->attributes[self::INSTANCE_PUBLICDNS]; - } - - /** - * Get the instance's CPU - * - * @return string - */ - public function getCpu() - { - return $this->attributes[self::INSTANCE_CPU]; - } - - /** - * Get the instance's RAM size - * - * @return string - */ - public function getRamSize() - { - return $this->attributes[self::INSTANCE_RAM]; - } - - /** - * Get the instance's storage size - * - * @return string - */ - public function getStorageSize() - { - return $this->attributes[self::INSTANCE_STORAGE]; - } - - /** - * Get the instance's zone - * - * @return string - */ - public function getZone() - { - return $this->attributes[self::INSTANCE_ZONE]; - } - - /** - * Get the instance's launch time - * - * @return string - */ - public function getLaunchTime() - { - return $this->attributes[self::INSTANCE_LAUNCHTIME]; - } - - /** - * Reboot the instance - * - * @return boolean - */ - public function reboot() - { - return $this->adapter->rebootInstance($this->attributes[self::INSTANCE_ID]); - } - - /** - * Stop the instance - * - * @return boolean - */ - public function stop() - { - return $this->adapter->stopInstance($this->attributes[self::INSTANCE_ID]); - } - - /** - * Start the instance - * - * @return boolean - */ - public function start() - { - return $this->adapter->startInstance($this->attributes[self::INSTANCE_ID]); - } - - /** - * Destroy the instance - * - * @return boolean - */ - public function destroy() - { - return $this->adapter->destroyInstance($this->attributes[self::INSTANCE_ID]); - } - - /** - * Return the system informations about the $metric of an instance - * - * @param string $metric - * @param null|array $options - * @return array|boolean - */ - public function monitor($metric, $options = null) - { - return $this->adapter->monitorInstance($this->attributes[self::INSTANCE_ID], $metric, $options); - } - - /** - * Run arbitrary shell script on the instance - * - * @param array $param - * @param string|array $cmd - * @return string|array - */ - public function deploy($params, $cmd) - { - return $this->adapter->deployInstance($this->attributes[self::INSTANCE_ID], $params, $cmd); - } -} diff --git a/lib/Zend/Cloud/Infrastructure/InstanceList.php b/lib/Zend/Cloud/Infrastructure/InstanceList.php deleted file mode 100644 index 4ab86bc24..000000000 --- a/lib/Zend/Cloud/Infrastructure/InstanceList.php +++ /dev/null @@ -1,219 +0,0 @@ -adapter = $adapter; - $this->constructFromArray($instances); - } - - /** - * Transforms the Array to array of Instances - * - * @param array $list - * @return void - */ - protected function constructFromArray(array $list) - { - foreach ($list as $instance) { - $this->addInstance(new Zend_Cloud_Infrastructure_Instance($this->adapter,$instance)); - } - } - - /** - * Add an instance - * - * @param Instance - * @return InstanceList - */ - protected function addInstance(Zend_Cloud_Infrastructure_Instance $instance) - { - $this->instances[] = $instance; - return $this; - } - - /** - * Return number of instances - * - * Implement Countable::count() - * - * @return int - */ - public function count() - { - return count($this->instances); - } - - /** - * Return the current element - * - * Implement Iterator::current() - * - * @return Instance - */ - public function current() - { - return $this->instances[$this->iteratorKey]; - } - - /** - * Return the key of the current element - * - * Implement Iterator::key() - * - * @return int - */ - public function key() - { - return $this->iteratorKey; - } - - /** - * Move forward to next element - * - * Implement Iterator::next() - * - * @return void - */ - public function next() - { - $this->iteratorKey++; - } - - /** - * Rewind the Iterator to the first element - * - * Implement Iterator::rewind() - * - * @return void - */ - public function rewind() - { - $this->iteratorKey = 0; - } - - /** - * Check if there is a current element after calls to rewind() or next() - * - * Implement Iterator::valid() - * - * @return bool - */ - public function valid() - { - $numItems = $this->count(); - if ($numItems > 0 && $this->iteratorKey < $numItems) { - return true; - } - return false; - } - - /** - * Whether the offset exists - * - * Implement ArrayAccess::offsetExists() - * - * @param int $offset - * @return bool - */ - public function offsetExists($offset) - { - return ($offset < $this->count()); - } - - /** - * Return value at given offset - * - * Implement ArrayAccess::offsetGet() - * - * @param int $offset - * @return Instance - * @throws Zend_Cloud_Infrastructure_Exception - */ - public function offsetGet($offset) - { - if (!$this->offsetExists($offset)) { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('Illegal index'); - } - return $this->instances[$offset]; - } - - /** - * Throws exception because all values are read-only - * - * Implement ArrayAccess::offsetSet() - * - * @param int $offset - * @param string $value - * @throws Zend_Cloud_Infrastructure_Exception - */ - public function offsetSet($offset, $value) - { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('You are trying to set read-only property'); - } - - /** - * Throws exception because all values are read-only - * - * Implement ArrayAccess::offsetUnset() - * - * @param int $offset - * @throws Zend_Cloud_Infrastructure_Exception - */ - public function offsetUnset($offset) - { - #require_once 'Zend/Cloud/Infrastructure/Exception.php'; - throw new Zend_Cloud_Infrastructure_Exception('You are trying to unset read-only property'); - } -} diff --git a/lib/Zend/Cloud/OperationNotAvailableException.php b/lib/Zend/Cloud/OperationNotAvailableException.php index ddb204b1b..1c8ff3ca1 100644 --- a/lib/Zend/Cloud/OperationNotAvailableException.php +++ b/lib/Zend/Cloud/OperationNotAvailableException.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,7 +26,7 @@ /** * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_OperationNotAvailableException extends Zend_Exception diff --git a/lib/Zend/Cloud/QueueService/Adapter.php b/lib/Zend/Cloud/QueueService/Adapter.php index d7757c867..641e3c0b0 100644 --- a/lib/Zend/Cloud/QueueService/Adapter.php +++ b/lib/Zend/Cloud/QueueService/Adapter.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Cloud_QueueService_Adapter @@ -49,7 +49,7 @@ interface Zend_Cloud_QueueService_Adapter * Create a queue. Returns the ID of the created queue (typically the URL). * It may take some time to create the queue. Check your vendor's * documentation for details. - * + * * Name constraints: Maximum 80 characters * Only alphanumeric characters, hyphens (-), and underscores (_) * @@ -67,7 +67,7 @@ public function createQueue($name, $options = null); * @return boolean true if successful, false otherwise */ public function deleteQueue($queueId, $options = null); - + /** * List all queues. * @@ -75,7 +75,7 @@ public function deleteQueue($queueId, $options = null); * @return array Queue IDs */ public function listQueues($options = null); - + /** * Get a key/value array of metadata for the given queue. * @@ -84,40 +84,40 @@ public function listQueues($options = null); * @return array */ public function fetchQueueMetadata($queueId, $options = null); - + /** * Store a key/value array of metadata for the specified queue. - * WARNING: This operation overwrites any metadata that is located at + * WARNING: This operation overwrites any metadata that is located at * $destinationPath. Some adapters may not support this method. - * + * * @param string $queueId * @param array $metadata * @param array $options * @return void */ public function storeQueueMetadata($queueId, $metadata, $options = null); - + /** * Send a message to the specified queue. - * + * * @param string $queueId * @param string $message * @param array $options * @return string Message ID */ public function sendMessage($queueId, $message, $options = null); - + /** * Recieve at most $max messages from the specified queue and return the * message IDs for messages recieved. - * + * * @param string $queueId * @param int $max * @param array $options * @return array[Zend_Cloud_QueueService_Message] Array of messages */ public function receiveMessages($queueId, $max = 1, $options = null); - + /** * Peek at the messages from the specified queue without removing them. * @@ -127,18 +127,18 @@ public function receiveMessages($queueId, $max = 1, $options = null); * @return array[Zend_Cloud_QueueService_Message] */ public function peekMessages($queueId, $num = 1, $options = null); - + /** * Delete the specified message from the specified queue. - * + * * @param string $queueId - * @param Zend_Cloud_QueueService_Message $message Message to delete + * @param Zend_Cloud_QueueService_Message $message Message to delete * @param array $options * @return void - * + * */ public function deleteMessage($queueId, $message, $options = null); - + /** * Get the concrete adapter. */ diff --git a/lib/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php b/lib/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php index 01e249938..37be80704 100644 --- a/lib/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php +++ b/lib/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Cloud_QueueService_Adapter_AbstractAdapter @@ -48,8 +48,8 @@ abstract class Zend_Cloud_QueueService_Adapter_AbstractAdapter /** * Set class to use for message objects - * - * @param string $class + * + * @param string $class * @return Zend_Cloud_QueueService_Adapter_AbstractAdapter */ public function setMessageClass($class) @@ -60,7 +60,7 @@ public function setMessageClass($class) /** * Get class to use for message objects - * + * * @return string */ public function getMessageClass() @@ -70,8 +70,8 @@ public function getMessageClass() /** * Set class to use for message collection objects - * - * @param string $class + * + * @param string $class * @return Zend_Cloud_QueueService_Adapter_AbstractAdapter */ public function setMessageSetClass($class) @@ -82,7 +82,7 @@ public function setMessageSetClass($class) /** * Get class to use for message collection objects - * + * * @return string */ public function getMessageSetClass() diff --git a/lib/Zend/Cloud/QueueService/Adapter/Sqs.php b/lib/Zend/Cloud/QueueService/Adapter/Sqs.php index 608ef2f6d..d6bf3b65c 100644 --- a/lib/Zend/Cloud/QueueService/Adapter/Sqs.php +++ b/lib/Zend/Cloud/QueueService/Adapter/Sqs.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,10 +28,10 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cloud_QueueService_Adapter_Sqs +class Zend_Cloud_QueueService_Adapter_Sqs extends Zend_Cloud_QueueService_Adapter_AbstractAdapter { /* @@ -53,11 +53,11 @@ class Zend_Cloud_QueueService_Adapter_Sqs /** * Constructor - * - * @param array|Zend_Config $options + * + * @param array|Zend_Config $options * @return void */ - public function __construct($options = array()) + public function __construct($options = array()) { if ($options instanceof Zend_Config) { $options = $options->toArray(); @@ -85,7 +85,7 @@ public function __construct($options = array()) if(isset($options[self::HTTP_ADAPTER])) { $this->_sqs->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); - } + } } /** @@ -97,7 +97,7 @@ public function __construct($options = array()) * @param array $options * @return string Queue ID (typically URL) */ - public function createQueue($name, $options = null) + public function createQueue($name, $options = null) { try { return $this->_sqs->create($name, $options[self::CREATE_TIMEOUT]); @@ -113,7 +113,7 @@ public function createQueue($name, $options = null) * @param array $options * @return boolean true if successful, false otherwise */ - public function deleteQueue($queueId, $options = null) + public function deleteQueue($queueId, $options = null) { try { return $this->_sqs->delete($queueId); @@ -128,7 +128,7 @@ public function deleteQueue($queueId, $options = null) * @param array $options * @return array Queue IDs */ - public function listQueues($options = null) + public function listQueues($options = null) { try { return $this->_sqs->getQueues(); @@ -144,7 +144,7 @@ public function listQueues($options = null) * @param array $options * @return array */ - public function fetchQueueMetadata($queueId, $options = null) + public function fetchQueueMetadata($queueId, $options = null) { try { // TODO: ZF-9050 Fix the SQS client library in trunk to return all attribute values @@ -169,7 +169,7 @@ public function fetchQueueMetadata($queueId, $options = null) * @param array $options * @return void */ - public function storeQueueMetadata($queueId, $metadata, $options = null) + public function storeQueueMetadata($queueId, $metadata, $options = null) { // TODO Add support for SetQueueAttributes to client library #require_once 'Zend/Cloud/OperationNotAvailableException.php'; @@ -184,7 +184,7 @@ public function storeQueueMetadata($queueId, $metadata, $options = null) * @param array $options * @return string Message ID */ - public function sendMessage($queueId, $message, $options = null) + public function sendMessage($queueId, $message, $options = null) { try { return $this->_sqs->send($queueId, $message); @@ -202,7 +202,7 @@ public function sendMessage($queueId, $message, $options = null) * @param array $options * @return array */ - public function receiveMessages($queueId, $max = 1, $options = null) + public function receiveMessages($queueId, $max = 1, $options = null) { try { return $this->_makeMessages($this->_sqs->receive($queueId, $max, $options[self::VISIBILITY_TIMEOUT])); @@ -210,11 +210,11 @@ public function receiveMessages($queueId, $max = 1, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on recieving messages: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Create Zend_Cloud_QueueService_Message array for * Sqs messages. - * + * * @param array $messages * @return Zend_Cloud_QueueService_Message[] */ @@ -237,7 +237,7 @@ protected function _makeMessages($messages) * @param array $options * @return void */ - public function deleteMessage($queueId, $message, $options = null) + public function deleteMessage($queueId, $message, $options = null) { try { if($message instanceof Zend_Cloud_QueueService_Message) { @@ -249,7 +249,7 @@ public function deleteMessage($queueId, $message, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on deleting a message: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Peek at the messages from the specified queue without removing them. * @@ -269,7 +269,7 @@ public function peekMessages($queueId, $num = 1, $options = null) /** * Get SQS implementation - * @return Zend_Service_Amazon_Sqs + * @return Zend_Service_Amazon_Sqs */ public function getClient() { diff --git a/lib/Zend/Cloud/QueueService/Adapter/WindowsAzure.php b/lib/Zend/Cloud/QueueService/Adapter/WindowsAzure.php index 4130062b1..f59d6145b 100644 --- a/lib/Zend/Cloud/QueueService/Adapter/WindowsAzure.php +++ b/lib/Zend/Cloud/QueueService/Adapter/WindowsAzure.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,10 +27,10 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cloud_QueueService_Adapter_WindowsAzure +class Zend_Cloud_QueueService_Adapter_WindowsAzure extends Zend_Cloud_QueueService_Adapter_AbstractAdapter { /** @@ -49,20 +49,20 @@ class Zend_Cloud_QueueService_Adapter_WindowsAzure /** message options */ const MESSAGE_TTL = 'ttl'; - + const DEFAULT_HOST = Zend_Service_WindowsAzure_Storage::URL_CLOUD_QUEUE; /** * Storage client - * + * * @var Zend_Service_WindowsAzure_Storage_Queue */ protected $_storageClient = null; - + /** * Constructor - * - * @param array|Zend_Config $options + * + * @param array|Zend_Config $options * @return void */ public function __construct($options = array()) @@ -112,9 +112,9 @@ public function __construct($options = array()) } catch(Zend_Service_WindowsAzure_Exception $e) { throw new Zend_Cloud_QueueService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e); } - + } - + /** * Create a queue. Returns the ID of the created queue (typically the URL). * It may take some time to create the queue. Check your vendor's @@ -133,7 +133,7 @@ public function createQueue($name, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on queue creation: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Delete a queue. All messages in the queue will also be deleted. * @@ -152,7 +152,7 @@ public function deleteQueue($queueId, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on queue deletion: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * List all queues. * @@ -177,7 +177,7 @@ public function listQueues($options = null) throw new Zend_Cloud_QueueService_Exception('Error on listing queues: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Get a key/value array of metadata for the given queue. * @@ -196,12 +196,12 @@ public function fetchQueueMetadata($queueId, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on fetching queue metadata: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Store a key/value array of metadata for the specified queue. - * WARNING: This operation overwrites any metadata that is located at + * WARNING: This operation overwrites any metadata that is located at * $destinationPath. Some adapters may not support this method. - * + * * @param string $queueId * @param array $metadata * @param array $options @@ -218,10 +218,10 @@ public function storeQueueMetadata($queueId, $metadata, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on setting queue metadata: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Send a message to the specified queue. - * + * * @param string $queueId * @param string $message * @param array $options @@ -240,11 +240,11 @@ public function sendMessage($queueId, $message, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on sending message: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Recieve at most $max messages from the specified queue and return the * message IDs for messages recieved. - * + * * @param string $queueId * @param int $max * @param array $options @@ -266,11 +266,11 @@ public function receiveMessages($queueId, $max = 1, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on recieving messages: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Create Zend_Cloud_QueueService_Message array for * Azure messages. - * + * * @param array $messages * @return Zend_Cloud_QueueService_Message[] */ @@ -287,9 +287,9 @@ protected function _makeMessages($messages) /** * Delete the specified message from the specified queue. - * + * * @param string $queueId - * @param Zend_Cloud_QueueService_Message $message Message ID or message + * @param Zend_Cloud_QueueService_Message $message Message ID or message * @param array $options * @return void */ @@ -331,10 +331,10 @@ public function peekMessages($queueId, $num = 1, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on peeking messages: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Get Azure implementation - * @return Zend_Service_Azure_Storage_Queue + * @return Zend_Service_Azure_Storage_Queue */ public function getClient() { diff --git a/lib/Zend/Cloud/QueueService/Adapter/ZendQueue.php b/lib/Zend/Cloud/QueueService/Adapter/ZendQueue.php index 40e40af35..3ba8805e7 100644 --- a/lib/Zend/Cloud/QueueService/Adapter/ZendQueue.php +++ b/lib/Zend/Cloud/QueueService/Adapter/ZendQueue.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,33 +27,33 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cloud_QueueService_Adapter_ZendQueue +class Zend_Cloud_QueueService_Adapter_ZendQueue extends Zend_Cloud_QueueService_Adapter_AbstractAdapter { /** * Options array keys for the Zend_Queue adapter. */ const ADAPTER = 'adapter'; - + /** * Storage client - * + * * @var Zend_Queue */ protected $_queue = null; - + /** * @var array All queues */ protected $_queues = array(); - + /** * Constructor - * - * @param array|Zend_Config $options + * + * @param array|Zend_Config $options * @return void */ public function __construct ($options = array()) @@ -87,7 +87,7 @@ public function __construct ($options = array()) throw new Zend_Cloud_QueueService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Create a queue. Returns the ID of the created queue (typically the URL). * It may take some time to create the queue. Check your vendor's @@ -106,7 +106,7 @@ public function createQueue($name, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on queue creation: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Delete a queue. All messages in the queue will also be deleted. * @@ -128,7 +128,7 @@ public function deleteQueue($queueId, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on queue deletion: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * List all queues. * @@ -143,7 +143,7 @@ public function listQueues($options = null) throw new Zend_Cloud_QueueService_Exception('Error on listing queues: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Get a key/value array of metadata for the given queue. * @@ -162,12 +162,12 @@ public function fetchQueueMetadata($queueId, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on fetching queue metadata: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Store a key/value array of metadata for the specified queue. - * WARNING: This operation overwrites any metadata that is located at + * WARNING: This operation overwrites any metadata that is located at * $destinationPath. Some adapters may not support this method. - * + * * @param string $queueId * @param array $metadata * @param array $options @@ -184,10 +184,10 @@ public function storeQueueMetadata($queueId, $metadata, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on setting queue metadata: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Send a message to the specified queue. - * + * * @param string $queueId * @param string $message * @param array $options @@ -204,11 +204,11 @@ public function sendMessage($queueId, $message, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on sending message: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Recieve at most $max messages from the specified queue and return the * message IDs for messages recieved. - * + * * @param string $queueId * @param int $max * @param array $options @@ -230,11 +230,11 @@ public function receiveMessages($queueId, $max = 1, $options = null) throw new Zend_Cloud_QueueService_Exception('Error on recieving messages: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Create Zend_Cloud_QueueService_Message array for * Azure messages. - * + * * @param array $messages * @return Zend_Cloud_QueueService_Message[] */ @@ -248,12 +248,12 @@ protected function _makeMessages($messages) } return new $setClass($result); } - + /** * Delete the specified message from the specified queue. - * + * * @param string $queueId - * @param Zend_Cloud_QueueService_Message $message Message ID or message + * @param Zend_Cloud_QueueService_Message $message Message ID or message * @param array $options * @return void */ @@ -269,13 +269,13 @@ public function deleteMessage($queueId, $message, $options = null) if (!($message instanceof Zend_Queue_Message)) { throw new Zend_Cloud_QueueService_Exception('Cannot delete the message: Zend_Queue_Message object required'); } - + return $this->_queues[$queueId]->deleteMessage($message); } catch (Zend_Queue_Exception $e) { throw new Zend_Cloud_QueueService_Exception('Error on deleting a message: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Peek at the messages from the specified queue without removing them. * @@ -289,10 +289,10 @@ public function peekMessages($queueId, $num = 1, $options = null) #require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('ZendQueue doesn\'t currently support message peeking'); } - + /** * Get Azure implementation - * @return Zend_Queue + * @return Zend_Queue */ public function getClient() { diff --git a/lib/Zend/Cloud/QueueService/Exception.php b/lib/Zend/Cloud/QueueService/Exception.php index 4c8398e48..fb8067464 100644 --- a/lib/Zend/Cloud/QueueService/Exception.php +++ b/lib/Zend/Cloud/QueueService/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_QueueService_Exception extends Zend_Cloud_Exception diff --git a/lib/Zend/Cloud/QueueService/Factory.php b/lib/Zend/Cloud/QueueService/Factory.php index f667baeb8..d9b596581 100644 --- a/lib/Zend/Cloud/QueueService/Factory.php +++ b/lib/Zend/Cloud/QueueService/Factory.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_QueueService_Factory extends Zend_Cloud_AbstractFactory @@ -39,21 +39,21 @@ class Zend_Cloud_QueueService_Factory extends Zend_Cloud_AbstractFactory /** * Constructor - * + * * @return void */ private function __construct() { // private ctor - should not be used } - + /** * Retrieve QueueService adapter - * - * @param array $options + * + * @param array $options * @return void */ - public static function getAdapter($options = array()) + public static function getAdapter($options = array()) { $adapter = parent::_getAdapter(self::QUEUE_ADAPTER_KEY, $options); if (!$adapter) { diff --git a/lib/Zend/Cloud/QueueService/Message.php b/lib/Zend/Cloud/QueueService/Message.php index eddbb6e85..a62ddd0d7 100644 --- a/lib/Zend/Cloud/QueueService/Message.php +++ b/lib/Zend/Cloud/QueueService/Message.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,22 +23,22 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_QueueService_Message { protected $_body; protected $_clientMessage; - + /** * @param string $body Message text - * @param string $message Original message + * @param $message Original message */ function __construct($body, $message) { - $this->_body = $body; - $this->_clientMessage = $message; + $this->_body = $body; + $this->_clientMessage = $message; } /** @@ -49,7 +49,7 @@ public function getBody() { return $this->_body; } - + /** * Get the original adapter-specific message */ diff --git a/lib/Zend/Cloud/QueueService/MessageSet.php b/lib/Zend/Cloud/QueueService/MessageSet.php index f62268015..60168c874 100644 --- a/lib/Zend/Cloud/QueueService/MessageSet.php +++ b/lib/Zend/Cloud/QueueService/MessageSet.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_QueueService_MessageSet implements Countable, IteratorAggregate @@ -36,8 +36,8 @@ class Zend_Cloud_QueueService_MessageSet implements Countable, IteratorAggregate /** * Constructor - * - * @param array $messages + * + * @param array $messages * @return void */ public function __construct(array $messages) @@ -48,7 +48,7 @@ public function __construct(array $messages) /** * Countable: number of messages in collection - * + * * @return int */ public function count() @@ -58,7 +58,7 @@ public function count() /** * IteratorAggregate: return iterable object - * + * * @return Traversable */ public function getIterator() diff --git a/lib/Zend/Cloud/StorageService/Adapter.php b/lib/Zend/Cloud/StorageService/Adapter.php index e06d11946..ec541cc65 100644 --- a/lib/Zend/Cloud/StorageService/Adapter.php +++ b/lib/Zend/Cloud/StorageService/Adapter.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Cloud_StorageService_Adapter @@ -39,10 +39,10 @@ interface Zend_Cloud_StorageService_Adapter * @return mixed */ public function fetchItem($path, $options = null); - + /** * Store an item in the storage service. - * WARNING: This operation overwrites any item that is located at + * WARNING: This operation overwrites any item that is located at * $destinationPath. * @param string $destinationPath * @param mixed $data @@ -52,7 +52,7 @@ public function fetchItem($path, $options = null); public function storeItem($destinationPath, $data, $options = null); - + /** * Delete an item in the storage service. * @@ -61,10 +61,10 @@ public function storeItem($destinationPath, * @return void */ public function deleteItem($path, $options = null); - + /** * Copy an item in the storage service to a given path. - * + * * The $destinationPath must be a directory. * * @param string $sourcePath @@ -73,10 +73,10 @@ public function deleteItem($path, $options = null); * @return void */ public function copyItem($sourcePath, $destinationPath, $options = null); - + /** * Move an item in the storage service to a given path. - * + * * The $destinationPath must be a directory. * * @param string $sourcePath @@ -85,7 +85,7 @@ public function copyItem($sourcePath, $destinationPath, $options = null); * @return void */ public function moveItem($sourcePath, $destinationPath, $options = null); - + /** * Rename an item in the storage service to a given name. * @@ -96,10 +96,10 @@ public function moveItem($sourcePath, $destinationPath, $options = null); * @return void */ public function renameItem($path, $name, $options = null); - + /** * List items in the given directory in the storage service - * + * * The $path must be a directory * * @@ -108,7 +108,7 @@ public function renameItem($path, $name, $options = null); * @return array A list of item names */ public function listItems($path, $options = null); - + /** * Get a key/value array of metadata for the given path. * @@ -117,10 +117,10 @@ public function listItems($path, $options = null); * @return array */ public function fetchMetadata($path, $options = null); - + /** * Store a key/value array of metadata at the given path. - * WARNING: This operation overwrites any metadata that is located at + * WARNING: This operation overwrites any metadata that is located at * $destinationPath. * * @param string $destinationPath @@ -128,7 +128,7 @@ public function fetchMetadata($path, $options = null); * @return void */ public function storeMetadata($destinationPath, $metadata, $options = null); - + /** * Delete a key/value array of metadata at the given path. * diff --git a/lib/Zend/Cloud/StorageService/Adapter/FileSystem.php b/lib/Zend/Cloud/StorageService/Adapter/FileSystem.php index fa345727b..5bcf657d7 100644 --- a/lib/Zend/Cloud/StorageService/Adapter/FileSystem.php +++ b/lib/Zend/Cloud/StorageService/Adapter/FileSystem.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_StorageService_Adapter_FileSystem implements Zend_Cloud_StorageService_Adapter @@ -45,11 +45,11 @@ class Zend_Cloud_StorageService_Adapter_FileSystem implements Zend_Cloud_Storage /** * Constructor - * - * @param array|Zend_Config $options + * + * @param array|Zend_Config $options * @return void */ - public function __construct($options = array()) + public function __construct($options = array()) { if ($options instanceof Zend_Config) { $options = $options->toArray(); @@ -75,12 +75,12 @@ public function __construct($options = array()) * @param array $options * @return false|string */ - public function fetchItem($path, $options = array()) + public function fetchItem($path, $options = array()) { $filepath = $this->_getFullPath($path); $path = realpath($filepath); - if (!$path || !file_exists($path)) { + if (!$path) { return false; } @@ -100,7 +100,7 @@ public function fetchItem($path, $options = array()) * @param array $options * @return void */ - public function storeItem($destinationPath, $data, $options = array()) + public function storeItem($destinationPath, $data, $options = array()) { $path = $this->_getFullPath($destinationPath); file_put_contents($path, $data); @@ -114,7 +114,7 @@ public function storeItem($destinationPath, $data, $options = array()) * @param array $options * @return void */ - public function deleteItem($path, $options = array()) + public function deleteItem($path, $options = array()) { if (!isset($path)) { return; @@ -139,7 +139,7 @@ public function deleteItem($path, $options = array()) * @param array $options * @return void */ - public function copyItem($sourcePath, $destinationPath, $options = array()) + public function copyItem($sourcePath, $destinationPath, $options = array()) { copy($this->_getFullPath($sourcePath), $this->_getFullPath($destinationPath)); } @@ -157,7 +157,7 @@ public function copyItem($sourcePath, $destinationPath, $options = array()) * @param array $options * @return void */ - public function moveItem($sourcePath, $destinationPath, $options = array()) + public function moveItem($sourcePath, $destinationPath, $options = array()) { rename($this->_getFullPath($sourcePath), $this->_getFullPath($destinationPath)); } @@ -171,10 +171,10 @@ public function moveItem($sourcePath, $destinationPath, $options = array()) * @param array $options * @return void */ - public function renameItem($path, $name, $options = null) + public function renameItem($path, $name, $options = null) { rename( - $this->_getFullPath($path), + $this->_getFullPath($path), dirname($this->_getFullPath($path)) . DIRECTORY_SEPARATOR . $name ); } @@ -189,7 +189,7 @@ public function renameItem($path, $name, $options = null) * @param array $options * @return array A list of item names */ - public function listItems($path, $options = null) + public function listItems($path, $options = null) { $listing = scandir($this->_getFullPath($path)); @@ -206,7 +206,7 @@ public function listItems($path, $options = null) * @param array $options * @return array */ - public function fetchMetadata($path, $options = array()) + public function fetchMetadata($path, $options = array()) { $fullPath = $this->_getFullPath($path); $metadata = null; @@ -226,7 +226,7 @@ public function fetchMetadata($path, $options = array()) * @param array $options * @return void */ - public function storeMetadata($destinationPath, $metadata, $options = array()) + public function storeMetadata($destinationPath, $metadata, $options = array()) { #require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Storing metadata not implemented'); @@ -239,7 +239,7 @@ public function storeMetadata($destinationPath, $metadata, $options = array()) * @param array $options * @return void */ - public function deleteMetadata($path) + public function deleteMetadata($path) { #require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Deleting metadata not implemented'); @@ -247,11 +247,11 @@ public function deleteMetadata($path) /** * Return the full path for the file. - * + * * @param string $path * @return string */ - private function _getFullPath($path) + private function _getFullPath($path) { return $this->_directory . DIRECTORY_SEPARATOR . $path; } @@ -262,6 +262,6 @@ private function _getFullPath($path) */ public function getClient() { - return $this->_directory; + return $this->_directory; } } diff --git a/lib/Zend/Cloud/StorageService/Adapter/Nirvanix.php b/lib/Zend/Cloud/StorageService/Adapter/Nirvanix.php index d9197f35f..7909e9d07 100644 --- a/lib/Zend/Cloud/StorageService/Adapter/Nirvanix.php +++ b/lib/Zend/Cloud/StorageService/Adapter/Nirvanix.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,10 +27,10 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cloud_StorageService_Adapter_Nirvanix +class Zend_Cloud_StorageService_Adapter_Nirvanix implements Zend_Cloud_StorageService_Adapter { const USERNAME = 'auth_username'; @@ -50,11 +50,11 @@ class Zend_Cloud_StorageService_Adapter_Nirvanix /** * Constructor - * - * @param array|Zend_Config $options + * + * @param array|Zend_Config $options * @return void */ - function __construct($options = array()) + function __construct($options = array()) { if ($options instanceof Zend_Config) { $options = $options->toArray(); @@ -74,13 +74,13 @@ function __construct($options = array()) $httpc = new Zend_Http_Client(); $httpc->setAdapter($options[self::HTTP_ADAPTER]); $nirvanix_options['httpClient'] = $httpc; - } + } try { $this->_nirvanix = new Zend_Service_Nirvanix($auth, $nirvanix_options); $this->_remoteDirectory = $options[self::REMOTE_DIRECTORY]; $this->_imfNs = $this->_nirvanix->getService('IMFS'); $this->_metadataNs = $this->_nirvanix->getService('Metadata'); - } catch (Zend_Service_Nirvanix_Exception $e) { + } catch (Zend_Service_Nirvanix_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e); } } @@ -197,7 +197,7 @@ public function moveItem($sourcePath, $destinationPath, $options = null) * @param array $options * @return void */ - public function renameItem($path, $name, $options = null) + public function renameItem($path, $name, $options = null) { #require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Renaming not implemented'); @@ -219,7 +219,7 @@ public function fetchMetadata($path, $options = null) } catch (Zend_Service_Nirvanix_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on fetching metadata: '.$e->getMessage(), $e->getCode(), $e); } - + $metadata = array(); $length = count($metadataNode->Metadata); @@ -244,9 +244,9 @@ public function fetchMetadata($path, $options = null) * WARNING: This operation overwrites any metadata that is located at * $destinationPath. * - * @param string $destinationPath - * @param array $metadata associative array specifying the key/value pairs for the metadata. - * @param array $options + * @param array $metadata - An associative array specifying the key/value pairs for the metadata. + * @param $destinationPath + * @param array $options * @return void */ public function storeMetadata($destinationPath, $metadata, $options = null) @@ -293,16 +293,16 @@ public function deleteMetadata($path, $metadata = null, $options = null) } } catch (Zend_Service_Nirvanix_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on deleting metadata: '.$e->getMessage(), $e->getCode(), $e); - } + } } /* * Recursively traverse all the folders and build an array that contains * the path names for each folder. * - * @param string $path folder path to get the list of folders from. - * @param array& $resultArray reference to the array that contains the path names - * for each folder. + * @param $path - The folder path to get the list of folders from. + * @param &$resultArray - reference to the array that contains the path names + * for each folder. */ private function getAllFolders($path, &$resultArray) { @@ -355,8 +355,8 @@ public function listItems($path, $options = null) )); } catch (Zend_Service_Nirvanix_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on list: '.$e->getMessage(), $e->getCode(), $e); - } - + } + $numFiles = $response->ListFolder->TotalFileCount; //Add the file names to the array @@ -379,11 +379,11 @@ public function listItems($path, $options = null) /** * Get full path to an object - * - * @param string $path + * + * @param string $path * @return string */ - private function _getFullPath($path) + private function _getFullPath($path) { return $this->_remoteDirectory . $path; } @@ -394,6 +394,6 @@ private function _getFullPath($path) */ public function getClient() { - return $this->_nirvanix; + return $this->_nirvanix; } } diff --git a/lib/Zend/Cloud/StorageService/Adapter/Rackspace.php b/lib/Zend/Cloud/StorageService/Adapter/Rackspace.php deleted file mode 100644 index 7226bcb60..000000000 --- a/lib/Zend/Cloud/StorageService/Adapter/Rackspace.php +++ /dev/null @@ -1,332 +0,0 @@ -toArray(); - } - - if (!is_array($options) || empty($options)) { - throw new Zend_Cloud_StorageService_Exception('Invalid options provided'); - } - - try { - $this->_rackspace = new Zend_Service_Rackspace_Files($options[self::USER], $options[self::API_KEY]); - } catch (Zend_Service_Rackspace_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e); - } - - if (isset($options[self::HTTP_ADAPTER])) { - $this->_rackspace->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); - } - if (!empty($options[self::REMOTE_CONTAINER])) { - $this->_container = $options[self::REMOTE_CONTAINER]; - } - } - - /** - * Get an item from the storage service. - * - * @param string $path - * @param array $options - * @return mixed - */ - public function fetchItem($path, $options = null) - { - $item = $this->_rackspace->getObject($this->_container,$path, $options); - if (!$this->_rackspace->isSuccessful() && ($this->_rackspace->getErrorCode()!='404')) { - throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$this->_rackspace->getErrorMsg()); - } - if (!empty($item)) { - return $item->getContent(); - } else { - return false; - } - } - - /** - * Store an item in the storage service. - * - * @param string $destinationPath - * @param mixed $data - * @param array $options - * @return void - */ - public function storeItem($destinationPath, $data, $options = null) - { - $this->_rackspace->storeObject($this->_container,$destinationPath,$data,$options); - if (!$this->_rackspace->isSuccessful()) { - throw new Zend_Cloud_StorageService_Exception('Error on store: '.$this->_rackspace->getErrorMsg()); - } - } - - /** - * Delete an item in the storage service. - * - * @param string $path - * @param array $options - * @return void - */ - public function deleteItem($path, $options = null) - { - $this->_rackspace->deleteObject($this->_container,$path); - if (!$this->_rackspace->isSuccessful()) { - throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$this->_rackspace->getErrorMsg()); - } - } - - /** - * Copy an item in the storage service to a given path. - * - * @param string $sourcePath - * @param string $destination path - * @param array $options - * @return void - */ - public function copyItem($sourcePath, $destinationPath, $options = null) - { - $this->_rackspace->copyObject($this->_container,$sourcePath,$this->_container,$destinationPath,$options); - if (!$this->_rackspace->isSuccessful()) { - throw new Zend_Cloud_StorageService_Exception('Error on copy: '.$this->_rackspace->getErrorMsg()); - } - } - - /** - * Move an item in the storage service to a given path. - * WARNING: This operation is *very* expensive for services that do not - * support moving an item natively. - * - * @param string $sourcePath - * @param string $destination path - * @param array $options - * @return void - */ - public function moveItem($sourcePath, $destinationPath, $options = null) - { - try { - $this->copyItem($sourcePath, $destinationPath, $options); - } catch (Zend_Service_Rackspace_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage()); - } - try { - $this->deleteItem($sourcePath); - } catch (Zend_Service_Rackspace_Exception $e) { - $this->deleteItem($destinationPath); - throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage()); - } - } - - /** - * Rename an item in the storage service to a given name. - * - * @param string $path - * @param string $name - * @param array $options - * @return void - */ - public function renameItem($path, $name, $options = null) - { - #require_once 'Zend/Cloud/OperationNotAvailableException.php'; - throw new Zend_Cloud_OperationNotAvailableException('Renaming not implemented'); - } - - /** - * Get a key/value array of metadata for the given path. - * - * @param string $path - * @param array $options - * @return array An associative array of key/value pairs specifying the metadata for this object. - * If no metadata exists, an empty array is returned. - */ - public function fetchMetadata($path, $options = null) - { - $result = $this->_rackspace->getMetadataObject($this->_container,$path); - if (!$this->_rackspace->isSuccessful()) { - throw new Zend_Cloud_StorageService_Exception('Error on fetch metadata: '.$this->_rackspace->getErrorMsg()); - } - $metadata = array(); - if (isset($result['metadata'])) { - $metadata = $result['metadata']; - } - // delete the self::DELETE_METADATA_KEY - this is a trick to remove all - // the metadata information of an object (see deleteMetadata). - // Rackspace doesn't have an API to remove the metadata of an object - unset($metadata[self::DELETE_METADATA_KEY]); - return $metadata; - } - - /** - * Store a key/value array of metadata at the given path. - * WARNING: This operation overwrites any metadata that is located at - * $destinationPath. - * - * @param string $destinationPath - * @param array $metadata associative array specifying the key/value pairs for the metadata. - * @param array $options - * @return void - */ - public function storeMetadata($destinationPath, $metadata, $options = null) - { - $this->_rackspace->setMetadataObject($this->_container, $destinationPath, $metadata); - if (!$this->_rackspace->isSuccessful()) { - throw new Zend_Cloud_StorageService_Exception('Error on store metadata: '.$this->_rackspace->getErrorMsg()); - } - } - - /** - * Delete a key/value array of metadata at the given path. - * - * @param string $path - * @param array $metadata - An associative array specifying the key/value pairs for the metadata - * to be deleted. If null, all metadata associated with the object will - * be deleted. - * @param array $options - * @return void - */ - public function deleteMetadata($path, $metadata = null, $options = null) - { - if (empty($metadata)) { - $newMetadata = array(self::DELETE_METADATA_KEY => true); - try { - $this->storeMetadata($path, $newMetadata); - } catch (Zend_Service_Rackspace_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on delete metadata: '.$e->getMessage()); - } - } else { - try { - $oldMetadata = $this->fetchMetadata($path); - } catch (Zend_Service_Rackspace_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on delete metadata: '.$e->getMessage()); - } - $newMetadata = array_diff_assoc($oldMetadata, $metadata); - try { - $this->storeMetadata($path, $newMetadata); - } catch (Zend_Service_Rackspace_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on delete metadata: '.$e->getMessage()); - } - } - } - - /* - * Recursively traverse all the folders and build an array that contains - * the path names for each folder. - * - * @param string $path folder path to get the list of folders from. - * @param array& $resultArray reference to the array that contains the path names - * for each folder. - * @return void - */ - private function getAllFolders($path, &$resultArray) - { - if (!empty($path)) { - $options = array ( - 'prefix' => $path - ); - } - $files = $this->_rackspace->getObjects($this->_container,$options); - if (!$this->_rackspace->isSuccessful()) { - throw new Zend_Cloud_StorageService_Exception('Error on get all folders: '.$this->_rackspace->getErrorMsg()); - } - $resultArray = array(); - foreach ($files as $file) { - $resultArray[dirname($file->getName())] = true; - } - $resultArray = array_keys($resultArray); - } - - /** - * Return an array of the items contained in the given path. The items - * returned are the files or objects that in the specified path. - * - * @param string $path - * @param array $options - * @return array - */ - public function listItems($path, $options = null) - { - if (!empty($path)) { - $options = array ( - 'prefix' => $path - ); - } - - $files = $this->_rackspace->getObjects($this->_container,$options); - if (!$this->_rackspace->isSuccessful()) { - throw new Zend_Cloud_StorageService_Exception('Error on list items: '.$this->_rackspace->getErrorMsg()); - } - $resultArray = array(); - if (!empty($files)) { - foreach ($files as $file) { - $resultArray[] = $file->getName(); - } - } - return $resultArray; - } - - /** - * Get the concrete client. - * - * @return Zend_Service_Rackspace_File - */ - public function getClient() - { - return $this->_rackspace; - } -} diff --git a/lib/Zend/Cloud/StorageService/Adapter/S3.php b/lib/Zend/Cloud/StorageService/Adapter/S3.php index 3c7a1ed16..2167bbae9 100644 --- a/lib/Zend/Cloud/StorageService/Adapter/S3.php +++ b/lib/Zend/Cloud/StorageService/Adapter/S3.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,10 +27,10 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cloud_StorageService_Adapter_S3 +class Zend_Cloud_StorageService_Adapter_S3 implements Zend_Cloud_StorageService_Adapter { /* @@ -40,7 +40,7 @@ class Zend_Cloud_StorageService_Adapter_S3 const BUCKET_AS_DOMAIN = 'bucket_as_domain?'; const FETCH_STREAM = 'fetch_stream'; const METADATA = 'metadata'; - + /** * AWS constants */ @@ -57,11 +57,11 @@ class Zend_Cloud_StorageService_Adapter_S3 /** * Constructor - * - * @param array|Zend_Config $options + * + * @param array|Zend_Config $options * @return void */ - public function __construct($options = array()) + public function __construct($options = array()) { if ($options instanceof Zend_Config) { $options = $options->toArray(); @@ -78,13 +78,13 @@ public function __construct($options = array()) try { $this->_s3 = new Zend_Service_Amazon_S3($options[self::AWS_ACCESS_KEY], $options[self::AWS_SECRET_KEY]); - } catch (Zend_Service_Amazon_S3_Exception $e) { + } catch (Zend_Service_Amazon_S3_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e); } - + if (isset($options[self::HTTP_ADAPTER])) { $this->_s3->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); - } + } if (isset($options[self::BUCKET_NAME])) { $this->_defaultBucketName = $options[self::BUCKET_NAME]; @@ -104,7 +104,7 @@ public function __construct($options = array()) * @param array $options * @return string */ - public function fetchItem($path, $options = array()) + public function fetchItem($path, $options = array()) { $fullPath = $this->_getFullPath($path, $options); try { @@ -113,7 +113,7 @@ public function fetchItem($path, $options = array()) } else { return $this->_s3->getObject($fullPath); } - } catch (Zend_Service_Amazon_S3_Exception $e) { + } catch (Zend_Service_Amazon_S3_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); } } @@ -131,16 +131,16 @@ public function fetchItem($path, $options = array()) * @param array $options * @return void */ - public function storeItem($destinationPath, $data, $options = array()) + public function storeItem($destinationPath, $data, $options = array()) { try { $fullPath = $this->_getFullPath($destinationPath, $options); return $this->_s3->putObject( - $fullPath, - $data, + $fullPath, + $data, empty($options[self::METADATA]) ? null : $options[self::METADATA] ); - } catch (Zend_Service_Amazon_S3_Exception $e) { + } catch (Zend_Service_Amazon_S3_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on store: '.$e->getMessage(), $e->getCode(), $e); } } @@ -152,11 +152,11 @@ public function storeItem($destinationPath, $data, $options = array()) * @param array $options * @return void */ - public function deleteItem($path, $options = array()) - { + public function deleteItem($path, $options = array()) + { try { $this->_s3->removeObject($this->_getFullPath($path, $options)); - } catch (Zend_Service_Amazon_S3_Exception $e) { + } catch (Zend_Service_Amazon_S3_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$e->getMessage(), $e->getCode(), $e); } } @@ -174,18 +174,13 @@ public function deleteItem($path, $options = array()) * @param array $options * @return void */ - public function copyItem($sourcePath, $destinationPath, $options = array()) + public function copyItem($sourcePath, $destinationPath, $options = array()) { try { - $fullSourcePath = $this->_getFullPath($sourcePath, $options); - $fullDestPath = $this->_getFullPath($destinationPath, $options); - return $this->_s3->copyObject( - $fullSourcePath, - $fullDestPath, - empty($options[self::METADATA]) ? null : $options[self::METADATA] - ); - - } catch (Zend_Service_Amazon_S3_Exception $e) { + // TODO We *really* need to add support for object copying in the S3 adapter + $item = $this->fetch($_getFullPath(sourcePath), $options); + $this->storeItem($item, $destinationPath, $options); + } catch (Zend_Service_Amazon_S3_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on copy: '.$e->getMessage(), $e->getCode(), $e); } } @@ -200,7 +195,7 @@ public function copyItem($sourcePath, $destinationPath, $options = array()) * @param array $options * @return void */ - public function moveItem($sourcePath, $destinationPath, $options = array()) + public function moveItem($sourcePath, $destinationPath, $options = array()) { try { $fullSourcePath = $this->_getFullPath($sourcePath, $options); @@ -210,7 +205,7 @@ public function moveItem($sourcePath, $destinationPath, $options = array()) $fullDestPath, empty($options[self::METADATA]) ? null : $options[self::METADATA] ); - } catch (Zend_Service_Amazon_S3_Exception $e) { + } catch (Zend_Service_Amazon_S3_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage(), $e->getCode(), $e); } } @@ -224,7 +219,7 @@ public function moveItem($sourcePath, $destinationPath, $options = array()) * @param array $options * @return void */ - public function renameItem($path, $name, $options = null) + public function renameItem($path, $name, $options = null) { #require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Rename not implemented'); @@ -240,12 +235,12 @@ public function renameItem($path, $name, $options = null) * @param array $options * @return array A list of item names */ - public function listItems($path, $options = null) + public function listItems($path, $options = null) { try { // TODO Support 'prefix' parameter for Zend_Service_Amazon_S3::getObjectsByBucket() return $this->_s3->getObjectsByBucket($this->_defaultBucketName); - } catch (Zend_Service_Amazon_S3_Exception $e) { + } catch (Zend_Service_Amazon_S3_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on list: '.$e->getMessage(), $e->getCode(), $e); } } @@ -257,11 +252,11 @@ public function listItems($path, $options = null) * @param array $options * @return array */ - public function fetchMetadata($path, $options = array()) + public function fetchMetadata($path, $options = array()) { try { return $this->_s3->getInfo($this->_getFullPath($path, $options)); - } catch (Zend_Service_Amazon_S3_Exception $e) { + } catch (Zend_Service_Amazon_S3_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); } } @@ -275,7 +270,7 @@ public function fetchMetadata($path, $options = array()) * @param array $options * @return void */ - public function storeMetadata($destinationPath, $metadata, $options = array()) + public function storeMetadata($destinationPath, $metadata, $options = array()) { #require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Storing separate metadata is not supported, use storeItem() with \'metadata\' option key'); @@ -288,7 +283,7 @@ public function storeMetadata($destinationPath, $metadata, $options = array()) * @param array $options * @return void */ - public function deleteMetadata($path) + public function deleteMetadata($path) { #require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Deleting metadata not supported'); @@ -296,12 +291,12 @@ public function deleteMetadata($path) /** * Get full path, including bucket, for an object - * - * @param string $path - * @param array $options + * + * @param string $path + * @param array $options * @return void */ - protected function _getFullPath($path, $options) + protected function _getFullPath($path, $options) { if (isset($options[self::BUCKET_NAME])) { $bucket = $options[self::BUCKET_NAME]; @@ -327,6 +322,6 @@ protected function _getFullPath($path, $options) */ public function getClient() { - return $this->_s3; + return $this->_s3; } } diff --git a/lib/Zend/Cloud/StorageService/Adapter/WindowsAzure.php b/lib/Zend/Cloud/StorageService/Adapter/WindowsAzure.php index 4aa069911..51cd880db 100644 --- a/lib/Zend/Cloud/StorageService/Adapter/WindowsAzure.php +++ b/lib/Zend/Cloud/StorageService/Adapter/WindowsAzure.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -24,14 +24,14 @@ /** * * Windows Azure Blob Service abstraction - * + * * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cloud_StorageService_Adapter_WindowsAzure +class Zend_Cloud_StorageService_Adapter_WindowsAzure implements Zend_Cloud_StorageService_Adapter { const ACCOUNT_NAME = 'storage_accountname'; @@ -44,7 +44,7 @@ class Zend_Cloud_StorageService_Adapter_WindowsAzure const RETURN_TYPE = 'return_type'; const RETURN_PATHNAME = 'return_path'; const RETURN_OPENMODE = 'return_openmode'; - + /** return types for fetch */ const RETURN_PATH = 1; // return filename const RETURN_STRING = 2; // return data as string @@ -53,26 +53,26 @@ class Zend_Cloud_StorageService_Adapter_WindowsAzure /** return types for list */ const RETURN_LIST = 1; // return native list const RETURN_NAMES = 2; // return only names - + const DEFAULT_HOST = Zend_Service_WindowsAzure_Storage::URL_CLOUD_BLOB; /** * Storage container to operate on - * + * * @var string */ protected $_container; - + /** * Storage client - * + * * @var Zend_Service_WindowsAzure_Storage_Blob */ protected $_storageClient = null; /** * Creates a new Zend_Cloud_Storage_WindowsAzure instance - * + * * @param array|Zend_Config $options Options for the Zend_Cloud_Storage_WindowsAzure instance */ public function __construct($options = array()) @@ -91,30 +91,30 @@ public function __construct($options = array()) } else { $host = $options[self::HOST]; } - + if (!isset($options[self::ACCOUNT_NAME])) { throw new Zend_Cloud_StorageService_Exception('No Windows Azure account name provided.'); } if (!isset($options[self::ACCOUNT_KEY])) { throw new Zend_Cloud_StorageService_Exception('No Windows Azure account key provided.'); } - + $this->_storageClient = new Zend_Service_WindowsAzure_Storage_Blob($host, $options[self::ACCOUNT_NAME], $options[self::ACCOUNT_KEY]); - + // Parse other options if (!empty($options[self::PROXY_HOST])) { $proxyHost = $options[self::PROXY_HOST]; $proxyPort = isset($options[self::PROXY_PORT]) ? $options[self::PROXY_PORT] : 8080; $proxyCredentials = isset($options[self::PROXY_CREDENTIALS]) ? $options[self::PROXY_CREDENTIALS] : ''; - + $this->_storageClient->setProxy(true, $proxyHost, $proxyPort, $proxyCredentials); } - + if (isset($options[self::HTTP_ADAPTER])) { $this->_storageClient->setHttpClientChannel($options[self::HTTP_ADAPTER]); } - + // Set container $this->_container = $options[self::CONTAINER]; @@ -123,7 +123,7 @@ public function __construct($options = array()) $this->_storageClient->createContainer($this->_container); } } - + /** * Get an item from the storage service. * @@ -134,25 +134,25 @@ public function __construct($options = array()) public function fetchItem($path, $options = null) { // Options - $returnType = self::RETURN_STRING; + $returnType = self::RETURN_STRING; $returnPath = tempnam('', 'azr'); $openMode = 'r'; - + // Parse options if (is_array($options)) { if (isset($options[self::RETURN_TYPE])) { $returnType = $options[self::RETURN_TYPE]; } - + if (isset($options[self::RETURN_PATHNAME])) { $returnPath = $options[self::RETURN_PATHNAME]; } - + if (isset($options[self::RETURN_OPENMODE])) { $openMode = $options[self::RETURN_OPENMODE]; } } - + // Fetch the blob try { $this->_storageClient->getBlob( @@ -166,7 +166,7 @@ public function fetchItem($path, $options = null) } throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); } - + // Return value if ($returnType == self::RETURN_PATH) { return $returnPath; @@ -178,17 +178,17 @@ public function fetchItem($path, $options = null) return fopen($returnPath, $openMode); } } - + /** * Store an item in the storage service. - * WARNING: This operation overwrites any item that is located at + * WARNING: This operation overwrites any item that is located at * $destinationPath. * @param string $destinationPath * @param mixed $data * @param array $options * @return boolean */ - public function storeItem($destinationPath, $data, $options = null) + public function storeItem($destinationPath, $data, $options = null) { // Create a temporary file that will be uploaded $temporaryFilePath = ''; @@ -203,9 +203,9 @@ public function storeItem($destinationPath, $data, $options = null) while (!feof($fpSource)) { fwrite($fpDestination, fread($fpSource, 8192)); } - + fclose($fpDestination); - + $removeTemporaryFilePath = true; } elseif (file_exists($data)) { $temporaryFilePath = $data; @@ -215,7 +215,7 @@ public function storeItem($destinationPath, $data, $options = null) file_put_contents($temporaryFilePath, $data); $removeTemporaryFilePath = true; } - + try { // Upload data $this->_storageClient->putBlob( @@ -225,13 +225,13 @@ public function storeItem($destinationPath, $data, $options = null) ); } catch(Zend_Service_WindowsAzure_Exception $e) { @unlink($temporaryFilePath); - throw new Zend_Cloud_StorageService_Exception('Error on store: '.$e->getMessage(), $e->getCode(), $e); + throw new Zend_Cloud_StorageService_Exception('Error on store: '.$e->getMessage(), $e->getCode(), $e); } if ($removeTemporaryFilePath) { @unlink($temporaryFilePath); } } - + /** * Delete an item in the storage service. * @@ -246,11 +246,11 @@ public function deleteItem($path, $options = null) $this->_container, $path ); - } catch (Zend_Service_WindowsAzure_Exception $e) { + } catch (Zend_Service_WindowsAzure_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Copy an item in the storage service to a given path. * @@ -268,11 +268,11 @@ public function copyItem($sourcePath, $destinationPath, $options = null) $this->_container, $destinationPath ); - } catch (Zend_Service_WindowsAzure_Exception $e) { + } catch (Zend_Service_WindowsAzure_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on copy: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Move an item in the storage service to a given path. * @@ -290,17 +290,17 @@ public function moveItem($sourcePath, $destinationPath, $options = null) $this->_container, $destinationPath ); - + $this->_storageClient->deleteBlob( $this->_container, $sourcePath ); - } catch (Zend_Service_WindowsAzure_Exception $e) { + } catch (Zend_Service_WindowsAzure_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage(), $e->getCode(), $e); } - + } - + /** * Rename an item in the storage service to a given name. * @@ -314,10 +314,10 @@ public function renameItem($path, $name, $options = null) { return $this->moveItem($path, $name, $options); } - + /** * List items in the given directory in the storage service - * + * * The $path must be a directory * * @@ -329,32 +329,32 @@ public function listItems($path, $options = null) { // Options $returnType = self::RETURN_NAMES; // 1: return list of paths, 2: return raw output from underlying provider - + // Parse options if (is_array($options)&& isset($options[self::RETURN_TYPE])) { $returnType = $options[self::RETURN_TYPE]; } - + try { // Fetch list $blobList = $this->_storageClient->listBlobs( $this->_container, $path ); - } catch (Zend_Service_WindowsAzure_Exception $e) { + } catch (Zend_Service_WindowsAzure_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on list: '.$e->getMessage(), $e->getCode(), $e); } - + // Return if ($returnType == self::RETURN_LIST) { return $blobList; } - + $returnValue = array(); foreach ($blobList as $blob) { $returnValue[] = $blob->Name; } - + return $returnValue; } @@ -379,10 +379,10 @@ public function fetchMetadata($path, $options = null) throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Store a key/value array of metadata at the given path. - * WARNING: This operation overwrites any metadata that is located at + * WARNING: This operation overwrites any metadata that is located at * $destinationPath. * * @param string $destinationPath @@ -399,7 +399,7 @@ public function storeMetadata($destinationPath, $metadata, $options = null) } } } - + /** * Delete a key/value array of metadata at the given path. * @@ -417,17 +417,17 @@ public function deleteMetadata($path, $options = null) } } } - + /** * Delete container - * + * * @return void */ public function deleteContainer() { try { $this->_storageClient->deleteContainer($this->_container); - } catch (Zend_Service_WindowsAzure_Exception $e) { + } catch (Zend_Service_WindowsAzure_Exception $e) { throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$e->getMessage(), $e->getCode(), $e); } } @@ -438,6 +438,6 @@ public function deleteContainer() */ public function getClient() { - return $this->_storageClient; + return $this->_storageClient; } } diff --git a/lib/Zend/Cloud/StorageService/Exception.php b/lib/Zend/Cloud/StorageService/Exception.php index 0e25938da..f8022865d 100644 --- a/lib/Zend/Cloud/StorageService/Exception.php +++ b/lib/Zend/Cloud/StorageService/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_StorageService_Exception extends Zend_Cloud_Exception diff --git a/lib/Zend/Cloud/StorageService/Factory.php b/lib/Zend/Cloud/StorageService/Factory.php index fd2fe4ca3..cf69a2bbd 100644 --- a/lib/Zend/Cloud/StorageService/Factory.php +++ b/lib/Zend/Cloud/StorageService/Factory.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,34 +25,34 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_StorageService_Factory extends Zend_Cloud_AbstractFactory { const STORAGE_ADAPTER_KEY = 'storage_adapter'; - + /** * @var string Interface which adapter must implement to be considered valid */ protected static $_adapterInterface = 'Zend_Cloud_StorageService_Adapter'; /** * Constructor - * + * * @return void */ private function __construct() { // private ctor - should not be used } - + /** * Retrieve StorageService adapter - * - * @param array $options - * @return Zend_Cloud_StorageService_Adapter + * + * @param array $options + * @return void */ - public static function getAdapter($options = array()) + public static function getAdapter($options = array()) { $adapter = parent::_getAdapter(self::STORAGE_ADAPTER_KEY, $options); if (!$adapter) { diff --git a/lib/Zend/CodeGenerator/Abstract.php b/lib/Zend/CodeGenerator/Abstract.php index 4b92bdd30..c74a397c6 100644 --- a/lib/Zend/CodeGenerator/Abstract.php +++ b/lib/Zend/CodeGenerator/Abstract.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_CodeGenerator_Abstract diff --git a/lib/Zend/CodeGenerator/Exception.php b/lib/Zend/CodeGenerator/Exception.php index 3603a1b25..7b16b2dea 100644 --- a/lib/Zend/CodeGenerator/Exception.php +++ b/lib/Zend/CodeGenerator/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Exception extends Zend_Exception diff --git a/lib/Zend/CodeGenerator/Php/Abstract.php b/lib/Zend/CodeGenerator/Php/Abstract.php index 6e2551866..ac9eb6bb4 100644 --- a/lib/Zend/CodeGenerator/Php/Abstract.php +++ b/lib/Zend/CodeGenerator/Php/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_CodeGenerator_Php_Abstract extends Zend_CodeGenerator_Abstract diff --git a/lib/Zend/CodeGenerator/Php/Body.php b/lib/Zend/CodeGenerator/Php/Body.php index eabb5e337..77b5840aa 100644 --- a/lib/Zend/CodeGenerator/Php/Body.php +++ b/lib/Zend/CodeGenerator/Php/Body.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Body.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Body.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Body extends Zend_CodeGenerator_Abstract diff --git a/lib/Zend/CodeGenerator/Php/Class.php b/lib/Zend/CodeGenerator/Php/Class.php index 4c28fb46f..e33b4a889 100644 --- a/lib/Zend/CodeGenerator/Php/Class.php +++ b/lib/Zend/CodeGenerator/Php/Class.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Class.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Class.php 21915 2010-04-16 20:40:15Z matthew $ */ /** @@ -48,7 +48,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract @@ -84,11 +84,6 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract */ protected $_properties = null; - /** - * @var array Array of constants - */ - protected $_constants = null; - /** * @var array Array of methods */ @@ -161,7 +156,7 @@ public function setDocblock($docblock) if (is_array($docblock)) { $docblock = new Zend_CodeGenerator_Php_Docblock($docblock); - } elseif ((!is_null($docblock)) && (!$docblock instanceof Zend_CodeGenerator_Php_Docblock)) { + } elseif (!$docblock instanceof Zend_CodeGenerator_Php_Docblock) { #require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock'); } @@ -283,21 +278,6 @@ public function setProperties(Array $properties) return $this; } - /** - * setConstants() - * - * @param array $constants - * @return Zend_CodeGenerator_Php_Class - */ - public function setConstants(Array $constants) - { - foreach ($constants as $const) { - $this->setConstant($const); - } - - return $this; - } - /** * setProperty() * @@ -316,9 +296,6 @@ public function setProperty($property) throw new Zend_CodeGenerator_Php_Exception('setProperty() expects either an array of property options or an instance of Zend_CodeGenerator_Php_Property'); } - if ($property->isConst()) { - return $this->setConstant($property); - } if (isset($this->_properties[$propertyName])) { #require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('A property by name ' . $propertyName . ' already exists in this class.'); @@ -328,37 +305,6 @@ public function setProperty($property) return $this; } - /** - * setConstant() - * - * @param array|Zend_CodeGenerator_Php_Property $const - * @return Zend_CodeGenerator_Php_Class - */ - public function setConstant($const) - { - if (is_array($const)) { - $const = new Zend_CodeGenerator_Php_Property($const); - $constName = $const->getName(); - } elseif ($const instanceof Zend_CodeGenerator_Php_Property) { - $constName = $const->getName(); - } else { - #require_once 'Zend/CodeGenerator/Php/Exception.php'; - throw new Zend_CodeGenerator_Php_Exception('setConstant() expects either an array of property options or an instance of Zend_CodeGenerator_Php_Property'); - } - - if (!$const->isConst()) { - #require_once 'Zend/CodeGenerator/Php/Exception.php'; - throw new Zend_CodeGenerator_Php_Exception('setProperty() expects argument to define a constant'); - } - if (isset($this->_constants[$constName])) { - #require_once 'Zend/CodeGenerator/Php/Exception.php'; - throw new Zend_CodeGenerator_Php_Exception('A constant by name ' . $constName . ' already exists in this class.'); - } - - $this->_constants[$constName] = $const; - return $this; - } - /** * getProperties() * @@ -369,16 +315,6 @@ public function getProperties() return $this->_properties; } - /** - * getConstants() - * - * @return array - */ - public function getConstants() - { - return $this->_constants; - } - /** * getProperty() * @@ -395,22 +331,6 @@ public function getProperty($propertyName) return false; } - /** - * getConstant() - * - * @param string $constName - * @return Zend_CodeGenerator_Php_Property - */ - public function getConstant($constName) - { - foreach ($this->_constants as $const) { - if ($const->getName() == $constName) { - return $const; - } - } - return false; - } - /** * hasProperty() * @@ -422,17 +342,6 @@ public function hasProperty($propertyName) return isset($this->_properties[$propertyName]); } - /** - * hasConstant() - * - * @param string $constName - * @return bool - */ - public function hasConstant($constName) - { - return isset($this->_constants[$constName]); - } - /** * setMethods() * @@ -528,12 +437,6 @@ public function isSourceDirty() } } - foreach ($this->_constants as $constant) { - if ($constant->isSourceDirty()) { - return true; - } - } - foreach ($this->_methods as $method) { if ($method->isSourceDirty()) { return true; @@ -578,13 +481,6 @@ public function generate() $output .= self::LINE_FEED . '{' . self::LINE_FEED . self::LINE_FEED; - $constants = $this->getConstants(); - if (!empty($constants)) { - foreach ($constants as $const) { - $output .= $const->generate() . self::LINE_FEED . self::LINE_FEED; - } - } - $properties = $this->getProperties(); if (!empty($properties)) { foreach ($properties as $property) { @@ -611,7 +507,6 @@ public function generate() protected function _init() { $this->_properties = new Zend_CodeGenerator_Php_Member_Container(Zend_CodeGenerator_Php_Member_Container::TYPE_PROPERTY); - $this->_constants = new Zend_CodeGenerator_Php_Member_Container(Zend_CodeGenerator_Php_Member_Container::TYPE_PROPERTY); $this->_methods = new Zend_CodeGenerator_Php_Member_Container(Zend_CodeGenerator_Php_Member_Container::TYPE_METHOD); } diff --git a/lib/Zend/CodeGenerator/Php/Docblock.php b/lib/Zend/CodeGenerator/Php/Docblock.php index 4ef5295d2..d48ce71c5 100644 --- a/lib/Zend/CodeGenerator/Php/Docblock.php +++ b/lib/Zend/CodeGenerator/Php/Docblock.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Docblock.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Docblock.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract @@ -211,11 +211,7 @@ protected function _docCommentize($content) $content = wordwrap($content, 80, self::LINE_FEED); $lines = explode(self::LINE_FEED, $content); foreach ($lines as $line) { - $output .= $indent . ' *'; - if ($line) { - $output .= " $line"; - } - $output .= self::LINE_FEED; + $output .= $indent . ' * ' . $line . self::LINE_FEED; } $output .= $indent . ' */' . self::LINE_FEED; return $output; diff --git a/lib/Zend/CodeGenerator/Php/Docblock/Tag.php b/lib/Zend/CodeGenerator/Php/Docblock/Tag.php index 0385ef373..f919cb0c5 100644 --- a/lib/Zend/CodeGenerator/Php/Docblock/Tag.php +++ b/lib/Zend/CodeGenerator/Php/Docblock/Tag.php @@ -15,20 +15,30 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tag.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Tag.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** - * @see Zend_CodeGenerator_Php_Abstract + * @see Zend_CodeGenerator_Abstract */ #require_once 'Zend/CodeGenerator/Php/Abstract.php'; +/** + * @see Zend_CodeGenerator_Php_Docblock_Tag_Param + */ +#require_once 'Zend/CodeGenerator/Php/Docblock/Tag/Param.php'; + +/** + * @see Zend_CodeGenerator_Php_Docblock_Tag_Return + */ +#require_once 'Zend/CodeGenerator/Php/Docblock/Tag/Return.php'; + /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstract @@ -168,11 +178,7 @@ public function getDescription() */ public function generate() { - $tag = '@' . $this->_name; - if ($this->_description) { - $tag .= ' ' . $this->_description; - } - return $tag; + return '@' . $this->_name . ' ' . $this->_description; } -} +} \ No newline at end of file diff --git a/lib/Zend/CodeGenerator/Php/Docblock/Tag/License.php b/lib/Zend/CodeGenerator/Php/Docblock/Tag/License.php index 627bb33e3..c83f2deec 100644 --- a/lib/Zend/CodeGenerator/Php/Docblock/Tag/License.php +++ b/lib/Zend/CodeGenerator/Php/Docblock/Tag/License.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: License.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: License.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Docblock_Tag_License extends Zend_CodeGenerator_Php_Docblock_Tag diff --git a/lib/Zend/CodeGenerator/Php/Docblock/Tag/Param.php b/lib/Zend/CodeGenerator/Php/Docblock/Tag/Param.php index 195ee9f3d..af453e8e5 100644 --- a/lib/Zend/CodeGenerator/Php/Docblock/Tag/Param.php +++ b/lib/Zend/CodeGenerator/Php/Docblock/Tag/Param.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Param.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Param.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Docblock_Tag_Param extends Zend_CodeGenerator_Php_Docblock_Tag @@ -53,7 +53,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Param extends Zend_CodeGenerator_Php_D * fromReflection() * * @param Zend_Reflection_Docblock_Tag $reflectionTagParam - * @return Zend_CodeGenerator_Php_Docblock_Tag + * @return Zend_CodeGenerator_Php_Docblock_Tag_Param */ public static function fromReflection(Zend_Reflection_Docblock_Tag $reflectionTagParam) { diff --git a/lib/Zend/CodeGenerator/Php/Docblock/Tag/Return.php b/lib/Zend/CodeGenerator/Php/Docblock/Tag/Return.php index 762efa7c1..974142ee2 100644 --- a/lib/Zend/CodeGenerator/Php/Docblock/Tag/Return.php +++ b/lib/Zend/CodeGenerator/Php/Docblock/Tag/Return.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Return.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Return.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Docblock_Tag_Return extends Zend_CodeGenerator_Php_Docblock_Tag diff --git a/lib/Zend/CodeGenerator/Php/Exception.php b/lib/Zend/CodeGenerator/Php/Exception.php index f85a8f373..76a777f98 100644 --- a/lib/Zend/CodeGenerator/Php/Exception.php +++ b/lib/Zend/CodeGenerator/Php/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Exception extends Zend_CodeGenerator_Exception diff --git a/lib/Zend/CodeGenerator/Php/File.php b/lib/Zend/CodeGenerator/Php/File.php index aec8533b6..9c9c4c94b 100644 --- a/lib/Zend/CodeGenerator/Php/File.php +++ b/lib/Zend/CodeGenerator/Php/File.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract @@ -97,7 +97,7 @@ public static function registerFileCodeGenerator(Zend_CodeGenerator_Php_File $fi } /** - * fromReflectedFileName() - use this if you intend on generating code generation objects based on the same file. + * fromReflectedFilePath() - use this if you intend on generating code generation objects based on the same file. * This will keep previous changes to the file in tact during the same PHP process * * @param string $filePath @@ -110,7 +110,7 @@ public static function fromReflectedFileName($filePath, $usePreviousCodeGenerato $realpath = realpath($filePath); if ($realpath === false) { - if ( ($realpath = Zend_Reflection_File::findRealpathInIncludePath($filePath)) === false) { + if ( ($realpath = Zend_Reflection_file::findRealpathInIncludePath($filePath)) === false) { #require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('No file for ' . $realpath . ' was found.'); } @@ -394,7 +394,7 @@ public function generate() // if there are markers, put the body into the output $body = $this->getBody(); - if (preg_match('#/\* Zend_CodeGenerator_Php_File-(.*?)Marker#', $body)) { + if (preg_match('#/\* Zend_CodeGenerator_Php_File-(.*?)Marker:#', $body)) { $output .= $body; $body = ''; } @@ -428,9 +428,6 @@ public function generate() $classes = $this->getClasses(); if (!empty($classes)) { foreach ($classes as $class) { - if($this->getDocblock() == $class->getDocblock()) { - $class->setDocblock(null); - } $regex = str_replace('?', $class->getName(), self::$_markerClass); $regex = preg_quote($regex, '#'); if (preg_match('#'.$regex.'#', $output)) { diff --git a/lib/Zend/CodeGenerator/Php/Member/Abstract.php b/lib/Zend/CodeGenerator/Php/Member/Abstract.php index 13162f8f8..67517e4cb 100644 --- a/lib/Zend/CodeGenerator/Php/Member/Abstract.php +++ b/lib/Zend/CodeGenerator/Php/Member/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator_Php_Abstract diff --git a/lib/Zend/CodeGenerator/Php/Member/Container.php b/lib/Zend/CodeGenerator/Php/Member/Container.php index 944f6e1ce..e0e613291 100644 --- a/lib/Zend/CodeGenerator/Php/Member/Container.php +++ b/lib/Zend/CodeGenerator/Php/Member/Container.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Container.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Container.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Member_Container extends ArrayObject diff --git a/lib/Zend/CodeGenerator/Php/Method.php b/lib/Zend/CodeGenerator/Php/Method.php index d2a240114..cd32851a2 100644 --- a/lib/Zend/CodeGenerator/Php/Method.php +++ b/lib/Zend/CodeGenerator/Php/Method.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Method.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Method.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -38,7 +38,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstract @@ -220,12 +220,10 @@ public function generate() $output .= ')' . self::LINE_FEED . $indent . '{' . self::LINE_FEED; - if ($this->_body && $this->isSourceDirty()) { + if ($this->_body) { $output .= ' ' . str_replace(self::LINE_FEED, self::LINE_FEED . $indent . $indent, trim($this->_body)) . self::LINE_FEED; - } elseif ($this->_body) { - $output .= $this->_body . self::LINE_FEED; } $output .= $indent . '}' . self::LINE_FEED; diff --git a/lib/Zend/CodeGenerator/Php/Parameter.php b/lib/Zend/CodeGenerator/Php/Parameter.php index a54cb3de0..099a3c31f 100644 --- a/lib/Zend/CodeGenerator/Php/Parameter.php +++ b/lib/Zend/CodeGenerator/Php/Parameter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parameter.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Parameter.php 21889 2010-04-16 18:40:50Z juokaz $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract diff --git a/lib/Zend/CodeGenerator/Php/Parameter/DefaultValue.php b/lib/Zend/CodeGenerator/Php/Parameter/DefaultValue.php index 289548d66..6b245d5ea 100644 --- a/lib/Zend/CodeGenerator/Php/Parameter/DefaultValue.php +++ b/lib/Zend/CodeGenerator/Php/Parameter/DefaultValue.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage Php - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DefaultValue.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: DefaultValue.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage Php - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Parameter_DefaultValue diff --git a/lib/Zend/CodeGenerator/Php/Property.php b/lib/Zend/CodeGenerator/Php/Property.php index ff6d68b91..9ec019eaa 100644 --- a/lib/Zend/CodeGenerator/Php/Property.php +++ b/lib/Zend/CodeGenerator/Php/Property.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Property.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Property.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abstract diff --git a/lib/Zend/CodeGenerator/Php/Property/DefaultValue.php b/lib/Zend/CodeGenerator/Php/Property/DefaultValue.php index 385f9f1de..02a4014ba 100644 --- a/lib/Zend/CodeGenerator/Php/Property/DefaultValue.php +++ b/lib/Zend/CodeGenerator/Php/Property/DefaultValue.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DefaultValue.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: DefaultValue.php 21979 2010-04-24 11:07:11Z jan $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Php_Abstract diff --git a/lib/Zend/Config.php b/lib/Zend/Config.php index 0ebce6ba7..caa10dfe4 100644 --- a/lib/Zend/Config.php +++ b/lib/Zend/Config.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Config.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Config.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config implements Countable, Iterator diff --git a/lib/Zend/Config/Exception.php b/lib/Zend/Config/Exception.php index a63dfd733..59de84a3c 100644 --- a/lib/Zend/Config/Exception.php +++ b/lib/Zend/Config/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Exception extends Zend_Exception {} diff --git a/lib/Zend/Config/Ini.php b/lib/Zend/Config/Ini.php index 41f143363..46e878cfa 100644 --- a/lib/Zend/Config/Ini.php +++ b/lib/Zend/Config/Ini.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ini.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Ini.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Ini extends Zend_Config @@ -83,17 +83,16 @@ class Zend_Config_Ini extends Zend_Config * * The $options parameter may be provided as either a boolean or an array. * If provided as a boolean, this sets the $allowModifications option of - * Zend_Config. If provided as an array, there are three configuration + * Zend_Config. If provided as an array, there are two configuration * directives that may be set. For example: * * $options = array( * 'allowModifications' => false, - * 'nestSeparator' => ':', - * 'skipExtends' => false, + * 'nestSeparator' => '->' * ); * * @param string $filename - * @param mixed $section + * @param string|null $section * @param boolean|array $options * @throws Zend_Config_Exception * @return void @@ -158,11 +157,11 @@ public function __construct($filename, $section = null, $options = false) $this->_loadedSection = $section; } - + /** * Load the INI file from disk using parse_ini_file(). Use a private error * handler to convert any loading errors into a Zend_Config_Exception - * + * * @param string $filename * @throws Zend_Config_Exception * @return array @@ -172,7 +171,7 @@ protected function _parseIniFile($filename) set_error_handler(array($this, '_loadFileErrorHandler')); $iniArray = parse_ini_file($filename, true); // Warnings and errors are suppressed restore_error_handler(); - + // Check if there was a error while loading file if ($this->_loadFileErrorStr !== null) { /** @@ -181,7 +180,7 @@ protected function _parseIniFile($filename) #require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception($this->_loadFileErrorStr); } - + return $iniArray; } diff --git a/lib/Zend/Config/Json.php b/lib/Zend/Config/Json.php index 242cd06f1..5d8f44263 100644 --- a/lib/Zend/Config/Json.php +++ b/lib/Zend/Config/Json.php @@ -16,7 +16,7 @@ * @package Zend_Config * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 24810 2012-05-17 21:20:12Z rob $ + * @version $Id: Json.php 23294 2010-11-05 00:27:34Z ramon $ */ /** @@ -220,9 +220,7 @@ protected function _replaceConstants($value) { foreach ($this->_getConstants() as $constant) { if (strstr($value, $constant)) { - // handle backslashes that may represent windows path names for instance - $replacement = str_replace('\\', '\\\\', constant($constant)); - $value = str_replace($constant, $replacement, $value); + $value = str_replace($constant, constant($constant), $value); } } return $value; diff --git a/lib/Zend/Config/Writer.php b/lib/Zend/Config/Writer.php index 20bd0789b..9bfedca74 100644 --- a/lib/Zend/Config/Writer.php +++ b/lib/Zend/Config/Writer.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Writer.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id: Writer.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Config_Writer diff --git a/lib/Zend/Config/Writer/Array.php b/lib/Zend/Config/Writer/Array.php index 378d01371..c324d52cd 100644 --- a/lib/Zend/Config/Writer/Array.php +++ b/lib/Zend/Config/Writer/Array.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Array.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Writer_Array extends Zend_Config_Writer_FileAbstract diff --git a/lib/Zend/Config/Writer/FileAbstract.php b/lib/Zend/Config/Writer/FileAbstract.php index 79659bd83..59a9d0227 100644 --- a/lib/Zend/Config/Writer/FileAbstract.php +++ b/lib/Zend/Config/Writer/FileAbstract.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Config * @package Writer - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,9 +26,9 @@ * * @category Zend * @package Zend_package - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FileAbstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: FileAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $ */ class Zend_Config_Writer_FileAbstract extends Zend_Config_Writer { diff --git a/lib/Zend/Config/Writer/Ini.php b/lib/Zend/Config/Writer/Ini.php index 5f23a59f0..30d793dba 100644 --- a/lib/Zend/Config/Writer/Ini.php +++ b/lib/Zend/Config/Writer/Ini.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ini.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Ini.php 21983 2010-04-25 08:09:09Z jan $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Writer_Ini extends Zend_Config_Writer_FileAbstract @@ -161,11 +161,11 @@ protected function _prepareValue($value) throw new Zend_Config_Exception('Value can not contain double quotes "'); } } - + /** * Root elements that are not assigned to any section needs to be * on the top of config. - * + * * @see http://framework.zend.com/issues/browse/ZF-6289 * @param Zend_Config * @return Zend_Config @@ -174,7 +174,7 @@ protected function _sortRootElements(Zend_Config $config) { $configArray = $config->toArray(); $sections = array(); - + // remove sections from config array foreach ($configArray as $key => $value) { if (is_array($value)) { @@ -182,12 +182,12 @@ protected function _sortRootElements(Zend_Config $config) unset($configArray[$key]); } } - + // readd sections to the end foreach ($sections as $key => $value) { $configArray[$key] = $value; } - + return new Zend_Config($configArray); } } diff --git a/lib/Zend/Config/Writer/Json.php b/lib/Zend/Config/Writer/Json.php index 8b27a3d80..59f277c61 100644 --- a/lib/Zend/Config/Writer/Json.php +++ b/lib/Zend/Config/Writer/Json.php @@ -16,7 +16,7 @@ * @package Zend_Config * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 23293 2010-11-04 23:40:23Z ramon $ + * @version $Id: Json.php 23294 2010-11-05 00:27:34Z ramon $ */ /** diff --git a/lib/Zend/Config/Writer/Xml.php b/lib/Zend/Config/Writer/Xml.php index 708fbec13..0806b66e4 100644 --- a/lib/Zend/Config/Writer/Xml.php +++ b/lib/Zend/Config/Writer/Xml.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xml.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Xml.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Writer_Xml extends Zend_Config_Writer_FileAbstract diff --git a/lib/Zend/Config/Writer/Yaml.php b/lib/Zend/Config/Writer/Yaml.php index edc63ef6a..27b693587 100644 --- a/lib/Zend/Config/Writer/Yaml.php +++ b/lib/Zend/Config/Writer/Yaml.php @@ -16,7 +16,7 @@ * @package Zend_Config * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Yaml.php 23650 2011-01-21 21:32:57Z mikaelkael $ + * @version $Id: Yaml.php 23294 2010-11-05 00:27:34Z ramon $ */ /** @@ -57,7 +57,7 @@ public function getYamlEncoder() /** * Set callback for decoding YAML * - * @param callable $yamlEncoder the decoder to set + * @param $yamlEncoder the decoder to set * @return Zend_Config_Yaml */ public function setYamlEncoder($yamlEncoder) diff --git a/lib/Zend/Config/Xml.php b/lib/Zend/Config/Xml.php index 727a8e62a..d2230992a 100644 --- a/lib/Zend/Config/Xml.php +++ b/lib/Zend/Config/Xml.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xml.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Xml.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Xml extends Zend_Config @@ -58,20 +58,10 @@ class Zend_Config_Xml extends Zend_Config * * Note that the keys in $section will override any keys of the same * name in the sections that have been included via "extends". - * - * The $options parameter may be provided as either a boolean or an array. - * If provided as a boolean, this sets the $allowModifications option of - * Zend_Config. If provided as an array, there are two configuration - * directives that may be set. For example: * - * $options = array( - * 'allowModifications' => false, - * 'skipExtends' => false - * ); - * - * @param string $xml XML file or string to process - * @param mixed $section Section to process - * @param array|boolean $options + * @param string $xml XML file or string to process + * @param mixed $section Section to process + * @param boolean $options Whether modifications are allowed at runtime * @throws Zend_Config_Exception When xml is not set or cannot be loaded * @throws Zend_Config_Exception When section $sectionName cannot be found in $xml */ diff --git a/lib/Zend/Config/Yaml.php b/lib/Zend/Config/Yaml.php index a2dfbf817..9e631cf42 100644 --- a/lib/Zend/Config/Yaml.php +++ b/lib/Zend/Config/Yaml.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Yaml.php 25169 2012-12-22 12:23:11Z rob $ + * @version $Id: Yaml.php 23294 2010-11-05 00:27:34Z ramon $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Yaml extends Zend_Config @@ -93,7 +93,7 @@ public function getYamlDecoder() /** * Set callback for decoding YAML * - * @param callable $yamlDecoder the decoder to set + * @param $yamlDecoder the decoder to set * @return Zend_Config_Yaml */ public function setYamlDecoder($yamlDecoder) @@ -124,9 +124,9 @@ public function setYamlDecoder($yamlDecoder) * - skip_extends: whether or not to skip processing of parent configuration * - yaml_decoder: a callback to use to decode the Yaml source * - * @param string $yaml YAML file to process - * @param mixed $section Section to process - * @param array|boolean $options + * @param string $yaml YAML file to process + * @param mixed $section Section to process + * @param boolean $options Whether modifiacations are allowed at runtime */ public function __construct($yaml, $section = null, $options = false) { @@ -201,10 +201,7 @@ public function __construct($yaml, $section = null, $options = false) foreach ($section as $sectionName) { if (!isset($config[$sectionName])) { #require_once 'Zend/Config/Exception.php'; - throw new Zend_Config_Exception(sprintf( - 'Section "%s" cannot be found', - implode(' ', (array)$section) - )); + throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section)); } $dataArray = array_merge($this->_processExtends($config, $sectionName), $dataArray); @@ -213,10 +210,7 @@ public function __construct($yaml, $section = null, $options = false) } else { if (!isset($config[$section])) { #require_once 'Zend/Config/Exception.php'; - throw new Zend_Config_Exception(sprintf( - 'Section "%s" cannot be found', - implode(' ', (array)$section) - )); + throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section)); } $dataArray = $this->_processExtends($config, $section); @@ -290,13 +284,14 @@ protected static function _decodeYaml($currentIndent, &$lines) $config = array(); $inIndent = false; while (list($n, $line) = each($lines)) { - $lineno = $n + 1; - - $line = rtrim(preg_replace("/#.*$/", "", $line)); + $lineno = $n+1; if (strlen($line) == 0) { continue; } - + if ($line[0] == '#') { + // comment + continue; + } $indent = strspn($line, " "); // line without the spaces @@ -316,12 +311,20 @@ protected static function _decodeYaml($currentIndent, &$lines) $inIndent = true; } - if (preg_match("/(?!-)([\w\-]+):\s*(.*)/", $line, $m)) { + if (preg_match("/(\w+):\s*(.*)/", $line, $m)) { // key: value - if (strlen($m[2])) { + if ($m[2]) { // simple key: value - $value = preg_replace("/#.*$/", "", $m[2]); - $value = self::_parseValue($value); + $value = $m[2]; + // Check for booleans and constants + if (preg_match('/^(t(rue)?|on|y(es)?)$/i', $value)) { + $value = true; + } elseif (preg_match('/^(f(alse)?|off|n(o)?)$/i', $value)) { + $value = false; + } elseif (!self::$_ignoreConstants) { + // test for constants + $value = self::_replaceConstants($value); + } } else { // key: and then values on new lines $value = self::_decodeYaml($currentIndent + 1, $lines); @@ -334,9 +337,7 @@ protected static function _decodeYaml($currentIndent, &$lines) // item in the list: // - FOO if (strlen($line) > 2) { - $value = substr($line, 2); - - $config[] = self::_parseValue($value); + $config[] = substr($line, 2); } else { $config[] = self::_decodeYaml($currentIndent + 1, $lines); } @@ -351,40 +352,6 @@ protected static function _decodeYaml($currentIndent, &$lines) return $config; } - /** - * Parse values - * - * @param string $value - * @return string - */ - protected static function _parseValue($value) - { - $value = trim($value); - - // remove quotes from string. - if ('"' == $value['0']) { - if ('"' == $value[count($value) -1]) { - $value = substr($value, 1, -1); - } - } elseif ('\'' == $value['0'] && '\'' == $value[count($value) -1]) { - $value = strtr($value, array("''" => "'", "'" => '')); - } - - // Check for booleans and constants - if (preg_match('/^(t(rue)?|on|y(es)?)$/i', $value)) { - $value = true; - } elseif (preg_match('/^(f(alse)?|off|n(o)?)$/i', $value)) { - $value = false; - } elseif (strcasecmp($value, 'null') === 0) { - $value = null; - } elseif (!self::$_ignoreConstants) { - // test for constants - $value = self::_replaceConstants($value); - } - - return $value; - } - /** * Replace any constants referenced in a string with their values * diff --git a/lib/Zend/Console/Getopt.php b/lib/Zend/Console/Getopt.php index 815eda90d..db10f86e6 100644 --- a/lib/Zend/Console/Getopt.php +++ b/lib/Zend/Console/Getopt.php @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Console_Getopt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Getopt.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Getopt.php 22191 2010-05-17 21:50:14Z jan $ */ /** @@ -80,7 +80,7 @@ * * @category Zend * @package Zend_Console_Getopt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version Release: @package_version@ * @since Class available since Release 0.6.0 diff --git a/lib/Zend/Console/Getopt/Exception.php b/lib/Zend/Console/Getopt/Exception.php index 44847263a..849043186 100644 --- a/lib/Zend/Console/Getopt/Exception.php +++ b/lib/Zend/Console/Getopt/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Console_Getopt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Console_Getopt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Console_Getopt_Exception extends Zend_Exception diff --git a/lib/Zend/Controller/Action.php b/lib/Zend/Controller/Action.php index 7407f13e0..3a3dc17b2 100644 --- a/lib/Zend/Controller/Action.php +++ b/lib/Zend/Controller/Action.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Action.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Action.php 22792 2010-08-05 18:30:27Z matthew $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Action implements Zend_Controller_Action_Interface @@ -505,18 +505,14 @@ public function dispatch($action) $this->_classMethods = get_class_methods($this); } - // If pre-dispatch hooks introduced a redirect then stop dispatch - // @see ZF-7496 - if (!($this->getResponse()->isRedirect())) { - // preDispatch() didn't change the action, so we can continue - if ($this->getInvokeArg('useCaseSensitiveActions') || in_array($action, $this->_classMethods)) { - if ($this->getInvokeArg('useCaseSensitiveActions')) { - trigger_error('Using case sensitive actions without word separators is deprecated; please do not rely on this "feature"'); - } - $this->$action(); - } else { - $this->__call($action, array()); + // preDispatch() didn't change the action, so we can continue + if ($this->getInvokeArg('useCaseSensitiveActions') || in_array($action, $this->_classMethods)) { + if ($this->getInvokeArg('useCaseSensitiveActions')) { + trigger_error('Using case sensitive actions without word separators is deprecated; please do not rely on this "feature"'); } + $this->$action(); + } else { + $this->__call($action, array()); } $this->postDispatch(); } @@ -582,25 +578,9 @@ public function run(Zend_Controller_Request_Abstract $request = null, Zend_Contr * @return mixed */ protected function _getParam($paramName, $default = null) - { - return $this->getParam($paramName, $default); - } - - /** - * Gets a parameter from the {@link $_request Request object}. If the - * parameter does not exist, NULL will be returned. - * - * If the parameter does not exist and $default is set, then - * $default will be returned instead of NULL. - * - * @param string $paramName - * @param mixed $default - * @return mixed - */ - public function getParam($paramName, $default = null) { $value = $this->getRequest()->getParam($paramName); - if ((null === $value || '' === $value) && (null !== $default)) { + if ((null === $value || '' === $value) && (null !== $default)) { $value = $default; } @@ -613,22 +593,8 @@ public function getParam($paramName, $default = null) * @param string $paramName * @param mixed $value * @return Zend_Controller_Action - * @deprecated Deprecated as of Zend Framework 1.7. Use - * setParam() instead. */ protected function _setParam($paramName, $value) - { - return $this->setParam($paramName, $value); - } - - /** - * Set a parameter in the {@link $_request Request object}. - * - * @param string $paramName - * @param mixed $value - * @return Zend_Controller_Action - */ - public function setParam($paramName, $value) { $this->getRequest()->setParam($paramName, $value); @@ -641,22 +607,8 @@ public function setParam($paramName, $value) * * @param string $paramName * @return boolean - * @deprecated Deprecated as of Zend Framework 1.7. Use - * hasParam() instead. */ protected function _hasParam($paramName) - { - return $this->hasParam($paramName); - } - - /** - * Determine whether a given parameter exists in the - * {@link $_request Request object}. - * - * @param string $paramName - * @return boolean - */ - public function hasParam($paramName) { return null !== $this->getRequest()->getParam($paramName); } @@ -666,21 +618,8 @@ public function hasParam($paramName) * as an associative array. * * @return array - * @deprecated Deprecated as of Zend Framework 1.7. Use - * getAllParams() instead. */ protected function _getAllParams() - { - return $this->getAllParams(); - } - - /** - * Return all parameters in the {@link $_request Request object} - * as an associative array. - * - * @return array - */ - public function getAllParams() { return $this->getRequest()->getParams(); } @@ -711,41 +650,8 @@ public function getAllParams() * @param string $module * @param array $params * @return void - * @deprecated Deprecated as of Zend Framework 1.7. Use - * forward() instead. */ final protected function _forward($action, $controller = null, $module = null, array $params = null) - { - $this->forward($action, $controller, $module, $params); - } - - /** - * Forward to another controller/action. - * - * It is important to supply the unformatted names, i.e. "article" - * rather than "ArticleController". The dispatcher will do the - * appropriate formatting when the request is received. - * - * If only an action name is provided, forwards to that action in this - * controller. - * - * If an action and controller are specified, forwards to that action and - * controller in this module. - * - * Specifying an action, controller, and module is the most specific way to - * forward. - * - * A fourth argument, $params, will be used to set the request parameters. - * If either the controller or module are unnecessary for forwarding, - * simply pass null values for them before specifying the parameters. - * - * @param string $action - * @param string $controller - * @param string $module - * @param array $params - * @return void - */ - final public function forward($action, $controller = null, $module = null, array $params = null) { $request = $this->getRequest(); @@ -774,24 +680,8 @@ final public function forward($action, $controller = null, $module = null, array * @param string $url * @param array $options Options to be used when redirecting * @return void - * @deprecated Deprecated as of Zend Framework 1.7. Use - * redirect() instead. */ protected function _redirect($url, array $options = array()) - { - $this->redirect($url, $options); - } - - /** - * Redirect to another URL - * - * Proxies to {@link Zend_Controller_Action_Helper_Redirector::gotoUrl()}. - * - * @param string $url - * @param array $options Options to be used when redirecting - * @return void - */ - public function redirect($url, array $options = array()) { $this->_helper->redirector->gotoUrl($url, $options); } diff --git a/lib/Zend/Controller/Action/Exception.php b/lib/Zend/Controller/Action/Exception.php index e7ba2f828..37de78b19 100644 --- a/lib/Zend/Controller/Action/Exception.php +++ b/lib/Zend/Controller/Action/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Exception extends Zend_Controller_Exception diff --git a/lib/Zend/Controller/Action/Helper/Abstract.php b/lib/Zend/Controller/Action/Helper/Abstract.php index bec7ebb66..383655a68 100644 --- a/lib/Zend/Controller/Action/Helper/Abstract.php +++ b/lib/Zend/Controller/Action/Helper/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 20261 2010-01-13 18:55:25Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Action_Helper_Abstract @@ -142,15 +142,13 @@ public function getResponse() */ public function getName() { - $fullClassName = get_class($this); - if (strpos($fullClassName, '_') !== false) { - $helperName = strrchr($fullClassName, '_'); - return ltrim($helperName, '_'); - } elseif (strpos($fullClassName, '\\') !== false) { - $helperName = strrchr($fullClassName, '\\'); - return ltrim($helperName, '\\'); + $full_class_name = get_class($this); + + if (strpos($full_class_name, '_') !== false) { + $helper_name = strrchr($full_class_name, '_'); + return ltrim($helper_name, '_'); } else { - return $fullClassName; + return $full_class_name; } } } diff --git a/lib/Zend/Controller/Action/Helper/ActionStack.php b/lib/Zend/Controller/Action/Helper/ActionStack.php index 5c4362657..0d3cdeaa5 100644 --- a/lib/Zend/Controller/Action/Helper/ActionStack.php +++ b/lib/Zend/Controller/Action/Helper/ActionStack.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActionStack.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ActionStack.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_Helper_Abstract diff --git a/lib/Zend/Controller/Action/Helper/AjaxContext.php b/lib/Zend/Controller/Action/Helper/AjaxContext.php index 68ec1e19b..710782d61 100644 --- a/lib/Zend/Controller/Action/Helper/AjaxContext.php +++ b/lib/Zend/Controller/Action/Helper/AjaxContext.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AjaxContext.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: AjaxContext.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_AjaxContext extends Zend_Controller_Action_Helper_ContextSwitch @@ -68,10 +68,7 @@ public function initContext($format = null) { $this->_currentContext = null; - $request = $this->getRequest(); - if (!method_exists($request, 'isXmlHttpRequest') || - !$this->getRequest()->isXmlHttpRequest()) - { + if (!$this->getRequest()->isXmlHttpRequest()) { return; } diff --git a/lib/Zend/Controller/Action/Helper/AutoComplete/Abstract.php b/lib/Zend/Controller/Action/Helper/AutoComplete/Abstract.php index d04f90e53..74d273068 100644 --- a/lib/Zend/Controller/Action/Helper/AutoComplete/Abstract.php +++ b/lib/Zend/Controller/Action/Helper/AutoComplete/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_Controller_Action_Helper_Abstract diff --git a/lib/Zend/Controller/Action/Helper/AutoCompleteDojo.php b/lib/Zend/Controller/Action/Helper/AutoCompleteDojo.php index b47e50faa..65198977d 100644 --- a/lib/Zend/Controller/Action/Helper/AutoCompleteDojo.php +++ b/lib/Zend/Controller/Action/Helper/AutoCompleteDojo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AutoCompleteDojo.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: AutoCompleteDojo.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Action_Helper_AutoComplete_Abstract diff --git a/lib/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php b/lib/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php index 459cd51a6..0f24ecf87 100644 --- a/lib/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php +++ b/lib/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AutoCompleteScriptaculous.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: AutoCompleteScriptaculous.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_AutoCompleteScriptaculous extends Zend_Controller_Action_Helper_AutoComplete_Abstract diff --git a/lib/Zend/Controller/Action/Helper/Cache.php b/lib/Zend/Controller/Action/Helper/Cache.php index 6ad86c220..26f8fb0e7 100644 --- a/lib/Zend/Controller/Action/Helper/Cache.php +++ b/lib/Zend/Controller/Action/Helper/Cache.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 24853 2012-05-31 23:19:27Z adamlundrigan $ + * @version $Id: Cache.php 22662 2010-07-24 17:37:36Z mabe $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_Cache @@ -64,7 +64,7 @@ class Zend_Controller_Action_Helper_Cache * @var array */ protected $_tags = array(); - + /** * Indexed map of Extensions by Controller and Action * @@ -130,26 +130,16 @@ public function direct(array $actions, array $tags = array(), $extension = null) public function removePage($relativeUrl, $recursive = false) { $cache = $this->getCache(Zend_Cache_Manager::PAGECACHE); - $encodedCacheId = $this->_encodeCacheId($relativeUrl); - if ($recursive) { $backend = $cache->getBackend(); if (($backend instanceof Zend_Cache_Backend) && method_exists($backend, 'removeRecursively') ) { - $result = $backend->removeRecursively($encodedCacheId); - if (is_null($result) ) { - $result = $backend->removeRecursively($relativeUrl); - } - return $result; + return $backend->removeRecursively($relativeUrl); } } - $result = $cache->remove($encodedCacheId); - if (is_null($result) ) { - $result = $cache->remove($relativeUrl); - } - return $result; + return $cache->remove($relativeUrl); } /** @@ -199,7 +189,7 @@ public function preDispatch() ->start($this->_encodeCacheId($reqUri), $tags, $extension); } } - + /** * Encode a Cache ID as hexadecimal. This is a workaround because Backend ID validation * is trapped in the Frontend classes. Will try to get this reversed for ZF 2.0 diff --git a/lib/Zend/Controller/Action/Helper/ContextSwitch.php b/lib/Zend/Controller/Action/Helper/ContextSwitch.php index 7f2aa2882..f4689975b 100644 --- a/lib/Zend/Controller/Action/Helper/ContextSwitch.php +++ b/lib/Zend/Controller/Action/Helper/ContextSwitch.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContextSwitch.php 24864 2012-06-02 00:51:50Z adamlundrigan $ + * @version $Id: ContextSwitch.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action_Helper_Abstract @@ -1304,6 +1304,7 @@ public function getActionContexts($action = null) if (null === $controller) { return array(); } + $action = (string) $action; $contextKey = $this->_contextKey; if (!isset($controller->$contextKey)) { @@ -1311,7 +1312,6 @@ public function getActionContexts($action = null) } if (null !== $action) { - $action = (string) $action; if (isset($controller->{$contextKey}[$action])) { return $controller->{$contextKey}[$action]; } else { diff --git a/lib/Zend/Controller/Action/Helper/FlashMessenger.php b/lib/Zend/Controller/Action/Helper/FlashMessenger.php index 3eea88e1f..a36f0e191 100644 --- a/lib/Zend/Controller/Action/Helper/FlashMessenger.php +++ b/lib/Zend/Controller/Action/Helper/FlashMessenger.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -36,9 +36,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FlashMessenger.php 24813 2012-05-22 16:49:24Z adamlundrigan $ + * @version $Id: FlashMessenger.php 20096 2010-01-06 02:05:09Z bkarwin $ */ class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Action_Helper_Abstract implements IteratorAggregate, Countable { @@ -112,16 +112,6 @@ public function setNamespace($namespace = 'default') $this->_namespace = $namespace; return $this; } - - /** - * getNamespace() - return the current namepsace - * - * @return string - */ - public function getNamespace() - { - return $this->_namespace; - } /** * resetNamespace() - reset the namespace to the default @@ -140,22 +130,17 @@ public function resetNamespace() * @param string $message * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface */ - public function addMessage($message, $namespace = null) + public function addMessage($message) { - if (!is_string($namespace) || $namespace == '') { - $namespace = $this->getNamespace(); - } - if (self::$_messageAdded === false) { self::$_session->setExpirationHops(1, null, true); } if (!is_array(self::$_session->{$this->_namespace})) { - self::$_session->{$namespace} = array(); + self::$_session->{$this->_namespace} = array(); } - self::$_session->{$namespace}[] = $message; - self::$_messageAdded = true; + self::$_session->{$this->_namespace}[] = $message; return $this; } @@ -165,13 +150,9 @@ public function addMessage($message, $namespace = null) * * @return boolean */ - public function hasMessages($namespace = null) + public function hasMessages() { - if (!is_string($namespace) || $namespace == '') { - $namespace = $this->getNamespace(); - } - - return isset(self::$_messages[$namespace]); + return isset(self::$_messages[$this->_namespace]); } /** @@ -179,14 +160,10 @@ public function hasMessages($namespace = null) * * @return array */ - public function getMessages($namespace = null) + public function getMessages() { - if (!is_string($namespace) || $namespace == '') { - $namespace = $this->getNamespace(); - } - - if ($this->hasMessages($namespace)) { - return self::$_messages[$namespace]; + if ($this->hasMessages()) { + return self::$_messages[$this->_namespace]; } return array(); @@ -197,14 +174,10 @@ public function getMessages($namespace = null) * * @return boolean True if messages were cleared, false if none existed */ - public function clearMessages($namespace = null) + public function clearMessages() { - if (!is_string($namespace) || $namespace == '') { - $namespace = $this->getNamespace(); - } - - if ($this->hasMessages($namespace)) { - unset(self::$_messages[$namespace]); + if ($this->hasMessages()) { + unset(self::$_messages[$this->_namespace]); return true; } @@ -217,13 +190,9 @@ public function clearMessages($namespace = null) * * @return boolean */ - public function hasCurrentMessages($namespace = null) + public function hasCurrentMessages() { - if (!is_string($namespace) || $namespace == '') { - $namespace = $this->getNamespace(); - } - - return isset(self::$_session->{$namespace}); + return isset(self::$_session->{$this->_namespace}); } /** @@ -232,14 +201,10 @@ public function hasCurrentMessages($namespace = null) * * @return array */ - public function getCurrentMessages($namespace = null) + public function getCurrentMessages() { - if (!is_string($namespace) || $namespace == '') { - $namespace = $this->getNamespace(); - } - - if ($this->hasCurrentMessages($namespace)) { - return self::$_session->{$namespace}; + if ($this->hasCurrentMessages()) { + return self::$_session->{$this->_namespace}; } return array(); @@ -250,14 +215,10 @@ public function getCurrentMessages($namespace = null) * * @return boolean */ - public function clearCurrentMessages($namespace = null) + public function clearCurrentMessages() { - if (!is_string($namespace) || $namespace == '') { - $namespace = $this->getNamespace(); - } - if ($this->hasCurrentMessages()) { - unset(self::$_session->{$namespace}); + unset(self::$_session->{$this->_namespace}); return true; } @@ -269,14 +230,10 @@ public function clearCurrentMessages($namespace = null) * * @return ArrayObject */ - public function getIterator($namespace = null) + public function getIterator() { - if (!is_string($namespace) || $namespace == '') { - $namespace = $this->getNamespace(); - } - - if ($this->hasMessages($namespace)) { - return new ArrayObject($this->getMessages($namespace)); + if ($this->hasMessages()) { + return new ArrayObject($this->getMessages()); } return new ArrayObject(); @@ -287,14 +244,10 @@ public function getIterator($namespace = null) * * @return int */ - public function count($namespace = null) + public function count() { - if (!is_string($namespace) || $namespace == '') { - $namespace = $this->getNamespace(); - } - - if ($this->hasMessages($namespace)) { - return count($this->getMessages($namespace)); + if ($this->hasMessages()) { + return count($this->getMessages()); } return 0; @@ -306,8 +259,8 @@ public function count($namespace = null) * @param string $message * @return void */ - public function direct($message, $namespace=NULL) + public function direct($message) { - return $this->addMessage($message, $namespace); + return $this->addMessage($message); } } diff --git a/lib/Zend/Controller/Action/Helper/Json.php b/lib/Zend/Controller/Action/Helper/Json.php index 1124c0f07..c271bde86 100644 --- a/lib/Zend/Controller/Action/Helper/Json.php +++ b/lib/Zend/Controller/Action/Helper/Json.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 24829 2012-05-30 12:31:39Z adamlundrigan $ + * @version $Id: Json.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_Json extends Zend_Controller_Action_Helper_Abstract @@ -53,24 +53,23 @@ class Zend_Controller_Action_Helper_Json extends Zend_Controller_Action_Helper_A * @param mixed $data * @param boolean $keepLayouts * @param boolean|array $keepLayouts - * @param boolean $encodeData Provided data is already JSON * NOTE: if boolean, establish $keepLayouts to true|false * if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false * if $keepLayouts and parmas for Zend_Json::encode are required - * then, the array can contains a 'keepLayout'=>true|false and/or 'encodeData'=>true|false + * then, the array can contains a 'keepLayout'=>true|false * that will not be passed to Zend_Json::encode method but will be passed * to Zend_View_Helper_Json * @throws Zend_Controller_Action_Helper_Json * @return string */ - public function encodeJson($data, $keepLayouts = false, $encodeData = true) + public function encodeJson($data, $keepLayouts = false) { /** * @see Zend_View_Helper_Json */ #require_once 'Zend/View/Helper/Json.php'; $jsonHelper = new Zend_View_Helper_Json(); - $data = $jsonHelper->json($data, $keepLayouts, $encodeData); + $data = $jsonHelper->json($data, $keepLayouts); if (!$keepLayouts) { /** @@ -88,18 +87,17 @@ public function encodeJson($data, $keepLayouts = false, $encodeData = true) * * @param mixed $data * @param boolean|array $keepLayouts - * @param $encodeData Encode $data as JSON? * NOTE: if boolean, establish $keepLayouts to true|false * if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false * if $keepLayouts and parmas for Zend_Json::encode are required - * then, the array can contains a 'keepLayout'=>true|false and/or 'encodeData'=>true|false + * then, the array can contains a 'keepLayout'=>true|false * that will not be passed to Zend_Json::encode method but will be passed * to Zend_View_Helper_Json * @return string|void */ - public function sendJson($data, $keepLayouts = false, $encodeData = true) + public function sendJson($data, $keepLayouts = false) { - $data = $this->encodeJson($data, $keepLayouts, $encodeData); + $data = $this->encodeJson($data, $keepLayouts); $response = $this->getResponse(); $response->setBody($data); @@ -120,14 +118,13 @@ public function sendJson($data, $keepLayouts = false, $encodeData = true) * @param mixed $data * @param boolean $sendNow * @param boolean $keepLayouts - * @param boolean $encodeData Encode $data as JSON? * @return string|void */ - public function direct($data, $sendNow = true, $keepLayouts = false, $encodeData = true) + public function direct($data, $sendNow = true, $keepLayouts = false) { if ($sendNow) { - return $this->sendJson($data, $keepLayouts, $encodeData); + return $this->sendJson($data, $keepLayouts); } - return $this->encodeJson($data, $keepLayouts, $encodeData); + return $this->encodeJson($data, $keepLayouts); } } diff --git a/lib/Zend/Controller/Action/Helper/Redirector.php b/lib/Zend/Controller/Action/Helper/Redirector.php index 5d433ed0c..1cb04ec9d 100644 --- a/lib/Zend/Controller/Action/Helper/Redirector.php +++ b/lib/Zend/Controller/Action/Helper/Redirector.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Redirector.php 24843 2012-05-31 18:43:18Z rob $ + * @version $Id: Redirector.php 23248 2010-10-26 12:45:52Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_Helper_Abstract @@ -100,7 +100,7 @@ protected function _checkCode($code) } /** - * Set HTTP status code for {@link _redirect()} behaviour + * Retrieve HTTP status code for {@link _redirect()} behaviour * * @param int $code * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface @@ -123,7 +123,7 @@ public function getExit() } /** - * Set exit flag for {@link _redirect()} behaviour + * Retrieve exit flag for {@link _redirect()} behaviour * * @param boolean $flag * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface @@ -146,7 +146,7 @@ public function getPrependBase() } /** - * Set 'prepend base' flag for {@link _redirect()} behaviour + * Retrieve 'prepend base' flag for {@link _redirect()} behaviour * * @param boolean $flag * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface @@ -294,9 +294,9 @@ public function setGotoSimple($action, $controller = null, $module = null, array } } - $params[$request->getModuleKey()] = $module; - $params[$request->getControllerKey()] = $controller; - $params[$request->getActionKey()] = $action; + $params['module'] = $module; + $params['controller'] = $controller; + $params['action'] = $action; $router = $this->getFrontController()->getRouter(); $url = $router->assemble($params, 'default', true); diff --git a/lib/Zend/Controller/Action/Helper/Url.php b/lib/Zend/Controller/Action/Helper/Url.php index 9cf16b771..501252916 100644 --- a/lib/Zend/Controller/Action/Helper/Url.php +++ b/lib/Zend/Controller/Action/Helper/Url.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Url.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Url.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_Url extends Zend_Controller_Action_Helper_Abstract diff --git a/lib/Zend/Controller/Action/Helper/ViewRenderer.php b/lib/Zend/Controller/Action/Helper/ViewRenderer.php index 950de794d..7f5b146e7 100644 --- a/lib/Zend/Controller/Action/Helper/ViewRenderer.php +++ b/lib/Zend/Controller/Action/Helper/ViewRenderer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewRenderer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ViewRenderer.php 20261 2010-01-13 18:55:25Z matthew $ */ /** @@ -68,7 +68,7 @@ * @uses Zend_Controller_Action_Helper_Abstract * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_Helper_Abstract @@ -626,9 +626,6 @@ public function getViewScript($action = null, array $vars = array()) } elseif (null !== $action) { $vars['action'] = $action; } - - $replacePattern = array('/[^a-z0-9]+$/i', '/^[^a-z0-9]+/i'); - $vars['action'] = preg_replace($replacePattern, '', $vars['action']); $inflector = $this->getInflector(); if ($this->getNoController() || $this->getNeverController()) { diff --git a/lib/Zend/Controller/Action/HelperBroker.php b/lib/Zend/Controller/Action/HelperBroker.php index 1d9e8a81e..d1e7ffe6a 100644 --- a/lib/Zend/Controller/Action/HelperBroker.php +++ b/lib/Zend/Controller/Action/HelperBroker.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelperBroker.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: HelperBroker.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_HelperBroker diff --git a/lib/Zend/Controller/Action/HelperBroker/PriorityStack.php b/lib/Zend/Controller/Action/HelperBroker/PriorityStack.php index e50f53e24..bb2d03e00 100644 --- a/lib/Zend/Controller/Action/HelperBroker/PriorityStack.php +++ b/lib/Zend/Controller/Action/HelperBroker/PriorityStack.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PriorityStack.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: PriorityStack.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggregate, ArrayAccess, Countable diff --git a/lib/Zend/Controller/Action/Interface.php b/lib/Zend/Controller/Action/Interface.php index 871390ca1..eb00ada36 100644 --- a/lib/Zend/Controller/Action/Interface.php +++ b/lib/Zend/Controller/Action/Interface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Controller_Action_Interface diff --git a/lib/Zend/Controller/Dispatcher/Abstract.php b/lib/Zend/Controller/Dispatcher/Abstract.php index cb49cd534..e325ed9f6 100644 --- a/lib/Zend/Controller/Dispatcher/Abstract.php +++ b/lib/Zend/Controller/Dispatcher/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** Zend_Controller_Dispatcher_Interface */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Dispatcher_Abstract implements Zend_Controller_Dispatcher_Interface diff --git a/lib/Zend/Controller/Dispatcher/Exception.php b/lib/Zend/Controller/Dispatcher/Exception.php index 2a05ff56b..ffb5aff22 100644 --- a/lib/Zend/Controller/Dispatcher/Exception.php +++ b/lib/Zend/Controller/Dispatcher/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Dispatcher_Exception extends Zend_Controller_Exception diff --git a/lib/Zend/Controller/Dispatcher/Interface.php b/lib/Zend/Controller/Dispatcher/Interface.php index ee67f0412..86fd575e4 100644 --- a/lib/Zend/Controller/Dispatcher/Interface.php +++ b/lib/Zend/Controller/Dispatcher/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -33,7 +33,7 @@ /** * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Controller_Dispatcher_Interface diff --git a/lib/Zend/Controller/Dispatcher/Standard.php b/lib/Zend/Controller/Dispatcher/Standard.php index 6eb5a855c..96c9112c1 100644 --- a/lib/Zend/Controller/Dispatcher/Standard.php +++ b/lib/Zend/Controller/Dispatcher/Standard.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Standard.php 24861 2012-06-01 23:40:13Z adamlundrigan $ + * @version $Id: Standard.php 22038 2010-04-28 18:54:22Z matthew $ */ /** Zend_Loader */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abstract @@ -256,19 +256,6 @@ public function dispatch(Zend_Controller_Request_Abstract $request, Zend_Control } } - /** - * If we're in a module or prefixDefaultModule is on, we must add the module name - * prefix to the contents of $className, as getControllerClass does not do that automatically. - * We must keep a separate variable because modules are not strictly PSR-0: We need the no-module-prefix - * class name to do the class->file mapping, but the full class name to insantiate the controller - */ - $moduleClassName = $className; - if (($this->_defaultModule != $this->_curModule) - || $this->getParam('prefixDefaultModule')) - { - $moduleClassName = $this->formatClassName($this->_curModule, $className); - } - /** * Load the controller class file */ @@ -278,12 +265,12 @@ public function dispatch(Zend_Controller_Request_Abstract $request, Zend_Control * Instantiate controller with request, response, and invocation * arguments; throw exception if it's not an action controller */ - $controller = new $moduleClassName($request, $this->getResponse(), $this->getParams()); + $controller = new $className($request, $this->getResponse(), $this->getParams()); if (!($controller instanceof Zend_Controller_Action_Interface) && !($controller instanceof Zend_Controller_Action)) { #require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception( - 'Controller "' . $moduleClassName . '" is not an instance of Zend_Controller_Action_Interface' + 'Controller "' . $className . '" is not an instance of Zend_Controller_Action_Interface' ); } diff --git a/lib/Zend/Controller/Exception.php b/lib/Zend/Controller/Exception.php index ed6e27aaf..744718f9b 100644 --- a/lib/Zend/Controller/Exception.php +++ b/lib/Zend/Controller/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Exception extends Zend_Exception diff --git a/lib/Zend/Controller/Front.php b/lib/Zend/Controller/Front.php index bb0acccbf..768c0d0b7 100644 --- a/lib/Zend/Controller/Front.php +++ b/lib/Zend/Controller/Front.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Front.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Front.php 20246 2010-01-12 21:36:08Z dasprid $ */ @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Front diff --git a/lib/Zend/Controller/Plugin/Abstract.php b/lib/Zend/Controller/Plugin/Abstract.php index 46dfdcafa..007d2f630 100644 --- a/lib/Zend/Controller/Plugin/Abstract.php +++ b/lib/Zend/Controller/Plugin/Abstract.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Plugin_Abstract diff --git a/lib/Zend/Controller/Plugin/ActionStack.php b/lib/Zend/Controller/Plugin/ActionStack.php index f655fadbd..3d6855d90 100644 --- a/lib/Zend/Controller/Plugin/ActionStack.php +++ b/lib/Zend/Controller/Plugin/ActionStack.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActionStack.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ActionStack.php 20096 2010-01-06 02:05:09Z bkarwin $ */ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract { diff --git a/lib/Zend/Controller/Plugin/Broker.php b/lib/Zend/Controller/Plugin/Broker.php index 55a45080a..cb58eef7e 100644 --- a/lib/Zend/Controller/Plugin/Broker.php +++ b/lib/Zend/Controller/Plugin/Broker.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Broker.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Broker.php 20255 2010-01-13 13:23:36Z matthew $ */ /** Zend_Controller_Plugin_Abstract */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Plugin_Broker extends Zend_Controller_Plugin_Abstract @@ -237,7 +237,7 @@ public function routeStartup(Zend_Controller_Request_Abstract $request) $plugin->routeStartup($request); } catch (Exception $e) { if (Zend_Controller_Front::getInstance()->throwExceptions()) { - throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e); + throw $e; } else { $this->getResponse()->setException($e); } @@ -260,7 +260,7 @@ public function routeShutdown(Zend_Controller_Request_Abstract $request) $plugin->routeShutdown($request); } catch (Exception $e) { if (Zend_Controller_Front::getInstance()->throwExceptions()) { - throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e); + throw $e; } else { $this->getResponse()->setException($e); } @@ -287,7 +287,7 @@ public function dispatchLoopStartup(Zend_Controller_Request_Abstract $request) $plugin->dispatchLoopStartup($request); } catch (Exception $e) { if (Zend_Controller_Front::getInstance()->throwExceptions()) { - throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e); + throw $e; } else { $this->getResponse()->setException($e); } @@ -309,11 +309,9 @@ public function preDispatch(Zend_Controller_Request_Abstract $request) $plugin->preDispatch($request); } catch (Exception $e) { if (Zend_Controller_Front::getInstance()->throwExceptions()) { - throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e); + throw $e; } else { $this->getResponse()->setException($e); - // skip rendering of normal dispatch give the error handler a try - $this->getRequest()->setDispatched(false); } } } @@ -333,7 +331,7 @@ public function postDispatch(Zend_Controller_Request_Abstract $request) $plugin->postDispatch($request); } catch (Exception $e) { if (Zend_Controller_Front::getInstance()->throwExceptions()) { - throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e); + throw $e; } else { $this->getResponse()->setException($e); } @@ -355,7 +353,7 @@ public function dispatchLoopShutdown() $plugin->dispatchLoopShutdown(); } catch (Exception $e) { if (Zend_Controller_Front::getInstance()->throwExceptions()) { - throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e); + throw $e; } else { $this->getResponse()->setException($e); } diff --git a/lib/Zend/Controller/Plugin/ErrorHandler.php b/lib/Zend/Controller/Plugin/ErrorHandler.php index 50f2ced24..7f5d4a22c 100644 --- a/lib/Zend/Controller/Plugin/ErrorHandler.php +++ b/lib/Zend/Controller/Plugin/ErrorHandler.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ErrorHandler.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: ErrorHandler.php 20246 2010-01-12 21:36:08Z dasprid $ */ class Zend_Controller_Plugin_ErrorHandler extends Zend_Controller_Plugin_Abstract { @@ -193,25 +193,14 @@ public function getErrorHandlerAction() /** * Route shutdown hook -- Ccheck for router exceptions - * - * @param Zend_Controller_Request_Abstract $request + * + * @param Zend_Controller_Request_Abstract $request */ public function routeShutdown(Zend_Controller_Request_Abstract $request) { $this->_handleError($request); } - /** - * Pre dispatch hook -- check for exceptions and dispatch error handler if - * necessary - * - * @param Zend_Controller_Request_Abstract $request - */ - public function preDispatch(Zend_Controller_Request_Abstract $request) - { - $this->_handleError($request); - } - /** * Post dispatch hook -- check for exceptions and dispatch error handler if * necessary diff --git a/lib/Zend/Controller/Plugin/PutHandler.php b/lib/Zend/Controller/Plugin/PutHandler.php index 94cc7b9b3..b5e5e6e67 100644 --- a/lib/Zend/Controller/Plugin/PutHandler.php +++ b/lib/Zend/Controller/Plugin/PutHandler.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Plugin - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PutHandler.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id: PutHandler.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -35,7 +35,7 @@ * * @package Zend_Controller * @subpackage Zend_Controller_Plugin - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Plugin_PutHandler extends Zend_Controller_Plugin_Abstract diff --git a/lib/Zend/Controller/Request/Abstract.php b/lib/Zend/Controller/Request/Abstract.php index 0e8c033b1..1d18e0c5e 100644 --- a/lib/Zend/Controller/Request/Abstract.php +++ b/lib/Zend/Controller/Request/Abstract.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Request_Abstract @@ -312,7 +312,7 @@ public function setParams(array $array) { $this->_params = $this->_params + (array) $array; - foreach ($array as $key => $value) { + foreach ($this->_params as $key => $value) { if (null === $value) { unset($this->_params[$key]); } diff --git a/lib/Zend/Controller/Request/Apache404.php b/lib/Zend/Controller/Request/Apache404.php index ed05bba02..46e9013c2 100644 --- a/lib/Zend/Controller/Request/Apache404.php +++ b/lib/Zend/Controller/Request/Apache404.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Apache404.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Apache404.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** Zend_Controller_Request_Http */ @@ -50,8 +50,8 @@ public function setRequestUri($requestUri = null) $requestUri = $_SERVER['HTTP_X_REWRITE_URL']; } elseif (isset($_SERVER['REDIRECT_URL'])) { // Check if using mod_rewrite $requestUri = $_SERVER['REDIRECT_URL']; - if (isset($_SERVER['REDIRECT_QUERY_STRING'])) { - $parseUriGetVars = $_SERVER['REDIRECT_QUERY_STRING']; + if (isset($_SERVER['REDIRECT_QUERYSTRING'])) { + $parseUriGetVars = $_SERVER['REDIRECT_QUERYSTRING']; } } elseif (isset($_SERVER['REQUEST_URI'])) { $requestUri = $_SERVER['REQUEST_URI']; diff --git a/lib/Zend/Controller/Request/Exception.php b/lib/Zend/Controller/Request/Exception.php index 718010c73..fe9ab53f5 100644 --- a/lib/Zend/Controller/Request/Exception.php +++ b/lib/Zend/Controller/Request/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Request_Exception extends Zend_Controller_Exception diff --git a/lib/Zend/Controller/Request/Http.php b/lib/Zend/Controller/Request/Http.php index 19b9f1833..b010f5684 100644 --- a/lib/Zend/Controller/Request/Http.php +++ b/lib/Zend/Controller/Request/Http.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 24842 2012-05-31 18:31:28Z rob $ + * @version $Id: Http.php 23414 2010-11-20 10:56:11Z bittarman $ */ /** @see Zend_Controller_Request_Abstract */ @@ -390,11 +390,7 @@ public function getEnv($key = null, $default = null) public function setRequestUri($requestUri = null) { if ($requestUri === null) { - if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { - // IIS with Microsoft Rewrite Module - $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL']; - } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) { - // IIS with ISAPI_Rewrite + if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch $requestUri = $_SERVER['HTTP_X_REWRITE_URL']; } elseif ( // IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem) @@ -549,13 +545,13 @@ public function setBaseUrl($baseUrl = null) * * @return string */ - public function getBaseUrl($raw = false) + public function getBaseUrl() { if (null === $this->_baseUrl) { $this->setBaseUrl(); } - return (($raw == false) ? urldecode($this->_baseUrl) : $this->_baseUrl); + return urldecode($this->_baseUrl); } /** @@ -616,33 +612,31 @@ public function getBasePath() public function setPathInfo($pathInfo = null) { if ($pathInfo === null) { - $baseUrl = $this->getBaseUrl(); // this actually calls setBaseUrl() & setRequestUri() - $baseUrlRaw = $this->getBaseUrl(false); - $baseUrlEncoded = urlencode($baseUrlRaw); - + $baseUrl = $this->getBaseUrl(); + if (null === ($requestUri = $this->getRequestUri())) { return $this; } - + // Remove the query string from REQUEST_URI if ($pos = strpos($requestUri, '?')) { $requestUri = substr($requestUri, 0, $pos); } - if (!empty($baseUrl) || !empty($baseUrlRaw)) { - if (strpos($requestUri, $baseUrl) === 0) { - $pathInfo = substr($requestUri, strlen($baseUrl)); - } elseif (strpos($requestUri, $baseUrlRaw) === 0) { - $pathInfo = substr($requestUri, strlen($baseUrlRaw)); - } elseif (strpos($requestUri, $baseUrlEncoded) === 0) { - $pathInfo = substr($requestUri, strlen($baseUrlEncoded)); - } else { - $pathInfo = $requestUri; - } - } else { - $pathInfo = $requestUri; + $requestUri = urldecode($requestUri); + + if (null !== $baseUrl + && ((!empty($baseUrl) && 0 === strpos($requestUri, $baseUrl)) + || empty($baseUrl)) + && false === ($pathInfo = substr($requestUri, strlen($baseUrl))) + ){ + // If substr() returns false then PATH_INFO is set to an empty string + $pathInfo = ''; + } elseif (null === $baseUrl + || (!empty($baseUrl) && false === strpos($requestUri, $baseUrl)) + ) { + $pathInfo = $requestUri; } - } $this->_pathInfo = (string) $pathInfo; diff --git a/lib/Zend/Controller/Request/HttpTestCase.php b/lib/Zend/Controller/Request/HttpTestCase.php index 47f103f17..827c6f837 100644 --- a/lib/Zend/Controller/Request/HttpTestCase.php +++ b/lib/Zend/Controller/Request/HttpTestCase.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpTestCase.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: HttpTestCase.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** diff --git a/lib/Zend/Controller/Request/Simple.php b/lib/Zend/Controller/Request/Simple.php index 2eb9d9ff0..dc8755296 100644 --- a/lib/Zend/Controller/Request/Simple.php +++ b/lib/Zend/Controller/Request/Simple.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Simple.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Simple.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** Zend_Controller_Request_Abstract */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Request_Simple extends Zend_Controller_Request_Abstract diff --git a/lib/Zend/Controller/Response/Abstract.php b/lib/Zend/Controller/Response/Abstract.php index 275bfb5d6..040ec9078 100644 --- a/lib/Zend/Controller/Response/Abstract.php +++ b/lib/Zend/Controller/Response/Abstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 21301 2010-03-02 23:01:19Z yoshida@zend.co.jp $ */ /** @@ -26,7 +26,7 @@ * * @package Zend_Controller * @subpackage Response - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Response_Abstract @@ -257,9 +257,7 @@ public function clearRawHeader($headerRaw) } $key = array_search($headerRaw, $this->_headersRaw); - if ($key !== false) { - unset($this->_headersRaw[$key]); - } + unset($this->_headersRaw[$key]); return $this; } diff --git a/lib/Zend/Controller/Response/Cli.php b/lib/Zend/Controller/Response/Cli.php index 2f62abc4a..9c5678fb0 100644 --- a/lib/Zend/Controller/Response/Cli.php +++ b/lib/Zend/Controller/Response/Cli.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cli.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Cli.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -32,7 +32,7 @@ * @uses Zend_Controller_Response_Abstract * @package Zend_Controller * @subpackage Response - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Response_Cli extends Zend_Controller_Response_Abstract diff --git a/lib/Zend/Controller/Response/Exception.php b/lib/Zend/Controller/Response/Exception.php index 900c2225c..9d110fb3b 100644 --- a/lib/Zend/Controller/Response/Exception.php +++ b/lib/Zend/Controller/Response/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -28,7 +28,7 @@ /** * @package Zend_Controller * @subpackage Response - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Response_Exception extends Zend_Controller_Exception diff --git a/lib/Zend/Controller/Response/Http.php b/lib/Zend/Controller/Response/Http.php index 5233d76d9..190fa1990 100644 --- a/lib/Zend/Controller/Response/Http.php +++ b/lib/Zend/Controller/Response/Http.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $ */ diff --git a/lib/Zend/Controller/Response/HttpTestCase.php b/lib/Zend/Controller/Response/HttpTestCase.php index 206ae31ef..2a3f57e6e 100644 --- a/lib/Zend/Controller/Response/HttpTestCase.php +++ b/lib/Zend/Controller/Response/HttpTestCase.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpTestCase.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: HttpTestCase.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** diff --git a/lib/Zend/Controller/Router/Abstract.php b/lib/Zend/Controller/Router/Abstract.php index 59e3e349b..d6ca7b0cb 100644 --- a/lib/Zend/Controller/Router/Abstract.php +++ b/lib/Zend/Controller/Router/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -31,16 +31,11 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Router_Abstract implements Zend_Controller_Router_Interface { - /** - * URI delimiter - */ - const URI_DELIMITER = '/'; - /** * Front controller instance * @var Zend_Controller_Front diff --git a/lib/Zend/Controller/Router/Exception.php b/lib/Zend/Controller/Router/Exception.php index 335cdbcb4..eba63dbe1 100644 --- a/lib/Zend/Controller/Router/Exception.php +++ b/lib/Zend/Controller/Router/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ /** * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Router_Exception extends Zend_Controller_Exception diff --git a/lib/Zend/Controller/Router/Interface.php b/lib/Zend/Controller/Router/Interface.php index 86100385b..aa7f6a0dc 100644 --- a/lib/Zend/Controller/Router/Interface.php +++ b/lib/Zend/Controller/Router/Interface.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Controller_Router_Interface diff --git a/lib/Zend/Controller/Router/Rewrite.php b/lib/Zend/Controller/Router/Rewrite.php index 9d8d6a2ac..0203ba615 100644 --- a/lib/Zend/Controller/Router/Rewrite.php +++ b/lib/Zend/Controller/Router/Rewrite.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Rewrite.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Rewrite.php 23362 2010-11-18 17:22:41Z bittarman $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ @@ -381,7 +381,7 @@ public function route(Zend_Controller_Request_Abstract $request) // Find the matching route $routeMatched = false; - + foreach (array_reverse($this->_routes, true) as $name => $route) { // TODO: Should be an interface method. Hack for 1.0 BC if (method_exists($route, 'isAbstract') && $route->isAbstract()) { @@ -450,11 +450,6 @@ protected function _setRequestParams($request, $params) */ public function assemble($userParams, $name = null, $reset = false, $encode = true) { - if (!is_array($userParams)) { - #require_once 'Zend/Controller/Router/Exception.php'; - throw new Zend_Controller_Router_Exception('userParams must be an array'); - } - if ($name == null) { try { $name = $this->getCurrentRouteName(); @@ -463,14 +458,14 @@ public function assemble($userParams, $name = null, $reset = false, $encode = tr } } - // Use UNION (+) in order to preserve numeric keys + // Use UNION (+) in order to preserve numeric keys $params = $userParams + $this->_globalParams; $route = $this->getRoute($name); $url = $route->assemble($params, $reset, $encode); if (!preg_match('|^[a-z]+://|', $url)) { - $url = rtrim($this->getFrontController()->getBaseUrl(), self::URI_DELIMITER) . self::URI_DELIMITER . $url; + $url = rtrim($this->getFrontController()->getBaseUrl(), '/') . '/' . $url; } return $url; diff --git a/lib/Zend/Controller/Router/Route.php b/lib/Zend/Controller/Router/Route.php index 6c83c10bd..03fa5f907 100644 --- a/lib/Zend/Controller/Router/Route.php +++ b/lib/Zend/Controller/Router/Route.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Route.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Route.php 20096 2010-01-06 02:05:09Z bkarwin $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ @@ -77,7 +77,7 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract protected $_translatable = array(); protected $_urlVariable = ':'; - protected $_urlDelimiter = self::URI_DELIMITER; + protected $_urlDelimiter = '/'; protected $_regexDelimiter = '#'; protected $_defaultRegex = null; @@ -294,9 +294,6 @@ public function match($path, $partial = false) foreach ($this->_variables as $var) { if (!array_key_exists($var, $return)) { return false; - } elseif ($return[$var] == '' || $return[$var] === null) { - // Empty variable? Replace with the default value. - $return[$var] = $this->_defaults[$var]; } } @@ -347,7 +344,7 @@ public function assemble($data = array(), $reset = false, $encode = false, $part $value = $this->_values[$name]; } elseif (!$reset && !$useDefault && isset($this->_wildcardData[$name])) { $value = $this->_wildcardData[$name]; - } elseif (array_key_exists($name, $this->_defaults)) { + } elseif (isset($this->_defaults[$name])) { $value = $this->_defaults[$name]; } else { #require_once 'Zend/Controller/Router/Exception.php'; diff --git a/lib/Zend/Controller/Router/Route/Abstract.php b/lib/Zend/Controller/Router/Route/Abstract.php index f1ca62b0c..0c7abb46c 100644 --- a/lib/Zend/Controller/Router/Route/Abstract.php +++ b/lib/Zend/Controller/Router/Route/Abstract.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,16 +32,11 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_Router_Route_Interface { - /** - * URI delimiter - */ - const URI_DELIMITER = '/'; - /** * Wether this route is abstract or not * diff --git a/lib/Zend/Controller/Router/Route/Chain.php b/lib/Zend/Controller/Router/Route/Chain.php index 67cbf00bf..a6bdcf2e7 100644 --- a/lib/Zend/Controller/Router/Route/Chain.php +++ b/lib/Zend/Controller/Router/Route/Chain.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Chain.php 25249 2013-02-06 09:54:24Z frosch $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Chain.php 23187 2010-10-20 18:42:37Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Abstract @@ -39,8 +39,7 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab /** * Instantiates route based on passed Zend_Config structure * - * @param Zend_Config $config Configuration object - * @return Zend_Controller_Router_Route_Chain + * @param Zend_Config $config Configuration object */ public static function getInstance(Zend_Config $config) { @@ -55,7 +54,7 @@ public static function getInstance(Zend_Config $config) * @param string $separator * @return Zend_Controller_Router_Route_Chain */ - public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = self::URI_DELIMITER) + public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = '/') { $this->_routes[] = $route; $this->_separators[] = $separator; @@ -69,21 +68,18 @@ public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = * Assigns and returns an array of defaults on a successful match. * * @param Zend_Controller_Request_Http $request Request to get the path info from - * @param null $partial * @return array|false An array of assigned values or a false on a mismatch */ public function match($request, $partial = null) { - $path = trim($request->getPathInfo(), self::URI_DELIMITER); - $subPath = $path; - $values = array(); - $numRoutes = count($this->_routes); - $matchedPath = null; + $path = trim($request->getPathInfo(), '/'); + $subPath = $path; + $values = array(); foreach ($this->_routes as $key => $route) { - if ($key > 0 - && $matchedPath !== null - && $subPath !== '' + if ($key > 0 + && $matchedPath !== null + && $subPath !== '' && $subPath !== false ) { $separator = substr($subPath, 0, strlen($this->_separators[$key])); @@ -103,7 +99,7 @@ public function match($request, $partial = null) $match = $request; } - $res = $route->match($match, true, ($key == $numRoutes - 1)); + $res = $route->match($match, true); if ($res === false) { return false; } @@ -130,9 +126,7 @@ public function match($request, $partial = null) /** * Assembles a URL path defined by this route * - * @param array $data An array of variable and value pairs used as parameters - * @param bool $reset - * @param bool $encode + * @param array $data An array of variable and value pairs used as parameters * @return string Route path with user submitted parameters */ public function assemble($data = array(), $reset = false, $encode = false) @@ -175,42 +169,5 @@ public function setRequest(Zend_Controller_Request_Abstract $request = null) } } } - - /** - * Return a single parameter of route's defaults - * - * @param string $name Array key of the parameter - * @return string Previously set default - */ - public function getDefault($name) - { - $default = null; - foreach ($this->_routes as $route) { - if (method_exists($route, 'getDefault')) { - $current = $route->getDefault($name); - if (null !== $current) { - $default = $current; - } - } - } - - return $default; - } - - /** - * Return an array of defaults - * - * @return array Route defaults - */ - public function getDefaults() - { - $defaults = array(); - foreach ($this->_routes as $route) { - if (method_exists($route, 'getDefaults')) { - $defaults = array_merge($defaults, $route->getDefaults()); - } - } - return $defaults; - } -} \ No newline at end of file +} diff --git a/lib/Zend/Controller/Router/Route/Hostname.php b/lib/Zend/Controller/Router/Route/Hostname.php index 279866c91..69768abcc 100644 --- a/lib/Zend/Controller/Router/Route/Hostname.php +++ b/lib/Zend/Controller/Router/Route/Hostname.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Hostname.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Hostname.php 20096 2010-01-06 02:05:09Z bkarwin $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ @@ -302,6 +302,7 @@ public function assemble($data = array(), $reset = false, $encode = false, $part } } + $hostname = implode('.', $host); $url = $scheme . '://' . $url; return $url; diff --git a/lib/Zend/Controller/Router/Route/Interface.php b/lib/Zend/Controller/Router/Route/Interface.php index 8f09556c5..77d005d0c 100644 --- a/lib/Zend/Controller/Router/Route/Interface.php +++ b/lib/Zend/Controller/Router/Route/Interface.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,7 +26,7 @@ /** * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Controller_Router_Route_Interface { diff --git a/lib/Zend/Controller/Router/Route/Module.php b/lib/Zend/Controller/Router/Route/Module.php index 061d56cd9..3f0ae3bb9 100644 --- a/lib/Zend/Controller/Router/Route/Module.php +++ b/lib/Zend/Controller/Router/Route/Module.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Module.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Module.php 20096 2010-01-06 02:05:09Z bkarwin $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,12 +30,17 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ class Zend_Controller_Router_Route_Module extends Zend_Controller_Router_Route_Abstract { + /** + * URI delimiter + */ + const URI_DELIMITER = '/'; + /** * Default values for the route (ie. module, controller, action, params) * @var array @@ -232,29 +237,29 @@ public function assemble($data = array(), $reset = false, $encode = true, $parti if (is_array($value)) { foreach ($value as $arrayValue) { $arrayValue = ($encode) ? urlencode($arrayValue) : $arrayValue; - $url .= self::URI_DELIMITER . $key; - $url .= self::URI_DELIMITER . $arrayValue; + $url .= '/' . $key; + $url .= '/' . $arrayValue; } } else { if ($encode) $value = urlencode($value); - $url .= self::URI_DELIMITER . $key; - $url .= self::URI_DELIMITER . $value; + $url .= '/' . $key; + $url .= '/' . $value; } } if (!empty($url) || $action !== $this->_defaults[$this->_actionKey]) { if ($encode) $action = urlencode($action); - $url = self::URI_DELIMITER . $action . $url; + $url = '/' . $action . $url; } if (!empty($url) || $controller !== $this->_defaults[$this->_controllerKey]) { if ($encode) $controller = urlencode($controller); - $url = self::URI_DELIMITER . $controller . $url; + $url = '/' . $controller . $url; } if (isset($module)) { if ($encode) $module = urlencode($module); - $url = self::URI_DELIMITER . $module . $url; + $url = '/' . $module . $url; } return ltrim($url, self::URI_DELIMITER); diff --git a/lib/Zend/Controller/Router/Route/Regex.php b/lib/Zend/Controller/Router/Route/Regex.php index c1f982a43..1dc8e293d 100644 --- a/lib/Zend/Controller/Router/Route/Regex.php +++ b/lib/Zend/Controller/Router/Route/Regex.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Regex.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Regex.php 20096 2010-01-06 02:05:09Z bkarwin $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Abstract @@ -74,7 +74,7 @@ public function getVersion() { public function match($path, $partial = false) { if (!$partial) { - $path = trim(urldecode($path), self::URI_DELIMITER); + $path = trim(urldecode($path), '/'); $regex = '#^' . $this->_regex . '$#i'; } else { $regex = '#^' . $this->_regex . '#i'; diff --git a/lib/Zend/Controller/Router/Route/Static.php b/lib/Zend/Controller/Router/Route/Static.php index 8f39c1149..29f4c5748 100644 --- a/lib/Zend/Controller/Router/Route/Static.php +++ b/lib/Zend/Controller/Router/Route/Static.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Static.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Static.php 23210 2010-10-21 16:10:55Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Router_Route_Static extends Zend_Controller_Router_Route_Abstract @@ -62,7 +62,7 @@ public static function getInstance(Zend_Config $config) */ public function __construct($route, $defaults = array()) { - $this->_route = trim($route, self::URI_DELIMITER); + $this->_route = trim($route, '/'); $this->_defaults = (array) $defaults; } @@ -83,7 +83,7 @@ public function match($path, $partial = false) return $this->_defaults; } } else { - if (trim($path, self::URI_DELIMITER) == $this->_route) { + if (trim($path, '/') == $this->_route) { return $this->_defaults; } } diff --git a/lib/Zend/Crypt.php b/lib/Zend/Crypt.php index 8e72b71ee..005b07bb3 100644 --- a/lib/Zend/Crypt.php +++ b/lib/Zend/Crypt.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Crypt.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id: Crypt.php 23089 2010-10-12 17:05:31Z padraic $ */ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt diff --git a/lib/Zend/Crypt/DiffieHellman.php b/lib/Zend/Crypt/DiffieHellman.php index 3475b1c6a..b96850e82 100644 --- a/lib/Zend/Crypt/DiffieHellman.php +++ b/lib/Zend/Crypt/DiffieHellman.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage DiffieHellman - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DiffieHellman.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: DiffieHellman.php 22662 2010-07-24 17:37:36Z mabe $ */ /** @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_DiffieHellman diff --git a/lib/Zend/Crypt/DiffieHellman/Exception.php b/lib/Zend/Crypt/DiffieHellman/Exception.php index a5f6e7ef5..fa5455da3 100644 --- a/lib/Zend/Crypt/DiffieHellman/Exception.php +++ b/lib/Zend/Crypt/DiffieHellman/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage DiffieHellman - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_DiffieHellman_Exception extends Zend_Crypt_Exception diff --git a/lib/Zend/Crypt/Exception.php b/lib/Zend/Crypt/Exception.php index 413e1c8b3..07a4027fb 100644 --- a/lib/Zend/Crypt/Exception.php +++ b/lib/Zend/Crypt/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Exception extends Zend_Exception diff --git a/lib/Zend/Crypt/Hmac.php b/lib/Zend/Crypt/Hmac.php index 6a52f89b1..c1304e480 100644 --- a/lib/Zend/Crypt/Hmac.php +++ b/lib/Zend/Crypt/Hmac.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Hmac - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hmac.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Hmac.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -33,7 +33,7 @@ * @todo Check if mhash() is a required alternative (will be PECL-only soon) * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Hmac extends Zend_Crypt diff --git a/lib/Zend/Crypt/Hmac/Exception.php b/lib/Zend/Crypt/Hmac/Exception.php index 148ac43bb..a16252904 100644 --- a/lib/Zend/Crypt/Hmac/Exception.php +++ b/lib/Zend/Crypt/Hmac/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Hmac - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Hmac_Exception extends Zend_Crypt_Exception diff --git a/lib/Zend/Crypt/Math.php b/lib/Zend/Crypt/Math.php index 33840979a..532cf59cc 100644 --- a/lib/Zend/Crypt/Math.php +++ b/lib/Zend/Crypt/Math.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Math.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Math.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Math extends Zend_Crypt_Math_BigInteger diff --git a/lib/Zend/Crypt/Math/BigInteger.php b/lib/Zend/Crypt/Math/BigInteger.php index 509c0f469..6aaadeea6 100644 --- a/lib/Zend/Crypt/Math/BigInteger.php +++ b/lib/Zend/Crypt/Math/BigInteger.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BigInteger.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: BigInteger.php 23439 2010-11-23 21:10:14Z alexander $ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Math_BigInteger diff --git a/lib/Zend/Crypt/Math/BigInteger/Bcmath.php b/lib/Zend/Crypt/Math/BigInteger/Bcmath.php index 7de59d5c9..4c24b3684 100644 --- a/lib/Zend/Crypt/Math/BigInteger/Bcmath.php +++ b/lib/Zend/Crypt/Math/BigInteger/Bcmath.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Bcmath.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Bcmath.php 22653 2010-07-22 18:41:39Z mabe $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_Interface diff --git a/lib/Zend/Crypt/Math/BigInteger/Exception.php b/lib/Zend/Crypt/Math/BigInteger/Exception.php index d617647a4..25e04eceb 100644 --- a/lib/Zend/Crypt/Math/BigInteger/Exception.php +++ b/lib/Zend/Crypt/Math/BigInteger/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Math_BigInteger_Exception extends Zend_Crypt_Math_Exception diff --git a/lib/Zend/Crypt/Math/BigInteger/Gmp.php b/lib/Zend/Crypt/Math/BigInteger/Gmp.php index 6550360e2..3ee9cea45 100644 --- a/lib/Zend/Crypt/Math/BigInteger/Gmp.php +++ b/lib/Zend/Crypt/Math/BigInteger/Gmp.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gmp.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Gmp.php 23439 2010-11-23 21:10:14Z alexander $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Interface diff --git a/lib/Zend/Crypt/Math/BigInteger/Interface.php b/lib/Zend/Crypt/Math/BigInteger/Interface.php index 02a4e47e4..f0cce8b5d 100644 --- a/lib/Zend/Crypt/Math/BigInteger/Interface.php +++ b/lib/Zend/Crypt/Math/BigInteger/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Crypt_Math_BigInteger_Interface diff --git a/lib/Zend/Crypt/Math/Exception.php b/lib/Zend/Crypt/Math/Exception.php index e4faa85b4..479df2bd6 100644 --- a/lib/Zend/Crypt/Math/Exception.php +++ b/lib/Zend/Crypt/Math/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Math_Exception extends Zend_Crypt_Exception diff --git a/lib/Zend/Crypt/Rsa.php b/lib/Zend/Crypt/Rsa.php index 585a54542..25cebeb00 100644 --- a/lib/Zend/Crypt/Rsa.php +++ b/lib/Zend/Crypt/Rsa.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Rsa - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rsa.php 24808 2012-05-17 19:56:09Z rob $ + * @version $Id: Rsa.php 23439 2010-11-23 21:10:14Z alexander $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Rsa @@ -71,7 +71,7 @@ public function __construct(array $options = null) { if (!extension_loaded('openssl')) { #require_once 'Zend/Crypt/Rsa/Exception.php'; - throw new Zend_Crypt_Rsa_Exception('Zend_Crypt_Rsa requires openssl extension to be loaded.'); + throw new Zend_Crypt_Rsa_Exception('Zend_Crypt_Rsa requires openssl extention to be loaded.'); } // Set _hashAlgorithm property when we are sure, that openssl extension is loaded @@ -201,13 +201,6 @@ public function decrypt($data, Zend_Crypt_Rsa_Key $key, $format = null) return $decrypted; } - /** - * @param array $configargs - * - * @throws Zend_Crypt_Rsa_Exception - * - * @return ArrayObject - */ public function generateKeys(array $configargs = null) { $config = null; @@ -222,10 +215,6 @@ public function generateKeys(array $configargs = null) $privateKey = null; $publicKey = null; $resource = openssl_pkey_new($config); - if (!$resource) { - #require_once 'Zend/Crypt/Rsa/Exception.php'; - throw new Zend_Crypt_Rsa_Exception('Failed to generate a new private key'); - } // above fails on PHP 5.3 openssl_pkey_export($resource, $private, $passPhrase); $privateKey = new Zend_Crypt_Rsa_Key_Private($private, $passPhrase); @@ -323,9 +312,6 @@ public function getHashAlgorithm() protected function _parseConfigArgs(array $config = null) { $configs = array(); - if (isset($config['private_key_bits'])) { - $configs['private_key_bits'] = $config['private_key_bits']; - } if (isset($config['privateKeyBits'])) { $configs['private_key_bits'] = $config['privateKeyBits']; } diff --git a/lib/Zend/Crypt/Rsa/Exception.php b/lib/Zend/Crypt/Rsa/Exception.php index 49c4fedab..ba6a015f9 100644 --- a/lib/Zend/Crypt/Rsa/Exception.php +++ b/lib/Zend/Crypt/Rsa/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Rsa_Exception extends Zend_Crypt_Exception diff --git a/lib/Zend/Crypt/Rsa/Key.php b/lib/Zend/Crypt/Rsa/Key.php index b6851dd6d..d384c3c68 100644 --- a/lib/Zend/Crypt/Rsa/Key.php +++ b/lib/Zend/Crypt/Rsa/Key.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Crypt * @subpackage Rsa - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Key.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Key.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Rsa_Key implements Countable diff --git a/lib/Zend/Crypt/Rsa/Key/Private.php b/lib/Zend/Crypt/Rsa/Key/Private.php index 045188c20..cf771d10c 100644 --- a/lib/Zend/Crypt/Rsa/Key/Private.php +++ b/lib/Zend/Crypt/Rsa/Key/Private.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Rsa - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Private.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Private.php 22662 2010-07-24 17:37:36Z mabe $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Rsa_Key_Private extends Zend_Crypt_Rsa_Key diff --git a/lib/Zend/Crypt/Rsa/Key/Public.php b/lib/Zend/Crypt/Rsa/Key/Public.php index 48dad6d1b..25972a7e1 100644 --- a/lib/Zend/Crypt/Rsa/Key/Public.php +++ b/lib/Zend/Crypt/Rsa/Key/Public.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Rsa - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Public.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Public.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Rsa_Key_Public extends Zend_Crypt_Rsa_Key diff --git a/lib/Zend/Currency.php b/lib/Zend/Currency.php index eeaff3abc..668ab704f 100644 --- a/lib/Zend/Currency.php +++ b/lib/Zend/Currency.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Currency.php 24855 2012-06-01 00:12:25Z adamlundrigan $ + * @version $Id: Currency.php 22708 2010-07-28 07:25:16Z thomas $ */ /** @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Currency @@ -91,11 +91,6 @@ class Zend_Currency */ public function __construct($options = null, $locale = null) { - $calloptions = $options; - if (is_array($options) && isset($options['display'])) { - $this->_options['display'] = $options['display']; - } - if (is_array($options)) { $this->setLocale($locale); $this->setFormat($options); @@ -125,13 +120,10 @@ public function __construct($options = null, $locale = null) } // Get the format - if ((is_array($calloptions) && !isset($calloptions['display'])) - || (!is_array($calloptions) && $this->_options['display'] == self::NO_SYMBOL)) { - if (!empty($this->_options['symbol'])) { - $this->_options['display'] = self::USE_SYMBOL; - } else if (!empty($this->_options['currency'])) { - $this->_options['display'] = self::USE_SHORTNAME; - } + if (!empty($this->_options['symbol'])) { + $this->_options['display'] = self::USE_SYMBOL; + } else if (!empty($this->_options['currency'])) { + $this->_options['display'] = self::USE_SHORTNAME; } } @@ -802,7 +794,7 @@ public function setService($service) if (!class_exists($service)) { $file = str_replace('_', DIRECTORY_SEPARATOR, $service) . '.php'; if (Zend_Loader::isReadable($file)) { - Zend_Loader::loadClass($service); + Zend_Loader::loadClass($class); } } diff --git a/lib/Zend/Currency/CurrencyInterface.php b/lib/Zend/Currency/CurrencyInterface.php index 9f5d2fb6e..a58dd1321 100644 --- a/lib/Zend/Currency/CurrencyInterface.php +++ b/lib/Zend/Currency/CurrencyInterface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CurrencyInterface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: CurrencyInterface.php 20785 2010-01-31 09:43:03Z mikaelkael $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Currency_CurrencyInterface diff --git a/lib/Zend/Currency/Exception.php b/lib/Zend/Currency/Exception.php index 51850a906..f59bee15d 100644 --- a/lib/Zend/Currency/Exception.php +++ b/lib/Zend/Currency/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Currency_Exception extends Zend_Exception diff --git a/lib/Zend/Date.php b/lib/Zend/Date.php index 2f4352a97..37dead4f7 100644 --- a/lib/Zend/Date.php +++ b/lib/Zend/Date.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Date.php 24880 2012-06-12 20:35:18Z matthew $ + * @version $Id: Date.php 22713 2010-07-29 11:41:56Z thomas $ */ /** @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Date extends Zend_Date_DateObject @@ -1201,7 +1201,7 @@ public function getTimezoneFromString($zone) } preg_match('/([+-]\d{2}):{0,1}\d{2}/', $zone, $match); - if (!empty($match) and ($match[count($match) - 1] <= 14) and ($match[count($match) - 1] >= -12)) { + if (!empty($match) and ($match[count($match) - 1] <= 12) and ($match[count($match) - 1] >= -12)) { $zone = "Etc/GMT"; $zone .= ($match[count($match) - 1] < 0) ? "+" : "-"; $zone .= (int) abs($match[count($match) - 1]); @@ -2107,10 +2107,7 @@ private function _calculate($calc, $date, $part, $locale) break; case self::RFC_2822: - $result = preg_match('/^\w{3},\s(\d{1,2})\s(\w{3})\s(\d{4})\s' - . '(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]' - . '{1}\d{4}|\w{1,20})$/', $date, $match); - + $result = preg_match('/^\w{3},\s(\d{1,2})\s(\w{3})\s(\d{4})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4})$/', $date, $match); if (!$result) { #require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no RFC 2822 format ($date)", 0, null, $date); @@ -2644,8 +2641,10 @@ private function _calculate($calc, $date, $part, $locale) $parsed['day'] = 0; } - if (!isset($parsed['year'])) { - $parsed['year'] = 1970; + if (isset($parsed['year'])) { + $parsed['year'] -= 1970; + } else { + $parsed['year'] = 0; } } @@ -2655,7 +2654,7 @@ private function _calculate($calc, $date, $part, $locale) isset($parsed['second']) ? $parsed['second'] : 0, isset($parsed['month']) ? (1 + $parsed['month']) : 1, isset($parsed['day']) ? (1 + $parsed['day']) : 1, - $parsed['year'], + isset($parsed['year']) ? (1970 + $parsed['year']) : 1970, false), $this->getUnixTimestamp(), false); } catch (Zend_Locale_Exception $e) { if (!is_numeric($date)) { @@ -3239,7 +3238,7 @@ public function compareArpa($date, $locale = null) /** * Check if location is supported * - * @param array $location locations array + * @param $location array - locations array * @return $horizon float */ private function _checkLocation($location) @@ -3282,7 +3281,7 @@ private function _checkLocation($location) * Returns the time of sunrise for this date and a given location as new date object * For a list of cities and correct locations use the class Zend_Date_Cities * - * @param array $location location of sunrise + * @param $location array - location of sunrise * ['horizon'] -> civil, nautic, astronomical, effective (default) * ['longitude'] -> longitude of location * ['latitude'] -> latitude of location @@ -3302,7 +3301,7 @@ public function getSunrise($location) * Returns the time of sunset for this date and a given location as new date object * For a list of cities and correct locations use the class Zend_Date_Cities * - * @param array $location location of sunset + * @param $location array - location of sunset * ['horizon'] -> civil, nautic, astronomical, effective (default) * ['longitude'] -> longitude of location * ['latitude'] -> latitude of location @@ -3322,7 +3321,7 @@ public function getSunset($location) * Returns an array with the sunset and sunrise dates for all horizon types * For a list of cities and correct locations use the class Zend_Date_Cities * - * @param array $location location of suninfo + * @param $location array - location of suninfo * ['horizon'] -> civil, nautic, astronomical, effective (default) * ['longitude'] -> longitude of location * ['latitude'] -> latitude of location @@ -3787,7 +3786,7 @@ public function compareMonth($month, $locale = null) * Returns the day as new date object * Example: 20.May.1986 -> 20.Jan.1970 00:00:00 * - * @param Zend_Locale $locale OPTIONAL Locale for parsing input + * @param $locale string|Zend_Locale OPTIONAL Locale for parsing input * @return Zend_Date */ public function getDay($locale = null) @@ -3799,9 +3798,9 @@ public function getDay($locale = null) /** * Returns the calculated day * - * @param string $calc Type of calculation to make - * @param Zend_Date $day Day to calculate, when null the actual day is calculated - * @param Zend_Locale $locale Locale for parsing input + * @param $calc string Type of calculation to make + * @param $day string|integer|Zend_Date Day to calculate, when null the actual day is calculated + * @param $locale string|Zend_Locale Locale for parsing input * @return Zend_Date|integer */ private function _day($calc, $day, $locale) @@ -3930,7 +3929,7 @@ public function compareDay($day, $locale = null) * Weekday is always from 1-7 * Example: 09-Jan-2007 -> 2 = Tuesday -> 02-Jan-1970 (when 02.01.1970 is also Tuesday) * - * @param Zend_Locale $locale OPTIONAL Locale for parsing input + * @param $locale string|Zend_Locale OPTIONAL Locale for parsing input * @return Zend_Date */ public function getWeekday($locale = null) @@ -3948,9 +3947,9 @@ public function getWeekday($locale = null) /** * Returns the calculated weekday * - * @param string $calc Type of calculation to make - * @param Zend_Date $weekday Weekday to calculate, when null the actual weekday is calculated - * @param Zend_Locale $locale Locale for parsing input + * @param $calc string Type of calculation to make + * @param $weekday string|integer|array|Zend_Date Weekday to calculate, when null the actual weekday is calculated + * @param $locale string|Zend_Locale Locale for parsing input * @return Zend_Date|integer * @throws Zend_Date_Exception */ @@ -4167,7 +4166,7 @@ public function compareDayOfYear($day, $locale = null) * Returns the hour as new date object * Example: 02.Feb.1986 10:30:25 -> 01.Jan.1970 10:00:00 * - * @param Zend_Locale $locale OPTIONAL Locale for parsing input + * @param $locale string|Zend_Locale OPTIONAL Locale for parsing input * @return Zend_Date */ public function getHour($locale = null) @@ -4618,7 +4617,7 @@ public function compareMilliSecond($milli = null, $precision = null) * Returns the week as new date object using monday as begining of the week * Example: 12.Jan.2007 -> 08.Jan.1970 00:00:00 * - * @param Zend_Locale $locale OPTIONAL Locale for parsing input + * @param $locale string|Zend_Locale OPTIONAL Locale for parsing input * @return Zend_Date */ public function getWeek($locale = null) diff --git a/lib/Zend/Date/Cities.php b/lib/Zend/Date/Cities.php index 4c78a7c7a..250ff1509 100644 --- a/lib/Zend/Date/Cities.php +++ b/lib/Zend/Date/Cities.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cities.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Cities.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Date * @subpackage Zend_Date_Cities - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Date_Cities diff --git a/lib/Zend/Date/DateObject.php b/lib/Zend/Date/DateObject.php index 2835b6be1..7104f1394 100644 --- a/lib/Zend/Date/DateObject.php +++ b/lib/Zend/Date/DateObject.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: DateObject.php 24880 2012-06-12 20:35:18Z matthew $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: DateObject.php 22712 2010-07-29 08:24:28Z thomas $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Date * @subpackage Zend_Date_DateObject - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Date_DateObject { @@ -312,13 +312,6 @@ protected function date($format, $timestamp = null, $gmt = false) } if (abs($timestamp) <= 0x7FFFFFFF) { - // See ZF-11992 - // "o" will sometimes resolve to the previous year (see - // http://php.net/date ; it's part of the ISO 8601 - // standard). However, this is not desired, so replacing - // all occurrences of "o" not preceded by a backslash - // with "Y" - $format = preg_replace('/(? (boolean) Whether to use a persistent connection or not, defaults to false * protocol => (string) The network protocol, defaults to TCPIP * caseFolding => (int) style of case-alteration used for identifiers - * socket => (string) The socket or named pipe that should be used * * @param array|Zend_Config $config An array or instance of Zend_Config having configuration data * @throws Zend_Db_Adapter_Exception @@ -532,7 +531,6 @@ public function rollBack() * @param mixed $table The table to insert data into. * @param array $bind Column-value pairs. * @return int The number of affected rows. - * @throws Zend_Db_Adapter_Exception */ public function insert($table, array $bind) { @@ -585,7 +583,6 @@ public function insert($table, array $bind) * @param array $bind Column-value pairs. * @param mixed $where UPDATE WHERE clause(s). * @return int The number of affected rows. - * @throws Zend_Db_Adapter_Exception */ public function update($table, array $bind, $where = '') { @@ -746,7 +743,7 @@ public function fetchAll($sql, $bind = array(), $fetchMode = null) * @param string|Zend_Db_Select $sql An SQL SELECT statement. * @param mixed $bind Data to bind into SELECT placeholders. * @param mixed $fetchMode Override current fetch mode. - * @return mixed Array, object, or scalar depending on fetch mode. + * @return array */ public function fetchRow($sql, $bind = array(), $fetchMode = null) { diff --git a/lib/Zend/Db/Adapter/Db2.php b/lib/Zend/Db/Adapter/Db2.php index ba10bda60..aa2e62dff 100644 --- a/lib/Zend/Db/Adapter/Db2.php +++ b/lib/Zend/Db/Adapter/Db2.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db2.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Db2.php 23199 2010-10-21 14:27:06Z ralph $ * */ @@ -39,7 +39,7 @@ /** * @package Zend_Db - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -161,7 +161,7 @@ protected function _connect() $this->_config['driver_options']['i5_naming'] = DB2_I5_NAMING_OFF; } } - + if ($this->_config['host'] !== 'localhost' && !$this->_isI5) { // if the host isn't localhost, use extended connection params $dbname = 'DRIVER={IBM DB2 ODBC DRIVER}' . diff --git a/lib/Zend/Db/Adapter/Db2/Exception.php b/lib/Zend/Db/Adapter/Db2/Exception.php index e8acda914..053791097 100644 --- a/lib/Zend/Db/Adapter/Db2/Exception.php +++ b/lib/Zend/Db/Adapter/Db2/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -30,7 +30,7 @@ * * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Db2_Exception extends Zend_Db_Adapter_Exception @@ -38,7 +38,7 @@ class Zend_Db_Adapter_Db2_Exception extends Zend_Db_Adapter_Exception protected $code = '00000'; protected $message = 'unknown exception'; - function __construct($message = 'unknown exception', $code = '00000', Exception $e = null) + function __construct($message = 'unknown exception', $code = '00000', Exception $e = null) { parent::__construct($message, $code, $e); } diff --git a/lib/Zend/Db/Adapter/Exception.php b/lib/Zend/Db/Adapter/Exception.php index e303b8fa6..07c95f9b9 100644 --- a/lib/Zend/Db/Adapter/Exception.php +++ b/lib/Zend/Db/Adapter/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Exception extends Zend_Db_Exception diff --git a/lib/Zend/Db/Adapter/Mysqli.php b/lib/Zend/Db/Adapter/Mysqli.php index 616c147b6..181194d40 100644 --- a/lib/Zend/Db/Adapter/Mysqli.php +++ b/lib/Zend/Db/Adapter/Mysqli.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mysqli.php 25229 2013-01-18 08:17:21Z frosch $ + * @version $Id: Mysqli.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract @@ -297,12 +297,6 @@ protected function _connect() $port = null; } - if (isset($this->_config['socket'])) { - $socket = $this->_config['socket']; - } else { - $socket = null; - } - $this->_connection = mysqli_init(); if(!empty($this->_config['driver_options'])) { @@ -326,8 +320,7 @@ protected function _connect() $this->_config['username'], $this->_config['password'], $this->_config['dbname'], - $port, - $socket + $port ); if ($_isConnected === false || mysqli_connect_errno()) { diff --git a/lib/Zend/Db/Adapter/Mysqli/Exception.php b/lib/Zend/Db/Adapter/Mysqli/Exception.php index 6d4eb3b5a..23ffc2b8e 100644 --- a/lib/Zend/Db/Adapter/Mysqli/Exception.php +++ b/lib/Zend/Db/Adapter/Mysqli/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ * */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Mysqli_Exception extends Zend_Db_Adapter_Exception diff --git a/lib/Zend/Db/Adapter/Oracle.php b/lib/Zend/Db/Adapter/Oracle.php index a5de11c4f..3573aaede 100644 --- a/lib/Zend/Db/Adapter/Oracle.php +++ b/lib/Zend/Db/Adapter/Oracle.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oracle.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Oracle.php 21108 2010-02-19 22:36:08Z mikaelkael $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract @@ -147,9 +147,8 @@ protected function _connect() public function isConnected() { return ((bool) (is_resource($this->_connection) - && (get_resource_type($this->_connection) == 'oci8 connection' - || get_resource_type($this->_connection) == 'oci8 persistent connection'))); - } + && get_resource_type($this->_connection) == 'oci8 connection')); + } /** * Force the connection to close. diff --git a/lib/Zend/Db/Adapter/Oracle/Exception.php b/lib/Zend/Db/Adapter/Oracle/Exception.php index 318fe1f8a..488cb1c87 100644 --- a/lib/Zend/Db/Adapter/Oracle/Exception.php +++ b/lib/Zend/Db/Adapter/Oracle/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Oracle_Exception extends Zend_Db_Adapter_Exception diff --git a/lib/Zend/Db/Adapter/Pdo/Abstract.php b/lib/Zend/Db/Adapter/Pdo/Abstract.php index e2a94c945..d4f8a8e4d 100644 --- a/lib/Zend/Db/Adapter/Pdo/Abstract.php +++ b/lib/Zend/Db/Adapter/Pdo/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract diff --git a/lib/Zend/Db/Adapter/Pdo/Ibm.php b/lib/Zend/Db/Adapter/Pdo/Ibm.php index d91244e03..66a9ab7b1 100644 --- a/lib/Zend/Db/Adapter/Pdo/Ibm.php +++ b/lib/Zend/Db/Adapter/Pdo/Ibm.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ibm.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Ibm.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Ibm extends Zend_Db_Adapter_Pdo_Abstract diff --git a/lib/Zend/Db/Adapter/Pdo/Ibm/Db2.php b/lib/Zend/Db/Adapter/Pdo/Ibm/Db2.php index 797dd2193..2eb09557e 100644 --- a/lib/Zend/Db/Adapter/Pdo/Ibm/Db2.php +++ b/lib/Zend/Db/Adapter/Pdo/Ibm/Db2.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db2.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Db2.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Ibm_Db2 diff --git a/lib/Zend/Db/Adapter/Pdo/Ibm/Ids.php b/lib/Zend/Db/Adapter/Pdo/Ibm/Ids.php index 33f334f10..4db9203b7 100644 --- a/lib/Zend/Db/Adapter/Pdo/Ibm/Ids.php +++ b/lib/Zend/Db/Adapter/Pdo/Ibm/Ids.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ids.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Ids.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Ibm_Ids diff --git a/lib/Zend/Db/Adapter/Pdo/Mssql.php b/lib/Zend/Db/Adapter/Pdo/Mssql.php index d3b0d9154..d76205ef2 100644 --- a/lib/Zend/Db/Adapter/Pdo/Mssql.php +++ b/lib/Zend/Db/Adapter/Pdo/Mssql.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mssql.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Mssql.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Abstract diff --git a/lib/Zend/Db/Adapter/Pdo/Mysql.php b/lib/Zend/Db/Adapter/Pdo/Mysql.php index 011c425c5..8bca20360 100644 --- a/lib/Zend/Db/Adapter/Pdo/Mysql.php +++ b/lib/Zend/Db/Adapter/Pdo/Mysql.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mysql.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Mysql.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Abstract @@ -76,19 +76,6 @@ class Zend_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Abstract 'FLOAT' => Zend_Db::FLOAT_TYPE ); - /** - * Override _dsn() and ensure that charset is incorporated in mysql - * @see Zend_Db_Adapter_Pdo_Abstract::_dsn() - */ - protected function _dsn() - { - $dsn = parent::_dsn(); - if (isset($this->_config['charset'])) { - $dsn .= ';charset=' . $this->_config['charset']; - } - return $dsn; - } - /** * Creates a PDO object and connects to the database. * diff --git a/lib/Zend/Db/Adapter/Pdo/Oci.php b/lib/Zend/Db/Adapter/Pdo/Oci.php index 5783b1ffe..7bb4ddf4c 100644 --- a/lib/Zend/Db/Adapter/Pdo/Oci.php +++ b/lib/Zend/Db/Adapter/Pdo/Oci.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oci.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Oci.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Oci extends Zend_Db_Adapter_Pdo_Abstract diff --git a/lib/Zend/Db/Adapter/Pdo/Pgsql.php b/lib/Zend/Db/Adapter/Pdo/Pgsql.php index 2d1593ebf..f3a0c604e 100644 --- a/lib/Zend/Db/Adapter/Pdo/Pgsql.php +++ b/lib/Zend/Db/Adapter/Pdo/Pgsql.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pgsql.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Pgsql.php 22788 2010-08-03 18:29:55Z ramon $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Abstract diff --git a/lib/Zend/Db/Adapter/Pdo/Sqlite.php b/lib/Zend/Db/Adapter/Pdo/Sqlite.php index fffff1c7b..2c24dfbf7 100644 --- a/lib/Zend/Db/Adapter/Pdo/Sqlite.php +++ b/lib/Zend/Db/Adapter/Pdo/Sqlite.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlite.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Sqlite.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract diff --git a/lib/Zend/Db/Adapter/Sqlsrv.php b/lib/Zend/Db/Adapter/Sqlsrv.php index 4f6fe8c50..b54fcedf4 100644 --- a/lib/Zend/Db/Adapter/Sqlsrv.php +++ b/lib/Zend/Db/Adapter/Sqlsrv.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlsrv.php 25077 2012-11-06 20:06:24Z rob $ + * @version $Id: Sqlsrv.php 21885 2010-04-16 15:13:40Z juokaz $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract @@ -437,10 +437,10 @@ public function describeTable($tableName, $schemaName = null) $sql = "exec sp_columns @table_name = " . $this->quoteIdentifier($tableName, true); $stmt = $this->query($sql); $result = $stmt->fetchAll(Zend_Db::FETCH_NUM); + + // ZF-7698 + $stmt->closeCursor(); - // ZF-7698 - $stmt->closeCursor(); - if (count($result) == 0) { return array(); } @@ -622,22 +622,17 @@ public function limit($sql, $count, $offset = 0) } else { $over = preg_replace('/\"[^,]*\".\"([^,]*)\"/i', '"inner_tbl"."$1"', $orderby); } - + // Remove ORDER BY clause from $sql $sql = preg_replace('/\s+ORDER BY(.*)/', '', $sql); - + // Add ORDER BY clause as an argument for ROW_NUMBER() $sql = "SELECT ROW_NUMBER() OVER ($over) AS \"ZEND_DB_ROWNUM\", * FROM ($sql) AS inner_tbl"; - + $start = $offset + 1; + $end = $offset + $count; - if ($count == PHP_INT_MAX) { - $sql = "WITH outer_tbl AS ($sql) SELECT * FROM outer_tbl WHERE \"ZEND_DB_ROWNUM\" >= $start"; - } - else { - $end = $offset + $count; - $sql = "WITH outer_tbl AS ($sql) SELECT * FROM outer_tbl WHERE \"ZEND_DB_ROWNUM\" BETWEEN $start AND $end"; - } + $sql = "WITH outer_tbl AS ($sql) SELECT * FROM outer_tbl WHERE \"ZEND_DB_ROWNUM\" BETWEEN $start AND $end"; } return $sql; diff --git a/lib/Zend/Db/Adapter/Sqlsrv/Exception.php b/lib/Zend/Db/Adapter/Sqlsrv/Exception.php index 7ce0f2c6f..17d0d9ad9 100644 --- a/lib/Zend/Db/Adapter/Sqlsrv/Exception.php +++ b/lib/Zend/Db/Adapter/Sqlsrv/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20625 2010-01-25 21:03:53Z ralph $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Sqlsrv_Exception extends Zend_Db_Adapter_Exception diff --git a/lib/Zend/Db/Exception.php b/lib/Zend/Db/Exception.php index d120c8ed3..36c540d8e 100644 --- a/lib/Zend/Db/Exception.php +++ b/lib/Zend/Db/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Db - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Db - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Exception extends Zend_Exception diff --git a/lib/Zend/Db/Expr.php b/lib/Zend/Db/Expr.php index 781f9007d..df366b3b2 100644 --- a/lib/Zend/Db/Expr.php +++ b/lib/Zend/Db/Expr.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Expr - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Expr.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Expr.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Db * @subpackage Expr - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Expr diff --git a/lib/Zend/Db/Profiler.php b/lib/Zend/Db/Profiler.php index 2597be5ca..72d00dea5 100644 --- a/lib/Zend/Db/Profiler.php +++ b/lib/Zend/Db/Profiler.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Profiler.php 25127 2012-11-16 15:17:42Z rob $ + * @version $Id: Profiler.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Profiler @@ -225,9 +225,7 @@ public function clear() } /** - * Clone a profiler query - * - * @param Zend_Db_Profiler_Query $query + * @param integer $queryId * @return integer or null */ public function queryClone(Zend_Db_Profiler_Query $query) @@ -289,12 +287,12 @@ public function queryStart($queryText, $queryType = null) } /** - * Ends a query. Pass it the handle that was returned by queryStart(). + * Ends a query. Pass it the handle that was returned by queryStart(). * This will mark the query as ended and save the time. * * @param integer $queryId * @throws Zend_Db_Profiler_Exception - * @return string Inform that a query is stored or ignored. + * @return void */ public function queryEnd($queryId) { diff --git a/lib/Zend/Db/Profiler/Exception.php b/lib/Zend/Db/Profiler/Exception.php index 1fad40654..713d88888 100644 --- a/lib/Zend/Db/Profiler/Exception.php +++ b/lib/Zend/Db/Profiler/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Profiler_Exception extends Zend_Db_Exception diff --git a/lib/Zend/Db/Profiler/Firebug.php b/lib/Zend/Db/Profiler/Firebug.php index 5c46dfcc8..a190ac9b6 100644 --- a/lib/Zend/Db/Profiler/Firebug.php +++ b/lib/Zend/Db/Profiler/Firebug.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Firebug.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Firebug.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** Zend_Db_Profiler */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Profiler_Firebug extends Zend_Db_Profiler diff --git a/lib/Zend/Db/Profiler/Query.php b/lib/Zend/Db/Profiler/Query.php index 3420e8b79..a634ea966 100644 --- a/lib/Zend/Db/Profiler/Query.php +++ b/lib/Zend/Db/Profiler/Query.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Query.php 23382 2010-11-18 22:50:50Z bittarman $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Profiler_Query diff --git a/lib/Zend/Db/Select.php b/lib/Zend/Db/Select.php index ea9eb53d4..601259e9e 100644 --- a/lib/Zend/Db/Select.php +++ b/lib/Zend/Db/Select.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Select.php 24833 2012-05-30 13:29:41Z adamlundrigan $ + * @version $Id: Select.php 23254 2010-10-26 12:49:23Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Select @@ -207,8 +207,8 @@ public function distinct($flag = true) * The first parameter $name can be a simple string, in which case the * correlation name is generated automatically. If you want to specify * the correlation name, the first parameter must be an associative - * array in which the key is the correlation name, and the value is - * the physical table name. For example, array('alias' => 'table'). + * array in which the key is the physical table name, and the value is + * the correlation name. For example, array('table' => 'alias'). * The correlation name is prepended to all columns fetched for this * table. * @@ -219,8 +219,8 @@ public function distinct($flag = true) * no correlation name is generated or prepended to the columns named * in the second parameter. * - * @param array|string|Zend_Db_Expr $name The table name or an associative array - * relating correlation name to table name. + * @param array|string|Zend_Db_Expr $name The table name or an associative array relating table name to + * correlation name. * @param array|string|Zend_Db_Expr $cols The columns to select from this table. * @param string $schema The schema name to specify, if any. * @return Zend_Db_Select This Zend_Db_Select object. @@ -880,13 +880,9 @@ public function _joinUsing($type, $name, $cond, $cols = '*', $schema = null) $join = $this->_adapter->quoteIdentifier(key($this->_parts[self::FROM]), true); $from = $this->_adapter->quoteIdentifier($this->_uniqueCorrelation($name), true); - $joinCond = array(); - foreach ((array)$cond as $fieldName) { - $cond1 = $from . '.' . $fieldName; - $cond2 = $join . '.' . $fieldName; - $joinCond[] = $cond1 . ' = ' . $cond2; - } - $cond = implode(' '.self::SQL_AND.' ', $joinCond); + $cond1 = $from . '.' . $cond; + $cond2 = $join . '.' . $cond; + $cond = $cond1 . ' = ' . $cond2; return $this->_join($type, $name, $cond, $cols, $schema); } @@ -900,8 +896,7 @@ public function _joinUsing($type, $name, $cond, $cols = '*', $schema = null) private function _uniqueCorrelation($name) { if (is_array($name)) { - $k = key($name); - $c = is_string($k) ? $k : end($name); + $c = end($name); } else { // Extract just the last name of a qualified table name $dot = strrpos($name,'.'); diff --git a/lib/Zend/Db/Select/Exception.php b/lib/Zend/Db/Select/Exception.php index b59e8d32c..a39f244ce 100644 --- a/lib/Zend/Db/Select/Exception.php +++ b/lib/Zend/Db/Select/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/lib/Zend/Db/Statement.php b/lib/Zend/Db/Statement.php index 71df2a8f0..bcacbf9ea 100644 --- a/lib/Zend/Db/Statement.php +++ b/lib/Zend/Db/Statement.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Statement.php 24790 2012-05-10 12:28:51Z mcleod@spaceweb.nl $ + * @version $Id: Statement.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface @@ -176,40 +176,37 @@ protected function _parseParameters($sql) */ protected function _stripQuoted($sql) { + // get the character for delimited id quotes, + // this is usually " but in MySQL is ` + $d = $this->_adapter->quoteIdentifier('a'); + $d = $d[0]; + + // get the value used as an escaped delimited id quote, + // e.g. \" or "" or \` + $de = $this->_adapter->quoteIdentifier($d); + $de = substr($de, 1, 2); + $de = str_replace('\\', '\\\\', $de); // get the character for value quoting // this should be ' $q = $this->_adapter->quote('a'); - $q = $q[0]; + $q = $q[0]; + // get the value used as an escaped quote, // e.g. \' or '' $qe = $this->_adapter->quote($q); $qe = substr($qe, 1, 2); - $qe = preg_quote($qe); - $escapeChar = substr($qe,0,1); - // remove 'foo\'bar' - if (!empty($q)) { - $escapeChar = preg_quote($escapeChar); - // this segfaults only after 65,000 characters instead of 9,000 - $sql = preg_replace("/$q([^$q{$escapeChar}]*|($qe)*)*$q/s", '', $sql); - } - + $qe = str_replace('\\', '\\\\', $qe); + // get a version of the SQL statement with all quoted // values and delimited identifiers stripped out // remove "foo\"bar" - $sql = preg_replace("/\"(\\\\\"|[^\"])*\"/Us", '', $sql); + $sql = preg_replace("/$q($qe|\\\\{2}|[^$q])*$q/", '', $sql); + // remove 'foo\'bar' + if (!empty($q)) { + $sql = preg_replace("/$q($qe|[^$q])*$q/", '', $sql); + } - // get the character for delimited id quotes, - // this is usually " but in MySQL is ` - $d = $this->_adapter->quoteIdentifier('a'); - $d = $d[0]; - // get the value used as an escaped delimited id quote, - // e.g. \" or "" or \` - $de = $this->_adapter->quoteIdentifier($d); - $de = substr($de, 1, 2); - $de = preg_quote($de); - // Note: $de and $d where never used..., now they are: - $sql = preg_replace("/$d($de|\\\\{2}|[^$d])*$d/Us", '', $sql); return $sql; } diff --git a/lib/Zend/Db/Statement/Db2.php b/lib/Zend/Db/Statement/Db2.php index 21bcb3768..6121c8fdc 100644 --- a/lib/Zend/Db/Statement/Db2.php +++ b/lib/Zend/Db/Statement/Db2.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db2.php 24625 2012-02-22 21:53:40Z adamlundrigan $ + * @version $Id: Db2.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -30,7 +30,7 @@ * * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Db2 extends Zend_Db_Statement @@ -96,7 +96,7 @@ public function _bindParam($parameter, &$variable, $type = null, $length = null, $datatype = DB2_CHAR; } - if (!db2_bind_param($this->_stmt, $parameter, "variable", $type, $datatype)) { + if (!db2_bind_param($this->_stmt, $position, "variable", $type, $datatype)) { /** * @see Zend_Db_Statement_Db2_Exception */ diff --git a/lib/Zend/Db/Statement/Db2/Exception.php b/lib/Zend/Db/Statement/Db2/Exception.php index 89c5e3b85..1c58093f3 100644 --- a/lib/Zend/Db/Statement/Db2/Exception.php +++ b/lib/Zend/Db/Statement/Db2/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/lib/Zend/Db/Statement/Exception.php b/lib/Zend/Db/Statement/Exception.php index 2f69da9a5..1650c12e0 100644 --- a/lib/Zend/Db/Statement/Exception.php +++ b/lib/Zend/Db/Statement/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20513 2010-01-22 07:55:48Z ralph $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Exception extends Zend_Db_Exception diff --git a/lib/Zend/Db/Statement/Interface.php b/lib/Zend/Db/Statement/Interface.php index bb0540c25..701c64010 100644 --- a/lib/Zend/Db/Statement/Interface.php +++ b/lib/Zend/Db/Statement/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Db_Statement_Interface diff --git a/lib/Zend/Db/Statement/Mysqli.php b/lib/Zend/Db/Statement/Mysqli.php index 653b8b558..1f1d432bd 100644 --- a/lib/Zend/Db/Statement/Mysqli.php +++ b/lib/Zend/Db/Statement/Mysqli.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mysqli.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Mysqli.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement diff --git a/lib/Zend/Db/Statement/Mysqli/Exception.php b/lib/Zend/Db/Statement/Mysqli/Exception.php index 787cc40da..4e3034056 100644 --- a/lib/Zend/Db/Statement/Mysqli/Exception.php +++ b/lib/Zend/Db/Statement/Mysqli/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/lib/Zend/Db/Statement/Oracle.php b/lib/Zend/Db/Statement/Oracle.php index a27a97c0b..adea263b8 100644 --- a/lib/Zend/Db/Statement/Oracle.php +++ b/lib/Zend/Db/Statement/Oracle.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oracle.php 24863 2012-06-02 00:22:47Z adamlundrigan $ + * @version $Id: Oracle.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Oracle extends Zend_Db_Statement @@ -87,7 +87,7 @@ public function getLobAsString() protected function _prepare($sql) { $connection = $this->_adapter->getConnection(); - $this->_stmt = @oci_parse($connection, $sql); + $this->_stmt = oci_parse($connection, $sql); if (!$this->_stmt) { /** * @see Zend_Db_Statement_Oracle_Exception @@ -240,7 +240,7 @@ public function _execute(array $params = null) } $error = false; foreach (array_keys($params) as $name) { - if (!$this->bindParam($name, $params[$name], null, -1)) { + if (!@oci_bind_by_name($this->_stmt, $name, $params[$name], -1)) { $error = true; break; } diff --git a/lib/Zend/Db/Statement/Oracle/Exception.php b/lib/Zend/Db/Statement/Oracle/Exception.php index 04bd9555b..633f55825 100644 --- a/lib/Zend/Db/Statement/Oracle/Exception.php +++ b/lib/Zend/Db/Statement/Oracle/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/lib/Zend/Db/Statement/Pdo.php b/lib/Zend/Db/Statement/Pdo.php index ebe55d11d..cd0a947cb 100644 --- a/lib/Zend/Db/Statement/Pdo.php +++ b/lib/Zend/Db/Statement/Pdo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pdo.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Pdo.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggregate diff --git a/lib/Zend/Db/Statement/Pdo/Ibm.php b/lib/Zend/Db/Statement/Pdo/Ibm.php index a72f12562..c66d4956d 100644 --- a/lib/Zend/Db/Statement/Pdo/Ibm.php +++ b/lib/Zend/Db/Statement/Pdo/Ibm.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ibm.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Ibm.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Pdo_Ibm extends Zend_Db_Statement_Pdo diff --git a/lib/Zend/Db/Statement/Pdo/Oci.php b/lib/Zend/Db/Statement/Pdo/Oci.php index 6c0856bf0..b32ed0efb 100644 --- a/lib/Zend/Db/Statement/Pdo/Oci.php +++ b/lib/Zend/Db/Statement/Pdo/Oci.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oci.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Oci.php 21104 2010-02-19 21:26:36Z mikaelkael $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Pdo_Oci extends Zend_Db_Statement_Pdo diff --git a/lib/Zend/Db/Statement/Sqlsrv.php b/lib/Zend/Db/Statement/Sqlsrv.php index 435475e7e..353183628 100644 --- a/lib/Zend/Db/Statement/Sqlsrv.php +++ b/lib/Zend/Db/Statement/Sqlsrv.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlsrv.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Sqlsrv.php 21887 2010-04-16 18:28:10Z juokaz $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement @@ -376,11 +376,11 @@ public function nextRowset() #require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } - - // reset column keys - $this->_keys = null; + + // reset column keys + $this->_keys = null; - return true; + return true; } /** @@ -411,8 +411,8 @@ public function rowCount() return $num_rows; } - - /** + + /** * Returns an array containing all of the result set rows. * * @param int $style OPTIONAL Fetch mode. diff --git a/lib/Zend/Db/Statement/Sqlsrv/Exception.php b/lib/Zend/Db/Statement/Sqlsrv/Exception.php index bc3c73673..562ccb0f4 100644 --- a/lib/Zend/Db/Statement/Sqlsrv/Exception.php +++ b/lib/Zend/Db/Statement/Sqlsrv/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -28,7 +28,7 @@ /** * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Sqlsrv_Exception extends Zend_Db_Statement_Exception diff --git a/lib/Zend/Db/Table.php b/lib/Zend/Db/Table.php index 5c3d62073..ef6f42e79 100644 --- a/lib/Zend/Db/Table.php +++ b/lib/Zend/Db/Table.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Table.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Table.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table extends Zend_Db_Table_Abstract diff --git a/lib/Zend/Db/Table/Abstract.php b/lib/Zend/Db/Table/Abstract.php index e94f6a073..abd5e41a8 100644 --- a/lib/Zend/Db/Table/Abstract.php +++ b/lib/Zend/Db/Table/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24958 2012-06-15 13:44:04Z adamlundrigan $ + * @version $Id: Abstract.php 21078 2010-02-18 18:07:16Z tech13 $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Table_Abstract @@ -70,7 +70,6 @@ abstract class Zend_Db_Table_Abstract const ON_UPDATE = 'onUpdate'; const CASCADE = 'cascade'; - const CASCADE_RECURSE = 'cascadeRecurse'; const RESTRICT = 'restrict'; const SET_NULL = 'setNull'; @@ -745,7 +744,6 @@ protected function _setup() * Initialize database adapter. * * @return void - * @throws Zend_Db_Table_Exception */ protected function _setupDatabaseAdapter() { @@ -809,23 +807,12 @@ protected function _setupMetadata() //get db configuration $dbConfig = $this->_db->getConfig(); - $port = isset($dbConfig['options']['port']) - ? ':'.$dbConfig['options']['port'] - : (isset($dbConfig['port']) - ? ':'.$dbConfig['port'] - : null); - - $host = isset($dbConfig['options']['host']) - ? ':'.$dbConfig['options']['host'] - : (isset($dbConfig['host']) - ? ':'.$dbConfig['host'] - : null); - // Define the cache identifier where the metadata are saved $cacheId = md5( // port:host/dbname:schema.table (based on availabilty) - $port . $host . '/'. $dbConfig['dbname'] . ':' - . $this->_schema. '.' . $this->_name - ); + (isset($dbConfig['options']['port']) ? ':'.$dbConfig['options']['port'] : null) + . (isset($dbConfig['options']['host']) ? ':'.$dbConfig['options']['host'] : null) + . '/'.$dbConfig['dbname'].':'.$this->_schema.'.'.$this->_name + ); } // If $this has no metadata cache or metadata cache misses @@ -886,7 +873,7 @@ protected function _setupPrimaryKey() // then throw an exception. if (empty($this->_primary)) { #require_once 'Zend/Db/Table/Exception.php'; - throw new Zend_Db_Table_Exception("A table must have a primary key, but none was found for table '{$this->_name}'"); + throw new Zend_Db_Table_Exception('A table must have a primary key, but none was found'); } } else if (!is_array($this->_primary)) { $this->_primary = array(1 => $this->_primary); @@ -974,9 +961,8 @@ public function init() * You can elect to return only a part of this information by supplying its key name, * otherwise all information is returned as an array. * - * @param string $key The specific info part to return OPTIONAL + * @param $key The specific info part to return OPTIONAL * @return mixed - * @throws Zend_Db_Table_Exception */ public function info($key = null) { @@ -1049,24 +1035,14 @@ public function insert(array $data) */ if (is_string($this->_sequence) && !isset($data[$pkIdentity])) { $data[$pkIdentity] = $this->_db->nextSequenceId($this->_sequence); - $pkSuppliedBySequence = true; } /** * If the primary key can be generated automatically, and no value was * specified in the user-supplied data, then omit it from the tuple. - * - * Note: this checks for sensible values in the supplied primary key - * position of the data. The following values are considered empty: - * null, false, true, '', array() */ - if (!isset($pkSuppliedBySequence) && array_key_exists($pkIdentity, $data)) { - if ($data[$pkIdentity] === null // null - || $data[$pkIdentity] === '' // empty string - || is_bool($data[$pkIdentity]) // boolean - || (is_array($data[$pkIdentity]) && empty($data[$pkIdentity]))) { // empty array - unset($data[$pkIdentity]); - } + if (array_key_exists($pkIdentity, $data) && $data[$pkIdentity] === null) { + unset($data[$pkIdentity]); } /** @@ -1181,22 +1157,6 @@ public function _cascadeUpdate($parentTableClassname, array $oldPrimaryKey, arra */ public function delete($where) { - $depTables = $this->getDependentTables(); - if (!empty($depTables)) { - $resultSet = $this->fetchAll($where); - if (count($resultSet) > 0 ) { - foreach ($resultSet as $row) { - /** - * Execute cascading deletes against dependent tables - */ - foreach ($depTables as $tableClass) { - $t = self::getTableFromString($tableClass, $this); - $t->_cascadeDelete($tableClass, $row->getPrimaryKey()); - } - } - } - } - $tableSpec = ($this->_schema ? $this->_schema . '.' : '') . $this->_name; return $this->_db->delete($tableSpec, $where); } @@ -1210,56 +1170,27 @@ public function delete($where) */ public function _cascadeDelete($parentTableClassname, array $primaryKey) { - // setup metadata $this->_setupMetadata(); - - // get this class name - $thisClass = get_class($this); - if ($thisClass === 'Zend_Db_Table') { - $thisClass = $this->_definitionConfigName; - } - $rowsAffected = 0; - foreach ($this->_getReferenceMapNormalized() as $map) { if ($map[self::REF_TABLE_CLASS] == $parentTableClassname && isset($map[self::ON_DELETE])) { - - $where = array(); - - // CASCADE or CASCADE_RECURSE - if (in_array($map[self::ON_DELETE], array(self::CASCADE, self::CASCADE_RECURSE))) { - for ($i = 0; $i < count($map[self::COLUMNS]); ++$i) { - $col = $this->_db->foldCase($map[self::COLUMNS][$i]); - $refCol = $this->_db->foldCase($map[self::REF_COLUMNS][$i]); - $type = $this->_metadata[$col]['DATA_TYPE']; - $where[] = $this->_db->quoteInto( - $this->_db->quoteIdentifier($col, true) . ' = ?', - $primaryKey[$refCol], $type); - } - } - - // CASCADE_RECURSE - if ($map[self::ON_DELETE] == self::CASCADE_RECURSE) { - - /** - * Execute cascading deletes against dependent tables - */ - $depTables = $this->getDependentTables(); - if (!empty($depTables)) { - foreach ($depTables as $tableClass) { - $t = self::getTableFromString($tableClass, $this); - foreach ($this->fetchAll($where) as $depRow) { - $rowsAffected += $t->_cascadeDelete($thisClass, $depRow->getPrimaryKey()); - } + switch ($map[self::ON_DELETE]) { + case self::CASCADE: + $where = array(); + for ($i = 0; $i < count($map[self::COLUMNS]); ++$i) { + $col = $this->_db->foldCase($map[self::COLUMNS][$i]); + $refCol = $this->_db->foldCase($map[self::REF_COLUMNS][$i]); + $type = $this->_metadata[$col]['DATA_TYPE']; + $where[] = $this->_db->quoteInto( + $this->_db->quoteIdentifier($col, true) . ' = ?', + $primaryKey[$refCol], $type); } - } - } - - // CASCADE or CASCADE_RECURSE - if (in_array($map[self::ON_DELETE], array(self::CASCADE, self::CASCADE_RECURSE))) { - $rowsAffected += $this->delete($where); + $rowsAffected += $this->delete($where); + break; + default: + // no action + break; } - } } return $rowsAffected; @@ -1411,11 +1342,10 @@ public function fetchAll($where = null, $order = null, $count = null, $offset = * * @param string|array|Zend_Db_Table_Select $where OPTIONAL An SQL WHERE clause or Zend_Db_Table_Select object. * @param string|array $order OPTIONAL An SQL ORDER clause. - * @param int $offset OPTIONAL An SQL OFFSET value. * @return Zend_Db_Table_Row_Abstract|null The row results per the * Zend_Db_Adapter fetch mode, or null if no row found. */ - public function fetchRow($where = null, $order = null, $offset = null) + public function fetchRow($where = null, $order = null) { if (!($where instanceof Zend_Db_Table_Select)) { $select = $this->select(); @@ -1428,10 +1358,10 @@ public function fetchRow($where = null, $order = null, $offset = null) $this->_order($select, $order); } - $select->limit(1, ((is_numeric($offset)) ? (int) $offset : null)); + $select->limit(1); } else { - $select = $where->limit(1, $where->getPart(Zend_Db_Select::LIMIT_OFFSET)); + $select = $where->limit(1); } $rows = $this->_fetch($select); @@ -1577,38 +1507,4 @@ protected function _fetch(Zend_Db_Table_Select $select) return $data; } - public static function getTableFromString($tableName, Zend_Db_Table_Abstract $referenceTable = null) - { - if ($referenceTable instanceof Zend_Db_Table_Abstract) { - $tableDefinition = $referenceTable->getDefinition(); - - if ($tableDefinition !== null && $tableDefinition->hasTableConfig($tableName)) { - return new Zend_Db_Table($tableName, $tableDefinition); - } - } - - // assume the tableName is the class name - if (!class_exists($tableName)) { - try { - #require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($tableName); - } catch (Zend_Exception $e) { - #require_once 'Zend/Db/Table/Row/Exception.php'; - throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e); - } - } - - $options = array(); - - if ($referenceTable instanceof Zend_Db_Table_Abstract) { - $options['db'] = $referenceTable->getAdapter(); - } - - if (isset($tableDefinition) && $tableDefinition !== null) { - $options[Zend_Db_Table_Abstract::DEFINITION] = $tableDefinition; - } - - return new $tableName($options); - } - } diff --git a/lib/Zend/Db/Table/Definition.php b/lib/Zend/Db/Table/Definition.php index 6019c7ead..30e601a5b 100644 --- a/lib/Zend/Db/Table/Definition.php +++ b/lib/Zend/Db/Table/Definition.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Definition.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Definition.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Definition diff --git a/lib/Zend/Db/Table/Exception.php b/lib/Zend/Db/Table/Exception.php index 3a14c22f1..097b68278 100644 --- a/lib/Zend/Db/Table/Exception.php +++ b/lib/Zend/Db/Table/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Exception extends Zend_Db_Exception diff --git a/lib/Zend/Db/Table/Row.php b/lib/Zend/Db/Table/Row.php index b42a0676f..68b9528b8 100644 --- a/lib/Zend/Db/Table/Row.php +++ b/lib/Zend/Db/Table/Row.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Row.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Row.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Row extends Zend_Db_Table_Row_Abstract diff --git a/lib/Zend/Db/Table/Row/Abstract.php b/lib/Zend/Db/Table/Row/Abstract.php index 34fc14bae..0d88241fd 100644 --- a/lib/Zend/Db/Table/Row/Abstract.php +++ b/lib/Zend/Db/Table/Row/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24831 2012-05-30 12:52:25Z rob $ + * @version $Id: Abstract.php 22229 2010-05-21 20:55:01Z ralph $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggregate @@ -646,7 +646,7 @@ public function getIterator() { return new ArrayIterator((array) $this->_data); } - + /** * Returns the column/value data as an array. * @@ -724,17 +724,6 @@ protected function _getPrimaryKey($useDirty = true) return $array; } - /** - * Retrieves an associative array of primary keys. - * - * @param bool $useDirty - * @return array - */ - public function getPrimaryKey($useDirty = true) - { - return $this->_getPrimaryKey($useDirty); - } - /** * Constructs where statement for retrieving row(s). * @@ -1178,7 +1167,37 @@ public function __call($method, array $args) */ protected function _getTableFromString($tableName) { - return Zend_Db_Table_Abstract::getTableFromString($tableName, $this->_table); + + if ($this->_table instanceof Zend_Db_Table_Abstract) { + $tableDefinition = $this->_table->getDefinition(); + + if ($tableDefinition !== null && $tableDefinition->hasTableConfig($tableName)) { + return new Zend_Db_Table($tableName, $tableDefinition); + } + } + + // assume the tableName is the class name + if (!class_exists($tableName)) { + try { + #require_once 'Zend/Loader.php'; + Zend_Loader::loadClass($tableName); + } catch (Zend_Exception $e) { + #require_once 'Zend/Db/Table/Row/Exception.php'; + throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e); + } + } + + $options = array(); + + if (($table = $this->_getTable())) { + $options['db'] = $table->getAdapter(); + } + + if (isset($tableDefinition) && $tableDefinition !== null) { + $options[Zend_Db_Table_Abstract::DEFINITION] = $tableDefinition; + } + + return new $tableName($options); } } diff --git a/lib/Zend/Db/Table/Row/Exception.php b/lib/Zend/Db/Table/Row/Exception.php index 2470a5784..e14498dbe 100644 --- a/lib/Zend/Db/Table/Row/Exception.php +++ b/lib/Zend/Db/Table/Row/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Row_Exception extends Zend_Db_Table_Exception diff --git a/lib/Zend/Db/Table/Rowset.php b/lib/Zend/Db/Table/Rowset.php index 43dfd1ccb..71a323159 100644 --- a/lib/Zend/Db/Table/Rowset.php +++ b/lib/Zend/Db/Table/Rowset.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rowset.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Rowset.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Rowset extends Zend_Db_Table_Rowset_Abstract diff --git a/lib/Zend/Db/Table/Rowset/Abstract.php b/lib/Zend/Db/Table/Rowset/Abstract.php index 1c220578d..3f1c2dc31 100644 --- a/lib/Zend/Db/Table/Rowset/Abstract.php +++ b/lib/Zend/Db/Table/Rowset/Abstract.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Abstract.php 23380 2010-11-18 22:22:28Z ralph $ */ /** * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Countable, ArrayAccess @@ -384,11 +384,11 @@ public function getRow($position, $seek = false) #require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception('No row could be found at position ' . (int) $position, 0, $e); } - + if ($seek == true) { $this->seek($position); } - + return $row; } @@ -408,14 +408,14 @@ public function toArray() } return $this->_data; } - + protected function _loadAndReturnRow($position) { if (!isset($this->_data[$position])) { #require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception("Data for provided position does not exist"); } - + // do we already have a row object for this position? if (empty($this->_rows[$position])) { $this->_rows[$position] = new $this->_rowClass( diff --git a/lib/Zend/Db/Table/Rowset/Exception.php b/lib/Zend/Db/Table/Rowset/Exception.php index 6bc706387..fbf68d698 100644 --- a/lib/Zend/Db/Table/Rowset/Exception.php +++ b/lib/Zend/Db/Table/Rowset/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Rowset_Exception extends Zend_Db_Table_Exception diff --git a/lib/Zend/Db/Table/Select.php b/lib/Zend/Db/Table/Select.php index d4f2ff698..3980b8698 100644 --- a/lib/Zend/Db/Table/Select.php +++ b/lib/Zend/Db/Table/Select.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Select.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Select.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Select extends Zend_Db_Select diff --git a/lib/Zend/Db/Table/Select/Exception.php b/lib/Zend/Db/Table/Select/Exception.php index 4f9b5c10a..9cf573123 100644 --- a/lib/Zend/Db/Table/Select/Exception.php +++ b/lib/Zend/Db/Table/Select/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/lib/Zend/Debug.php b/lib/Zend/Debug.php index 234693171..f7341f8c2 100644 --- a/lib/Zend/Debug.php +++ b/lib/Zend/Debug.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Debug - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Debug.php 25095 2012-11-07 20:11:07Z rob $ + * @version $Id: Debug.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Debug - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -90,12 +90,7 @@ public static function dump($var, $label=null, $echo=true) . PHP_EOL; } else { if(!extension_loaded('xdebug')) { - $flags = ENT_QUOTES; - // PHP 5.4.0+ - if (defined('ENT_SUBSTITUTE')) { - $flags = ENT_QUOTES | ENT_SUBSTITUTE; - } - $output = htmlspecialchars($output, $flags); + $output = htmlspecialchars($output, ENT_QUOTES); } $output = '
    '
diff --git a/lib/Zend/Dojo.php b/lib/Zend/Dojo.php
index ba010ad4b..b3745cb77 100644
--- a/lib/Zend/Dojo.php
+++ b/lib/Zend/Dojo.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -22,9 +22,9 @@
  * Enable Dojo components
  *
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Dojo.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Dojo.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo
 {
diff --git a/lib/Zend/Dojo/BuildLayer.php b/lib/Zend/Dojo/BuildLayer.php
index 79df0fa1c..b2ebbe705 100644
--- a/lib/Zend/Dojo/BuildLayer.php
+++ b/lib/Zend/Dojo/BuildLayer.php
@@ -14,16 +14,16 @@
  *
  * @category   Zend
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BuildLayer.php 25024 2012-07-30 15:08:15Z rob $
+ * @version    $Id: BuildLayer.php 22280 2010-05-24 20:39:45Z matthew $
  */
 
 /**
  * Dojo module layer and custom build profile generation support
  *
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Dojo_BuildLayer
diff --git a/lib/Zend/Dojo/Data.php b/lib/Zend/Dojo/Data.php
index 38ec16150..4fa948f2e 100644
--- a/lib/Zend/Dojo/Data.php
+++ b/lib/Zend/Dojo/Data.php
@@ -14,9 +14,9 @@
  *
  * @category   Zend
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Data.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Data.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
@@ -26,7 +26,7 @@
  * @uses       Iterator
  * @uses       Countable
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
diff --git a/lib/Zend/Dojo/Exception.php b/lib/Zend/Dojo/Exception.php
index 2bbeb7af6..e9b2664de 100644
--- a/lib/Zend/Dojo/Exception.php
+++ b/lib/Zend/Dojo/Exception.php
@@ -14,9 +14,9 @@
  *
  * @category   Zend
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Exception */
@@ -27,7 +27,7 @@
  *
  * @uses       Zend_Exception
  * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Dojo_Exception extends Zend_Exception
diff --git a/lib/Zend/Dojo/Form.php b/lib/Zend/Dojo/Form.php
index 1e40a506e..501d7ff5e 100644
--- a/lib/Zend/Dojo/Form.php
+++ b/lib/Zend/Dojo/Form.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Form
  * @package    Zend_Dojo
  * @subpackage Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Form.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Form.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form extends Zend_Form
 {
diff --git a/lib/Zend/Dojo/Form/Decorator/AccordionContainer.php b/lib/Zend/Dojo/Form/Decorator/AccordionContainer.php
index cc6065799..7c68b2d1d 100644
--- a/lib/Zend/Dojo/Form/Decorator/AccordionContainer.php
+++ b/lib/Zend/Dojo/Form/Decorator/AccordionContainer.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,9 +29,9 @@
  * @uses       Zend_Dojo_Form_Decorator_DijitContainer
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AccordionContainer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: AccordionContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Decorator_AccordionContainer extends Zend_Dojo_Form_Decorator_DijitContainer
 {
diff --git a/lib/Zend/Dojo/Form/Decorator/AccordionPane.php b/lib/Zend/Dojo/Form/Decorator/AccordionPane.php
index deb833134..9943bb3d9 100644
--- a/lib/Zend/Dojo/Form/Decorator/AccordionPane.php
+++ b/lib/Zend/Dojo/Form/Decorator/AccordionPane.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,9 +29,9 @@
  * @uses       Zend_Dojo_Form_Decorator_DijitContainer
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AccordionPane.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: AccordionPane.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Decorator_AccordionPane extends Zend_Dojo_Form_Decorator_DijitContainer
 {
diff --git a/lib/Zend/Dojo/Form/Decorator/BorderContainer.php b/lib/Zend/Dojo/Form/Decorator/BorderContainer.php
index c2cd0b97d..28873b851 100644
--- a/lib/Zend/Dojo/Form/Decorator/BorderContainer.php
+++ b/lib/Zend/Dojo/Form/Decorator/BorderContainer.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,9 +29,9 @@
  * @uses       Zend_Dojo_Form_Decorator_DijitContainer
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BorderContainer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: BorderContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Decorator_BorderContainer extends Zend_Dojo_Form_Decorator_DijitContainer
 {
diff --git a/lib/Zend/Dojo/Form/Decorator/ContentPane.php b/lib/Zend/Dojo/Form/Decorator/ContentPane.php
index 3f7a8a1d7..717c953c8 100644
--- a/lib/Zend/Dojo/Form/Decorator/ContentPane.php
+++ b/lib/Zend/Dojo/Form/Decorator/ContentPane.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,9 +29,9 @@
  * @uses       Zend_Dojo_Form_Decorator_DijitContainer
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ContentPane.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: ContentPane.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Decorator_ContentPane extends Zend_Dojo_Form_Decorator_DijitContainer
 {
diff --git a/lib/Zend/Dojo/Form/Decorator/DijitContainer.php b/lib/Zend/Dojo/Form/Decorator/DijitContainer.php
index 1f9c2b185..2b197ffd0 100644
--- a/lib/Zend/Dojo/Form/Decorator/DijitContainer.php
+++ b/lib/Zend/Dojo/Form/Decorator/DijitContainer.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -35,9 +35,9 @@
  * @uses       Zend_Form_Decorator_Abstract
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DijitContainer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: DijitContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 abstract class Zend_Dojo_Form_Decorator_DijitContainer extends Zend_Form_Decorator_Abstract
 {
diff --git a/lib/Zend/Dojo/Form/Decorator/DijitElement.php b/lib/Zend/Dojo/Form/Decorator/DijitElement.php
index 927f98d4e..87e679387 100644
--- a/lib/Zend/Dojo/Form/Decorator/DijitElement.php
+++ b/lib/Zend/Dojo/Form/Decorator/DijitElement.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -36,9 +36,9 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DijitElement.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: DijitElement.php 20621 2010-01-25 20:25:23Z matthew $
  */
 class Zend_Dojo_Form_Decorator_DijitElement extends Zend_Form_Decorator_ViewHelper
 {
diff --git a/lib/Zend/Dojo/Form/Decorator/DijitForm.php b/lib/Zend/Dojo/Form/Decorator/DijitForm.php
index 06fe12f3e..07745f289 100644
--- a/lib/Zend/Dojo/Form/Decorator/DijitForm.php
+++ b/lib/Zend/Dojo/Form/Decorator/DijitForm.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -31,9 +31,9 @@
  *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DijitForm.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: DijitForm.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Decorator_DijitForm extends Zend_Dojo_Form_Decorator_DijitContainer
 {
@@ -56,11 +56,6 @@ public function render($content)
         $dijitParams = $this->getDijitParams();
         $attribs     = array_merge($this->getAttribs(), $this->getOptions());
 
-        // Enforce id attribute of form for dojo events
-        if (!isset($attribs['name']) || !$attribs['name']) {
-            $element->setName(get_class($element) . '_' . uniqid());
-        }
-
         return $view->form($element->getName(), $attribs, $content);
     }
 }
diff --git a/lib/Zend/Dojo/Form/Decorator/SplitContainer.php b/lib/Zend/Dojo/Form/Decorator/SplitContainer.php
index a8ad24ceb..9f4ddfd29 100644
--- a/lib/Zend/Dojo/Form/Decorator/SplitContainer.php
+++ b/lib/Zend/Dojo/Form/Decorator/SplitContainer.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,9 +29,9 @@
  * @uses       Zend_Dojo_Form_Decorator_DijitContainer
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SplitContainer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: SplitContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Decorator_SplitContainer extends Zend_Dojo_Form_Decorator_DijitContainer
 {
diff --git a/lib/Zend/Dojo/Form/Decorator/StackContainer.php b/lib/Zend/Dojo/Form/Decorator/StackContainer.php
index db7a42c62..a81c10cf2 100644
--- a/lib/Zend/Dojo/Form/Decorator/StackContainer.php
+++ b/lib/Zend/Dojo/Form/Decorator/StackContainer.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,9 +29,9 @@
  * @uses       Zend_Dojo_Form_Decorator_DijitContainer
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StackContainer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: StackContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Decorator_StackContainer extends Zend_Dojo_Form_Decorator_DijitContainer
 {
diff --git a/lib/Zend/Dojo/Form/Decorator/TabContainer.php b/lib/Zend/Dojo/Form/Decorator/TabContainer.php
index d143b92fb..afba3b7b3 100644
--- a/lib/Zend/Dojo/Form/Decorator/TabContainer.php
+++ b/lib/Zend/Dojo/Form/Decorator/TabContainer.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,9 +29,9 @@
  * @uses       Zend_Dojo_Form_Decorator_DijitContainer
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TabContainer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: TabContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Decorator_TabContainer extends Zend_Dojo_Form_Decorator_DijitContainer
 {
diff --git a/lib/Zend/Dojo/Form/DisplayGroup.php b/lib/Zend/Dojo/Form/DisplayGroup.php
index a4da730ef..7c833deeb 100644
--- a/lib/Zend/Dojo/Form/DisplayGroup.php
+++ b/lib/Zend/Dojo/Form/DisplayGroup.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Form_DisplayGroup
  * @package    Zend_Dojo
  * @subpackage Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DisplayGroup.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: DisplayGroup.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_DisplayGroup extends Zend_Form_DisplayGroup
 {
diff --git a/lib/Zend/Dojo/Form/Element/Button.php b/lib/Zend/Dojo/Form/Element/Button.php
index 35f82b866..947271c35 100644
--- a/lib/Zend/Dojo/Form/Element/Button.php
+++ b/lib/Zend/Dojo/Form/Element/Button.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Button.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Button.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_Button extends Zend_Dojo_Form_Element_Dijit
 {
diff --git a/lib/Zend/Dojo/Form/Element/CheckBox.php b/lib/Zend/Dojo/Form/Element/CheckBox.php
index 2c02f1665..ad7ef6594 100644
--- a/lib/Zend/Dojo/Form/Element/CheckBox.php
+++ b/lib/Zend/Dojo/Form/Element/CheckBox.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -30,9 +30,9 @@
  * @uses       Zend_Dojo_Form_Element_Dijit
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CheckBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: CheckBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit
 {
diff --git a/lib/Zend/Dojo/Form/Element/ComboBox.php b/lib/Zend/Dojo/Form/Element/ComboBox.php
index dda504b69..8fbdbfd07 100644
--- a/lib/Zend/Dojo/Form/Element/ComboBox.php
+++ b/lib/Zend/Dojo/Form/Element/ComboBox.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_DijitMulti
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ComboBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: ComboBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_ComboBox extends Zend_Dojo_Form_Element_DijitMulti
 {
diff --git a/lib/Zend/Dojo/Form/Element/CurrencyTextBox.php b/lib/Zend/Dojo/Form/Element/CurrencyTextBox.php
index c5699af2c..5f157b3c0 100644
--- a/lib/Zend/Dojo/Form/Element/CurrencyTextBox.php
+++ b/lib/Zend/Dojo/Form/Element/CurrencyTextBox.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_NumberTextBox
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CurrencyTextBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: CurrencyTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_CurrencyTextBox extends Zend_Dojo_Form_Element_NumberTextBox
 {
diff --git a/lib/Zend/Dojo/Form/Element/DateTextBox.php b/lib/Zend/Dojo/Form/Element/DateTextBox.php
index 587ee8dc3..c6455f371 100644
--- a/lib/Zend/Dojo/Form/Element/DateTextBox.php
+++ b/lib/Zend/Dojo/Form/Element/DateTextBox.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_ValidationTextBox
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DateTextBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: DateTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_DateTextBox extends Zend_Dojo_Form_Element_ValidationTextBox
 {
diff --git a/lib/Zend/Dojo/Form/Element/Dijit.php b/lib/Zend/Dojo/Form/Element/Dijit.php
index d78d87b9c..0c19ffeee 100644
--- a/lib/Zend/Dojo/Form/Element/Dijit.php
+++ b/lib/Zend/Dojo/Form/Element/Dijit.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Dijit.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Dijit.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 abstract class Zend_Dojo_Form_Element_Dijit extends Zend_Form_Element
 {
diff --git a/lib/Zend/Dojo/Form/Element/DijitMulti.php b/lib/Zend/Dojo/Form/Element/DijitMulti.php
index 97c4ef818..49cff54e0 100644
--- a/lib/Zend/Dojo/Form/Element/DijitMulti.php
+++ b/lib/Zend/Dojo/Form/Element/DijitMulti.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -30,9 +30,9 @@
  * @uses       Zend_Dojo_Form_Element_Dijit
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DijitMulti.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: DijitMulti.php 22322 2010-05-30 11:12:57Z thomas $
  */
 abstract class Zend_Dojo_Form_Element_DijitMulti extends Zend_Dojo_Form_Element_Dijit
 {
diff --git a/lib/Zend/Dojo/Form/Element/Editor.php b/lib/Zend/Dojo/Form/Element/Editor.php
index bf7d6900b..ae3c8fe71 100644
--- a/lib/Zend/Dojo/Form/Element/Editor.php
+++ b/lib/Zend/Dojo/Form/Element/Editor.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Editor.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Editor.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Dojo_Form_Element_Dijit */
@@ -30,7 +30,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Dojo_Form_Element_Editor extends Zend_Dojo_Form_Element_Dijit
@@ -247,7 +247,7 @@ public function addPlugin($plugin)
     {
         $plugin = (string) $plugin;
         $plugins = $this->getPlugins();
-        if (in_array($plugin, $plugins) && $plugin !== '|') {
+        if (in_array($plugin, $plugins)) {
             return $this;
         }
 
@@ -446,11 +446,11 @@ public function getInheritWidth()
      */
     public function setMinHeight($minHeight)
     {
-        if (!preg_match('/^\d+(em|px|%)?$/i', $minHeight)) {
+        if (!preg_match('/^\d+(em)?$/i', $minHeight)) {
             #require_once 'Zend/Form/Element/Exception.php';
             throw new Zend_Form_Element_Exception('Invalid minHeight provided; must be integer or CSS measurement');
         }
-        if (!preg_match('/(em|px|%)$/', $minHeight)) {
+        if ('em' != substr($minHeight, -2)) {
             $minHeight .= 'em';
         }
         return $this->setDijitParam('minHeight', $minHeight);
@@ -596,102 +596,4 @@ public function getUpdateInterval()
         }
         return $this->getDijitParam('updateInterval');
     }
-
-    /**
-     * Add a single editor extra plugin.
-     *
-     * @param  string $plugin
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function addExtraPlugin($plugin)
-    {
-        $plugin = (string) $plugin;
-        $extraPlugins = $this->getExtraPlugins();
-        if (in_array($plugin, $extraPlugins)) {
-            return $this;
-        }
-    
-        $extraPlugins[] = (string) $plugin;
-        $this->setDijitParam('extraPlugins', $extraPlugins);
-        return $this;
-    }
-    
-    /**
-     * Add multiple extra plugins.
-     *
-     * @param  array $extraPlugins
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function addExtraPlugins(array $plugins)
-    {
-        foreach ($plugins as $plugin) {
-            $this->addExtraPlugin($plugin);
-        }
-        return $this;
-    }
-    
-    /**
-     * Overwrite many extra plugins at once.
-     *
-     * @param  array $plugins
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function setExtraPlugins(array $plugins)
-    {
-        $this->clearExtraPlugins();
-        $this->addExtraPlugins($plugins);
-        return $this;
-    }
-    
-    /**
-     * Get all extra plugins.
-     *
-     * @return array
-     */
-    public function getExtraPlugins()
-    {
-        if (!$this->hasDijitParam('extraPlugins')) {
-            return array();
-        }
-        return $this->getDijitParam('extraPlugins');
-    }
-    
-    /**
-     * Is a given extra plugin registered?
-     *
-     * @param  string $plugin
-     * @return bool
-     */
-    public function hasExtraPlugin($plugin)
-    {
-        $extraPlugins = $this->getExtraPlugins();
-        return in_array((string) $plugin, $extraPlugins);
-    }
-    
-    /**
-     * Remove a given extra plugin.
-     *
-     * @param  string $plugin
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function removeExtraPlugin($plugin)
-    {
-        $extraPlugins = $this->getExtraPlugins();
-        if (false === ($index = array_search($plugin, $extraPlugins))) {
-            return $this;
-        }
-        unset($extraPlugins[$index]);
-        $this->setDijitParam('extraPlugins', $extraPlugins);
-        return $this;
-    }
-    
-    /**
-     * Clear all extra plugins.
-     *
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function clearExtraPlugins()
-    {
-        return $this->removeDijitParam('extraPlugins');
-    }
 }
diff --git a/lib/Zend/Dojo/Form/Element/FilteringSelect.php b/lib/Zend/Dojo/Form/Element/FilteringSelect.php
index 76bf97f1a..e1650dc37 100644
--- a/lib/Zend/Dojo/Form/Element/FilteringSelect.php
+++ b/lib/Zend/Dojo/Form/Element/FilteringSelect.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_ComboBox
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FilteringSelect.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: FilteringSelect.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_FilteringSelect extends Zend_Dojo_Form_Element_ComboBox
 {
diff --git a/lib/Zend/Dojo/Form/Element/HorizontalSlider.php b/lib/Zend/Dojo/Form/Element/HorizontalSlider.php
index 7c54d820d..21b9f918d 100644
--- a/lib/Zend/Dojo/Form/Element/HorizontalSlider.php
+++ b/lib/Zend/Dojo/Form/Element/HorizontalSlider.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_Slider
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HorizontalSlider.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: HorizontalSlider.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_HorizontalSlider extends Zend_Dojo_Form_Element_Slider
 {
diff --git a/lib/Zend/Dojo/Form/Element/NumberSpinner.php b/lib/Zend/Dojo/Form/Element/NumberSpinner.php
index acb40dfa5..f77adc3a2 100644
--- a/lib/Zend/Dojo/Form/Element/NumberSpinner.php
+++ b/lib/Zend/Dojo/Form/Element/NumberSpinner.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_ValidationTextBox
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NumberSpinner.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: NumberSpinner.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_NumberSpinner extends Zend_Dojo_Form_Element_ValidationTextBox
 {
@@ -92,7 +92,7 @@ public function getTimeoutChangeRate()
      */
     public function setLargeDelta($delta)
     {
-        $this->setDijitParam('largeDelta', (float) $delta);
+        $this->setDijitParam('largeDelta', (int) $delta);
         return $this;
     }
 
@@ -114,7 +114,7 @@ public function getLargeDelta()
      */
     public function setSmallDelta($delta)
     {
-        $this->setDijitParam('smallDelta', (float) $delta);
+        $this->setDijitParam('smallDelta', (int) $delta);
         return $this;
     }
 
@@ -187,7 +187,7 @@ public function setMin($value)
         if ($this->hasDijitParam('constraints')) {
             $constraints = $this->getDijitParam('constraints');
         }
-        $constraints['min'] = (float) $value;
+        $constraints['min'] = (int) $value;
         $this->setDijitParam('constraints', $constraints);
         return $this;
     }
@@ -221,7 +221,7 @@ public function setMax($value)
         if ($this->hasDijitParam('constraints')) {
             $constraints = $this->getDijitParam('constraints');
         }
-        $constraints['max'] = (float) $value;
+        $constraints['max'] = (int) $value;
         $this->setDijitParam('constraints', $constraints);
         return $this;
     }
diff --git a/lib/Zend/Dojo/Form/Element/NumberTextBox.php b/lib/Zend/Dojo/Form/Element/NumberTextBox.php
index f42299caf..eed7095cf 100644
--- a/lib/Zend/Dojo/Form/Element/NumberTextBox.php
+++ b/lib/Zend/Dojo/Form/Element/NumberTextBox.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_ValidationTextBox
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NumberTextBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: NumberTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_NumberTextBox extends Zend_Dojo_Form_Element_ValidationTextBox
 {
diff --git a/lib/Zend/Dojo/Form/Element/PasswordTextBox.php b/lib/Zend/Dojo/Form/Element/PasswordTextBox.php
index b7ae74ac1..b522eb334 100644
--- a/lib/Zend/Dojo/Form/Element/PasswordTextBox.php
+++ b/lib/Zend/Dojo/Form/Element/PasswordTextBox.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_ValidationTextBox
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PasswordTextBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: PasswordTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_PasswordTextBox extends Zend_Dojo_Form_Element_ValidationTextBox
 {
diff --git a/lib/Zend/Dojo/Form/Element/RadioButton.php b/lib/Zend/Dojo/Form/Element/RadioButton.php
index 459071ae1..d9505745c 100644
--- a/lib/Zend/Dojo/Form/Element/RadioButton.php
+++ b/lib/Zend/Dojo/Form/Element/RadioButton.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_DijitMulti
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RadioButton.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: RadioButton.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_RadioButton extends Zend_Dojo_Form_Element_DijitMulti
 {
diff --git a/lib/Zend/Dojo/Form/Element/SimpleTextarea.php b/lib/Zend/Dojo/Form/Element/SimpleTextarea.php
index fb73747b7..b4c634e21 100644
--- a/lib/Zend/Dojo/Form/Element/SimpleTextarea.php
+++ b/lib/Zend/Dojo/Form/Element/SimpleTextarea.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,9 +29,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SimpleTextarea.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: SimpleTextarea.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_SimpleTextarea extends Zend_Dojo_Form_Element_Dijit
 {
diff --git a/lib/Zend/Dojo/Form/Element/Slider.php b/lib/Zend/Dojo/Form/Element/Slider.php
index 39e6cfaaf..43513ae85 100644
--- a/lib/Zend/Dojo/Form/Element/Slider.php
+++ b/lib/Zend/Dojo/Form/Element/Slider.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_Dijit
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Slider.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Slider.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 abstract class Zend_Dojo_Form_Element_Slider extends Zend_Dojo_Form_Element_Dijit
 {
diff --git a/lib/Zend/Dojo/Form/Element/SubmitButton.php b/lib/Zend/Dojo/Form/Element/SubmitButton.php
index 3ac844fa4..8f5cfb334 100644
--- a/lib/Zend/Dojo/Form/Element/SubmitButton.php
+++ b/lib/Zend/Dojo/Form/Element/SubmitButton.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SubmitButton.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: SubmitButton.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_SubmitButton extends Zend_Dojo_Form_Element_Button
 {
diff --git a/lib/Zend/Dojo/Form/Element/TextBox.php b/lib/Zend/Dojo/Form/Element/TextBox.php
index 6daa35c6c..5ea35a244 100644
--- a/lib/Zend/Dojo/Form/Element/TextBox.php
+++ b/lib/Zend/Dojo/Form/Element/TextBox.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TextBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: TextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_TextBox extends Zend_Dojo_Form_Element_Dijit
 {
diff --git a/lib/Zend/Dojo/Form/Element/Textarea.php b/lib/Zend/Dojo/Form/Element/Textarea.php
index 1a12ae950..8bb418783 100644
--- a/lib/Zend/Dojo/Form/Element/Textarea.php
+++ b/lib/Zend/Dojo/Form/Element/Textarea.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Textarea.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Textarea.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_Textarea extends Zend_Dojo_Form_Element_Dijit
 {
diff --git a/lib/Zend/Dojo/Form/Element/TimeTextBox.php b/lib/Zend/Dojo/Form/Element/TimeTextBox.php
index 105bd1131..800dfe604 100644
--- a/lib/Zend/Dojo/Form/Element/TimeTextBox.php
+++ b/lib/Zend/Dojo/Form/Element/TimeTextBox.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_DateTextBox
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TimeTextBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: TimeTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_TimeTextBox extends Zend_Dojo_Form_Element_DateTextBox
 {
diff --git a/lib/Zend/Dojo/Form/Element/ValidationTextBox.php b/lib/Zend/Dojo/Form/Element/ValidationTextBox.php
index 70c4517d4..adf93fbd2 100644
--- a/lib/Zend/Dojo/Form/Element/ValidationTextBox.php
+++ b/lib/Zend/Dojo/Form/Element/ValidationTextBox.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_TextBox
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ValidationTextBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: ValidationTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_ValidationTextBox extends Zend_Dojo_Form_Element_TextBox
 {
@@ -132,8 +132,6 @@ public function setConstraint($key, $value)
      */
     public function setConstraints(array $constraints)
     {
-        $tmp = $this->getConstraints();
-        $constraints = array_merge($tmp, $constraints);
         array_walk_recursive($constraints, array($this, '_castBoolToString'));
         $this->setDijitParam('constraints', $constraints);
         return $this;
diff --git a/lib/Zend/Dojo/Form/Element/VerticalSlider.php b/lib/Zend/Dojo/Form/Element/VerticalSlider.php
index 18d15d54b..b7c2270e2 100644
--- a/lib/Zend/Dojo/Form/Element/VerticalSlider.php
+++ b/lib/Zend/Dojo/Form/Element/VerticalSlider.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Dojo_Form_Element_Slider
  * @package    Zend_Dojo
  * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VerticalSlider.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: VerticalSlider.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_Element_VerticalSlider extends Zend_Dojo_Form_Element_Slider
 {
diff --git a/lib/Zend/Dojo/Form/SubForm.php b/lib/Zend/Dojo/Form/SubForm.php
index 739f4fda9..759be44b6 100644
--- a/lib/Zend/Dojo/Form/SubForm.php
+++ b/lib/Zend/Dojo/Form/SubForm.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@
  * @uses       Zend_Form_SubForm
  * @package    Zend_Dojo
  * @subpackage Form
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SubForm.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: SubForm.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Dojo_Form_SubForm extends Zend_Form_SubForm
 {
diff --git a/lib/Zend/Dojo/View/Exception.php b/lib/Zend/Dojo/View/Exception.php
index 9c16ad0ea..09caa8c0e 100644
--- a/lib/Zend/Dojo/View/Exception.php
+++ b/lib/Zend/Dojo/View/Exception.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /**
@@ -29,7 +29,7 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Dojo_View_Exception extends Zend_Dojo_Exception
diff --git a/lib/Zend/Dojo/View/Helper/AccordionContainer.php b/lib/Zend/Dojo/View/Helper/AccordionContainer.php
index 2b273dd5b..cd24c6a41 100644
--- a/lib/Zend/Dojo/View/Helper/AccordionContainer.php
+++ b/lib/Zend/Dojo/View/Helper/AccordionContainer.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AccordionContainer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: AccordionContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Dojo_View_Helper_DijitContainer */
@@ -29,7 +29,7 @@
  * @uses       Zend_Dojo_View_Helper_DijitContainer
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class Zend_Dojo_View_Helper_AccordionContainer extends Zend_Dojo_View_Helper_DijitContainer
diff --git a/lib/Zend/Dojo/View/Helper/AccordionPane.php b/lib/Zend/Dojo/View/Helper/AccordionPane.php
index 2763cce0a..ad8c984fd 100644
--- a/lib/Zend/Dojo/View/Helper/AccordionPane.php
+++ b/lib/Zend/Dojo/View/Helper/AccordionPane.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AccordionPane.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: AccordionPane.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Dojo_View_Helper_DijitContainer */
@@ -29,7 +29,7 @@
  * @uses       Zend_Dojo_View_Helper_DijitContainer
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class Zend_Dojo_View_Helper_AccordionPane extends Zend_Dojo_View_Helper_DijitContainer
diff --git a/lib/Zend/Dojo/View/Helper/BorderContainer.php b/lib/Zend/Dojo/View/Helper/BorderContainer.php
index d7440db16..8a5a30361 100644
--- a/lib/Zend/Dojo/View/Helper/BorderContainer.php
+++ b/lib/Zend/Dojo/View/Helper/BorderContainer.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BorderContainer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: BorderContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Dojo_View_Helper_DijitContainer */
@@ -29,7 +29,7 @@
  * @uses       Zend_Dojo_View_Helper_DijitContainer
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class Zend_Dojo_View_Helper_BorderContainer extends Zend_Dojo_View_Helper_DijitContainer
diff --git a/lib/Zend/Dojo/View/Helper/Button.php b/lib/Zend/Dojo/View/Helper/Button.php
index 06a282ec4..f60750d21 100644
--- a/lib/Zend/Dojo/View/Helper/Button.php
+++ b/lib/Zend/Dojo/View/Helper/Button.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Button.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Button.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Dojo_View_Helper_Dijit */
@@ -29,7 +29,7 @@
  * @uses       Zend_Dojo_View_Helper_Dijit
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class Zend_Dojo_View_Helper_Button extends Zend_Dojo_View_Helper_Dijit
diff --git a/lib/Zend/Dojo/View/Helper/CheckBox.php b/lib/Zend/Dojo/View/Helper/CheckBox.php
index dde114e20..cd3fcc157 100644
--- a/lib/Zend/Dojo/View/Helper/CheckBox.php
+++ b/lib/Zend/Dojo/View/Helper/CheckBox.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CheckBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: CheckBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Dojo_View_Helper_Dijit */
@@ -29,7 +29,7 @@
  * @uses       Zend_Dojo_View_Helper_Dijit
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class Zend_Dojo_View_Helper_CheckBox extends Zend_Dojo_View_Helper_Dijit
diff --git a/lib/Zend/Dojo/View/Helper/ComboBox.php b/lib/Zend/Dojo/View/Helper/ComboBox.php
index 11acea821..79349fdce 100644
--- a/lib/Zend/Dojo/View/Helper/ComboBox.php
+++ b/lib/Zend/Dojo/View/Helper/ComboBox.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ComboBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: ComboBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Dojo_View_Helper_Dijit */
@@ -29,7 +29,7 @@
  * @uses       Zend_Dojo_View_Helper_Dijit
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class Zend_Dojo_View_Helper_ComboBox extends Zend_Dojo_View_Helper_Dijit
@@ -100,10 +100,6 @@ public function comboBox($id, $value = null, array $params = array(), array $att
             return $html;
         }
 
-        // required for correct type casting in declerative mode 
-        if (isset($params['autocomplete'])) {
-            $params['autocomplete'] = ($params['autocomplete']) ? 'true' : 'false';
-        }
         // do as normal select
         $attribs = $this->_prepareDijit($attribs, $params, 'element');
         return $this->view->formSelect($id, $value, $attribs, $options);
diff --git a/lib/Zend/Dojo/View/Helper/ContentPane.php b/lib/Zend/Dojo/View/Helper/ContentPane.php
index 0e889c2b5..f930e10f7 100644
--- a/lib/Zend/Dojo/View/Helper/ContentPane.php
+++ b/lib/Zend/Dojo/View/Helper/ContentPane.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ContentPane.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: ContentPane.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Dojo_View_Helper_DijitContainer */
@@ -29,7 +29,7 @@
  * @uses       Zend_Dojo_View_Helper_DijitContainer
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class Zend_Dojo_View_Helper_ContentPane extends Zend_Dojo_View_Helper_DijitContainer
diff --git a/lib/Zend/Dojo/View/Helper/CurrencyTextBox.php b/lib/Zend/Dojo/View/Helper/CurrencyTextBox.php
index aa2a6a100..f1f2ed3d2 100644
--- a/lib/Zend/Dojo/View/Helper/CurrencyTextBox.php
+++ b/lib/Zend/Dojo/View/Helper/CurrencyTextBox.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CurrencyTextBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: CurrencyTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Dojo_View_Helper_Dijit */
@@ -29,7 +29,7 @@
  * @uses       Zend_Dojo_View_Helper_Dijit
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class Zend_Dojo_View_Helper_CurrencyTextBox extends Zend_Dojo_View_Helper_Dijit
diff --git a/lib/Zend/Dojo/View/Helper/CustomDijit.php b/lib/Zend/Dojo/View/Helper/CustomDijit.php
index 2d38bee90..7916b3d53 100644
--- a/lib/Zend/Dojo/View/Helper/CustomDijit.php
+++ b/lib/Zend/Dojo/View/Helper/CustomDijit.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CustomDijit.php 25024 2012-07-30 15:08:15Z rob $
+ * @version    $Id: CustomDijit.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Dojo_View_Helper_DijitContainer */
@@ -29,7 +29,7 @@
  * @uses       Zend_Dojo_View_Helper_DijitContainer
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class Zend_Dojo_View_Helper_CustomDijit extends Zend_Dojo_View_Helper_DijitContainer
diff --git a/lib/Zend/Dojo/View/Helper/DateTextBox.php b/lib/Zend/Dojo/View/Helper/DateTextBox.php
index 72b810fcd..a7f675310 100644
--- a/lib/Zend/Dojo/View/Helper/DateTextBox.php
+++ b/lib/Zend/Dojo/View/Helper/DateTextBox.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DateTextBox.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: DateTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Dojo_View_Helper_Dijit */
@@ -29,7 +29,7 @@
  * @uses       Zend_Dojo_View_Helper_Dijit
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 class Zend_Dojo_View_Helper_DateTextBox extends Zend_Dojo_View_Helper_Dijit
diff --git a/lib/Zend/Dojo/View/Helper/Dijit.php b/lib/Zend/Dojo/View/Helper/Dijit.php
index 0a051e3f1..da7d6c14a 100644
--- a/lib/Zend/Dojo/View/Helper/Dijit.php
+++ b/lib/Zend/Dojo/View/Helper/Dijit.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Dijit.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Dijit.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_View_Helper_HtmlElement */
@@ -29,7 +29,7 @@
  * @uses       Zend_View_Helper_Abstract
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 abstract class Zend_Dojo_View_Helper_Dijit extends Zend_View_Helper_HtmlElement
diff --git a/lib/Zend/Dojo/View/Helper/DijitContainer.php b/lib/Zend/Dojo/View/Helper/DijitContainer.php
index 6c8ddbd84..e2da51fce 100644
--- a/lib/Zend/Dojo/View/Helper/DijitContainer.php
+++ b/lib/Zend/Dojo/View/Helper/DijitContainer.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DijitContainer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: DijitContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
 /** Zend_Dojo_View_Helper_Dijit */
@@ -29,7 +29,7 @@
  * @uses       Zend_Dojo_View_Helper_Dijit
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
   */
 abstract class Zend_Dojo_View_Helper_DijitContainer extends Zend_Dojo_View_Helper_Dijit
diff --git a/lib/Zend/Dojo/View/Helper/Dojo.php b/lib/Zend/Dojo/View/Helper/Dojo.php
index 0641e2aa6..372e6bba1 100644
--- a/lib/Zend/Dojo/View/Helper/Dojo.php
+++ b/lib/Zend/Dojo/View/Helper/Dojo.php
@@ -15,8 +15,8 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Dojo.php 24593 2012-01-05 20:35:02Z matthew $
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id: Dojo.php 20096 2010-01-06 02:05:09Z bkarwin $
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -31,7 +31,7 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Dojo_View_Helper_Dojo
diff --git a/lib/Zend/Dojo/View/Helper/Dojo/Container.php b/lib/Zend/Dojo/View/Helper/Dojo/Container.php
index a8b91e031..8a4fc2156 100644
--- a/lib/Zend/Dojo/View/Helper/Dojo/Container.php
+++ b/lib/Zend/Dojo/View/Helper/Dojo/Container.php
@@ -15,8 +15,8 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Container.php 24593 2012-01-05 20:35:02Z matthew $
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id: Container.php 23368 2010-11-18 19:56:30Z bittarman $
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,7 +29,7 @@
  *
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Dojo_View_Helper_Dojo_Container
@@ -882,7 +882,7 @@ function() {
      */
     public function addJavascript($js)
     {
-        $js = trim($js);
+        $js = preg_replace('/^\s*(.*?)\s*$/s', '$1', $js);
         if (!in_array(substr($js, -1), array(';', '}'))) {
             $js .= ';';
         }
@@ -1136,7 +1136,7 @@ protected function _renderExtras()
         }
 
         $onLoadActions = array();
-        // Get Zend specific onLoad actions; these will always be first to
+        // Get Zend specific onLoad actions; these will always be first to 
         // ensure that dijits are created in the correct order
         foreach ($this->_getZendLoadActions() as $callback) {
             $onLoadActions[] = 'dojo.addOnLoad(' . $callback . ');';
@@ -1177,12 +1177,12 @@ protected function _renderExtras()
     /**
      * Add an onLoad action related to ZF dijit creation
      *
-     * This method is public, but prefixed with an underscore to indicate that
+     * This method is public, but prefixed with an underscore to indicate that 
      * it should not normally be called by userland code. It is pertinent to
-     * ensuring that the correct order of operations occurs during dijit
+     * ensuring that the correct order of operations occurs during dijit 
      * creation.
-     *
-     * @param  string $callback
+     * 
+     * @param  string $callback 
      * @return Zend_Dojo_View_Helper_Dojo_Container
      */
     public function _addZendLoad($callback)
@@ -1195,7 +1195,7 @@ public function _addZendLoad($callback)
 
     /**
      * Retrieve all ZF dijit callbacks
-     *
+     * 
      * @return array
      */
     public function _getZendLoadActions()
diff --git a/lib/Zend/Dojo/View/Helper/Editor.php b/lib/Zend/Dojo/View/Helper/Editor.php
index b1e2e3dcf..7ffad44cc 100644
--- a/lib/Zend/Dojo/View/Helper/Editor.php
+++ b/lib/Zend/Dojo/View/Helper/Editor.php
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Editor.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id: Editor.php 20116 2010-01-07 14:18:34Z matthew $
  */
 
 /** Zend_Dojo_View_Helper_Dijit */
@@ -32,7 +32,7 @@
  * @uses       Zend_Dojo_View_Helper_Textarea
  * @package    Zend_Dojo
  * @subpackage View
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Dojo_View_Helper_Editor extends Zend_Dojo_View_Helper_Dijit
@@ -57,21 +57,14 @@ class Zend_Dojo_View_Helper_Editor extends Zend_Dojo_View_Helper_Dijit
         'fontSize' => 'FontChoice',
         'formatBlock' => 'FontChoice',
         'foreColor' => 'TextColor',
-        'hiliteColor' => 'TextColor',
-        'enterKeyHandling' => 'EnterKeyHandling',
-        'fullScreen' => 'FullScreen',
-        'newPage' => 'NewPage',
-        'print' => 'Print',
-        'tabIndent' => 'TabIndent',
-        'toggleDir' => 'ToggleDir',
-        'viewSource' => 'ViewSource'
+        'hiliteColor' => 'TextColor'
     );
 
     /**
      * JSON-encoded parameters
      * @var array
      */
-    protected $_jsonParams = array('captureEvents', 'events', 'plugins', 'extraPlugins');
+    protected $_jsonParams = array('captureEvents', 'events', 'plugins');
 
     /**
      * dijit.Editor
@@ -90,8 +83,8 @@ public function editor($id, $value = null, $params = array(), $attribs = array()
             }
         }
 
-        // Previous versions allowed specifying "degrade" to allow using a
-        // textarea instead of a div -- but this is insecure. Removing the
+        // Previous versions allowed specifying "degrade" to allow using a 
+        // textarea instead of a div -- but this is insecure. Removing the 
         // parameter if set to prevent its injection in the dijit.
         if (isset($params['degrade'])) {
             unset($params['degrade']);
@@ -121,18 +114,17 @@ public function editor($id, $value = null, $params = array(), $attribs = array()
 
         $attribs = $this->_prepareDijit($attribs, $params, 'textarea');
 
-        $html  = '_htmlAttribs($attribs) . '>'
+        $html  = '_htmlAttribs($hiddenAttribs) . $this->getClosingBracket();
+        $html .= '_htmlAttribs($attribs) . '>'
                . $value
                . "
    \n"; - // Embed a textarea in a